diff --git a/Configuration.cpp b/Configuration.cpp index 3a3c1d4f5..4be3f414d 100644 --- a/Configuration.cpp +++ b/Configuration.cpp @@ -1056,6 +1056,7 @@ void Configuration::impl::initialize_models () ui_->cbx2ToneSpacing->setChecked(x2ToneSpacing_); ui_->cbContestMode->setChecked(contestMode_); ui_->cbRealTime->setChecked(realTimeDecode_); + ui_->cbRealTime->setVisible(false); //Tempoary -- probably will remove this control ui_->offset_Rx_freq_check_box->setChecked(offsetRxFreq_); ui_->type_2_msg_gen_combo_box->setCurrentIndex (type_2_msg_gen_); ui_->rig_combo_box->setCurrentText (rig_params_.rig_name); diff --git a/Configuration.ui b/Configuration.ui index febe85c58..0c555aef3 100644 --- a/Configuration.ui +++ b/Configuration.ui @@ -2267,7 +2267,7 @@ Right click for insert and delete options. - + <html><head/><body><p>Generate Tx audio with twice the normal tone spacing. Intended for special LF/MF transmitters that use a divide-by-2 before generating RF.</p></body></html> @@ -2277,10 +2277,10 @@ Right click for insert and delete options. - + - true + false <html><head/><body><p>Decode on-the-fly rather than at end of Rx sequence.</p></body></html> @@ -2539,12 +2539,12 @@ soundcard changes - - + + - + diff --git a/mainwindow.cpp b/mainwindow.cpp index 2df5f473f..91d48f3d8 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -1274,7 +1274,7 @@ void MainWindow::fastSink(qint64 frames) if(m_diskData) nutc0=m_UTCdisk; char line[80]; bool bmsk144=((m_mode=="MSK144") and (m_monitoring or m_diskData)); - bmsk144=bmsk144 && m_config.realTimeDecode(); +// bmsk144=bmsk144 && m_config.realTimeDecode(); line[0]=0; m_RxFreq=ui->RxFreqSpinBox->value (); @@ -1327,7 +1327,8 @@ void MainWindow::fastSink(qint64 frames) m_k0=k; if(m_diskData and m_k0 >= dec_data.params.kin - 7 * 512) decodeNow=true; if(!m_diskData and m_tRemaining<0.35 and !m_bFastDecodeCalled) decodeNow=true; - if(m_mode=="MSK144" and m_config.realTimeDecode()) decodeNow=false; +// if(m_mode=="MSK144" and m_config.realTimeDecode()) decodeNow=false; + if(m_mode=="MSK144") decodeNow=false; if(decodeNow) { m_dataAvailable=true; @@ -2254,7 +2255,7 @@ void MainWindow::decode() //decode() if(m_nPick > 0) { t0=m_t0Pick; t1=m_t1Pick; - if(t1 > m_kdone/12000.0 and !m_config.realTimeDecode()) t1=m_kdone/12000.0; +// if(t1 > m_kdone/12000.0 and !m_config.realTimeDecode()) t1=m_kdone/12000.0; } static short int d2b[360000]; narg[0]=dec_data.params.nutc; @@ -3033,7 +3034,8 @@ void MainWindow::guiUpdate() tx_status_label.setStyleSheet("QLabel{background-color: #00ff00}"); QString t; t="Receiving"; - if(m_mode=="MSK144" and m_config.realTimeDecode()) { +// if(m_mode=="MSK144" and m_config.realTimeDecode()) { + if(m_mode=="MSK144") { int npct=int(100.0*m_fCPUmskrtd/0.298667); if(npct>90) tx_status_label.setStyleSheet("QLabel{background-color: #ff0000}"); t.sprintf("Receiving %2d%%",npct); @@ -5213,6 +5215,7 @@ void::MainWindow::VHF_controls_visible(bool b) void::MainWindow::VHF_features_enabled(bool b) { + if(m_mode!="JT4" and m_mode!="JT65") b=false; if(!b and (ui->actionInclude_averaging->isChecked() or ui->actionInclude_correlation->isChecked())) { on_actionDeepestDecode_triggered();