Add "Prompt to log QSO" option on Setup menu.

Reduce code speed for CW ID to 22.5 WPM.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3110 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2013-03-26 16:23:40 +00:00
parent 86dc7f0efc
commit da83aab7e4
4 changed files with 29 additions and 5 deletions

View File

@ -151,6 +151,7 @@ MainWindow::MainWindow(QWidget *parent) :
m_iptt=0;
m_COMportOpen=0;
m_secID=0;
m_promptToLog=false;
decodeBusy(false);
ui->xThermo->setFillBrush(Qt::green);
@ -359,6 +360,7 @@ void MainWindow::writeSettings()
settings.setValue("Handshake",m_handshake);
settings.setValue("HandshakeIndex",m_handshakeIndex);
settings.setValue("BandIndex",m_band);
settings.setValue("PromptToLog",m_promptToLog);
settings.endGroup();
}
@ -450,6 +452,8 @@ void MainWindow::readSettings()
m_handshakeIndex=settings.value("HandshakeIndex",0).toInt();
m_band=settings.value("BandIndex",7).toInt();
ui->bandComboBox->setCurrentIndex(m_band);
m_promptToLog=settings.value("PromptToLog",false).toBool();
ui->actionPrompt_to_log_QSO->setChecked(m_promptToLog);
settings.endGroup();
@ -1264,7 +1268,7 @@ void MainWindow::guiUpdate()
int khsym=0;
double tx1=0.0;
double tx2=1.0 + 85.0*m_nsps/12000.0 + icw[0]*2048.0/48000.0;
double tx2=1.0 + 85.0*m_nsps/12000.0 + icw[0]*2560.0/48000.0;
if(!m_txFirst) {
tx1 += m_TRperiod;
@ -1345,7 +1349,10 @@ void MainWindow::guiUpdate()
}
QStringList w=t.split(" ",QString::SkipEmptyParts);
icw[0]=0;
if(m_After73 and (w[2]=="73" or itext!=0)) icw[0]=m_ncw;
if(m_After73 and (w[2]=="73" or itext!=0)) {
icw[0]=m_ncw;
if(m_promptToLog) on_logQSOButton_clicked();
}
if(m_idInt>0) {
int nmin=(m_sec0-m_secID)/60;
@ -2218,3 +2225,8 @@ void MainWindow::on_bandComboBox_currentIndexChanged(int index)
p3.waitForFinished();
}
}
void MainWindow::on_actionPrompt_to_log_QSO_triggered(bool checked)
{
m_promptToLog=checked;
}

View File

@ -131,6 +131,8 @@ private slots:
void on_bandComboBox_currentIndexChanged(int index);
void on_actionPrompt_to_log_QSO_triggered(bool checked);
private:
Ui::MainWindow *ui;
@ -207,6 +209,7 @@ private:
bool m_dBtoComments;
bool m_catEnabled;
bool m_After73;
bool m_promptToLog;
char m_decoded[80];

View File

@ -1671,6 +1671,7 @@ p, li { white-space: pre-wrap; }
<addaction name="actionLog_JT9_without_submode"/>
<addaction name="actionConvert_JT9_x_to_RTTY"/>
<addaction name="actionLog_dB_reports_to_Comments"/>
<addaction name="actionPrompt_to_log_QSO"/>
</widget>
<widget class="QMenu" name="menuView">
<property name="title">
@ -1861,7 +1862,7 @@ p, li { white-space: pre-wrap; }
<bool>false</bool>
</property>
<property name="text">
<string>Quick</string>
<string>Fast</string>
</property>
</action>
<action name="actionNone">
@ -2149,6 +2150,14 @@ p, li { white-space: pre-wrap; }
<string>Log dB reports to Comments</string>
</property>
</action>
<action name="actionPrompt_to_log_QSO">
<property name="checkable">
<bool>true</bool>
</property>
<property name="text">
<string>Prompt to log QSO</string>
</property>
</action>
</widget>
<layoutdefault spacing="6" margin="11"/>
<customwidgets>

View File

@ -67,8 +67,8 @@ extern "C" int d2aCallback(const void *inputBuffer, void *outputBuffer,
dphi=twopi*freq/48000.0;
// float wpm=20.0;
// int nspd=1.2*48000.0/wpm;
// nspd=3072; //18.75 wpm
nspd=2048; //28.125 wpm
// nspd=3072; //18.75 WPM
nspd=2048 + 512; //22.5 WPM
int ic0=85*4*udata->nsps;
for(int i=0 ; i<framesToProcess; i++ ) {
phi += dphi;