Changeset 20be946 in sasview for sansview

Timestamp:

Jan 11, 2009 4:55:55 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:

d74d751

Parents:

24ea33c

Message:

working on model plotting

Location:

sansview/perspectives/fitting

Files:

• calcthread.py (added)
• fitting.py (modified) (2 diffs)
• model_thread.py (added)
• modelpage.py (modified) (2 diffs)

sansview/perspectives/fitting/fitting.py

@@ -643 +643 @@
                 except:
                     raise
-    def _draw_model2D(self,model,name,description=None, enable2D=False,qmin=None,qmax=None, qstep=None):
+    def update(self, output):
+        print "Got an update"
+    
+    def complete(self, output, elapsed, model, qmin, qmax):
+        #printEVT("Calc complete in %g sec" % elapsed) 
+        wx.PostEvent(self.parent, StatusEvent(status="Calc \
+        complete in %g sec" % elapsed))
+                           
+        print "complete",output, model,qmin, qmax
+        data = output
+        theory= Data2D(data)
+        theory.name= model.name
+        theory.group_id ="Model"
+        theory.id ="Model"
+        theory.xmin= qmin
+        theory.xmax= qmax
+        theory.ymin= qmin
+        theory.ymax= qmax
+        wx.PostEvent(self.parent, NewPlotEvent(plot=theory,
+                         title="Analytical model 2D %s" %str(model.name)))
+         
+        
+         
+    def _draw_model2D(self,model,description=None, enable2D=False,qmin=None,qmax=None, qstep=None):
         if qmin==None:
             qmin= -0.05
@@ -655 +678 @@
         #print x
         data=numpy.zeros([len(x),len(y)])
+        self.model= model
         if enable2D:
-            #print "drawing model 2D params",qmin, qmax,model.getParamList()
-            for i_x in range(int(len(x))):
-                for i_y in range(len(y)):
+            from model_thread import Calc2D
+            self.calc_thread = Calc2D(parent =self.parent,x=x, y=y,model= self.model, qmin=qmin,qmax=qmax,
+                            completefn=self.complete,
+                            updatefn=self.update)
+            self.calc_thread.queue()
+            self.calc_thread.ready(2.5)
+           
+                
+                
+    def H_draw_model2D(self,model,description=None, enable2D=False,qmin=None,qmax=None, qstep=None):
+        if qmin==None:
+            qmin= -0.05
+        if qmax==None:
+            qmax= 0.05
+        if qstep ==None:
+            qstep =0.001
+        x = numpy.arange(qmin,qmax, qstep)
+        y = numpy.arange(qmin,qmax,qstep)
+        lx = len(self.x)
+        if enable2D:
+            data=numpy.zeros([len(x),len(y)])
+            for i in range(len(x)):
+                for j in range(len(x)):
                     try:
-                        value = model.runXY([x[i_x],y[i_y]])
-                        data[i_y][i_x] = value
+                        data[i][j]=model.runXY([j,i])
                     except:
                          wx.PostEvent(self.parent, StatusEvent(status="\
-                        Error computing %s at [%g,%g] :%s" %(model.name,x[i_x],y[i_y], sys.exc_value)))
-            #print "data2 draw" ,data          
-            theory= Data2D(data)
-            theory.name= name
-            theory.group_id ="Model"
-            theory.id ="Model"
-            theory.xmin= qmin
-            theory.xmax= qmax
-            theory.ymin= qmin
-            theory.ymax= qmax
-            wx.PostEvent(self.parent, NewPlotEvent(plot=theory,
-                             title="Analytical model 2D %s" %str(name)))
-             
-  
+                        Model 2D cannot be plot %g %s %s" %(data[i][j],model.name, sys.exc_value)))
+           
+    
+    def on_draw_model2D(self, event):
+        """
+             plot view model 2D
+        """
+        
+        if self.enable_model2D== True:
+            self.enable_model2D=False
+        else:
+            self.enable_model2D=True
+        print "self.enable_model2D",self.enable_model2D
 if __name__ == "__main__":
     i = Plugin()

sansview/perspectives/fitting/modelpage.py

@@ -134 +134 @@
         # preview selected model name
         self.prevmodel_name=name
+        print "model view prev_model",name
         self.modelbox.SetValue(self.prevmodel_name)
         # flag to check if the user has selected a new model in the combox box
@@ -179 +180 @@
         if self.enable2D==False:
             self.enable2D=True
-            self.manager.draw_model(model=self.model,name=self.prevmodel_name,
+            self.manager.draw_model(model=self.model,
                                     description=None,
                                      enable2D=self.enable2D,