Changeset 484faf7 in sasview for sansview/perspectives/fitting

Timestamp:

Jan 4, 2010 8:11:56 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:

6e0e2d85

Parents:

0277d084

Message:

adding invarant panel

Location:

sansview/perspectives/fitting

Files:

• basepage.py (modified) (4 diffs)
• fitting.py (modified) (11 diffs)
• help_panel.py (moved) (moved from sansview/perspectives/fitting/helpPanel.py)
• invariant_panel.py (added)
• modelpage.py (deleted)
• sldCalculator.py (deleted)
• sldPanel.py (deleted)

sansview/perspectives/fitting/basepage.py

@@ -1229 +1229 @@
                 if self.enable_smearer.GetValue():
                     temp_smear= self.smearer
+            
             self.manager.draw_model(self.model, data=self.data,
                                     smearer= temp_smear,
-                                    qmin=float(self.qmin_x), qmax=float(self.qmax_x),
+                                    qmin=float(self.qmin_x), 
+                                    qmax=float(self.qmax_x),
                                     qstep= float(self.num_points),
                                     enable2D=self.enable2D) 
@@ -1442 +1444 @@
 
                 # If qmin and qmax have been modified, update qmin and qmax
-                if check_value( self.qmin, self.qmax):
+                if self._validate_qrange( self.qmin, self.qmax):
                     tempmin = float(self.qmin.GetValue())
                     if tempmin != self.qmin_x:
@@ -1481 +1483 @@
         wx.PostEvent(self.parent, event)
         self.state_change= False
-  
+        #Draw the model for a different range
+        self._draw_model()
                    
     def _on_select_model_helper(self): 
@@ -2012 +2015 @@
         #On 'More details' button
         """
-        from helpPanel import  HelpWindow
+        from help_panel import  HelpWindow
         
         if self.model == None:

sansview/perspectives/fitting/fitting.py

@@ -102 +102 @@
         self.sim_page=None
         #dictionary containing data name and error on dy of that data 
-        self.err_dy={}
+        self.err_dy = {}
         
    
@@ -136 +136 @@
         wx.EVT_MENU(owner, id1, self.on_add_sim_page)
         #menu for SLD Calculator
-        self.tool_menu = wx.Menu()
-        id_tool_menu = wx.NewId()
-        sld_id = wx.NewId()
-        sld_help= "Compute the scattering length density of molecules"
-        self.tool_menu.Append(sld_id, "SLD Calculator",sld_help)
-        wx.EVT_MENU(owner,sld_id,  self.onCalculateSld)
+        #self.tool_menu = wx.Menu()
+        #id_tool_menu = wx.NewId()
+        #sld_id = wx.NewId()
+        #sld_help= "Compute the scattering length density of molecules"
+        #self.tool_menu.Append(sld_id, "SLD Calculator",sld_help)
+        #wx.EVT_MENU(owner,sld_id,  self.onCalculateSld)
     
         #menu for model
@@ -154 +154 @@
       
         #create  menubar items
-        return [(id, self.menu1, "Fitting"),
-                (id_tool_menu, self.tool_menu,"Tools" ),
-                (id2, menu2, "Model")]
+        return [(id, self.menu1, "Fitting")]
+                #(id_tool_menu, self.tool_menu,"Tools" ),
+                #(id2, menu2, "Model")]
        
     
@@ -178 +178 @@
             TODO: replace the text with a nice image
         """
-        from helpPanel import  HelpWindow
+        
+        from help_panel import  HelpWindow
         frame = HelpWindow(None, -1, 'HelpWindow')    
         frame.Show(True)
@@ -194 +195 @@
         """
         self.graph = graph
-        fitOption = "Select data for fitting"
-        fitOpenHint =  "Dialog with fitting parameters "
-               
+        fit_option = "Select data for fitting"
+        fit_hint =  "Dialog with fitting parameters "
+        invariant_option = "Compute Invariant"
+        invariant_hint =  "A dialog will appears for further computation"
         for item in graph.plottables:
             if item.__class__.__name__ is "Data2D":
@@ -202 +204 @@
                 if hasattr(item,"is_data"):
                     if item.is_data:
-                        return [[fitOption, fitOpenHint, self._onSelect]]
+                        return [[fit_option, fit_hint, self._onSelect]]
                     else:
                         return [] 
-                return [[fitOption, fitOpenHint, self._onSelect]]
+                return [[fit_option, fit_hint, self._onSelect]]
             else:
                 if item.name==graph.selected_plottable :
@@ -214 +216 @@
                             if hasattr(item,"is_data"):
                                 if item.is_data:
-                                    return [[fitOption, fitOpenHint, self._onSelect]]
+                                    return [[fit_option, fit_hint,
+                                              self._onSelect],
+                                            [invariant_option, 
+                                    invariant_hint, self._compute_invariant]]
                                 else:
                                     return [] 
                             else:
-                               return [[fitOption, fitOpenHint, self._onSelect]] 
+                               return [[fit_option, fit_hint, self._onSelect],
+                                       [invariant_option, 
+                                        invariant_hint, self._compute_invariant]]
         return []   
 
@@ -548 +555 @@
                
             
-            
+    def _compute_invariant(self, event):    
+        """
+            Open the invariant panel to invariant computation
+        """
+        
+        
     def _closed_fitpage(self, event):   
         """
@@ -848 +860 @@
             set engine to park
         """
+        Plugin.on_perspective(self,event=event)
         self._on_change_engine('park')
        
@@ -908 +921 @@
             @param engine: the key work of the engine
         """
+       
         ## saving fit engine name
         self._fit_engine = engine
@@ -1090 +1104 @@
            
             title= new_plot.name
-            
+            new_plot. perspective = self.get_perspective()
             # Pass the reset flag to let the plotting event handler
             # know that we are replacing the whole plot