kopia lustrzana https://gitlab.com/eliggett/wfview
Fixed reference issue where the slider and spinbox didn't track
correctly. Re-arranged buttons for this dialog.merge-requests/2/head
Elliott Liggett
rodzic
fdaadc0d2a
commit
1f133344ba
|
|
@ -67,10 +67,17 @@ void calibrationWindow::on_calReadRigCalBtn_clicked()
|
|||
|
||||
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);
|
||||
|
||||
}
|
||||
|
||||
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);
|
||||
}
|
||||
|
|
|
|||
42
wfmain.cpp
42
wfmain.cpp
|
|
@ -1038,7 +1038,8 @@ void wfmain::shortcutControlT()
|
|||
void wfmain::shortcutControlR()
|
||||
{
|
||||
// Receive
|
||||
ui->pttOffBtn->click();
|
||||
emit setPTT(false);
|
||||
issueDelayedCommand(cmdGetPTT);
|
||||
}
|
||||
|
||||
void wfmain::shortcutControlI()
|
||||
|
|
@ -2482,22 +2483,6 @@ void wfmain::on_dataModeBtn_toggled(bool checked)
|
|||
setDataMode(checked);
|
||||
}
|
||||
|
||||
// --- DEBUG FUNCTION ---
|
||||
void wfmain::on_debugBtn_clicked()
|
||||
{
|
||||
qDebug() << "Debug button pressed.";
|
||||
|
||||
// TODO: Why don't these commands work?!
|
||||
//emit getScopeMode();
|
||||
//emit getScopeEdge(); // 1,2,3 only in "fixed" mode
|
||||
//emit getScopeSpan(); // in khz, only in "center" mode
|
||||
//qDebug() << "Debug: finding rigs attached. Let's see if this works. ";
|
||||
//rig->findRigs();
|
||||
// cal->show();
|
||||
//emit getMode();
|
||||
sat->show();
|
||||
}
|
||||
|
||||
void wfmain::on_transmitBtn_clicked()
|
||||
{
|
||||
if(!amTransmitting)
|
||||
|
|
@ -2524,3 +2509,26 @@ void wfmain::on_transmitBtn_clicked()
|
|||
issueDelayedCommand(cmdGetPTT);
|
||||
}
|
||||
}
|
||||
|
||||
void wfmain::on_adjRefBtn_clicked()
|
||||
{
|
||||
cal->show();
|
||||
}
|
||||
|
||||
void wfmain::on_satOpsBtn_clicked()
|
||||
{
|
||||
sat->show();
|
||||
}
|
||||
|
||||
// --- DEBUG FUNCTION ---
|
||||
void wfmain::on_debugBtn_clicked()
|
||||
{
|
||||
qDebug() << "Debug button pressed.";
|
||||
|
||||
// TODO: Why don't these commands work?!
|
||||
//emit getScopeMode();
|
||||
//emit getScopeEdge(); // 1,2,3 only in "fixed" mode
|
||||
//emit getScopeSpan(); // in khz, only in "center" mode
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
4
wfmain.h
4
wfmain.h
|
|
@ -292,6 +292,10 @@ private slots:
|
|||
|
||||
void on_transmitBtn_clicked();
|
||||
|
||||
void on_adjRefBtn_clicked();
|
||||
|
||||
void on_satOpsBtn_clicked();
|
||||
|
||||
private:
|
||||
Ui::wfmain *ui;
|
||||
QSettings settings;
|
||||
|
|
|
|||
201
wfmain.ui
201
wfmain.ui
|
|
@ -18,7 +18,7 @@
|
|||
<item>
|
||||
<widget class="QTabWidget" name="tabWidget">
|
||||
<property name="currentIndex">
|
||||
<number>0</number>
|
||||
<number>3</number>
|
||||
</property>
|
||||
<widget class="QWidget" name="mainTab">
|
||||
<attribute name="title">
|
||||
|
|
@ -188,17 +188,28 @@
|
|||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QProgressBar" name="levelIndicator">
|
||||
<property name="maximum">
|
||||
<number>255</number>
|
||||
</property>
|
||||
<property name="value">
|
||||
<number>100</number>
|
||||
</property>
|
||||
<property name="textVisible">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
</widget>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_21">
|
||||
<item>
|
||||
<widget class="QLabel" name="label_26">
|
||||
<property name="text">
|
||||
<string>Signal</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QProgressBar" name="levelIndicator">
|
||||
<property name="maximum">
|
||||
<number>255</number>
|
||||
</property>
|
||||
<property name="value">
|
||||
<number>100</number>
|
||||
</property>
|
||||
<property name="textVisible">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
|
|
@ -1333,16 +1344,12 @@
|
|||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QCheckBox" name="fullScreenChk">
|
||||
<widget class="QCheckBox" name="tuningFloorZerosChk">
|
||||
<property name="text">
|
||||
<string>Show full screen</string>
|
||||
<string>When tuning, set lower digits to zero</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QCheckBox" name="useDarkThemeChk">
|
||||
<property name="text">
|
||||
<string>Use Dark Theme</string>
|
||||
<property name="checked">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
|
|
@ -1367,19 +1374,23 @@
|
|||
<number>0</number>
|
||||
</property>
|
||||
<item>
|
||||
<widget class="QCheckBox" name="tuningFloorZerosChk">
|
||||
<widget class="QCheckBox" name="checkBox_2">
|
||||
<property name="text">
|
||||
<string>When tuning, set lower digits to zero</string>
|
||||
</property>
|
||||
<property name="checked">
|
||||
<bool>true</bool>
|
||||
<string>Use System Theme</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QCheckBox" name="pttEnableChk">
|
||||
<widget class="QCheckBox" name="useDarkThemeChk">
|
||||
<property name="text">
|
||||
<string>Enable PTT Controls</string>
|
||||
<string>Waterfall Dark Theme</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QCheckBox" name="fullScreenChk">
|
||||
<property name="text">
|
||||
<string>Show full screen</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
|
|
@ -1398,6 +1409,64 @@
|
|||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_22">
|
||||
<property name="topMargin">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<item>
|
||||
<widget class="QPushButton" name="adjRefBtn">
|
||||
<property name="text">
|
||||
<string>Adjust Reference</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QPushButton" name="satOpsBtn">
|
||||
<property name="text">
|
||||
<string>Satellite Ops</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QLabel" name="label_27">
|
||||
<property name="text">
|
||||
<string>Modulation Input:</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QComboBox" name="modInputCombo"/>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QCheckBox" name="tuneEnableChk">
|
||||
<property name="text">
|
||||
<string>Enable ATU</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QPushButton" name="tuneNowBtn">
|
||||
<property name="text">
|
||||
<string>Tune Now</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<spacer name="horizontalSpacer_9">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>40</width>
|
||||
<height>20</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_15">
|
||||
<property name="topMargin">
|
||||
|
|
@ -1421,30 +1490,9 @@
|
|||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QPushButton" name="aboutBtn">
|
||||
<widget class="QCheckBox" name="pttEnableChk">
|
||||
<property name="text">
|
||||
<string>About</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QPushButton" name="saveSettingsBtn">
|
||||
<property name="text">
|
||||
<string>Save Settings</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QPushButton" name="connectBtn">
|
||||
<property name="text">
|
||||
<string>Connect</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QPushButton" name="debugBtn">
|
||||
<property name="text">
|
||||
<string>Debug</string>
|
||||
<string>Enable PTT Controls</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
|
|
@ -1469,19 +1517,22 @@
|
|||
<number>0</number>
|
||||
</property>
|
||||
<item>
|
||||
<widget class="QCheckBox" name="tuneEnableChk">
|
||||
<widget class="QCheckBox" name="checkBox">
|
||||
<property name="text">
|
||||
<string>Enable ATU</string>
|
||||
<string>Enable USB (serial)</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QPushButton" name="tuneNowBtn">
|
||||
<widget class="QLabel" name="label_28">
|
||||
<property name="text">
|
||||
<string>Tune Now</string>
|
||||
<string>Serial Device:</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QComboBox" name="serialDeviceListCombo"/>
|
||||
</item>
|
||||
<item>
|
||||
<spacer name="tuneSpacer">
|
||||
<property name="orientation">
|
||||
|
|
@ -1506,6 +1557,20 @@
|
|||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QPushButton" name="connectBtn">
|
||||
<property name="text">
|
||||
<string>Connect</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QPushButton" name="udpServerSetupBtn">
|
||||
<property name="text">
|
||||
<string>Server Setup</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<spacer name="horizontalSpacer_8">
|
||||
<property name="orientation">
|
||||
|
|
@ -1519,13 +1584,6 @@
|
|||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QPushButton" name="udpServerSetupBtn">
|
||||
<property name="text">
|
||||
<string>Server Setup</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
|
|
@ -1729,6 +1787,13 @@
|
|||
<property name="topMargin">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<item>
|
||||
<widget class="QPushButton" name="debugBtn">
|
||||
<property name="text">
|
||||
<string>Debug</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<spacer name="horizontalSpacer_6">
|
||||
<property name="orientation">
|
||||
|
|
@ -1742,6 +1807,20 @@
|
|||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QPushButton" name="aboutBtn">
|
||||
<property name="text">
|
||||
<string>About</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QPushButton" name="saveSettingsBtn">
|
||||
<property name="text">
|
||||
<string>Save Settings</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QPushButton" name="exitBtn">
|
||||
<property name="font">
|
||||
|
|
|
|||
Ładowanie…
Reference in New Issue