Changeset 817991b in sasview for fittingview/src/sans/perspectives

Timestamp:

Sep 28, 2011 4:13:25 PM (13 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:

5f15492

Parents:

951a2f5

Message:

keep the param values on seleting a new model if possible

Location:

fittingview/src/sans/perspectives/fitting

Files:

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

fittingview/src/sans/perspectives/fitting/basepage.py

@@ -153 +153 @@
         ## dictionary of saved state
         self.saved_states = {} 
-        # clipbord str state
-        self.clipboard_str_state = None
         ## Create context menu for page
         self.popUpMenu = wx.Menu()
@@ -620 +618 @@
         name = menu.GetLabel(event.GetId())
         self._on_select_model_helper()
-        
         if name in self.saved_states.keys():
             previous_state = self.saved_states[name]
@@ -2922 +2919 @@
         """
         text = self.get_clipboard()
-        
-        return self.get_paste_from_clipboard(text)
-        
-    def get_paste_from_clipboard(self, text=''): 
+        flag = self.get_paste_params(text)
+        self._copy_info(flag)
+        return flag
+        
+    def get_paste_params(self, text=''): 
         """
         Get the string copies of the param names and values in the tap
@@ -2960 +2958 @@
             self._get_paste_helper(self.str_parameters, 
                                    self.orientation_params, context)
-        self._copy_info(True)
-        return True
+            return True
+        return None
     
     def _get_paste_helper(self, param, orient_param, content):

fittingview/src/sans/perspectives/fitting/fitpage.py

@@ -1187 +1187 @@
         """  
         
-        self.Show(False)    
+        self.Show(False) 
+        if event != None:
+            copy_flag = self.get_copy_params()
+            is_poly_enabled = self.enable_disp.GetValue() 
+        else:
+            copy_flag = '' 
+            is_poly_enabled = None 
         self._on_select_model_helper() 
         self.set_model_param_sizer(self.model)                   
@@ -1213 +1219 @@
             self._set_copy_flag(True)
             self._set_paste_flag(True)
-            if self.data != None:
-                self._set_bookmark_flag(True)
-                self._keep.Enable(True)
+            if self.data is not None:
+                is_data = check_data_validity(self.data) 
+                if is_data:
+                    self._set_bookmark_flag(True)
+                    self._keep.Enable(True)
             #self._set_save_flag(True)
             # Reset smearer, model and data
@@ -1267 +1275 @@
                     self.formfactorbox.SetSelection(pos)
                     self.formfactorbox.SetValue(current_val)
+            # when select a model only from guictr/button
+            if is_poly_enabled != None:
+                self.enable_disp.SetValue(is_poly_enabled)
+                self.disable_disp.SetValue(not is_poly_enabled)
+                self._set_dipers_Param(event=None)
+                self.state.enable_disp = self.enable_disp.GetValue()
+                self.state.disable_disp = self.disable_disp.GetValue()
+
+            # Keep the previous param values
+            if copy_flag:
+                self.get_paste_params(copy_flag)
             self._onDraw(event=None)
         else: