tempo-plotter Changeset - 2f04c80c72e3 · protofusion repositories

Changeset - 2f04c80c72e3

Parent rev.

Child rev.

[Not reviewed]

plot-manager

0 5 0

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

implemented PlotManager::flashSnapshotOverlay

5 files changed with 19 insertions and 6 deletions:

src/mainwindow.cpp

src/plot.cpp

src/plot.h

src/plotmanager.cpp

src/plotmanager.h

0 comments (0 inline, 0 general)

src/mainwindow.cpp

➞

Show inline comments

@@ @@ -130,13 +130,13 @@ MainWindow::MainWindow(QWidget *parent) @@
             plotMan, &PlotManager::setMulti);
     QObject::connect(ui->actionClear, SIGNAL(triggered(bool)),
                      this, SLOT(clearPlot()));
     QObject::connect(snapshotMan.takeSnapshotAction(), &QAction::triggered,
-                     ui->plot, &Plot::flashSnapshotOverlay);
+                     plotMan, &PlotManager::flashSnapshotOverlay);
     // init port signals
     QObject::connect(&(this->serialPort), SIGNAL(error(QSerialPort::SerialPortError)),
                      this, SLOT(onPortError(QSerialPort::SerialPortError)));
     // init data format and reader

src/plot.cpp

➞

Show inline comments

@@ @@ -178,20 +178,18 @@ QColor Plot::makeColor(unsigned int chan @@
         double n = pow(2, p);
         i = i - n;
         return QColor::fromHsv(360*i/n + 360/pow(2,p+1), 255, 230);
+    }
+}
 void Plot::flashSnapshotOverlay()
+void Plot::flashSnapshotOverlay(bool light)
+{
     if (snapshotOverlay != NULL) delete snapshotOverlay;
     QColor color;
     // TODO: fix snapshot overlay
     // if (darkBackgroundAction.isChecked())
     if(1)
     if(light)
+    {
         color = QColor(Qt::white);
+    }
     else
+    {
         color = QColor(Qt::black);

src/plot.h

➞

Show inline comments

@@ @@ -61,13 +61,18 @@ public slots: @@
     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();
     /**
      * Displays an animation for snapshot.
+     *
      * @param light show a light colored (white) animation or the opposite
      */
     void flashSnapshotOverlay(bool light);
 private slots:
     void unzoomed();
 };
 #endif // PLOT_H

src/plotmanager.cpp

➞

Show inline comments

@@ @@ -325,6 +325,14 @@ void PlotManager::setAxis(bool autoScale @@
     _yMax = yAxisMax;
     for (auto plot : plotWidgets)
+    {
         plot->setAxis(autoScaled, yAxisMin, yAxisMax);
+    }
+}
 void PlotManager::flashSnapshotOverlay()
+{
     for (auto plot : plotWidgets)
+    {
         plot->flashSnapshotOverlay(darkBackgroundAction.isChecked());
+    }
+}

src/plotmanager.h

➞

Show inline comments

@@ @@ -60,12 +60,14 @@ public slots: @@
     /// 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);
     /// Display an animation for snapshot
     void flashSnapshotOverlay();
 private:
     bool isMulti;
     QWidget* _plotArea;
     QVBoxLayout* layout; ///< layout of the `plotArea`
     QScrollArea* scrollArea;

0 comments (0 inline, 0 general)