Changeset b324aa9 in sasview for sansview/perspectives/fitting/fitting.py

Timestamp:

Feb 26, 2010 5:15:24 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:

4d6cce0

Parents:

3562fbc

Message:

remove invariant

File:

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

sansview/perspectives/fitting/fitting.py

@@ -185 +185 @@
         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":
@@ -205 +204 @@
                                 if item.is_data:
                                     return [[fit_option, fit_hint,
-                                              self._onSelect],
-                                            [invariant_option, 
-                                    invariant_hint, self._compute_invariant]]
+                                              self._onSelect]]
                                 else:
                                     return [] 
                             else:
-                               return [[fit_option, fit_hint, self._onSelect],
-                                       [invariant_option, 
-                                        invariant_hint, self._compute_invariant]]
+                               return [[fit_option, fit_hint, self._onSelect]]
         return []   
 
@@ -524 +519 @@
             and panel_name to find the slicer 's panel concerned.
         """
-        
         for item in self.parent.panels:
             if self.parent.panels[item].window_caption.startswith(event.panel_name):
@@ -530 +524 @@
                 
         self.parent._mgr.Update()
-               
-    def _compute_invariant(self, event):    
-        """
-            Open the invariant panel to invariant computation
-        """
-        self.panel = event.GetEventObject()
-        Plugin.on_perspective(self,event=event)
-        for plottable in self.panel.graph.plottables:
-            if plottable.name == self.panel.graph.selected_plottable:
-                data = self.copy_data(item= plottable, dy=plottable.dy)
-               
-                from invariant_panel import InvariantWindow
-                frame = InvariantWindow(base=self.parent, data=plottable, graph=self.panel.graph)   
-                frame.Show(True)
+   
               
     def _closed_fitpage(self, event):   
@@ -665 +646 @@
                 ## before sending them to the fit engine
                 if len(self.err_dy)>0:
+                    dy = item.dy
                     if item.name in  self.err_dy.iterkeys():
-                        dy= self.err_dy[item.name]
-                        data= self.copy_data(item, dy)
-                        data.is_data= item.is_data
-                    else:
-                        data= self.copy_data(item, item.dy)
-                        data.is_data= item.is_data
-                        
-                       
+                        dy = self.err_dy[item.name]
+                    data = self.copy_data(item, dy)
+                    data.is_data= item.is_data
+                
                 else:
                     if item.dy==None:
@@ -1143 +1121 @@
             their errors of y coordinates for 1Data hide and show error
         """
-        self.err_dy= event.err_dy
+        self.err_dy = event.err_dy