Changeset ebf86f1 in sasview for src/sas/qtgui
- Timestamp:
- Nov 12, 2018 2:28:14 AM (6 years ago)
- 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
- Location:
- src/sas/qtgui
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
src/sas/qtgui/Calculators/GenericScatteringCalculator.py
r30e0be0 rebf86f1 33 33 trigger_plot_3d = QtCore.pyqtSignal() 34 34 calculationFinishedSignal = QtCore.pyqtSignal() 35 loadingFinishedSignal = QtCore.pyqtSignal(list) 35 36 36 37 def __init__(self, parent=None): … … 104 105 # plots - 3D in real space 105 106 self.calculationFinishedSignal.connect(self.plot_1_2d) 107 108 # notify main thread about file load complete 109 self.loadingFinishedSignal.connect(self.complete_loading) 106 110 107 111 # TODO the option Ellipsoid has not been implemented … … 167 171 str(self.datafile)))) 168 172 self.reader = GenReader(path=str(self.datafile), loader=loader, 169 completefn=self.complete_loading ,173 completefn=self.complete_loading_ex, 170 174 updatefn=self.load_update) 171 175 self.reader.queue() … … 184 188 logging.info(status_type) 185 189 190 def complete_loading_ex(self, data=None): 191 """ 192 Send the finish message from calculate threads to main thread 193 """ 194 self.loadingFinishedSignal.emit(data) 195 186 196 def complete_loading(self, data=None): 187 197 """ Function used in GenRead""" 198 assert isinstance(data, list) 199 assert len(data)==1 200 data = data[0] 188 201 self.cbShape.setEnabled(False) 189 202 try: -
src/sas/qtgui/Utilities/GenericReader.py
re7a0b2f rebf86f1 41 41 try: 42 42 data = self.loader.read(self.path) 43 self.complete(data= data)43 self.complete(data=[data]) 44 44 except: 45 45 # Thread was interrupted, just proceed and re-raise.
Note: See TracChangeset
for help on using the changeset viewer.