w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-11-23 20:58:55 -05:00
Code Issues Packages Projects Releases Wiki Activity

Add a "+ 2 kHz" checkbox under the Band selector.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3480 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2013-07-11 20:41:46 +00:00
parent ca54c58caa
commit e7d5347020
4 changed files with 86 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
WSJT-X_Users_Guide_v1.1.docx
View File

Binary file not shown.

10
mainwindow.cpp
View File

@ -446,6 +446,7 @@ void MainWindow::writeSettings()
settings.setValue("Fmin",m_fMin); settings.setValue("Fmin",m_fMin);
settings.setValue("TxSplit",m_bSplit); settings.setValue("TxSplit",m_bSplit);
settings.setValue("UseXIT",m_bXIT); settings.setValue("UseXIT",m_bXIT);
settings.setValue("Plus2kHz",m_plus2kHz);
settings.endGroup(); settings.endGroup();
} }
@ -593,6 +594,8 @@ void MainWindow::readSettings()
m_fMin=settings.value("fMin",2500).toInt(); m_fMin=settings.value("fMin",2500).toInt();
m_bSplit=settings.value("TxSplit",false).toBool(); m_bSplit=settings.value("TxSplit",false).toBool();
m_bXIT=settings.value("UseXit",false).toBool(); m_bXIT=settings.value("UseXit",false).toBool();
m_plus2kHz=settings.value("Plus2kHz",false).toBool();
ui->cbPlus2kHz->setChecked(m_plus2kHz);
settings.endGroup(); settings.endGroup();
if(!ui->actionLinrad->isChecked() && !ui->actionCuteSDR->isChecked() && if(!ui->actionLinrad->isChecked() && !ui->actionCuteSDR->isChecked() &&
@ -2699,6 +2702,7 @@ void MainWindow::on_bandComboBox_activated(int index)
m_band=index; m_band=index;
QString t=m_dFreq[index]; QString t=m_dFreq[index];
m_dialFreq=t.toDouble(); m_dialFreq=t.toDouble();
if(m_plus2kHz) m_dialFreq+=0.002;
dialFreqChanged2(m_dialFreq); dialFreqChanged2(m_dialFreq);
m_repeatMsg=0; m_repeatMsg=0;
m_secBandChanged=QDateTime::currentMSecsSinceEpoch()/1000; m_secBandChanged=QDateTime::currentMSecsSinceEpoch()/1000;
@ -3034,3 +3038,9 @@ void MainWindow::on_actionTx2QSO_triggered(bool checked)
{ {
m_tx2QSO=checked; m_tx2QSO=checked;
} }
void MainWindow::on_cbPlus2kHz_toggled(bool checked)
{
m_plus2kHz=checked;
on_bandComboBox_activated(m_band);
}

4
mainwindow.h
View File

@ -156,7 +156,8 @@ private slots:
void on_pbTxMode_clicked(); void on_pbTxMode_clicked();
void on_RxFreqSpinBox_valueChanged(int n); void on_RxFreqSpinBox_valueChanged(int n);
void on_cbTxLock_clicked(bool checked); void on_cbTxLock_clicked(bool checked);
void on_actionTx2QSO_triggered(bool checked); void on_actionTx2QSO_triggered(bool checked);
void on_cbPlus2kHz_toggled(bool checked);
private: private:
Ui::MainWindow *ui; Ui::MainWindow *ui;
@ -256,6 +257,7 @@ private:
bool m_CATerror; bool m_CATerror;
bool m_bSplit; bool m_bSplit;
bool m_bXIT; bool m_bXIT;
bool m_plus2kHz;
char m_decoded[80]; char m_decoded[80];

139
mainwindow.ui
View File

@ -642,7 +642,7 @@ p, li { white-space: pre-wrap; }
</property> </property>
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>0</width> <width>140</width>
<height>30</height> <height>30</height>
</size> </size>
</property> </property>
@ -1493,71 +1493,10 @@ p, li { white-space: pre-wrap; }
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="1" column="1" rowspan="6"> <item row="1" column="0" colspan="4">
<widget class="QProgressBar" name="xThermo"> <widget class="QCheckBox" name="cbPlus2kHz">
<property name="sizePolicy"> <property name="text">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed"> <string> +2 kHz</string>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>180</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>15</width>
<height>16777215</height>
</size>
</property>
<property name="maximum">
<number>60</number>
</property>
<property name="value">
<number>0</number>
</property>
<property name="textVisible">
<bool>false</bool>
</property>
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
</widget>
</item>
<item row="1" column="2" rowspan="6">
<widget class="QSlider" name="inGain">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>180</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>20</width>
<height>180</height>
</size>
</property>
<property name="toolTip">
<string>Digital gain for audio input</string>
</property>
<property name="minimum">
<number>-50</number>
</property>
<property name="maximum">
<number>50</number>
</property>
<property name="orientation">
<enum>Qt::Vertical</enum>
</property> </property>
</widget> </widget>
</item> </item>
@ -1761,6 +1700,74 @@ p, li { white-space: pre-wrap; }
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="1" rowspan="5">
<widget class="QProgressBar" name="xThermo">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>160</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>15</width>
<height>160</height>
</size>
</property>
<property name="maximum">
<number>60</number>
</property>
<property name="value">
<number>0</number>
</property>
<property name="textVisible">
<bool>false</bool>
</property>
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
</widget>
</item>
<item row="2" column="2" rowspan="5">
<widget class="QSlider" name="inGain">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>160</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>20</width>
<height>160</height>
</size>
</property>
<property name="toolTip">
<string>Digital gain for audio input</string>
</property>
<property name="minimum">
<number>-50</number>
</property>
<property name="maximum">
<number>50</number>
</property>
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
</widget>
</item>
<item row="2" column="4"> <item row="2" column="4">
<widget class="QLineEdit" name="dxCallEntry"> <widget class="QLineEdit" name="dxCallEntry">
<property name="sizePolicy"> <property name="sizePolicy">