tempo-plotter Changeset - 432ae2fe0870 · protofusion repositories

Changeset - 432ae2fe0870

Parent rev.

Child rev.

[Not reviewed]

Merge scrollbar-exp

0 5 0

Hasan Yavuz ÖZDERYA - 8 years ago 2017-08-16 09:23:56
hy@ozderya.net

Merge with default

5 files changed with 50 insertions and 5 deletions:

src/framebufferseries.cpp

src/plot.cpp

src/plot.h

src/plotmanager.cpp

src/plotmanager.h

0 comments (0 inline, 0 general)

src/framebufferseries.cpp

➞

Show inline comments

@@ @@ -14,12 +14,13 @@ @@
   GNU General Public License for more details.
   You should have received a copy of the GNU General Public License
   along with serialplot.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include <math.h>
 #include "framebufferseries.h"
 FrameBufferSeries::FrameBufferSeries(FrameBuffer* buffer)
+{
     xAsIndex = true;
     _xmin = 0;
@@ @@ -70,20 +71,20 @@ QRectF FrameBufferSeries::boundingRect() @@
+}
 void FrameBufferSeries::setRectOfInterest(const QRectF& rect)
+{
     if (xAsIndex)
+    {
         int_index_start = rect.left();
         int_index_end = rect.right();
         int_index_start = floor(rect.left())-1;
         int_index_end = ceil(rect.right())+1;
+    }
     else
+    {
         double xsize = _xmax - _xmin;
         size_t bsize = _buffer->size();
         int_index_start =  bsize * (rect.left()-_xmin) / xsize;
         int_index_end = bsize * (rect.right()-_xmin) / xsize;
         int_index_start =  floor(bsize * (rect.left()-_xmin) / xsize)-1;
         int_index_end = ceil(bsize * (rect.right()-_xmin) / xsize)+1;
+    }
     int_index_start = std::max(int_index_start, (size_t) 0);
     int_index_end = std::min(_buffer->size(), int_index_end);
+}

src/plot.cpp

➞

Show inline comments

@@ @@ -70,12 +70,22 @@ Plot::Plot(QWidget* parent) : @@
     demoText.setBackgroundBrush(Qt::darkRed);
     demoText.setBorderRadius(4);
     demoText.setRenderFlags(Qt::AlignLeft | Qt::AlignBottom);
     demoIndicator.setText(demoText);
     demoIndicator.hide();
     demoIndicator.attach(this);
     // init no channels are visible indicator
     QwtText noChannelText(" No Visible Channels ");
     noChannelText.setColor(QColor("white"));
     noChannelText.setBackgroundBrush(Qt::darkBlue);
     noChannelText.setBorderRadius(4);
     noChannelText.setRenderFlags(Qt::AlignHCenter | Qt::AlignVCenter);
     noChannelIndicator.setText(noChannelText);
     noChannelIndicator.hide();
     noChannelIndicator.attach(this);
+}
 Plot::~Plot()
+{
     if (snapshotOverlay != NULL) delete snapshotOverlay;
+}
@@ @@ -161,12 +171,18 @@ void Plot::showLegend(bool show) @@
 void Plot::showDemoIndicator(bool show)
+{
     demoIndicator.setVisible(show);
     replot();
+}
 void Plot::showNoChannel(bool show)
+{
     noChannelIndicator.setVisible(show);
     replot();
+}
 void Plot::unzoom()
+{
     zoomer.zoom(0);
+}
 void Plot::darkBackground(bool enabled)

src/plot.h

➞

Show inline comments

@@ @@ -54,12 +54,13 @@ public: @@
 public slots:
     void showGrid(bool show = true);
     void showMinorGrid(bool show = true);
     void showLegend(bool show = true);
     void showDemoIndicator(bool show = true);
     void showNoChannel(bool show = true);
     void unzoom();
     void darkBackground(bool enabled = true);
     void setYAxis(bool autoScaled, double yMin = 0, double yMax = 1);
     void setXAxis(double xMin, double xMax);
     void setSymbols(ShowSymbols shown);
@@ @@ -85,12 +86,13 @@ private: @@
     Zoomer zoomer;
     ScaleZoomer sZoomer;
     QwtPlotGrid grid;
     PlotSnapshotOverlay* snapshotOverlay;
     QwtPlotLegendItem legend;
     QwtPlotTextLabel demoIndicator;
     QwtPlotTextLabel noChannelIndicator;
     ShowSymbols showSymbols;
     void resetAxes();
     void resizeEvent(QResizeEvent * event);
     void calcSymbolSize();

src/plotmanager.cpp

➞

Show inline comments

@@ @@ -14,12 +14,13 @@ @@
   GNU General Public License for more details.
   You should have received a copy of the GNU General Public License
   along with serialplot.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include <algorithm>
 #include <QActionGroup>
 #include <QMetaEnum>
 #include <QtDebug>
 #include "qwt_symbol.h"
 #include "plot.h"
@@ @@ -43,12 +44,13 @@ PlotManager::PlotManager(QWidget* plotAr @@
     _yMax = 1;
     _xAxisAsIndex = true;
     isDemoShown = false;
     _infoModel = infoModel;
     _numOfSamples = 1;
     showSymbols = Plot::ShowSymbolsAuto;
     emptyPlot = NULL;
     // initalize layout and single widget
     isMulti = false;
     scrollArea = NULL;
     setupLayout(isMulti);
     addPlotWidget();
@@ @@ -153,12 +155,13 @@ PlotManager::~PlotManager() @@
     while (plotWidgets.size())
+    {
         delete plotWidgets.takeLast();
+    }
     if (scrollArea != NULL) delete scrollArea;
     if (emptyPlot != NULL) delete emptyPlot;
+}
 void PlotManager::onChannelInfoChanged(const QModelIndex &topLeft,
                                        const QModelIndex &bottomRight,
                                        const QVector<int> &roles)
+{
@@ @@ -186,21 +189,37 @@ void PlotManager::onChannelInfoChanged(c @@
+            {
                 plotWidgets[ci]->replot();
+            }
+        }
+    }
     checkNoVisChannels();
     // replot single widget
     if (!isMulti)
+    {
         plotWidgets[0]->updateSymbols();
         plotWidgets[0]->updateLegend();
         replot();
+    }
+}
 void PlotManager::checkNoVisChannels()
+{
     // if all channels are hidden show indicator
     bool allhidden = std::none_of(curves.cbegin(), curves.cend(),
                                   [](QwtPlotCurve* c) {return c->isVisible();});
     plotWidgets[0]->showNoChannel(allhidden);
     if (isMulti)
+    {
         plotWidgets[0]->showNoChannel(allhidden);
         plotWidgets[0]->setVisible(true);
+    }
+}
 void PlotManager::setMulti(bool enabled)
+{
     if (enabled == isMulti) return;
     isMulti = enabled;
@@ @@ -221,13 +240,15 @@ void PlotManager::setMulti(bool enabled) @@
     if (isMulti)
+    {
         // add new widgets and attach
         for (auto curve : curves)
+        {
             curve->attach(addPlotWidget());
             auto plot = addPlotWidget();
             plot->setVisible(curve->isVisible());
             curve->attach(plot);
+        }
+    }
     else
+    {
         // add a single widget
         auto plot = addPlotWidget();
@@ @@ -235,12 +256,14 @@ void PlotManager::setMulti(bool enabled) @@
         // attach all curves
         for (auto curve : curves)
+        {
             curve->attach(plot);
+        }
+    }
     checkNoVisChannels();
+}
 void PlotManager::setupLayout(bool multiPlot)
+{
     // delete previous layout if it exists
     if (_plotArea->layout() != 0)

src/plotmanager.h

➞

Show inline comments

@@ @@ -93,12 +93,13 @@ private: @@
     bool isMulti;
     QWidget* _plotArea;
     QVBoxLayout* layout; ///< layout of the `plotArea`
     QScrollArea* scrollArea;
     QList<QwtPlotCurve*> curves;
     QList<Plot*> plotWidgets;
     Plot* emptyPlot;  ///< for displaying when all channels are hidden
     ChannelInfoModel* _infoModel;
     bool isDemoShown;
     bool _autoScaled;
     double _yMin;
     double _yMax;
     bool _xAxisAsIndex;
@@ @@ -125,12 +126,14 @@ private: @@
     Plot* addPlotWidget();
     /// Returns the plot widget that given curve is attached to
     Plot* plotWidget(unsigned curveIndex);
     /// Common part of overloaded `addCurve` functions
     void _addCurve(QwtPlotCurve* curve);
     void setSymbols(Plot::ShowSymbols shown);
     /// Check and make sure "no visible channels" text is shown
     void checkNoVisChannels();
 private slots:
     void showGrid(bool show = true);
     void showMinorGrid(bool show = true);
     void showLegend(bool show = true);
     void unzoom();

0 comments (0 inline, 0 general)