tempo-plotter Changeset - b389ff133420 · protofusion repositories

Changeset - b389ff133420

Parent rev.

Child rev.

[Not reviewed]

barplot

0 3 0

Hasan Yavuz ÖZDERYA - 8 years ago 2017-10-27 07:37:31
hy@ozderya.net

control bar plot background from menu

3 files changed with 30 insertions and 4 deletions:

src/barplot.cpp

src/barplot.h

src/mainwindow.cpp

0 comments (0 inline, 0 general)

src/barplot.cpp

➞

Show inline comments

@@ @@ -10,45 +10,65 @@ @@
   serialplot is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.
   You should have received a copy of the GNU General Public License
   along with serialplot.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "barplot.h"
 #include "barscaledraw.h"
 #include "utils.h"
 BarPlot::BarPlot(ChannelManager* channelMan, QWidget* parent) :
     QwtPlot(parent), barChart(channelMan)
 BarPlot::BarPlot(ChannelManager* channelMan, PlotMenu* menu, QWidget* parent) :
     QwtPlot(parent), _menu(menu), barChart(channelMan)
+{
     _channelMan = channelMan;
     barChart.attach(this);
     setAxisMaxMinor(QwtPlot::xBottom, 0);
     setAxisScaleDraw(QwtPlot::xBottom, new BarScaleDraw(channelMan));
     update();
     connect(_channelMan, &ChannelManager::dataAdded, this, &BarPlot::update);
     connect(_channelMan, &ChannelManager::numOfChannelsChanged, this, &BarPlot::update);
     // connect to menu
     connect(&menu->darkBackgroundAction, SELECT<bool>::OVERLOAD_OF(&QAction::toggled),
             this, &BarPlot::darkBackground);
     darkBackground(menu->darkBackgroundAction.isChecked());
+}
 void BarPlot::update()
+{
     // Note: -0.99 is used instead of -1 to handle the case of `numOfChannels==1`
     setAxisScale(QwtPlot::xBottom, 0, _channelMan->numOfChannels()-0.99, 1);
     barChart.resample();
     replot();
+}
 void BarPlot::setYAxis(bool autoScaled, double yMin, double yMax)
+{
     if (autoScaled)
+    {
         setAxisAutoScale(QwtPlot::yLeft);
+    }
     else
+    {
         setAxisScale(QwtPlot::yLeft, yMin, yMax);
+    }
+}
 void BarPlot::darkBackground(bool enabled)
+{
     if (enabled)
+    {
         setCanvasBackground(QBrush(Qt::black));
+    }
     else
+    {
         setCanvasBackground(QBrush(Qt::white));
+    }
     replot();
+}

src/barplot.h

➞

Show inline comments

@@ @@ -14,36 +14,42 @@ @@
   GNU General Public License for more details.
   You should have received a copy of the GNU General Public License
   along with serialplot.  If not, see <http://www.gnu.org/licenses/>.
 */
 #ifndef BARPLOT_H
 #define BARPLOT_H
 #include <qwt_plot.h>
 #include "channelmanager.h"
 #include "plotmenu.h"
 #include "barchart.h"
 class BarPlot : public QwtPlot
+{
     Q_OBJECT
 public:
     explicit BarPlot(ChannelManager* channelMan, QWidget* parent = 0);
     explicit BarPlot(ChannelManager* channelMan,
                      PlotMenu* menu,
                      QWidget* parent = 0);
 public slots:
     /// Set the Y axis
     void setYAxis(bool autoScaled, double yMin = 0, double yMax = 1);
     /// Enable/disable dark background
     void darkBackground(bool enabled);
 private:
     ChannelManager* _channelMan;
     PlotMenu* _menu;
     BarChart barChart;
     QVector<double> chartData() const;
 private slots:
     void update();
 };
 #endif // BARPLOT_H

src/mainwindow.cpp

➞

Show inline comments

@@ @@ -499,25 +499,25 @@ void MainWindow::hideSecondary() @@
+    {
         qFatal("Secondary plot doesn't exist!");
+    }
     secondaryPlot->deleteLater();
     secondaryPlot = NULL;
+}
 void MainWindow::showBarPlot(bool show)
+{
     if (show)
+    {
         auto plot = new BarPlot(&channelMan);
+        auto plot = new BarPlot(&channelMan, &plotMenu);
         plot->setYAxis(plotControlPanel.autoScale(),
                        plotControlPanel.yMin(),
                        plotControlPanel.yMax());
         connect(&plotControlPanel, &PlotControlPanel::yScaleChanged,
                 plot, &BarPlot::setYAxis);
         showSecondary(plot);
+    }
     else
+    {
         hideSecondary();
+    }
+}

0 comments (0 inline, 0 general)