tempo-plotter Changeset - 73a524b77e08 · protofusion repositories

Changeset - 73a524b77e08

Parent rev.

Child rev.

[Not reviewed]

bugfix/zoomer-channel-out-of-bound

0 1 0

Mehmet ASLAN - 7 years ago 2019-01-26 11:32:06
aaslan-mehmet@hotmail.com

zoomer index out of bound for channel info fixed

1 file changed with 10 insertions and 0 deletions:

src/plotmanager.cpp

0 comments (0 inline, 0 general)

src/plotmanager.cpp

➞

Show inline comments

@@ @@ -295,192 +295,202 @@ void PlotManager::setupLayout(bool multi @@
+    }
     else
+    {
         // delete scrollArea left from multi layout
         if (scrollArea != NULL)
+        {
             delete scrollArea;
             scrollArea = NULL;
+        }
         layout = new QVBoxLayout(_plotArea);
+    }
     layout->setContentsMargins(2,2,2,2);
     layout->setSpacing(1);
+}
 Plot* PlotManager::addPlotWidget()
+{
     auto plot = new Plot();
     plotWidgets.append(plot);
     layout->addWidget(plot);
     plot->darkBackground(_menu->darkBackgroundAction.isChecked());
     plot->showGrid(_menu->showGridAction.isChecked());
     plot->showMinorGrid(_menu->showMinorGridAction.isChecked());
     plot->showLegend(_menu->showLegendAction.isChecked());
     plot->setSymbols(_menu->showSymbols());
     plot->showDemoIndicator(isDemoShown);
     plot->setYAxis(_autoScaled, _yMin, _yMax);
     plot->setNumOfSamples(_numOfSamples);
     plot->setPlotWidth(_plotWidth);
     if (_xAxisAsIndex)
+    {
         plot->setXAxis(0, _numOfSamples);
+    }
     else
+    {
         plot->setXAxis(_xMin, _xMax);
+    }
     return plot;
+}
 void PlotManager::addCurve(QString title, const XFrameBuffer* xBuf, const FrameBuffer* yBuf)
+{
     auto curve = new QwtPlotCurve(title);
     auto series = new FrameBufferSeries(xBuf, yBuf);
     curve->setSamples(series);
     _addCurve(curve);
+}
 void PlotManager::_addCurve(QwtPlotCurve* curve)
+{
     // store and init the curve
     curves.append(curve);
     unsigned index = curves.size()-1;
     auto color = infoModel->color(index);
     curve->setPen(color);
     // create the plot for the curve if we are on multi display
     Plot* plot;
     if (isMulti)
+    {
         // create a new plot widget
         plot = addPlotWidget();
+    }
     else
+    {
         plot = plotWidgets[0];
+    }
     if (_stream != nullptr)     // not displaying snapshot
+    {
         QVector<const StreamChannel*> dispChannels;
         if (isMulti)
+        {
             dispChannels = QVector<const StreamChannel*>(1, _stream->channel(index));
+        }
         else
+        {
             dispChannels = _stream->allChannels();
+        }
         plot->setDispChannels(dispChannels);
+    }
     // show the curve
     curve->attach(plot);
     plot->replot();
+}
 void PlotManager::removeCurves(unsigned number)
+{
     if (_stream != nullptr)     // not displaying snapshot
+    {
         if (! isMulti)
+        {
             QVector<const StreamChannel*> dispChannels;
             dispChannels = _stream->allChannels();
             plotWidgets[0]->setDispChannels(dispChannels);
+        }
+    }
     for (unsigned i = 0; i < number; i++)
+    {
         if (!curves.isEmpty())
+        {
             delete curves.takeLast();
             if (isMulti) // delete corresponding widget as well
+            {
                 delete plotWidgets.takeLast();
+            }
+        }
+    }
+}
 unsigned PlotManager::numOfCurves()
+{
     return curves.size();
+}
 Plot* PlotManager::plotWidget(unsigned curveIndex)
+{
     if (isMulti)
+    {
         return plotWidgets[curveIndex];
+    }
     else
+    {
         return plotWidgets[0];
+    }
+}
 void PlotManager::replot()
+{
     for (auto plot : plotWidgets)
+    {
         plot->replot();
+    }
+}
 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::showDemoIndicator(bool show)
+{
     isDemoShown = show;
     for (auto plot : plotWidgets)
+    {
         plot->showDemoIndicator(show);
+    }
+}
 void PlotManager::unzoom()
+{
     for (auto plot : plotWidgets)
+    {
         plot->unzoom();
+    }
+}
 void PlotManager::darkBackground(bool enabled)
+{
     for (auto plot : plotWidgets)
+    {
         plot->darkBackground(enabled);
+    }
+}
 void PlotManager::setSymbols(Plot::ShowSymbols shown)
+{
     showSymbols = shown;
     for (auto plot : plotWidgets)
+    {
         plot->setSymbols(shown);
+    }
+}

0 comments (0 inline, 0 general)