Changeset bcd6d51 in sasview for sansview

Timestamp:

Oct 16, 2008 11:28:59 AM (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:

4ddf1067

Parents:

f8ce013

Message:

working on data2D panel

Location:

sansview/perspectives/fitting

Files:

• fitpage1D.py (added)
• fitpage2D.py (moved) (moved from sansview/perspectives/fitting/fitpage.py) (1 diff)
• fitpanel.py (modified) (2 diffs)
• fitting.py (modified) (8 diffs)

sansview/perspectives/fitting/fitpage2D.py

@@ -25 +25 @@
 
     
-class FitPage(wx.Panel):
+class FitPage2D(wx.Panel):
     """
         FitPanel class contains fields allowing to display results when

sansview/perspectives/fitting/fitpanel.py

@@ -66 +66 @@
       
         
-    def add_fit_page( self,page_title ):
+    def add_fit_page( self,data ):
         """ 
             Add a fitting page on the notebook contained by fitpanel
@@ -73 +73 @@
             @return panel : page just added for futher used. is used by fitting module
         """     
-        if self.fit_page_name != page_title:
-            from fitpage import FitPage
-            panel = FitPage(self.nb, -1)
+        try:
+            name = data.group_id # item in Data1D
+        except:
+            name = 'Fit'
+        if self.fit_page_name != name:
+            if data.__class__.__name__=='MetaData2D':
+                 from fitpage2D import FitPage2D
+                 panel = FitPage2D(self.nb, -1)
+            else:
+                from fitpage1D import FitPage1D
+                panel = FitPage1D(self.nb, -1)
             panel.set_manager(self.manager)
             panel.set_owner(self.event_owner)
-            self.nb.AddPage(page=panel,text=page_title,select=True)
+            self.nb.AddPage(page=panel,text=name,select=True)
             panel.populate_box( self.model_list_box)
-            self.fit_page_name = page_title
+            self.fit_page_name = name
             return panel
         

sansview/perspectives/fitting/fitting.py

@@ -14 +14 @@
 
 import models
-import fitpage
+import fitpage1D
 import park
 
@@ -64 +64 @@
         self.fit_panel.set_owner(owner)
         self.fit_panel.set_model_list(self.menu_mng.get_model_list())
-        owner.Bind(fitpage.EVT_MODEL_BOX,self._on_model_panel)
+        owner.Bind(fitpage1D.EVT_MODEL_BOX,self._on_model_panel)
         #create  menubar items
         return [(id, self.menu1, "Fitting"),(id2, menu2, "Model")]
@@ -146 +146 @@
             if item.name == self.panel.graph.selected_plottable or item.__class__.__name__ is "MetaData2D":
                 #find a name for the page created for notebook
+                
                 try:
-                    name = item.group_id # item in Data1D
-                except:
-                    name = 'Fit'
-                try:
-                    page = self.fit_panel.add_fit_page(name)
+                    page = self.fit_panel.add_fit_page(item)
                     # add data associated to the page created
-                    if item.__class__.__name__=='MetaData1D' or item.__class__.__name__=='Data1D' :
-                        new_item=FitData1D(item)
-                    else:
-                        new_item=FitData2D(item)
+                    
                     if page !=None:    
-                        page.set_data_name(new_item)
+                        page.set_data_name(item)
                         #create a fitproblem storing all link to data,model,page creation
                         self.page_finder[page]= FitProblem()
@@ -164 +158 @@
                         #datap = PlottableData(data=data_for_park,data1d=item)
                         #self.page_finder[page].add_data(datap)
-                        self.page_finder[page].add_data(new_item)
+                        self.page_finder[page].add_data(item)
                 except:
-                    raise
                     wx.PostEvent(self.parent, StatusEvent(status="Creating Fit page: %s"\
                     %sys.exc_value))
@@ -201 +194 @@
                 list=value.get_model()
                 model=list[0]
-                print "fitting",model.name,modelname
+                #print "fitting",model.name,modelname
                 if model.name== modelname:
                     value.set_model_param(names,values)
@@ -437 +430 @@
             react to model selection on any combo box or model menu.plot the model  
         """
+        
         model = evt.model
         name = evt.name
@@ -444 +438 @@
             current_pg.set_model_name(name)
             current_pg.set_panel(model)
+            
             try:
-                fitdata=self.page_finder[current_pg].get_data()
-                M_name="M"+str(self.index_model)+"= "+name+"("+fitdata.data.group_id+")"
+                metadata=self.page_finder[current_pg].get_data()
+                M_name="M"+str(self.index_model)+"= "+name+"("+metadata.group_id+")"
             except:
-                raise 
                 M_name="M"+str(self.index_model)+"= "+name
             model.name="M"+str(self.index_model)
@@ -479 +473 @@
             for page in self.page_finder.iterkeys():
                 if  page==currpage :  
+                    data=self.page_finder[page].get_data()
+                    list=self.page_finder[page].get_model()
+                    model=list[0]
                     break 
-            fitdata=self.page_finder[page].get_data()
-            list=self.page_finder[page].get_model()
-            model=list[0]
-            data=fitdata.data
             
             if data!=None and data.__class__.__name__ != 'MetaData2D':