move restore plot_settings.pkl back to original location

Author: kkiesling

openmc_plotter/main_window.py

@@ -64,7 +64,7 @@ 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)
@@ -128,10 +128,6 @@ def loadGui(self, use_settings_pkl=True):
 
         self.plotIm.frozen = False
 
-        # restore plot settings after loading materials/cells
-        if use_settings_pkl:
-            self.restoreModelSettings()
-
     def event(self, event):
         # use pinch event to update zoom
         if isinstance(event, QGestureEvent):
@@ -460,12 +456,15 @@ 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()
+            if use_settings_pkl:
+                self.restoreModelSettings()
+            # update plot and model settings
             self.updateRelativeBases()
 
         self.cellsModel = DomainTableModel(self.model.activeView.cells)