Changeset 47d10a2 in sasview

Timestamp:

Jan 13, 2009 6:45:44 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:

0f6d05f8

Parents:

e8d1066

Message:

working on close button model page

Location:

sansview/perspectives/fitting

Files:

• fitpage1D.py (modified) (1 diff)
• fitpanel.py (modified) (2 diffs)

sansview/perspectives/fitting/fitpage1D.py

@@ -166 +166 @@
         self.sizer1.Add( self.btClose,(iy,ix),(1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 0)
         #self.sizer1.Add( self.btClose,1, wx.LEFT | wx.BOTTOM , 5)
-
+        self.tcChi.Disable()
         ix= 0
         iy+=1

sansview/perspectives/fitting/fitpanel.py

@@ -171 +171 @@
              selected on that page. remove its reference into page_finder (fitting module)
         """
+        print "model page", page_number, page
         if page!=None and page_number!=None:
+            
+            self.nb.RemovePage(page_number)
             page.Destroy()
-            self.nb.RemovePage(page_number)
             self.model_page_number=None
             self.model_page=None
+            self.draw_model_name=None
             return 
         try:
@@ -194 +197 @@
                 if self.nb.GetPageText(page_number)== self.page_name:
                     self.draw_model_name=None
-               
+                if  page_number == 1:
+                    self.model_page=None
+                    self.draw_model_name=None
                 selected_page.Destroy()
                 self.nb.RemovePage(page_number)