Merge pull request #8 from milankl/pie

sorted with a,b,c; %.1f for pie charts
ConferenceCarbonTracker · Nov 4, 2019 · 503f3a6 · 503f3a6
2 parents e4604e3 + befe88f
commit 503f3a6
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 6 deletions.
diff --git a/data/data_processed.xlsx b/data/data_processed.xlsx
diff --git a/plots/CO2_permode.png b/plots/CO2_permode.png
diff --git a/plots/carbon_sorted.png b/plots/carbon_sorted.png
diff --git a/src/emissions_sorted.py b/src/emissions_sorted.py
@@ -60,19 +60,24 @@
 
 # A FEW COUNTRIES NUMBERED
 n_countries1 = [3,20,21,27,36]
-n_countries2 = [41,72,80,86,98,99]
+n_countries2 = [41,72,80,86,98,99,100,109]
 for n,j in enumerate(n_countries1):
-    ax.text(cnumpercent[j-1]+0.2, ccarbonpercent[j-1]+0.5,"{}".format(n+1), fontsize=5)
+    ax.text(cnumpercent[j-1]+0.2, ccarbonpercent[j-1]+0.5,chr(97+n), fontsize=5)
 
 for n,j in enumerate(n_countries2):
-    ax.text(cnumpercent[j-1]+0.2, ccarbonpercent[j]+0.5,"{}".format(n+len(n_countries1)+1), fontsize=5)
+    ax.text(cnumpercent[j-1]+0.2, ccarbonpercent[j]+0.5,chr(97+n+len(n_countries1)), fontsize=5)
 
 # RECTANGLES
 ax.fill_between(x,y1,y2,alpha=0.3,color="k")
 
-countrynames = ["{:d} {:s}".format(i+1,names[n]) for i,n in enumerate(n_countries1+n_countries2)]
+# LEGEND
+countrynames = ["      {:s}".format(names[n]) for i,n in enumerate(n_countries1+n_countries2)]
 ax.legend([l1,]*len(countrynames),countrynames,title="Countries",loc=4,handlelength=0,fontsize=7)
 
+for i,n in enumerate(n_countries1+n_countries2):
+    ax.text(74,45-3.52*i,chr(97+i),fontsize=7,color="k",zorder=10)
+
+
 ax.set_xlim(0.0,100.0)
 ax.set_ylim(0.0,100.0)
 

diff --git a/src/pie_charts_mode.py b/src/pie_charts_mode.py
@@ -35,13 +35,13 @@
 
 # REALISTIC
 
-wedges1, texts1, autotexts1 = ax1.pie([C1lh,C1sh,C1ra],labels=["Long-haul","Short-haul","Rail"],autopct="%d%%",colors=colors)
+wedges1, texts1, autotexts1 = ax1.pie([C1lh,C1sh,C1ra],labels=["Long-haul","Short-haul","Rail"],autopct="%.1f%%",colors=colors)
 plt.setp(autotexts1, size=8, weight="bold", color="white")
 ax1.axis('equal')
 ax1.set_title("a) Travel to EGU19, total %d tC02e" % sum(S1),loc="left",weight="bold")
 
 # RAIL
-wedges2, texts2, autotexts2 = ax2.pie([C2lh,C2ra],labels=["Long-haul","Rail"],autopct="%d%%",colors=colors)
+wedges2, texts2, autotexts2 = ax2.pie([C2lh,C2ra],labels=["Long-haul","Rail"],autopct="%.1f%%",colors=colors)
 plt.setp(autotexts2, size=8, weight="bold", color="white")
 ax2.axis('equal')
 ax2.set_title("b) All journeys <1500km by rail, total %d tC02e" % sum(S2),loc="left",weight="bold")