diff --git a/.codespell/ignore_lines.txt b/.codespell/ignore_lines.txt new file mode 100644 index 0000000..07fa7c8 --- /dev/null +++ b/.codespell/ignore_lines.txt @@ -0,0 +1,2 @@ +;; Please include filenames and explanations for each ignored line. +;; See https://docs.openverse.org/meta/codespell.html for docs. diff --git a/.codespell/ignore_words.txt b/.codespell/ignore_words.txt new file mode 100644 index 0000000..04b4fcf --- /dev/null +++ b/.codespell/ignore_words.txt @@ -0,0 +1,8 @@ +;; Please include explanations for each ignored word (lowercase). +;; See https://docs.openverse.org/meta/codespell.html for docs. + +;; abbreviation for "materials" often used in a journal title +mater + +;; Frobenius norm used in np.linalg.norm +fro diff --git a/LICENSE.rst b/LICENSE.rst index 171b401..1f80da0 100644 --- a/LICENSE.rst +++ b/LICENSE.rst @@ -8,4 +8,4 @@ prohibited. If you don’t know whether or not your anticipated use is under a license, you must contact Prof. Simon Billinge at sb2896@columbia.edu. Use of this software without a license is prohibited. -For more information please email Prof. Simon Billinge at sb2896@columbia.edu \ No newline at end of file +For more information please email Prof. Simon Billinge at sb2896@columbia.edu diff --git a/requirements/conda.txt b/requirements/conda.txt index ead0e88..c944f3b 100644 --- a/requirements/conda.txt +++ b/requirements/conda.txt @@ -4,4 +4,4 @@ pyface scipy traits pyfai -matplotlib \ No newline at end of file +matplotlib diff --git a/src/diffpy/srxplanargui/__init__.py b/src/diffpy/srxplanargui/__init__.py index 66f2325..19cf2a0 100644 --- a/src/diffpy/srxplanargui/__init__.py +++ b/src/diffpy/srxplanargui/__init__.py @@ -12,7 +12,7 @@ # See LICENSE.rst for license information. # ############################################################################## -"""xPDFsuite, a software for PDF transformation and visualization.""" +"""XPDFsuite, a software for PDF transformation and visualization.""" # package version from diffpy.srxplanargui.version import __version__ # noqa diff --git a/src/diffpy/srxplanargui/calibration.py b/src/diffpy/srxplanargui/calibration.py index 5a1b986..0388596 100644 --- a/src/diffpy/srxplanargui/calibration.py +++ b/src/diffpy/srxplanargui/calibration.py @@ -16,10 +16,6 @@ import re import sys -from diffpy.srxconfutils.tools import module_exists_lower -from diffpy.srxplanar.selfcalibrate import selfCalibrate -from diffpy.srxplanar.srxplanar import SrXplanar -from diffpy.srxplanar.srxplanarconfig import checkMax from pyface.api import ImageResource from traits.api import ( Bool, @@ -38,6 +34,10 @@ from traitsui.api import Group, Handler, HGroup, Item, VGroup, View from traitsui.menu import CancelButton, OKButton +from diffpy.srxconfutils.tools import module_exists_lower +from diffpy.srxplanar.selfcalibrate import selfCalibrate +from diffpy.srxplanar.srxplanar import SrXplanar +from diffpy.srxplanar.srxplanarconfig import checkMax from diffpy.srxplanargui.srxconfig import SrXconfig ETSConfig.toolkit = "qt" diff --git a/src/diffpy/srxplanargui/imageplot.py b/src/diffpy/srxplanargui/imageplot.py index 508e2e7..0679bc7 100644 --- a/src/diffpy/srxplanargui/imageplot.py +++ b/src/diffpy/srxplanargui/imageplot.py @@ -701,7 +701,7 @@ class AdvHint(HasTraits): compared to their local environment Average mask: Mask the pixels too bright or too dark compared to the average intensity at the similar diffraction angle. -Currect calibration information is required.""" +Correct calibration information is required.""" ) advhint_view = View( diff --git a/src/diffpy/srxplanargui/live.py b/src/diffpy/srxplanargui/live.py index 283b9a8..7372c31 100644 --- a/src/diffpy/srxplanargui/live.py +++ b/src/diffpy/srxplanargui/live.py @@ -16,7 +16,6 @@ import os import sys -from diffpy.srxplanar.srxplanar import SrXplanar from pyface.api import GUI, ImageResource, SplashScreen from traits.api import Any, on_trait_change from traits.etsconfig.api import ETSConfig @@ -32,6 +31,7 @@ ) from traitsui.menu import OKButton +from diffpy.srxplanar.srxplanar import SrXplanar from diffpy.srxplanargui.calibration import Calibration from diffpy.srxplanargui.help import SrXguiHelp from diffpy.srxplanargui.selectfiles import AddFiles diff --git a/src/diffpy/srxplanargui/selectfiles.py b/src/diffpy/srxplanargui/selectfiles.py index 005f364..94ee6ac 100644 --- a/src/diffpy/srxplanargui/selectfiles.py +++ b/src/diffpy/srxplanargui/selectfiles.py @@ -52,7 +52,6 @@ from diffpy.pdfgete.functs import sortKeyNumericString from diffpy.srxplanar.loadimage import openImage, saveImage - from diffpy.srxplanargui.datacontainer import DataContainer from diffpy.srxplanargui.imageplot import ImagePlot from diffpy.srxplanargui.srxconfig import SrXconfig @@ -94,7 +93,7 @@ class AddFiles(HasTraits): srxconfig = Instance(SrXconfig) - # The currenty inputdir directory being searched: + # The currently inputdir directory being searched: # inputdir = DelegatesTo('srxconfig') inputdir = Directory() # , entries = 10 ) diff --git a/src/diffpy/srxplanargui/srxconfig.py b/src/diffpy/srxplanargui/srxconfig.py index b734e44..b9ee4c6 100644 --- a/src/diffpy/srxplanargui/srxconfig.py +++ b/src/diffpy/srxplanargui/srxconfig.py @@ -17,6 +17,11 @@ import os import numpy as np +from pyface.api import ImageResource +from traits.api import Bool, Enum, Property, on_trait_change +from traits.etsconfig.api import ETSConfig +from traitsui.api import Group, Item, View + from diffpy.srxconfutils.configtraits import ConfigBaseTraits from diffpy.srxplanar.srxplanarconfig import ( _description, @@ -24,10 +29,6 @@ _optdatalist, checkMax, ) -from pyface.api import ImageResource -from traits.api import Bool, Enum, Property, on_trait_change -from traits.etsconfig.api import ETSConfig -from traitsui.api import Group, Item, View ETSConfig.toolkit = "qt" @@ -109,7 +110,7 @@ class SrXconfig(ConfigBaseTraits): _optdatalist = _optdatalist - _defaultdata = {"configfile": [], "headertitle": "SrXgui configration"} + _defaultdata = {"configfile": [], "headertitle": "SrXgui configuration"} rotation = Property( depends_on="rotationd", fget=lambda self: np.radians(self.rotationd) diff --git a/src/diffpy/srxplanargui/srxgui.py b/src/diffpy/srxplanargui/srxgui.py index d3e7d21..8f35ec8 100644 --- a/src/diffpy/srxplanargui/srxgui.py +++ b/src/diffpy/srxplanargui/srxgui.py @@ -16,7 +16,6 @@ import os import sys -from diffpy.srxplanar.srxplanar import SrXplanar from pyface.api import ImageResource from traits.api import Any, Button, File, HasTraits, Instance from traits.etsconfig.api import ETSConfig @@ -33,6 +32,7 @@ ) from traitsui.menu import CancelButton, OKButton +from diffpy.srxplanar.srxplanar import SrXplanar from diffpy.srxplanargui.calibration import Calibration from diffpy.srxplanargui.help import SrXguiHelp from diffpy.srxplanargui.selectfiles import AddFiles diff --git a/src/diffpy/srxplanargui/srxplanargui_app.py b/src/diffpy/srxplanargui/srxplanargui_app.py index 5b38aeb..653c323 100644 --- a/src/diffpy/srxplanargui/srxplanargui_app.py +++ b/src/diffpy/srxplanargui/srxplanargui_app.py @@ -7,8 +7,8 @@ def main(): parser = argparse.ArgumentParser( prog="diffpy.srxplanargui", description=( - "xPDFsuite, a software for PDF transformation and visualization.\n\n" - "For more information, visit: " + "xPDFsuite, a software for PDF transformation" + " and visualization.\n\n For more information, visit: " "https://github.com/diffpy/diffpy.srxplanargui/" ), formatter_class=argparse.RawDescriptionHelpFormatter,