Changeset a47d0c8 in sasview for src/sas/sasgui/perspectives

Timestamp:

Aug 12, 2016 6:40:40 AM (8 years ago)

Author:

lewis

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, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

1925a8e

Parents:

2c627ad (diff), 2cff9db (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into corfunc

Location:

src/sas/sasgui/perspectives

Files:

• calculator/data_operator.py (modified) (8 diffs)
• calculator/image_viewer.py (modified) (3 diffs)
• corfunc/__init__.py (added)
• corfunc/corfunc.py (added)
• corfunc/corfunc_panel.py (added)
• corfunc/corfunc_state.py (added)
• corfunc/media/corfunc_help.rst (added)
• corfunc/media/fig1.gif (added)
• corfunc/media/fig2.gif (added)
• corfunc/media/tutorial1.png (added)
• corfunc/media/tutorial2.png (added)
• corfunc/media/tutorial3.png (added)
• corfunc/plot_labels.py (added)

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

@@ -15 +15 @@
 from sas.sasgui.guiframe.documentation_window import DocumentationWindow
 
-#Control panel width 
+#Control panel width
 if sys.platform.count("win32") > 0:
     PANEL_TOP = 0
@@ -156 +156 @@
 
         wx.EVT_TEXT_ENTER(self.data_namectr, -1, self.on_name)
-        wx.EVT_TEXT_ENTER(self.numberctr, -1, self.on_number)
+        wx.EVT_TEXT(self.numberctr, -1, self.on_number)
         wx.EVT_COMBOBOX(self.data1_cbox, -1, self.on_select_data1)
         wx.EVT_COMBOBOX(self.operator_cbox, -1, self.on_select_operator)
@@ -235 +235 @@
         self.name_sizer.Layout()
 
-    def on_number(self, event=None):
+    def on_number(self, event=None, control=None):
         """
         On selecting Number for Data2
         """
         self.send_warnings('')
-        item = event.GetEventObject()
+        item = control
+        if item is None and event is not None:
+            item = event.GetEventObject()
+        elif item is None:
+            raise ValueError("Event or control must be supplied")
         text = item.GetValue().strip()
         if self.numberctr.IsShown():
@@ -251 +255 @@
                 except:
                     self._set_textctrl_color(self.numberctr, 'pink')
-                    msg = "DataOperation: Number requires a float number."
-                    self.send_warnings(msg, 'error')
-                    return
+                    if event is None:
+                        msg = "DataOperation: Number requires a float number."
+                        self.send_warnings(msg, 'error')
+                    return False
             else:
                 self._set_textctrl_color(self.numberctr, self.color)
@@ -263 +268 @@
         self.draw_output(self.output)
         self.Refresh()
+        return True
 
     def on_select_data1(self, event=None):
@@ -607 +613 @@
             wx.MessageBox(msg, 'Error')
             return
+        if self.numberctr.IsEnabled() and self.numberctr.IsShown():
+            valid_num = self.on_number(control=self.numberctr)
+            if not valid_num:
+                return
         # send data to data manager
         self.output.name = name
@@ -731 +741 @@
         #add plot
         self.graph.add(plot)
-        #draw        
+        #draw
         self.graph.render(self)
 
@@ -985 +995 @@
     window = DataOperatorWindow(parent=None, data=[], title="Data Editor")
     app.MainLoop()
-

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

@@ -73 +73 @@
                     parent.put_icon(plot_frame)
             except:
-                print "parent", parent
                 err_msg += "Failed to load '%s'.\n" % basename
         if err_msg:
@@ -109 +108 @@
         """
         # Initialize the Frame object
-        PlotFrame.__init__(self, parent, id, title, scale, size)
+        PlotFrame.__init__(self, parent, id, title, scale, size,
+            show_menu_icons=False)
         self.parent = parent
         self.data = image
@@ -437 +437 @@
     ImageView(None).load()
     app.MainLoop()
-