Changeset cbcdd2c in sasview for src/sas/sasgui/perspectives/fitting/model_thread.py

Timestamp:

Mar 10, 2017 9:44:44 AM (8 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

cd31251

Parents:

5236449

Message:

QModel items conversion into SasModel? parameters + data display SASVIEW-535

File:

• src/sas/sasgui/perspectives/fitting/model_thread.py (modified) (2 diffs)

src/sas/sasgui/perspectives/fitting/model_thread.py

@@ -99 +99 @@
         output[index_model] = value
         elapsed = time.time() - self.starttime
-        self.complete(image=output,
-                       data=self.data,
-                       page_id=self.page_id,
-                       model=self.model,
-                       state=self.state,
-                       toggle_mode_on=self.toggle_mode_on,
-                       elapsed=elapsed,
-                       index=index_model,
-                       fid=self.fid,
-                       qmin=self.qmin,
-                       qmax=self.qmax,
-                       weight=self.weight,
-                       #qstep=self.qstep,
-                       update_chisqr=self.update_chisqr,
-                       source=self.source)
+        #self.complete(image=output,
+        #               data=self.data,
+        #               page_id=self.page_id,
+        #               model=self.model,
+        #               state=self.state,
+        #               toggle_mode_on=self.toggle_mode_on,
+        #               elapsed=elapsed,
+        #               index=index_model,
+        #               fid=self.fid,
+        #               qmin=self.qmin,
+        #               qmax=self.qmax,
+        #               weight=self.weight,
+        #               #qstep=self.qstep,
+        #               update_chisqr=self.update_chisqr,
+        #               source=self.source)
+        return (output,
+                self.data,
+                self.page_id,
+                self.model,
+                self.state,
+                self.toggle_mode_on,
+                elapsed,
+                index_model,
+                self.fid,
+                self.qmin,
+                self.qmax,
+                self.weight,
+                self.update_chisqr,
+                self.source)
 
 
@@ -178 +192 @@
         elapsed = time.time() - self.starttime
 
-        self.complete(x=self.data.x[index], y=output[index],
-                      page_id=self.page_id,
-                      state=self.state,
-                      weight=self.weight,
-                      fid=self.fid,
-                      toggle_mode_on=self.toggle_mode_on,
-                      elapsed=elapsed, index=index, model=self.model,
-                      data=self.data,
-                      update_chisqr=self.update_chisqr,
-                      source=self.source)
+        #self.complete(x=self.data.x[index], y=output[index],
+        #              page_id=self.page_id,
+        #              state=self.state,
+        #              weight=self.weight,
+        #              fid=self.fid,
+        #              toggle_mode_on=self.toggle_mode_on,
+        #              elapsed=elapsed, index=index, model=self.model,
+        #              data=self.data,
+        #              update_chisqr=self.update_chisqr,
+        #              source=self.source)
+        return (self.data.x[index], output[index],
+                self.page_id,
+                self.state,
+                self.weight,
+                self.fid,
+                self.toggle_mode_on,
+                elapsed, index, self.model,
+                self.data,
+                self.update_chisqr,
+                self.source)
 
     def results(self):