tempo-plotter Changeset - 5a149e786568 · protofusion repositories

Changeset - 5a149e786568

Parent rev.

Child rev.

[Not reviewed]

default

0 4 0

Hasan Yavuz ÖZDERYA - 8 years ago 2017-04-30 12:59:48
hy@ozderya.net

fix for snapshot x axis being 0-1 at first display and glitch at later displays

4 files changed with 9 insertions and 6 deletions:

src/mainwindow.cpp

src/plotmanager.cpp

src/plotmanager.h

src/snapshotview.cpp

0 comments (0 inline, 0 general)

src/mainwindow.cpp

➞

Show inline comments

@@ @@ -139,7 +139,7 @@ MainWindow::MainWindow(QWidget *parent) @@
             this, &MainWindow::onNumOfSamplesChanged);
     connect(&plotControlPanel, &PlotControlPanel::numOfSamplesChanged,
-            plotMan, &PlotManager::onNumOfSamplesChanged);
+            plotMan, &PlotManager::setNumOfSamples);
     connect(&plotControlPanel, &PlotControlPanel::yScaleChanged,
             plotMan, &PlotManager::setYAxis);
@@ @@ -221,7 +221,7 @@ MainWindow::MainWindow(QWidget *parent) @@
                       plotControlPanel.yMin(), plotControlPanel.yMax());
     plotMan->setXAxis(plotControlPanel.xAxisAsIndex(),
                       plotControlPanel.xMin(), plotControlPanel.xMax());
-    plotMan->onNumOfSamplesChanged(numOfSamples);
+    plotMan->setNumOfSamples(numOfSamples);
     // Init sps (sample per second) counter
     spsLabel.setText("0sps");

src/plotmanager.cpp

➞

Show inline comments

@@ @@ -508,7 +508,7 @@ void PlotManager::flashSnapshotOverlay() @@
+    }
+}
-void PlotManager::onNumOfSamplesChanged(unsigned value)
+void PlotManager::setNumOfSamples(unsigned value)
+{
     _numOfSamples = value;
     for (auto plot : plotWidgets)

src/plotmanager.h

➞

Show inline comments

@@ @@ -73,7 +73,7 @@ public slots: @@
     /// Display an animation for snapshot
     void flashSnapshotOverlay();
     /// Should be called to update zoom base
-    void onNumOfSamplesChanged(unsigned value);
+    void setNumOfSamples(unsigned value);
 private:
     bool isMulti;

src/snapshotview.cpp

➞

Show inline comments

 /*
-  Copyright © 2015 Hasan Yavuz Özderya
+  Copyright © 2017 Hasan Yavuz Özderya
   This file is part of serialplot.
@@ @@ -29,17 +29,19 @@ SnapshotView::SnapshotView(QWidget *pare @@
     ui->setupUi(this);
     plotMan = new PlotManager(ui->plotArea, snapshot->infoModel());
+    plotMan = new PlotManager(ui->plotArea, snapshot->infoModel(), this);
     ui->menuSnapshot->insertAction(ui->actionClose, snapshot->deleteAction());
     this->setWindowTitle(snapshot->displayName());
     // initialize curves
     unsigned numOfChannels = snapshot->data.size();
     unsigned numOfSamples = snapshot->data[0].size();
     for (unsigned ci = 0; ci < numOfChannels; ci++)
+    {
         plotMan->addCurve(snapshot->channelName(ci), snapshot->data[ci]);
+    }
     plotMan->setNumOfSamples(numOfSamples);
     renameDialog.setWindowTitle("Rename Snapshot");
     renameDialog.setLabelText("Enter new name:");
@@ @@ -62,6 +64,7 @@ SnapshotView::~SnapshotView() @@
+    {
         delete curve;
+    }
     delete plotMan;
     delete ui;
+}

0 comments (0 inline, 0 general)