Changeset c7bd6d1 in sasview

Timestamp:

Nov 3, 2017 3:17:45 PM (7 years ago)

Author:

GitHub <noreply@…>

Parents:

08b9e331 (diff), 5ff08e7 (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:

Stuart Prescott <llimeht@…> (11/03/17 15:17:45)

git-committer:

GitHub <noreply@…> (11/03/17 15:17:45)

Message:

Merge 5ff08e79561c59a32e53a6e6fde9fb7ce5a79eff into 08b9e331d743a63c1d27511d353c58d34d22f28e

Location:

src

Files:

• sas/sasgui/guiframe/data_processor.py (modified) (1 diff)
• examples/test_panel2D.py (modified) (1 diff)
• sas/sascalc/calculator/instrument.py (modified) (1 diff)
• sas/sascalc/data_util/uniquelist.py (deleted)
• sas/sascalc/dataloader/file_reader_base_class.py (modified) (2 diffs)
• sas/sascalc/file_converter/otoko_loader.py (modified) (1 diff)
• sas/sascalc/fit/AbstractFitEngine.py (modified) (1 diff)
• sas/sascalc/pr/c_extensions/Cinvertor.c (modified) (1 diff)
• sas/sascalc/pr/fit/AbstractFitEngine.py (modified) (1 diff)
• sas/sasgui/guiframe/events.py (modified) (1 diff)
• sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified) (1 diff)
• sas/sasgui/guiframe/local_perspectives/plotting/binder.py (modified) (1 diff)
• sas/sasgui/guiframe/local_perspectives/plotting/boxSlicer.py (modified) (1 diff)
• sas/sasgui/guiframe/local_perspectives/plotting/masking.py (modified) (1 diff)
• sas/sasgui/guiframe/plugin_base.py (modified) (1 diff)
• sas/sasgui/guiframe/proxy.py (modified) (1 diff)
• sas/sasgui/perspectives/calculator/gen_scatter_panel.py (modified) (1 diff)
• sas/sasgui/perspectives/calculator/resolcal_thread.py (modified) (1 diff)
• sas/sasgui/perspectives/fitting/fitproblem.py (modified) (3 diffs)
• sas/sasgui/perspectives/fitting/fitting.py (modified) (5 diffs)
• sas/sasgui/perspectives/fitting/fitting_widgets.py (modified) (1 diff)
• sas/sasgui/perspectives/fitting/gpu_options.py (modified) (1 diff)
• sas/sasgui/perspectives/fitting/simfitpage.py (modified) (1 diff)
• sas/sasgui/perspectives/invariant/invariant_details.py (modified) (1 diff)
• sas/sasgui/perspectives/pr/explore_dialog.py (modified) (1 diff)
• sas/sasgui/plottools/binder.py (modified) (1 diff)
• sas/sasgui/plottools/toolbar.py (modified) (1 diff)
• sas/sasview/sasview.py (modified) (1 diff)

src/sas/sasgui/guiframe/data_processor.py

@@ -14 +14 @@
 .. note:: Path to image is: /sasview/src/sas/sasgui/guiframe/media/BatchGridClassLayout.png
 
-.. image:: ../../user/sasgui/guiframe/BatchGridClassLayout.png
+.. image:: ../../../../../src/sas/sasgui/guiframe/media/BatchGridClassLayout.png
    :align: center
 

src/examples/test_panel2D.py

@@ -205 +205 @@
             L=Loader()
             
-            #Recieves data 
+            #Receives data
             try:
                 output=L.load(path)

src/sas/sascalc/calculator/instrument.py

@@ -314 +314 @@
         """
         To plot the wavelength spactrum
-        : requirment: matplotlib.pyplot
+        : requirement: matplotlib.pyplot
         """
         try:

src/sas/sascalc/dataloader/file_reader_base_class.py

@@ -123 +123 @@
         """
         Generic error handler to add an error to the current datainfo to
-        propogate the error up the error chain.
+        propagate the error up the error chain.
         :param msg: Error message
         """
@@ -325 +325 @@
     def splitline(line):
         """
-        Splits a line into pieces based on common delimeters
+        Splits a line into pieces based on common delimiters
         :param line: A single line of text
         :return: list of values

src/sas/sascalc/file_converter/otoko_loader.py

@@ -36 +36 @@
 
         Given the paths of two header files, this function will load each axis in
-        turn.  If loading is successfull then an instance of the OTOKOData class
+        turn.  If loading is successful then an instance of the OTOKOData class
         will be returned, else an exception will be raised.
 

src/sas/sascalc/fit/AbstractFitEngine.py

@@ -78 +78 @@
     def get_params(self, fitparams):
         """
-        return a list of value of paramter to fit
-
-        :param fitparams: list of paramaters name to fit
+        return a list of value of parameter to fit
+
+        :param fitparams: list of parameters name to fit
 
         """

src/sas/sascalc/pr/c_extensions/Cinvertor.c

@@ -735 +735 @@
 
 const char get_peaks_doc[] =
-        "Returns the number of peaks in the output P(r) distrubution\n"
+        "Returns the number of peaks in the output P(r) distribution\n"
         "for the given set of coefficients.\n"
         " @param args: c-parameters\n"

src/sas/sascalc/pr/fit/AbstractFitEngine.py

@@ -78 +78 @@
     def get_params(self, fitparams):
         """
-        return a list of value of paramter to fit
-
-        :param fitparams: list of paramaters name to fit
+        return a list of value of parameter to fit
+
+        :param fitparams: list of parameters name to fit
 
         """

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/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

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

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

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

@@ -44 +44 @@
     def compute(self):
         """
-        excuting computation
+        executing computation
         """
         self.image = map(self.func, self.qx, self.qy,

src/sas/sasgui/perspectives/fitting/fitproblem.py

@@ -1 +1 @@
 """
 Inferface containing information to store data, model, range of data, etc...
-and retreive this information. This is an inferface
+and retrieve this information. This is an inferface
 for a fitProblem i.e relationship between data and model.
 """
@@ -56 +56 @@
         """
         :param flag: bool.When flag is 1 get the computer smear value. When
-            flag is 0 ingore smear value.
+            flag is 0 ignore smear value.
         """
         self.smearer_enable = flag
@@ -305 +305 @@
         """
         :param flag: bool.When flag is 1 get the computer smear value. When
-            flag is 0 ingore smear value.
+            flag is 0 ignore smear value.
         """
         self._smear_on = flag

src/sas/sasgui/perspectives/fitting/fitting.py

@@ -763 +763 @@
         the current page and set value.
         :param value: integer 0 or 1
-        :param uid: the id related to a page contaning fitting information
+        :param uid: the id related to a page containing fitting information
         """
         if uid in self.page_finder.keys():
@@ -778 +778 @@
         Used by simfitpage.py to reset a parameter given the string constrainst.
 
-        :param modelname: the name ot the model for with the parameter
+        :param modelname: the name of the model for with the parameter
                             has to reset
         :param value: can be a string in this case.
-        :param names: the paramter name
+        :param names: the parameter name
         """
         sim_page_id = self.sim_page.uid
@@ -797 +797 @@
         name into model name and parameter name example: ::
 
-            paramaterset (item) = M1.A
+            parameterset (item) = M1.A
             Will return model_name = M1 , parameter name = A
 
@@ -1117 +1117 @@
     def store_data(self, uid, data_list=None, caption=None):
         """
-        Recieve a list of data and store them ans well as a caption of
+        Receive a list of data and store them ans well as a caption of
         the fit page where they come from.
         :param uid: if related to a fit page
@@ -1196 +1196 @@
         for a given interactor.
 
-        :param event: contains type of slicer , paramaters for updating
+        :param event: contains type of slicer , parameters for updating
             the panel and panel_name to find the slicer 's panel concerned.
         """

src/sas/sasgui/perspectives/fitting/fitting_widgets.py

@@ -64 +64 @@
         selection_sizer.Add(self.data_2d_selected, (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)
         button_sizer.Add(button_cancel, 0,

src/sas/sasgui/perspectives/fitting/gpu_options.py

@@ -88 +88 @@
         self.option_button = {}
         self.buttons = []
-        #Check if SAS_OPENCL is already set as enviromental variable
+        #Check if SAS_OPENCL is already set as environment variable
         self.sas_opencl = os.environ.get("SAS_OPENCL", "")
 

src/sas/sasgui/perspectives/fitting/simfitpage.py

@@ -976 +976 @@
         param_cbox = self.constraints_list[-1].param_cbox
         param_cbox.Clear()
-        # insert only fittable paramaters
+        # insert only fittable parameters
         for param in param_list:
             param_cbox.Append(str(param), model)

src/sas/sasgui/perspectives/invariant/invariant_details.py

@@ -422 +422 @@
         except:
             scale = RECTANGLE_SCALE
-            self.warning_msg += "Recieve an invalid scale for %s\n"
+            self.warning_msg += "Receive an invalid scale for %s\n"
             self.warning_msg += "check this value : %s\n" % str(percentage)
         return  scale

src/sas/sasgui/perspectives/pr/explore_dialog.py

@@ -93 +93 @@
 
         :TODO: Would be nice to add printing and log/linear scales.
-            The current verison of plottools no longer plays well with
+            The current version of plottools no longer plays well with
             plots outside of guiframe. Guiframe team needs to fix this.
         """

src/sas/sasgui/plottools/binder.py

@@ -366 +366 @@
         # 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/plottools/toolbar.py

@@ -145 +145 @@
     def OnPrintPage(self, page):
         """
-        Most rudimentry OnPrintPage overide.  instatiates a dc object, gets
+        Most rudimentry OnPrintPage override.  instatiates a dc object, gets
         its size, gets the size of the figure object, scales it to the dc
         canvas size keeping the aspect ratio intact, then prints as bitmap

src/sas/sasview/sasview.py

@@ -203 +203 @@
     plugin_dir = os.path.join(sas.get_user_dir(), PLUGIN_MODEL_DIR)
     os.environ['SAS_MODELPATH'] = plugin_dir
-    #Initiliaze enviromental variable with custom setting but only if variable not set
+    #Initialize environment variable with custom setting but only if variable not set
     SAS_OPENCL = sas.get_custom_config().SAS_OPENCL
     if SAS_OPENCL and "SAS_OPENCL" not in os.environ: