tempo-plotter Changeset - 52f54b71dc6b · protofusion repositories

Changeset - 52f54b71dc6b

Parent rev.

Child rev.

[Not reviewed]

snapshots

0 6 0

Hasan Yavuz ÖZDERYA - 10 years ago 2015-09-19 15:46:37
hy@ozderya.net

plot snapshots with color

6 files changed with 38 insertions and 35 deletions:

mainwindow.cpp

mainwindow.h

plot.cpp

plot.h

snapshotview.cpp

snapshotview.h

0 comments (0 inline, 0 general)

mainwindow.cpp

➞

Show inline comments

@@ @@ -23,24 +23,25 @@ @@
 #include <QApplication>
 #include <QFileDialog>
 #include <QFile>
 #include <QTextStream>
 #include <QtDebug>
 #include <QtEndian>
 #include <qwt_plot.h>
 #include <limits.h>
 #include <cmath>
 #include <iostream>
 #include <snapshotview.h>
 #include <plot.h>
 #include "utils.h"
 #include "version.h"
 #include "floatswap.h"
 #if defined(Q_OS_WIN) && defined(QT_STATIC)
 #include <QtPlugin>
 Q_IMPORT_PLUGIN(QWindowsIntegrationPlugin)
 #endif
 struct Range
+{
@@ @@ -148,25 +149,25 @@ MainWindow::MainWindow(QWidget *parent) @@
     // init data arrays and plot
     numOfSamples = ui->spNumOfSamples->value();
     numOfChannels = ui->spNumOfChannels->value();
     // init channel data and curve list
     for (unsigned int i = 0; i < numOfChannels; i++)
+    {
         channelBuffers.append(new FrameBuffer(numOfSamples));
         curves.append(new QwtPlotCurve());
         curves[i]->setSamples(channelBuffers[i]);
         curves[i]->setPen(makeColor(i));
+        curves[i]->setPen(Plot::makeColor(i));
         curves[i]->attach(ui->plot);
+    }
     // init auto scale
     ui->plot->setAxis(ui->cbAutoScale->isChecked(),
                       ui->spYmin->value(), ui->spYmax->value());
     // init grid
     ui->plot->showGrid(ui->actionGrid->isChecked());
     ui->plot->showMinorGrid(ui->actionMinorGrid->isChecked());
     // init scale range preset list
@@ @@ -462,25 +463,25 @@ void MainWindow::onNumOfChannelsChanged( @@
+{
     unsigned int oldNum = this->numOfChannels;
     this->numOfChannels = value;
     if (numOfChannels > oldNum)
+    {
         // add new channels
         for (unsigned int i = 0; i < numOfChannels - oldNum; i++)
+        {
             channelBuffers.append(new FrameBuffer(numOfSamples));
             curves.append(new QwtPlotCurve());
             curves.last()->setSamples(channelBuffers.last());
             curves.last()->setPen(makeColor(curves.length()-1));
+            curves.last()->setPen(Plot::makeColor(curves.length()-1));
             curves.last()->attach(ui->plot);
+        }
+    }
     else if(numOfChannels < oldNum)
+    {
         // remove channels
         for (unsigned int i = 0; i < oldNum - numOfChannels; i++)
+        {
             // also deletes owned FrameBuffer
             delete curves.takeLast();
             channelBuffers.removeLast();
+        }
@@ @@ -644,55 +645,24 @@ void MainWindow::enableDemo(bool enabled @@
             ui->actionDemoMode->setChecked(false);
+        }
+    }
     else
+    {
         demoTimer.stop();
         ui->actionDemoMode->setChecked(false);
         demoIndicator.hide();
         ui->plot->replot();
+    }
+}
 /*
   Below crude drawing demostrates how color selection occurs for
   given channel index
 °                     <--Hue Value-->                           360°
   |* . o . + . o . * . o . + . o . * . o . + . o . * . o . + . o . |
   * -> 0-3
   + -> 4-7
   o -> 8-15
   . -> 16-31
  */
 QColor MainWindow::makeColor(unsigned int channelIndex)
+{
     auto i = channelIndex;
     if (i < 4)
+    {
         return QColor::fromHsv(360*i/4, 255, 230);
+    }
     else
+    {
         double p = floor(log2(i));
         double n = pow(2, p);
         i = i - n;
         return QColor::fromHsv(360*i/n + 360/pow(2,p+1), 255, 230);
+    }
+}
 void MainWindow::onExportCsv()
+{
     bool wasPaused = ui->actionPause->isChecked();
     ui->actionPause->setChecked(true); // pause plotting
     QString fileName = QFileDialog::getSaveFileName(this, tr("Export CSV File"));
     if (fileName.isNull())  // user canceled export
+    {
         ui->actionPause->setChecked(wasPaused);
+    }
     else

mainwindow.h

➞

Show inline comments

@@ @@ -100,26 +100,24 @@ private: @@
     unsigned int sampleCount;
     QTimer spsTimer;
     // snapshots
     QList<SnapShot*> snapshots;
     // demo
     QTimer demoTimer;
     int demoCount;
     bool isDemoRunning();
     QwtPlotTextLabel demoIndicator;
     QColor makeColor(unsigned int channelIndex);
 private slots:
     void onPortToggled(bool open);
     void onDataReady();      // used with binary number formats
     void onDataReadyASCII(); // used with ASCII number format
     void onPortError(QSerialPort::SerialPortError error);
     void skipByte();
     void onNumOfSamplesChanged(int value);
     void onAutoScaleChecked(bool checked);
     void onYScaleChanged();
     void onRangeSelected();

plot.cpp

➞

Show inline comments

@@ @@ -101,12 +101,42 @@ void Plot::darkBackground(bool enabled) @@
         sZoomer.setPickerPen(QPen(Qt::white));
+    }
     else
+    {
         setCanvasBackground(QBrush(Qt::white));
         grid.setPen(Qt::lightGray);
         zoomer.setRubberBandPen(QPen(Qt::black));
         zoomer.setTrackerPen(QPen(Qt::black));
         sZoomer.setPickerPen(QPen(Qt::black));
+    }
     replot();
+}
 /*
   Below crude drawing demostrates how color selection occurs for
   given channel index
 °                     <--Hue Value-->                           360°
   |* . o . + . o . * . o . + . o . * . o . + . o . * . o . + . o . |
   * -> 0-3
   + -> 4-7
   o -> 8-15
   . -> 16-31
  */
 QColor Plot::makeColor(unsigned int channelIndex)
+{
     auto i = channelIndex;
     if (i < 4)
+    {
         return QColor::fromHsv(360*i/4, 255, 230);
+    }
     else
+    {
         double p = floor(log2(i));
         double n = pow(2, p);
         i = i - n;
         return QColor::fromHsv(360*i/n + 360/pow(2,p+1), 255, 230);
+    }
+}

plot.h

➞

Show inline comments

@@ @@ -11,38 +11,41 @@ @@
   serialplot is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   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/>.
 */
 #ifndef PLOT_H
 #define PLOT_H
 #include <QColor>
 #include <qwt_plot.h>
 #include <qwt_plot_grid.h>
 #include <qwt_plot_shapeitem.h>
 #include "zoomer.h"
 #include "scalezoomer.h"
 class Plot : public QwtPlot
+{
     Q_OBJECT
 public:
     Plot(QWidget* parent = 0);
     void setAxis(bool autoScaled, double yMin = 0, double yMax = 1);
     static QColor makeColor(unsigned int channelIndex);
 private:
     bool isAutoScaled;
     double yMin, yMax;
     Zoomer zoomer;
     ScaleZoomer sZoomer;
     QwtPlotGrid grid;
     QwtPlotShapeItem rectItem;
     void resetAxes();
 public slots:
     void showGrid(bool show = true);

snapshotview.cpp

➞

Show inline comments

@@ @@ -5,24 +5,25 @@ SnapShotView::SnapShotView(QWidget *pare @@
     QMainWindow(parent),
     ui(new Ui::SnapShotView)
+{
     ui->setupUi(this);
     unsigned numOfChannels = snapShot->data.size();
     for (unsigned ci = 0; ci < numOfChannels; ci++)
+    {
         QwtPlotCurve* curve = new QwtPlotCurve();
         curves.append(curve);
         curve->setSamples(snapShot->data[ci]);
         curve->setPen(Plot::makeColor(ci));
         curve->attach(ui->plot);
+    }
     _snapShot = snapShot;
+}
 SnapShotView::~SnapShotView()
+{
     for (auto curve : curves)
+    {
         delete curve;
+    }

snapshotview.h

➞

Show inline comments

 #ifndef SNAPSHOTVIEW_H
 #define SNAPSHOTVIEW_H
 #include <QMainWindow>
 #include <QVector>
 #include <QPointF>
 #include <QPen>
 #include <qwt_plot_curve.h>
 #include "plot.h"
 class SnapShotView;
 struct SnapShot
+{
     QString name;
     QVector<QVector<QPointF>> data;
     SnapShotView* view;
 };
 namespace Ui {

0 comments (0 inline, 0 general)