Start implementing graphs for the stats panel

2012-11-27 02:48:20 +13:00
parent ed9bb72dbe
commit b6e8c9c9ea
7 changed files with 215 additions and 37 deletions
--- a/mods/ra/chrome/ingame.yaml
+++ b/mods/ra/chrome/ingame.yaml
@@ -396,7 +396,7 @@ Container@OBSERVER_ROOT:
 			X:25
 			Y:50
 			Width:950
-			Height:400
+			Height:500
 			Visible:false
 			Children:
 				Background@BACKGROUND:
@@ -413,9 +413,9 @@ Container@OBSERVER_ROOT:
 							Align:Center
 							Text:Statistics
 						DropDownButton@STATS_DROPDOWN:
-							X:PARENT_RIGHT-140
+							X:PARENT_RIGHT-200
 							Y:15
-							Width:125
+							Width:185
 							Height:25
 							Font:Bold
 						Container@BASIC_STATS_HEADERS:
@@ -503,29 +503,36 @@ Container@OBSERVER_ROOT:
 									Height:25
 									Font:Bold
 									Text:Earned/min
-								Label@ASSETS_HEADER:
+								Label@EARNED_THIS_MIN_HEADER:
 									X:425
 									Y:40
 									Width:60
 									Height:25
 									Font:Bold
+									Text:Earned this min
+								Label@ASSETS_HEADER:
+									X:565
+									Y:40
+									Width:60
+									Height:25
+									Font:Bold
 									Text:Assets
 								Label@EARNED_HEADER:
-									X:505
+									X:645
 									Y:40
 									Width:60
 									Height:25
 									Font:Bold
 									Text:Earned
 								Label@SPENT_HEADER:
-									X:585
+									X:725
 									Y:40
 									Width:60
 									Height:25
 									Font:Bold
 									Text:Spent
 								Label@HARVESTERS_HEADER:
-									X:665
+									X:805
 									Y:40
 									Width:60
 									Height:25
@@ -607,7 +614,7 @@ Container@OBSERVER_ROOT:
 									Width:40
 									Height:25
 									Font:Bold
-									Text:Units Dead
+									Text:Units Lost
 									Align:Right
 								Label@BUILDINGS_KILLED_HEADER:
 									X:725
@@ -615,7 +622,7 @@ Container@OBSERVER_ROOT:
 									Width:40
 									Height:25
 									Font:Bold
-									Text:Bld Destroyed
+									Text:Bldg Killed
 									Align:Right
 								Label@BUILDINGS_DEAD_HEADER:
 									X:825
@@ -623,8 +630,22 @@ Container@OBSERVER_ROOT:
 									Width:40
 									Height:25
 									Font:Bold
-									Text:Bld Lost
+									Text:Bldg Lost
 									Align:Right
+						Container@EARNED_THIS_MIN_GRAPH_HEADERS:
+							X:0
+							Y:0
+							Width:PARENT_RIGHT
+							Height:PARENT_BOTTOM
+							Children:
+								Label@EARNED_THIS_MIN_HEADER:
+									X:0
+									Y:40
+									Width:PARENT_RIGHT
+									Height:25
+									Font:Bold
+									Text:Earnings received each minute
+									Align:Center
 						ScrollPanel@PLAYER_STATS_PANEL:
 							X:25
 							Y:70
@@ -725,23 +746,28 @@ Container@OBSERVER_ROOT:
 											Y:0
 											Width:60
 											Height:PARENT_BOTTOM
-										Label@ASSETS:
+										Label@EARNED_THIS_MIN:
 											X:395
 											Y:0
 											Width:60
 											Height:PARENT_BOTTOM
+										Label@ASSETS:
+											X:535
+											Y:0
+											Width:60
+											Height:PARENT_BOTTOM
 										Label@EARNED:
-											X:475
+											X:615
 											Y:0
 											Width:60
 											Height:PARENT_BOTTOM
 										Label@SPENT:
-											X:555
+											X:695
 											Y:0
 											Width:60
 											Height:PARENT_BOTTOM
 										Label@HARVESTERS:
-											X:635
+											X:775
 											Y:0
 											Width:60
 											Height:PARENT_BOTTOM
@@ -833,6 +859,17 @@ Container@OBSERVER_ROOT:
 											Width:40
 											Height:PARENT_BOTTOM
 											Align:Right
+								Container@EARNED_THIS_MIN_GRAPH_TEMPLATE:
+									X:0
+									Y:0
+									Width:PARENT_RIGHT-35
+									Height:300
+									Children:
+										ObserverStatsGraph@EARNED_THIS_MIN_GRAPH:
+											X:0
+											Y:0
+											Width:800
+											Height:PARENT_BOTTOM
 Background@FMVPLAYER:
 	Width:WINDOW_RIGHT
 	Height:WINDOW_BOTTOM