tempo-plotter Changeset - bd649e494eb1 · protofusion repositories

Changeset - bd649e494eb1

Parent rev.

Child rev.

[Not reviewed]

plot-manager

0 6 0

Hasan Yavuz ÖZDERYA - 9 years ago 2016-08-26 16:16:49
hy@ozderya.net

show demo indicator on all plots

6 files changed with 35 insertions and 17 deletions:

src/mainwindow.cpp

src/mainwindow.h

src/plot.cpp

src/plot.h

src/plotmanager.cpp

src/plotmanager.h

0 comments (0 inline, 0 general)

src/mainwindow.cpp

➞

Show inline comments

@@ @@ -184,22 +184,14 @@ MainWindow::MainWindow(QWidget *parent) @@
                      this, &MainWindow::onSpsChanged);
     // init demo
     QObject::connect(ui->actionDemoMode, &QAction::toggled,
                      this, &MainWindow::enableDemo);
     {   // init demo indicator
         QwtText demoText(" DEMO RUNNING ");  // looks better with spaces
         demoText.setColor(QColor("white"));
         demoText.setBackgroundBrush(Qt::darkRed);
         demoText.setBorderRadius(4);
         demoText.setRenderFlags(Qt::AlignLeft | Qt::AlignTop);
         demoIndicator.setText(demoText);
         demoIndicator.hide();
         demoIndicator.attach(ui->plot);
+    }
     QObject::connect(ui->actionDemoMode, &QAction::toggled,
                      plotMan, &PlotManager::showDemoIndicator);
+}
 MainWindow::~MainWindow()
+{
     if (serialPort.isOpen())
+    {
@@ @@ -353,27 +345,22 @@ void MainWindow::enableDemo(bool enabled @@
+{
     if (enabled)
+    {
         if (!serialPort.isOpen())
+        {
             dataFormatPanel.enableDemo(true);
             ui->actionDemoMode->setChecked(true);
             demoIndicator.show();
             plotMan->replot();
+        }
         else
+        {
             ui->actionDemoMode->setChecked(false);
+        }
+    }
     else
+    {
         dataFormatPanel.enableDemo(false);
         ui->actionDemoMode->setChecked(false);
         demoIndicator.hide();
         plotMan->replot();
+    }
+}
 void MainWindow::onExportCsv()
+{
     bool wasPaused = ui->actionPause->isChecked();

src/mainwindow.h

➞

Show inline comments

@@ @@ -29,13 +29,12 @@ @@
 #include <QSerialPort>
 #include <QSignalMapper>
 #include <QTimer>
 #include <QColor>
 #include <QtGlobal>
 #include <qwt_plot_curve.h>
 #include <qwt_plot_textlabel.h>
 #include "portcontrol.h"
 #include "commandpanel.h"
 #include "dataformatpanel.h"
 #include "plotcontrolpanel.h"
 #include "ui_about_dialog.h"
@@ @@ -80,13 +79,12 @@ private: @@
     CommandPanel commandPanel;
     DataFormatPanel dataFormatPanel;
     PlotControlPanel plotControlPanel;
     SnapshotManager snapshotMan;
     QwtPlotTextLabel demoIndicator;
     bool isDemoRunning();
     // test widget
     QWidget plotArea;
     PlotManager* plotMan;

src/plot.cpp

➞

Show inline comments

@@ @@ -40,12 +40,22 @@ Plot::Plot(QWidget* parent) : @@
     legend.attach(this);
     showGrid(false);
     darkBackground(false);
     snapshotOverlay = NULL;
     // init demo indicator
     QwtText demoText(" DEMO RUNNING ");  // looks better with spaces
     demoText.setColor(QColor("white"));
     demoText.setBackgroundBrush(Qt::darkRed);
     demoText.setBorderRadius(4);
     demoText.setRenderFlags(Qt::AlignLeft | Qt::AlignTop);
     demoIndicator.setText(demoText);
     demoIndicator.hide();
     demoIndicator.attach(this);
+}
 Plot::~Plot()
+{
     if (snapshotOverlay != NULL) delete snapshotOverlay;
+}
@@ @@ -101,12 +111,18 @@ void Plot::showMinorGrid(bool show) @@
 void Plot::showLegend(bool show)
+{
     legend.setVisible(show);
     replot();
+}
 void Plot::showDemoIndicator(bool show)
+{
     demoIndicator.setVisible(show);
     replot();
+}
 void Plot::unzoom()
+{
     zoomer.zoom(0);
+}
 void Plot::darkBackground(bool enabled)

src/plot.h

➞

Show inline comments

@@ @@ -24,12 +24,13 @@ @@
 #include <QList>
 #include <QAction>
 #include <qwt_plot.h>
 #include <qwt_plot_grid.h>
 #include <qwt_plot_shapeitem.h>
 #include <qwt_plot_legenditem.h>
 #include <qwt_plot_textlabel.h>
 #include "zoomer.h"
 #include "scalezoomer.h"
 #include "plotsnapshotoverlay.h"
 class Plot : public QwtPlot
@@ @@ -47,19 +48,21 @@ private: @@
     double yMin, yMax;
     Zoomer zoomer;
     ScaleZoomer sZoomer;
     QwtPlotGrid grid;
     PlotSnapshotOverlay* snapshotOverlay;
     QwtPlotLegendItem legend;
     QwtPlotTextLabel demoIndicator;
     void resetAxes();
 public slots:
     void showGrid(bool show = true);
     void showMinorGrid(bool show = true);
     void showLegend(bool show = true);
     void showDemoIndicator(bool show = true);
     void unzoom();
     void darkBackground(bool enabled = true);
     void setAxis(bool autoScaled, double yMin = 0, double yMax = 1);
     void flashSnapshotOverlay();

src/plotmanager.cpp

➞

Show inline comments

@@ @@ -32,12 +32,13 @@ PlotManager::PlotManager(QWidget* plotAr @@
     unzoomAction("Unzoom", this),
     darkBackgroundAction("Dark Background", this),
     showLegendAction("Legend", this)
+{
     // initalize layout and single widget
     isMulti = false;
     isDemoShown = false;
     scrollArea = NULL;
     setupLayout(isMulti);
     addPlotWidget();
     // initialize menu actions
     showGridAction.setToolTip("Show Grid");
@@ @@ -171,12 +172,13 @@ Plot* PlotManager::addPlotWidget() @@
     layout->addWidget(plot);
     plot->darkBackground(darkBackgroundAction.isChecked());
     plot->showGrid(showGridAction.isChecked());
     plot->showMinorGrid(showMinorGridAction.isChecked());
     plot->showLegend(showLegendAction.isChecked());
     plot->showDemoIndicator(isDemoShown);
     return plot;
+}
 void PlotManager::addCurve(QString title, FrameBuffer* buffer)
+{
@@ @@ -283,12 +285,21 @@ void PlotManager::showLegend(bool show) @@
     for (auto plot : plotWidgets)
+    {
         plot->showLegend(show);
+    }
+}
 void PlotManager::showDemoIndicator(bool show)
+{
     isDemoShown = show;
     for (auto plot : plotWidgets)
+    {
         plot->showDemoIndicator(show);
+    }
+}
 void PlotManager::unzoom()
+{
     for (auto plot : plotWidgets)
+    {
         plot->unzoom();
+    }

src/plotmanager.h

➞

Show inline comments

@@ @@ -56,20 +56,23 @@ public: @@
 public slots:
     /// Enable/Disable multiple plot display
     void setMulti(bool enabled);
     /// Update all plot widgets
     void replot();
     /// Enable display of a "DEMO" label on each plot
     void showDemoIndicator(bool show = true);
 private:
     bool isMulti;
     QWidget* _plotArea;
     QVBoxLayout* layout; ///< layout of the `plotArea`
     QScrollArea* scrollArea;
     QList<QwtPlotCurve*> curves;
     QList<Plot*> plotWidgets;
     bool isDemoShown;
     // menu actions
     QAction showGridAction;
     QAction showMinorGridAction;
     QAction unzoomAction;
     QAction darkBackgroundAction;

0 comments (0 inline, 0 general)