Changeset d23544dc in sasview for sansview/perspectives/fitting/fitpage1D.py

Timestamp:

Jan 14, 2009 5:25:32 PM (16 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:

1b6bb09

Parents:

a19cd4d

Message:

panel1d and 2 d for fitpanel refactored

File:

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

sansview/perspectives/fitting/fitpage1D.py

@@ -24 +24 @@
         return "%-5.3g" % value
 
-    
-class FitPage1D(wx.ScrolledWindow):
+from modelpage import format_number
+from modelpage import ModelPage
+class FitPage1D(ModelPage):
     """
         FitPanel class contains fields allowing to display results when
@@ -202 +203 @@
        
 
-        
-        
-        
-        
-        
-        
-    def set_owner(self,owner):
-        """ 
-            set owner of fitpage
-            @param owner: the class responsible of plotting
-        """
-        self.event_owner = owner    
-   
   
-    def set_manager(self, manager):
-        """
-             set panel manager
-             @param manager: instance of plugin fitting
-        """
-        self.manager = manager
+  
  
-        
-    def onClose(self,event):
-        """ close the page associated with this panel"""
-        self.GrandParent.onClose()
-        
         
     def compute_chisqr(self):
@@ -273 +251 @@
               wx.PostEvent(self.parent.GrandParent, StatusEvent(status=\
                             "Select at least on parameter to fit "))
-    def populate_box(self, dict):
-        """
-            Populate each combox box of each page
-            @param page: the page to populate
-        """
-        id=0
-        self.model_list_box=dict
-        list_name=[]
-        for item in  self.model_list_box.itervalues():
-            name = item.__name__
-            if hasattr(item, "name"):
-                name = item.name
-            list_name.append(name)
-        list_name.sort()   
-        for name in list_name:
-            self.modelbox.Insert(name,int(id))
-            id+=1
-        wx.EVT_COMBOBOX(self.modelbox,-1, self._on_select_model) 
-        return 0
-    
+  
     
     def _on_select_model(self,event):
@@ -361 +320 @@
         return flag
     
-
-    def get_model_box(self): 
-        """ return reference to combox box self.model"""
-        return self.modelbox
 
     
@@ -543 +498 @@
             for item in self.parameters:
                 try:
+                    self.text2_3.Hide()
                     item[2].Hide()
                     item[3].Clear()
@@ -567 +523 @@
             
             if is_modified:
-                self.manager.redraw_model(
-                                        qmin=self.qmin, qmax=self.qmax,
-                                        )
-            #self.manager.draw_model(self,model,description=None,
-            # enable1D=True,qmin=None,qmax=None, qstep=None)
-           
+                self.manager.redraw_model(qmin=self.qmin, qmax=self.qmax)
+         
     def select_all_param(self,event): 
         """