More complete definition of CPU usage for MSK144 RT decoding. Speed is back

to that of r7139.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7143 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2016-10-03 13:48:30 +00:00
parent d899d844a6
commit 2068d358c4
2 changed files with 9 additions and 10 deletions

View File

@ -1279,23 +1279,20 @@ void MainWindow::fastSink(qint64 frames)
bmsk144=bmsk144 && m_config.realTimeDecode(); bmsk144=bmsk144 && m_config.realTimeDecode();
line[0]=0; line[0]=0;
//###
m_RxFreq=ui->RxFreqSpinBox->value (); m_RxFreq=ui->RxFreqSpinBox->value ();
int nTRpDepth=m_TRperiod + 1000*(m_ndepth & 3); int nTRpDepth=m_TRperiod + 1000*(m_ndepth & 3);
qint64 ms0 = QDateTime::currentMSecsSinceEpoch(); qint64 ms0 = QDateTime::currentMSecsSinceEpoch();
hspec_(dec_data.d2,&k,&nutc0,&nTRpDepth,&m_RxFreq,&m_Ftol,&bmsk144,&m_inGain, hspec_(dec_data.d2,&k,&nutc0,&nTRpDepth,&m_RxFreq,&m_Ftol,&bmsk144,&m_inGain,
fast_green,fast_s,&fast_jh, &line[0],80); fast_green,fast_s,&fast_jh, &line[0],80);
float tsec=0.001*(QDateTime::currentMSecsSinceEpoch() - ms0);
m_fCPUmskrtd=0.9*m_fCPUmskrtd + 0.1*tsec;
float px = fast_green[fast_jh]; float px = fast_green[fast_jh];
QString t; QString t;
t.sprintf(" Rx noise: %5.1f ",px); t.sprintf(" Rx noise: %5.1f ",px);
ui->signal_meter_widget->setValue(px); // Update thermometer ui->signal_meter_widget->setValue(px); // Update thermometer
m_fastGraph->plotSpec(m_diskData,m_UTCdisk); m_fastGraph->plotSpec(m_diskData,m_UTCdisk);
if(bmsk144 and (line[0]!=0)) {
DecodedText decodedtext; DecodedText decodedtext;
QString message; QString message;
if(bmsk144 and (line[0]!=0)) {
message=QString::fromLatin1(line); message=QString::fromLatin1(line);
decodedtext=message.replace("\n",""); decodedtext=message.replace("\n","");
ui->decodedTextBrowser->displayDecodedText (decodedtext,m_baseCall,m_config.DXCC(), ui->decodedTextBrowser->displayDecodedText (decodedtext,m_baseCall,m_config.DXCC(),
@ -1365,6 +1362,8 @@ void MainWindow::fastSink(qint64 frames)
} }
m_bFastDone=false; m_bFastDone=false;
} }
float tsec=0.001*(QDateTime::currentMSecsSinceEpoch() - ms0);
m_fCPUmskrtd=0.9*m_fCPUmskrtd + 0.1*tsec;
} }
void MainWindow::showSoundInError(const QString& errorMsg) void MainWindow::showSoundInError(const QString& errorMsg)