tempo-plotter Changeset - baaf95cd2089 · protofusion repositories

Changeset - baaf95cd2089

Parent rev.

Child rev.

[Not reviewed]

plot-manager

0 4 0

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

enabled legend menu item

4 files changed with 22 insertions and 4 deletions:

src/plot.cpp

src/plot.h

src/plotmanager.cpp

src/plotmanager.h

0 comments (0 inline, 0 general)

src/plot.cpp

➞

Show inline comments

@@ @@ -89,24 +89,30 @@ void Plot::showGrid(bool show) @@
     grid.enableX(show);
     grid.enableY(show);
     replot();
+}
 void Plot::showMinorGrid(bool show)
+{
     grid.enableXMin(show);
     grid.enableYMin(show);
     replot();
+}
 void Plot::showLegend(bool show)
+{
     legend.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

@@ @@ -47,23 +47,24 @@ private: @@
     double yMin, yMax;
     Zoomer zoomer;
     ScaleZoomer sZoomer;
     QwtPlotGrid grid;
     PlotSnapshotOverlay* snapshotOverlay;
     QwtPlotLegendItem legend;
     void resetAxes();
 public slots:
     void showGrid(bool show = true);
     void showMinorGrid(bool show = true);
     void showLegend(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

@@ @@ -61,27 +61,26 @@ PlotManager::PlotManager(QWidget* plotAr @@
     showMinorGridAction.setEnabled(false);
     connect(&showGridAction, SELECT<bool>::OVERLOAD_OF(&QAction::triggered),
             this, &PlotManager::showGrid);
     connect(&showGridAction, SELECT<bool>::OVERLOAD_OF(&QAction::triggered),
             &showMinorGridAction, &QAction::setEnabled);
     connect(&showMinorGridAction, SELECT<bool>::OVERLOAD_OF(&QAction::triggered),
             this, &PlotManager::showMinorGrid);
     connect(&unzoomAction, &QAction::triggered, this, &PlotManager::unzoom);
     connect(&darkBackgroundAction, SELECT<bool>::OVERLOAD_OF(&QAction::triggered),
             this, &PlotManager::darkBackground);
     // TODO: enable legend
     // connect(&showLegendAction, SELECT<bool>::OVERLOAD_OF(&QAction::triggered),
     //         [this](bool enabled){legend.setVisible(enabled); replot();});
     connect(&showLegendAction, SELECT<bool>::OVERLOAD_OF(&QAction::triggered),
             this, &PlotManager::showLegend);
+}
 PlotManager::~PlotManager()
+{
     while (curves.size())
+    {
         delete curves.takeLast();
+    }
     // remove all widgets
     while (plotWidgets.size())
+    {
@@ @@ -165,25 +164,25 @@ void PlotManager::setupLayout(bool multi @@
     layout->setSpacing(1);
+}
 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());
-    // TODO: show legend
+    plot->showLegend(showLegendAction.isChecked());
     return plot;
+}
 void PlotManager::addCurve(QString title, FrameBuffer* buffer)
+{
     Plot* plot;
     if (isMulti)
+    {
         // create a new plot widget
         plot = addPlotWidget();
@@ @@ -261,33 +260,44 @@ QList<QAction*> PlotManager::menuActions @@
     actions << &darkBackgroundAction;
     actions << &showLegendAction;
     return actions;
+}
 void PlotManager::showGrid(bool show)
+{
     for (auto plot : plotWidgets)
+    {
         plot->showGrid(show);
+    }
+}
 void PlotManager::showMinorGrid(bool show)
+{
     for (auto plot : plotWidgets)
+    {
         plot->showMinorGrid(show);
+    }
+}
 void PlotManager::showLegend(bool show)
+{
     for (auto plot : plotWidgets)
+    {
         plot->showLegend(show);
+    }
+}
 void PlotManager::unzoom()
+{
     for (auto plot : plotWidgets)
+    {
         plot->unzoom();
+    }
+}
 void PlotManager::darkBackground(bool enabled)
+{
     for (auto plot : plotWidgets)
+    {
         plot->darkBackground(enabled);
+    }
+}

src/plotmanager.h

➞

Show inline comments

@@ @@ -74,17 +74,18 @@ private: @@
     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);
 private slots:
     void showGrid(bool show = true);
     void showMinorGrid(bool show = true);
     void showLegend(bool show = true);
     void unzoom();
     void darkBackground(bool enabled = true);
 };
 #endif // PLOTMANAGER_H

0 comments (0 inline, 0 general)