Changeset e9b4cc4 in sasview for sansview/perspectives/fitting/model_thread.py

Timestamp:

Jan 15, 2009 5:39:19 PM (16 years ago)

Author:

Gervaise Alina <gervyh@…>

Branches:

master, 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, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

633ba04

Parents:

681f0dc

Message:

add thread for fitting

File:

• sansview/perspectives/fitting/model_thread.py (modified) (4 diffs)

sansview/perspectives/fitting/model_thread.py

@@ -109 +109 @@
         self.model = model
         self.starttime = 0
+       
         
     def isquit(self):
@@ -120 +121 @@
             raise KeyboardInterrupt
         
+    def update(self, output=None, time=None):
+        
+        wx.PostEvent(self.parent, StatusEvent(status="Plot \
+        updating ... %g sec" % time))
+        
     def compute(self):
         import numpy
@@ -125 +131 @@
         y = self.y
         output = numpy.zeros((len(x),len(y)))
-        """
-        if self.qmin *self.qmax >=0:
-            print "same signe plotting"
-            if self.qmax==0:
-                center_x= self.qmin/2
-                center_y= self.qmin /2
-            else:
-                center_x= (self.qmax -self.qmin)/2
-                center_y= (self.qmax -self.qmin)/2
-        else:
-        """
+      
         center_x=0
         center_y=0
-        #print "center_x , center_y",center_x , center_y
-        #print "x ",len(x)
-        #print "y", y
-        #print "int(len(self.x)/2)",int(len(self.x)/2)
+       
         self.starttime = time.time()
+        wx.PostEvent(self.parent, StatusEvent(status=\
+                       "Start Drawing model %g " % self.starttime))
         lx = len(self.x)
        
         for i_x in range(len(self.x)):
-           
-            # Check whether we need to bail out
-            self.update(output=output)
+            # Check whether we need to bail out
+            self.update(output=output, time=time.time() )
             self.isquit()
             
@@ -154 +148 @@
                 try:
                     if (self.x[i_x]*self.x[i_x]+self.y[i_y]*self.y[i_y]) \
-                    < self.qmin * self.qmin:
-                        output[i_x] [i_y]=0
-                         
+                        < self.qmin * self.qmin:
+                        
+                        output[i_x] [i_y]=0   
                     else:
-                        value1 = self.model.runXY([self.x[i_x]-center_x, self.y[i_y]-center_y])
-                       
-                        
-                        output[i_x] [i_y]=value1 
-                       
-                    
+                        value = self.model.runXY([self.x[i_x]-center_x, self.y[i_y]-center_y])
+                        output[i_x] [i_y]=value   
                 except:
                      wx.PostEvent(self.parent, StatusEvent(status=\