tempo-plotter Changeset - 40b3b165830c · protofusion repositories

Changeset - 40b3b165830c

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

Hasan Yavuz ÖZDERYA - 9 years ago 2016-09-17 12:03:28
hy@ozderya.net

show snapshot name with an asterisk if not saved

3 files changed with 21 insertions and 4 deletions:

src/snapshot.cpp

src/snapshot.h

src/snapshotview.cpp

0 comments (0 inline, 0 general)

src/snapshot.cpp

➞

Show inline comments

@@ @@ -17,32 +17,33 @@ @@
   along with serialplot.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include <stddef.h>
 #include <QSaveFile>
 #include <QTextStream>
 #include "snapshot.h"
 #include "snapshotview.h"
 Snapshot::Snapshot(QMainWindow* parent, QString name) :
     QObject(parent),
-    _showAction(name, this),
     _showAction(this),
     _deleteAction("Delete", this)
+{
     _name = name;
     _saved = false;
     view = NULL;
     mainWindow = parent;
     _showAction.setText(displayName());
     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;
+    }
@@ @@ -77,24 +78,36 @@ void Snapshot::viewClosed() @@
+}
 void Snapshot::onDeleteTriggered()
+{
     emit deleteRequested(this);
+}
 QString Snapshot::name()
+{
     return _name;
+}
 QString Snapshot::displayName()
+{
     if (_saved)
+    {
         return name();
+    }
     else
+    {
         return name() + "*";
+    }
+}
 void Snapshot::setName(QString name)
+{
     _name = name;
     _showAction.setText(_name);
     emit nameChanged(this);
+}
 void Snapshot::setChannelNames(QStringList names)
+{
     _channelNames = names;
+}
@@ @@ -132,24 +145,25 @@ void Snapshot::save(QString fileName) @@
                 if (ci != numOfChannels-1) fileStream << ",";
+            }
             fileStream << '\n';
+        }
         if (!file.commit())
+        {
             qCritical() << "File save error during snapshot save: " << file.error();
+        }
         else
+        {
             _saved = true;
             _showAction.setText(displayName());
+        }
+    }
     else
+    {
         qCritical() << "File open error during snapshot save: " << file.error();
+    }
+}
 bool Snapshot::isSaved()
+{
     return _saved;
+}

src/snapshot.h

➞

Show inline comments

@@ @@ -33,24 +33,25 @@ class Snapshot : public QObject @@
+{
     Q_OBJECT
 public:
     Snapshot(QMainWindow* parent, QString name);
     ~Snapshot();
     QVector<QVector<QPointF>> data;
     QAction* showAction();
     QAction* deleteAction();
     QString name();
     QString displayName(); ///< `name()` plus '*' if snapshot is not saved
     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
     bool isSaved(); ///< snapshot has been saved at least once
 signals:
     void deleteRequested(Snapshot*);
     void nameChanged(Snapshot*);
 private:

src/snapshotview.cpp

➞

Show inline comments

@@ @@ -23,41 +23,42 @@ @@
 SnapshotView::SnapshotView(QWidget *parent, Snapshot* snapshot) :
     QMainWindow(parent),
     ui(new Ui::SnapshotView),
     renameDialog(this)
+{
     _snapshot = snapshot;
     ui->setupUi(this);
     plotMan = new PlotManager(ui->plotArea);
     ui->menuSnapshot->insertAction(ui->actionClose, snapshot->deleteAction());
-    this->setWindowTitle(snapshot->name());
+    this->setWindowTitle(snapshot->displayName());
     // initialize curves
     unsigned numOfChannels = snapshot->data.size();
     for (unsigned ci = 0; ci < numOfChannels; ci++)
+    {
         plotMan->addCurve(snapshot->channelName(ci), snapshot->data[ci]);
+    }
     renameDialog.setWindowTitle("Rename Snapshot");
     renameDialog.setLabelText("Enter new name:");
     connect(ui->actionRename, &QAction::triggered,
             this, &SnapshotView::showRenameDialog);
     connect(ui->actionExport, &QAction::triggered,
             this, &SnapshotView::save);
     // add 'View' menu items
     for (auto a : plotMan->menuActions())
+    {
         ui->menuView->addAction(a);
+    }
+}
 SnapshotView::~SnapshotView()
+{
     for (auto curve : curves)
+    {
         delete curve;
+    }
@@ @@ -70,23 +71,24 @@ void SnapshotView::closeEvent(QCloseEven @@
     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);
+    setWindowTitle(_snapshot->displayName());
+}
 void SnapshotView::save()
+{
     QString fileName = QFileDialog::getSaveFileName(this, tr("Export CSV File"));
     if (fileName.isNull()) return; // user canceled
     _snapshot->save(fileName);
     setWindowTitle(_snapshot->displayName());
+}

0 comments (0 inline, 0 general)