Adjust name and reference from remote control

BatchDrake · Jun 7, 2023 · b3305dc · b3305dc
1 parent f09f107
commit b3305dc
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 6 deletions.
diff --git a/DriftTool.cpp b/DriftTool.cpp
@@ -143,6 +143,9 @@ DriftTool::DriftTool(
           "Drift Tool: current acceleration [m/s^2]",
           0.);
 
+    m_propName->setAdjustable(true);
+    m_propRef->setAdjustable(true);
+
     g_propsCreated = true;
   }
 
@@ -278,14 +281,25 @@ DriftTool::connectAll()
         ui->programPathEdit,
         SIGNAL(textEdited(QString)),
         this,
-        SLOT(onNameChanged()));
+        SLOT(onConfigChanged()));
 
   connect(
         ui->programArgumentsEdit,
         SIGNAL(textEdited(QString)),
         this,
-        SLOT(onNameChanged()));
+        SLOT(onConfigChanged()));
 
+  connect(
+        m_propName,
+        SIGNAL(changed()),
+        this,
+        SLOT(onPropNameChanged()));
+
+  connect(
+        m_propRef,
+        SIGNAL(changed()),
+        this,
+        SLOT(onPropRefChanged()));
 }
 
 void
@@ -495,8 +509,8 @@ DriftTool::applyConfig()
   m_processor->setThreshold(m_panelConfig->lockThres);
 
   // Apply global properties
-  m_propName->setValue(QString::fromStdString(m_panelConfig->probeName));
-  m_propRef->setValue(m_panelConfig->reference);
+  m_propName->setValueSilent(QString::fromStdString(m_panelConfig->probeName));
+  m_propRef->setValueSilent(m_panelConfig->reference);
 
   refreshUi();
 }
@@ -1055,8 +1069,8 @@ DriftTool::onConfigChanged()
       : "strf";
 
   // Properties
-  m_propName->setValue(QString::fromStdString(m_panelConfig->probeName));
-  m_propRef->setValue(m_panelConfig->reference);
+  m_propName->setValueSilent(QString::fromStdString(m_panelConfig->probeName));
+  m_propRef->setValueSilent(m_panelConfig->reference);
 
   refreshUi();
 }
@@ -1110,3 +1124,19 @@ DriftTool::onProcessFinished(int code, QProcess::ExitStatus status)
   else if (code != 0)
     SU_ERROR("Lock notifier program finished with error status %d\n", code);
 }
+
+void
+DriftTool::onPropNameChanged()
+{
+  m_panelConfig->probeName = m_propName->value<QString>().toStdString();
+  BLOCKSIG(ui->nameEdit, setText(QString::fromStdString(m_panelConfig->probeName)));
+  refreshNamedChannel();
+}
+
+void
+DriftTool::onPropRefChanged()
+{
+  m_panelConfig->reference = m_propRef->value<double>();
+  BLOCKSIG(ui->refFreqSpin, setValue(m_panelConfig->reference));
+}
+
diff --git a/DriftTool.h b/DriftTool.h
@@ -152,6 +152,9 @@ namespace SigDigger {
     void onProcessError(QProcess::ProcessError error);
     void onProcessFinished(int code, QProcess::ExitStatus status);
 
+    void onPropNameChanged();
+    void onPropRefChanged();
+
   private:
     Ui::DriftTool *ui;
   };