w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-02-03 09:44:24 -05:00
Code Issues Packages Projects Releases Wiki Activity

Some cleanup of interaction between GUI and Echo mode.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5523 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2015-06-04 17:16:55 +00:00
parent 437c8c5c3f
commit d3b6ac4ba2
3 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
echograph.cpp
View File

@ -39,6 +39,12 @@ EchoGraph::~EchoGraph()
delete ui; delete ui;
} }
void EchoGraph::closeEvent (QCloseEvent * e)
{
saveSettings ();
QDialog::closeEvent (e);
}
void EchoGraph::saveSettings() void EchoGraph::saveSettings()
{ {
//Save user's settings //Save user's settings

3
echograph.h
View File

@ -10,6 +10,9 @@ class EchoGraph : public QDialog
{ {
Q_OBJECT Q_OBJECT
protected:
void closeEvent (QCloseEvent *) override;
public: public:
explicit EchoGraph(QWidget *parent = 0); explicit EchoGraph(QWidget *parent = 0);
~EchoGraph(); ~EchoGraph();

12
mainwindow.cpp
View File

@ -168,6 +168,8 @@ MainWindow::MainWindow(bool multiple, QSettings * settings, QSharedMemory *shdme
SLOT(setXIT(int))); SLOT(setXIT(int)));
connect (this, &MainWindow::finished, m_wideGraph.data (), &WideGraph::close); connect (this, &MainWindow::finished, m_wideGraph.data (), &WideGraph::close);
connect (this, &MainWindow::finished, m_echoGraph.data (), &EchoGraph::close);
// setup the log QSO dialog // setup the log QSO dialog
connect (m_logDlg.data (), &LogQSO::acceptQSO, this, &MainWindow::acceptQSO2); connect (m_logDlg.data (), &LogQSO::acceptQSO, this, &MainWindow::acceptQSO2);
connect (this, &MainWindow::finished, m_logDlg.data (), &LogQSO::close); connect (this, &MainWindow::finished, m_logDlg.data (), &LogQSO::close);
@ -495,8 +497,9 @@ MainWindow::MainWindow(bool multiple, QSettings * settings, QSharedMemory *shdme
genStdMsgs(m_rpt); genStdMsgs(m_rpt);
m_ntx=6; m_ntx=6;
ui->txrb6->setChecked(true); ui->txrb6->setChecked(true);
if(m_mode!="JT9" and m_mode!="JT9W-1" and m_mode!="JT65" and m_mode!="JT9+JT65" and if(m_mode!="JT9" and m_mode!="JT9W-1" and m_mode!="JT65" and m_mode!="JT9+JT65"
m_mode!="JT4" and m_mode!="WSPR-2" and m_mode!="WSPR-15") m_mode="JT9"; and m_mode!="JT4" and m_mode!="WSPR-2" and m_mode!="WSPR-15" and
m_mode!="Echo") m_mode="JT9";
on_actionWide_Waterfall_triggered(); //### on_actionWide_Waterfall_triggered(); //###
connect(m_wideGraph.data (), SIGNAL(setFreq3(int,int)),this, connect(m_wideGraph.data (), SIGNAL(setFreq3(int,int)),this,
@ -509,6 +512,7 @@ MainWindow::MainWindow(bool multiple, QSettings * settings, QSharedMemory *shdme
if(m_mode=="JT9+JT65") on_actionJT9_JT65_triggered(); if(m_mode=="JT9+JT65") on_actionJT9_JT65_triggered();
if(m_mode=="WSPR-2") on_actionWSPR_2_triggered(); if(m_mode=="WSPR-2") on_actionWSPR_2_triggered();
if(m_mode=="WSPR-15") on_actionWSPR_15_triggered(); if(m_mode=="WSPR-15") on_actionWSPR_15_triggered();
if(m_mode=="Echo") on_actionEcho_triggered();
m_wideGraph->setLockTxFreq(m_lockTxFreq); m_wideGraph->setLockTxFreq(m_lockTxFreq);
m_wideGraph->setMode(m_mode); m_wideGraph->setMode(m_mode);
@ -3172,7 +3176,11 @@ void MainWindow::on_actionEcho_triggered()
{ {
m_mode="Echo"; m_mode="Echo";
switch_mode(Modes::Echo); switch_mode(Modes::Echo);
m_modeTx="Echo";
statusChanged();
if(!m_echoGraph->isVisible()) m_echoGraph->show(); if(!m_echoGraph->isVisible()) m_echoGraph->show();
mode_label->setStyleSheet("QLabel{background-color: #7cfc00}");
mode_label->setText(m_mode);
} }
void MainWindow::switch_mode (Mode mode) void MainWindow::switch_mode (Mode mode)