Minor changes to calibration window

merge-requests/2/head
Elliott Liggett 2021-02-14 23:24:21 -08:00
rodzic de09bac4c4
commit 187b42cc34
3 zmienionych plików z 84 dodań i 58 usunięć

Wyświetl plik

@ -70,6 +70,7 @@ void calibrationWindow::on_calCourseSlider_valueChanged(int value)
ui->calCourseSpinbox->blockSignals(true);
ui->calCourseSpinbox->setValue((int) value);
ui->calCourseSpinbox->blockSignals(false);
emit setRefAdjustCourse((unsigned char) value);
}
@ -79,5 +80,50 @@ void calibrationWindow::on_calFineSlider_valueChanged(int value)
ui->calFineSpinbox->blockSignals(true);
ui->calFineSpinbox->setValue((int) value);
ui->calFineSpinbox->blockSignals(false);
emit setRefAdjustFine((unsigned char) value);
}
void calibrationWindow::on_calCourseSpinbox_valueChanged(int value)
{
// this one works with the up and down arrows,
// however, if typing in a value, say "128",
// this will get called three times with these values:
// 1
// 12
// 128
//int value = ui->calFineSpinbox->value();
ui->calCourseSlider->blockSignals(true);
ui->calCourseSlider->setValue(value);
ui->calCourseSlider->blockSignals(false);
emit setRefAdjustCourse((unsigned char) value);
}
void calibrationWindow::on_calFineSpinbox_valueChanged(int value)
{
//int value = ui->calFineSpinbox->value();
ui->calFineSlider->blockSignals(true);
ui->calFineSlider->setValue(value);
ui->calFineSlider->blockSignals(false);
emit setRefAdjustFine((unsigned char) value);
}
void calibrationWindow::on_calFineSpinbox_editingFinished()
{
}
void calibrationWindow::on_calCourseSpinbox_editingFinished()
{
// This function works well for typing in values
// but the up and down arrows on the spinbox will not
// trigger this function, until the enter key is pressed.
}

Wyświetl plik

@ -36,6 +36,14 @@ private slots:
void on_calFineSlider_valueChanged(int value);
void on_calCourseSpinbox_valueChanged(int arg1);
void on_calFineSpinbox_valueChanged(int arg1);
void on_calFineSpinbox_editingFinished();
void on_calCourseSpinbox_editingFinished();
private:
Ui::calibrationWindow *ui;
};

Wyświetl plik

@ -10,6 +10,24 @@
<height>300</height>
</rect>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>400</width>
<height>300</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>400</width>
<height>300</height>
</size>
</property>
<property name="windowTitle">
<string>Dialog</string>
</property>
@ -41,64 +59,6 @@
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_4">
<item>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QLabel" name="label_7">
<property name="text">
<string>Peak</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="calPeakFreqLabel">
<property name="text">
<string>446.000125</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<widget class="QLabel" name="label_6">
<property name="text">
<string>Tune</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="calTuneFreqLabel">
<property name="text">
<string>446.00000</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QVBoxLayout" name="verticalLayout_4">
<item>
<widget class="QLabel" name="label_5">
<property name="text">
<string>Delta</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="calDeltaFreqLabel">
<property name="text">
<string>-0.125</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_5">
<item>
@ -196,6 +156,9 @@
</property>
<item>
<widget class="QPushButton" name="calSaveSlotBtn">
<property name="enabled">
<bool>false</bool>
</property>
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Save the calibration data to the indicated slot in the preference file. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
@ -206,6 +169,9 @@
</item>
<item>
<widget class="QPushButton" name="calLoadSlotBtn">
<property name="enabled">
<bool>false</bool>
</property>
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Load the calibration data fromthe indicated slot in the preference file. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
@ -216,6 +182,9 @@
</item>
<item>
<widget class="QLabel" name="label_11">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Slot:</string>
</property>
@ -223,6 +192,9 @@
</item>
<item>
<widget class="QComboBox" name="comboBox">
<property name="enabled">
<bool>false</bool>
</property>
<item>
<property name="text">
<string>1</string>