finalize all plots (so far)

plots_für_johann.py

@@ -76,44 +76,13 @@ def plotTdiagram():
 
 def plotUdiagram():
 
-    figures = {}
-    figures["E11-9a_amph_E11_ab"] = pp.subplots(1)
-    figures["Fro5-2_amph_Fro_i"] = pp.subplots(1)
-    figures["Fro5-2_amph_Fro_j"] = pp.subplots(1)
-    figures["Fro5-2_amph_Fro_k"] = pp.subplots(1)
-    figures["Fro5-2_amph_Fro_l"] = pp.subplots(1)
-    figures["Fro5-2_amph_Fro_m"] = pp.subplots(1)
-    figures["Fro5-2_amph_Fro_o"] = pp.subplots(1)
-    figures["Fro12-4_amph_Fro_ad"] = pp.subplots(1)
-    figures["Fro12-4_amph_Fro_ah"] = pp.subplots(1)
-    figures["Fro12-4_amph_Fro_ai"] = pp.subplots(1)
-    figures["Fro12-4_amph_Fro_aj"] = pp.subplots(1)
-    figures["Fro1312b1_amph_Fro_bb"] = pp.subplots(1)
-    figures["Fro1312b1_amph_Fro_be"] = pp.subplots(1)
-    figures["Fro1312b1_amph_Fro_bi"] = pp.subplots(1)
-    figures["Rane10-3_amph_Rane_a"] = pp.subplots(1)
-    figures["Rane10-3_amph_Rane_b"] = pp.subplots(1)
-    figures["Rane10-3_amph_Rane_c"] = pp.subplots(1)
-    figures["Rane10-3_amph_Rane_e"] = pp.subplots(1)
-    figures["Rane10-3_amph_Rane_f"] = pp.subplots(1)
-    figures["Rane10-4_amph_Rane_g"] = pp.subplots(1)
-    figures["Rane10-4_amph_Rane_l"] = pp.subplots(1)
-    figures["Rane10-4_amph_Rane_m"] = pp.subplots(1)
-    figures["Rane10-10_amph_Rane_p"] = pp.subplots(1)
-    figures["Rane10-10_amph_Rane_q"] = pp.subplots(1)
-    figures["Rane10-10_amph_Rane_r"] = pp.subplots(1)
-    figures["Rane10-10_amph_Rane_s"] = pp.subplots(1)
-    figures["Rane10-10_amph_Rane_t"] = pp.subplots(1)
-    figures["Rane10-10_amph_Rane_u"] = pp.subplots(1)
-    figures["Rane10-10_amph_Rane_v"] = pp.subplots(1)
-    figures["Rane10-10_amph_Rane_w"] = pp.subplots(1)
-
     for g in data_udiagram.data.keys():
 
         dat = data_udiagram.data[g]
 
         for i, zone in enumerate(dat['zones']):
-            fig, ax = figures[f"{g}_{zone}"]
+            name = f"{g}_{zone}"
+            fig, ax = pp.subplots(1, num=name)
             ax.plot(dat['index'][i], dat['al4'][i], label="Al(IV)", color="blue", marker=".")
             ax.plot(dat['index'][i], dat['al6'][i], label="Al(VI)", color="orange", marker=".")
             ax.set_xlabel("No.")
@@ -124,13 +93,11 @@ def plotUdiagram():
 
             fig.savefig(f"uplot_{g}_{zone}.png")
 
-    pp.show()
+    #pp.show()
 
 
 def plotZdiagram():
 
-    #fig, ax = pp.subplots(1)
-
     for g in data_udiagram.data.keys():
 
         fig, ax = pp.subplots(1, num=g)
@@ -146,14 +113,33 @@ def plotZdiagram():
 
         fig.savefig(f"zplot_{g}.png")
 
-    pp.show()
+    #pp.show()
 
 def plotEdiagram():
 
+    #line =  [[2.75, 1], [2,.75, 0]]
+    line =  [[2.75, 2.075], [1, 0]]
+    labelpositions = {
+            "Epi_E_a": [[2.1,0.8], [2.4,0.1]],
+            "Epi_E_d": [[2.1,0.4], [2.4,0.1]],
+            "Epi_E_h": [[2.1,0.5], [2.4,0.1]],
+            "Epi_E_k": [[1.8,0.4], [2.4,0.1]],
+            "Epi_Fro_a": [[2.1,0.5], [2.4,0.1]],
+            "Epi_Fro_d": [[2.01,0.5], [2.4,0.1]],
+            "Epi_Fro_g": [[2.1,0.8], [2.4,0.1]],
+            "Epi_Fro_k": [[2.1,0.8], [2.4,0.1]],
+            "Epi_Fro_n": [[2,0.5], [2.4,0.1]],
+            "Epi_Fro_q": [[2.1,0.4], [2.4,0.1]],
+            "Epi_Fro_u": [[2.08,0.3], [2.4,0.1]],
+            "Epi_Rane_a": [[2.1,0.8], [2.225,0.02]],
+            "Epi_Rane_d": [[1.7,0.3], [2.4,0.1]],
+    }
+
     for dataset in data_ediagram.data:
         #print(dataset)
         firstname = dataset['labels'][0]
         fig, ax = pp.subplots(1, num=firstname)
+        ax.plot(line[0], line[1], color="k")
 
         lens = list(map(len, dataset['al']))
         for idx in range(len(lens)):
@@ -164,6 +150,8 @@ def plotEdiagram():
 
             ax.plot(aldata, fedata, linestyle="", marker="o", label=label)
 
+        ax.annotate("Epidote", labelpositions[firstname][0])
+        ax.annotate("Zoisite/Clinozoisite", labelpositions[firstname][1])
         ax.legend(frameon=False)
         ax.set_xlabel("Al")
         ax.set_ylabel("Fe+3")
@@ -171,15 +159,10 @@ def plotEdiagram():
         fig.savefig(f"eplot_{firstname}")
     pp.show()
 
-
-    exit()
-    raise NotImplementedError()
-    
-
 if __name__ == "__main__":
     pass
 
     #plotTdiagram()
-    #plotUdiagram()
+    plotUdiagram()
-    #plotZdiagram()
+    plotZdiagram()
-    plotEdiagram()
+    #plotEdiagram()