Changeset 2657df9 in sasview

Timestamp:

Apr 20, 2011 8:47:11 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:

d38d0042

Parents:

2a62d5c

Message:

disabled right-click book mark when no data was set yet

Location:

sansview/perspectives/fitting

Files:

• basepage.py (modified) (3 diffs)
• fitpage.py (modified) (3 diffs)

sansview/perspectives/fitting/basepage.py

@@ -148 +148 @@
                                  " Keep the panel status to recall it later")
         self.popUpMenu.AppendItem(self._keep)
-        self._keep.Enable(True)
+        self._keep.Enable(False)
         self._set_bookmark_flag(False)
         self._set_save_flag(False)
@@ -930 +930 @@
             return 
         # set data, etc. from the state
-        self.set_data(state.data)
+        # reset page between theory and fitting from bookmarking
+        #if state.data == None:
+        #    data = None
+        #else:
+        data = state.data
+
+        #if data != None:
+        
+        if data == None:
+            data_min = state.qmin
+            data_max = state.qmax
+            self.qmin_x = data_min
+            self.qmax_x = data_max
+            self.minimum_q.SetValue(str(data_min))
+            self.maximum_q.SetValue(str(data_max))
+            self.qmin.SetValue(str(data_min))
+            self.qmax.SetValue(str(data_max))
+
+            self.state.data = data
+            self.state.qmin = self.qmin_x
+            self.state.qmax = self.qmax_x
+        else:
+            self.set_data(data)
+            
         self.enable2D= state.enable2D
         self.engine_type = state.engine_type
@@ -955 +978 @@
         #draw the pnael according to the new model parameter 
         self._on_select_model(event=None)
-       
+        # take care of 2D button
+        if data == None and self.model_view.IsEnabled():
+            if self.enable2D:
+                self.model_view.SetLabel("Switch to 1D")
+            else:
+                self.model_view.SetLabel("Switch to 2D")
+        # else:
+                
         if self._manager !=None:
             self._manager._on_change_engine(engine=self.engine_type)

sansview/perspectives/fitting/fitpage.py

@@ -1023 +1023 @@
         if self.model is None:
             self._set_bookmark_flag(False)
+            self._keep.Enable(False)
             self._set_save_flag(False)
         self.enable_disp.SetValue(False)
@@ -1042 +1043 @@
             if self.data != None:
                 self._set_bookmark_flag(True)
+                self._keep.Enable(True)
             #self._set_save_flag(True)
             # Reset smearer, model and data
@@ -1582 +1584 @@
             data_name = ""
             self._set_bookmark_flag(False)
+            self._keep.Enable(False)
             self._set_save_flag(False)
         else:
             if self.model != None:
                 self._set_bookmark_flag(True)
+                self._keep.Enable(True)
             self._set_save_flag(True)
             self._set_preview_flag(True)