tempo-plotter Changeset - 52acb9a759b7 · protofusion repositories

Changeset - 52acb9a759b7

Parent rev.

Child rev.

[Not reviewed]

default

0 6 0

Hasan Yavuz ÖZDERYA - 9 years ago 2016-09-17 11:48:37
hy@ozderya.net

warn user if snapshot is not saved

6 files changed with 46 insertions and 1 deletions:

src/mainwindow.cpp

src/mainwindow.h

src/snapshot.cpp

src/snapshot.h

src/snapshotmanager.cpp

src/snapshotmanager.h

0 comments (0 inline, 0 general)

src/mainwindow.cpp

➞

Show inline comments

@@ @@ -19,12 +19,13 @@ @@
 #include "mainwindow.h"
 #include "ui_mainwindow.h"
 #include <QByteArray>
 #include <QApplication>
 #include <QFileDialog>
 #include <QMessageBox>
 #include <QFile>
 #include <QTextStream>
 #include <QMenu>
 #include <QDesktopServices>
 #include <QMap>
 #include <QtDebug>
@@ @@ -227,12 +228,30 @@ MainWindow::~MainWindow() @@
     delete plotMan;
     delete ui;
     ui = NULL; // we check if ui is deleted in messageHandler
+}
 void MainWindow::closeEvent(QCloseEvent * event)
+{
     if (!snapshotMan.isAllSaved())
+    {
         auto clickedButton = QMessageBox::warning(
             this, "Closing SerialPlot",
             "There are un-saved snapshots. If you close you will loose the data.",
             QMessageBox::Discard | QMessageBox::Discard,
             QMessageBox::Cancel);
         if (clickedButton == QMessageBox::Cancel)
+        {
             event->ignore();
             return;
+        }
+    }
     QMainWindow::closeEvent(event);
+}
 void MainWindow::setupAboutDialog()
+{
     Ui_AboutDialog uiAboutDialog;
     uiAboutDialog.setupUi(&aboutDialog);
     QObject::connect(uiAboutDialog.pbAboutQt, &QPushButton::clicked,

src/mainwindow.h

➞

Show inline comments

@@ @@ -87,12 +87,15 @@ private: @@
     void loadAllSettings(QSettings* settings);
     /// Stores main window settings into a `QSettings`
     void saveMWSettings(QSettings* settings);
     /// Loads main window settings from a `QSettings`
     void loadMWSettings(QSettings* settings);
     /// `QWidget::closeEvent` handler
     void closeEvent(QCloseEvent * event);
 private slots:
     void onPortToggled(bool open);
     void onPortError(QSerialPort::SerialPortError error);
     void onNumOfSamplesChanged(int value);
     void onNumOfChannelsChanged(unsigned value);

src/snapshot.cpp

➞

Show inline comments

@@ @@ -27,12 +27,13 @@ @@
 Snapshot::Snapshot(QMainWindow* parent, QString name) :
     QObject(parent),
     _showAction(name, this),
     _deleteAction("Delete", this)
+{
     _name = name;
     _saved = false;
     view = NULL;
     mainWindow = parent;
     connect(&_showAction, &QAction::triggered, this, &Snapshot::show);
     _deleteAction.setToolTip(QString("Delete ") + _name);
@@ @@ -134,12 +135,21 @@ void Snapshot::save(QString fileName) @@
+        }
         if (!file.commit())
+        {
             qCritical() << "File save error during snapshot save: " << file.error();
+        }
         else
+        {
             _saved = true;
+        }
+    }
     else
+    {
         qCritical() << "File open error during snapshot save: " << file.error();
+    }
+}
 bool Snapshot::isSaved()
+{
     return _saved;
+}

src/snapshot.h

➞

Show inline comments

@@ @@ -43,25 +43,27 @@ public: @@
     QString name();
     void setName(QString name);
     void setChannelNames(QStringList names); // must be called when setting data!
     QString channelName(unsigned channel);
     void save(QString fileName); /// save snapshot data as CSV
     void save(QString fileName); ///< save snapshot data as CSV
     bool isSaved(); ///< snapshot has been saved at least once
 signals:
     void deleteRequested(Snapshot*);
     void nameChanged(Snapshot*);
 private:
     QString _name;
     QStringList _channelNames;
     QAction _showAction;
     QAction _deleteAction;
     QMainWindow* mainWindow;
     SnapshotView* view;
     bool _saved;
 private slots:
     void show();
     void viewClosed();
     void onDeleteTriggered();

src/snapshotmanager.cpp

➞

Show inline comments

@@ @@ -202,6 +202,15 @@ QMenu* SnapshotManager::menu() @@
+}
 QAction* SnapshotManager::takeSnapshotAction()
+{
     return &_takeSnapshotAction;
+}
 bool SnapshotManager::isAllSaved()
+{
     for (auto snapshot : snapshots)
+    {
         if (!snapshot->isSaved()) return false;
+    }
     return true;
+}

src/snapshotmanager.h

➞

Show inline comments

@@ @@ -40,12 +40,14 @@ public: @@
     QAction* takeSnapshotAction();
     /// Creates a dynamically allocated snapshot object but doesn't record it in snapshots list.
     /// @note Caller is responsible for deletion of the returned `Snapshot` object.
     Snapshot* makeSnapshot();
     bool isAllSaved(); ///< returns `true` if all snapshots are saved to a file
 private:
     QMainWindow* _mainWindow;
     ChannelManager* _channelMan;
     QList<Snapshot*> snapshots;

0 comments (0 inline, 0 general)