remove debug font build, reformat

janvrska · Oct 9, 2022 · dbf855f · dbf855f
1 parent 3e3d529
commit dbf855f
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 13 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -3,7 +3,7 @@ project(weather_widget)
 
 set(CMAKE_CXX_STANDARD 20)
 
-add_executable(weather_widget src/main.cpp src/render/Renderer.cpp src/render/Renderer.h src/abstract/AWeatherPlot.cpp src/abstract/AWeatherPlot.h src/plot/TemperaturePlot.cpp src/plot/TemperaturePlot.h src/abstract/ADataProvider.cpp src/abstract/ADataProvider.h src/abstract/AApiDataProvider.cpp src/abstract/AApiDataProvider.h src/data/api/WundergroundDataProvider.cpp src/data/api/WundergroundDataProvider.h src/data/WundergroundDataSchema.h src/plot/HumidityPlot.cpp src/plot/HumidityPlot.h src/config/ConfigFileManager.cpp src/config/ConfigFileManager.h src/config/Config.h)
+add_executable(weather_widget src/main.cpp src/render/Renderer.cpp src/render/Renderer.h src/abstract/AWeatherPlot.cpp src/abstract/AWeatherPlot.h src/plot/TemperaturePlot.cpp src/plot/TemperaturePlot.h src/abstract/ADataProvider.h src/abstract/AApiDataProvider.h src/data/api/WundergroundDataProvider.cpp src/data/api/WundergroundDataProvider.h src/data/WundergroundDataSchema.h src/plot/HumidityPlot.cpp src/plot/HumidityPlot.h src/config/ConfigFileManager.cpp src/config/ConfigFileManager.h src/config/Config.h)
 find_package(imgui REQUIRED)
 
 find_package(GLEW REQUIRED)

diff --git a/src/abstract/AApiDataProvider.cpp b/src/abstract/AApiDataProvider.cpp
diff --git a/src/abstract/ADataProvider.cpp b/src/abstract/ADataProvider.cpp
diff --git a/src/data/api/WundergroundDataProvider.cpp b/src/data/api/WundergroundDataProvider.cpp
@@ -50,7 +50,7 @@ void WundergroundDataProvider::ProcessResponseData(std::string responseData) {
 bool WundergroundDataProvider::RefreshData(bool oneTimeRefresh) {
     while (true) {
 
-        if((apiKey.length() == 0 && pwsId.length() == 0) && !oneTimeRefresh) {
+        if ((apiKey.length() == 0 && pwsId.length() == 0) && !oneTimeRefresh) {
             std::this_thread::sleep_for(std::chrono::milliseconds(1000 * 300));
             continue;
         }

diff --git a/src/main.cpp b/src/main.cpp
@@ -4,7 +4,9 @@
 
 int main() {
     try {
-        ::ShowWindow(::GetConsoleWindow(), SW_HIDE);
+        ShowWindow(GetConsoleWindow(), SW_HIDE);
+        FreeConsole();
+
         Renderer renderer;
         renderer.Render();
     } catch (std::exception& e) {

diff --git a/src/render/Renderer.cpp b/src/render/Renderer.cpp
@@ -47,14 +47,8 @@ void Renderer::Init() {
 
     ImGuiIO& io = ImGui::GetIO();
 
-#ifdef NDEBUG
     fonts.insert({"regular", io.Fonts->AddFontFromFileTTF(FONTS"Roboto-Regular.ttf", 15)});
     fonts.insert({"light", io.Fonts->AddFontFromFileTTF(FONTS"Roboto-Light.ttf", 50)});
-#else
-    fonts.insert({"regular", io.Fonts->AddFontFromFileTTF(FONTS"Roboto-Regular.ttf", 15)});
-    fonts.insert({"light", io.Fonts->AddFontFromFileTTF(FONTS"Roboto-Light.ttf", 50)});
-#endif
-
 }
 
 Renderer::~Renderer() {
@@ -85,7 +79,6 @@ void Renderer::Render() {
                                                       wundergroundDataProvider);
     HumidityPlot humidityPlot = HumidityPlot(humidityPlotTitle, humidityPlotUnit, wundergroundDataProvider);
 
-
     while (!glfwWindowShouldClose(window)) {
         glfwPollEvents();