tempo-plotter Changeset - 099df007158d · protofusion repositories

Changeset - 099df007158d

Parent rev.

Child rev.

[Not reviewed]

snapshots

0 6 0

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

implemented delete snapshot function and showing snapshot name in the title

6 files changed with 50 insertions and 17 deletions:

mainwindow.cpp

mainwindow.h

snapshot.cpp

snapshot.h

snapshotview.cpp

snapshotview.ui

0 comments (0 inline, 0 general)

mainwindow.cpp

➞

Show inline comments

@@ @@ -701,77 +701,85 @@ void MainWindow::onExportCsv() @@
+}
 void MainWindow::messageHandler(QtMsgType type,
                                 const QMessageLogContext &context,
                                 const QString &msg)
+{
     QString logString;
     switch (type)
+    {
         case QtDebugMsg:
             logString = "[Debug] " + msg;
             break;
         case QtWarningMsg:
             logString = "[Warning] " + msg;
             break;
         case QtCriticalMsg:
             logString = "[Error] " + msg;
             break;
         case QtFatalMsg:
             logString = "[Fatal] " + msg;
             break;
+    }
     if (ui != NULL) ui->ptLog->appendPlainText(logString);
     std::cerr << logString.toStdString() << std::endl;
     if (type != QtDebugMsg && ui != NULL)
+    {
         ui->statusBar->showMessage(msg, 5000);
+    }
+}
 void MainWindow::takeSnapShot()
+{
     qDebug() << "taking a snopshot yay!";
     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->menuAction());
+            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

@@ @@ -89,56 +89,57 @@ private: @@
     NumberFormat numberFormat;
     unsigned int sampleSize; // number of bytes in the selected number format
     double (MainWindow::*readSample)();
     // note that serialPort should already have enough bytes present
     template<typename T> double readSampleAs();
     bool skipByteRequested;
     const int SPS_UPDATE_TIMEOUT = 1;  // second
     QLabel spsLabel;
     unsigned int sampleCount;
     QTimer spsTimer;
     // snapshots
     QList<SnapShot*> snapshots;
     void updateSnapShotMenu();
     // demo
     QTimer demoTimer;
     int demoCount;
     bool isDemoRunning();
     QwtPlotTextLabel demoIndicator;
 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();
     void onNumOfChannelsChanged(int value);
     void onNumberFormatButtonToggled(int numberFormatId, bool checked);
     void selectNumberFormat(NumberFormat numberFormatId);
     void clearPlot();
     void spsTimerTimeout();
     void takeSnapShot();
     void clearSnapshots();
     void deleteSnapshot(SnapShot* snapshot);
     void demoTimerTimeout();
     void enableDemo(bool enabled);
     void onExportCsv();
 };
 #endif // MAINWINDOW_H

snapshot.cpp

➞

Show inline comments

 #include <stddef.h>
 #include "snapshot.h"
 #include "snapshotview.h"
 #include <QtDebug>
 SnapShot::SnapShot(QMainWindow* parent, QString name) :
     QObject(parent),
     _menuAction(name, this)
     _showAction(name, this),
     _deleteAction("Delete", this)
+{
     _name = name;
     view = NULL;
     mainWindow = parent;
     connect(&_menuAction, &QAction::triggered, this, &SnapShot::show);
     connect(&_showAction, &QAction::triggered, this, &SnapShot::show);
     _deleteAction.setToolTip(QString("Delete ") + _name);
     connect(&_deleteAction, &QAction::triggered, this, &SnapShot::onDeleteTriggered);
+}
 SnapShot::~SnapShot()
+{
     if (view != NULL)
+    {
         delete view;
+    }
+}
-QAction* SnapShot::menuAction()
+QAction* SnapShot::showAction()
+{
     return &_menuAction;
     return &_showAction;
+}
 QAction* SnapShot::deleteAction()
+{
     return &_deleteAction;
+}
 void SnapShot::show()
+{
     if (view == NULL)
+    {
         qDebug() << "view == NULL";
         view = new SnapShotView(mainWindow, this);
         connect(view, &SnapShotView::closed, this, &SnapShot::viewClosed);
+    }
     view->show();
     view->activateWindow();
     view->raise();
+}
 void SnapShot::hide()
+{
+}
 void SnapShot::viewClosed()
+{
     delete view;
     view = NULL;
+}
 void SnapShot::onDeleteTriggered()
+{
     emit deleteRequested(this);
+}
 QString SnapShot::name()
+{
     return _name;
+}

snapshot.h

➞

Show inline comments

 #ifndef SNAPSHOT_H
 #define SNAPSHOT_H
 #include <QObject>
 #include <QMainWindow>
 #include <QAction>
 #include <QVector>
 class SnapShotView;
 class SnapShot : public QObject
+{
     Q_OBJECT
 public:
     SnapShot(QMainWindow* parent, QString name);
     ~SnapShot();
     // QString _name;
     QVector<QVector<QPointF>> data;
     QAction* menuAction();
     QAction* showAction();
     QAction* deleteAction();
     QString name();
 public slots:
     void show();
     void hide();
 signals:
     void deleteRequested(SnapShot*);
 private:
     QAction _menuAction;
     QString _name;
     QAction _showAction;
     QAction _deleteAction;
     QMainWindow* mainWindow;
     SnapShotView* view;
 private slots:
     void viewClosed();
     void onDeleteTriggered();
 };
 #endif /* SNAPSHOT_H */

snapshotview.cpp

➞

Show inline comments

 #include "snapshotview.h"
 #include "ui_snapshotview.h"
 SnapShotView::SnapShotView(QWidget *parent, SnapShot* snapShot) :
     QMainWindow(parent),
     ui(new Ui::SnapShotView)
+{
     ui->setupUi(this);
     ui->toolBar->addAction(snapShot->deleteAction());
     this->setWindowTitle(snapShot->name());
     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;
+    }
     delete ui;
+}
 void SnapShotView::closeEvent(QCloseEvent *event)
+{
     emit closed();
+}

snapshotview.ui

➞

Show inline comments

@@ @@ -9,75 +9,66 @@ @@
     <width>544</width>
     <height>449</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>MainWindow</string>
   </property>
   <widget class="QWidget" name="centralwidget">
    <layout class="QVBoxLayout" name="verticalLayout">
     <item>
      <widget class="Plot" name="plot" native="true"/>
     </item>
    </layout>
   </widget>
   <widget class="QMenuBar" name="menubar">
    <property name="geometry">
     <rect>
      <x>0</x>
      <y>0</y>
      <width>544</width>
      <height>27</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuFile">
     <property name="title">
      <string>File</string>
     </property>
     <addaction name="actionExportCSV"/>
    </widget>
    <widget class="QMenu" name="menuView">
     <property name="title">
      <string>View</string>
     </property>
    </widget>
    <addaction name="menuFile"/>
    <addaction name="menuView"/>
   </widget>
   <widget class="QToolBar" name="toolBar">
    <property name="windowTitle">
     <string>toolBar</string>
    </property>
    <attribute name="toolBarArea">
     <enum>TopToolBarArea</enum>
    </attribute>
    <attribute name="toolBarBreak">
     <bool>false</bool>
    </attribute>
    <addaction name="actionExportCSV"/>
    <addaction name="actionDelete"/>
   </widget>
   <action name="actionExportCSV">
    <property name="text">
     <string>Export CSV</string>
    </property>
   </action>
   <action name="actionDelete">
    <property name="text">
     <string>Delete</string>
    </property>
    <property name="toolTip">
     <string>Delete this snapshot!</string>
    </property>
   </action>
  </widget>
  <customwidgets>
   <customwidget>
    <class>Plot</class>
    <extends>QWidget</extends>
    <header>plot.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>

0 comments (0 inline, 0 general)