From 2620435e92e954672d1722ca416cb1af0a1981d6 Mon Sep 17 00:00:00 2001 From: Jordan Sherer Date: Sat, 1 Sep 2018 18:26:10 -0400 Subject: [PATCH] Added waterfall controls menu item --- mainwindow.cpp | 6 ++++++ mainwindow.h | 1 + mainwindow.ui | 12 ++++++++++++ widegraph.cpp | 9 +++++++++ widegraph.h | 2 ++ widegraph.ui | 3 +++ 6 files changed, 33 insertions(+) diff --git a/mainwindow.cpp b/mainwindow.cpp index 102a01e..42cc2bb 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -2178,6 +2178,8 @@ void MainWindow::on_menuWindow_aboutToShow(){ auto vsizes = ui->mainSplitter->sizes(); ui->actionShow_Waterfall->setChecked(vsizes.last() > 0); + ui->actionShow_Waterfall_Controls->setChecked(m_wideGraph->controlsVisible()); + ui->actionShow_Waterfall_Controls->setEnabled(ui->actionShow_Waterfall->isChecked()); QMenu * sortBandMenu = new QMenu(ui->menuWindow); buildBandActivitySortByMenu(sortBandMenu); @@ -2210,6 +2212,10 @@ void MainWindow::on_actionShow_Waterfall_triggered(bool checked){ ui->mainSplitter->setSizes(vsizes); } +void MainWindow::on_actionShow_Waterfall_Controls_triggered(bool checked){ + m_wideGraph->setControlsVisible(checked); +} + void MainWindow::on_actionReset_Window_Sizes_triggered(){ auto size = this->centralWidget()->size(); diff --git a/mainwindow.h b/mainwindow.h index 8ac503a..61ac253 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -168,6 +168,7 @@ private slots: void on_actionShow_Band_Activity_triggered(bool checked); void on_actionShow_Call_Activity_triggered(bool checked); void on_actionShow_Waterfall_triggered(bool checked); + void on_actionShow_Waterfall_Controls_triggered(bool checked); void on_actionReset_Window_Sizes_triggered(); void on_actionSettings_triggered(); void prepareSpotting(); diff --git a/mainwindow.ui b/mainwindow.ui index 9e786b2..12103fe 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -4364,6 +4364,7 @@ list. The list can be maintained in Settings (F2). + @@ -5066,6 +5067,17 @@ list. The list can be maintained in Settings (F2). Sort Call Activity... + + + true + + + true + + + Show Waterfall Controls + + diff --git a/widegraph.cpp b/widegraph.cpp index 1cfbcd1..f4ca4f5 100644 --- a/widegraph.cpp +++ b/widegraph.cpp @@ -363,6 +363,15 @@ void WideGraph::setDialFreq(double d) //setDialFreq ui->widePlot->setDialFreq(d); } +void WideGraph::setControlsVisible(bool visible) +{ + ui->cbControls->setChecked(visible); +} + +bool WideGraph::controlsVisible(){ + return ui->cbControls->isChecked(); +} + void WideGraph::setRxBand (QString const& band) { m_rxBand = band; diff --git a/widegraph.h b/widegraph.h index d734796..9701257 100644 --- a/widegraph.h +++ b/widegraph.h @@ -60,6 +60,8 @@ public slots: void wideFreezeDecode(int n); void setFreq2(int rxFreq, int txFreq); void setDialFreq(double d); + void setControlsVisible(bool visible); + bool controlsVisible(); protected: void keyPressEvent (QKeyEvent *e) override; diff --git a/widegraph.ui b/widegraph.ui index 6992aa7..62b9410 100644 --- a/widegraph.ui +++ b/widegraph.ui @@ -56,6 +56,9 @@ 1 + + false + 5