- Alpha - Build 0001

- Fixed debug mode
casdata · Apr 14, 2024 · 6015ff0 · 6015ff0
1 parent 21fa3e2
commit 6015ff0
Show file tree

Hide file tree

Showing 4 changed files with 207 additions and 1 deletion.
diff --git a/Data/DTypes.h b/Data/DTypes.h
@@ -5,6 +5,8 @@
 #ifndef MASTERSERIALMONITOR_DTYPES_H
 #define MASTERSERIALMONITOR_DTYPES_H
 
+//#define DEBUG_TAG
+
 #include <unordered_map>
 #include "serial/serial.h"
 

diff --git a/UIDisplays/Hud.cpp b/UIDisplays/Hud.cpp
@@ -11,6 +11,7 @@ Hud::Hud() {
     int imageWidth = 0;
     int imageHeight = 0;
 
+#ifdef DEBUG_TAG
     bool ret = FunctionTools::loadTextureFromFile("../Assets/iconQ.png", &questionTexture, &imageWidth, &imageHeight); //Assets
     IM_ASSERT(ret);
     questionSize = new ImVec2(imageWidth, imageHeight);
@@ -78,6 +79,76 @@ Hud::Hud() {
 
     ret = FunctionTools::loadTextureFromFile("../Assets/closeBtn.png", &closeTexture, &imageWidth, &imageHeight);
     IM_ASSERT(ret);
+#else
+    bool ret = FunctionTools::loadTextureFromFile("Assets/iconQ.png", &questionTexture, &imageWidth, &imageHeight); //Assets
+    IM_ASSERT(ret);
+    questionSize = new ImVec2(imageWidth, imageHeight);
+
+    ret = FunctionTools::loadTextureFromFile("Assets/menuLightUp.png", &menuLightTexture, &imageWidth, &imageHeight);
+    IM_ASSERT(ret);
+    menuBarIconSize = new ImVec2(imageWidth, imageHeight);
+
+    ret = FunctionTools::loadTextureFromFile("Assets/menuDarkUp.png", &menuDarkTexture, &imageWidth, &imageHeight);
+    IM_ASSERT(ret);
+
+    ret  = FunctionTools::loadTextureFromFile("Assets/icon.png", &iconTexture, &imageWidth, &imageHeight);
+    IM_ASSERT(ret);
+
+    ret = FunctionTools::loadTextureFromFile("Assets/newBtn.png", &newBtnTexture, &imageWidth, &imageHeight);
+    IM_ASSERT(ret);
+
+    ret = FunctionTools::loadTextureFromFile("Assets/openBtn.png", &openBtnTexture, &imageWidth, &imageHeight);
+    IM_ASSERT(ret);
+
+    ret = FunctionTools::loadTextureFromFile("Assets/saveAsBtn.png", &saveAsBtnTexture, &imageWidth, &imageHeight);
+    IM_ASSERT(ret);
+
+    ret = FunctionTools::loadTextureFromFile("Assets/saveBtn.png", &saveBtnTexture, &imageWidth, &imageHeight);
+    IM_ASSERT(ret);
+
+    ret = FunctionTools::loadTextureFromFile("Assets/rewindBtn.png", &rewindTexture, &imageWidth, &imageHeight);
+    IM_ASSERT(ret);
+
+    ret = FunctionTools::loadTextureFromFile("Assets/uNewBtn.png", &uNewBtnTexture, &imageWidth, &imageHeight);
+    IM_ASSERT(ret);
+
+    ret = FunctionTools::loadTextureFromFile("Assets/uOpenBtn.png", &uOpenBtnTexture, &imageWidth, &imageHeight);
+    IM_ASSERT(ret);
+
+    ret = FunctionTools::loadTextureFromFile("Assets/uSaveBtn.png", &uSaveBtnTexture, &imageWidth, &imageHeight);
+    IM_ASSERT(ret);
+
+    ret = FunctionTools::loadTextureFromFile("Assets/uSaveAsBtn.png", &uSaveAsBtnTexture, &imageWidth, &imageHeight);
+    IM_ASSERT(ret);
+
+    ret = FunctionTools::loadTextureFromFile("Assets/uEmpty.png", &uEmptyBtnTexture, &imageWidth, &imageHeight);
+    IM_ASSERT(ret);
+
+    ret = FunctionTools::loadTextureFromFile("Assets/sun.png", &sunBtnTexture, &imageWidth, &imageHeight);
+    IM_ASSERT(ret);
+
+    ret = FunctionTools::loadTextureFromFile("Assets/moon.png", &moonBtnTexture, &imageWidth, &imageHeight);
+    IM_ASSERT(ret);
+
+    ret = FunctionTools::loadTextureFromFile("Assets/withBar.png", &withBarTexture, &imageWidth, &imageHeight);
+    IM_ASSERT(ret);
+
+    ret = FunctionTools::loadTextureFromFile("Assets/withoutBar.png", &withoutBarTexture, &imageWidth, &imageHeight);
+    IM_ASSERT(ret);
+
+    ret = FunctionTools::loadTextureFromFile("Assets/minimizeBtn.png", &minimizeTexture, &imageWidth, &imageHeight);
+    IM_ASSERT(ret);
+
+    ret = FunctionTools::loadTextureFromFile("Assets/maximizeBtn.png", &maximizeTexture, &imageWidth, &imageHeight);
+    IM_ASSERT(ret);
+
+    ret = FunctionTools::loadTextureFromFile("Assets/maximize2Btn.png", &maximize2Texture, &imageWidth, &imageHeight);
+    IM_ASSERT(ret);
+
+    ret = FunctionTools::loadTextureFromFile("Assets/closeBtn.png", &closeTexture, &imageWidth, &imageHeight);
+    IM_ASSERT(ret);
+#endif
+
     cornerIconSize = new ImVec2(imageWidth, imageHeight);
 
     mainWin = new MainWindow();

diff --git a/UIDisplays/MainWindow.cpp b/UIDisplays/MainWindow.cpp
@@ -34,6 +34,7 @@ MainWindow::MainWindow() {
 
     GLuint *texturePtr = &TabSerialWindow::timestampTexture;
 
+#ifdef DEBUG_TAG
     bool ret = FunctionTools::loadTextureFromFile("../Assets/timestamp.png", texturePtr, &imageWidth, &imageHeight);
     IM_ASSERT(ret);
 
@@ -159,6 +160,133 @@ MainWindow::MainWindow() {
     ret = FunctionTools::loadTextureFromFile("../Assets/info.png", texturePtr, &imageWidth, &imageHeight);
     IM_ASSERT(ret);
 
+#else
+    bool ret = FunctionTools::loadTextureFromFile("Assets/timestamp.png", texturePtr, &imageWidth, &imageHeight);
+    IM_ASSERT(ret);
+
+    TabSerialWindow::textureSize = ImVec2(imageWidth, imageHeight);
+
+    texturePtr = &TabSerialWindow::timestampDisLightTexture;
+    ret = FunctionTools::loadTextureFromFile("Assets/timestampDisableLight.png", texturePtr, &imageWidth, &imageHeight);
+    IM_ASSERT(ret);
+
+    texturePtr = &TabSerialWindow::timestampDisDarkTexture;
+    ret = FunctionTools::loadTextureFromFile("Assets/timestampDisableDark.png", texturePtr, &imageWidth, &imageHeight);
+    IM_ASSERT(ret);
+
+    texturePtr = &TabSerialWindow::settingsTexture;
+    ret = FunctionTools::loadTextureFromFile("Assets/comSettings.png", texturePtr, &imageWidth, &imageHeight);
+    IM_ASSERT(ret);
+
+    texturePtr = &TabSerialWindow::separatorTexture;
+    ret = FunctionTools::loadTextureFromFile("Assets/separator.png", texturePtr, &imageWidth, &imageHeight);
+    IM_ASSERT(ret);
+
+    texturePtr = &TabSerialWindow::playTexture;
+    ret = FunctionTools::loadTextureFromFile("Assets/play.png", texturePtr, &imageWidth, &imageHeight);
+    IM_ASSERT(ret);
+
+    texturePtr = &TabSerialWindow::pauseTexture;
+    ret = FunctionTools::loadTextureFromFile("Assets/pause.png", texturePtr, &imageWidth, &imageHeight);
+    IM_ASSERT(ret);
+
+    texturePtr = &TabSerialWindow::fruitsTexture;
+    ret = FunctionTools::loadTextureFromFile("Assets/orange.png", texturePtr, &imageWidth, &imageHeight);
+    IM_ASSERT(ret);
+
+    texturePtr = &TabSerialWindow::fruitsDisDarkTexture;
+    ret = FunctionTools::loadTextureFromFile("Assets/orangeDisableDark.png", texturePtr, &imageWidth, &imageHeight);
+    IM_ASSERT(ret);
+
+    texturePtr = &TabSerialWindow::fruitsDisLightTexture;
+    ret = FunctionTools::loadTextureFromFile("Assets/orangeDisableLight.png", texturePtr, &imageWidth, &imageHeight);
+    IM_ASSERT(ret);
+
+    texturePtr = &TabSerialWindow::darkBtn0RedTexture;
+    ret = FunctionTools::loadTextureFromFile("Assets/darkbtn0Red.png", texturePtr, &imageWidth, &imageHeight);
+    IM_ASSERT(ret);
+
+    texturePtr = &TabSerialWindow::darkBtn1RedTexture;
+    ret = FunctionTools::loadTextureFromFile("Assets/darkbtn1Red.png", texturePtr, &imageWidth, &imageHeight);
+    IM_ASSERT(ret);
+
+    texturePtr = &TabSerialWindow::darkBtn2RedTexture;
+    ret = FunctionTools::loadTextureFromFile("Assets/darkbtn2Red.png", texturePtr, &imageWidth, &imageHeight);
+    IM_ASSERT(ret);
+
+    texturePtr = &TabSerialWindow::darkBtn3RedTexture;
+    ret = FunctionTools::loadTextureFromFile("Assets/darkbtn3Red.png", texturePtr, &imageWidth, &imageHeight);
+    IM_ASSERT(ret);
+
+    texturePtr = &TabSerialWindow::lightBtn0RedTexture;
+    ret = FunctionTools::loadTextureFromFile("Assets/lightbtn0Red.png", texturePtr, &imageWidth, &imageHeight);
+    IM_ASSERT(ret);
+
+    texturePtr = &TabSerialWindow::lightBtn1RedTexture;
+    ret = FunctionTools::loadTextureFromFile("Assets/lightbtn1Red.png", texturePtr, &imageWidth, &imageHeight);
+    IM_ASSERT(ret);
+
+    texturePtr = &TabSerialWindow::lightBtn2RedTexture;
+    ret = FunctionTools::loadTextureFromFile("Assets/lightbtn2Red.png", texturePtr, &imageWidth, &imageHeight);
+    IM_ASSERT(ret);
+
+    texturePtr = &TabSerialWindow::lightBtn3RedTexture;
+    ret = FunctionTools::loadTextureFromFile("Assets/lightbtn3Red.png", texturePtr, &imageWidth, &imageHeight);
+    IM_ASSERT(ret);
+
+
+    texturePtr = &darkSendTexture;
+    ret = FunctionTools::loadTextureFromFile("Assets/lightSend.png", texturePtr, &imageWidth, &imageHeight);
+    IM_ASSERT(ret);
+
+    sendTextureSize = ImVec2(imageWidth, imageHeight);
+
+    texturePtr = &lightSendTexture;
+    ret = FunctionTools::loadTextureFromFile("Assets/lightSend.png", texturePtr, &imageWidth, &imageHeight);
+    IM_ASSERT(ret);
+
+    texturePtr = &darkBtn0Texture;
+    ret = FunctionTools::loadTextureFromFile("Assets/darkbtn0.png", texturePtr, &imageWidth, &imageHeight);
+    IM_ASSERT(ret);
+
+    texturePtr = &darkBtn1Texture;
+    ret = FunctionTools::loadTextureFromFile("Assets/darkbtn1.png", texturePtr, &imageWidth, &imageHeight);
+    IM_ASSERT(ret);
+
+    texturePtr = &darkBtn2Texture;
+    ret = FunctionTools::loadTextureFromFile("Assets/darkbtn2.png", texturePtr, &imageWidth, &imageHeight);
+    IM_ASSERT(ret);
+
+    texturePtr = &darkBtn3Texture;
+    ret = FunctionTools::loadTextureFromFile("Assets/darkbtn3.png", texturePtr, &imageWidth, &imageHeight);
+    IM_ASSERT(ret);
+
+
+    texturePtr = &lightBtn0Texture;
+    ret = FunctionTools::loadTextureFromFile("Assets/lightbtn0.png", texturePtr, &imageWidth, &imageHeight);
+    IM_ASSERT(ret);
+
+    texturePtr = &lightBtn1Texture;
+    ret = FunctionTools::loadTextureFromFile("Assets/lightbtn1.png", texturePtr, &imageWidth, &imageHeight);
+    IM_ASSERT(ret);
+
+    texturePtr = &lightBtn2Texture;
+    ret = FunctionTools::loadTextureFromFile("Assets/lightbtn2.png", texturePtr, &imageWidth, &imageHeight);
+    IM_ASSERT(ret);
+
+    texturePtr = &lightBtn3Texture;
+    ret = FunctionTools::loadTextureFromFile("Assets/lightbtn3.png", texturePtr, &imageWidth, &imageHeight);
+    IM_ASSERT(ret);
+
+    texturePtr = &sepTexture;
+    ret = FunctionTools::loadTextureFromFile("Assets/separator.png", texturePtr, &imageWidth, &imageHeight);
+    IM_ASSERT(ret);
+
+    texturePtr = &infoTexture;
+    ret = FunctionTools::loadTextureFromFile("Assets/info.png", texturePtr, &imageWidth, &imageHeight);
+    IM_ASSERT(ret);
+#endif
+
 
     auto* subWin = new SubWindow(windowCount);
     subWindows.push_back(subWin);

diff --git a/main.cpp b/main.cpp
@@ -148,13 +148,18 @@ int main(int, char**)
     //io.Fonts->AddFontDefault();
     //io.Fonts->AddFontFromFileTTF("c:\\Windows\\Fonts\\segoeui.ttf", 18.0f);
     //io.Fonts->AddFontFromFileTTF("../imgui/misc/fonts/ProggyClean.ttf", FunctionTools::norm2HeightFloat(14.0f));    //win
+#ifdef DEBUG_TAG
     io.Fonts->AddFontFromFileTTF("../imGui/misc/fonts/ProggyClean.ttf", FunctionTools::norm2HeightFloat(14.0f));
+    appData.monoFont = io.Fonts->AddFontFromFileTTF("../imGui/misc/fonts/JetBrainsMono-Regular.ttf", FunctionTools::norm2HeightFloat(16.0f), NULL, io.Fonts->GetGlyphRangesJapanese());
+#else
+    io.Fonts->AddFontFromFileTTF("Fonts/ProggyClean.ttf", FunctionTools::norm2HeightFloat(14.0f));
+    appData.monoFont = io.Fonts->AddFontFromFileTTF("Fonts/JetBrainsMono-Regular.ttf", FunctionTools::norm2HeightFloat(16.0f), NULL, io.Fonts->GetGlyphRangesJapanese());
+#endif
     //io.Fonts->AddFontFromFileTTF("../imgui/misc/fonts/DroidSans.ttf", 16.0f);
     //io.Fonts->AddFontFromFileTTF("../imgui/misc/fonts/Roboto-Medium.ttf", 16.0f);
     //io.Fonts->AddFontFromFileTTF("../imgui/misc/fonts/Cousine-Regular.ttf", 15.0f);
     //ImFont* monoFont = io.Fonts->AddFontFromFileTTF("../imgui/misc/fonts/JetBrainsMono-Regular.ttf", 16.0f, NULL, io.Fonts->GetGlyphRangesJapanese());
     //io.Fonts->AddFontFromFileTTF("../imgui/misc/fonts/Osaka Regular-Mono.otf", 16.0f, NULL, io.Fonts->GetGlyphRangesJapanese());
-    appData.monoFont = io.Fonts->AddFontFromFileTTF("../imGui/misc/fonts/JetBrainsMono-Regular.ttf", FunctionTools::norm2HeightFloat(16.0f), NULL, io.Fonts->GetGlyphRangesJapanese());
 
     IM_ASSERT(appData.monoFont != NULL);