Changeset 129 for trunk

Timestamp:

May 1, 2023, 11:40:29 AM (19 months ago)

Author:

chronos

Message:

• Modified: Code cleanup.

Location:

trunk

Files:

• Forms/UFormMain.pas (modified) (1 diff)
• UEngine.pas (modified) (6 diffs)
• UTrack.pas (modified) (2 diffs)

trunk/Forms/UFormMain.pas

@@ -5 +5 @@
 uses
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, Menus,
-  ExtCtrls, UEngine, LCLType, StdCtrls, types, UTranslator, UApplicationInfo,
+  ExtCtrls, UEngine, LCLType, Types, UTranslator, UApplicationInfo,
   URegistry, UPersistentForm;
 

trunk/UEngine.pas

@@ -1453 +1453 @@
   TempIntersect: TPoint;
 begin
-  Result := TTrackLink.Create;
-  Result.Points.Count := 2;
-  Result.Points[0] := nil;
-  Result.Points[1] := nil;
+  Result := nil;
   I := 0;
   MinD := High(Integer);
@@ -1466 +1463 @@
       if (D < MinD) and (D < TrackClickDistance) then begin
         MinD := D;
-        Result.Points[0] := Track.Points[T - 1];
-        Result.Points[1] := Track.Points[T];
+        if not Assigned(Result) then
+          Result := TTrackLink.Create;
+        Result.Points.Add(Track.Points[T - 1]);
+        Result.Points.Add(Track.Points[T]);
         Intersect := TempIntersect;
       end;
@@ -1946 +1945 @@
   // Reset all trackpoints position shift
   for MetroLine in Lines do
-    for TrackPoint in MetroLine.Track.Points do
-      TrackPoint.Position := TrackPoint.PositionDesigned;
+    MetroLine.Track.Points.ResetToDesignatedPosition;
 
   // Calculate new position shifts
@@ -1982 +1980 @@
           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 + 1].PositionDesigned + Points[I].LinkUp.Shift, NewPoint) then 
+                  begin
             Points[I].Position := NewPoint;
           end else begin
@@ -3706 +3705 @@
       end;
 
-      // New TrackLink creation from selected station as start
+      // New track creation from selected station as start
       Station := GetStationOnPos(View.PointDestToSrc(Position));
       if Assigned(Station) then begin
@@ -4055 +4054 @@
     FreeAndNil(Doc);
   end;
+  LastTickTime := Now;
 end;
 

trunk/UTrack.pas

@@ -64 +64 @@
     class function GetClassSysName: string; override;
     function CreateItem: TTrackPoint; override;
+    procedure ResetToDesignatedPosition;
   end;
 
@@ -240 +241 @@
 end;
 
+procedure TTrackPoints.ResetToDesignatedPosition;
+var
+  I: Integer;
+begin
+  for I := 0 to Count - 1 do
+    Items[I].Position := Items[I].PositionDesigned;
+end;
+
 { TTrack }