Changeset 6450d8c in sasview for sansview/perspectives/fitting

Timestamp:

Jul 27, 2010 4:37:01 PM (14 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:

8898e963

Parents:

330c63b

Message:

working on guiframe and combobox

Location:

sansview/perspectives/fitting

Files:

• fitpanel.py (modified) (4 diffs)
• fitting.py (modified) (3 diffs)
• hint_fitpage.py (modified) (1 diff)

sansview/perspectives/fitting/fitpanel.py

@@ -4 +4 @@
 import wx
 import wx.aui
-
+from sans.guicomm.events import NewPlotEvent, StatusEvent  
 import basepage
 
@@ -212 +212 @@
         if state is not None:
             page_info = self.get_page_info(data=state.data)
+            if hasattr(state.data,"title"):
+                title = str(state.data.title.lstrip().rstrip())
+                if title == "":
+                    title = str(state.data.name)
+            else:
+                title = str(state.data.name)
             for name, panel, type in self.opened_pages.values():
                 #Don't return any panel is the exact same page is created
@@ -227 +233 @@
                         self.manager.store_page(page=panel, data=state.data)
                     panel.reset_page(state=state)
+                    wx.PostEvent(self.parent, NewPlotEvent(plot=state.data, title=title))
                     page_is_opened = True
                     
@@ -235 +242 @@
                     self.manager.store_page(page=panel, data=state.data)
                     panel.reset_page(state=state)
+                    wx.PostEvent(self.parent, NewPlotEvent(plot=state.data, title=title))
                     
     def on_close_page(self, event):

sansview/perspectives/fitting/fitting.py

@@ -667 +667 @@
         try:
             page = self.fit_panel.add_fit_page(data)
-            # add data associated to the page created
-            if page != None:  
-                self.store_page(page=page, data=data)
+            if data !=None:
                 if hasattr(data,"title"):
                     title = str(data.title.lstrip().rstrip())
@@ -677 +675 @@
                     title = str(data.name)
                 wx.PostEvent(self.parent, NewPlotEvent(plot=data, title=title))
+            # add data associated to the page created
+            if page != None:  
+                self.store_page(page=page, data=data)
                 wx.PostEvent(self.parent, StatusEvent(status="Page Created",
                                                info="info"))
@@ -683 +684 @@
                 wx.PostEvent(self.parent, StatusEvent(status=msg, info="warning"))
         except:
-            raise
-            #msg = "Creating Fit page: %s"%sys.exc_value
-            #wx.PostEvent(self.parent, StatusEvent(status=msg, info="error"))
+            
+            msg = "Creating Fit page: %s"%sys.exc_value
+            wx.PostEvent(self.parent, StatusEvent(status=msg, info="error"))
        
     def _onEVT_SLICER_PANEL(self, event):

sansview/perspectives/fitting/hint_fitpage.py

@@ -81 +81 @@
         data, path = self.data_cbbox.GetClientData(n)
         self.parent.manager.add_fit_page(data=data)
-        title = os.path.basename(path)
-       
-        
+      
     def createMemento(self):
         """