Changeset 7ad6ff5 in sasview for sansview/perspectives/fitting

Timestamp:

Sep 11, 2009 4:19:50 PM (15 years ago)

Author:

Jae Cho <jhjcho@…>

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:

6ab0ad1

Parents:

be8c217

Message:

Added model detail button in fit panel

Location:

sansview/perspectives/fitting

Files:

• basepage.py (modified) (2 diffs)
• fitpage.py (modified) (4 diffs)
• fitting.py (modified) (1 diff)

sansview/perspectives/fitting/basepage.py

@@ -1122 +1122 @@
         self.struct_rbutton = wx.RadioButton(self, -1, "Structure Factor ")
         self.plugin_rbutton = wx.RadioButton(self, -1, "Customized Models")
-        
+                
         self.Bind( wx.EVT_RADIOBUTTON, self._show_combox,
                             id= self.shape_rbutton.GetId() ) 
@@ -1712 +1712 @@
         self.SetScrollbars(20,20,200,100)
         
-        
+    def on_model_help_clicked(self,event):
+        """
+        #On 'More details' button
+        """
+        from helpPanel import  HelpWindow
+        
+        if self.model == None:
+            name = 'FuncHelp'
+        else:
+            name = self.model.origin_name
+
+        frame = HelpWindow(None, -1,  pageToOpen="doc/model_functions.html")    
+        frame.Show(True)
+        if frame.rhelp.HasAnchor(name):
+            frame.rhelp.ScrollToAnchor(name)
+        else:
+           msg= "Model does not contains an available description "
+           msg +="Please try searching in the Help window"
+           wx.PostEvent(self.parent.parent, StatusEvent(status = msg ))                    
                 

sansview/perspectives/fitting/fitpage.py

@@ -48 +48 @@
        
         self._fill_model_sizer( self.sizer1)
+ 
         self._fill_range_sizer() 
         #self._on_select_model(event=None)
@@ -230 +231 @@
         self.sizer0.Layout()
        
-        
-       
     def _fill_model_sizer(self, sizer):
         """
             fill sizer containing model info
         """
-       
+        ##Add model function Details button in fitpanel.
+        id = wx.NewId()
+        self.model_help =wx.Button(self,id,'Details')
+        self.model_help.Bind(wx.EVT_BUTTON, self.on_model_help_clicked,id=id)
+        self.model_help.SetToolTipString("Model Function Help")
+        
         ## class base method  to add view 2d button    
-        self._set_model_sizer(sizer=sizer, title="Model",object=None )    
-        
+        self._set_model_sizer(sizer=sizer, title="Model",object=self.model_help )   
+
     
     #def _set_sizer_gaussian(self):
@@ -251 +255 @@
        
         self.sizer4_4.Clear(True)
-       
         if self.model==None:
             ##no model is selected
@@ -1286 +1289 @@
         self.SetScrollbars(20,20,200,100)
        
-            
         
 class HelpWindow(wx.Frame):

sansview/perspectives/fitting/fitting.py

@@ -946 +946 @@
         if model ==None:
             return
-       
+        model.origin_name = model.name
         current_pg = self.fit_panel.get_current_page() 
         ## make sure nothing is done on self.sim_page