Skip to content

Commit

Permalink
Changed the order of the included files back
Browse files Browse the repository at this point in the history
  • Loading branch information
AKMaily committed Sep 5, 2024
1 parent 390adb5 commit fd0f92c
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 12 deletions.
12 changes: 8 additions & 4 deletions src/handler.cpp
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
#include "handler.hpp"
#include "../imgui-stdlib/imgui_stdlib.h"
#include "get_from_github.hpp"
#include "popups.hpp"

#include <functional>
#include <implot.h>
#include <set>
#include <implot.h>


#include "popups.hpp"
#include "get_from_github.hpp"

#include "../imgui-stdlib/imgui_stdlib.h"

std::vector<AxisInfo> getDeviceInfos() {
std::vector<AxisInfo> axisInfos;
Expand Down
3 changes: 2 additions & 1 deletion src/handler.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@

#include "../ai_omniscope-v2-communication_sw/src/OmniscopeSampler.hpp"
#include "languages.hpp"
#include <implot.h>

#include <nlohmann/json.hpp>
#include <nlohmann/json_fwd.hpp>
#include <set>
#include <implot.h>

struct AxisInfo {
std::pair<Omniscope::Id, std::vector<std::pair<double, double>> &> data;
Expand Down
12 changes: 7 additions & 5 deletions src/saves_popup.cpp
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
#include <fstream>
#include <future>
#include <charconv>
#include "popups.hpp"
#include "look_up_saves.hpp"

#include "imgui_stdlib.h"
#include "languages.hpp"
#include "look_up_saves.hpp"
#include "popups.hpp"

#include "style.hpp"
#include <charconv>
#include <fstream>
#include <future>

static void save(const Omniscope::Id &device,
const std::vector<std::pair<double, double>> &values,
Expand Down
5 changes: 3 additions & 2 deletions src/style.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,15 @@
#include <vector>
#define IMGUI_DEFINE_MATH_OPERATORS
#define STB_IMAGE_IMPLEMENTATION
#include "../imgui-filebrowser/imfilebrowser.h"
#include "style.hpp"
#include "../stb_image/stb_image.h"
#include "imagesHeader.hpp"
#include "imgui_internal.h"
#include "jasonhandler.hpp"
#include "languages.hpp"
#include "../imgui-filebrowser/imfilebrowser.h"
#include "popups.hpp"
#include "style.hpp"


void SetupImGuiStyle(bool bStyleDark_, float alpha_) {

Expand Down

0 comments on commit fd0f92c

Please sign in to comment.