w4kek
/
WSJT-X
mirror of https://github.com/saitohirga/WSJT-X.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Corrected a startup problem: m_band was used before being defined. 

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3213 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2013-04-25 14:41:06 +00:00
parent 5c8a1f25ae
commit ce8c3263a1
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mainwindow.cpp
View File

@ -17,7 +17,6 @@ static int nc1=1;
wchar_t buffer[256];
bool btxok; //True if OK to transmit
bool btxMute;
bool bDTRoff;
double outputLatency; //Latency in seconds
double dFreq[]={0.136,0.4742,1.838,3.578,5.357,7.078,10.130,14.078,
18.104,21.078,24.918,28.078,50.293,70.091,144.489,432.178};
@ -401,7 +400,7 @@ void MainWindow::writeSettings()
settings.setValue("Runaway",m_runaway);
settings.setValue("Tx2QSO",m_tx2QSO);
settings.setValue("MultipleOK",m_bMultipleOK);
settings.setValue("DTRoff",bDTRoff);
settings.setValue("DTRoff",m_bDTRoff);
settings.endGroup();
}
@ -453,7 +452,6 @@ void MainWindow::readSettings()
m_NBslider=settings.value("NBslider",40).toInt();
ui->NBslider->setValue(m_NBslider);
m_dialFreq=settings.value("DialFreq",14.078).toDouble();
dialFreqChanged2(m_dialFreq);
m_txFreq=settings.value("TxFreq",1500).toInt();
ui->TxFreqSpinBox->setValue(m_txFreq);
soundOutThread.setTxFreq(m_txFreq);
@ -492,6 +490,7 @@ void MainWindow::readSettings()
m_handshakeIndex=settings.value("HandshakeIndex",0).toInt();
m_band=settings.value("BandIndex",7).toInt();
ui->bandComboBox->setCurrentIndex(m_band);
dialFreqChanged2(m_dialFreq);
m_promptToLog=settings.value("PromptToLog",false).toBool();
ui->actionPrompt_to_log_QSO->setChecked(m_promptToLog);
m_insertBlank=settings.value("InsertBlank",false).toBool();
@ -514,7 +513,7 @@ void MainWindow::readSettings()
ui->actionTx2QSO->setChecked(m_tx2QSO);
m_bMultipleOK=settings.value("MultipleOK",false).toBool();
ui->actionAllow_multiple_instances->setChecked(m_bMultipleOK);
bDTRoff=settings.value("DTRoff",false).toBool();
m_bDTRoff=settings.value("DTRoff",false).toBool();
if(!ui->actionLinrad->isChecked() && !ui->actionCuteSDR->isChecked() &&
!ui->actionAFMHot->isChecked() && !ui->actionBlue->isChecked()) {
@ -622,7 +621,7 @@ void MainWindow::on_actionDeviceSetup_triggered() //Setup Dialog
dlg.m_stopBitsIndex=m_stopBitsIndex;
dlg.m_handshake=m_handshake;
dlg.m_handshakeIndex=m_handshakeIndex;
dlg.m_bDTRoff=bDTRoff;
dlg.m_bDTRoff=m_bDTRoff;
if(m_bRigOpen) {
rig->close();
@ -658,7 +657,7 @@ void MainWindow::on_actionDeviceSetup_triggered() //Setup Dialog
m_stopBitsIndex=dlg.m_stopBitsIndex;
m_handshake=dlg.m_handshake;
m_handshakeIndex=dlg.m_handshakeIndex;
bDTRoff=dlg.m_bDTRoff;
m_bDTRoff=dlg.m_bDTRoff;
#ifdef WIN32
if(dlg.m_pskReporter!=m_pskReporter) {
@ -841,6 +840,7 @@ void MainWindow::bumpFqso(int n) //bumpFqso()
void MainWindow::dialFreqChanged2(double f)
{
if(m_band<0 or m_band>15) return;
m_dialFreq=f;
QString t;
t.sprintf("%.6f",m_dialFreq);
@ -2626,7 +2626,7 @@ void MainWindow::rigOpen()
sprintf(buf,"%d",m_stopBits);
rig->setConf("stop_bits",buf);
rig->setConf("serial_handshake",m_handshake.toAscii().data());
if(bDTRoff) {
if(m_bDTRoff) {
rig->setConf("rts_state","OFF");
rig->setConf("dtr_state","OFF");
}

2
mainwindow.h
View File

@ -255,7 +255,7 @@ private:
bool m_tune;
bool m_bRigOpen;
bool m_bMultipleOK;
// bool junk999;
bool m_bDTRoff;
char m_decoded[80];