Skip to content

Commit 5e3f935

Browse files
committed
Merge remote-tracking branch 'upstream/migration' into doc (codespell fix)
2 parents f28e035 + dff1173 commit 5e3f935

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

src/diffpy/fourigui/fourigui.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ def initUI(self):
3030
self.transformed = (
3131
False # denotes whether dataset is Fourier transformed
3232
)
33-
self.cutted = (
33+
self.cutoff_applied = (
3434
False # denotes whether cutoff frequencies are applied to dataset
3535
)
3636
self.transcutted = (
@@ -358,7 +358,7 @@ def load_cube(self):
358358
self.plot_plane()
359359
self.transformed = False
360360
self.transcutted = False
361-
self.cutted = False
361+
self.cutoff_applied = False
362362
self.cutoff.set(0)
363363
self.space.set(0)
364364

@@ -519,7 +519,7 @@ def applycutoff(self):
519519
--------
520520
nothing
521521
"""
522-
if not self.cutted:
522+
if not self.cutoff_applied:
523523
xdim, ydim, zdim = self.cube.shape
524524
sphere = np.ones((xdim, ydim, zdim))
525525
qmin = float(self.qminentry.get())
@@ -553,7 +553,7 @@ def applycutoff(self):
553553
self.plot_plane()
554554
self.intensity_upd_global()
555555

556-
self.cutted = True
556+
self.cutoff_applied = True
557557

558558
else:
559559
if self.space.get(): # in real space
@@ -585,7 +585,7 @@ def newcutoff(self):
585585
self.cube = self.cube_real
586586
else:
587587
self.cube = self.cube_reci
588-
self.cutted = False
588+
self.cutoff_applied = False
589589
self.transcutted = False
590590
self.applycutoff()
591591

tests/test_fourigui.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ def setUp(self):
1818
def test_init(self):
1919
self.assertFalse(self.test_gui.loaded)
2020
self.assertFalse(self.test_gui.transformed)
21-
self.assertFalse(self.test_gui.cutted)
21+
self.assertFalse(self.test_gui.cutoff_applied)
2222
self.assertFalse(self.test_gui.transcutted)
2323
self.assertFalse(self.test_gui.cutoff.get())
2424
self.assertFalse(self.test_gui.space.get())
@@ -81,7 +81,7 @@ def test_fft_010(self):
8181
self.assertTrue(
8282
not self.test_gui.transformed and self.test_gui.transcutted
8383
)
84-
# self.assertTrue(self.test_gui.cutted)
84+
# self.assertTrue(self.test_gui.cutoff_applied)
8585

8686
def test_fft_001(self):
8787
# given
@@ -170,7 +170,7 @@ def test_applycutoff(mocker):
170170
mocker.patch.object(
171171
fg, "plot_plane"
172172
) # we don't want it to plot anything so intercept
173-
fg.cutted = False
173+
fg.cutoff_applied = False
174174
fg.cube = np.ones((5, 5, 5))
175175
expected_ones = np.ones((5, 5, 5))
176176
expected_recip = np.array(
@@ -229,7 +229,7 @@ def test_applycutoff(mocker):
229229
fg, "fft"
230230
) # we don't want it to do the fft so intercept.
231231
# Should be tested separately (fixme).
232-
fg.cutted = False
232+
fg.cutoff_applied = False
233233
fg.cube_reci = np.ones((5, 5, 5))
234234
fg.cube = np.ones((5, 5, 5))
235235
mocker.patch.object(fg.space, "get", return_value=1)

0 commit comments

Comments
 (0)