Changeset 9130227 in sasview

Timestamp:

Apr 19, 2012 5:26:54 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:

11857f7

Parents:

b716dd8

Message:

Added dy selection for error bar

File:

• sansguiframe/src/sans/guiframe/data_processor.py (modified) (11 diffs)

sansguiframe/src/sans/guiframe/data_processor.py

@@ -779 +779 @@
         self.x = []
         self.y  = []
+        self.dy  = []
         self.x_axis_label = None
         self.y_axis_label = None
+        self.dy_axis_label = None
         self.x_axis_title = None
         self.y_axis_title = None
@@ -811 +813 @@
         self.y_axis_title.SetValue(str(label))
         
+    def set_dyaxis(self, label="", dy=None):
+        """
+        """
+        if dy is None:
+            dy = []
+        self.dy = dy
+        self.dy_axis_label.SetValue("%s[:]" % str(label))
+                
     def get_plot_axis(self, col, list):
         """
@@ -959 +969 @@
 
         dict = parse_string(sentence, column_names.keys())
-        for tok, (col_name, list) in dict.iteritems():
-            col = column_names[col_name]
-            xaxis = self.get_plot_axis(col, list)
-            sentence = sentence.replace(tok, 
-                                        "numpy.array(%s)" % str(xaxis))
-        for key, value in FUNC_DICT.iteritems():
-            sentence = sentence.replace(key.lower(), value)
-        x = eval(sentence)
+        sentence = self.get_sentence(dict, sentence, column_names)
+        try:
+            x = eval(sentence)
+        except:
+            msg = "Need a proper x-range."
+            wx.PostEvent(self.parent.parent, 
+                             StatusEvent(status=msg, info="error")) 
+            return
         #evaluate y
         sentence = self.y_axis_label.GetValue()
@@ -973 +983 @@
             raise ValueError, msg
         dict = parse_string(sentence, column_names.keys())
-        for tok, (col_name, list) in dict.iteritems():
-            col = column_names[col_name]
-            yaxis = self.get_plot_axis(col, list)
-            sentence = sentence.replace(tok, 
-                                        "numpy.array(%s)" % str(yaxis))
-        for key, value in FUNC_DICT.iteritems():
-            sentence = sentence.replace(key, value)
-        y = eval(sentence)
-        if len(x) != len(y) and (len(x) == 0 or len(y) == 0):
+        sentence = self.get_sentence(dict, sentence, column_names)
+        try:
+            y = eval(sentence)
+        except:
+            msg = "Need a proper y-range."
+            wx.PostEvent(self.parent.parent, 
+                             StatusEvent(status=msg, info="error")) 
+            return
+        #evaluate y
+        sentence = self.dy_axis_label.GetValue()
+        dy = None
+        if sentence.strip() != "":
+            dict = parse_string(sentence, column_names.keys())
+            sentence = self.get_sentence(dict, sentence, column_names)
+            try:
+                dy = eval(sentence)
+            except:
+                msg = "Need a proper dy-range."
+                wx.PostEvent(self.parent.parent, 
+                                 StatusEvent(status=msg, info="error")) 
+                return
+        if len(x) != len(y) or (len(x) == 0 or len(y) == 0):
             msg = "Need same length for X and Y axis and both greater than 0"
             msg += " to plot.\n"
@@ -989 +1012 @@
                              StatusEvent(status=msg, info="error")) 
             return
-            
+        if dy != None and (len(y) != len(dy)):  
+            msg = "Need same length for Y and dY axis and both greater than 0"
+            msg += " to plot.\n"
+            msg += "Got Y length = %s, dY length = %s" % (str(len(y)),
+                                                          str(len(dy)))
+            wx.PostEvent(self.parent.parent, 
+                             StatusEvent(status=msg, info="error")) 
+            return
         #plotting
-        new_plot = Data1D(x=x, y=y)
+        new_plot = Data1D(x=x, y=y, dy=dy)
         new_plot.id =  wx.NewId()
         new_plot.group_id = wx.NewId()
@@ -1014 +1044 @@
              wx.PostEvent(self.parent.parent, 
                              StatusEvent(status=msg, info="error")) 
-
+    
+    def get_sentence(self, dict, sentence, column_names):
+        """
+        Get sentence from dict
+        """
+        for tok, (col_name, list) in dict.iteritems():
+            col = column_names[col_name]
+            axis = self.get_plot_axis(col, list)
+            sentence = sentence.replace(tok, 
+                                        "numpy.array(%s)" % str(axis))
+        for key, value in FUNC_DICT.iteritems():
+            sentence = sentence.replace(key.lower(), value)
+        return sentence
+            
     def layout_grid(self):
         """
@@ -1032 +1075 @@
         self.x_axis_label = wx.TextCtrl(self, -1, size=(200, -1))
         self.y_axis_label = wx.TextCtrl(self, -1, size=(200, -1))
+        self.dy_axis_label = wx.TextCtrl(self, -1, size=(200, -1))
         self.x_axis_add = wx.Button(self, -1, "Add")
         self.x_axis_add.Bind(event=wx.EVT_BUTTON, handler=self.on_edit_axis, 
@@ -1038 +1082 @@
         self.y_axis_add.Bind(event=wx.EVT_BUTTON, handler=self.on_edit_axis, 
                             id=self.y_axis_add.GetId())
+        self.dy_axis_add = wx.Button(self, -1, "Add")
+        self.dy_axis_add.Bind(event=wx.EVT_BUTTON, handler=self.on_edit_axis, 
+                            id=self.dy_axis_add.GetId())
         self.x_axis_unit = wx.TextCtrl(self, -1)
         self.y_axis_unit = wx.TextCtrl(self, -1)
@@ -1075 +1122 @@
                     (wx.StaticText(self, -1 , "Y-axis Unit"), 1, wx.BOTTOM, 10),
                     (self.y_axis_unit, 1, wx.BOTTOM, 10),
+                    (wx.StaticText(self, -1, 
+                                   "dY Label (Optional)\nSelection Range"), 1, 
+                     wx.BOTTOM|wx.LEFT, 10),
+                    (self.dy_axis_label, wx.BOTTOM, 10),
+                    (self.dy_axis_add, 1, wx.BOTTOM|wx.RIGHT, 10),
                       (-1, -1),
                       (-1, -1),
@@ -1102 +1154 @@
             self.edit_axis_helper(self.y_axis_label, self.y_axis_title,
                                    label, title)
+        elif tcrtl == self.dy_axis_add:
+            self.edit_axis_helper(self.dy_axis_label, None,
+                                   label, None)
             
     def create_axis_label(self, cell_list):
@@ -1117 +1172 @@
         get controls to modify
         """
-        tcrtl_label.SetValue(str(label))
-        tcrtl_title.SetValue(str(title))
+        if label != None:
+            tcrtl_label.SetValue(str(label))
+        if title != None:
+            tcrtl_title.SetValue(str(title))
         
     def add_column(self):