Remove the thread used for sampling.

[sigrok-meter.git] / mainwindow.py

diff --git a/mainwindow.py b/mainwindow.py
index 7398a5a84c5da87bb255efcc186e524785c41f02..315d805ceed1d124931b2397b8b632f967df0db5 100644 (file)
--- a/mainwindow.py
+++ b/mainwindow.py
@@ -19,11 +19,11 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
+import acquisition
 import datamodel
 import multiplotwidget
 import os.path
 import qtcompat
-import samplingthread
 import textwrap
 import time
 import util
@@ -61,7 +61,12 @@ class MainWindow(QtGui.QMainWindow):
     def __init__(self, context, drivers):
         super(self.__class__, self).__init__()
 
+        # Used to coordinate the stopping of the acquisition and
+        # the closing of the window.
+        self._closing = False
+
         self.context = context
+        self.drivers = drivers
 
         self.delegate = datamodel.MultimeterDelegate(self, self.font())
         self.model = datamodel.MeasurementDataModel(self)
@@ -69,10 +74,22 @@ class MainWindow(QtGui.QMainWindow):
 
         self.setup_ui()
 
-        self.thread = samplingthread.SamplingThread(self.context, drivers)
-        self.thread.measured.connect(self.model.update)
-        self.thread.error.connect(self.error)
-        self.thread.start()
+        QtCore.QTimer.singleShot(0, self._start_acquisition)
+
+    def _start_acquisition(self):
+        self.acquisition = acquisition.Acquisition(self.context)
+        self.acquisition.measured.connect(self.model.update)
+        self.acquisition.stopped.connect(self._stopped)
+
+        try:
+            for (ds, cs) in self.drivers:
+                self.acquisition.add_device(ds, cs)
+        except Exception as e:
+            QtGui.QMessageBox.critical(self, 'Error', str(e))
+            self.close()
+            return
+
+        self.acquisition.start()
 
     def setup_ui(self):
         self.setWindowTitle('sigrok-meter')
@@ -133,6 +150,10 @@ class MainWindow(QtGui.QMainWindow):
 
         self.startTimer(MainWindow.UPDATEINTERVAL)
 
+    def stop(self):
+        self.acquisition.stop()
+        print(self.acquisition.is_running())
+
     def _getPlot(self, unit):
         '''Looks up or creates a new plot for 'unit'.'''
 
@@ -228,9 +249,18 @@ class MainWindow(QtGui.QMainWindow):
                 if traceunit == plotunit:
                     trace.new = False
 
+    @QtCore.Slot()
+    def _stopped(self):
+        if self._closing:
+            self.close()
+
     def closeEvent(self, event):
-        self.thread.stop()
-        event.accept()
+        if self.acquisition.is_running():
+            self._closing = True
+            self.acquisition.stop()
+            event.ignore()
+        else:
+            event.accept()
 
     @QtCore.Slot()
     def show_about(self):
@@ -252,12 +282,6 @@ class MainWindow(QtGui.QMainWindow):
 
         QtGui.QMessageBox.about(self, 'About sigrok-meter', text)
 
-    @QtCore.Slot(str)
-    def error(self, msg):
-        '''Error handler for the sampling thread.'''
-        QtGui.QMessageBox.critical(self, 'Error', msg)
-        self.close()
-
     @QtCore.Slot(object, int, int)
     def modelRowsInserted(self, parent, start, end):
         '''Resize the list view to the size of the content.'''