Changeset 882cfec in sasview for src/sas/sasgui/guiframe

Timestamp:

Nov 28, 2017 9:56:33 AM (7 years ago)

Author:

GitHub <noreply@…>

Branches:

master, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

b6b81a3, 19b5c886, fb7c816, 814ee32

Parents:

45bfe3f1 (diff), c926a97 (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.

git-author:

Paul Kienzle <pkienzle@…> (11/28/17 09:56:33)

git-committer:

GitHub <noreply@…> (11/28/17 09:56:33)

Message:

Merge pull request #126 from SasView?/ticket-776-orientation

a

Location:

src/sas/sasgui/guiframe

Files:

• data_processor.py (modified) (6 diffs)
• events.py (modified) (1 diff)
• local_perspectives/data_loader/data_loader.py (modified) (1 diff)
• local_perspectives/plotting/Plotter1D.py (modified) (1 diff)
• local_perspectives/plotting/binder.py (modified) (1 diff)
• local_perspectives/plotting/boxSlicer.py (modified) (1 diff)
• local_perspectives/plotting/masking.py (modified) (1 diff)
• plugin_base.py (modified) (1 diff)
• proxy.py (modified) (1 diff)

src/sas/sasgui/guiframe/data_processor.py

@@ -758 +758 @@
         cell pop up context by right clicking on a cell and gives the
         option to cut, paste, and clear. This will probably be removed in
-        future versions and is being superceded by more traditional cut and
+        future versions and is being superseded by more traditional cut and
         paste options.
         """
@@ -800 +800 @@
         THIS METHOD IS NOT CURRENTLY USED.  it is part of right click cell
         context menu which is being removed. This will probably be removed in
-        future versions and is being superceded by more traditional cut and
+        future versions and is being superseded by more traditional cut and
         paste options
         """
@@ -812 +812 @@
         THIS METHOD IS NOT CURRENTLY USED.  it is part of right click cell
         context menu which is being removed. This will probably be removed in
-        future versions and is being superceded by more traditional cut and
+        future versions and is being superseded by more traditional cut and
         paste options
         """
@@ -828 +828 @@
         THIS METHOD IS NOT CURRENTLY USED.  it is part of right click cell
         context menu which is being removed. This will probably be removed in
-        future versions and is being superceded by more traditional cut and
+        future versions and is being superseded by more traditional cut and
         paste options
         """
@@ -1233 +1233 @@
         """
         Get object represented by the given cells and plot them.  Basically
-        plot the colum in y vs the column in x.
+        plot the column in y vs the column in x.
         """
 
@@ -1961 +1961 @@
         selection_sizer.Add(self.save_to_file, (iy, ix),
                             (1, 1), wx.LEFT | wx.EXPAND | wx.ADJUST_MINSIZE, 15)
-        #contruction the sizer contaning button
+        #contruction the sizer containing button
         button_sizer.Add((20, 20), 1, wx.EXPAND | wx.ADJUST_MINSIZE, 0)
 

src/sas/sasgui/guiframe/events.py

@@ -14 +14 @@
 #create a panel slicer
 (SlicerPanelEvent, EVT_SLICER_PANEL)   = wx.lib.newevent.NewEvent()
-#print update paramaters for panel slicer
+#print update parameers for panel slicer
 (SlicerParamUpdateEvent, EVT_SLICER_PARS_UPDATE)   = wx.lib.newevent.NewEvent()
 #update the slicer from the panel

src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py

@@ -90 +90 @@
     def can_load_data(self):
         """
-        if return True, then call handler to laod data
+        if return True, then call handler to load data
         """
         return True

src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter1D.py

@@ -827 +827 @@
         on_Modify Plot Property_close
         """
-        if self.appD.okay_clicked == True:
+        if self.appD.okay_clicked:
             info = self.appD.get_current_values()
             self.appearance_selected_plot.custom_color = \

src/sas/sasgui/guiframe/local_perspectives/plotting/binder.py

@@ -359 +359 @@
         # TODO: Do we need an explicit focus command for keyboard?
         # TODO: Can we tab between items?
-        # TODO: How do unhandled events get propogated to axes, figure and
+        # TODO: How do unhandled events get propagated to axes, figure and
         # TODO: finally to application?  Do we need to implement a full tags
         # TODO: architecture a la Tk?

src/sas/sasgui/guiframe/local_perspectives/plotting/boxSlicer.py

@@ -216 +216 @@
         """
         self.base.thaw_axes()
-        # Post paramters
+        # Post parameters
         event = SlicerParameterEvent()
         event.type = self.__class__.__name__

src/sas/sasgui/guiframe/local_perspectives/plotting/masking.py

@@ -77 +77 @@
     def compute(self):
         """
-        excuting computation
+        executing computation
         """
         elapsed = time.time() - self.starttime

src/sas/sasgui/guiframe/plugin_base.py

@@ -82 +82 @@
     def can_load_data(self):
         """
-        if return True, then call handler to laod data
+        if return True, then call handler to load data
         """
         return False

src/sas/sasgui/guiframe/proxy.py

@@ -17 +17 @@
 connect() function:
     - auto detects proxy in windows, osx
-    - in ux systems, the http_proxy enviroment variable must be set
+    - in ux systems, the http_proxy environment variable must be set
     - if it fails, try to find the proxy.pac address.
       - parses the file, and looks up for all possible proxies