bug fixes

fixed a problem on data unload where exemplar data path is forgotten, fixed path issue with some code assets
sandialabs · Jan 8, 2024 · 1f58bb6 · 1f58bb6
1 parent 417d044
commit 1f58bb6
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 12 deletions.
diff --git a/GUI/IOWizard.py b/GUI/IOWizard.py
@@ -61,7 +61,7 @@ def __init__(self, parent=None):
     #bring in the first page banner
     dirname, _ = os.path.split(os.path.abspath(__file__))
     x = Path(dirname).resolve().parents[0]
-    F = os.path.join(x, 'docs_v2','source', 'assets', 'codeAssets', 'SNL_Horizontal_Black.jpg')
+    F = os.path.join(x, 'docs_v2', 'codeAssets', 'SNL_Horizontal_Black.jpg')
     res = QtGui.QPixmap(F)
     geometry = qApp.desktop().availableGeometry(self)
     res = res.scaledToWidth(geometry.width()*0.25)

diff --git a/GUI/MAPIT_main.py b/GUI/MAPIT_main.py
@@ -162,7 +162,7 @@ def __init__(self):
     #
     dirname, _ = os.path.split(os.path.abspath(__file__))
     x = Path(dirname).resolve().parents[0]
-    F = os.path.join(x, 'docs_v2','source', 'assets', 'codeAssets', 'mapit_logo.png')
+    F = os.path.join(x, 'docs_v2', 'codeAssets', 'mapit_logo.png')
     self.setWindowIcon(QtGui.QIcon(F))
 
     StatsPanelOps.update_data_opts(self,0) #call for initial layout setup
@@ -586,7 +586,7 @@ def InitErrors(self):
     ep_L.addWidget(self.CloseEConfig)
 
     self.ErrorPane.setWindowTitle("Error Selection")
-    F = os.path.join(x, 'docs_v2','source', 'assets', 'codeAssets', 'mapit_logo.png')
+    F = os.path.join(x, 'docs_v2', 'codeAssets', 'mapit_logo.png')
     self.ErrorPane.setWindowIcon(QtGui.QIcon(F))
     self.ErrorPane.setWindowModality(QtCore.Qt.ApplicationModal)
     self.ErrorPane.finished.connect(self.RunStats._animation.start)
@@ -665,7 +665,7 @@ def RunTable(self):
     dlg.setWindowTitle('SEID Contributions')
     dirname, _ = os.path.split(os.path.abspath(__file__))
     x = Path(dirname).resolve().parents[0]
-    F = os.path.join(x, 'docs_v2','source', 'assets', 'codeAssets', 'mapit_logo.png')
+    F = os.path.join(x, 'docs_v2', 'codeAssets', 'mapit_logo.png')
     dlg.setWindowIcon(QtGui.QIcon(F))
     dlg.resize(1200,800)
     res = dlg.show()
@@ -679,7 +679,7 @@ def RunTableAI(self):
     dlg.setWindowTitle('SEID(AI) Contributions')
     dirname, _ = os.path.split(os.path.abspath(__file__))
     x = Path(dirname).resolve().parents[0]
-    F = os.path.join(x, 'docs_v2','source', 'assets', 'codeAssets', 'mapit_logo.png')
+    F = os.path.join(x, 'docs_v2', 'codeAssets', 'mapit_logo.png')
     dlg.setWindowIcon(QtGui.QIcon(F))
     dlg.resize(1200, 800)
     res = dlg.exec_()
@@ -896,9 +896,11 @@ def unloadInternalData(self):
     global GUIparams
     global AnalysisData
 
-    GUIparams = GUIopts()
+    GUIparams = GUIopts(False, True)
     AnalysisData = DataHolder()
     GUIparams = GeneralOps.loadGUILabels(GUIparams)
+    self.updateSamplePath()
+
 
 
 def ErrorStyleChange():
@@ -1392,7 +1394,7 @@ def launch_explorer(mdlname, datname):
 
   #splash
   x = Path(sys.argv[0]).resolve().parents[1]
-  F = os.path.join(x, 'docs_v2','source', 'assets', 'codeAssets', 'splash3.png')
+  F = os.path.join(x, 'docs_v2', 'codeAssets', 'splash3.png')
   splash_pix = QtGui.QPixmap(F)
   G = QtWidgets.QApplication.instance().devicePixelRatio()
   splash_pix.setDevicePixelRatio(G)
@@ -1405,7 +1407,7 @@ def launch_explorer(mdlname, datname):
 
 
 
-  F = os.path.join(x, 'docs_v2','source', 'assets', 'codeAssets', 'SNL_Stacked_Black_Blue2.jpg')
+  F = os.path.join(x, 'docs_v2', 'codeAssets', 'SNL_Stacked_Black_Blue2.jpg')
   splash.setWindowIcon(QtGui.QIcon(F))
 
   progressBar = QtWidgets.QProgressBar(splash)

diff --git a/GUI/ScenarioSelector.py b/GUI/ScenarioSelector.py
@@ -95,7 +95,7 @@ def __init__(self, parent=None, dpi=400):
     #load the background image
     dirname, _ = os.path.split(os.path.abspath(__file__))
     x = Path(dirname).resolve().parents[0]
-    F = os.path.join(x, 'docs_v2','source','assets', 'codeAssets', 'FuelFabBase.png')
+    F = os.path.join(x, 'docs_v2', 'codeAssets', 'FuelFabBase.png')
     self.axes.imshow(Image.open(F), interpolation='catrom')
 
     self.axes.set_ylim(self.axes.get_ylim()[0], self.axes.get_ylim()[1] - 500)
@@ -289,7 +289,7 @@ def __init__(self, mdlname, dataname, GUIparams, parent=None):
 
     self.sceneName = 'Normal'
 
-    F = os.path.join(x, 'docs_v2','source', 'assets', 'codeAssets', 'SNL_Stacked_Black_Blue2.jpg')
+    F = os.path.join(x, 'docs_v2', 'codeAssets', 'SNL_Stacked_Black_Blue2.jpg')
     self.setWindowIcon(QtGui.QIcon(F))
 
 
@@ -323,7 +323,7 @@ def __init__(self, mdlname, dataname, GUIparams, parent=None):
 
     dirname, _ = os.path.split(os.path.abspath(__file__))
     x = Path(dirname).resolve().parents[0]
-    F = os.path.join(x, 'docs_v2','source','assets', 'codeAssets', pName)
+    F = os.path.join(x, 'docs_v2', 'codeAssets', pName)
     IC = QtGui.QPixmap(F)
 
     ICB = QtWidgets.QPushButton()
@@ -332,7 +332,7 @@ def __init__(self, mdlname, dataname, GUIparams, parent=None):
     ICB.clicked.connect(self.PlayButton)
 
     SCB = QtWidgets.QPushButton()
-    F = os.path.join(x, 'docs_v2','source','assets', 'codeAssets', ppName)
+    F = os.path.join(x, 'docs_v2', 'codeAssets', ppName)
     SCBL = QtGui.QPixmap(F)
 
     SCB.setIcon(SCBL)