Changeset fa81e94 in sasview for src/sas/sasgui/perspectives/calculator/data_operator.py

Timestamp:

Nov 15, 2017 2:33:09 AM (7 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

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

Children:

d4881f6a

Parents:

7c487846

Message:

Initial commit of the P(r) inversion perspective.
Code merged from Jeff Krzywon's ESS_GUI_Pr branch.
Also, minor 2to3 mods to sascalc/sasgui to enble error free setup.

File:

• src/sas/sasgui/perspectives/calculator/data_operator.py (modified) (9 diffs, 1 prop)

src/sas/sasgui/perspectives/calculator/data_operator.py

@@ -202 +202 @@
         else:
             text = name
-        state_list = self.get_datalist().values()
+        state_list = list(self.get_datalist().values())
         name_list = []
         for state in state_list:
             if state.data is None:
                 theory_list = state.get_theory()
-                theory, _ = theory_list.values()[0]
+                theory, _ = list(theory_list.values())[0]
                 d_name = str(theory.name)
             else:
@@ -397 +397 @@
             self._set_textctrl_color(self.data1_cbox, 'pink')
             self._set_textctrl_color(self.data2_cbox, 'pink')
-            msg = "DataOperation: %s" % sys.exc_value
+            msg = "DataOperation: %s" % sys.exc_info()[1]
             self.send_warnings(msg, 'error')
             self.output = None
@@ -411 +411 @@
         operator = self.operator_cbox.GetClientData(pos)
         try:
-            exec "output = data1 %s data2" % operator
+            exec("output = data1 %s data2" % operator)
         except:
             raise
@@ -532 +532 @@
         self.data2_cbox.SetClientData(pos3, val)
         dnames = []
-        ids = self._data.keys()
+        ids = list(self._data.keys())
         for id in ids:
             if id is not None:
@@ -539 +539 @@
                 else:
                     theory_list = self._data[id].get_theory()
-                    theory, _ = theory_list.values()[0]
+                    theory, _ = list(theory_list.values())[0]
                     dnames.append(theory.name)
         ind = np.argsort(dnames)
         if len(ind) > 0:
-            val_list = np.array(self._data.values())[ind]
+            val_list = np.array(list(self._data.values()))[ind]
             for datastate in val_list:
                 data = datastate.data
@@ -558 +558 @@
                 try:
                     theory_list = datastate.get_theory()
-                    for theory, _ in theory_list.values():
+                    for theory, _ in list(theory_list.values()):
                         th_name = theory.name
                         posth1 = self.data1_cbox.Append(str(th_name))
@@ -588 +588 @@
         self.send_warnings('')
         self.data_namectr.SetBackgroundColour('white')
-        state_list = self.get_datalist().values()
+        state_list = list(self.get_datalist().values())
         name = self.data_namectr.GetValue().strip()
         name_list = []
@@ -594 +594 @@
             if state.data is None:
                 theory_list = state.get_theory()
-                theory, _ = theory_list.values()[0]
+                theory, _ = list(theory_list.values())[0]
                 d_name = str(theory.name)
             else:
@@ -896 +896 @@
         list = []
         list = self.graph.returnPlottable()
-        if len(list.keys()) > 0:
-            first_item = list.keys()[0]
+        if len(list(list.keys())) > 0:
+            first_item = list(list.keys())[0]
             if first_item.x != []:
                 from sas.sasgui.plottools.PropertyDialog import Properties