Changeset 743f480 in sasview for calculatorview/src

Timestamp:

Jun 26, 2012 1:35:21 PM (12 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:

709cd83

Parents:

21bc81b

Message:

read theory too.

File:

• calculatorview/src/sans/perspectives/calculator/data_operator.py (modified) (12 diffs)

calculatorview/src/sans/perspectives/calculator/data_operator.py

@@ -57 +57 @@
         self.output = None
         self._notes = None
+        #text grayed color
+        self.color = wx.SystemSettings.GetColour(wx.SYS_COLOUR_BACKGROUND)
         #data
         self._data = self.get_datalist()
@@ -169 +171 @@
             children = ctrl.GetChildren()
             if len(children) > 0:
-                ctrl.GetChildren()[0].SetBackGroundColour(\
-                                                self.GetBackGroundColour())
+                ctrl.GetChildren()[0].SetBackGroundColour(self.color)
         else:
             if not ctrl.IsEnabled():
@@ -201 +202 @@
             text = name
         state_list = self.get_datalist().values()
-        if text in [str(state.data.name) for state in state_list]:
+        name_list = []
+        for state in state_list:
+            if state.data == None:
+                theory_list = state.get_theory()
+                theory, _ = theory_list.values()[0]
+                d_name = str(theory.name)
+            else:
+                d_name = str(state.data.name)
+            name_list.append(d_name)
+        if text in name_list:
             self._set_textctrl_color(self.data_namectr, 'pink')
             msg = "DataOperation: The name already exists."
@@ -300 +310 @@
             if data == None:
                 content = "?"
-                self.put_text_pic(self.data2_pic, content) 
+                self.put_text_pic(self.data2_pic, content)
+                #item.SetClientData(pos, content) 
             else:
                 self.data2_pic.add_image(data)
-        else:
-            if data == None:
-                content = str(self.numberctr.GetValue().strip())
-                try:
-                    content = float(content)
-                    data = content
-                except:
-                    self._set_textctrl_color(self.numberctr, 'pink')
-                    content = "?"
-                    data = None
-                item.SetClientData(pos, content)
+            self.check_data_inputs() 
+        else:
+            content = str(self.numberctr.GetValue().strip())
+            try:
+                content = float(content)
+                data = content
+            except:
+                self._set_textctrl_color(self.numberctr, 'pink')
+                content = "?"
+                data = None
+            item.SetClientData(pos, data)
+            if data != None:
+                self.check_data_inputs()
+                
             self.put_text_pic(self.data2_pic, content)   
-        self.check_data_inputs()
-
+        
         if self.output != None:
             self.output.name = str(self.data_namectr.GetValue())
@@ -350 +363 @@
                 self._set_textctrl_color(self.numberctr, 'white')
             else:
-                self._set_textctrl_color(self.numberctr, 
-                                         self.GetBackgroundColour())
+                self._set_textctrl_color(self.numberctr, self.color )
             try:
                 float(data2)
@@ -369 +381 @@
         elif data1.__class__.__name__ != data2.__class__.__name__:
             self._set_textctrl_color(self.data1_cbox, 'pink')
-            self._set_textctrl_color(self.data1_cbox, 'pink')
+            self._set_textctrl_color(self.data2_cbox, 'pink')
             msg = "DataOperation: Data types must be same."
             self.send_warnings(msg, 'error')
@@ -393 +405 @@
         pos = self.operator_cbox.GetCurrentSelection()
         operator = self.operator_cbox.GetClientData(pos)
-        exec "output = data1 %s data2"% operator
+        try:
+            exec "output = data1 %s data2"% operator
+        except:
+            raise
         return output
     
@@ -479 +494 @@
         self.data1_cbox.Clear()
         self.data2_cbox.Clear()
+
         if not self._data:
             pos = self.data1_cbox.Append('No Data Available')
@@ -486 +502 @@
             self.data2_cbox.SetSelection(pos2)
             self.data2_cbox.SetClientData(pos2, None)
-            pos3 = self.data2_cbox.Append("Number")
-            val = None
-            if (self.numberctr.IsShown() and self.numberctr.IsEnabled()):
-                try:
-                    val = float(self.numberctr.GetValue())
-                except:
-                    val = None
-            self.data2_cbox.SetClientData(pos3, val)
             return
         pos1 = self.data1_cbox.Append('Select Data')
@@ -510 +518 @@
         self.data2_cbox.SetClientData(pos3, val)
         dnames = []
-        for dstate in self._data.values():
-            if dstate != None:
-                if dstate.data != None:
-                    dnames.append(dstate.data.name)
-        if len(dnames) > 0:
-            ind = numpy.argsort(dnames)
-            for datastate in numpy.array(self._data.values())[ind]:
+        ids = self._data.keys()
+        for id in ids:
+            if id != None:
+                if self._data[id].data != None:
+                    dnames.append(self._data[id].data.name)
+                else:
+                    theory_list = self._data[id].get_theory()
+                    theory, _ = theory_list.values()[0]
+                    dnames.append(theory.name)
+        ind = numpy.argsort(dnames)
+        if len(ind) > 0:
+            val_list = numpy.array(self._data.values())[ind]
+            for datastate in val_list:
                 data = datastate.data
                 if data != None:
@@ -562 +576 @@
         state_list = self.get_datalist().values()
         name = self.data_namectr.GetValue().strip()
-        if name in [str(state.data.name) for state in state_list]:
+        name_list = []
+        for state in state_list:
+            if state.data == None:
+                theory_list = state.get_theory()
+                theory, _ = theory_list.values()[0]
+                d_name = str(theory.name)
+            else:
+                d_name = str(state.data.name)
+            name_list.append(d_name)
+        if name in name_list:
             self._set_textctrl_color(self.data_namectr, 'pink')
             msg = "The Output Data Name already exists...   "
@@ -674 +697 @@
             pass
         self.subplot.figure.canvas.resizing = False
-        self.subplot.set_xticks([])
-        self.subplot.set_yticks([])
+        self.subplot.set_xticks([0.0])
+        self.subplot.set_yticks([0.0])
         # Draw zero axis lines
         self.subplot.axhline(linewidth = 1, color='r')