tempo-plotter Changeset - f520f2a1546b · protofusion repositories

Changeset - f520f2a1546b

Parent rev.

Child rev.

[Not reviewed]

snapshots

0 7 0

Hasan Yavuz ÖZDERYA - 10 years ago 2015-09-20 17:48:04
hy@ozderya.net

implemented snapshot rename

7 files changed with 51 insertions and 8 deletions:

snapshot.cpp

snapshot.h

snapshotmanager.cpp

snapshotmanager.h

snapshotview.cpp

snapshotview.h

snapshotview.ui

0 comments (0 inline, 0 general)

snapshot.cpp

➞

Show inline comments

@@ @@ -21,48 +21,55 @@ SnapShot::SnapShot(QMainWindow* parent, @@
     connect(&_deleteAction, &QAction::triggered, this, &SnapShot::onDeleteTriggered);
+}
 SnapShot::~SnapShot()
+{
     if (view != NULL)
+    {
         delete view;
+    }
+}
 QAction* SnapShot::showAction()
+{
     return &_showAction;
+}
 QAction* SnapShot::deleteAction()
+{
     return &_deleteAction;
+}
 void SnapShot::show()
+{
     if (view == NULL)
+    {
         view = new SnapShotView(mainWindow, this);
         connect(view, &SnapShotView::closed, this, &SnapShot::viewClosed);
+    }
     view->show();
     view->activateWindow();
     view->raise();
+}
 void SnapShot::viewClosed()
+{
     delete view;
     view = NULL;
+}
 void SnapShot::onDeleteTriggered()
+{
     emit deleteRequested(this);
+}
 QString SnapShot::name()
+{
     return _name;
+}
 void SnapShot::setName(QString name)
+{
     _name = name;
     _showAction.setText(_name);
     emit nameChanged(this);
+}

snapshot.h

➞

Show inline comments

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

snapshotmanager.cpp

➞

Show inline comments

@@ @@ -7,93 +7,95 @@ @@
 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);
     QObject::connect(snapShot, &SnapShot::deleteRequested,
                      this, &SnapshotManager::updateMenu);
     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

 #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 */

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(new Ui::SnapShotView),
     renameDialog(this)
+{
     _snapShot = snapShot;
     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;
     renameDialog.setWindowTitle("Rename Snapshot");
     renameDialog.setLabelText("Enter new name:");
     connect(ui->actionRename, &QAction::triggered,
             this, &SnapShotView::showRenameDialog);
+}
 SnapShotView::~SnapShotView()
+{
     for (auto curve : curves)
+    {
         delete curve;
+    }
     delete ui;
+}
 void SnapShotView::closeEvent(QCloseEvent *event)
+{
     QMainWindow::closeEvent(event);
     emit closed();
+}
 void SnapShotView::showRenameDialog()
+{
     renameDialog.setTextValue(_snapShot->name());
     renameDialog.open(this, SLOT(renameSnapshot(QString)));
+}
 void SnapShotView::renameSnapshot(QString name)
+{
     _snapShot->setName(name);
     setWindowTitle(name);
+}

snapshotview.h

➞

Show inline comments

 #ifndef SNAPSHOTVIEW_H
 #define SNAPSHOTVIEW_H
 #include <QMainWindow>
 #include <QInputDialog>
 #include <QVector>
 #include <QPointF>
 #include <QPen>
 #include <QCloseEvent>
 #include <qwt_plot_curve.h>
 #include "plot.h"
 #include "snapshot.h"
 namespace Ui {
 class SnapShotView;
+}
 class SnapShotView : public QMainWindow
+{
     Q_OBJECT
 public:
     explicit SnapShotView(QWidget *parent, SnapShot* snapShot);
     ~SnapShotView();
 signals:
     void closed();
 private:
     Ui::SnapShotView *ui;
     QList<QwtPlotCurve*> curves;
     SnapShot* _snapShot;
     QInputDialog renameDialog;
     SnapShot* _snapShot;
     void closeEvent(QCloseEvent *event);
 private slots:
     void showRenameDialog();
     void renameSnapshot(QString name);
 };
 #endif // SNAPSHOTVIEW_H

snapshotview.ui

➞

Show inline comments

 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>SnapShotView</class>
  <widget class="QMainWindow" name="SnapShotView">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <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">
+   <widget class="QMenu" name="menuSnapshot">
     <property name="title">
-     <string>File</string>
+     <string>Snapshot</string>
     </property>
     <addaction name="actionRename"/>
     <addaction name="actionExportCSV"/>
    </widget>
    <widget class="QMenu" name="menuView">
     <property name="title">
      <string>View</string>
     </property>
    </widget>
-   <addaction name="menuFile"/>
+   <addaction name="menuSnapshot"/>
    <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"/>
   </widget>
   <action name="actionExportCSV">
    <property name="text">
     <string>Export CSV</string>
    </property>
   </action>
   <action name="actionRename">
    <property name="text">
     <string>Rename</string>
    </property>
    <property name="toolTip">
     <string>Rename 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)