Changeset 96c9cf1 in sasview for src/sas/sasgui/perspectives

Timestamp:

Nov 2, 2017 11:04:32 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:

08b9e331, 90961b4

Parents:

8e5c36d (diff), 20fa5fe (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/02/17 11:04:32)

git-committer:

GitHub <noreply@…> (11/02/17 11:04:32)

Message:

Merge pull request #121 from llimeht/tmp/spelling

Fix typo in P(r) peaks description

Location:

src/sas/sasgui/perspectives

Files:

• calculator/gen_scatter_panel.py (modified) (1 diff)
• calculator/resolcal_thread.py (modified) (1 diff)
• fitting/fitproblem.py (modified) (3 diffs)
• fitting/fitting.py (modified) (5 diffs)
• fitting/fitting_widgets.py (modified) (1 diff)
• fitting/gpu_options.py (modified) (1 diff)
• fitting/simfitpage.py (modified) (1 diff)
• invariant/invariant_details.py (modified) (1 diff)
• pr/explore_dialog.py (modified) (1 diff)

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.
         """