Changeset 170 for trunk/Forms

Timestamp:

Nov 23, 2017, 5:02:49 PM (7 years ago)

Author:

chronos

Message:

• Modified: UGeometry unit rewritten to use generics and define own TPoint and TRect types.

Location:

trunk/Forms

Files:

• UFormCharts.lfm (modified) (2 diffs)
• UFormMain.lfm (modified) (7 diffs)
• UFormMain.pas (modified) (9 diffs)
• UFormNew.pas (modified) (2 diffs)

trunk/Forms/UFormCharts.lfm

@@ -9 +9 @@
   OnClose = FormClose
   OnShow = FormShow
-  LCLVersion = '1.8.0.4'
+  LCLVersion = '1.6.4.0'
   object Chart1: TChart
     Left = 8
@@ -35 +35 @@
   object ComboBox1: TComboBox
     Left = 24
-    Height = 36
+    Height = 28
     Top = 8
     Width = 392
-    ItemHeight = 0
+    ItemHeight = 20
     ItemIndex = 0
     Items.Strings = (

trunk/Forms/UFormMain.lfm

@@ -5 +5 @@
   Width = 775
   Caption = 'xTactics'
-  ClientHeight = 587
+  ClientHeight = 596
   ClientWidth = 775
   Menu = MainMenu1
@@ -13 +13 @@
   OnKeyUp = FormKeyUp
   OnShow = FormShow
-  LCLVersion = '1.8.0.4'
+  LCLVersion = '1.6.4.0'
   WindowState = wsMaximized
   object StatusBar1: TStatusBar
     Left = 0
-    Height = 30
-    Top = 557
+    Height = 28
+    Top = 568
     Width = 775
     Panels = <    
@@ -34 +34 @@
   object ToolBar1: TToolBar
     Left = 0
-    Height = 557
+    Height = 568
     Top = 0
     Width = 32
@@ -72 +72 @@
     object ToolButton6: TToolButton
       Left = 1
-      Top = 170
+      Top = 194
       Action = AZoomIn
     end
     object ToolButton7: TToolButton
       Left = 1
-      Top = 202
+      Top = 226
       Action = AZoomOut
     end
     object ToolButton8: TToolButton
       Left = 1
-      Top = 234
+      Top = 258
       Action = AZoomAll
     end
     object ToolButton9: TToolButton
       Left = 1
+      Height = 32
       Top = 162
       Width = 32
@@ -93 +94 @@
     object ToolButton10: TToolButton
       Left = 1
-      Top = 266
+      Height = 32
+      Top = 290
       Width = 32
       Style = tbsSeparator
@@ -99 +101 @@
     object ToolButton11: TToolButton
       Left = 1
-      Top = 274
+      Top = 322
       Action = Core.AGameLoad
     end
     object ToolButton12: TToolButton
       Left = 1
-      Top = 306
+      Top = 354
       Action = Core.AGameSave
     end
     object ToolButton13: TToolButton
       Left = 1
-      Top = 338
+      Top = 386
       Action = Core.AExit
     end
@@ -115 +117 @@
   object PaintBox1: TPaintBox
     Left = 32
-    Height = 557
+    Height = 568
     Top = 0
     Width = 743

trunk/Forms/UFormMain.pas

@@ -7 +7 @@
 uses
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, ExtCtrls,
-  UGame, LCLType, Menus, ActnList, ComCtrls, types, dateutils, XMLConf, DOM;
+  UGame, LCLType, Menus, ActnList, ComCtrls, dateutils, XMLConf, DOM,
+  UGeometry;
 
 const
@@ -137 +138 @@
   if Assigned(Core.CurrentClient) then
   with Core.CurrentClient do begin
-    View.DestRect := Bounds(0, 0, PaintBox1.Width, PaintBox1.Height);
+    View.DestRect := TRect.CreateBounds(TPoint.Create(0, 0), TPoint.Create(PaintBox1.Width, PaintBox1.Height));
     if csOpaque in PaintBox1.ControlStyle then begin
       TempBitmap.SetSize(PaintBox1.Width, PaintBox1.Height);
@@ -166 +167 @@
   if Assigned(Core.CurrentClient) then
   with Core.CurrentClient do
-    View.DestRect := Bounds(0, 0, PaintBox1.Width, PaintBox1.Height);
+    View.DestRect := TRect.CreateBounds(TPoint.Create(0, 0), TPoint.Create(PaintBox1.Width, PaintBox1.Height));
   Redraw;
 end;
@@ -252 +253 @@
   with Core, Game, CurrentClient, View do begin
     MapRect := Map.CalculatePixelRect;
-    Factor := FloatPoint((DestRect.Right - DestRect.Left) / (MapRect.Right - MapRect.Left),
-      (DestRect.Bottom - DestRect.Top) / (MapRect.Bottom - MapRect.Top));
+    Factor := FloatPoint(DestRect.Size.X / MapRect.Size.X,
+      DestRect.Size.Y / MapRect.Size.Y);
     if Factor.X < Factor.Y then NewZoom := Factor.X
       else NewZoom := Factor.Y;
@@ -342 +343 @@
   if Button = mbLeft then begin
     if Assigned(Core.CurrentClient) then begin
-      StartMousePoint := Point(X, Y);
-      StartViewPoint := Core.CurrentClient.View.SourceRect.TopLeft;
+      StartMousePoint := TPoint.Create(X, Y);
+      StartViewPoint := Core.CurrentClient.View.SourceRect.P1;
       MoveActive := True;
     end;
@@ -366 +367 @@
     (Abs(StartMousePoint.Y - Y) > Trunc(Screen.PixelsPerInch * MouseMinDiff)) then
     with Core.Game.CurrentPlayer, Core.CurrentClient do begin
-      View.SourceRect := Bounds(Trunc(StartViewPoint.X + (StartMousePoint.X - X) / View.Zoom),
-        Trunc(StartViewPoint.Y + (StartMousePoint.Y - Y) / View.Zoom),
-        View.SourceRect.Right - View.SourceRect.Left,
-        View.SourceRect.Bottom - View.SourceRect.Top);
+      View.SourceRect := TRect.CreateBounds(TPoint.Create(Trunc(StartViewPoint.X + (StartMousePoint.X - X) / View.Zoom),
+        Trunc(StartViewPoint.Y + (StartMousePoint.Y - Y) / View.Zoom)),
+        View.SourceRect.Size);
       Redraw;
     end;
@@ -375 +375 @@
     OldCell := Core.CurrentClient.View.FocusedCell;
     with Core.Game do
-      Cell := Map.PosToCell(Core.CurrentClient.View.CanvasToCellPos(Point(X, Y)), Core.CurrentClient.View );
+      Cell := Map.PosToCell(Core.CurrentClient.View.CanvasToCellPos(TPoint.Create(X, Y)), Core.CurrentClient.View );
     if Assigned(Cell) then begin
       Core.CurrentClient.View.FocusedCell := Cell;
@@ -384 +384 @@
       StatusBar1.Panels[0].Text := '';
     end;
-    CellPos := Core.CurrentClient.View.CanvasToCellPos(Point(X, Y));
+    CellPos := Core.CurrentClient.View.CanvasToCellPos(TPoint.Create(X, Y));
     StatusBar1.Panels[2].Text := 'CellPos: ' + IntToStr(CellPos.X) + ', ' + IntToStr(CellPos.Y);
     if Cell <> OldCell then Redraw;
@@ -396 +396 @@
   (Abs(StartMousePoint.Y - Y) < Trunc(Screen.PixelsPerInch * MouseMinDiff)) then begin
     if Core.Game.Running and (Core.Game.CurrentPlayer.Mode = pmHuman) then begin
-      Core.CurrentClient.View.SelectCell(Point(X, Y), Core.Game.CurrentPlayer, Shift);
+      Core.CurrentClient.View.SelectCell(TPoint.Create(X, Y), Core.Game.CurrentPlayer, Shift);
       Redraw;
     end;

trunk/Forms/UFormNew.pas

@@ -7 +7 @@
 uses
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls,
-  ComCtrls, Spin, ExtCtrls, ActnList, ExtDlgs, Menus, UGame;
+  ComCtrls, Spin, ExtCtrls, ActnList, ExtDlgs, Menus, UGame, UGeometry;
 
 type
@@ -363 +363 @@
   Game.CityEnabled := CheckBoxCity.Checked;
   Game.CityPercentage := SpinEditCityPercent.Value;
-  Game.Map.Size := Point(SpinEditMapSizeX.Value, SpinEditMapSizeY.Value);
+  Game.Map.Size := TPoint.Create(SpinEditMapSizeX.Value, SpinEditMapSizeY.Value);
   Game.GrowAmount := TGrowAmount(RadioGroupGrowAmount.ItemIndex);
   Game.GrowCells := TGrowCells(RadioGroupGrowCells.ItemIndex);