Merge pull request #76 from openmc-dev/ignore_settings

Adding option to ignore the plot_settings.pkl file

Author: paulromano

openmc_plotter/__main__.py

@@ -16,15 +16,17 @@ def main():
     ap = ArgumentParser(description='OpenMC Plotter GUI')
     ap.add_argument('-d', '--model-directory', default=os.curdir,
                     help='Location of model dir (default is current dir)')
+    ap.add_argument('-e','--ignore-settings', action='store_false',
+                    help='Ignore plot_settings.pkl file if present.')
 
     args = ap.parse_args()
 
     os.chdir(args.model_directory)
 
-    run_app()
+    run_app(use_settings_pkl=args.ignore_settings)
 
 
-def run_app():
+def run_app(use_settings_pkl=True):
     path_icon = str(Path(__file__).parent / 'assets/openmc_logo.png')
     path_splash = str(Path(__file__).parent / 'assets/splash.png')
 
@@ -60,7 +62,7 @@ def run_app():
     screen_size = app.primaryScreen().size()
     mainWindow = MainWindow(font_metric, screen_size)
     # connect splashscreen to main window, close when main window opens
-    mainWindow.loadGui()
+    mainWindow.loadGui(use_settings_pkl=use_settings_pkl)
     mainWindow.show()
     splash.close()
 

openmc_plotter/main_window.py

@@ -38,19 +38,21 @@ def _openmcReload():
     openmc.lib.settings.verbosity = 1
 
 class MainWindow(QMainWindow):
-    def __init__(self, font=QtGui.QFontMetrics(QtGui.QFont()), screen_size=QtCore.QSize()):
+    def __init__(self,
+                 font=QtGui.QFontMetrics(QtGui.QFont()),
+                 screen_size=QtCore.QSize()):
         super().__init__()
 
         self.screen = screen_size
         self.font_metric = font
         self.setWindowTitle('OpenMC Plot Explorer')
 
-    def loadGui(self):
+    def loadGui(self, use_settings_pkl=True):
 
         self.pixmap = None
         self.zoom = 100
 
-        self.loadModel()
+        self.loadModel(use_settings_pkl=use_settings_pkl)
 
         # Create viewing area
         self.frame = QScrollArea(self)
@@ -439,13 +441,14 @@ def updateWindowMenu(self):
         self.mainWindowAction.setChecked(self.isActiveWindow())
 
     # Menu and shared methods
-    def loadModel(self, reload=False):
+    def loadModel(self, reload=False, use_settings_pkl=True):
         if reload:
             self.resetModels()
         else:
             # create new plot model
             self.model = PlotModel()
-            self.restoreModelSettings()
+            if use_settings_pkl:
+                self.restoreModelSettings()
             # update plot and model settings
             self.updateRelativeBases()