chris/js8call
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed issue with WideGraph activating on Windows before fully initialized, which when notifications were enabled (not sure why) would hang the widegraph.

Browse Source
This commit is contained in:
Jordan Sherer 2019-12-02 10:37:14 -05:00
parent 6a0ef6d407
commit ca5012c3b2
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mainwindow.cpp
View File

@ -278,6 +278,7 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
m_WSPR_tx_next {false}, m_WSPR_tx_next {false},
m_rigErrorMessageBox {MessageBox::Critical, tr ("Rig Control Error") m_rigErrorMessageBox {MessageBox::Critical, tr ("Rig Control Error")
, MessageBox::Cancel | MessageBox::Ok | MessageBox::Retry}, , MessageBox::Cancel | MessageBox::Ok | MessageBox::Retry},
m_isWideGraphMDI {false},
m_wideGraph (new WideGraph(m_settings)), m_wideGraph (new WideGraph(m_settings)),
// no parent so that it has a taskbar icon // no parent so that it has a taskbar icon
m_logDlg (new LogQSO (program_title (), m_settings, &m_config, nullptr)), m_logDlg (new LogQSO (program_title (), m_settings, &m_config, nullptr)),
@ -864,7 +865,6 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
morse_(const_cast<char *> (m_config.my_callsign ().toLatin1().constData()), morse_(const_cast<char *> (m_config.my_callsign ().toLatin1().constData()),
const_cast<int *> (icw), &m_ncw, m_config.my_callsign ().length()); const_cast<int *> (icw), &m_ncw, m_config.my_callsign ().length());
on_actionWide_Waterfall_triggered();
ui->cbShMsgs->setChecked(m_bShMsgs); ui->cbShMsgs->setChecked(m_bShMsgs);
ui->cbSWL->setChecked(m_bSWL); ui->cbSWL->setChecked(m_bSWL);
@ -935,6 +935,7 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
//UI Customizations & Tweaks //UI Customizations & Tweaks
m_wideGraph.data()->installEventFilter(new EscapeKeyPressEater()); m_wideGraph.data()->installEventFilter(new EscapeKeyPressEater());
ui->mdiArea->addSubWindow(m_wideGraph.data(), Qt::Dialog | Qt::FramelessWindowHint | Qt::CustomizeWindowHint | Qt::Tool)->showMaximized(); ui->mdiArea->addSubWindow(m_wideGraph.data(), Qt::Dialog | Qt::FramelessWindowHint | Qt::CustomizeWindowHint | Qt::Tool)->showMaximized();
m_isWideGraphMDI = true;
ui->menuMode->setVisible(false); ui->menuMode->setVisible(false);
ui->menuSave->setEnabled(false); ui->menuSave->setEnabled(false);
ui->menuTools->setEnabled(false); ui->menuTools->setEnabled(false);
@ -3626,11 +3627,6 @@ void MainWindow::on_actionLocal_User_Guide_triggered()
{ {
} }
void MainWindow::on_actionWide_Waterfall_triggered() //Display Waterfalls
{
m_wideGraph->show();
}
void MainWindow::on_actionSolve_FreqCal_triggered() void MainWindow::on_actionSolve_FreqCal_triggered()
{ {
QString dpath{QDir::toNativeSeparators(m_config.writeable_data_dir().absolutePath()+"/")}; QString dpath{QDir::toNativeSeparators(m_config.writeable_data_dir().absolutePath()+"/")};
@ -7495,7 +7491,7 @@ void MainWindow::on_actionJS8_triggered()
VHF_features_enabled(bVHF); VHF_features_enabled(bVHF);
ui->cbAutoSeq->setChecked(true); ui->cbAutoSeq->setChecked(true);
m_TRperiod = computePeriodForSubmode(m_nSubMode); m_TRperiod = computePeriodForSubmode(m_nSubMode);
m_wideGraph->show(); if(m_isWideGraphMDI) m_wideGraph->show();
ui->decodedTextLabel2->setText(" UTC dB DT Freq Message"); ui->decodedTextLabel2->setText(" UTC dB DT Freq Message");
m_modulator->setTRPeriod(m_TRperiod); // TODO - not thread safe m_modulator->setTRPeriod(m_TRperiod); // TODO - not thread safe
#if JS8_RING_BUFFER #if JS8_RING_BUFFER

2
mainwindow.h
View File

@ -219,7 +219,6 @@ private slots:
void on_actionFT8_DXpedition_Mode_User_Guide_triggered(); void on_actionFT8_DXpedition_Mode_User_Guide_triggered();
void on_actionOnline_User_Guide_triggered(); void on_actionOnline_User_Guide_triggered();
void on_actionLocal_User_Guide_triggered(); void on_actionLocal_User_Guide_triggered();
void on_actionWide_Waterfall_triggered();
void on_actionOpen_triggered(); void on_actionOpen_triggered();
void on_actionOpen_next_in_directory_triggered(); void on_actionOpen_next_in_directory_triggered();
void on_actionDecode_remaining_files_in_directory_triggered(); void on_actionDecode_remaining_files_in_directory_triggered();
@ -483,6 +482,7 @@ private:
MessageBox m_rigErrorMessageBox; MessageBox m_rigErrorMessageBox;
QScopedPointer<EqualizationToolsDialog> m_equalizationToolsDialog; QScopedPointer<EqualizationToolsDialog> m_equalizationToolsDialog;
bool m_isWideGraphMDI;
QScopedPointer<WideGraph> m_wideGraph; QScopedPointer<WideGraph> m_wideGraph;
QScopedPointer<LogQSO> m_logDlg; QScopedPointer<LogQSO> m_logDlg;
QScopedPointer<Astro> m_astroWidget; QScopedPointer<Astro> m_astroWidget;