First draft complete

DrRocketry · Feb 5, 2021 · a699200 · a699200
1 parent abe7d25
commit a699200
Show file tree

Hide file tree

Showing 5 changed files with 202 additions and 114 deletions.
diff --git a/MAPLEAF/IO/gridConvergenceFunctions.py b/MAPLEAF/IO/gridConvergenceFunctions.py
@@ -308,35 +308,41 @@ def plotConvergence(coarseX, coarseY, medX, medY, fineX, fineY, \
     return resultsAxes, resultsFig, resultsAxins, convergenceAxes, convergenceFig, uncertaintyAxes, uncertaintyFig
 
 def saveFigureAndPrintNotification(fileName, figure, saveToDirectory, overwrite=False, pngVersion=True, epsVersion=True, pdfVersion=True, printStatementPrefix=""):
-        def saveFigure(filePath):
-            if overwrite or not os.path.exists(filePath):
-                figure.savefig(filePath)
-                print("{}Saved Image: {}".format(printStatementPrefix, filePath))
-            elif not overwrite and os.path.exists(filePath):
-                print("{}WARNING: Did not save image: {} - file already exists".format(printStatementPrefix, filePath))
-
-        def getNoExtensionFilePath(filePath):
-            noExtensionPath = filePath
-
-            # Remove extension if it exists
-            if '.' in filePath:
-                dotIndex = filePath.rfind('.')
-                noExtensionPath = filePath[:dotIndex]
-
-            return noExtensionPath
-
-        filePath = os.path.join(saveToDirectory, fileName)
-        noExtensionPath = getNoExtensionFilePath(filePath)
-
-        # Save each desired version of the figure
-        if pngVersion:
-            pngFilePath = noExtensionPath + ".png"
-            saveFigure(pngFilePath)
-
-        if epsVersion:
-            epsFilePath = noExtensionPath + ".eps"
-            saveFigure(epsFilePath)
-
-        if pdfVersion:
-            pdfFilePath = noExtensionPath + ".pdf"
-            saveFigure(pdfFilePath)
+    def saveFigure(filePath):
+        if overwrite or not os.path.exists(filePath):
+            figure.savefig(filePath)
+            print("{}Saved Image: {}".format(printStatementPrefix, filePath))
+        elif not overwrite and os.path.exists(filePath):
+            print("{}WARNING: Did not save image: {} - file already exists".format(printStatementPrefix, filePath))
+
+    def getNoExtensionFilePath(filePath):
+        noExtensionPath = filePath
+
+        # Remove extension if it exists
+        if '.' in filePath:
+            dotIndex = filePath.rfind('.')
+            noExtensionPath = filePath[:dotIndex]
+
+        return noExtensionPath
+
+    filePath = saveToDirectory + '/' + fileName
+    noExtensionPath = getNoExtensionFilePath(filePath)
+    savedFiles = []
+
+    # Save each desired version of the figure
+    if pngVersion:
+        pngFilePath = noExtensionPath + ".png"
+        saveFigure(pngFilePath)
+        savedFiles.append(pngFilePath)
+
+    if epsVersion:
+        epsFilePath = noExtensionPath + ".eps"
+        saveFigure(epsFilePath)
+        savedFiles.append(epsFilePath)
+
+    if pdfVersion:
+        pdfFilePath = noExtensionPath + ".pdf"
+        saveFigure(pdfFilePath)
+        savedFiles.append(pdfFilePath)
+
+    return savedFiles