Changeset 1b1bbf9 in sasview for sansview/perspectives/fitting

Timestamp:

Apr 6, 2011 8:42:32 AM (14 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:

2ca51f44

Parents:

16865897

Message:

focus color (plots) and adjust panel sizes a bit

Location:

sansview/perspectives/fitting

Files:

• basepage.py (modified) (1 diff)
• fitpage.py (modified) (1 diff)
• fitpanel.py (modified) (6 diffs)
• fitting.py (modified) (5 diffs)
• ftol_dialog.py (modified) (1 diff)

sansview/perspectives/fitting/basepage.py

@@ -23 +23 @@
 _QMIN_DEFAULT = 0.0005
 _QMAX_DEFAULT = 0.5
-_NPTS_DEFAULT = 50
+_NPTS_DEFAULT = 200
 #Control panel width 
 if sys.platform.count("darwin")==0:

sansview/perspectives/fitting/fitpage.py

@@ -2722 +2722 @@
             self._show_ftol_dialog()
             flag = True
+        elif event.AltDown() or event.ShiftDown():
+            flag = False
         else:
-            flag = False
+            return
         # make event free
         event.Skip()

sansview/perspectives/fitting/fitpanel.py

@@ -3 +3 @@
 import string 
 import wx
-import wx.lib.flatnotebook as fnb
+#from wx.lib.flatnotebook import FlatNotebook as nb
+from wx.aui import AuiNotebook as nb
 
 from sans.guiframe.panel_base import PanelBase
@@ -14 +15 @@
 
 
-class FitPanel(fnb.FlatNotebook, PanelBase):    
+class FitPanel(nb, PanelBase):    
 
     """
@@ -32 +33 @@
         """
         """
-        fnb.FlatNotebook.__init__(self, parent, -1,
+        nb.__init__(self, parent, -1,
                     style= wx.aui.AUI_NB_WINDOWLIST_BUTTON|
                     wx.aui.AUI_NB_DEFAULT_STYLE|
                     wx.CLIP_CHILDREN)
         PanelBase.__init__(self, parent)
-        self.SetWindowStyleFlag(style=fnb.FNB_FANCY_TABS)
+        #self.SetWindowStyleFlag(style=nb.FNB_FANCY_TABS)
         self._manager = manager
         self.parent = parent
@@ -44 +45 @@
         self.menu_mng = models.ModelManager()
         self.model_list_box = self.menu_mng.get_model_list()
-        #pageClosedEvent = fnb.EVT_FLATNOTEBOOK_PAGE_CLOSING 
-        self.Bind(fnb.EVT_FLATNOTEBOOK_PAGE_CLOSING , self.on_close_page)
+        #pageClosedEvent = nb.EVT_FLATNOTEBOOK_PAGE_CLOSING 
+        pageClosedEvent = wx.aui.EVT_AUINOTEBOOK_PAGE_CLOSE
+        
+        self.Bind(pageClosedEvent, self.on_close_page)
          ## save the title of the last page tab added
         self.fit_page_name = {}
@@ -58 +61 @@
         self.Bind(basepage.EVT_NEXT_STATE, self._onRedo)
         self.Bind(wx.aui.EVT_AUINOTEBOOK_PAGE_CHANGED, self.on_page_changing)
-      
+
         #add default pages
         self.add_default_pages()
@@ -375 +378 @@
         """
         #remove hint page
-        if selected_page == self.hint_page:
-            return
+        #if selected_page == self.hint_page:
+        #    return
         ## removing sim_page
         if selected_page == self.sim_page :

sansview/perspectives/fitting/fitting.py

@@ -277 +277 @@
                 wx.PostEvent(self.parent, NewPlotEvent(plot=data, 
                                                        title=str(data.title)))
+                
         except:
             raise
             #msg = "Fitting Set_data: " + str(sys.exc_value)
             #wx.PostEvent(self.parent, StatusEvent(status=msg, info="error"))
-            
+    
+    def set_top_panel(self):
+        """
+        Close default (welcome) panel
+        """
+        if 'default' in self.parent.panels:
+            self.parent.on_close_welcome_panel()
+
+             
     def set_theory(self,  theory_list=None):
         """
@@ -352 +361 @@
                 wx.PostEvent(self.parent, NewPlotEvent(plot=data,
                                         title=data.title))
-                self.add_fit_page(data)
-                caption = panel.window_name
-                self.store_data(page=panel.id, data=data, caption=caption)
-                self.mypanels.append(panel) 
+                page = self.add_fit_page(data)
+                caption = page.window_name
+                self.store_data(page=page.id, data=data, caption=caption)
+                self.mypanels.append(page) 
                 
             # get ready for the next set_state
@@ -689 +698 @@
                 wx.PostEvent(self.parent, StatusEvent(status=msg,
                                                        info="warning"))
+            self.set_top_panel()
         except:
             raise
@@ -726 +736 @@
         if self.sim_page is not None:
             self.sim_page.draw_page()
+        return page
             
     def _onEVT_SLICER_PANEL(self, event):
@@ -851 +862 @@
                 data = plottable
                 self.add_fit_page(data=data)
+        self.set_top_panel()
             
     def update_fit(self, result=None, msg=""):

sansview/perspectives/fitting/ftol_dialog.py

@@ -11 +11 @@
 import wx
 import sys
-from sans.guicomm.events import StatusEvent  
+from sans.guiframe.events import StatusEvent  
 # default ftol
 F_TOL = 1.49012e-08