Changeset ebf86f1 in sasview

Timestamp:

Nov 12, 2018 4:28:14 AM (6 years ago)

Author:

wojciech

Branches:

ESS_GUI, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

859d960, 5f9e874

Parents:

5584dee

Message:

Fixing failing Generic Scattering Calculator on OMF file on Linux

Location:

src/sas/qtgui

Files:

• Calculators/GenericScatteringCalculator.py (modified) (4 diffs)
• Utilities/GenericReader.py (modified) (1 diff)

src/sas/qtgui/Calculators/GenericScatteringCalculator.py

@@ -33 +33 @@
     trigger_plot_3d = QtCore.pyqtSignal()
     calculationFinishedSignal = QtCore.pyqtSignal()
+    loadingFinishedSignal = QtCore.pyqtSignal(list)
 
     def __init__(self, parent=None):
@@ -104 +105 @@
         # plots - 3D in real space
         self.calculationFinishedSignal.connect(self.plot_1_2d)
+
+        # notify main thread about file load complete
+        self.loadingFinishedSignal.connect(self.complete_loading)
 
         # TODO the option Ellipsoid has not been implemented
@@ -167 +171 @@
                         str(self.datafile))))
                 self.reader = GenReader(path=str(self.datafile), loader=loader,
-                                        completefn=self.complete_loading,
+                                        completefn=self.complete_loading_ex,
                                         updatefn=self.load_update)
                 self.reader.queue()
@@ -184 +188 @@
         logging.info(status_type)
 
+    def complete_loading_ex(self, data=None):
+        """
+        Send the finish message from calculate threads to main thread
+        """
+        self.loadingFinishedSignal.emit(data)
+
     def complete_loading(self, data=None):
         """ Function used in GenRead"""
+        assert isinstance(data, list)
+        assert len(data)==1
+        data = data[0]
         self.cbShape.setEnabled(False)
         try:

src/sas/qtgui/Utilities/GenericReader.py

@@ -41 +41 @@
         try:
             data = self.loader.read(self.path)
-            self.complete(data=data)
+            self.complete(data=[data])
         except:
             # Thread was interrupted, just proceed and re-raise.