Changeset a93f525 in sasview

Timestamp:

Aug 4, 2010 1:05:12 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:

b35d3d1

Parents:

10f3b23

Message:

make sure the first fitpage is filled up on first load

File:

• sansview/perspectives/fitting/fitpanel.py (modified) (12 diffs)

sansview/perspectives/fitting/fitpanel.py

@@ -4 +4 @@
 import wx
 import wx.aui
-from sans.guicomm.events import NewPlotEvent, StatusEvent  
+
 import basepage
 
@@ -187 +187 @@
         self.Bind(basepage.EVT_NEXT_STATE, self._onRedo)
         
-       #add default page
+        #add default page
         from hint_fitpage import HintFitPage
         self.hint_page = HintFitPage(self) 
@@ -195 +195 @@
         
         # increment number for model name
-        self.count = 0
+        self.count=0
         #updating the panel
         self.Update()
@@ -207 +207 @@
         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():
+            for name, panel in self.opened_pages.values():
                 #Don't return any panel is the exact same page is created
                 if name == page_info.window_name:
                     # the page is still opened
-                    panel.set_manager(self.manager)
-                    panel.set_owner(self.event_owner)
-                    if panel.model_list_box is None or len(panel.model_list_box) == 0: 
-                        page_info.model_list_box = self.model_list_box.get_list()
-                        panel.populate_box(dict=page_info.model_list_box)
-                        panel.initialize_combox()
-                        panel.set_page_info(page_info=page_info)
-                        self.opened_pages[page_info.window_name] = [page_info.window_name, panel, page_info.type]
-                    if panel is not None:  
-                        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
-                    
             if not page_is_opened:
                 panel = self.add_fit_page(data=state.data)
@@ -237 +219 @@
                     self.manager.store_page(page=panel, data=state.data)
                     panel.reset_page(state=state)
-                
                     
     def on_close_page(self, event):
@@ -244 +225 @@
         """
         nbr_page = self.GetPageCount()
-        pos = self.GetSelection()
-        if nbr_page == 1 or self.GetPage(pos)== self.hint_page:
+        if nbr_page == 1:
             event.Veto()
             return 
@@ -278 +258 @@
         """
         self.manager = manager
-    
+
         
     def set_owner(self,owner):
@@ -323 +303 @@
         name = "Fit Page"
         type = 'empty'
-        if data is not None and hasattr(data, "is_data"):
+        if data is not None:
             if data.is_data:
                 name = data.name 
@@ -350 +330 @@
         panel = FitPage(parent=self, page_info=page_info)
         self.AddPage(page=panel, caption=page_info.window_name, select=True)
-        self.opened_pages[page_info.window_name] = [page_info.window_name, panel, page_info.type]
+        self.opened_pages[page_info.type] = [page_info.window_name, panel]
         return panel 
     
@@ -377 +357 @@
             panel.initialize_combox()
         panel.set_page_info(page_info=page_info)
-        self.opened_pages[page_info.window_name] = [page_info.window_name, panel, page_info.type]
+        self.opened_pages[page_info.type] = [page_info.window_name, panel]
         return panel
     
@@ -385 +365 @@
         """
         self.DeletePage(index)
-        del self.opened_pages[page_info.window_name]
+        del self.opened_pages[type]
         return self.add_page(page_info=page_info)
         
@@ -402 +382 @@
         type = page_info.type
         npages = len(self.opened_pages.keys())
-        if npages == 0:
-            # create new type of page
+        #check if only and empty page is opened
+        if len(self.opened_pages.keys()) > 0:
+            first_page_type = self.opened_pages.keys()[0]
+            if npages == 1 and first_page_type in ['empty']:
+                #replace the first empty page
+                name, panel = self.opened_pages[first_page_type]
+                index = self.GetPageIndex(panel)
+                panel = self.change_page_content(data=data, index=index)
+                del self.opened_pages[first_page_type]
+                return panel
+        if type in self.opened_pages.keys():
+            #this type of page is already created but it is a theory
+            # meaning the same page is just to fit different data
+            if not type.lower() in ['data']:
+                #delete the previous theory page and add a new one
+                name, panel = self.opened_pages[type]
+                #self.manager.reset_plot_panel(panel.get_data())
+                #delete the existing page and replace it
+                index = self.GetPageIndex(panel)
+                panel = self.replace_page(index=index, page_info=page_info, type=type)
+                return panel 
+            else:
+                for name, panel in self.opened_pages.values():
+                    #Don't return any panel is the exact same page is created
+                    if name == page_info.window_name:
+                        return None
+                    else:
+                        panel = self.add_page(page_info=page_info)
+                        return panel        
+        else:
+            #a new type of page is created
             panel = self.add_page(page_info=page_info)
             return panel
-        else:
-            if page_info.window_name not in self.opened_pages.keys() and \
-                page_info.type.lower() in ['data']:
-                #create new data type page
-                panel = self.add_page(page_info=page_info)
-                return panel 
-            elif page_info.type.lower() not in ['data']:
-                #create new theory page
-                for open_tab_caption, value in self.opened_pages.iteritems():
-                    open_tab = value[1]
-                    open_type = value[2]
-                    if page_info.type == open_type:
-                        #replace theory fit tab
-                        existing_value = self.opened_pages[open_tab_caption]
-                        panel = existing_value[1]
-                        #delete the existing page and replace it
-                        index = self.GetPageIndex(panel)
-                        panel = self.replace_page(index=index, page_info=page_info,
-                                                   type=type)
-                        return panel 
-                panel = self.add_page(page_info=page_info)
-                return panel 
-            else:
-                _, panel, _ = self.opened_pages[page_info.window_name]
-                index = self.GetPageIndex(panel)
-                self.SetSelection(index)
-                #page already existing
-                return None
-             
+    
     def  _onGetstate(self, event):
         """