tempo-plotter Changeset - 6af8069441ab · protofusion repositories

Changeset - 6af8069441ab

Parent rev.

Child rev.

[Not reviewed]

snapshots

0 2 0

Hasan Yavuz ÖZDERYA - 10 years ago 2015-09-30 00:21:05
hy@ozderya.net

load snapshots from multiple files

2 files changed with 20 insertions and 11 deletions:

snapshotmanager.cpp

snapshotmanager.h

0 comments (0 inline, 0 general)

snapshotmanager.cpp

➞

Show inline comments

@@ @@ -13,7 +13,7 @@ SnapshotManager::SnapshotManager(QMainWi @@
                                  QList<FrameBuffer*>* channelBuffers) :
     _menu("Snapshots"),
     _takeSnapshotAction("Take Snapshot", this),
-    loadSnapshotAction("Load Snapshot", this),
+    loadSnapshotAction("Load Snapshots", this),
     clearAction("Clear Snapshots", this)
+{
     _mainWindow = mainWindow;
@@ @@ -21,14 +21,14 @@ SnapshotManager::SnapshotManager(QMainWi @@
     _takeSnapshotAction.setToolTip("Take a snapshot of current plot (F5)");
     _takeSnapshotAction.setShortcut(QKeySequence("F5"));
-    loadSnapshotAction.setToolTip("Load a snapshot from CSV file");
+    loadSnapshotAction.setToolTip("Load snapshots from CSV files");
     clearAction.setToolTip("Delete all snapshots");
     connect(&_takeSnapshotAction, SIGNAL(triggered(bool)),
             this, SLOT(takeSnapshot()));
     connect(&clearAction, SIGNAL(triggered(bool)),
             this, SLOT(clearSnapshots()));
     connect(&loadSnapshotAction, SIGNAL(triggered(bool)),
-            this, SLOT(loadSnapshot()));
+            this, SLOT(loadSnapshots()));
     updateMenu();
+}
@@ @@ -61,12 +61,12 @@ void SnapshotManager::takeSnapshot() @@
     addSnapshot(snapShot);
+}
 void SnapshotManager::addSnapshot(SnapShot* snapshot)
+void SnapshotManager::addSnapshot(SnapShot* snapshot, bool update_menu)
+{
     snapshots.append(snapshot);
     QObject::connect(snapshot, &SnapShot::deleteRequested,
                      this, &SnapshotManager::deleteSnapshot);
     updateMenu();
+    if (update_menu) updateMenu();
+}
 void SnapshotManager::updateMenu()
@@ @@ -103,12 +103,20 @@ void SnapshotManager::deleteSnapshot(Sna @@
     updateMenu();
+}
 void SnapshotManager::loadSnapshot()
 void SnapshotManager::loadSnapshots()
+{
     auto files = QFileDialog::getOpenFileNames(_mainWindow, tr("Load CSV File"));
     for (auto f : files)
+{
     QString fileName = QFileDialog::getOpenFileName(_mainWindow, tr("Load CSV File"));
         if (!f.isNull()) loadSnapshotFromFile(f);
+    }
     if (fileName.isNull()) return; // user canceled
     updateMenu();
+}
 void SnapshotManager::loadSnapshotFromFile(QString fileName)
+{
     QFile file(fileName);
     if (!file.open(QIODevice::ReadOnly | QIODevice::Text))
+    {
@@ @@ -158,7 +166,7 @@ void SnapshotManager::loadSnapshot() @@
     auto snapshot = new SnapShot(_mainWindow, QFileInfo(fileName).baseName());
     snapshot->data = data;
     addSnapshot(snapshot);
+    addSnapshot(snapshot, false);
+}
 QMenu* SnapshotManager::menu()

snapshotmanager.h

➞

Show inline comments

@@ @@ -33,14 +33,15 @@ private: @@
     QAction loadSnapshotAction;
     QAction clearAction;
     void addSnapshot(SnapShot* snapshot);
+    void addSnapshot(SnapShot* snapshot, bool update_menu=true);
     void updateMenu();
 private slots:
     void takeSnapshot();
     void clearSnapshots();
     void deleteSnapshot(SnapShot* snapshot);
     void loadSnapshot();
     void loadSnapshots();
     void loadSnapshotFromFile(QString fileName);
 };
 #endif /* SNAPSHOTMANAGER_H */

0 comments (0 inline, 0 general)