Changeset 888e62c in sasview for sansview/perspectives/fitting/fitting.py

Timestamp:

Feb 5, 2009 4:02:45 PM (15 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:

8d93ec4

Parents:

d468daa

Message:

sansview print remove

File:

• sansview/perspectives/fitting/fitting.py (modified) (5 diffs)

sansview/perspectives/fitting/fitting.py

@@ -135 +135 @@
         self.index_model = 0
         self.parent.Bind(EVT_SLICER_PANEL, self._on_slicer_event)
+       
         
         #create the fitting panel
@@ -141 +142 @@
         self.mypanels.append(self.fit_panel)
         return self.mypanels
+    
+    
     def _on_model2D_show(self, event ):
         print "model2D get the id ", event.id
+        
+        
     def _on_slicer_event(self, event):
         print "fitting:slicer event ", event.panel
-        new_panel = event.panel
-        # Set group ID if available
-        event_id = self.parent.popup_panel(new_panel)
-        self.menu1.Append(event_id, new_panel.window_caption, 
-                         "Show %s plot panel" % new_panel.window_caption)
-        # Set UID to allow us to reference the panel later
-        new_panel.uid = event_id
-        new_panel
-        self.mypanels.append(new_panel) 
+        if event.panel!=None:
+            new_panel = event.panel
+            # Set group ID if available
+            event_id = self.parent.popup_panel(new_panel)
+            self.menu1.Append(event_id, new_panel.window_caption, 
+                             "Show %s plot panel" % new_panel.window_caption)
+            # Set UID to allow us to reference the panel later
+            new_panel.uid = event_id
+            new_panel
+            self.mypanels.append(new_panel) 
         return        
     def _on_show_panel(self, event):
@@ -375 +381 @@
                     #Do the single fit
                     self.fitter.set_model(Model(model), self.id, pars) 
-                    print "args...:",metadata,self.id,smearer,qmin,qmax,ymin,ymax
+                    #print "args...:",metadata,self.id,smearer,qmin,qmax,ymin,ymax
                   
                     self.fitter.set_data(data=metadata,Uid=self.id,
@@ -468 +474 @@
                           
                     self.fitter.set_model(new_model, self.id, pars) 
-                    
                     self.fitter.set_data(metadata,self.id,qmin,qmax,ymin,ymax)
                     self.fitter.select_problem_for_fit(Uid=self.id,value=value.get_scheduled())
@@ -642 +647 @@
                 xmin=data.xmin
                 xmax=data.xmax
-                print " q range =",    
+                #print " q range =",    
                 theory.data = numpy.zeros((len(data.y_bins),len(data.x_bins)))
-                for j in range(len(data.y_bins)):
-                    if data.y_bins[j]>= ymin and data.y_bins[j]<= ymax:
-                        for i in range(len(data.x_bins)):
+                for i in range(len(data.y_bins)):
+                    if data.y_bins[i]>= ymin and data.y_bins[i]<= ymax:
+                        for j in range(len(data.x_bins)):
                             if data.x_bins[i]>= qmin and data.x_bins[i]<= qmax:
                                 theory.data[j][i]=model.runXY([data.y_bins[j],data.x_bins[i]])