tempo-plotter Changeset - 42da1825ce45 · protofusion repositories

Changeset - 42da1825ce45

Parent rev.

Child rev.

[Not reviewed]

plot-manager

0 3 0

Hasan Yavuz ÖZDERYA - 9 years ago 2016-08-25 01:34:48
hy@ozderya.net

implemented plotman.replot

3 files changed with 23 insertions and 7 deletions:

src/mainwindow.cpp

src/plotmanager.cpp

src/plotmanager.h

0 comments (0 inline, 0 general)

src/mainwindow.cpp

➞

Show inline comments

@@ @@ -120,49 +120,49 @@ MainWindow::MainWindow(QWidget *parent) @@
     QObject::connect(&portControl, &PortControl::portToggled,
                      this, &MainWindow::onPortToggled);
     connect(&plotControlPanel, &PlotControlPanel::numOfSamplesChanged,
             this, &MainWindow::onNumOfSamplesChanged);
     connect(&plotControlPanel, &PlotControlPanel::scaleChanged,
             ui->plot, &Plot::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)),
                      this, SLOT(onPortError(QSerialPort::SerialPortError)));
     // init data format and reader
     QObject::connect(&dataFormatPanel, &DataFormatPanel::dataAdded,
-                     ui->plot, &QwtPlot::replot);
+                     plotMan, &PlotManager::replot);
     QObject::connect(ui->actionPause, &QAction::triggered,
                      &dataFormatPanel, &DataFormatPanel::pause);
     // init data arrays and plot
     numOfSamples = plotControlPanel.numOfSamples();
     unsigned numOfChannels = dataFormatPanel.numOfChannels();
     channelMan.setNumOfSamples(numOfSamples);
     channelMan.setNumOfChannels(dataFormatPanel.numOfChannels());
     connect(&dataFormatPanel, &DataFormatPanel::numOfChannelsChanged,
             &channelMan, &ChannelManager::setNumOfChannels);
     connect(&channelMan, &ChannelManager::numOfChannelsChanged,
             this, &MainWindow::onNumOfChannelsChanged);
     connect(&channelMan, &ChannelManager::channelNameChanged,
             this, &MainWindow::onChannelNameChanged);
     plotControlPanel.setChannelNamesModel(channelMan.channelNames());
     // init curve list
     for (unsigned int i = 0; i < numOfChannels; i++)
@@ @@ -276,123 +276,122 @@ required privileges or device is already @@
         case QSerialPort::ReadError:
             qCritical() << "An error occurred while reading data.";
             break;
         case QSerialPort::UnsupportedOperationError:
             qCritical() << "Operation is not supported.";
             break;
         case QSerialPort::TimeoutError:
             qCritical() << "A timeout error occurred.";
             break;
         case QSerialPort::UnknownError:
             qCritical() << "Unknown error! Error: " << serialPort.errorString();
             break;
         default:
             qCritical() << "Unhandled port error: " << error;
             break;
+    }
+}
 void MainWindow::clearPlot()
+{
     for (unsigned ci = 0; ci < channelMan.numOfChannels(); ci++)
+    {
         channelMan.channelBuffer(ci)->clear();
+    }
-    ui->plot->replot();
+    plotMan->replot();
+}
 void MainWindow::onNumOfSamplesChanged(int value)
+{
     numOfSamples = value;
     channelMan.setNumOfSamples(value);
-    ui->plot->replot();
+    plotMan->replot();
+}
 void MainWindow::onNumOfChannelsChanged(unsigned value)
+{
     unsigned int oldNum = plotMan->numOfCurves();
     unsigned numOfChannels = value;
     if (numOfChannels > oldNum)
+    {
         // add new channels
         for (unsigned int i = oldNum; i < numOfChannels; i++)
+        {
             plotMan->addCurve(channelMan.channelName(i), channelMan.channelBuffer(i));
+        }
+    }
     else if(numOfChannels < oldNum)
+    {
         plotMan->removeCurves(oldNum - numOfChannels);
+    }
     // TODO: plotman.replot
     ui->plot->replot();
     plotMan->replot();
+}
 void MainWindow::onChannelNameChanged(unsigned channel, QString name)
+{
     // This slot is triggered also when a new channel is added, in
     // this case curve list doesn't contain said channel. No worries,
     // since `onNumOfChannelsChanged` slot will update curve list.
     if (channel < plotMan->numOfCurves()) // check if channel exists in curve list
+    {
         plotMan->setTitle(channel, name);
+    }
+}
 void MainWindow::onSpsChanged(unsigned sps)
+{
     spsLabel.setText(QString::number(sps) + "sps");
+}
 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();
-            ui->plot->replot();
+            plotMan->replot();
+        }
         else
+        {
             ui->actionDemoMode->setChecked(false);
+        }
+    }
     else
+    {
         dataFormatPanel.enableDemo(false);
         ui->actionDemoMode->setChecked(false);
         demoIndicator.hide();
-        ui->plot->replot();
+        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
+    {
         ui->actionPause->setChecked(wasPaused);
+    }
     else
+    {
         Snapshot* snapshot = snapshotMan.makeSnapshot();
         snapshot->save(fileName);
         delete snapshot;
+    }
+}
 void MainWindow::messageHandler(QtMsgType type,
                                 const QMessageLogContext &context,

src/plotmanager.cpp

➞

Show inline comments

@@ @@ -183,24 +183,39 @@ void PlotManager::removeCurves(unsigned @@
 unsigned PlotManager::numOfCurves()
+{
     return curves.size();
+}
 void PlotManager::setTitle(unsigned index, QString title)
+{
     curves[index]->setTitle(title);
     plotWidget(index)->replot();
+}
 Plot* PlotManager::plotWidget(unsigned curveIndex)
+{
     if (isMulti)
+    {
         return plotWidgets[curveIndex];
+    }
     else
+    {
         return plotWidgets[0];
+    }
+}
 void PlotManager::replot()
+{
     if (isMulti)
+    {
         for (auto plot : plotWidgets)
+        {
             plot->replot();
+        }
+    }
     else
+    {
         plotWidgets[0]->replot();
+    }
+}

src/plotmanager.h

➞

Show inline comments

@@ @@ -35,40 +35,42 @@ class PlotManager : public QObject @@
     Q_OBJECT
 public:
     explicit PlotManager(QWidget* plotArea, QObject *parent = 0);
     ~PlotManager();
     /// Add a new curve with title and buffer. A color is
     /// automatically chosen for curve.
     void addCurve(QString title, FrameBuffer* buffer);
     /// Set the displayed title for a curve
     void setTitle(unsigned index, QString title);
     /// Removes curves from the end
     void removeCurves(unsigned number);
     /// Returns current number of curves known by plot manager
     unsigned numOfCurves();
 signals:
 public slots:
     /// Enable/Disable multiple plot display
     void setMulti(bool enabled);
     /// Update all plot widgets
     void replot();
 private:
     bool isMulti;
     QWidget* _plotArea;
     QVBoxLayout* layout; ///< layout of the `plotArea`
     QScrollArea* scrollArea;
     QList<QwtPlotCurve*> curves;
     QList<Plot*> plotWidgets;
     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);
 };
 #endif // PLOTMANAGER_H

0 comments (0 inline, 0 general)