Changeset c4f6851 in sasview for src/sas/perspectives/invariant

Timestamp:

Mar 5, 2015 5:22:28 PM (10 years ago)

Author:

Mathieu Doucet <doucetm@…>

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:

c1c14ba

Parents:

b40ad40

Message:

Get rid of a bunch of bad exec

File:

• src/sas/perspectives/invariant/invariant_panel.py (modified) (9 diffs)

src/sas/perspectives/invariant/invariant_panel.py

@@ -802 +802 @@
         for key in comp_state:
             value = comp_state[key]
-            try:
-                exec "self.%s.SetValue(str(%s))" % (key, value)
-            except TypeError:
-                exec "self.%s.SetValue(%s)" % (key, value)
-            except:
-                logging.error(sys.exc_value)
+            self._set_property_value(key, value)
 
         self.compute_invariant(event=None)
@@ -815 +810 @@
             # set the inputs and boxes
             value = current_state[key]
-            try:
-                exec 'self.%s.SetValue(str(%s))' % (key, value)
-            except TypeError:
-                exec 'self.%s.SetValue(%s)' % (key, value)
-            except:
-                logging.error(sys.exc_value)
+            self._set_property_value(key, value)
 
         self._enable_high_q_section(event=None)
@@ -828 +818 @@
         self.state.state_num = state_num
 
+    def _set_property_value(self, key, value):
+        """
+            Set a property value
+            :param key: property name
+            :param value: value of the property
+        """
+        try:
+            attr = getattr(self, key)
+            attr.SetValue(str(value))
+        except:
+            logging.error("Invariant state: %s", sys.exc_value)
 
     def get_bookmark_by_num(self, num=None):
@@ -850 +851 @@
         for key in comp_state:
             value = comp_state[key]
-            try:
-                exec "self.%s.SetValue(str(%s))" % (key, value)
-            except TypeError:
-                exec "self.%s.SetValue(%s)" % (key, value)
-            except:
-                logging.error(sys.exc_value)
+            self._set_property_value(key, value)
 
         self.compute_invariant(event=None)
@@ -861 +857 @@
         for key in current_state:
             value = current_state[key]
-            try:
-                exec 'self.%s.SetValue(str(%s))' % (key, value)
-            except TypeError:
-                exec 'self.%s.SetValue(%s)' % (key, value)
-            except:
-                logging.error(sys.exc_value)
+            self._set_property_value(key, value)
         self.state.saved_state = copy.deepcopy(current_state)
 
@@ -925 +916 @@
             if value == None or value.lstrip().rstrip() == '':
                 value = 'None'
-            exec 'self.state.%s = %s' % (name, value)
-            exec "self.state.saved_state['%s'] = %s" % (name, value)
+            setattr(self.state, name, str(value))
+            self.state.saved_state[name] = str(value)
 
             # set the count part of radio button clicked
@@ -937 +928 @@
                     name = title
                     value = False
-            exec "self.state.saved_state['%s'] = %s" % (name, value)
+            self.state.saved_state[name] = str(value)
 
             # Instead of changing the future, create a new future.
@@ -1059 +1050 @@
                 logging.error(sys.exc_value)
 
-        # Instead of changing the future, create a new future.
-        #max_state_num = len(self.state.state_list)-1
-        #self.state.saved_state['state_num'] = max_state_num
-
         # try to add new state of the text changes in the state_list
         try:
             if value.strip() == None:
                 value = ''
-            exec "self.state.%s = '%s'" % (name, value)
-            exec "self.state.saved_state['%s'] = '%s'" % (name, value)
-            exec "self.state.input_list['%s'] = '%s'" % (name, value)
+            setattr(self.state, name, str(value))
+            self.state.saved_state[name] = str(value)
+            self.state.input_list[name] = str(value)
             if not self.is_power_out:
                 if name != 'power_low_tcl' and name != 'power_high_tcl':
                     self.state.saved_state['state_num'] += 1
             self.state.state_num = self.state.saved_state['state_num']
-            #copy.deepcopy(self.state.saved_state)
-            self.state.state_list[str(self.state.state_num)] = \
-                                        self.state.clone_state()
+            self.state.state_list[str(self.state.state_num)] = self.state.clone_state()
         except:
             logging.error(sys.exc_value)
 
-        #event.Skip()
         self._set_undo_flag(True)
         self._set_redo_flag(False)
@@ -1098 +1082 @@
         value = str(obj.GetValue())
         try:
-            exec "self.state.saved_state['%s'] = '%s'" % (name, value)
-            self.state.state_list[str(self.state.state_num)] = \
-                                self.state.clone_state()
+            self.state.saved_state[name] = str(value)
+            self.state.state_list[str(self.state.state_num)] = self.state.clone_state()
         except:
             logging.error(sys.exc_value)
-        #if event != None: event.Skip()
 
     def _get_input_list(self):