Merge pull request #11 from lgolouz/lgolouz_zxtapereviver-10

Fixed [ZXTAPEREVIVER-10] No suspicious points displayed when wfm file…
lgolouz · Sep 27, 2020 · 5474fcf · 5474fcf
2 parents 9d6c9cc + 04b99da
commit 5474fcf
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 11 deletions.
diff --git a/qml/main.qml b/qml/main.qml
@@ -35,6 +35,16 @@ ApplicationWindow {
         return channelsComboBox.currentIndex == 0 ? waveformControlCh0 : waveformControlCh1;
     }
 
+    function restoreWaveformView() {
+        waveformControlCh0.xScaleFactor = 1;
+        waveformControlCh0.yScaleFactor = 80000;
+        waveformControlCh0.wavePos = 0;
+
+        waveformControlCh1.xScaleFactor = 1;
+        waveformControlCh1.yScaleFactor = 80000;
+        waveformControlCh1.wavePos = 0;
+    }
+
     menuBar: MenuBar {
         Menu {
             title: "File"
@@ -110,15 +120,9 @@ ApplicationWindow {
             title: "Waveform"
 
             MenuItem {
-                text: "Restore"
+                text: "Restore view"
                 onTriggered: {
-                    waveformControlCh0.xScaleFactor = 1;
-                    waveformControlCh0.yScaleFactor = 80000;
-                    waveformControlCh0.wavePos = 0;
-
-                    waveformControlCh1.xScaleFactor = 1;
-                    waveformControlCh1.yScaleFactor = 80000;
-                    waveformControlCh1.wavePos = 0;
+                    restoreWaveformView();
                 }
             }
 
@@ -142,9 +146,16 @@ ApplicationWindow {
         onAccepted: {
             var filetype = isWavOpening ? "WAV" : "Waveform";
             console.log("Selected %1 file: ".arg(filetype) + openFileDialog.fileUrl);
-            console.log("Open %1 file result: ".arg(filetype) + (isWavOpening
-                                                                 ? FileWorkerModel.openWavFileByUrl(openFileDialog.fileUrl)
-                                                                 : FileWorkerModel.openWaveformFileByUrl(openFileDialog.fileUrl)));
+            var res = (isWavOpening
+                        ? FileWorkerModel.openWavFileByUrl(openFileDialog.fileUrl)
+                        : FileWorkerModel.openWaveformFileByUrl(openFileDialog.fileUrl));
+            console.log("Open %1 file result: ".arg(filetype) + res);
+            if (res === 0) {
+                if (isWavOpening) {
+                    SuspiciousPointsModel.clearSuspiciousPoints();
+                }
+                restoreWaveformView();
+            }
         }
 
         onRejected: {

diff --git a/sources/models/suspiciouspointsmodel.cpp b/sources/models/suspiciouspointsmodel.cpp
@@ -56,6 +56,13 @@ uint SuspiciousPointsModel::getSuspiciousPoint(int idx)
     return 0;
 }
 
+void SuspiciousPointsModel::clearSuspiciousPoints()
+{
+    mSuspiciousPoints.clear();
+    emit suspiciousPointsChanged();
+    emit sizeChanged();
+}
+
 int SuspiciousPointsModel::getSize() const
 {
     return mSuspiciousPoints.size();

diff --git a/sources/models/suspiciouspointsmodel.h b/sources/models/suspiciouspointsmodel.h
@@ -33,6 +33,7 @@ class SuspiciousPointsModel : public QObject
     Q_INVOKABLE bool addSuspiciousPoint(uint idx);
     Q_INVOKABLE bool removeSuspiciousPoint(int idx);
     Q_INVOKABLE uint getSuspiciousPoint(int idx);
+    Q_INVOKABLE void clearSuspiciousPoints();
 
 signals:
     void suspiciousPointsChanged();