Changeset 128

Timestamp:

May 1, 2023, 11:21:30 AM (19 months ago)

Author:

chronos

Message:

• Added: Ability to save and load a game.

Location:

trunk

Files:

• Languages/TransLines.cs.po (modified) (3 diffs)
• Languages/TransLines.de.po (modified) (3 diffs)
• Languages/TransLines.fr.po (modified) (3 diffs)
• Languages/TransLines.pot (modified) (3 diffs)
• Packages/Common/UXMLUtils.pas (modified) (3 diffs)
• TransLines.lpi (modified) (2 diffs)
• TransLines.lpr (modified) (1 diff)
• UEngine.pas (modified) (52 diffs)
• UItems.pas (added)
• UMetroPassenger.pas (modified) (3 diffs)
• UTrack.pas (modified) (14 diffs)
• UView.pas (modified) (5 diffs)

trunk/Languages/TransLines.cs.po

@@ -157 +157 @@
 msgstr "Lineární"
 
+#: uengine.sload
+msgid "Load"
+msgstr "Načíst"
+
 #: uengine.slondon
 msgid "London"
@@ -217 +221 @@
 msgstr "Řím"
 
+#: uengine.ssave
+msgid "Save"
+msgstr "Uložit"
+
 #: uengine.sseoul
 msgid "Seoul"
@@ -311 +319 @@
 msgstr "St"
 
+#: uitems.sreferencenotfound
+#, object-pascal-format
+msgid "Reference %s to class %s not found."
+msgstr "Reference %s na třídu %s nenalezena."
+
 #: utrack.salreadyconnectedtrackpoint
 msgctxt "utrack.salreadyconnectedtrackpoint"

trunk/Languages/TransLines.de.po

@@ -161 +161 @@
 msgstr ""
 
+#: uengine.sload
+msgid "Load"
+msgstr ""
+
 #: uengine.slondon
 msgid "London"
@@ -221 +225 @@
 msgstr ""
 
+#: uengine.ssave
+msgid "Save"
+msgstr ""
+
 #: uengine.sseoul
 msgid "Seoul"
@@ -313 +321 @@
 #: uformmain.swednesdayshort
 msgid "WED"
+msgstr ""
+
+#: uitems.sreferencenotfound
+#, object-pascal-format
+msgid "Reference %s to class %s not found."
 msgstr ""
 

trunk/Languages/TransLines.fr.po

@@ -162 +162 @@
 msgstr ""
 
+#: uengine.sload
+msgid "Load"
+msgstr ""
+
 #: uengine.slondon
 msgid "London"
@@ -222 +226 @@
 msgstr "Rome"
 
+#: uengine.ssave
+msgid "Save"
+msgstr ""
+
 #: uengine.sseoul
 msgid "Seoul"
@@ -315 +323 @@
 msgid "WED"
 msgstr "MER"
+
+#: uitems.sreferencenotfound
+#, object-pascal-format
+msgid "Reference %s to class %s not found."
+msgstr ""
 
 #: utrack.salreadyconnectedtrackpoint

trunk/Languages/TransLines.pot

@@ -147 +147 @@
 msgstr ""
 
+#: uengine.sload
+msgid "Load"
+msgstr ""
+
 #: uengine.slondon
 msgid "London"
@@ -207 +211 @@
 msgstr ""
 
+#: uengine.ssave
+msgid "Save"
+msgstr ""
+
 #: uengine.sseoul
 msgid "Seoul"
@@ -301 +309 @@
 msgstr ""
 
+#: uitems.sreferencenotfound
+#, object-pascal-format
+msgid "Reference %s to class %s not found."
+msgstr ""
+
 #: utrack.salreadyconnectedtrackpoint
 msgctxt "utrack.salreadyconnectedtrackpoint"

trunk/Packages/Common/UXMLUtils.pas

@@ -14 +14 @@
 procedure WriteString(Node: TDOMNode; Name: string; Value: string);
 procedure WriteDateTime(Node: TDOMNode; Name: string; Value: TDateTime);
+procedure WriteDouble(Node: TDOMNode; Name: string; Value: Double);
 function ReadInteger(Node: TDOMNode; Name: string; DefaultValue: Integer): Integer;
 function ReadInt64(Node: TDOMNode; Name: string; DefaultValue: Int64): Int64;
@@ -19 +20 @@
 function ReadString(Node: TDOMNode; Name: string; DefaultValue: string): string;
 function ReadDateTime(Node: TDOMNode; Name: string; DefaultValue: TDateTime): TDateTime;
+function ReadDouble(Node: TDOMNode; Name: string; DefaultValue: Double): Double;
 procedure ReadXMLFileParser(out Doc: TXMLDocument; FileName: string);
 
 
 implementation
+
+function ReadDouble(Node: TDOMNode; Name: string; DefaultValue: Double): Double;
+var
+  NewNode: TDOMNode;
+begin
+  Result := DefaultValue;
+  NewNode := Node.FindNode(DOMString(Name));
+  if Assigned(NewNode) then
+    Result := StrToFloat(string(NewNode.TextContent));
+end;
 
 procedure ReadXMLFileParser(out Doc: TXMLDocument; FileName: string);
@@ -200 +212 @@
 end;
 
+procedure WriteDouble(Node: TDOMNode; Name: string; Value: Double);
+var
+  NewNode: TDOMNode;
+begin
+  NewNode := Node.OwnerDocument.CreateElement(DOMString(Name));
+  NewNode.TextContent := DOMString(FloatToStr(Value));
+  Node.AppendChild(NewNode);
+end;
+
 function ReadInteger(Node: TDOMNode; Name: string; DefaultValue: Integer): Integer;
 var

trunk/TransLines.lpi

@@ -89 +89 @@
       </Item2>
     </RequiredPackages>
-    <Units Count="16">
+    <Units Count="17">
       <Unit0>
         <Filename Value="TransLines.lpr"/>
@@ -169 +169 @@
         <IsPartOfProject Value="True"/>
       </Unit15>
+      <Unit16>
+        <Filename Value="UItems.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit16>
     </Units>
   </ProjectOptions>

trunk/TransLines.lpr

@@ -10 +10 @@
   Forms, SysUtils, UFormMain, UFormImages, UFormTestCase, UFormTest, Common,
   UMenu, UControls, UMetroPassenger, UColors, UView, URiver, UCity, UCore,
-  UTestCases;
+  UTestCases, UItems;
 
 {$R *.res}

trunk/UEngine.pas

@@ -10 +10 @@
   URegistry, UMetaCanvas, Generics.Collections, Generics.Defaults, UMenu,
   UControls, UMetroPassenger, UColors, UView, URiver, UTrack, UCity, UGeometric,
-  UTranslator, DOM, XMLRead, XMLWrite, UXMLUtils;
+  UTranslator, DOM, XMLRead, XMLWrite, UXMLUtils, UItems;
 
 type
@@ -24 +24 @@
   { TMapStation }
 
-  TMapStation = class
+  TMapStation = class(TItem)
   private
     procedure ShiftTrackPoints;
@@ -39 +39 @@
     function GetMaxPassengers: Integer;
     function IsBestStationForShape(DestinationIndex: TDestinationIndex; Check, Current: TLineStation): Boolean;
-    procedure LoadFromXmlNode(Node: TDOMNode);
-    procedure SaveToXmlNode(Node: TDOMNode);
+    class function GetClassSysName: string; override;
+    procedure LoadFromXmlNode(Node: TDOMNode); override;
+    procedure SaveToXmlNode(Node: TDOMNode); override;
     constructor Create;
     destructor Destroy; override;
@@ -47 +48 @@
   { TMapStations }
 
-  TMapStations = class(TObjectList<TMapStation>)
+  TMapStations = class(TItems<TMapStation>)
     Engine: TEngine;
+    function CreateItem: TMapStation; override;
     function GetRect: TRect;
     function AddNew: TMapStation;
-    procedure LoadFromXmlNode(Node: TDOMNode);
-    procedure SaveToXmlNode(Node: TDOMNode);
+    class function GetClassSysName: string; override;
   end;
 
   { TLineStation }
 
-  TLineStation = class
+  TLineStation = class(TItem)
     Line: TMetroLine;
     MapStation: TMapStation;
     TrackPoint: TTrackPoint;
+    class function GetClassSysName: string; override;
+    procedure LoadFromXmlNode(Node: TDOMNode); override;
+    procedure SaveToXmlNode(Node: TDOMNode); override;
   end;
 
   { TLineStations }
 
-  TLineStations = class(TObjectList<TLineStation>)
+  TLineStations = class(TItems<TLineStation>)
     Line: TMetroLine;
+    function CreateItem: TLineStation; override;
     function SearchMapStation(Station: TMapStation): TLineStation;
+    class function GetClassSysName: string; override;
   end;
 
   { TMetroLine }
 
-  TMetroLine = class
+  TMetroLine = class(TItem)
   private
     procedure UpdateEndingLine(EndIndex, Direction: Integer);
     procedure UpdateEndingLines;
   public
-    Id: Integer;
     Index: Integer;
     Engine: TEngine;
@@ -89 +94 @@
     destructor Destroy; override;
     function IsCircular: Boolean;
-    procedure LoadFromXmlNode(Node: TDOMNode);
-    procedure SaveToXmlNode(Node: TDOMNode);
+    class function GetClassSysName: string; override;
+    procedure LoadFromXmlNode(Node: TDOMNode); override;
+    procedure SaveToXmlNode(Node: TDOMNode); override;
   end;
 
   { TMetroLines }
 
-  TMetroLines = class(TObjectList<TMetroLine>)
+  TMetroLines = class(TItems<TMetroLine>)
     Engine: TEngine;
+    function CreateItem: TMetroLine; override;
     function AddNew(Color: TColor): TMetroLine;
-    function FindById(Id: Integer): TMetroLine;
     function SearchByColor(Color: TColor): TMetroLine;
-    procedure LoadFromXmlNode(Node: TDOMNode);
-    procedure SaveToXmlNode(Node: TDOMNode);
+    class function GetClassSysName: string; override;
   end;
 
   { TMetroCarriage }
 
-  TMetroCarriage = class
+  TMetroCarriage = class(TItem)
     Train: TMetroTrain;
     Passengers: TMetroPassengers;
@@ -113 +118 @@
     constructor Create;
     destructor Destroy; override;
+    class function GetClassSysName: string; override;
+    procedure LoadFromXmlNode(Node: TDOMNode); override;
+    procedure SaveToXmlNode(Node: TDOMNode); override;
   end;
 
   { TMetroCarriages }
 
-  TMetroCarriages = class(TObjectList<TMetroCarriage>)
+  TMetroCarriages = class(TItems<TMetroCarriage>)
     function GetUnused: TMetroCarriage;
     function GetUnusedCount: Integer;
-    function AddNew: TMetroCarriage;
+    class function GetClassSysName: string; override;
   end;
 
   { TMetroTrain }
 
-  TMetroTrain = class
+  TMetroTrain = class(TItem)
   private
     FLine: TMetroLine;
@@ -140 +148 @@
     TargetStation: TLineStation;
     Carriages: TMetroCarriages;
-    procedure LoadFromXmlNode(Node: TDOMNode);
-    procedure SaveToXmlNode(Node: TDOMNode);
+    class function GetClassSysName: string; override;
+    procedure LoadFromXmlNode(Node: TDOMNode); override;
+    procedure SaveToXmlNode(Node: TDOMNode); override;
     procedure FindTargetStation;
     function GetTargetStationDistance: Integer;
@@ -151 +160 @@
   { TMetroTrains }
 
-  TMetroTrains = class(TObjectList<TMetroTrain>)
+  TMetroTrains = class(TItems<TMetroTrain>)
+    Engine: TEngine;
     function GetUnused: TMetroTrain;
     function GetUnusedCount: Integer;
-    function AddNew: TMetroTrain;
-    procedure LoadFromXmlNode(Node: TDOMNode);
-    procedure SaveToXmlNode(Node: TDOMNode);
+    function CreateItem: TMetroTrain; override;
+    class function GetClassSysName: string; override;
   end;
 
@@ -228 +237 @@
     GrabbedTrainDirection: Integer;
     LastGrabbedTrain: TMetroTrain;
+    SavedGameFileName: string;
     function GetMetroLineThickness: Integer;
     function GetServedDaysCount: Integer;
@@ -274 +284 @@
     procedure MenuItemGameExit(Sender: TObject);
     procedure MenuItemGameRestart(Sender: TObject);
+    procedure MenuItemGameLoad(Sender: TObject);
+    procedure MenuItemGameSave(Sender: TObject);
     procedure MenuItemBack(Sender: TObject);
     procedure ButtonPlay(Sender: TObject);
@@ -350 +362 @@
     procedure LoadFromRegistry;
     procedure SaveToRegistry;
+    procedure LoadFromXmlNode(Node: TDOMNode);
+    procedure SaveToXmlNode(Node: TDOMNode);
     procedure LoadFromFile(FileName: string);
     procedure SaveToFile(FileName: string);
@@ -399 +413 @@
   NewPassengerProbability = 0.003;
   VisiblePassengersPerLine = 6;
+  TransLinesExt = '.tlg';
 
 
@@ -421 +436 @@
   STrain = 'Train';
   SPlay = 'Play';
+  SLoad = 'Load';
+  SSave = 'Save';
   SCustomGame = 'Custom game';
   SOptions = 'Options';
@@ -468 +485 @@
   VisualStyleText: array[TVisualStyle] of string = (SLondon, SPrague);
 
+const
+  GameXmlName = 'TransLinesGame';
+
+{ TLineStation }
+
+class function TLineStation.GetClassSysName: string;
+begin
+  Result := 'LineStation';
+end;
+
+procedure TLineStation.LoadFromXmlNode(Node: TDOMNode);
+begin
+  inherited;
+  MapStation := Line.Engine.Stations.FindById(ReadInteger(Node, 'MapStation', 0));
+  TrackPoint := Line.Track.Points.FindById(ReadInteger(Node, 'TrackPoint', 0));
+  TrackPoint.OwnerPoint := Self;
+end;
+
+procedure TLineStation.SaveToXmlNode(Node: TDOMNode);
+begin
+  inherited;
+  WriteInteger(Node, 'MapStation', MapStation.Id);
+  WriteInteger(Node, 'TrackPoint', TrackPoint.Id);
+end;
+
 { TClock }
 
@@ -538 +580 @@
 end;
 
+class function TMetroCarriage.GetClassSysName: string;
+begin
+  Result := 'Carriage';
+end;
+
+procedure TMetroCarriage.LoadFromXmlNode(Node: TDOMNode);
+var
+  Node2: TDOMNode;
+begin
+  inherited;
+
+  Node2 := Node.FindNode(DOMString(TMetroPassengers.GetClassSysName));
+  if Assigned(Node2) then
+    Passengers.LoadFromXmlNodeRef(Node2, Train.Engine.Passengers);
+end;
+
+procedure TMetroCarriage.SaveToXmlNode(Node: TDOMNode);
+var
+  NewNode: TDOMNode;
+begin
+  inherited;
+
+  NewNode := Node.OwnerDocument.CreateElement(DOMString(TMetroPassengers.GetClassSysName));
+  Node.AppendChild(NewNode);
+  Passengers.SaveToXmlNodeRef(NewNode);
+end;
+
 { TMetroCarriages }
 
@@ -559 +628 @@
 end;
 
-function TMetroCarriages.AddNew: TMetroCarriage;
-begin
-  Result := TMetroCarriage.Create;
-  Add(Result);
+class function TMetroCarriages.GetClassSysName: string;
+begin
+  Result := 'Carriages';
 end;
 
@@ -579 +647 @@
 
 { TLineStations }
+
+function TLineStations.CreateItem: TLineStation;
+begin
+  Result := inherited;
+  Result.Line := Line;
+end;
 
 function TLineStations.SearchMapStation(Station: TMapStation): TLineStation;
@@ -590 +664 @@
 end;
 
+class function TLineStations.GetClassSysName: string;
+begin
+  Result := 'LineStations';
+end;
+
 { TMetroTrains }
 
@@ -611 +690 @@
 end;
 
-function TMetroTrains.AddNew: TMetroTrain;
-begin
-  Result := TMetroTrain.Create;
-  Add(Result);
-end;
-
-procedure TMetroTrains.LoadFromXmlNode(Node: TDOMNode);
-var
-  Node2: TDOMNode;
-  NewItem: TMetroTrain;
-begin
-  Node2 := Node.FirstChild;
-  while Assigned(Node2) and (Node2.NodeName = 'Train') do begin
-    NewItem := TMetroTrain.Create;
-    NewItem.LoadFromXmlNode(Node2);
-    Add(NewItem);
-    Node2 := Node2.NextSibling;
-  end;
-end;
-
-procedure TMetroTrains.SaveToXmlNode(Node: TDOMNode);
-var
-  I: Integer;
-  NewNode: TDOMNode;
-begin
-  for I := 0 to Count - 1 do begin;
-    NewNode := Node.OwnerDocument.CreateElement('Train');
-    Node.AppendChild(NewNode);
-    Items[I].SaveToXmlNode(NewNode);
-  end;
+function TMetroTrains.CreateItem: TMetroTrain;
+begin
+  Result := inherited;
+  Result.Engine := Engine;
+end;
+
+class function TMetroTrains.GetClassSysName: string;
+begin
+  Result := 'Trains';
 end;
 
 { TMapStations }
+
+function TMapStations.CreateItem: TMapStation;
+begin
+  Result := inherited;
+  Result.Engine := Engine;
+end;
 
 function TMapStations.GetRect: TRect;
@@ -673 +737 @@
   Step = 20;
 begin
-  Result := TMapStation.Create;
-  Result.Engine := Engine;
+  Result := CreateItem;
   Angle := Random * 2 * Pi;
   // Ensure minimum distance between stations
@@ -696 +759 @@
 end;
 
-procedure TMapStations.LoadFromXmlNode(Node: TDOMNode);
-var
-  Node2: TDOMNode;
-  NewItem: TMapStation;
-begin
-  Node2 := Node.FirstChild;
-  while Assigned(Node2) and (Node2.NodeName = 'Line') do begin
-    NewItem := TMapStation.Create;
-    NewItem.LoadFromXmlNode(Node2);
-    Add(NewItem);
-    Node2 := Node2.NextSibling;
-  end;
-end;
-
-procedure TMapStations.SaveToXmlNode(Node: TDOMNode);
-var
-  I: Integer;
-  NewNode: TDOMNode;
-begin
-  for I := 0 to Count - 1 do begin;
-    NewNode := Node.OwnerDocument.CreateElement('Station');
-    Node.AppendChild(NewNode);
-    Items[I].SaveToXmlNode(NewNode);
-  end;
+class function TMapStations.GetClassSysName: string;
+begin
+  Result := 'MapStations';
 end;
 
 { TMetroLines }
 
+function TMetroLines.CreateItem: TMetroLine;
+begin
+  Result := inherited;
+  Result.Engine := Engine;
+end;
+
 function TMetroLines.AddNew(Color: TColor): TMetroLine;
 begin
-  Result := TMetroLine.Create;
-  Result.Engine := Engine;
+  Result := AddItem;
   Result.Index := Count;
   Result.Color := Color;
-  Add(Result);
-end;
-
-function TMetroLines.FindById(Id: Integer): TMetroLine;
-var
-  I: Integer;
-begin
-  I := 0;
-  while (I < Count) and (Items[I].Id <> Id) do Inc(I);
-  if I < Count then Result := Items[I]
-    else Result := nil;
 end;
 
@@ -753 +789 @@
 end;
 
-procedure TMetroLines.LoadFromXmlNode(Node: TDOMNode);
-var
-  Node2: TDOMNode;
-  NewItem: TMetroLine;
-begin
-  Node2 := Node.FirstChild;
-  while Assigned(Node2) and (Node2.NodeName = 'Line') do begin
-    NewItem := TMetroLine.Create;
-    NewItem.LoadFromXmlNode(Node2);
-    Add(NewItem);
-    Node2 := Node2.NextSibling;
-  end;
-end;
-
-procedure TMetroLines.SaveToXmlNode(Node: TDOMNode);
-var
-  I: Integer;
-  NewNode: TDOMNode;
-begin
-  for I := 0 to Count - 1 do begin;
-    NewNode := Node.OwnerDocument.CreateElement('Line');
-    Node.AppendChild(NewNode);
-    Items[I].SaveToXmlNode(NewNode);
-  end;
+class function TMetroLines.GetClassSysName: string;
+begin
+  Result := 'Lines';
 end;
 
@@ -817 +832 @@
     Index := Track.Points.IndexOf(LineStations.First.TrackPoint);
     if Index = 0 then begin
-      NewTrackPoint := Track.Points.AddNew;
+      NewTrackPoint := Track.Points.CreateItem;
       Track.Points.Insert(0, NewTrackPoint);
     end;
     Index := Track.Points.IndexOf(LineStations.Last.TrackPoint);
     if Index = Track.Points.Count - 1 then begin
-      NewTrackPoint := Track.Points.AddNew;
+      NewTrackPoint := Track.Points.CreateItem;
       Track.Points.Insert(Track.Points.Count, NewTrackPoint);
     end;
@@ -850 +865 @@
   Station.Lines.Add(Self);
 
-  NewTrackPoint := Track.Points.AddNew;
+  NewTrackPoint := Track.Points.CreateItem;
   NewTrackPoint.OwnerPoint := NewLineStation;
   NewTrackPoint.Position := Station.Position;
@@ -955 +970 @@
   LineStations := TLineStations.Create;
   LineStations.OwnsObjects := True;
+  LineStations.Line := Self;
   Trains := TMetroTrains.Create;
   Trains.OwnsObjects := False;
@@ -976 +992 @@
 end;
 
+class function TMetroLine.GetClassSysName: string;
+begin
+  Result := 'Line';
+end;
+
 procedure TMetroLine.LoadFromXmlNode(Node: TDOMNode);
 var
   Node2: TDOMNode;
 begin
-  Id := ReadInteger(Node, 'Id', Id);
+  inherited;
   Color := TColor(ReadInteger(Node, 'Color', Color));
-
-  Node2 := Node.FindNode('Track');
+  Index := TColor(ReadInteger(Node, 'Index', Index));
+
+  Node2 := Node.FindNode(DOMString(TTrack.GetClassSysName));
   if Assigned(Node2) then
     Track.LoadFromXmlNode(Node2);
+
+  Node2 := Node.FindNode(DOMString(TLineStations.GetClassSysName));
+  if Assigned(Node2) then
+    LineStations.LoadFromXmlNode(Node2);
 end;
 
@@ -992 +1018 @@
   Node2: TDOMNode;
 begin
-  WriteInteger(Node, 'Id', Id);
+  inherited;
   WriteInteger(Node, 'Color', Color);
-
-  Node2 := Node.OwnerDocument.CreateElement('Track');
+  WriteInteger(Node, 'Index', Index);
+
+  LineStations.RebuildItemsId;
+
+  Node2 := Node.OwnerDocument.CreateElement(DOMString(TTrack.GetClassSysName));
   Node.AppendChild(Node2);
   Track.SaveToXmlNode(Node2);
+
+  Node2 := Node.OwnerDocument.CreateElement(DOMString(TLineStations.GetClassSysName));
+  Node.AppendChild(Node2);
+  LineStations.SaveToXmlNode(Node2);
 end;
 
@@ -1013 +1046 @@
 end;
 
+class function TMetroTrain.GetClassSysName: string;
+begin
+  Result := 'Train';
+end;
+
 procedure TMetroTrain.LoadFromXmlNode(Node: TDOMNode);
-begin
+var
+  Node2: TDOMNode;
+begin
+  inherited;
   Line := Engine.Lines.FindById(ReadInteger(Node, 'Line', 0));
+  Direction := ReadInteger(Node, 'Direction', Direction);
+  if Assigned(Line) then begin
+    Line.Trains.Add(Self);
+    TargetStation := Line.LineStations.FindById(ReadInteger(Node, 'TargetStation', 0));
+    TrackPosition.LoadFromXmlNode(Node, Line.Track.Points);
+  end;
+
+  Node2 := Node.FindNode(DOMString(TMetroPassengers.GetClassSysName));
+  if Assigned(Node2) then
+    Passengers.LoadFromXmlNodeRef(Node2, Engine.Passengers);
+
+  Node2 := Node.FindNode(DOMString(TMetroCarriages.GetClassSysName));
+  if Assigned(Node2) then
+    Carriages.LoadFromXmlNodeRef(Node2, Engine.Carriages);
 end;
 
 procedure TMetroTrain.SaveToXmlNode(Node: TDOMNode);
-begin
+var
+  NewNode: TDOMNode;
+begin
+  inherited;
   if Assigned(Line) then WriteInteger(Node, 'Line', Line.Id)
     else WriteInteger(Node, 'Line', 0);
+  WriteInteger(Node, 'Direction', Direction);
+  if Assigned(TargetStation) then WriteInteger(Node, 'TargetStation', TargetStation.Id)
+    else WriteInteger(Node, 'TargetStation', 0);
+  TrackPosition.SaveToXmlNode(Node);
+
+  NewNode := Node.OwnerDocument.CreateElement(DOMString(TMetroPassengers.GetClassSysName));
+  Node.AppendChild(NewNode);
+  Passengers.SaveToXmlNodeRef(NewNode);
+
+  NewNode := Node.OwnerDocument.CreateElement(DOMString(TMetroCarriages.GetClassSysName));
+  Node.AppendChild(NewNode);
+  Carriages.SaveToXmlNodeRef(NewNode);
 end;
 
@@ -1258 +1328 @@
 end;
 
+class function TMapStation.GetClassSysName: string;
+begin
+  Result := 'MapStation';
+end;
+
 procedure TMapStation.LoadFromXmlNode(Node: TDOMNode);
-begin
+var
+  Node2: TDOMNode;
+begin
+  inherited;
   Position.X := ReadInteger(Node, 'PositionX', Position.X);
   Position.Y := ReadInteger(Node, 'PositionY', Position.Y);
   DestinationIndex := ReadInteger(Node, 'DestinationIndex', Integer(DestinationIndex));
   IsTerminal := ReadBoolean(Node, 'IsTerminal', IsTerminal);
+
+  Node2 := Node.FindNode(DOMString(TMetroPassengers.GetClassSysName));
+  if Assigned(Node2) then
+    Passengers.LoadFromXmlNodeRef(Node2, Engine.Passengers);
 end;
 
 procedure TMapStation.SaveToXmlNode(Node: TDOMNode);
-begin
+var
+  NewNode: TDOMNode;
+begin
+  inherited;
   WriteInteger(Node, 'PositionX', Position.X);
   WriteInteger(Node, 'PositionY', Position.Y);
   WriteInteger(Node, 'DestinationIndex', DestinationIndex);
   WriteBoolean(Node, 'IsTerminal', IsTerminal);
+
+  NewNode := Node.OwnerDocument.CreateElement(DOMString(TMetroPassengers.GetClassSysName));
+  Node.AppendChild(NewNode);
+  Passengers.SaveToXmlNodeRef(NewNode);
 end;
 
@@ -1585 +1674 @@
   Station: TMapStation;
 begin
-  // NewGame all distances
+  // Reset all distances
   for Station in Stations do
   with Station do begin
@@ -1855 +1944 @@
   MapStation: TMapStation;
 begin
-  // NewGame all trackpoints position shift
+  // Reset all trackpoints position shift
   for MetroLine in Lines do
     for TrackPoint in MetroLine.Track.Points do
@@ -1866 +1955 @@
   // Compute track points from track shift
   for MetroLine in Lines do
-  with MetroLine do begin
+  with MetroLine, Track do begin
     // Update start
-    if Track.Points.Count > 1 then begin
-      Track.Points[0].Position := Track.Points[0].PositionDesigned +
-        Track.Points[0].LinkUp.Shift;
-    end;
-
-    for I := 1 to Track.Points.Count - 1 do
-    with Track.Points[I] do
-    if Assigned(Track.Points[I].LinkDown) and Assigned(Track.Points[I].LinkUp) then begin
+    if Points.Count > 1 then begin
+      if not Assigned(Points[0].LinkUp) then Points[0].GetLinkUp;
+      Points[0].Position := Points[0].PositionDesigned + Points[0].LinkUp.Shift;
+    end;
+
+    for I := 1 to Points.Count - 1 do
+    with TTrackPoint(Points[I]) do
+    if Assigned(Points[I].LinkDown) and Assigned(Points[I].LinkUp) then begin
       {
       Link1 := (Track.Points[I].PositionDesigned + Track.Points[I].LinkDown.Shift) -
@@ -1890 +1979 @@
       end else begin}
         // Intersected lines
-        if LineIntersect(Track.Points[I - 1].PositionDesigned + Track.Points[I].LinkDown.Shift,
-          Track.Points[I].PositionDesigned + Track.Points[I].LinkDown.Shift,
-          Track.Points[I].PositionDesigned + Track.Points[I].LinkUp.Shift,
-          Track.Points[I + 1].PositionDesigned + Track.Points[I].LinkUp.Shift, NewPoint) then begin
-            Track.Points[I].Position := NewPoint;
+        if LineIntersect(Points[I - 1].PositionDesigned + Points[I].LinkDown.Shift,
+          Points[I].PositionDesigned + Points[I].LinkDown.Shift,
+          Points[I].PositionDesigned + Points[I].LinkUp.Shift,
+          Points[I + 1].PositionDesigned + Points[I].LinkUp.Shift, NewPoint) then begin
+            Points[I].Position := NewPoint;
           end else begin
             // Parallel lines
-            NewPoint := Track.Points[I].PositionDesigned + Track.Points[I].LinkDown.Shift;
-            Track.Points[I].Position := NewPoint;
+            NewPoint := Points[I].PositionDesigned + Points[I].LinkDown.Shift;
+            Points[I].Position := NewPoint;
           end;
 //      end;
 
       // Update ending
-      if Track.Points.Count > 1 then begin
-        Track.Points[Track.Points.Count - 1].Position := Track.Points[Track.Points.Count - 1].PositionDesigned -
-          Track.Points[Track.Points.Count - 1].LinkDown.Shift;
+      if Points.Count > 1 then begin
+        if not Assigned(Points[Points.Count - 1].LinkDown) then
+          Points[Points.Count - 1].GetLinkDown;
+        Points[Points.Count - 1].Position := Points[Points.Count - 1].PositionDesigned -
+          Points[Points.Count - 1].LinkDown.Shift;
       end;
     end;
 
     // Update ending
-    if Track.Points.Count > 1 then begin
-      Track.Points[Track.Points.Count - 1].Position := Track.Points[Track.Points.Count - 1].PositionDesigned -
-        Track.Points[Track.Points.Count - 1].LinkDown.Shift;
+    if Points.Count > 1 then begin
+      if not Assigned(Points[Points.Count - 1].LinkDown) then
+        Points[Points.Count - 1].GetLinkDown;
+      Points[Points.Count - 1].Position := Points[Points.Count - 1].PositionDesigned -
+        Points[Points.Count - 1].LinkDown.Shift;
     end;
   end;
@@ -1918 +2011 @@
   // Remove all temporal links
   for MetroLine in Lines do
-  with MetroLine do begin
-    for J := 0 to Track.Points.Count - 1 do
-    if Assigned(Track.Points[J].LinkUp) then begin
-      Track.Points[J].LinkUp.Free;
-      Track.Points[J].LinkUp := nil;
-      Track.Points[J + 1].LinkDown := nil;
+  with MetroLine, Track do begin
+    for J := 0 to Points.Count - 1 do
+    if Assigned(Points[J].LinkUp) then begin
+      Points[J].LinkUp.Free;
+      Points[J].LinkUp := nil;
+      Points[J + 1].LinkDown := nil;
     end;
   end;
@@ -2059 +2152 @@
 
 procedure TEngine.MenuItemCustomGame(Sender: TObject);
-var
-  VisualStyleIndex: TVisualStyle;
-  StationStyleIndex: TStationStyle;
 begin
   MenuCustomGame.Parent := MenuMain;
@@ -2127 +2217 @@
   Index: Integer;
 begin
-  Trains.AddNew;
+  Trains.AddItem;
   State := gsNewImprovement;
   if Lines.Count <= (High(LineColors) - Low(LineColors)) then
@@ -2196 +2286 @@
 end;
 
+procedure TEngine.MenuItemGameLoad(Sender: TObject);
+begin
+  LoadFromFile(SavedGameFileName);
+  State := gsRunning;
+end;
+
+procedure TEngine.MenuItemGameSave(Sender: TObject);
+begin
+  SaveToFile(SavedGameFileName);
+  State := LastState;
+end;
+
 procedure TEngine.DarkModeChanged(Sender: TObject);
 begin
@@ -2321 +2423 @@
   case Improvement of
     miLine: Lines.AddNew(LineColors[Lines.Count]);
-    miCarriage: Carriages.AddNew;
+    miCarriage: Carriages.AddItem;
     //miTunnel: Tunnels.AddNew;
     miTerminal: Inc(AvailableTerminals);
@@ -2368 +2470 @@
       BackgroundSelectedColor := Colors.MenuItemBackgroundSelected;
     end;
+    with AddButton(SLoad, MenuItemGameLoad) do begin
+      Enabled := FileExists(SavedGameFileName);
+      TextSize := 40;
+      TextColor := Colors.MenuItemText;
+      TextDisabledColor := Colors.MenuItemDisabledText;
+      BackgroundColor := Colors.MenuItemBackground;
+      BackgroundSelectedColor := Colors.MenuItemBackgroundSelected;
+    end;
     {
     with AddButton(SCustomGame, MenuItemCustomGame) do begin
@@ -2411 +2521 @@
     end;
     with AddButton(SRestart, MenuItemGameRestart) do begin
+      TextSize := 40;
+      TextColor := Colors.MenuItemText;
+      TextDisabledColor := Colors.MenuItemDisabledText;
+      BackgroundColor := Colors.MenuItemBackground;
+      BackgroundSelectedColor := Colors.MenuItemBackgroundSelected;
+    end;
+    with AddButton(SLoad, MenuItemGameLoad) do begin
+      Enabled := FileExists(SavedGameFileName);
+      TextSize := 40;
+      TextColor := Colors.MenuItemText;
+      TextDisabledColor := Colors.MenuItemDisabledText;
+      BackgroundColor := Colors.MenuItemBackground;
+      BackgroundSelectedColor := Colors.MenuItemBackgroundSelected;
+    end;
+    with AddButton(SSave, MenuItemGameSave) do begin
       TextSize := 40;
       TextColor := Colors.MenuItemText;
@@ -3304 +3429 @@
       with MapStation do
       if Random < NewPassengerProbability then begin
-        Passenger := Self.Passengers.AddNew;
+        Passenger := Self.Passengers.AddItem;
         Passenger.DestinationIndex := Random(DestinationCount);
         Passengers.Add(Passenger);
@@ -3538 +3663 @@
   Station: TMapStation;
   NewLine: TMetroLine;
-  Track: TTrackLink;
+  TrackLink: TTrackLink;
   NewIndex: Integer;
   Intersection: TPoint;
@@ -3581 +3706 @@
       end;
 
-      // New track creation from selected station as start
+      // New TrackLink creation from selected station as start
       Station := GetStationOnPos(View.PointDestToSrc(Position));
       if Assigned(Station) then begin
@@ -3596 +3721 @@
 
       // Line selection
-      Track := GetTrackOnPos(View.PointDestToSrc(Position), Intersection);
-      if Assigned(Track) and Assigned(Track.Points[0]) and Assigned(Track.Points[1]) then begin
-        SelectedLine := TMetroLine(Track.Points[0].Track.Owner);
-
-        TrackStationDown := Track.Points[0];
+      TrackLink := GetTrackOnPos(View.PointDestToSrc(Position), Intersection);
+      if Assigned(TrackLink) and Assigned(TrackLink.Points[0]) and Assigned(TrackLink.Points[1]) then begin
+        SelectedLine := TMetroLine(TrackLink.Points[0].Track.Owner);
+
+        TrackStationDown := TrackLink.Points[0];
         NewIndex := TrackStationDown.Track.Points.IndexOf(TrackStationDown);
         while Assigned(TrackStationDown) and (not Assigned(TrackStationDown.OwnerPoint)) do begin
@@ -3607 +3732 @@
             else TrackStationDown := nil;
         end;
-        TrackStationUp := Track.Points[1];
+        TrackStationUp := TrackLink.Points[1];
         NewIndex := TrackStationUp.Track.Points.IndexOf(TrackStationDown);
         while Assigned(TrackStationUp) and (not Assigned(TrackStationUp.OwnerPoint)) do begin
@@ -3622 +3747 @@
         end;
 
-        Track.Free;
+        TrackLink.Free;
         Exit;
       end;
-      if Assigned(Track) then Track.Free;
+      if Assigned(TrackLink) then TrackLink.Free;
     end;
   end;
@@ -3682 +3807 @@
     end;
     if Key = KeyF3 then begin
-      Trains.AddNew;
+      Trains.AddItem;
       Redraw;
     end;
     if Key = KeyF4 then begin
-      Carriages.AddNew;
+      Carriages.AddItem;
       Redraw;
     end;
@@ -3822 +3947 @@
 end;
 
+procedure TEngine.LoadFromXmlNode(Node: TDOMNode);
+var
+  NewNode: TDOMNode;
+  Node2: TDOMNode;
+begin
+  Clear;
+  ServedPassengerCount := ReadInteger(Node, 'ServedPassengerCount', ServedPassengerCount);
+  DestinationCount := ReadInteger(Node, 'DestinationCount', DestinationCount);
+  State := TGameState(ReadInteger(Node, 'State', Integer(gsNotStarted)));
+  FTime := ReadDateTime(Node, 'Time', 0);
+  FLastTime := FTime;
+
+  NewNode := Node.FindNode(DOMString(TView.GetClassSysName));
+  if Assigned(NewNode) then
+    View.LoadFromXmlNode(NewNode);
+
+  SetLength(LineColors, 0);
+  NewNode := Node.FindNode('LineColors');
+  if Assigned(NewNode) then begin
+    Node2 := NewNode.FirstChild;
+    while Assigned(Node2) and (Node2.NodeName = 'LineColor') do begin
+      SetLength(LineColors, Length(LineColors) + 1);
+      LineColors[Length(LineColors) - 1] := TColor(StrToInt(string(Node2.TextContent)));
+      Node2 := Node2.NextSibling;
+    end;
+  end;
+
+  NewNode := Node.FindNode(DOMString(TMetroPassengers.GetClassSysName));
+  if Assigned(NewNode) then
+    Passengers.LoadFromXmlNode(NewNode);
+
+  NewNode := Node.FindNode(DOMString(TMapStations.GetClassSysName));
+  if Assigned(NewNode) then
+    Stations.LoadFromXmlNode(NewNode);
+
+  NewNode := Node.FindNode(DOMString(TMetroLines.GetClassSysName));
+  if Assigned(NewNode) then
+    Lines.LoadFromXmlNode(NewNode);
+
+  NewNode := Node.FindNode(DOMString(TMetroTrains.GetClassSysName));
+  if Assigned(NewNode) then
+    Trains.LoadFromXmlNode(NewNode);
+
+  NewNode := Node.FindNode(DOMString(TMetroCarriages.GetClassSysName));
+  if Assigned(NewNode) then
+    Carriages.LoadFromXmlNode(NewNode);
+end;
+
+procedure TEngine.SaveToXmlNode(Node: TDOMNode);
+var
+  I: Integer;
+  NewNode: TDOMNode;
+begin
+  Lines.RebuildItemsId;
+  Stations.RebuildItemsId;
+  Passengers.RebuildItemsId;
+
+  WriteInteger(Node, 'ServedPassengerCount', ServedPassengerCount);
+  WriteInteger(Node, 'DestinationCount', DestinationCount);
+  WriteInteger(Node, 'State', Integer(State));
+  WriteDateTime(Node, 'Time', FTime);
+
+  NewNode := Node.OwnerDocument.CreateElement(DOMString(TView.GetClassSysName));
+  Node.AppendChild(NewNode);
+  View.SaveToXmlNode(NewNode);
+
+  NewNode := Node.OwnerDocument.CreateElement('LineColors');
+  Node.AppendChild(NewNode);
+  for I := 0 to Length(LineColors) - 1 do begin
+    WriteInteger(NewNode, 'LineColor', Integer(LineColors[I]));
+  end;
+
+  NewNode := Node.OwnerDocument.CreateElement(DOMString(TMetroPassengers.GetClassSysName));
+  Node.AppendChild(NewNode);
+  Passengers.SaveToXmlNode(NewNode);
+
+  NewNode := Node.OwnerDocument.CreateElement(DOMString(TMapStations.GetClassSysName));
+  Node.AppendChild(NewNode);
+  Stations.SaveToXmlNode(NewNode);
+
+  NewNode := Node.OwnerDocument.CreateElement(DOMString(TMetroLines.GetClassSysName));
+  Node.AppendChild(NewNode);
+  Lines.SaveToXmlNode(NewNode);
+
+  NewNode := Node.OwnerDocument.CreateElement(DOMString(TMetroTrains.GetClassSysName));
+  Node.AppendChild(NewNode);
+  Trains.SaveToXmlNode(NewNode);
+
+  NewNode := Node.OwnerDocument.CreateElement(DOMString(TMetroCarriages.GetClassSysName));
+  Node.AppendChild(NewNode);
+  Carriages.SaveToXmlNode(NewNode);
+end;
+
 procedure TEngine.LoadFromFile(FileName: string);
 var
-  NewNode: TDOMNode;
   Doc: TXMLDocument;
   RootNode: TDOMNode;
@@ -3831 +4048 @@
   Clear;
   with Doc do try
-    if (Doc.DocumentElement.NodeName <> 'BigMetroGame') and
-      (Doc.DocumentElement.NodeName <> 'TransLinesGame') then
+    if Doc.DocumentElement.NodeName <> GameXmlName then
       raise Exception.Create(SWrongFileFormat);
     RootNode := Doc.DocumentElement;
-    with RootNode do begin
-      ServedPassengerCount := ReadInteger(RootNode, 'ServedPassengerCount', ServedPassengerCount);
-
-      NewNode := FindNode('Stations');
-      Stations.LoadFromXmlNode(NewNode);
-
-      NewNode := FindNode('Lines');
-      Lines.LoadFromXmlNode(NewNode);
-
-      NewNode := FindNode('Trains');
-      Trains.LoadFromXmlNode(NewNode);
-    end;
+    LoadFromXmlNode(RootNode);
   finally
     FreeAndNil(Doc);
@@ -3854 +4059 @@
 procedure TEngine.SaveToFile(FileName: string);
 var
-  NewNode: TDOMNode;
   Doc: TXMLDocument;
   RootNode: TDOMNode;
-  I: Integer;
 begin
   Doc := TXMLDocument.Create;
   with Doc do try
-    RootNode := CreateElement('TransLinesGame');
+    RootNode := CreateElement(GameXmlName);
     AppendChild(RootNode);
-    with RootNode do begin
-      WriteInteger(RootNode, 'ServedPassengerCount', ServedPassengerCount);
-
-      for I := 0 to Lines.Count - 1 do
-        Lines[I].Id := I + 1;
-
-      NewNode := OwnerDocument.CreateElement('Stations');
-      AppendChild(NewNode);
-      Stations.SaveToXmlNode(NewNode);
-
-      NewNode := OwnerDocument.CreateElement('Lines');
-      AppendChild(NewNode);
-      Lines.SaveToXmlNode(NewNode);
-
-      NewNode := OwnerDocument.CreateElement('Trains');
-      AppendChild(NewNode);
-      Trains.SaveToXmlNode(NewNode);
-    end;
+    SaveToXmlNode(RootNode);
     if ExtractFileDir(FileName) <> '' then
       ForceDirectories(ExtractFileDir(FileName));
@@ -3892 +4078 @@
 begin
   inherited;
+  SavedGameFileName := GetAppConfigDir(False) + 'LastGameState' + TransLinesExt;
   MovableTracks := True;
   Colors := TColors.Create;
@@ -3918 +4105 @@
   View := TView.Create;
   Trains := TMetroTrains.Create;
+  Trains.Engine := Self;
   Carriages := TMetroCarriages.Create;
   ImageTunnel := TImage.Create;

trunk/UMetroPassenger.pas

@@ -4 +4 @@
 
 uses
-  Classes, SysUtils, Generics.Collections;
+  Classes, SysUtils, Generics.Collections, UItems, DOM, UXMLUtils;
 
 type
@@ -15 +15 @@
   { TMetroPassenger }
 
-  TMetroPassenger = class
+  TMetroPassenger = class(TItem)
     DestinationIndex: TDestinationIndex;
+    class function GetClassSysName: string; override;
+    procedure LoadFromXmlNode(Node: TDOMNode); override;
+    procedure SaveToXmlNode(Node: TDOMNode); override;
   end;
 
   { TMetroPassengers }
 
-  TMetroPassengers = class(TObjectList<TMetroPassenger>)
-    function AddNew: TMetroPassenger;
+  TMetroPassengers = class(TItems<TMetroPassenger>)
+    class function GetClassSysName: string; override;
   end;
 
@@ -30 +33 @@
 { TMetroPassengers }
 
-function TMetroPassengers.AddNew: TMetroPassenger;
+class function TMetroPassengers.GetClassSysName: string;
 begin
-  Result := TMetroPassenger.Create;
-  Add(Result);
+  Result := 'MetroPassengers';
+end;
+
+{ TMetroPassengers }
+
+class function TMetroPassenger.GetClassSysName: string;
+begin
+  Result := 'MetroPassenger';
+end;
+
+procedure TMetroPassenger.LoadFromXmlNode(Node: TDOMNode);
+begin
+  inherited;
+  DestinationIndex := ReadInteger(Node, 'DestinationIndex', DestinationIndex);
+end;
+
+procedure TMetroPassenger.SaveToXmlNode(Node: TDOMNode);
+begin
+  inherited;
+  WriteInteger(Node, 'DestinationIndex', DestinationIndex);
 end;
 

trunk/UTrack.pas

@@ -5 +5 @@
 uses
   Classes, SysUtils, Math, Generics.Collections, UGeometric, DOM, XMLRead,
-  XMLWrite, UXMLUtils;
+  XMLWrite, UXMLUtils, UItems;
 
 type
@@ -22 +22 @@
     function GetVector: TVector;
     procedure Move(Distance: Double);
+    procedure LoadFromXmlNode(Node: TDOMNode; Points: TTrackPoints);
+    procedure SaveToXmlNode(Node: TDOMNode);
   end;
 
   { TTrackPoint }
 
-  TTrackPoint = class
+  TTrackPoint = class(TItem)
     OwnerPoint: TObject;
     Position: TPoint;
-    //PositionShift: TPoint;
     PositionDesigned: TPoint;
     Pending: Boolean;
@@ -50 +51 @@
     function GetDistance: Integer;
 
-    procedure LoadFromXmlNode(Node: TDOMNode);
-    procedure SaveToXmlNode(Node: TDOMNode);
+    class function GetClassSysName: string; override;
+    procedure LoadFromXmlNode(Node: TDOMNode); override;
+    procedure SaveToXmlNode(Node: TDOMNode); override;
     constructor Create;
     destructor Destroy; override;
@@ -58 +60 @@
   { TTrackPoints }
 
-  TTrackPoints = class(TObjectList<TTrackPoint>)
+  TTrackPoints = class(TItems<TTrackPoint>)
     Track: TTrack;
-    function AddNew: TTrackPoint;
-    procedure LoadFromXmlNode(Node: TDOMNode);
-    procedure SaveToXmlNode(Node: TDOMNode);
+    class function GetClassSysName: string; override;
+    function CreateItem: TTrackPoint; override;
   end;
 
   { TTrackLink }
 
-  TTrackLink = class
+  TTrackLink = class(TItem)
     Points: TTrackPoints;
     Shift: TPoint;
-    procedure LoadFromXmlNode(Node: TDOMNode);
-    procedure SaveToXmlNode(Node: TDOMNode);
+    class function GetClassSysName: string; override;
+    procedure LoadFromXmlNode(Node: TDOMNode); override;
+    procedure SaveToXmlNode(Node: TDOMNode); override;
     constructor Create;
     destructor Destroy; override;
@@ -78 +80 @@
   { TTrackLinks }
 
-  TTrackLinks = class(TObjectList<TTrackLink>)
+  TTrackLinks = class(TItems<TTrackLink>)
+    class function GetClassSysName: string; override;
     function SearchPoints(Point1, Point2: TTrackPoint): TTrackLink;
-    function AddNew: TTrackLink;
-    procedure LoadFromXmlNode(Node: TDOMNode);
-    procedure SaveToXmlNode(Node: TDOMNode);
   end;
 
   { TTrack }
 
-  TTrack = class
+  TTrack = class(TItem)
     Points: TTrackPoints;
     Links: TTrackLinks;
@@ -96 +96 @@
     constructor Create;
     destructor Destroy; override;
-    procedure LoadFromXmlNode(Node: TDOMNode);
-    procedure SaveToXmlNode(Node: TDOMNode);
+    class function GetClassSysName: string; override;
+    procedure LoadFromXmlNode(Node: TDOMNode); override;
+    procedure SaveToXmlNode(Node: TDOMNode); override;
   end;
 
@@ -192 +193 @@
 end;
 
+procedure TTrackPosition.LoadFromXmlNode(Node: TDOMNode; Points: TTrackPoints);
+begin
+  RelPos := ReadDouble(Node, 'RelPos', RelPos);
+  BaseTrackPoint := Points.FindById(ReadInteger(Node, 'BaseTrackPoint', 0));
+end;
+
+procedure TTrackPosition.SaveToXmlNode(Node: TDOMNode);
+begin
+  WriteDouble(Node, 'RelPos', RelPos);
+  if Assigned(BaseTrackPoint) then
+    WriteInteger(Node, 'BaseTrackPoint', BaseTrackPoint.Id)
+    else WriteInteger(Node, 'BaseTrackPoint', 0)
+end;
+
 { TTrackLinks }
+
+class function TTrackLinks.GetClassSysName: string;
+begin
+  Result := 'Links';
+end;
 
 function TTrackLinks.SearchPoints(Point1, Point2: TTrackPoint): TTrackLink;
@@ -207 +227 @@
 end;
 
-function TTrackLinks.AddNew: TTrackLink;
-begin
-  Result := TTrackLink.Create;
-end;
-
-procedure TTrackLinks.LoadFromXmlNode(Node: TDOMNode);
-var
-  Node2: TDOMNode;
-  NewItem: TTrackLink;
-begin
-  Node2 := Node.FirstChild;
-  while Assigned(Node2) and (Node2.NodeName = 'Link') do begin
-    NewItem := TTrackLink.Create;
-    NewItem.LoadFromXmlNode(Node2);
-    Add(NewItem);
-    Node2 := Node2.NextSibling;
-  end;
-end;
-
-procedure TTrackLinks.SaveToXmlNode(Node: TDOMNode);
-var
-  I: Integer;
-  Node2: TDOMNode;
-begin
-  for I := 0 to Count - 1 do begin;
-    Node2 := Node.OwnerDocument.CreateElement('Link');
-    Node.AppendChild(Node2);
-    Items[I].SaveToXmlNode(Node2);
-  end;
-end;
-
 { TTrackPoints }
 
-function TTrackPoints.AddNew: TTrackPoint;
-begin
-  Result := TTrackPoint.Create;
+class function TTrackPoints.GetClassSysName: string;
+begin
+  Result := 'Points';
+end;
+
+function TTrackPoints.CreateItem: TTrackPoint;
+begin
+  Result := inherited;
   Result.Track := Track;
-end;
-
-procedure TTrackPoints.LoadFromXmlNode(Node: TDOMNode);
-var
-  Node2: TDOMNode;
-  NewItem: TTrackPoint;
-begin
-  Node2 := Node.FirstChild;
-  while Assigned(Node2) and (Node2.NodeName = 'Point') do begin
-    NewItem := TTrackPoint.Create;
-    NewItem.LoadFromXmlNode(Node2);
-    Add(NewItem);
-    Node2 := Node2.NextSibling;
-  end;
-end;
-
-procedure TTrackPoints.SaveToXmlNode(Node: TDOMNode);
-var
-  I: Integer;
-  Node2: TDOMNode;
-begin
-  for I := 0 to Count - 1 do begin;
-    Node2 := Node.OwnerDocument.CreateElement('Point');
-    Node.AppendChild(Node2);
-    Items[I].SaveToXmlNode(Node2);
-  end;
 end;
 
@@ -288 +256 @@
 end;
 
+class function TTrack.GetClassSysName: string;
+begin
+  Result := 'Track';
+end;
+
 procedure TTrack.LoadFromXmlNode(Node: TDOMNode);
-begin
-  Points.LoadFromXmlNode(Node);
-  Links.LoadFromXmlNode(Node);
+var
+  NewNode: TDOMNode;
+begin
+  NewNode := Node.FindNode(DOMString(TTrackPoints.GetClassSysName));
+  if Assigned(NewNode) then
+    Points.LoadFromXmlNode(NewNode);
+
+  NewNode := Node.FindNode(DOMString(TTrackLinks.GetClassSysName));
+  if Assigned(NewNode) then
+    Links.LoadFromXmlNode(NewNode);
 end;
 
 procedure TTrack.SaveToXmlNode(Node: TDOMNode);
-begin
-  Points.SaveToXmlNode(Node);
-  Links.SaveToXmlNode(Node);
+var
+  NewNode: TDOMNode;
+begin
+  Points.RebuildItemsId;
+  Links.RebuildItemsId;
+
+  NewNode := Node.OwnerDocument.CreateElement(DOMString(TTrackPoints.GetClassSysName));
+  Node.AppendChild(NewNode);
+  Points.SaveToXmlNode(NewNode);
+
+  NewNode := Node.OwnerDocument.CreateElement(DOMString(TTrackLinks.GetClassSysName));
+  Node.AppendChild(NewNode);
+  Links.SaveToXmlNode(NewNode);
 end;
 
@@ -322 +312 @@
   P1 := Points[Index1].PositionDesigned;
   P2 := Points[Index2].PositionDesigned;
-  NewTrackPoint := Points.AddNew;
+  NewTrackPoint := Points.CreateItem;
   Delta := Point(P2.X - P1.X, P2.Y - P1.Y);
   if Abs(Delta.X) > Abs(Delta.Y) then begin
@@ -357 +347 @@
 { TTrackLink }
 
+class function TTrackLink.GetClassSysName: string;
+begin
+  Result := 'Link';
+end;
+
 procedure TTrackLink.LoadFromXmlNode(Node: TDOMNode);
 begin
-
+  inherited;
 end;
 
 procedure TTrackLink.SaveToXmlNode(Node: TDOMNode);
 begin
-
+  inherited;
 end;
 
@@ -416 +411 @@
 
     // Add new link to both self and connected track point
-    NewLink := Track.Links.AddNew;
+    NewLink := Track.Links.CreateItem;
     NewLink.Points.Add(TrackPoint);
     NewLink.Points.Add(Self);
@@ -530 +525 @@
 end;
 
+class function TTrackPoint.GetClassSysName: string;
+begin
+  Result := 'Point';
+end;
+
 procedure TTrackPoint.LoadFromXmlNode(Node: TDOMNode);
 begin
+  inherited;
   Position.X := ReadInteger(Node, 'PositionX', Position.X);
   Position.Y := ReadInteger(Node, 'PositionY', Position.Y);
+  PositionDesigned.X := ReadInteger(Node, 'PositionDesignedX', PositionDesigned.X);
+  PositionDesigned.Y := ReadInteger(Node, 'PositionDesignedY', PositionDesigned.Y);
 end;
 
 procedure TTrackPoint.SaveToXmlNode(Node: TDOMNode);
 begin
+  inherited;
   WriteInteger(Node, 'PositionX', Position.X);
   WriteInteger(Node, 'PositionY', Position.Y);
+  WriteInteger(Node, 'PositionDesignedX', PositionDesigned.X);
+  WriteInteger(Node, 'PositionDesignedY', PositionDesigned.Y);
 end;
 
@@ -554 +560 @@
   FreeAndNil(NeighLinks);
   FreeAndNil(NeighPoints);
+  Track := nil;
+  OwnerPoint := nil;
   inherited;
 end;

trunk/UView.pas

@@ -4 +4 @@
 
 uses
-  Classes, SysUtils;
+  Classes, SysUtils, UItems, DOM;
 
 type
   { TView }
 
-  TView = class
+  TView = class(TItem)
   private
     FDestRect: TRect;
@@ -18 +18 @@
     procedure SetZoom(AValue: Double);
   public
-    procedure Assign(Source: TView);
+    procedure Assign(Source: TItem); override;
     function PointDestToSrc(Pos: TPoint): TPoint;
     function PointSrcToDest(Pos: TPoint): TPoint;
     constructor Create;
+    procedure LoadFromXmlNode(Node: TDOMNode); override;
+    procedure SaveToXmlNode(Node: TDOMNode); override;
     property SourceRect: TRect read FSourceRect write SetSourceRect;
     property DestRect: TRect read FDestRect write SetDestRect;
@@ -31 +33 @@
 
 uses
-  UGeometric;
+  UGeometric, UXMLUtils;
 
 resourcestring
@@ -80 +82 @@
 end;
 
-procedure TView.Assign(Source: TView);
+procedure TView.Assign(Source: TItem);
 begin
-  FDestRect := Source.FDestRect;
-  FSourceRect := Source.FSourceRect;
-  FZoom := Source.FZoom;
+  if Source is TView then begin
+    FDestRect := TView(Source).FDestRect;
+    FSourceRect := TView(Source).FSourceRect;
+    FZoom := TView(Source).FZoom;
+  end;
 end;
 
@@ -104 +108 @@
 end;
 
+procedure TView.LoadFromXmlNode(Node: TDOMNode);
+begin
+  inherited;
+  FZoom := ReadDouble(Node, 'Zoom', 0);
+  FSourceRect.Left := ReadInteger(Node, 'SourceRectLeft', 0);
+  FSourceRect.Top := ReadInteger(Node, 'SourceRectTop', 0);
+  FSourceRect.Right := ReadInteger(Node, 'SourceRectRight', 0);
+  FSourceRect.Bottom := ReadInteger(Node, 'SourceRectBottom', 0);
+  FDestRect.Left := ReadInteger(Node, 'DestRectLeft', 0);
+  FDestRect.Top := ReadInteger(Node, 'DestRectTop', 0);
+  FDestRect.Right := ReadInteger(Node, 'DestRectRight', 0);
+  FDestRect.Bottom := ReadInteger(Node, 'DestRectBottom', 0);
+end;
+
+procedure TView.SaveToXmlNode(Node: TDOMNode);
+begin
+  inherited;
+  WriteDouble(Node, 'Zoom', FZoom);
+  WriteInteger(Node, 'SourceRectLeft', FSourceRect.Left);
+  WriteInteger(Node, 'SourceRectTop', FSourceRect.Top);
+  WriteInteger(Node, 'SourceRectRight', FSourceRect.Right);
+  WriteInteger(Node, 'SourceRectBottom', FSourceRect.Bottom);
+  WriteInteger(Node, 'DestRectLeft', FDestRect.Left);
+  WriteInteger(Node, 'DestRectTop', FDestRect.Top);
+  WriteInteger(Node, 'DestRectRight', FDestRect.Right);
+  WriteInteger(Node, 'DestRectBottom', FDestRect.Bottom);
+end;
+
 end.