Prevent scan autosolve if initiated with multiple GuiScanDialogs (#2682)

Author: oznogon

src/screenComponents/scanningDialog.cpp

@@ -19,7 +19,10 @@ GuiScanningDialog::GuiScanningDialog(GuiContainer* owner, string id)
     setSize(GuiElement::GuiSizeMax, GuiElement::GuiSizeMax);
 
     box = new GuiPanel(this, id + "_BOX");
-    box->setSize(500, 545)->setPosition(0, 0, sp::Alignment::Center);
+    box
+        ->setSize(500.0f, 545.0f)
+        ->setPosition(0.0f, 0.0f, sp::Alignment::Center)
+        ->hide();
 
     signal_label = new GuiLabel(box, id + "_LABEL", tr("scanning", "Electric signature"), 30);
     signal_label->addBackground()->setPosition(0, 20, sp::Alignment::TopCenter)->setSize(450, 50);
@@ -111,6 +114,10 @@ void GuiScanningDialog::setupParameters()
 {
     auto [complexity, depth] = getScanComplexityDepth();
 
+    // Reset lock state when setting up new scan parameters
+    locked = false;
+    lock_start_time = 0.0f;
+
     for(int n=0; n<max_sliders; n++)
     {
         if (n < complexity)
@@ -120,12 +127,13 @@ void GuiScanningDialog::setupParameters()
     }
     box->setSize(500, 265 + 70 * complexity);
 
-    for(int n=0; n<max_sliders; n++)
+    for (int n = 0; n < max_sliders; n++)
     {
-        target[n] = random(0.0, 1.0);
-        sliders[n]->setValue(random(0.0, 1.0));
-        while(fabsf(target[n] - sliders[n]->getValue()) < 0.2f)
-            sliders[n]->setValue(random(0.0, 1.0));
+        target[n] = random(0.0f, 1.0f);
+        float slider_value = random(0.0f, 1.0f);
+        while(fabsf(target[n] - slider_value) < 0.2f)
+            slider_value = random(0.0f, 1.0f);
+        sliders[n]->setValue(slider_value);
     }
     updateSignal();
 
@@ -153,6 +161,7 @@ void GuiScanningDialog::updateSignal()
     float noise = 0.0;
     float period = 0.0;
     float phase = 0.0;
+    int visible_slider_count = 0;
 
     for(int n=0; n<max_sliders; n++)
     {
@@ -161,9 +170,11 @@ void GuiScanningDialog::updateSignal()
             noise += fabsf(target[n] - sliders[n]->getValue());
             period += fabsf(target[n] - sliders[n]->getValue());
             phase += fabsf(target[n] - sliders[n]->getValue());
+            visible_slider_count++;
         }
     }
-    if (noise < 0.05f && period < 0.05f && phase < 0.05f)
+    // Only check for lock if there are visible sliders (i.e., scan is active)
+    if (visible_slider_count > 0 && noise < 0.05f && period < 0.05f && phase < 0.05f)
     {
         if (!locked)
         {

src/screenComponents/signalQualityIndicator.cpp

@@ -13,9 +13,12 @@ GuiSignalQualityIndicator::GuiSignalQualityIndicator(GuiContainer* owner, string
 
 void GuiSignalQualityIndicator::onDraw(sp::RenderTarget& renderer)
 {
+    int point_count = rect.size.x / 4 - 1;
+    // Bail if there's not enough space to draw the signal.
+    if (point_count < 2) return;
+
     renderer.drawStretchedHV(rect, 25.0f, "gui/widget/PanelBackground.png");
 
-    int point_count = rect.size.x / 4 - 1;
     std::vector<glm::vec2> r;
     std::vector<glm::vec2> g;
     std::vector<glm::vec2> b;