tempo-plotter Changeset - c35baca48756 · protofusion repositories

Changeset - c35baca48756

Parent rev.

Child rev.

[Not reviewed]

scrollbar-exp

0 2 0

Hasan Yavuz ÖZDERYA - 8 years ago 2017-08-16 12:28:53
hy@ozderya.net

fix auto show symbols

2 files changed with 5 insertions and 1 deletions:

src/plot.cpp

src/plot.h

0 comments (0 inline, 0 general)

src/plot.cpp

➞

Show inline comments

@@ @@ -30,24 +30,25 @@ @@
 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;
     plotWidth = 1;
     showSymbols = Plot::ShowSymbolsAuto;
     QObject::connect(&zoomer, &Zoomer::unzoomed, this, &Plot::unzoomed);
     zoomer.setZoomBase();
     grid.attach(this);
     legend.attach(this);
     showGrid(false);
     darkBackground(false);
     snapshotOverlay = NULL;
@@ @@ -293,25 +294,26 @@ void Plot::onXScaleChanged() @@
         calcSymbolSize();
         updateSymbols();
+    }
+}
 void Plot::calcSymbolSize()
+{
     auto sw = axisWidget(QwtPlot::xBottom);
     auto paintDist = sw->scaleDraw()->scaleMap().pDist();
     auto scaleDist = sw->scaleDraw()->scaleMap().sDist();
     auto fullScaleDist = zoomer.zoomBase().width();
     auto zoomRate = fullScaleDist / scaleDist;
     float samplesInView = numOfSamples / zoomRate;
     float plotWidthNumSamp = abs(numOfSamples * plotWidth / (_xMax - _xMin));
     float samplesInView = plotWidthNumSamp / 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);
+    }
+}
@@ @@ -342,14 +344,15 @@ void Plot::resizeEvent(QResizeEvent * ev @@
     QwtPlot::resizeEvent(event);
     onXScaleChanged();
+}
 void Plot::setNumOfSamples(unsigned value)
+{
     numOfSamples = value;
     onXScaleChanged();
+}
 void Plot::setPlotWidth(double width)
+{
     plotWidth = width;
     zoomer.setHViewSize(width);
+}

src/plot.h

➞

Show inline comments

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

0 comments (0 inline, 0 general)