Changeset 1258aa3 in sasview for sansview/perspectives/fitting

Timestamp:

Apr 20, 2011 4:56:07 PM (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:

d4d78c9

Parents:

f7e05b0

Message:

disabled bookmark when there is no data set up

Location:

sansview/perspectives/fitting

Files:

• basepage.py (modified) (1 diff)
• fitpage.py (modified) (2 diffs)

sansview/perspectives/fitting/basepage.py

@@ -556 +556 @@
         wx.PostEvent(self.parent.parent, StatusEvent(status = msg ))
         
-        #id = wx.NewId()
-        #self.popUpMenu.Append(id,name,str(msg))
-        #wx.EVT_MENU(self, id, self.onResetModel)
+        id = wx.NewId()
+        self.popUpMenu.Append(id,name,str(msg))
+        wx.EVT_MENU(self, id, self.onResetModel)
         wx.PostEvent(self.parent.parent, 
                      AppendBookmarkEvent(title=name, 

sansview/perspectives/fitting/fitpage.py

@@ -1040 +1040 @@
       
         if self.model != None:
-            self._set_bookmark_flag(True)
+            if self.data != None:
+                self._set_bookmark_flag(True)
             #self._set_save_flag(True)
             # Reset smearer, model and data
@@ -1583 +1584 @@
             self._set_save_flag(False)
         else:
-            self._set_bookmark_flag(True)
+            if self.model != None:
+                self._set_bookmark_flag(True)
             self._set_save_flag(True)
             self._set_preview_flag(True)