cal/MECH3410-P1-Graphs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Generate All Graphs Correctly

Browse Source
This commit is contained in:
Cal Wing 2024-08-26 16:40:05 +10:00
parent b1e53552fb
commit 8a2c7aca4f
2 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
main.py
View File

@ -144,7 +144,7 @@ if __name__ == '__main__':
for aoa in tqdm(raw_data["AoA"], position=1): for aoa in tqdm(raw_data["AoA"], position=1):
sheet = raw_data["data"][f"{aoa} AoA"] sheet = raw_data["data"][f"{aoa} AoA"]
aoa_data[aoa] = make_pressure_graph(sheet, aoa, raw_data["rpm"], raw_data["airSpeed"], True) aoa_data[aoa] = make_pressure_graph(sheet, aoa, raw_data["rpm"], raw_data["airSpeed"], False)
data[raw_data["rpm"]] = aoa_data data[raw_data["rpm"]] = aoa_data
@ -162,6 +162,11 @@ if __name__ == '__main__':
colour_cycle = uqccf() colour_cycle = uqccf()
for aoa, c in zip(aoa_data, colour_cycle): for aoa, c in zip(aoa_data, colour_cycle):
#print(c["color"], c["color"].hex_lighten(1.4), c["color"].rgb(), c["color"].lighten(1.4))
#print(c["color"].hex_lighten(1), c["color"])
#exit()
this_data = aoa_data[aoa] this_data = aoa_data[aoa]
pressure = this_data[0] pressure = this_data[0]
@ -178,8 +183,8 @@ if __name__ == '__main__':
#{"x": [PITOT_PLACEMENT[9], PITOT_PLACEMENT[18]], "y": [pressure.iloc[9], pressure.iloc[18]], "colour": c["color"]}, #{"x": [PITOT_PLACEMENT[9], PITOT_PLACEMENT[18]], "y": [pressure.iloc[9], pressure.iloc[18]], "colour": c["color"]},
{"x": [PITOT_PLACEMENT[9], pN[0]], "y": [pressure.iloc[9], pN[1]], "colour": c["color"].lighten(0.4)}, {"x": [PITOT_PLACEMENT[9], pN[0]], "y": [pressure.iloc[9], pN[1]], "colour": c["color"], "args":{"alpha":0.3}},
{"x": [PITOT_PLACEMENT[9], pN[0]], "y": [pressure.iloc[18], pN[1]], "colour": c["color"].lighten(0.4)}, {"x": [PITOT_PLACEMENT[9], pN[0]], "y": [pressure.iloc[18], pN[1]], "colour": c["color"], "args":{"alpha":0.3}},
{"x":PITOT_PLACEMENT, "y":pressure, "label":f"α = {int(aoa):d}°", "type":"scatter", "colour": c["color"], "args":{"zorder":2}}, {"x":PITOT_PLACEMENT, "y":pressure, "label":f"α = {int(aoa):d}°", "type":"scatter", "colour": c["color"], "args":{"zorder":2}},
) )
@ -189,7 +194,7 @@ if __name__ == '__main__':
if raw_data["rpm"] == 508: if raw_data["rpm"] == 508:
graph['xLim'] = ( graph['xLim'] = (
min(PITOT_PLACEMENT) - 5, min(PITOT_PLACEMENT) - 5,
max(PITOT_PLACEMENT) + 20 max(PITOT_PLACEMENT) + 25
) )
graph["figSize"] = (8, 6) graph["figSize"] = (8, 6)
@ -216,10 +221,10 @@ if __name__ == '__main__':
{"x": [PITOT_PLACEMENT[0], PITOT_PLACEMENT[10]], "y": [pressure.iloc[0], pressure.iloc[10]], "colour": c["color"]}, {"x": [PITOT_PLACEMENT[0], PITOT_PLACEMENT[10]], "y": [pressure.iloc[0], pressure.iloc[10]], "colour": c["color"]},
#{"x": [PITOT_PLACEMENT[9], PITOT_PLACEMENT[18]], "y": [pressure.iloc[9], pressure.iloc[18]], "colour": c["color"]}, #{"x": [PITOT_PLACEMENT[9], PITOT_PLACEMENT[18]], "y": [pressure.iloc[9], pressure.iloc[18]], "colour": c["color"]},
{"x": [PITOT_PLACEMENT[9], pN[0]], "y": [pressure.iloc[9], pN[1]], "colour": c["color"].lighten(0.4)}, {"x": [PITOT_PLACEMENT[9], pN[0]], "y": [pressure.iloc[9], pN[1]], "colour": c["color"], "args":{"alpha":0.3}},
{"x": [PITOT_PLACEMENT[9], pN[0]], "y": [pressure.iloc[18], pN[1]], "colour": c["color"].lighten(0.4)}, {"x": [PITOT_PLACEMENT[9], pN[0]], "y": [pressure.iloc[18], pN[1]], "colour": c["color"], "args":{"alpha":0.3}},
{"x":PITOT_PLACEMENT, "y":pressure, "label":f"α = {int(aoa):d}°", "type":"scatter", "colour": c["color"]}, {"x":PITOT_PLACEMENT, "y":pressure, "label":f"α = {int(aoa):d}°", "type":"scatter", "colour": c["color"], "args":{"zorder":2}},
) )
for plt in plts: for plt in plts:
graph["plots"].append(plt) graph["plots"].append(plt)

8
makeGraph.py
View File

@ -43,7 +43,8 @@ UQ_COLOURS_DICT = {
class ColourValue(str): class ColourValue(str):
def __new__(self, name, value): def __new__(self, name, value):
self.name = name self.name = name
self.value = colors.to_hex(value, True) self._orig_value = value
self.value = colors.to_hex(self._orig_value, True)
return super().__new__(self, self.value) return super().__new__(self, self.value)
@ -57,7 +58,7 @@ class ColourValue(str):
return colors.to_rgba(self.value, alpha) return colors.to_rgba(self.value, alpha)
def rgb(self) -> tuple[float, float, float]: def rgb(self) -> tuple[float, float, float]:
return colors.to_rgb(self.value) return colors.to_rgb(self._orig_value)
def hex(self) -> str: def hex(self) -> str:
return self.value return self.value
@ -73,6 +74,9 @@ class ColourValue(str):
return colorsys.hls_to_rgb(hls[0], max(0, min(1, amount * hls[1])), hls[2]) return colorsys.hls_to_rgb(hls[0], max(0, min(1, amount * hls[1])), hls[2])
def hex_lighten(self, amount=0.5) -> str:
return colors.to_hex(self.lighten(amount), True)
# Define the UQ Colours in a nicer object # Define the UQ Colours in a nicer object