Changeset 36

Timestamp:

May 10, 2015, 1:41:11 AM (9 years ago)

Author:

chronos

Message:

• Modified: Improved positioning of metro lines which are go in parallel so they should not overlay each other.

Location:

trunk

Files:

• BigMetro.lpi (modified) (1 diff)
• UEngine.pas (modified) (17 diffs)

trunk/BigMetro.lpi

@@ -80 +80 @@
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-        <UnitName Value="UFormMain"/>
       </Unit1>
       <Unit2>
         <Filename Value="UEngine.pas"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="UEngine"/>
       </Unit2>
       <Unit3>
         <Filename Value="UGeometric.pas"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="UGeometric"/>
       </Unit3>
       <Unit4>
         <Filename Value="UTrack.pas"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="UTrack"/>
       </Unit4>
       <Unit5>
         <Filename Value="UMetaCanvas.pas"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="UMetaCanvas"/>
       </Unit5>
     </Units>

trunk/UEngine.pas

@@ -22 +22 @@
   TTrackPoints = class;
   TTrack = class;
+  TTrackLink = class;
   TTrackLinks = class;
 
@@ -69 +70 @@
     LineStation: TLineStation;
     Position: TPoint;
-    PositionShift: TPoint;
+    //PositionShift: TPoint;
     PositionDesigned: TPoint;
     Pending: Boolean;
@@ -75 +76 @@
     NeighPoints: TTrackPoints;
     NeighLinks: TTrackLinks;
+    LinkUp: TTrackLink;
+    LinkDown: TTrackLink;
     procedure Connect(TrackPoint: TTrackPoint);
     procedure Disconnect(TrackPoint: TTrackPoint);
@@ -81 +84 @@
     function GetNeighDown: TTrackPoint;
     function GetNeighUp: TTrackPoint;
+    function GetLinkDown: TTrackLink;
+    function GetLinkUp: TTrackLink;
     // Move to TTrackLink later
     function GetDistance: Integer;
@@ -133 +138 @@
   TTrackPointsAngle = class
     Angle: Double;
-    Tracks: TTracks;
+    TrackLinks: TTrackLinks;
     constructor Create;
     destructor Destroy; override;
@@ -536 +541 @@
 constructor TTrackPointsAngle.Create;
 begin
-  Tracks := TTracks.Create;
-  Tracks.OwnsObjects := False;
+  TrackLinks := TTrackLinks.Create;
+  TrackLinks.OwnsObjects := False;
 end;
 
 destructor TTrackPointsAngle.Destroy;
 begin
-  Tracks.Free;
+  TrackLinks.Free;
   inherited Destroy;
 end;
@@ -624 +629 @@
     if NewIndex < Track.Points.Count then Result := TTrackPoint(Track.Points[NewIndex]);
   end;
+end;
+
+function TTrackPoint.GetLinkDown: TTrackLink;
+begin
+  if Assigned(LinkDown) then Result := LinkDown
+    else begin
+      LinkDown := TTrackLink.Create;
+      LinkDown.Points.Add(GetNeighDown);
+      LinkDown.Points.Add(Self);
+      Result := LinkDown;
+      GetNeighDown.LinkUp := LinkDown;
+    end;
+end;
+
+function TTrackPoint.GetLinkUp: TTrackLink;
+begin
+  if Assigned(LinkUp) then Result := LinkUp
+    else begin
+      LinkUp := TTrackLink.Create;
+      LinkUp.Points.Add(Self);
+      LinkUp.Points.Add(GetNeighUp);
+      Result := LinkUp;
+      GetNeighUp.LinkDown := LinkUp;
+    end;
 end;
 
@@ -794 +823 @@
     end;
 
-    Angle := arctan2((TTrackPoint(Track.Points[2]).Position.Y - TTrackPoint(Track.Points[1]).Position.Y),
-      (TTrackPoint(Track.Points[2]).Position.X - TTrackPoint(Track.Points[1]).Position.X));
-    EndPoint := Point(Round(TTrackPoint(Track.Points[1]).Position.X - EndStationLength * Cos(Angle)),
-      Round(TTrackPoint(Track.Points[1]).Position.Y - EndStationLength * Sin(Angle)));
+    Angle := ArcTan2((TTrackPoint(Track.Points[2]).PositionDesigned.Y - TTrackPoint(Track.Points[1]).PositionDesigned.Y),
+      (TTrackPoint(Track.Points[2]).PositionDesigned.X - TTrackPoint(Track.Points[1]).PositionDesigned.X));
+    EndPoint := Point(Round(TTrackPoint(Track.Points[1]).PositionDesigned.X - EndStationLength * Cos(Angle)),
+      Round(TTrackPoint(Track.Points[1]).PositionDesigned.Y - EndStationLength * Sin(Angle)));
+    TTrackPoint(Track.Points.First).PositionDesigned := EndPoint;
     TTrackPoint(Track.Points.First).Position := EndPoint;
-    TTrackPoint(Track.Points.First).PositionDesigned := EndPoint;
-
-    Angle := arctan2((TTrackPoint(Track.Points[Track.Points.Count - 2]).Position.Y - TTrackPoint(Track.Points[Track.Points.Count - 3]).Position.Y),
-      (TTrackPoint(Track.Points[Track.Points.Count - 2]).Position.X - TTrackPoint(Track.Points[Track.Points.Count - 3]).Position.X));
-    EndPoint := Point(Round(TTrackPoint(Track.Points[Track.Points.Count - 2]).Position.X + EndStationLength * Cos(Angle)),
-      Round(TTrackPoint(Track.Points[Track.Points.Count - 2]).Position.Y + EndStationLength * Sin(Angle)));
+
+    Angle := ArcTan2((TTrackPoint(Track.Points[Track.Points.Count - 2]).PositionDesigned.Y - TTrackPoint(Track.Points[Track.Points.Count - 3]).PositionDesigned.Y),
+      (TTrackPoint(Track.Points[Track.Points.Count - 2]).PositionDesigned.X - TTrackPoint(Track.Points[Track.Points.Count - 3]).PositionDesigned.X));
+    EndPoint := Point(Round(TTrackPoint(Track.Points[Track.Points.Count - 2]).PositionDesigned.X + EndStationLength * Cos(Angle)),
+      Round(TTrackPoint(Track.Points[Track.Points.Count - 2]).PositionDesigned.Y + EndStationLength * Sin(Angle)));
+    TTrackPoint(Track.Points.Last).PositionDesigned := EndPoint;
     TTrackPoint(Track.Points.Last).Position := EndPoint;
-    TTrackPoint(Track.Points.Last).PositionDesigned := EndPoint;
   end;
 end;
@@ -939 +968 @@
   Index1 := Points.IndexOf(TP1);
   Index2 := Points.IndexOf(TP2);
-  P1 := TTrackPoint(Points[Index1]).Position;
-  P2 := TTrackPoint(Points[Index2]).Position;
+  P1 := TTrackPoint(Points[Index1]).PositionDesigned;
+  P2 := TTrackPoint(Points[Index2]).PositionDesigned;
   NewTrackPoint := Points.AddNew;
   Delta := Point(P2.X - P1.X, P2.Y - P1.Y);
   if Abs(Delta.X) > Abs(Delta.Y) then begin
-    NewTrackPoint.Position := Point(P2.X - Sign(Delta.X) * Abs(Delta.Y), P1.Y);
-    NewTrackPoint.PositionDesigned := NewTrackPoint.Position;
+    NewTrackPoint.PositionDesigned := Point(P2.X - Sign(Delta.X) * Abs(Delta.Y), P1.Y);
+    NewTrackPoint.Position := NewTrackPoint.PositionDesigned;
   end else begin
-    NewTrackPoint.Position := Point(P1.X, P2.Y - Sign(Delta.Y) * Abs(Delta.X));
-    NewTrackPoint.PositionDesigned := NewTrackPoint.Position;
+    NewTrackPoint.PositionDesigned := Point(P1.X, P2.Y - Sign(Delta.Y) * Abs(Delta.X));
+    NewTrackPoint.Position := NewTrackPoint.PositionDesigned;
   end;
   Points.Insert(Index1 + 1, NewTrackPoint);
@@ -1099 +1128 @@
 procedure TMapStation.ShiftTrackPoints;
 var
-  Tracks: TTracks;
+  TrackLinks: TTrackLinks;
   I: Integer;
   J: Integer;
@@ -1106 +1135 @@
   LS: TLineStation;
   Line: TMetroLine;
-  Angle: Double;
+  Angle: Float;
   TPAngleGroup: TTrackPointsAngleGroup;
   GroupItem: TTrackPointsAngle;
-  NewTrack: TTrackLink;
+  NewTrackLink: TTrackLink;
   HAngle: Double;
-  PairTrack: TTrackLink;
-  NewPoint: TPoint;
-begin
-  Tracks := TTracks.Create;
-
-  // Collect all near track points as track
+  P1, P2: TPoint;
+  NewShift: TPoint;
+begin
+  TrackLinks := TTrackLinks.Create;
+  TrackLinks.OwnsObjects := False;
+
+  // Collect all near track points as track links
   SortLines;
   for I := 0 to Lines.Count - 1 do begin
@@ -1124 +1154 @@
     Index := Line.Track.Points.IndexOf(TP);
     if Index > 0 then begin
-      NewTrack := TTrackLink.Create;
-      NewTrack.Points.Count := 2;
-      NewTrack.Points[0] := TTrackPoint(Line.Track.Points[Index - 1]);
-      NewTrack.Points[1] := TTrackPoint(Line.Track.Points[Index]);
-      Tracks.Add(NewTrack);
+      NewTrackLink := TTrackPoint(Line.Track.Points[Index]).GetLinkDown;
+      TrackLinks.Add(NewTrackLink);
     end;
     if Index < (Line.Track.Points.Count - 1) then begin
-      NewTrack := TTrackLink.Create;
-      NewTrack.Points.Count := 2;
-      NewTrack.Points[0] := TTrackPoint(Line.Track.Points[Index + 1]);
-      NewTrack.Points[1] := TTrackPoint(Line.Track.Points[Index]);
-      Tracks.Add(NewTrack);
-    end;
-  end;
-
-  // Make groups of tracks with same angle
+      NewTrackLink := TTrackPoint(Line.Track.Points[Index]).GetLinkUp;
+      TrackLinks.Add(NewTrackLink);
+    end;
+    if Line.IsCircular and (Self = TLineStation(Line.LineStations.First).MapStation) and
+    (Self = TLineStation(Line.LineStations.Last).MapStation) then begin
+      LS := TLineStation(Line.LineStations.Last);
+      TP := LS.TrackPoint;
+      Index := Line.Track.Points.IndexOf(TP);
+      if Index > 0 then begin
+        NewTrackLink := TTrackPoint(Line.Track.Points[Index]).GetLinkDown;
+        TrackLinks.Add(NewTrackLink);
+      end;
+      if Index < (Line.Track.Points.Count - 1) then begin
+        NewTrackLink := TTrackPoint(Line.Track.Points[Index]).GetLinkUp;
+        TrackLinks.Add(NewTrackLink);
+      end;
+    end;
+  end;
+
+  // Make groups of TrackLinks with same angle
   TPAngleGroup := TTrackPointsAngleGroup.Create;
-  for I := 0 to Tracks.Count - 1 do begin
-    Angle := ArcTan2(TTrackPoint(TTrackLink(Tracks[I]).Points[0]).PositionDesigned.Y - Position.Y,
-      TTrackPoint(TTrackLink(Tracks[I]).Points[0]).PositionDesigned.X - Position.X);
+  for I := 0 to TrackLinks.Count - 1 do begin
+    P1 := TTrackPoint(TTrackLink(TrackLinks[I]).Points[0]).PositionDesigned;
+    P2 := TTrackPoint(TTrackLink(TrackLinks[I]).Points[1]).PositionDesigned;
+    if ComparePoint(P1, Position) and not ComparePoint(P2, Position) then begin
+      Angle := ArcTan2(P2.Y - Position.Y, P2.X - Position.X);
+    end else
+    if ComparePoint(P2, Position) and not ComparePoint(P1, Position) then begin
+      Angle := ArcTan2(P1.Y - Position.Y, P1.X - Position.X);
+    end else Angle := 0;// else raise Exception.Create('TrackLink angle rrror');
+
     GroupItem := TPAngleGroup.SearchAngle(Angle);
     if not Assigned(GroupItem) then begin
@@ -1150 +1195 @@
       TPAngleGroup.Add(GroupItem);
     end;
-    GroupItem.Tracks.Add(TTrackLink(Tracks[I]))
-  end;
-
-  // Shift tracks according number of lines in group
+    GroupItem.TrackLinks.Add(TTrackLink(TrackLinks[I]))
+  end;
+
+  // Shift TrackLinks according number of lines in group
   for I := 0 to TPAngleGroup.Count - 1 do
   with TTrackPointsAngle(TPAngleGroup[I]) do begin
-    for J := 0 to Tracks.Count - 1 do
-      with TTrackLink(Tracks[J]) do begin
+    for J := 0 to TrackLinks.Count - 1 do
+      with TTrackLink(TrackLinks[J]) do begin
         // Get orthogonal angle
         HAngle := Angle + Pi / 2;
-        if HAngle > Pi then HAngle := Hangle - Pi;
-        Shift.X := Trunc(MetroLineThickness * Cos(HAngle) * (J - (Tracks.Count - 1) / 2));
-        Shift.Y := Trunc(MetroLineThickness * Sin(HAngle) * (J - (Tracks.Count - 1) / 2));
-        TTrackPoint(Points[0]).PositionShift := Shift;
-        TTrackPoint(Points[1]).PositionShift := Shift;
+        if HAngle > Pi then HAngle := HAngle - Pi;
+        NewShift.X := Trunc(MetroLineThickness * Cos(HAngle) * (J - (TrackLinks.Count - 1) / 2));
+        NewShift.Y := Trunc(MetroLineThickness * Sin(HAngle) * (J - (TrackLinks.Count - 1) / 2));
+        //NewShift.X := TrackLinks.Count;
+        Shift := NewShift;
       end;
   end;
 
   TPAngleGroup.Free;
-  Tracks.Free;
+  TrackLinks.Free;
 end;
 
@@ -1747 +1792 @@
   for L := 0 to Lines.Count - 1 do
   with TMetroLine(Lines[L]) do begin
-    if Track.Points.Count > 0 then
+    if Track.Points.Count > 1 then begin
       TTrackPoint(Track.Points[0]).Position := AddPoint(TTrackPoint(Track.Points[0]).PositionDesigned,
-        TTrackPoint(Track.Points[0]).PositionShift);
+        TTrackPoint(Track.Points[0]).LinkUp.Shift);
+    end;
     for I := 1 to Track.Points.Count - 1 do
-    with TTrackPoint(Track.Points[I]) do begin
-      Link1 := SubPoint(AddPoint(TTrackPoint(Track.Points[I]).PositionDesigned, TTrackPoint(Track.Points[I]).PositionShift),
-        AddPoint(TTrackPoint(Track.Points[I - 1]).PositionDesigned, TTrackPoint(Track.Points[I - 1]).PositionShift));
+    with TTrackPoint(Track.Points[I]) do
+    if Assigned(TTrackPoint(Track.Points[I]).LinkDown) and Assigned(TTrackPoint(Track.Points[I]).LinkUp) then begin
+      Link1 := SubPoint(AddPoint(TTrackPoint(Track.Points[I]).PositionDesigned, TTrackPoint(Track.Points[I]).LinkDown.Shift),
+        AddPoint(TTrackPoint(Track.Points[I - 1]).PositionDesigned, TTrackPoint(Track.Points[I]).LinkDown.Shift));
       if (I + 1) < Track.Points.Count then
-        Link2 := SubPoint(AddPoint(TTrackPoint(Track.Points[I + 1]).PositionDesigned, TTrackPoint(Track.Points[I + 1]).PositionShift),
-          AddPoint(TTrackPoint(Track.Points[I]).PositionDesigned, TTrackPoint(Track.Points[I]).PositionShift))
+        Link2 := SubPoint(AddPoint(TTrackPoint(Track.Points[I + 1]).PositionDesigned, TTrackPoint(Track.Points[I]).LinkUp.Shift),
+          AddPoint(TTrackPoint(Track.Points[I]).PositionDesigned, TTrackPoint(Track.Points[I]).LinkUp.Shift))
         else Link2 := Link1;
 
       if ArcTanPoint(Link1) = ArcTanPoint(Link2) then begin
         // Parallel lines
-        TTrackPoint(Track.Points[I]).Position := AddPoint(TTrackPoint(Track.Points[I]).PositionDesigned,
-          TTrackPoint(Track.Points[I]).PositionShift);
+        NewPoint := AddPoint(TTrackPoint(Track.Points[I]).PositionDesigned,
+          TTrackPoint(Track.Points[I]).LinkDown.Shift);
+        TTrackPoint(Track.Points[I]).Position := NewPoint;
       end else begin
         // Intersected lines
-        NewPoint := LineIntersect(AddPoint(TTrackPoint(Track.Points[I - 1]).PositionDesigned, TTrackPoint(Track.Points[I - 1]).PositionShift),
-          AddPoint(TTrackPoint(Track.Points[I]).PositionDesigned, TTrackPoint(Track.Points[I]).PositionShift),
-          AddPoint(TTrackPoint(Track.Points[I]).PositionDesigned, TTrackPoint(Track.Points[I]).PositionShift),
-          AddPoint(TTrackPoint(Track.Points[I + 1]).PositionDesigned, TTrackPoint(Track.Points[I + 1]).PositionShift));
+        NewPoint := LineIntersect(AddPoint(TTrackPoint(Track.Points[I - 1]).PositionDesigned,
+          TTrackPoint(Track.Points[I]).LinkDown.Shift),
+          AddPoint(TTrackPoint(Track.Points[I]).PositionDesigned, TTrackPoint(Track.Points[I]).LinkDown.Shift),
+          AddPoint(TTrackPoint(Track.Points[I]).PositionDesigned, TTrackPoint(Track.Points[I]).LinkUp.Shift),
+          AddPoint(TTrackPoint(Track.Points[I + 1]).PositionDesigned, TTrackPoint(Track.Points[I]).LinkUp.Shift));
         TTrackPoint(Track.Points[I]).Position := NewPoint;
       end;
@@ -1774 +1823 @@
   end;
 
+  // Remove all temporal links
+  for I := 0 to Lines.Count - 1 do
+  with TMetroLine(Lines[I]) do
+    for J := 0 to Track.Points.Count - 1 do
+    if Assigned(TTrackPoint(Track.Points[J]).LinkUp) then begin
+      TTrackPoint(Track.Points[J]).LinkUp.Free;
+      TTrackPoint(Track.Points[J]).LinkUp := nil;
+      TTrackPoint(Track.Points[J + 1]).LinkDown := nil;
+    end;
 end;
 
@@ -2242 +2300 @@
       end;}
     end;
+(*    Canvas.Pen.Color := Color;
+    Canvas.Pen.Style := psSolid;
+    Canvas.Pen.Width := MetroLineThickness div 2;
+    if Track.Points.Count > 0 then Canvas.MoveTo(TTrackPoint(Track.Points[0]).PositionDesigned);
+    for S := 1 to Track.Points.Count - 1 do begin
+      Canvas.LineTo(TTrackPoint(Track.Points[S]).PositionDesigned);
+{      if (S = TrackPoints.Count - 1) then begin
+        Canvas.Pen.EndCap := pecSquare;
+        Angle := arctan2((TTrackPoint(TrackPoints[S]).Position.Y - TTrackPoint(TrackPoints[S - 1]).Position.Y),
+          (TTrackPoint(TrackPoints[S]).Position.X - TTrackPoint(TrackPoints[S - 1]).Position.X));
+        EndPoint := Point(Round(TTrackPoint(TrackPoints[S]).Position.X + EndStationLength * Cos(Angle)),
+          Round(TTrackPoint(TrackPoints[S]).Position.Y + EndStationLength * Sin(Angle)));
+        Canvas.LineTo(EndPoint);
+        Canvas.MoveTo(Point(Round(EndPoint.X + Cos(Angle + Pi / 2) * EndStationLength / 3),
+          Round(EndPoint.Y + Sin(Angle + Pi / 2) * EndStationLength / 3)));
+        Canvas.LineTo(Point(Round(EndPoint.X + Cos(Angle - Pi / 2) * EndStationLength / 3),
+          Round(EndPoint.Y + Sin(Angle - Pi / 2) * EndStationLength / 3)));
+        Canvas.Pen.EndCap := pecRound;
+      end;}
+    end;
     {
     if (TrackPoints.Count > 1) then begin
@@ -2257 +2335 @@
       Canvas.Pen.EndCap := pecRound;
     end;  }
-  end;
-
+    *)
+  end;
   // Draw design time lines
   if Assigned(TrackStationDown) and Assigned(TrackStationDown.LineStation) then begin