Add Calibration Strain

main.py

@@ -8,7 +8,9 @@ from makeGraph import makeGraph, UQ_COLOURS as UQC
 
 DATA_FILE_PATH = ".\\data\\AERO4450-Group-10-Data-Analysis-v2.xls"
 actualData = pd.read_excel(DATA_FILE_PATH, sheet_name="Actual Data")
+actualGraphData = pd.read_excel(DATA_FILE_PATH, sheet_name="Actual Data Graphs")
 calibrationData = pd.read_excel(DATA_FILE_PATH, sheet_name="Calibration Data")
+calibrationGraphData = pd.read_excel(DATA_FILE_PATH, sheet_name="Calibration Data Graphs")
 
 
 def makeActualDataGraph(testRun):
@@ -21,7 +23,6 @@ def makeActualDataGraph(testRun):
     
     return data1, data2
 
-
 def makeCalibrationDataGraph(testRun):
     cols = [f"Unnamed: {3 + testRun*5}", f"Unnamed: {2 + testRun*5}"]
     data = calibrationData[cols].rename(columns = {cols[0]:'Time', cols[1]:'Strain'})
@@ -82,6 +83,23 @@ if __name__ == "__main__":
     #fig.savefig("./images/initTestData.png")
 
     # Calibration Data
+    # Average Data
+    cols = [f"force stuff", f"Unnamed: 25"]
+    data = calibrationGraphData[cols].rename(columns = {cols[0]:'Strain', cols[1]:'Force'})
+    data = data[2:8].astype({"Strain":"float", "Force":"float"})
+    avgStrainGraphData = {
+        "title": f"Force vs Average Strain",
+        "xLabel": "Average Strain (ε)", 
+        "yLabel": "Weight (N)",
+        "plots":[
+            {"type":"scatter", "x": data["Strain"], "y": data["Force"], "args":{"s":10, "zorder":2}, "label":"Average Strain", "colour": UQC["purple"]},
+            {"type":"plot", "label": "Approximation: y(x) = 0.196722x", "x": data["Strain"], "y": data["Strain"]*0.196722, "args":{"zorder":0, "alpha":0.5}, "colour": UQC["dark_grey"]}
+        ]
+    }
+    #fig, _ = makeGraph(avgStrainGraphData)
+    #fig.savefig("./images/AverageCaliStrain.png")
+
+
     # Actual Data
     for i in [0,1]:
         graphData = {
@@ -104,12 +122,9 @@ if __name__ == "__main__":
             }
             graphData["subPlots"].append(newPlot)
     
+        if bool(i): graphData["subPlots"].append(avgStrainGraphData)
         fig, _ = makeGraph(graphData, showPlot=False)
-        #fig.figlegend([ax[0], ax[0]], ['Upper','Lower'], loc=(0.85, 0.65))
+        fig.savefig(f"./images/calibData_Runs_{i+1}-_{i+(4 if i != 0 else 3)}.png")
-        # Subplots adjusted to make room
-        # Note bbox_extra_artists includes both the title and the legend so that neither are cut off
-        #fig.subplots_adjust(top=0.8, right=0.8)
-        fig.savefig(f"./images/calibData_Runs_{i+1}-_{i+4}.png")
 
 
     plt.show()