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

@@ @@ -178,34 +178,26 @@ MainWindow::MainWindow(QWidget *parent) @@
     // Init sps (sample per second) counter
     spsLabel.setText("0sps");
     spsLabel.setToolTip("samples per second (per channel)");
     ui->statusBar->addPermanentWidget(&spsLabel);
     QObject::connect(&dataFormatPanel,
                      &DataFormatPanel::samplesPerSecondChanged,
                      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())
+    {
         serialPort.close();
+    }
     delete plotMan;
     delete ui;
@@ @@ -347,39 +339,34 @@ void MainWindow::onSpsChanged(unsigned s @@
 bool MainWindow::isDemoRunning()
+{
     return ui->actionDemoMode->isChecked();
+}
 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();
     ui->actionPause->setChecked(true); // pause plotting
     QString fileName = QFileDialog::getSaveFileName(this, tr("Export CSV File"));
     if (fileName.isNull())  // user canceled export
+    {

src/mainwindow.h

➞

Show inline comments

@@ @@ -23,25 +23,24 @@ @@
 #include <QMainWindow>
 #include <QButtonGroup>
 #include <QLabel>
 #include <QString>
 #include <QVector>
 #include <QList>
 #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"
 #include "framebuffer.h"
 #include "channelmanager.h"
 #include "snapshotmanager.h"
 #include "plotmanager.h"
 namespace Ui {
@@ @@ -74,25 +73,24 @@ private: @@
     // Note: FrameBuffer s are owned by their respective QwtPlotCurve s.
     // QList<FrameBuffer*> channelBuffers;
     ChannelManager channelMan;
     QLabel spsLabel;
     CommandPanel commandPanel;
     DataFormatPanel dataFormatPanel;
     PlotControlPanel plotControlPanel;
     SnapshotManager snapshotMan;
     QwtPlotTextLabel demoIndicator;
     bool isDemoRunning();
     // test widget
     QWidget plotArea;
     PlotManager* plotMan;
 private slots:
     void onPortToggled(bool open);
     void onPortError(QSerialPort::SerialPortError error);
     void onNumOfSamplesChanged(int value);
     void onNumOfChannelsChanged(unsigned value);

src/plot.cpp

➞

Show inline comments

@@ @@ -34,24 +34,34 @@ Plot::Plot(QWidget* parent) : @@
     isAutoScaled = true;
     QObject::connect(&zoomer, &Zoomer::unzoomed, this, &Plot::unzoomed);
     zoomer.setZoomBase();
     grid.attach(this);
     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;
+}
 void Plot::setAxis(bool autoScaled, double yAxisMin, double yAxisMax)
+{
     this->isAutoScaled = autoScaled;
     if (!autoScaled)
@@ @@ -95,24 +105,30 @@ void Plot::showMinorGrid(bool show) @@
+{
     grid.enableXMin(show);
     grid.enableYMin(show);
     replot();
+}
 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)
+{
     QColor gridColor;
     if (enabled)
+    {
         setCanvasBackground(QBrush(Qt::black));
         gridColor.setHsvF(0, 0, 0.25);

src/plot.h

➞

Show inline comments

@@ @@ -18,53 +18,56 @@ @@
 */
 #ifndef PLOT_H
 #define PLOT_H
 #include <QColor>
 #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
+{
     Q_OBJECT
 public:
     Plot(QWidget* parent = 0);
     ~Plot();
     static QColor makeColor(unsigned int channelIndex);
 private:
     bool isAutoScaled;
     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();
 private slots:
     void unzoomed();
 };
 #endif // PLOT_H

src/plotmanager.cpp

➞

Show inline comments

@@ @@ -26,24 +26,25 @@ @@
 PlotManager::PlotManager(QWidget* plotArea, QObject *parent) :
     QObject(parent),
     _plotArea(plotArea),
     showGridAction("Grid", this),
     showMinorGridAction("Minor Grid", this),
     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");
     showMinorGridAction.setToolTip("Show Minor Grid");
     unzoomAction.setToolTip("Unzoom the Plot");
     darkBackgroundAction.setToolTip("Enable Dark Plot Background");
     showLegendAction.setToolTip("Display the Legend on Plot");
     showGridAction.setShortcut(QKeySequence("G"));
@@ @@ -165,24 +166,25 @@ void PlotManager::setupLayout(bool multi @@
+}
 Plot* PlotManager::addPlotWidget()
+{
     auto plot = new Plot();
     plotWidgets.append(plot);
     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)
+{
     Plot* plot;
     if (isMulti)
+    {
         // create a new plot widget
         plot = addPlotWidget();
@@ @@ -277,24 +279,33 @@ void PlotManager::showMinorGrid(bool sho @@
         plot->showMinorGrid(show);
+    }
+}
 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();
+    }
+}
 void PlotManager::darkBackground(bool enabled)
+{
     for (auto plot : plotWidgets)
+    {

src/plotmanager.h

➞

Show inline comments

@@ @@ -50,32 +50,35 @@ public: @@
     /// Returns current number of curves known by plot manager
     unsigned numOfCurves();
     /// Returns the list of actions to be inserted into the `View` menu
     QList<QAction*> menuActions();
 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;
     QAction showLegendAction;
     void setupLayout(bool multiPlot);
     Plot* addPlotWidget(); ///< inserts a new plot widget to the current layout
     /// Returns the plot widget that given curve is attached to
     Plot* plotWidget(unsigned curveIndex);

0 comments (0 inline, 0 general)