w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-11-03 13:30:52 -05:00
Code Issues Packages Projects Releases Wiki Activity

Remove JT9/JT65 decoding statistics from timer.out. Remove the auto_tx_label, it's not really needed.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7383 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2016-12-15 18:58:17 +00:00
parent 4a132c59ee
commit 8ff9cb01b2
2 changed files with 5 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/jt9.f90
View File

@ -298,12 +298,12 @@ program jt9
call timer('jt9 ',101) call timer('jt9 ',101)
999 continue 999 continue
! Output decoder statistics ! Output decoder statistics
call fini_timer () call fini_timer ()
open (unit=12, file=trim(data_dir)//'/timer.out', status='unknown', position='append') ! open (unit=12, file=trim(data_dir)//'/timer.out', status='unknown', position='append')
write(12,1100) n65a,ntry65a,n65b,ntry65b,numfano,num9 ! write(12,1100) n65a,ntry65a,n65b,ntry65b,numfano,num9
1100 format(58('-')/' JT65_1 Tries_1 JT65_2 Tries_2 JT9 Tries'/ & !1100 format(58('-')/' JT65_1 Tries_1 JT65_2 Tries_2 JT9 Tries'/ &
58('-')/6i8) ! 58('-')/6i8)
! Save wisdom and free memory ! Save wisdom and free memory
iret=fftwf_export_wisdom_to_filename(wisfile) iret=fftwf_export_wisdom_to_filename(wisfile)

14
mainwindow.cpp
View File

@ -692,8 +692,6 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
} }
#endif #endif
auto_tx_label.setText (m_config.quick_call () ? "Auto-Tx-Enable Armed" : "Auto-Tx-Enable Disarmed");
{ {
//delete any .quit file that might have been left lying around //delete any .quit file that might have been left lying around
//since its presence will cause jt9 to exit a soon as we start it //since its presence will cause jt9 to exit a soon as we start it
@ -1414,8 +1412,6 @@ void MainWindow::on_actionSettings_triggered() //Setup Dialog
m_msAudioOutputBuffered); m_msAudioOutputBuffered);
} }
auto_tx_label.setText (m_config.quick_call () ? "Auto-Tx-Enable Armed" : "Auto-Tx-Enable Disarmed");
displayDialFrequency (); displayDialFrequency ();
bool vhf {m_config.enable_VHF_features()}; bool vhf {m_config.enable_VHF_features()};
m_wideGraph->setVHF(vhf); m_wideGraph->setVHF(vhf);
@ -1729,10 +1725,6 @@ void MainWindow::createStatusBar() //createStatusBar
last_tx_label.setFrameStyle (QFrame::Panel | QFrame::Sunken); last_tx_label.setFrameStyle (QFrame::Panel | QFrame::Sunken);
statusBar()->addWidget (&last_tx_label); statusBar()->addWidget (&last_tx_label);
auto_tx_label.setAlignment (Qt::AlignHCenter);
auto_tx_label.setMinimumSize (QSize {150, 18});
auto_tx_label.setFrameStyle (QFrame::Panel | QFrame::Sunken);
band_hopping_label.setAlignment (Qt::AlignHCenter); band_hopping_label.setAlignment (Qt::AlignHCenter);
band_hopping_label.setMinimumSize (QSize {90, 18}); band_hopping_label.setMinimumSize (QSize {90, 18});
band_hopping_label.setFrameStyle (QFrame::Panel | QFrame::Sunken); band_hopping_label.setFrameStyle (QFrame::Panel | QFrame::Sunken);
@ -1772,21 +1764,15 @@ void MainWindow::setup_status_bar (bool vhf)
} }
last_tx_label.setText (QString {}); last_tx_label.setText (QString {});
if (m_mode.contains (QRegularExpression {R"(^(Echo|ISCAT))"})) { if (m_mode.contains (QRegularExpression {R"(^(Echo|ISCAT))"})) {
if (auto_tx_label.isVisible ()) statusBar ()->removeWidget (&auto_tx_label);
if (band_hopping_label.isVisible ()) statusBar ()->removeWidget (&band_hopping_label); if (band_hopping_label.isVisible ()) statusBar ()->removeWidget (&band_hopping_label);
} else if (m_mode.startsWith ("WSPR")) { } else if (m_mode.startsWith ("WSPR")) {
mode_label.setStyleSheet ("QLabel{background-color: #ff66ff}"); mode_label.setStyleSheet ("QLabel{background-color: #ff66ff}");
if (auto_tx_label.isVisible ()) statusBar ()->removeWidget (&auto_tx_label);
if (!band_hopping_label.isVisible ()) { if (!band_hopping_label.isVisible ()) {
statusBar ()->addWidget (&band_hopping_label); statusBar ()->addWidget (&band_hopping_label);
band_hopping_label.show (); band_hopping_label.show ();
} }
} else { } else {
if (band_hopping_label.isVisible ()) statusBar ()->removeWidget (&band_hopping_label); if (band_hopping_label.isVisible ()) statusBar ()->removeWidget (&band_hopping_label);
if (!auto_tx_label.isVisible ()) {
statusBar ()->addWidget (&auto_tx_label);
auto_tx_label.show ();
}
} }
} }