Changeset 9237df4 in sasview for sansview/perspectives/fitting/fitting.py

Timestamp:

Jan 26, 2010 2:04:48 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:

2377cd4

Parents:

693500a

Message:

some change for danse meeting

File:

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

sansview/perspectives/fitting/fitting.py

@@ -261 +261 @@
         """
         self.parent.set_perspective(self.perspective)
-    
-    
+   
     def post_init(self):
         """
@@ -272 +271 @@
         pass
 
-
+    def get_tools(self):
+        """
+            Returns a set of menu entries for tools
+        """
+        id = wx.NewId()
+        sld_help = "Provides computation related to Scattering Length density"
+        return [("SLD Calculator", sld_help, self.on_calculate_sld)]
+        
     def copy_data(self, item, dy=None):
         """
@@ -510 +516 @@
             time.sleep(0.4)
              
+    def on_calculate_sld(self, event):
+        """
+            Compute the scattering length density of molecula
+        """  
+       
+        import  sld_panel 
+        frame = sld_panel.SldWindow(base=self.parent)
+        frame.Show(True) 
+      
+          
     def _onEVT_SLICER_PANEL(self, event):
         """
@@ -524 +540 @@
         self.parent._mgr.Update()
                
-  
     def _compute_invariant(self, event):    
         """
@@ -534 +549 @@
             if plottable.name == self.panel.graph.selected_plottable:
                 data = self.copy_data(item= plottable, dy=plottable.dy)
-                
-                print "_compute_invariant",data._yaxis
-                print "_compute_invariant" ,data._yunit
+               
                 from invariant_panel import InvariantWindow
                 frame = InvariantWindow(base=self.parent, data=plottable, graph=self.panel.graph)   
                 frame.Show(True)
-                #from invariant_panel import InvariantDialog
-                #self.invariant_dlg = InvariantDialog(base=self.parent,
-                #                                     data=plottable)
-                #if self.invariant_dlg.ShowModal() == wx.ID_OK:
-                #    pass
-                #self.invariant_dlg.Destroy()
-                
+              
     def _closed_fitpage(self, event):   
         """
@@ -553 +560 @@
         """    
         self.fit_panel._close_fitpage(event.data) 
-        
         
     def _add_page_onmenu(self, name,fitproblem=None):
@@ -712 +718 @@
                 try:
                     page = self.fit_panel.add_fit_page(data)
+                    page.set_data(data)
                     # add data associated to the page created
-                    if page !=None:   
+                    if page != None:   
                         #create a fitproblem storing all link to data,model,page creation
                         if not page in self.page_finder.keys():
@@ -767 +774 @@
 
             cpage.onsetValues(result.fitness,param_name, result.pvec,result.stderr)
-            """
-            ## plot the current model with new param
-            metadata =  self.page_finder[cpage].get_fit_data()
-            model = self.page_finder[cpage].get_model()
-            qmin, qmax= self.page_finder[cpage].get_range()
-            smearer =self.page_finder[cpage].get_smearer()
-            #Replot models
-            msg= "Single Fit completed. plotting... %s:"%model.name
-            wx.PostEvent(self.parent, StatusEvent(status="%s " % msg))
-            self.draw_model( model=model, data= metadata, smearer= smearer,
-                             qmin= qmin, qmax= qmax)
-            """
+           
         except:
             raise
@@ -939 +935 @@
         model = evt.model
         
-        if model ==None:
+        if model == None:
             return
         model.origin_name = model.name