Changeset 32673ac in sasview

Timestamp:

Jan 21, 2009 6:42:54 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:

54cc36a

Parents:

2eb40c5

Message:

working on the view2D button

Location:

sansview/perspectives/fitting

Files:

• fitpage1D.py (modified) (1 diff)
• fitting.py (modified) (2 diffs)
• modelpage.py (modified) (2 diffs)

sansview/perspectives/fitting/fitpage1D.py

@@ -185 +185 @@
         self.qmin= 0.001
         self.qmax= 0.1
-        """
-        bs = wx.BoxSizer(wx.VERTICAL)
-        bs.Add(self.scroll, 1, wx.EXPAND)
-        self.SetSizer(bs)
-        self.scroll.SetSizer(self.vbox)        
-        self.scroll.SetScrollbars(20,20,55,40)
-        #width,height = self.GetSize()
-         """
+       
         self.vbox.Layout()
         self.vbox.Fit(self) 

sansview/perspectives/fitting/fitting.py

@@ -7 +7 @@
 from danse.common.plottools.PlotPanel import PlotPanel
 from sans.guicomm.events import NewPlotEvent, StatusEvent  
-from sans.guicomm.events import EVT_SLICER_PARS
+from sans.guicomm.events import EVT_SLICER_PANEL
 
 from sans.fit.AbstractFitEngine import Model,Data,FitData1D,FitData2D
@@ -130 +130 @@
         #index number to create random model name
         self.index_model = 0
-        self.parent.Bind(EVT_SLICER_PARS, self._on_slicer_event)
+        self.parent.Bind(EVT_SLICER_PANEL, self._on_slicer_event)
         #create the fitting panel
         #return [self.fit_panel]
+        
         self.mypanels.append(self.fit_panel)
         return self.mypanels
     def _on_slicer_event(self, event):
-        print "slicer event ", event.panel
+        print "fitting:slicer event ", event.panel
         new_panel = event.panel
         # Set group ID if available
         event_id = self.parent.popup_panel(new_panel)
-        #self.menu.Append(event_id, new_panel.window_caption, 
-        #                 "Show %s plot panel" % new_panel.window_caption)
+        self.menu1.Append(event_id, new_panel.window_caption, 
+                         "Show %s plot panel" % new_panel.window_caption)
         # Set UID to allow us to reference the panel later
         new_panel.uid = event_id
-       
+        new_panel
         self.mypanels.append(new_panel) 
         return        

sansview/perspectives/fitting/modelpage.py

@@ -208 +208 @@
             self.enable2D=True
             self._draw_model()
+        else:
+            self.manager.menu1.Append(event_id, new_panel.window_caption, 
+                         "Show %s plot panel" % new_panel.window_caption)
             
     def populate_box(self, dict):
@@ -441 +444 @@
                                 enable2D=self.enable2D)
    
-            
-            
+