Changeset 318 for trunk/Forms/FormCharts.pas

Timestamp:

Jun 21, 2024, 3:20:20 PM (5 months ago)

Author:

chronos

Message:

• Modified: Code cleanup.

File:

• trunk/Forms/FormCharts.pas (modified) (6 diffs)

trunk/Forms/FormCharts.pas

@@ -5 +5 @@
 uses
   Classes, SysUtils, FileUtil, TAGraph, TASeries, Forms, Controls, Graphics,
-  Dialogs, StdCtrls, FormEx;
+  Dialogs, StdCtrls, FormEx, Game;
 
 type
@@ -16 +16 @@
     procedure ComboBox1Change(Sender: TObject);
     procedure FormShow(Sender: TObject);
+  private
+    FGame: TGame;
   public
     procedure Redraw;
     procedure Translate;
+    property Game: TGame read FGame write FGame;
   end;
 
@@ -27 +30 @@
 
 uses
-  Core, Game, Player;
+  Player;
 
 resourcestring
@@ -35 +38 @@
   SCitiesCount = 'Cities count';
   SWinObjectiveCells = 'Win objective cells';
-
 
 { TFormCharts }
@@ -59 +61 @@
 begin
   Chart1.Series.Clear;
-  for I := 0 to Core.Core.Game.Players.Count - 1 do
-  with TPlayer(Core.Core.Game.Players[I]) do begin
+  for I := 0 to Game.Players.Count - 1 do
+  with TPlayer(Game.Players[I]) do begin
     NewSeries := TLineSeries.Create(nil);
     NewSeries.LinePen.Color := Color;
     for X := 0 to TurnStats.Count - 1 do begin
-      if ComboBox1.ItemIndex = 0 then NewSeries.AddXY(X, TGameTurnStat(TurnStats[X]).OccupiedCells)
-      else if ComboBox1.ItemIndex = 1 then NewSeries.AddXY(X, TGameTurnStat(TurnStats[X]).Units)
-      else if ComboBox1.ItemIndex = 2 then NewSeries.AddXY(X, TGameTurnStat(TurnStats[X]).DiscoveredCells)
-      else if ComboBox1.ItemIndex = 3 then NewSeries.AddXY(X, TGameTurnStat(TurnStats[X]).Cities)
-      else if ComboBox1.ItemIndex = 4 then NewSeries.AddXY(X, TGameTurnStat(TurnStats[X]).WinObjectiveCells);
+      if ComboBox1.ItemIndex = 0 then NewSeries.AddXY(X, TurnStats[X].OccupiedCells)
+      else if ComboBox1.ItemIndex = 1 then NewSeries.AddXY(X, TurnStats[X].Units)
+      else if ComboBox1.ItemIndex = 2 then NewSeries.AddXY(X, TurnStats[X].DiscoveredCells)
+      else if ComboBox1.ItemIndex = 3 then NewSeries.AddXY(X, TurnStats[X].Cities)
+      else if ComboBox1.ItemIndex = 4 then NewSeries.AddXY(X, TurnStats[X].WinObjectiveCells);
     end;
     Chart1.AddSeries(NewSeries);
@@ -78 +80 @@
   LastIndex: Integer;
 begin
-  Core.Core.Translator1.TranslateComponentRecursive(Self);
+  TFormEx.Translator.TranslateComponentRecursive(Self);
   with ComboBox1 do begin
     LastIndex := ItemIndex;