Changeset f39511b in sasview for sansview/perspectives/fitting/modelpage.py

Timestamp:

Dec 12, 2008 3:13:10 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:

3aae6b6

Parents:

2d107b8

Message:

scroll bars and model2d view added—bug?

File:

• sansview/perspectives/fitting/modelpage.py (modified) (8 diffs)

sansview/perspectives/fitting/modelpage.py

@@ -25 +25 @@
 
     
-class ModelPage(wx.Panel):
+class ModelPage(wx.ScrolledWindow):
     """
         FitPanel class contains fields allowing to display results when
@@ -40 +40 @@
     
     def __init__(self, parent,model, *args, **kwargs):
-        wx.Panel.__init__(self, parent, *args, **kwargs)
+        wx.ScrolledWindow.__init__(self, parent, *args, **kwargs)
         """ 
             Initialization of the Panel
         """
+        #self.scroll = wx.ScrolledWindow(self)
         self.manager = None
         self.parent  = parent
@@ -78 +79 @@
         ix += 1
         self.sizer3.Add(self.modelbox,(iy,ix),(1,1),  wx.EXPAND|wx.ADJUST_MINSIZE, 0)
+        ix = 0
+        iy += 1
+        self.model_view= wx.CheckBox(self, -1, "View in 2D", (10, 10))
+        wx.EVT_CHECKBOX(self, self.model_view.GetId(), self.onModel2D)
+        self.sizer3.Add(self.model_view,(iy,ix),(1,1),\
+                   wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
         # contains link between  model ,all its parameters, and panel organization
         self.parameters=[]
@@ -85 +92 @@
         self.model=model
         try:
-            print"init modelpage",model.name
+            #print"init modelpage",model.name
             self.set_panel(model)
         except:
@@ -100 +107 @@
         self.vbox.Layout()
         self.vbox.Fit(self) 
+        
         self.SetSizer(self.vbox)
+        self.SetScrollbars(20,20,55,40)
         self.Centre()
        
@@ -122 +131 @@
         """
         self.manager = manager
-  
+    def onModel2D(self, event):
+        
+        if self.model_view.GetValue()==True:
+            print "2D model"
+            self.manager.draw_model(self.model,
+                                    description=None, enable2D=True,qmin=None, qmax=None)
     def populate_box(self, dict):
         """
@@ -167 +181 @@
             if hasattr(items, "name"):
                 name = items.name
-            print "fitpage: _on_select_model model name",name ,event.GetString()
+            #print "fitpage: _on_select_model model name",name ,event.GetString()
             if name ==event.GetString():
                 model=items
-                print "fitpage: _on_select_model model name",name ,event.GetString()
+                #print "fitpage: _on_select_model model name",name ,event.GetString()
                 self.model= model
+                self.set_panel(model)
                 self.manager.draw_model(model)
-                self.set_panel(model)
+                
     def set_model_name(self,name):
         """ 
@@ -233 +248 @@
             
         disp_list.sort()
-        print "went here",self.model.name,model.description
+        #print "went here",self.model.name,model.description
         iy = 1
         ix = 0