tempo-plotter Changeset - 9bdc741a9793 · protofusion repositories

Changeset - 9bdc741a9793

Parent rev.

Child rev.

[Not reviewed]

plot-manager

0 3 0

Hasan Yavuz ÖZDERYA - 9 years ago 2016-08-28 16:00:59
hy@ozderya.net

implemented plotMan.setAxis

3 files changed with 25 insertions and 5 deletions:

src/mainwindow.cpp

src/plotmanager.cpp

src/plotmanager.h

0 comments (0 inline, 0 general)

src/mainwindow.cpp

➞

Show inline comments

@@ @@ -115,25 +115,25 @@ MainWindow::MainWindow(QWidget *parent) @@
     QObject::connect(ui->actionQuit, &QAction::triggered,
                      this, &MainWindow::close);
     // port control signals
     QObject::connect(&portControl, &PortControl::portToggled,
                      this, &MainWindow::onPortToggled);
     connect(&plotControlPanel, &PlotControlPanel::numOfSamplesChanged,
             this, &MainWindow::onNumOfSamplesChanged);
     connect(&plotControlPanel, &PlotControlPanel::scaleChanged,
-            ui->plot, &Plot::setAxis);
+            plotMan, &PlotManager::setAxis);
     connect(&plotControlPanel, &PlotControlPanel::multiPlotChanged,
             plotMan, &PlotManager::setMulti);
     QObject::connect(ui->actionClear, SIGNAL(triggered(bool)),
                      this, SLOT(clearPlot()));
     QObject::connect(snapshotMan.takeSnapshotAction(), &QAction::triggered,
                      ui->plot, &Plot::flashSnapshotOverlay);
     // init port signals
     QObject::connect(&(this->serialPort), SIGNAL(error(QSerialPort::SerialPortError)),
@@ @@ -161,28 +161,27 @@ MainWindow::MainWindow(QWidget *parent) @@
     connect(&channelMan, &ChannelManager::channelNameChanged,
             this, &MainWindow::onChannelNameChanged);
     plotControlPanel.setChannelNamesModel(channelMan.channelNames());
     // init curve list
     for (unsigned int i = 0; i < numOfChannels; i++)
+    {
         plotMan->addCurve(channelMan.channelName(i), channelMan.channelBuffer(i));
+    }
     // TODO: plotman
     // init auto scale
     ui->plot->setAxis(plotControlPanel.autoScale(),
                       plotControlPanel.yMin(), plotControlPanel.yMax());
     plotMan->setAxis(plotControlPanel.autoScale(),
                      plotControlPanel.yMin(), plotControlPanel.yMax());
     // 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);

src/plotmanager.cpp

➞

Show inline comments

@@ @@ -24,27 +24,31 @@ @@
 #include "utils.h"
 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)
+{
     _autoScaled = true;
     _yMin = 0;
     _yMax = 1;
     isDemoShown = false;
     // 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"));
@@ @@ -167,24 +171,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);
     plot->setAxis(_autoScaled, _yMin, _yMax);
     return plot;
+}
 void PlotManager::addCurve(QString title, FrameBuffer* buffer)
+{
     Plot* plot;
     if (isMulti)
+    {
         // create a new plot widget
         plot = addPlotWidget();
@@ @@ -303,12 +308,23 @@ void PlotManager::unzoom() @@
+    {
         plot->unzoom();
+    }
+}
 void PlotManager::darkBackground(bool enabled)
+{
     for (auto plot : plotWidgets)
+    {
         plot->darkBackground(enabled);
+    }
+}
 void PlotManager::setAxis(bool autoScaled, double yAxisMin, double yAxisMax)
+{
     _autoScaled = autoScaled;
     _yMin = yAxisMin;
     _yMax = yAxisMax;
     for (auto plot : plotWidgets)
+    {
         plot->setAxis(autoScaled, yAxisMin, yAxisMax);
+    }
+}

src/plotmanager.h

➞

Show inline comments

@@ @@ -52,33 +52,38 @@ public: @@
     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);
     /// Set the Y axis
     void setAxis(bool autoScaled, double yMin = 0, double yMax = 1);
 private:
     bool isMulti;
     QWidget* _plotArea;
     QVBoxLayout* layout; ///< layout of the `plotArea`
     QScrollArea* scrollArea;
     QList<QwtPlotCurve*> curves;
     QList<Plot*> plotWidgets;
     bool isDemoShown;
     bool _autoScaled;
     double _yMin;
     double _yMax;
     // 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)