tempo-plotter Changeset - 0e27c36ff949 · protofusion repositories

Changeset - 0e27c36ff949

Parent rev.

Child rev.

[Not reviewed]

x-axis-scaling

0 3 0

Hasan Yavuz ÖZDERYA - 9 years ago 2017-04-01 08:49:22
hy@ozderya.net

fix symbols

3 files changed with 14 insertions and 6 deletions:

src/plot.cpp

src/plot.h

src/plotmanager.cpp

0 comments (0 inline, 0 general)

src/plot.cpp

➞

Show inline comments

@@ @@ -29,24 +29,25 @@ @@
 #include "utils.h"
 static const int SYMBOL_SHOW_AT_WIDTH = 5;
 static const int SYMBOL_SIZE_MAX = 7;
 Plot::Plot(QWidget* parent) :
     QwtPlot(parent),
     zoomer(this->canvas(), false),
     sZoomer(this, &zoomer)
+{
     isAutoScaled = true;
     symbolSize = 0;
     numOfSamples = 1;
     QObject::connect(&zoomer, &Zoomer::unzoomed, this, &Plot::unzoomed);
     zoomer.setZoomBase();
     grid.attach(this);
     legend.attach(this);
     showGrid(false);
     darkBackground(false);
     snapshotOverlay = NULL;
@@ @@ -241,25 +242,28 @@ void Plot::flashSnapshotOverlay(bool lig @@
             [this]()
+            {
                 delete snapshotOverlay;
                 snapshotOverlay = NULL;
             });
+}
 void Plot::onXScaleChanged()
+{
     auto sw = axisWidget(QwtPlot::xBottom);
     auto paintDist = sw->scaleDraw()->scaleMap().pDist();
     auto scaleDist = sw->scaleDraw()->scaleMap().sDist();
     int symDisPx = round(paintDist / scaleDist);
     auto fullScaleDist = zoomer.zoomBase().width();
     auto zoomRate = fullScaleDist / scaleDist;
     float samplesInView = numOfSamples / zoomRate;
     int symDisPx = round(paintDist / samplesInView);
     if (symDisPx < SYMBOL_SHOW_AT_WIDTH)
+    {
         symbolSize = 0;
+    }
     else
+    {
         symbolSize = std::min(SYMBOL_SIZE_MAX, symDisPx-SYMBOL_SHOW_AT_WIDTH+1);
+    }
     updateSymbols();
+}
@@ @@ -285,17 +289,22 @@ void Plot::updateSymbols() @@
+        }
+    }
+}
 void Plot::resizeEvent(QResizeEvent * event)
+{
     QwtPlot::resizeEvent(event);
     onXScaleChanged();
+}
 void Plot::onNumOfSamplesChanged(unsigned value)
+{
     numOfSamples = value;
     onXScaleChanged();
     // TODO: what to do with this?
     // auto currentBase = zoomer.zoomBase();
     // currentBase.setWidth(value);
     // zoomer.setZoomBase(currentBase);
     // onXScaleChanged();
+}

src/plot.h

➞

Show inline comments

@@ @@ -63,24 +63,25 @@ public slots: @@
     void flashSnapshotOverlay(bool light);
     void onNumOfSamplesChanged(unsigned value);
 protected:
     /// update the display of symbols depending on `symbolSize`
     void updateSymbols();
 private:
     bool isAutoScaled;
     double yMin, yMax;
     double _xMin, _xMax;
     unsigned numOfSamples;
     int symbolSize;
     Zoomer zoomer;
     ScaleZoomer sZoomer;
     QwtPlotGrid grid;
     PlotSnapshotOverlay* snapshotOverlay;
     QwtPlotLegendItem legend;
     QwtPlotTextLabel demoIndicator;
     void resetAxes();
     void resizeEvent(QResizeEvent * event);
 private slots:

src/plotmanager.cpp

➞

Show inline comments

@@ @@ -453,30 +453,28 @@ void PlotManager::setXAxis(bool asIndex, @@
 void PlotManager::flashSnapshotOverlay()
+{
     for (auto plot : plotWidgets)
+    {
         plot->flashSnapshotOverlay(darkBackgroundAction.isChecked());
+    }
+}
 void PlotManager::onNumOfSamplesChanged(unsigned value)
+{
     _numOfSamples = value;
-    if (_xAxisAsIndex)
+    for (auto plot : plotWidgets)
+    {
         for (auto plot : plotWidgets)
+        {
             plot->setXAxis(0, value);
+        }
         plot->onNumOfSamplesChanged(value);
         if (_xAxisAsIndex) plot->setXAxis(0, value);
+    }
+}
 void PlotManager::saveSettings(QSettings* settings)
+{
     settings->beginGroup(SettingGroup_Plot);
     settings->setValue(SG_Plot_DarkBackground, darkBackgroundAction.isChecked());
     settings->setValue(SG_Plot_Grid, showGridAction.isChecked());
     settings->setValue(SG_Plot_MinorGrid, showMinorGridAction.isChecked());
     settings->setValue(SG_Plot_Legend, showLegendAction.isChecked());
     settings->setValue(SG_Plot_MultiPlot, showMultiAction.isChecked());
     settings->endGroup();

0 comments (0 inline, 0 general)