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

1. Set the default startup frequencies to reasonable ones for JT65.

Browse Source 
(JT9 will typically be about 2 kHz higher.)
2. Add a few default Tx macros, as examples.
3. Fix display of correct UTC on decoded lines, when "Shift+D" is used to 
   do another wideband decode during the next Rx sequence.
4. Clear the "Split Tx" checkbox when CAT is not enabled (but remember
   what its state should be, if CAT is re-enabled).


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3468 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2013-07-09 15:44:33 +00:00
parent 08d813c92f
commit dc948031dd
3 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
devsetup.cpp
View File

@ -151,7 +151,7 @@ void DevSetup::initDlg()
ui.comboBoxSndOut->setCurrentIndex(m_nDevOut); ui.comboBoxSndOut->setCurrentIndex(m_nDevOut);
ui.cbID73->setChecked(m_After73); ui.cbID73->setChecked(m_After73);
ui.cbPSKReporter->setChecked(m_pskReporter); ui.cbPSKReporter->setChecked(m_pskReporter);
ui.cbSplit->setChecked(m_bSplit); ui.cbSplit->setChecked(m_bSplit and m_catEnabled);
ui.cbXIT->setChecked(m_bXIT); ui.cbXIT->setChecked(m_bXIT);
ui.cbXIT->setVisible(false); ui.cbXIT->setVisible(false);
@ -381,9 +381,7 @@ void DevSetup::on_cbEnableCAT_toggled(bool b)
{ {
m_catEnabled=b; m_catEnabled=b;
enableWidgets(); enableWidgets();
// bool b2=m_pttMethodIndex==0 and m_catEnabled; ui.cbSplit->setChecked(m_bSplit and m_catEnabled);
// b2=b2 or ((m_pttMethodIndex==1 or m_pttMethodIndex==2) and m_pttPort!=0);
// ui.testPTTButton->setEnabled(b2);
} }
void DevSetup::on_serialRateComboBox_activated(int index) void DevSetup::on_serialRateComboBox_activated(int index)

8
devsetup.ui
View File

@ -1366,7 +1366,7 @@
</size> </size>
</property> </property>
<property name="text"> <property name="text">
<string>5W DPL 73 GL</string> <string/>
</property> </property>
</widget> </widget>
</item> </item>
@ -1416,7 +1416,7 @@
</size> </size>
</property> </property>
<property name="text"> <property name="text">
<string>20W DPL 73 GL</string> <string>10W DPL 73 GL</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -1638,7 +1638,7 @@
</size> </size>
</property> </property>
<property name="text"> <property name="text">
<string>TNX 73 GL</string> <string/>
</property> </property>
</widget> </widget>
</item> </item>
@ -1663,7 +1663,7 @@
</size> </size>
</property> </property>
<property name="text"> <property name="text">
<string>10W DPL 73 GL</string> <string>5W DPL 73 GL</string>
</property> </property>
</widget> </widget>
</item> </item>

9
mainwindow.cpp
View File

@ -26,8 +26,8 @@ wchar_t buffer[256];
bool btxok; //True if OK to transmit bool btxok; //True if OK to transmit
bool btxMute; bool btxMute;
double outputLatency; //Latency in seconds double outputLatency; //Latency in seconds
double dFreq[]={0.136,0.4742,1.838,3.578,5.357,7.078,10.130,14.078, double dFreq[]={0.13613,0.4742,1.838,3.576,5.357,7.036,10.136,14.076,
18.104,21.078,24.918,28.078,50.293,70.091,144.489,432.178}; 18.102,21.076,24.917,28.076,50.293,70.091,144.489,432.178};
WideGraph* g_pWideGraph = NULL; WideGraph* g_pWideGraph = NULL;
LogQSO* logDlg = NULL; LogQSO* logDlg = NULL;
@ -534,7 +534,7 @@ void MainWindow::readSettings()
ui->actionMonitor_OFF_at_startup->setChecked(m_monitorStartOFF); ui->actionMonitor_OFF_at_startup->setChecked(m_monitorStartOFF);
m_pskReporter=settings.value("PSKReporter",false).toBool(); m_pskReporter=settings.value("PSKReporter",false).toBool();
m_After73=settings.value("After73",false).toBool(); m_After73=settings.value("After73",false).toBool();
m_macro=settings.value("Macros","").toStringList(); m_macro=settings.value("Macros","TNX 73 GL").toStringList();
m_dFreq=settings.value("DefaultFreqs","").toStringList(); m_dFreq=settings.value("DefaultFreqs","").toStringList();
m_toRTTY=settings.value("toRTTY",false).toBool(); m_toRTTY=settings.value("toRTTY",false).toBool();
ui->actionConvert_JT9_x_to_RTTY->setChecked(m_toRTTY); ui->actionConvert_JT9_x_to_RTTY->setChecked(m_toRTTY);
@ -1292,7 +1292,8 @@ void MainWindow::decode() //decode()
{ {
if(!m_dataAvailable) return; if(!m_dataAvailable) return;
ui->DecodeButton->setStyleSheet(m_pbdecoding_style1); ui->DecodeButton->setStyleSheet(m_pbdecoding_style1);
if(jt9com_.nagain==0 && (!m_diskData)) { // if(jt9com_.nagain==0 && (!m_diskData)) {
if(jt9com_.newdat==0 && (!m_diskData)) {
qint64 ms = QDateTime::currentMSecsSinceEpoch() % 86400000; qint64 ms = QDateTime::currentMSecsSinceEpoch() % 86400000;
int imin=ms/60000; int imin=ms/60000;
int ihr=imin/60; int ihr=imin/60;