From 187b42cc349984cfb030543ae56a017360f5a918 Mon Sep 17 00:00:00 2001 From: Elliott Liggett Date: Sun, 14 Feb 2021 23:24:21 -0800 Subject: [PATCH] Minor changes to calibration window --- calibrationwindow.cpp | 46 ++++++++++++++++++++++ calibrationwindow.h | 8 ++++ calibrationwindow.ui | 88 +++++++++++++++---------------------------- 3 files changed, 84 insertions(+), 58 deletions(-) diff --git a/calibrationwindow.cpp b/calibrationwindow.cpp index 020ed92..21a9780 100644 --- a/calibrationwindow.cpp +++ b/calibrationwindow.cpp @@ -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. + +} diff --git a/calibrationwindow.h b/calibrationwindow.h index 42e2e5c..093898b 100644 --- a/calibrationwindow.h +++ b/calibrationwindow.h @@ -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; }; diff --git a/calibrationwindow.ui b/calibrationwindow.ui index 1bd7d90..ebecef0 100644 --- a/calibrationwindow.ui +++ b/calibrationwindow.ui @@ -10,6 +10,24 @@ 300 + + + 0 + 0 + + + + + 400 + 300 + + + + + 400 + 300 + + Dialog @@ -41,64 +59,6 @@ - - - - - - - - Peak - - - - - - - 446.000125 - - - - - - - - - - - Tune - - - - - - - 446.00000 - - - - - - - - - - - Delta - - - - - - - -0.125 - - - - - - - @@ -196,6 +156,9 @@ + + false + <html><head/><body><p>Save the calibration data to the indicated slot in the preference file. </p></body></html> @@ -206,6 +169,9 @@ + + false + <html><head/><body><p>Load the calibration data fromthe indicated slot in the preference file. </p></body></html> @@ -216,6 +182,9 @@ + + false + Slot: @@ -223,6 +192,9 @@ + + false + 1