w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-10-31 13:10:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

1. Better (and faster) logic for Tune button ON/OFF actions.

Browse Source 
2. Pink highlighting for empty MyCall and MyGrid fields on Setup screen.
3. Working on better diagnostics for users trying to set up CAT control.  

(More progress still needed, on rig control.)


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3219 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2013-04-25 17:30:20 +00:00
parent 971ea3a8b3
commit 1f2ed5d8d8
3 changed files with 35 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
devsetup.cpp
View File

@ -126,8 +126,17 @@ void DevSetup::initDlg()
p4.start("rigctl -l"); p4.start("rigctl -l");
p4.waitForFinished(1000); p4.waitForFinished(1000);
QPalette pal(ui.myCallEntry->palette());
if(m_myCall=="") {
pal.setColor(QPalette::Base,"#ffccff");
} else {
pal.setColor(QPalette::Base,Qt::white);
}
ui.myCallEntry->setPalette(pal);
ui.myGridEntry->setPalette(pal);
ui.myCallEntry->setText(m_myCall); ui.myCallEntry->setText(m_myCall);
ui.myGridEntry->setText(m_myGrid); ui.myGridEntry->setText(m_myGrid);
ui.idIntSpinBox->setValue(m_idInt); ui.idIntSpinBox->setValue(m_idInt);
ui.pttMethodComboBox->setCurrentIndex(m_pttMethodIndex); ui.pttMethodComboBox->setCurrentIndex(m_pttMethodIndex);
ui.pttComboBox->setCurrentIndex(m_pttPort); ui.pttComboBox->setCurrentIndex(m_pttPort);
@ -402,14 +411,19 @@ void DevSetup::on_testCATButton_clicked()
rig->setConf("rts_state","OFF"); rig->setConf("rts_state","OFF");
rig->setConf("dtr_state","OFF"); rig->setConf("dtr_state","OFF");
} }
// qDebug() << "B6";
rig->open(); rig->open();
rig->getVFO();
// qDebug() << "B7" << rig->getVFO();
m_bRigOpen=true; m_bRigOpen=true;
} }
catch (const RigException &Ex) { catch (const RigException &Ex) {
// qDebug() << "B8";
m_bRigOpen=false; m_bRigOpen=false;
msgBox("Failed to open rig (devsetup)"); msgBox("Failed to open rig (devsetup)");
return; return;
} }
// qDebug() << "B9";
double fMHz=rig->getFreq(RIG_VFO_CURR)/1000000.0; double fMHz=rig->getFreq(RIG_VFO_CURR)/1000000.0;
QString t; QString t;
t.sprintf("Rig control working.\nDial Frequency: %.6f",fMHz); t.sprintf("Rig control working.\nDial Frequency: %.6f",fMHz);

8
mainwindow.cpp
View File

@ -2589,10 +2589,8 @@ void MainWindow::on_actionTx2QSO_triggered(bool checked)
void MainWindow::on_tuneButton_clicked() void MainWindow::on_tuneButton_clicked()
{ {
if(m_tune) { if(m_tune) {
m_tune=false;
soundOutThread.setTune(m_tune);
nc1=1; //disable the countdown timer nc1=1; //disable the countdown timer
tuneButtonTimer->start(1000); tuneButtonTimer->start(250);
} else { } else {
m_tune=true; m_tune=true;
m_sent73=false; m_sent73=false;
@ -2605,7 +2603,8 @@ void MainWindow::on_tuneButton_clicked()
void MainWindow::on_stopTxButton_clicked() //Stop Tx void MainWindow::on_stopTxButton_clicked() //Stop Tx
{ {
if(m_tune) { if(m_tune) {
on_tuneButton_clicked(); m_tune=false;
soundOutThread.setTune(m_tune);
} }
if(m_auto) on_autoButton_clicked(); if(m_auto) on_autoButton_clicked();
btxok=false; btxok=false;
@ -2631,6 +2630,7 @@ void MainWindow::rigOpen()
rig->setConf("dtr_state","OFF"); rig->setConf("dtr_state","OFF");
} }
rig->open(); rig->open();
rig->getVFO();
m_bRigOpen=true; m_bRigOpen=true;
} }
catch (const RigException &Ex) { catch (const RigException &Ex) {

34
mainwindow.ui
View File

@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>730</width> <width>711</width>
<height>702</height> <height>475</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
@ -718,7 +718,7 @@ p, li { white-space: pre-wrap; }
<string/> <string/>
</property> </property>
<attribute name="buttonGroup"> <attribute name="buttonGroup">
<string notr="true">buttonGroup</string> <string>buttonGroup</string>
</attribute> </attribute>
</widget> </widget>
</item> </item>
@ -749,7 +749,7 @@ p, li { white-space: pre-wrap; }
<bool>true</bool> <bool>true</bool>
</property> </property>
<attribute name="buttonGroup"> <attribute name="buttonGroup">
<string notr="true">buttonGroup</string> <string>buttonGroup</string>
</attribute> </attribute>
</widget> </widget>
</item> </item>
@ -777,7 +777,7 @@ p, li { white-space: pre-wrap; }
<string/> <string/>
</property> </property>
<attribute name="buttonGroup"> <attribute name="buttonGroup">
<string notr="true">buttonGroup</string> <string>buttonGroup</string>
</attribute> </attribute>
</widget> </widget>
</item> </item>
@ -927,7 +927,7 @@ p, li { white-space: pre-wrap; }
<string/> <string/>
</property> </property>
<attribute name="buttonGroup"> <attribute name="buttonGroup">
<string notr="true">buttonGroup</string> <string>buttonGroup</string>
</attribute> </attribute>
</widget> </widget>
</item> </item>
@ -1060,7 +1060,7 @@ p, li { white-space: pre-wrap; }
<string/> <string/>
</property> </property>
<attribute name="buttonGroup"> <attribute name="buttonGroup">
<string notr="true">buttonGroup</string> <string>buttonGroup</string>
</attribute> </attribute>
</widget> </widget>
</item> </item>
@ -1088,7 +1088,7 @@ p, li { white-space: pre-wrap; }
<string/> <string/>
</property> </property>
<attribute name="buttonGroup"> <attribute name="buttonGroup">
<string notr="true">buttonGroup</string> <string>buttonGroup</string>
</attribute> </attribute>
</widget> </widget>
</item> </item>
@ -1324,7 +1324,7 @@ p, li { white-space: pre-wrap; }
</widget> </widget>
</item> </item>
<item row="1" column="1" rowspan="5"> <item row="1" column="1" rowspan="5">
<widget class="QwtThermo" name="xThermo"> <widget class="QwtThermo" name="xThermo" native="true">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed"> <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>
@ -1337,19 +1337,19 @@ p, li { white-space: pre-wrap; }
<height>180</height> <height>180</height>
</size> </size>
</property> </property>
<property name="borderWidth"> <property name="borderWidth" stdset="0">
<number>1</number> <number>1</number>
</property> </property>
<property name="maxValue"> <property name="maxValue" stdset="0">
<double>60.000000000000000</double> <double>60.000000000000000</double>
</property> </property>
<property name="minValue"> <property name="minValue" stdset="0">
<double>0.000000000000000</double> <double>0.000000000000000</double>
</property> </property>
<property name="pipeWidth"> <property name="pipeWidth" stdset="0">
<number>8</number> <number>8</number>
</property> </property>
<property name="value"> <property name="value" stdset="0">
<double>0.000000000000000</double> <double>0.000000000000000</double>
</property> </property>
</widget> </widget>
@ -1936,7 +1936,7 @@ p, li { white-space: pre-wrap; }
<widget class="QFrame" name="frame_4"> <widget class="QFrame" name="frame_4">
<property name="maximumSize"> <property name="maximumSize">
<size> <size>
<width>16777215</width> <width>72</width>
<height>16777215</height> <height>16777215</height>
</size> </size>
</property> </property>
@ -2094,8 +2094,8 @@ p, li { white-space: pre-wrap; }
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>730</width> <width>711</width>
<height>25</height> <height>21</height>
</rect> </rect>
</property> </property>
<widget class="QMenu" name="menuFile"> <widget class="QMenu" name="menuFile">