Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .codespell/ignore_lines.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
;; Please include filenames and explanations for each ignored line.
;; See https://docs.openverse.org/meta/codespell.html for docs.
8 changes: 8 additions & 0 deletions .codespell/ignore_words.txt
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion LICENSE.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
For more information please email Prof. Simon Billinge at sb2896@columbia.edu
2 changes: 1 addition & 1 deletion requirements/conda.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ pyface
scipy
traits
pyfai
matplotlib
matplotlib
2 changes: 1 addition & 1 deletion src/diffpy/srxplanargui/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions src/diffpy/srxplanargui/calibration.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion src/diffpy/srxplanargui/imageplot.py
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion src/diffpy/srxplanargui/live.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
3 changes: 1 addition & 2 deletions src/diffpy/srxplanargui/selectfiles.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 )

Expand Down
11 changes: 6 additions & 5 deletions src/diffpy/srxplanargui/srxconfig.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,18 @@
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,
_epilog,
_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"

Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/diffpy/srxplanargui/srxgui.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/diffpy/srxplanargui/srxplanargui_app.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Loading