Changeset f22e626 in sasview

Timestamp:

May 13, 2011 12:53:43 PM (13 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:

13a63ab

Parents:

248b918

Message:

working on remove data

Location:

sansview/perspectives/fitting

Files:

• fitpage.py (modified) (4 diffs)
• fitpanel.py (modified) (11 diffs)
• fitting.py (modified) (2 diffs)

sansview/perspectives/fitting/fitpage.py

@@ -43 +43 @@
         self._fill_datainfo_sizer()
         self.is_2D = None
+        self.fit_started = False
         # get smear info from data
         self._get_smear_info()
@@ -982 +983 @@
         self.bind_fit_button()
            
+   
     def bind_fit_button(self):
         """
@@ -988 +990 @@
         self.btFit.Unbind(event=wx.EVT_BUTTON, id= self.btFit.GetId())
         if self.btFit.GetLabel().lower() == "stop":
+            self.fit_started = True
             self.btFit.SetForegroundColour('red')
             self.btFit.Bind(event=wx.EVT_BUTTON, handler=self._StopFit,
                              id=self.btFit.GetId())
         elif self.btFit.GetLabel().lower() == "fit":
+            self.fit_started = False
             self.btFit.SetDefault()
             self.btFit.SetForegroundColour('black')
@@ -1002 +1006 @@
         self._manager._reset_schedule_problem(value=0)
           
-
-    def _StopFit(self, event):
+    def is_fitting(self):
+        if self.fit_started:
+            self._StopFit(event=None)
+            
+    def _StopFit(self, event=None):
         """
         Stop fit 

sansview/perspectives/fitting/fitpanel.py

@@ -3 +3 @@
 import string 
 import wx
+import sys
 #from wx.lib.flatnotebook import FlatNotebook as nb
 from wx.aui import AuiNotebook as nb
@@ -46 +47 @@
         self.model_list_box = self.menu_mng.get_model_list()
         #pageClosedEvent = nb.EVT_FLATNOTEBOOK_PAGE_CLOSING 
-        pageClosedEvent = wx.aui.EVT_AUINOTEBOOK_PAGE_CLOSE
-        
-        self.Bind(pageClosedEvent, self.on_close_page)
+        self.pageClosedEvent = wx.aui.EVT_AUINOTEBOOK_PAGE_CLOSE
+        
+        self.Bind(self.pageClosedEvent, self.on_close_page)
          ## save the title of the last page tab added
         self.fit_page_name = {}
@@ -61 +62 @@
         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()
-
+        self.Bind(wx.aui.EVT_AUINOTEBOOK_PAGE_CLOSED, self.on_closed)
+
+    def on_closed(self, event):
+        """
+        """
+        print "page closed", self.GetPageCount()
+        
     def save_project(self, doc=None):
         """
@@ -116 +120 @@
     def on_page_changing(self, event):
         """
+        calls the function when the current event handler has exited. avoiding
+        to call panel on focus on a panel that is currently deleted
+        """
+        wx.CallAfter(self.helper_on_page_change)
+        
+        
+    def helper_on_page_change(self):
+        """
         """
         pos = self.GetSelection()
@@ -121 +133 @@
             selected_page = self.GetPage(pos)
             wx.PostEvent(self.parent, PanelOnFocusEvent(panel=selected_page))
-            
+        
+       
     def on_set_focus(self, event):
         """
@@ -157 +170 @@
             return selected_page.get_state()
     
-    def add_default_pages(self):
-        """
-        Add default pages such as a hint page and an empty fit page
-        """
-        pass
-        #add default page
-        #from hint_fitpage import HintFitPage
-        #self.hint_page = HintFitPage(self) 
-        #self.AddPage(self.hint_page,"Hint")
-        #self.hint_page.set_manager(self._manager)
+  
   
     def close_all(self):
@@ -228 +232 @@
         """
         nbr_page = self.GetPageCount()
+        selected_page = self.GetPage(self.GetSelection())
         if nbr_page == 1:
-           
-            event.Veto()
-            return 
-        selected_page = self.GetPage(self.GetSelection())
+            if selected_page.get_data() == None:
+                if event is not None:
+                    event.Veto()
+                return 
         self._close_helper(selected_page=selected_page)
         
@@ -250 +255 @@
                     #with no selected data
                     return
-                if data.name == deleted_data.name:
+                if data.id == deleted_data.id:
                     self._close_helper(selected_page)
                     self.DeletePage(index)
@@ -294 +299 @@
         self.AddPage(self.sim_page,"Simultaneous Fit", True)
         self.sim_page.set_manager(self._manager)
+        self.enable_close_button()
         return self.sim_page
         
@@ -310 +316 @@
         self.opened_pages[panel.uid] = panel
         self.set_engine_helper(panel=panel)
+        self.enable_close_button()
         return panel 
     
+    def enable_close_button(self):
+        """
+        display the close button on tab for more than 1 tabs else remove the 
+        close button
+        """
+        return
+        if self.GetPageCount() <= 1:
+            style = self.GetWindowStyleFlag() 
+            if style & wx.aui.AUI_NB_CLOSE_ON_ACTIVE_TAB == wx.aui.AUI_NB_CLOSE_ON_ACTIVE_TAB:
+                style = style & ~wx.aui.AUI_NB_CLOSE_ON_ACTIVE_TAB
+                self.SetWindowStyle(style)
+        else:
+            style = self.GetWindowStyleFlag()
+            if style & wx.aui.AUI_NB_CLOSE_ON_ACTIVE_TAB != wx.aui.AUI_NB_CLOSE_ON_ACTIVE_TAB:
+                style |= wx.aui.AUI_NB_CLOSE_ON_ACTIVE_TAB
+                self.SetWindowStyle(style)
+            
     def delete_data(self, data):
         """
         Delete the given data
         """
-        if data is None:
-            return None
+        if data.__class__.__name__ != "list":
+            raise ValueError, "Fitpanel delete_data expect list of id"
+        else:
+            n = self.GetPageCount()
+            for page in self.opened_pages.values():
+                pos = self.GetPageIndex(page)
+                temp_data = page.get_data()
+                #stop the fitting before deleting the page
+                page.is_fitting()
+                if temp_data is not None and temp_data.id in data:
+                    self.SetSelection(pos)
+                    self.on_close_page(event=None)
+                    temp = self.GetSelection()
+                    self.DeletePage(temp)
+            if self.GetPageCount()== 0:
+                self.add_empty_page()
+        
     def set_data(self, data):
         """ 
@@ -435 +474 @@
         for uid, list in self.opened_pages.iteritems():
             #Don't return any panel is the exact same page is created
-            
             if selected_page.uid == uid:
                 del self.opened_pages[selected_page.uid]
                 break 
-     
+      
   

sansview/perspectives/fitting/fitting.py

@@ -227 +227 @@
         loader = Loader()
         loader.associate_file_reader(".fitv", self.state_reader)
-        loader.associate_file_reader(".svs", self.state_reader)
+        #loader.associate_file_reader(".svs", self.state_reader)
         from sans.perspectives.calculator.sld_panel import SldPanel
         #Send the fitting panel to guiframe
@@ -266 +266 @@
             if dlg.ShowModal() == wx.ID_OK:
                 selected_data_list = dlg.get_data()
+            dlg.Destroy()
+            
         else:
             selected_data_list = data_list