Skip to content

Commit b0d7daa

Browse files
committed
Adding another test reference and making some small tweaks to polish the feature.
1 parent d063fc8 commit b0d7daa

5 files changed

Lines changed: 15 additions & 3 deletions

File tree

openmc_plotter/__main__.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,8 @@ def run_app(user_args):
4646
splash_pix = QtGui.QPixmap(path_splash)
4747
splash = QSplashScreen(splash_pix, QtCore.Qt.WindowStaysOnTopHint)
4848
splash.setMask(splash_pix.mask())
49-
splash.show()
49+
if not user_args.batch_mode:
50+
splash.show()
5051
app.processEvents()
5152
splash.setMask(splash_pix.mask())
5253
splash.showMessage("Loading Model...",

openmc_plotter/main_window.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,8 @@ def createMenuBar(self):
159159
self.saveImageAction.setShortcut("Ctrl+Shift+S")
160160
self.saveImageAction.setToolTip('Save plot image')
161161
self.saveImageAction.setStatusTip('Save plot image')
162-
self.saveImageAction.triggered.connect(self.saveImage)
162+
save_image_connector = partial(self.saveImage, filename=None)
163+
self.saveImageAction.triggered.connect(save_image_connector)
163164

164165
self.saveViewAction = QAction("Save &View...", self)
165166
self.saveViewAction.setShortcut(QtGui.QKeySequence.Save)

tests/setup_test/ref1.png

12.6 KB
Loading

tests/setup_test/test.py

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,27 +21,37 @@ def test_window(tmpdir, qtbot):
2121

2222
try:
2323
mw.saveImage(tmpdir / 'test.png')
24-
mw.close()
24+
2525
qtbot.addWidget(mw)
2626
finally:
2727
orig.chdir()
2828

2929
filecmp.cmp(orig / 'ref.png', tmpdir / 'test.png')
3030

31+
mw.close()
32+
3133
def test_batch_image(tmpdir, qtbot):
3234
orig = tmpdir.chdir()
3335

3436
# move view file into tmpdir
3537
shutil.copy2(orig / 'test.pltvw', tmpdir)
38+
shutil.copy2(orig / 'test1.pltvw', tmpdir)
3639

3740
_openmcReload(model_path=orig)
3841

3942
mw = MainWindow(model_path=orig)
4043
mw.loadGui()
44+
4145
try:
4246
mw.saveBatchImage('test.pltvw')
4347
qtbot.addWidget(mw)
48+
49+
mw.saveBatchImage('test1.pltvw')
50+
qtbot.addWidget(mw)
4451
finally:
4552
orig.chdir()
4653

4754
filecmp.cmp(orig / 'ref.png', tmpdir / 'test.png')
55+
filecmp.cmp(orig / 'ref1.png', tmpdir / 'test1.png')
56+
57+
mw.close()

tests/setup_test/test1.pltvw

1.96 KB
Binary file not shown.

0 commit comments

Comments
 (0)