m2k/trigger_settings: fix switched trigger mode logic in the Osc.

During style changes, the trigger mode determination process was switched and it no longer worked properly. An enabled CustomSwitch corresponds to the "Auto" trigger mode, not otherwise. Signed-off-by: AlexandraTrifan <[email protected]>
analogdevicesinc · Jan 20, 2025 · 53228fa · 53228fa
1 parent 4a5cf41
commit 53228fa
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/plugins/m2k/src/old/trigger_settings.cpp b/plugins/m2k/src/old/trigger_settings.cpp
@@ -116,7 +116,7 @@ TriggerSettings::TriggerSettings(M2kAnalogIn *libm2k_adc, QWidget *parent)
 	connect(trigger_level, SIGNAL(valueChanged(double)), SLOT(onSpinboxTriggerLevelChanged(double)));
 	connect(trigger_hysteresis, SIGNAL(valueChanged(double)), SLOT(onSpinboxTriggerHystChanged(double)));
 
-	connect(ui->btnTrigger, SIGNAL(clicked()), this, SLOT(autoTriggerEnable()));
+	connect(ui->btnTrigger, &CustomSwitch::toggled, [=](bool toggled) { autoTriggerEnable(); });
 
 	// Default GUI settings
 	ui->cmb_source->setCurrentIndex(0);
@@ -416,15 +416,15 @@ void TriggerSettings::on_cmb_analog_extern_currentIndexChanged(int index)
 
 void TriggerSettings::autoTriggerDisable()
 {
-	if(!ui->btnTrigger->isChecked()) {
+	if(ui->btnTrigger->isChecked()) {
 		writeHwMode(libm2k::ALWAYS);
 		temporarily_disabled = true;
 	}
 }
 
 void TriggerSettings::autoTriggerEnable()
 {
-	if(!ui->btnTrigger->isChecked()) {
+	if(ui->btnTrigger->isChecked()) {
 		if(temporarily_disabled) {
 			writeHwMode(determineTriggerMode(ui->intern_en->isChecked(), ui->extern_en->isChecked()));
 
@@ -440,14 +440,14 @@ bool TriggerSettings::triggerIsArmed() const { return ui->intern_en->isChecked()
 void TriggerSettings::on_btnTrigger_toggled(bool checked)
 {
 	trigger_auto_mode = checked;
-	int mode = checked ? NORMAL : AUTO;
+	int mode = checked ? AUTO : NORMAL;
 
 	Q_EMIT triggerModeChanged(mode);
 }
 
 TriggerSettings::TriggerMode TriggerSettings::triggerMode() const
 {
-	return ui->btnTrigger->isChecked() ? NORMAL : AUTO;
+	return ui->btnTrigger->isChecked() ? AUTO : NORMAL;
 }
 
 void TriggerSettings::updateHwVoltLevels(int chnIdx)