tempo-plotter Changeset - 84f4fcdcd017 · protofusion repositories

Changeset - 84f4fcdcd017

Parent rev.

Child rev.

[Not reviewed]

snapshots

0 5 2

Hasan Yavuz ÖZDERYA - 10 years ago 2015-09-20 16:10:31
hy@ozderya.net

moved snapshot functions to a new class (SnapshotManager) from mainwindow

7 files changed with 159 insertions and 103 deletions:

CMakeLists.txt

mainwindow.cpp

mainwindow.h

mainwindow.ui

serialplot.pro

snapshotmanager.cpp

snapshotmanager.h

0 comments (0 inline, 0 general)

CMakeLists.txt

➞

Show inline comments

@@ @@ -70,12 +70,13 @@ add_executable(${PROGRAM_NAME} WIN32 @@
   framebuffer.cpp
   scalepicker.cpp
   scalezoomer.cpp
   portlist.cpp
   snapshot.cpp
   snapshotview.cpp
   snapshotmanager.cpp
   ${UI_FILES}
   ${RES_FILES}
   misc/windows_icon.rc
+  )
 # Use the Widgets module from Qt 5.

mainwindow.cpp

➞

Show inline comments

@@ @@ -23,19 +23,17 @@ @@
 #include <QApplication>
 #include <QFileDialog>
 #include <QFile>
 #include <QTextStream>
 #include <QtDebug>
 #include <QtEndian>
 #include <QTime>
 #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"
@@ @@ -52,19 +50,23 @@ struct Range @@
 Q_DECLARE_METATYPE(Range);
 MainWindow::MainWindow(QWidget *parent) :
     QMainWindow(parent),
     ui(new Ui::MainWindow),
     portControl(&serialPort)
     portControl(&serialPort),
     snapshotMan(this, &channelBuffers)
+{
     ui->setupUi(this);
     ui->tabWidget->insertTab(0, &portControl, "Port");
     ui->tabWidget->setCurrentIndex(0);
     addToolBar(portControl.toolBar());
     ui->mainToolBar->addAction(snapshotMan.takeSnapshotAction());
     ui->menuBar->insertMenu(ui->menuHelp->menuAction(), snapshotMan.menu());
     setupAboutDialog();
     // init UI signals
     // menu signals
     QObject::connect(ui->actionHelpAbout, &QAction::triggered,
@@ @@ -113,17 +115,14 @@ MainWindow::MainWindow(QWidget *parent) @@
     QObject::connect(ui->spYmax, SIGNAL(valueChanged(double)),
                      this, SLOT(onYScaleChanged()));
     QObject::connect(ui->actionClear, SIGNAL(triggered(bool)),
                      this, SLOT(clearPlot()));
     QObject::connect(ui->actionSnapShot, SIGNAL(triggered(bool)),
                      this, SLOT(takeSnapShot()));
     QObject::connect(ui->actionClearSnapShots, SIGNAL(triggered(bool)),
                      this, SLOT(clearSnapshots()));
     // QObject::connect(ui->actionSnapShot, SIGNAL(triggered(bool)),
     //                  this, SLOT(takeSnapShot()));
     // setup number of channels spinbox
     QObject::connect(ui->spNumOfChannels,
                      SELECT<int>::OVERLOAD_OF(&QSpinBox::valueChanged),
                      this, &MainWindow::onNumOfChannelsChanged);
@@ @@ -249,17 +248,12 @@ MainWindow::~MainWindow() @@
     if (serialPort.isOpen())
+    {
         serialPort.close();
+    }
     for (auto snapshot : snapshots)
+    {
         delete snapshot;
+    }
     delete ui;
     ui = NULL; // we check if ui is deleted in messageHandler
+}
 void MainWindow::setupAboutDialog()
+{
@@ @@ -727,58 +721,6 @@ void MainWindow::messageHandler(QtMsgTyp @@
     if (type != QtDebugMsg && ui != NULL)
+    {
         ui->statusBar->showMessage(msg, 5000);
+    }
+}
 void MainWindow::takeSnapShot()
+{
     QString name = QTime::currentTime().toString("'Snapshot ['HH:mm:ss']'");
     auto snapShot = new SnapShot(this, name);
     for (unsigned ci = 0; ci < numOfChannels; ci++)
+    {
         snapShot->data.append(QVector<QPointF>(numOfSamples));
         for (unsigned i = 0; i < numOfSamples; i++)
+        {
             snapShot->data[ci][i] = channelBuffers[ci]->sample(i);
+        }
+    }
     snapshots.append(snapShot);
     QObject::connect(snapShot, &SnapShot::deleteRequested,
                      this, &MainWindow::deleteSnapshot);
     updateSnapShotMenu();
+}
 void MainWindow::updateSnapShotMenu()
+{
     ui->menuSnapShots->clear();
     ui->menuSnapShots->addAction(ui->actionSnapShot);
     if (snapshots.size())
+    {
         ui->menuSnapShots->addSeparator();
         for (auto ss : snapshots)
+        {
             ui->menuSnapShots->addAction(ss->showAction());
+        }
         ui->menuSnapShots->addSeparator();
         ui->menuSnapShots->addAction(ui->actionClearSnapShots);
+    }
+}
 void MainWindow::clearSnapshots()
+{
     for (auto snapshot : snapshots)
+    {
         delete snapshot;
+    }
     snapshots.clear();
     updateSnapShotMenu();
+}
 void MainWindow::deleteSnapshot(SnapShot* snapshot)
+{
     delete snapshots.takeAt(snapshots.indexOf(snapshot));
     updateSnapShotMenu();
+}

mainwindow.h

➞

Show inline comments

@@ @@ -32,15 +32,15 @@ @@
 #include <QColor>
 #include <QtGlobal>
 #include <qwt_plot_curve.h>
 #include <qwt_plot_textlabel.h>
 #include "portcontrol.h"
 #include "snapshotview.h"
 #include "ui_about_dialog.h"
 #include "framebuffer.h"
 #include "snapshotmanager.h"
 namespace Ui {
 class MainWindow;
+}
 class MainWindow : public QMainWindow
@@ @@ -97,16 +97,13 @@ private: @@
     const int SPS_UPDATE_TIMEOUT = 1;  // second
     QLabel spsLabel;
     unsigned int sampleCount;
     QTimer spsTimer;
     // snapshots
     QList<SnapShot*> snapshots;
     void updateSnapShotMenu();
     SnapshotManager snapshotMan;
     // demo
     QTimer demoTimer;
     int demoCount;
     bool isDemoRunning();
     QwtPlotTextLabel demoIndicator;
@@ @@ -129,16 +126,12 @@ private slots: @@
     void selectNumberFormat(NumberFormat numberFormatId);
     void clearPlot();
     void spsTimerTimeout();
     void takeSnapShot();
     void clearSnapshots();
     void deleteSnapshot(SnapShot* snapshot);
     void demoTimerTimeout();
     void enableDemo(bool enabled);
     void onExportCsv();
 };

mainwindow.ui

➞

Show inline comments

@@ @@ -485,33 +485,25 @@ @@
     </property>
     <addaction name="actionGrid"/>
     <addaction name="actionMinorGrid"/>
     <addaction name="actionUnzoom"/>
     <addaction name="actionDarkBackground"/>
    </widget>
    <widget class="QMenu" name="menuSnapShots">
     <property name="title">
      <string>SnapShots</string>
     </property>
     <addaction name="actionSnapShot"/>
    </widget>
    <addaction name="menuFile"/>
    <addaction name="menuView"/>
    <addaction name="menuSnapShots"/>
    <addaction name="menuHelp"/>
   </widget>
   <widget class="QToolBar" name="mainToolBar">
    <attribute name="toolBarArea">
     <enum>TopToolBarArea</enum>
    </attribute>
    <attribute name="toolBarBreak">
     <bool>false</bool>
    </attribute>
    <addaction name="actionPause"/>
    <addaction name="actionClear"/>
    <addaction name="actionSnapShot"/>
   </widget>
   <widget class="QStatusBar" name="statusBar"/>
   <action name="actionPause">
    <property name="checkable">
     <bool>true</bool>
    </property>
@@ @@ -609,31 +601,12 @@ @@
     <string>Dark Background</string>
    </property>
    <property name="toolTip">
     <string>Toggle Dark Background</string>
    </property>
   </action>
   <action name="actionSnapShot">
    <property name="text">
     <string>Take Snapshot</string>
    </property>
    <property name="toolTip">
     <string>Take a snapshot of the current plot (F5)</string>
    </property>
    <property name="shortcut">
     <string>F5</string>
    </property>
   </action>
   <action name="actionClearSnapShots">
    <property name="text">
     <string>Clear SnapShots</string>
    </property>
    <property name="toolTip">
     <string>Delete all snapshots</string>
    </property>
   </action>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <customwidgets>
   <customwidget>
    <class>Plot</class>
    <extends>QWidget</extends>

serialplot.pro

➞

Show inline comments

@@ @@ -40,26 +40,30 @@ SOURCES += main.cpp\ @@
     zoomer.cpp \
     hidabletabwidget.cpp \
     framebuffer.cpp \
     scalepicker.cpp \
     scalezoomer.cpp \
     portlist.cpp \
     snapshotview.cpp
     snapshotview.cpp \
     snapshotmanager.cpp \
     snapshot.cpp
 HEADERS  += mainwindow.h \
     utils.h \
     portcontrol.h \
     floatswap.h \
     plot.h \
     zoomer.h \
     hidabletabwidget.h \
     framebuffer.h \
     scalepicker.h \
     scalezoomer.h \
     portlist.h \
     snapshotview.h
     snapshotview.h \
     snapshotmanager.h \
     snapshot.h
 FORMS    += mainwindow.ui \
     about_dialog.ui \
     portcontrol.ui \
     snapshotview.ui

snapshotmanager.cpp

➞

Show inline comments

@@ new file 100644 @@
 #include <QTime>
 #include <QMenuBar>
 #include <QKeySequence>
 #include "snapshotmanager.h"
 SnapshotManager::SnapshotManager(QMainWindow* mainWindow,
                                  QList<FrameBuffer*>* channelBuffers) :
     _menu("Snapshots"),
     _takeSnapshotAction("Take Snapshot", this),
     clearAction("Clear Snapshots", this)
+{
     _mainWindow = mainWindow;
     _channelBuffers = channelBuffers;
     _takeSnapshotAction.setToolTip("Take a snapshot of current plot (F5)");
     _takeSnapshotAction.setShortcut(QKeySequence("F5"));
     clearAction.setToolTip("Delete all snapshots");
     connect(&_takeSnapshotAction, SIGNAL(triggered(bool)),
             this, SLOT(takeSnapshot()));
     connect(&clearAction, SIGNAL(triggered(bool)),
             this, SLOT(clearSnapshots()));
     updateMenu();
+}
 SnapshotManager::~SnapshotManager()
+{
     for (auto snapshot : snapshots)
+    {
         delete snapshot;
+    }
+}
 void SnapshotManager::takeSnapshot()
+{
     QString name = QTime::currentTime().toString("'Snapshot ['HH:mm:ss']'");
     auto snapShot = new SnapShot(_mainWindow, name);
     unsigned numOfChannels = _channelBuffers->size();
     unsigned numOfSamples = _channelBuffers->at(0)->size();
     for (unsigned ci = 0; ci < numOfChannels; ci++)
+    {
         snapShot->data.append(QVector<QPointF>(numOfSamples));
         for (unsigned i = 0; i < numOfSamples; i++)
+        {
             snapShot->data[ci][i] = _channelBuffers->at(ci)->sample(i);
+        }
+    }
     snapshots.append(snapShot);
     QObject::connect(snapShot, &SnapShot::deleteRequested,
                      this, &SnapshotManager::deleteSnapshot);
     updateMenu();
+}
 void SnapshotManager::updateMenu()
+{
     _menu.clear();
     _menu.addAction(&_takeSnapshotAction);
     if (snapshots.size())
+    {
         _menu.addSeparator();
         for (auto ss : snapshots)
+        {
             _menu.addAction(ss->showAction());
+        }
         _menu.addSeparator();
         _menu.addAction(&clearAction);
+    }
+}
 void SnapshotManager::clearSnapshots()
+{
     for (auto snapshot : snapshots)
+    {
         delete snapshot;
+    }
     snapshots.clear();
     updateMenu();
+}
 void SnapshotManager::deleteSnapshot(SnapShot* snapshot)
+{
     delete snapshots.takeAt(snapshots.indexOf(snapshot));
     updateMenu();
+}
 QMenu* SnapshotManager::menu()
+{
     return &_menu;
+}
 QAction* SnapshotManager::takeSnapshotAction()
+{
     return &_takeSnapshotAction;
+}

snapshotmanager.h

➞

Show inline comments

@@ new file 100644 @@
 #ifndef SNAPSHOTMANAGER_H
 #define SNAPSHOTMANAGER_H
 #include <QObject>
 #include <QAction>
 #include <QMenu>
 #include "framebuffer.h"
 #include "snapshot.h"
 // class MainWindow;
 class SnapshotManager : public QObject
+{
     Q_OBJECT
 public:
     SnapshotManager(QMainWindow* mainWindow, QList<FrameBuffer*>* channelBuffers);
     ~SnapshotManager();
     QMenu* menu();
     QAction* takeSnapshotAction();
 private:
     QMainWindow* _mainWindow;
     QList<FrameBuffer*>* _channelBuffers;
     QList<SnapShot*> snapshots;
     QMenu _menu;
     QAction _takeSnapshotAction;
     QAction clearAction;
     void updateMenu();
 private slots:
     void takeSnapshot();
     void clearSnapshots();
     void deleteSnapshot(SnapShot* snapshot);
 };
 #endif /* SNAPSHOTMANAGER_H */

0 comments (0 inline, 0 general)