Slight fixes on the hrpt decoder and new version

AlexandreRouma · Aug 1, 2021 · d9a0243 · d9a0243
1 parent 9909688
commit d9a0243
Show file tree

Hide file tree

Showing 2 changed files with 65 additions and 57 deletions.
diff --git a/core/src/version.h b/core/src/version.h
@@ -1,3 +1,3 @@
 #pragma once
 
-#define VERSION_STR "1.0.0_rc5"
+#define VERSION_STR "1.0.0"
diff --git a/weather_sat_decoder/src/noaa_hrpt_decoder.h b/weather_sat_decoder/src/noaa_hrpt_decoder.h
@@ -7,6 +7,7 @@
 #include <dsp/sink.h>
 #include <gui/widgets/symbol_diagram.h>
 #include <gui/widgets/line_push_image.h>
+#include <gui/gui.h>
 
 #define NOAA_HRPT_VFO_SR    3000000.0f
 #define NOAA_HRPT_VFO_BW    2000000.0f
@@ -212,72 +213,77 @@ class NOAAHRPTDecoder : public SatDecoder {
         ImGui::SetNextItemWidth(menuWidth);
         symDiag.draw();
 
-        ImGui::Begin("NOAA HRPT Decoder");
-        ImGui::BeginTabBar("NOAAHRPTTabs");
+        if (showWindow) {
+            gui::mainWindow.lockWaterfallControls = true;
+            ImGui::Begin("NOAA HRPT Decoder");
+            ImGui::BeginTabBar("NOAAHRPTTabs");
+
+            if (ImGui::BeginTabItem("AVHRR RGB(221)")) {
+                ImGui::BeginChild("AVHRRRGBChild");
+                ImGui::SetNextItemWidth(ImGui::GetContentRegionAvailWidth());
+                avhrrRGBImage.draw();
+                ImGui::SetScrollHereY(1.0f);
+                ImGui::EndChild();
+                ImGui::EndTabItem();
+            }
 
-        if (ImGui::BeginTabItem("AVHRR RGB(221)")) {
-            ImGui::BeginChild("AVHRRRGBChild");
-            ImGui::SetNextItemWidth(ImGui::GetContentRegionAvailWidth());
-            avhrrRGBImage.draw();
-            ImGui::SetScrollHereY(1.0f);
-            ImGui::EndChild();
-            ImGui::EndTabItem();
-        }
+            if (ImGui::BeginTabItem("AVHRR 1")) {
+                ImGui::BeginChild("AVHRR1Child");
+                ImGui::SetNextItemWidth(ImGui::GetContentRegionAvailWidth());
+                avhrr1Image.draw();
+                ImGui::SetScrollHereY(1.0f);
+                ImGui::EndChild();
+                ImGui::EndTabItem();
+            }
 
-        if (ImGui::BeginTabItem("AVHRR 1")) {
-            ImGui::BeginChild("AVHRR1Child");
-            ImGui::SetNextItemWidth(ImGui::GetContentRegionAvailWidth());
-            avhrr1Image.draw();
-            ImGui::SetScrollHereY(1.0f);
-            ImGui::EndChild();
-            ImGui::EndTabItem();
-        }
+            if (ImGui::BeginTabItem("AVHRR 2")) {
+                ImGui::BeginChild("AVHRR2Child");
+                ImGui::SetNextItemWidth(ImGui::GetContentRegionAvailWidth());
+                avhrr2Image.draw();
+                ImGui::SetScrollHereY(1.0f);
+                ImGui::EndChild();
+                ImGui::EndTabItem();
+            }
 
-        if (ImGui::BeginTabItem("AVHRR 2")) {
-            ImGui::BeginChild("AVHRR2Child");
-            ImGui::SetNextItemWidth(ImGui::GetContentRegionAvailWidth());
-            avhrr2Image.draw();
-            ImGui::SetScrollHereY(1.0f);
-            ImGui::EndChild();
-            ImGui::EndTabItem();
-        }
+            if (ImGui::BeginTabItem("AVHRR 3")) {
+                ImGui::BeginChild("AVHRR3Child");
+                ImGui::SetNextItemWidth(ImGui::GetContentRegionAvailWidth());
+                avhrr3Image.draw();
+                ImGui::SetScrollHereY(1.0f);
+                ImGui::EndChild();
+                ImGui::EndTabItem();
+            }
 
-        if (ImGui::BeginTabItem("AVHRR 3")) {
-            ImGui::BeginChild("AVHRR3Child");
-            ImGui::SetNextItemWidth(ImGui::GetContentRegionAvailWidth());
-            avhrr3Image.draw();
-            ImGui::SetScrollHereY(1.0f);
-            ImGui::EndChild();
-            ImGui::EndTabItem();
-        }
+            if (ImGui::BeginTabItem("AVHRR 4")) {
+                ImGui::BeginChild("AVHRR4Child");
+                ImGui::SetNextItemWidth(ImGui::GetContentRegionAvailWidth());
+                avhrr4Image.draw();
+                ImGui::SetScrollHereY(1.0f);
+                ImGui::EndChild();
+                ImGui::EndTabItem();
+            }
 
-        if (ImGui::BeginTabItem("AVHRR 4")) {
-            ImGui::BeginChild("AVHRR4Child");
-            ImGui::SetNextItemWidth(ImGui::GetContentRegionAvailWidth());
-            avhrr4Image.draw();
-            ImGui::SetScrollHereY(1.0f);
-            ImGui::EndChild();
-            ImGui::EndTabItem();
-        }
+            if (ImGui::BeginTabItem("AVHRR 5")) {
+                ImGui::BeginChild("AVHRR5Child");
+                ImGui::SetNextItemWidth(ImGui::GetContentRegionAvailWidth());
+                avhrr5Image.draw();
+                ImGui::SetScrollHereY(1.0f);
+                ImGui::EndChild();
+                ImGui::EndTabItem();
+            }
 
-        if (ImGui::BeginTabItem("AVHRR 5")) {
-            ImGui::BeginChild("AVHRR5Child");
-            ImGui::SetNextItemWidth(ImGui::GetContentRegionAvailWidth());
-            avhrr5Image.draw();
-            ImGui::SetScrollHereY(1.0f);
-            ImGui::EndChild();
-            ImGui::EndTabItem();
-        }
+            if (ImGui::BeginTabItem("HIRS")) {
+                ImGui::BeginChild("HIRSChild");
 
-        if (ImGui::BeginTabItem("HIRS")) {
-            ImGui::BeginChild("HIRSChild");
+                ImGui::EndChild();
+                ImGui::EndTabItem();
+            }
 
-            ImGui::EndChild();
-            ImGui::EndTabItem();
+            ImGui::EndTabBar();
+            ImGui::End();
         }
 
-        ImGui::EndTabBar();
-        ImGui::End();
+        ImGui::Checkbox("Show Image", &showWindow);
     };
 
 private:
@@ -561,4 +567,6 @@ class NOAAHRPTDecoder : public SatDecoder {
     dsp::stream<uint16_t> compositeIn2;
     std::thread compositeThread;
 
+    bool showWindow = false;
+
 };