Skip to content

Commit bbe0c4f

Browse files
committed
Slight adjustment to make testing easier
1 parent 80ebda2 commit bbe0c4f

3 files changed

Lines changed: 26 additions & 11 deletions

File tree

openmc_plotter/main_window.py

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -479,14 +479,15 @@ def loadModel(self, reload=False, use_settings_pkl=True):
479479
self.plotIm.model = self.model
480480
self.applyChanges()
481481

482-
def saveImage(self):
483-
filename, ext = QFileDialog.getSaveFileName(self,
484-
"Save Plot Image",
485-
"untitled",
486-
"Images (*.png)")
482+
def saveImage(self, filename=None):
483+
if filename is None:
484+
filename, ext = QFileDialog.getSaveFileName(self,
485+
"Save Plot Image",
486+
"untitled",
487+
"Images (*.png)")
487488
if filename:
488489
self.plotIm.saveImage(filename)
489-
self.statusBar().showMessage('Plot Image Saved', 5000)
490+
self.statusBar().showMessage('Plot Image Saved', 5000)
490491

491492
def saveView(self):
492493
filename, ext = QFileDialog.getSaveFileName(self,

openmc_plotter/plotgui.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ def saveImage(self, filename):
119119
filename : str or pathlib.Path
120120
Name of the image to save
121121
"""
122-
if "." not in filename:
122+
if "." not in str(filename):
123123
filename += ".png"
124124
self.figure.savefig(filename, transparent=True)
125125

tests/setup_test/test.py

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,23 @@
1+
import filecmp
2+
import pytest
13
from openmc_plotter.main_window import MainWindow, _openmcReload
24

3-
def test_window(qtbot):
4-
_openmcReload()
5+
@pytest.fixture
6+
def run_in_tmpdir(tmpdir):
7+
orig = tmpdir.chdir()
8+
try:
9+
yield
10+
finally:
11+
orig.chdir()
512

6-
mw = MainWindow()
13+
def test_window(tmpdir, qtbot):
14+
orig = tmpdir.chdir()
15+
16+
_openmcReload(model_path=str(orig))
17+
18+
mw = MainWindow(model_path=orig)
719
mw.loadGui()
8-
mw.plotIm.figure.savefig("test.png")
20+
mw.saveImage(tmpdir / 'test.png')
921
qtbot.addWidget(mw)
22+
23+
filecmp.cmp(orig / 'ref.png', tmpdir / 'test.png')

0 commit comments

Comments
 (0)