Changeset 140 for trunk

Timestamp:

May 17, 2023, 12:18:41 AM (18 months ago)

Author:

chronos

Message:

• Modified: Draw curved metro lines.

Location:

trunk

Files:

• Languages/TransLines.cs.po (modified) (1 diff)
• Languages/TransLines.de.po (modified) (1 diff)
• Languages/TransLines.fr.po (modified) (1 diff)
• Languages/TransLines.pot (modified) (1 diff)
• Packages/Common/UGeometric.pas (modified) (3 diffs)
• Packages/Common/UMetaCanvas.pas (modified) (7 diffs)
• UEngine.pas (modified) (5 diffs)

trunk/Languages/TransLines.cs.po

@@ -334 +334 @@
 msgstr "Špatný formát souboru"
 
+#: uformmain.sfridayshort
+#, fuzzy
+msgctxt "uformmain.sfridayshort"
+msgid "FRI"
+msgstr "Pá"
+
+#: uformmain.smondayshort
+#, fuzzy
+msgctxt "uformmain.smondayshort"
+msgid "MON"
+msgstr "Po"
+
+#: uformmain.ssaturdayshort
+#, fuzzy
+msgctxt "uformmain.ssaturdayshort"
+msgid "SAT"
+msgstr "So"
+
+#: uformmain.ssundayshort
+#, fuzzy
+msgctxt "uformmain.ssundayshort"
+msgid "SUN"
+msgstr "Ne"
+
+#: uformmain.sthrusdayshort
+#, fuzzy
+msgctxt "uformmain.sthrusdayshort"
+msgid "THU"
+msgstr "Čt"
+
+#: uformmain.stuesdayshort
+#, fuzzy
+msgctxt "uformmain.stuesdayshort"
+msgid "TUE"
+msgstr "Út"
+
+#: uformmain.swednesdayshort
+#, fuzzy
+msgctxt "uformmain.swednesdayshort"
+msgid "WED"
+msgstr "St"
+
 #: uitems.sreferencenotfound
 #, object-pascal-format

trunk/Languages/TransLines.de.po

@@ -338 +338 @@
 msgstr ""
 
+#: uformmain.sfridayshort
+msgctxt "uformmain.sfridayshort"
+msgid "FRI"
+msgstr ""
+
+#: uformmain.smondayshort
+msgctxt "uformmain.smondayshort"
+msgid "MON"
+msgstr ""
+
+#: uformmain.ssaturdayshort
+msgctxt "uformmain.ssaturdayshort"
+msgid "SAT"
+msgstr ""
+
+#: uformmain.ssundayshort
+msgctxt "uformmain.ssundayshort"
+msgid "SUN"
+msgstr ""
+
+#: uformmain.sthrusdayshort
+msgctxt "uformmain.sthrusdayshort"
+msgid "THU"
+msgstr ""
+
+#: uformmain.stuesdayshort
+msgctxt "uformmain.stuesdayshort"
+msgid "TUE"
+msgstr ""
+
+#: uformmain.swednesdayshort
+msgctxt "uformmain.swednesdayshort"
+msgid "WED"
+msgstr ""
+
 #: uitems.sreferencenotfound
 #, object-pascal-format

trunk/Languages/TransLines.fr.po

@@ -346 +346 @@
 msgstr "Mauvais format de fichier"
 
+#: uformmain.sfridayshort
+msgctxt "uformmain.sfridayshort"
+msgid "FRI"
+msgstr ""
+
+#: uformmain.smondayshort
+msgctxt "uformmain.smondayshort"
+msgid "MON"
+msgstr ""
+
+#: uformmain.ssaturdayshort
+msgctxt "uformmain.ssaturdayshort"
+msgid "SAT"
+msgstr ""
+
+#: uformmain.ssundayshort
+msgctxt "uformmain.ssundayshort"
+msgid "SUN"
+msgstr ""
+
+#: uformmain.sthrusdayshort
+msgctxt "uformmain.sthrusdayshort"
+msgid "THU"
+msgstr ""
+
+#: uformmain.stuesdayshort
+msgctxt "uformmain.stuesdayshort"
+msgid "TUE"
+msgstr ""
+
+#: uformmain.swednesdayshort
+msgctxt "uformmain.swednesdayshort"
+msgid "WED"
+msgstr ""
+
 #: uitems.sreferencenotfound
 #, object-pascal-format

trunk/Languages/TransLines.pot

@@ -324 +324 @@
 msgstr ""
 
+#: uformmain.sfridayshort
+msgctxt "uformmain.sfridayshort"
+msgid "FRI"
+msgstr ""
+
+#: uformmain.smondayshort
+msgctxt "uformmain.smondayshort"
+msgid "MON"
+msgstr ""
+
+#: uformmain.ssaturdayshort
+msgctxt "uformmain.ssaturdayshort"
+msgid "SAT"
+msgstr ""
+
+#: uformmain.ssundayshort
+msgctxt "uformmain.ssundayshort"
+msgid "SUN"
+msgstr ""
+
+#: uformmain.sthrusdayshort
+msgctxt "uformmain.sthrusdayshort"
+msgid "THU"
+msgstr ""
+
+#: uformmain.stuesdayshort
+msgctxt "uformmain.stuesdayshort"
+msgid "TUE"
+msgstr ""
+
+#: uformmain.swednesdayshort
+msgctxt "uformmain.swednesdayshort"
+msgid "WED"
+msgstr ""
+
 #: uitems.sreferencenotfound
 #, object-pascal-format

trunk/Packages/Common/UGeometric.pas

@@ -14 +14 @@
     Position: TPoint;
     Direction: TPoint;
-    function GetLength: Integer;
+    function GetLength: Double;
     function GetAngle: Double;
+    procedure SetLength(Value: Double);
+    class function Create(P1, P2: TPoint): TVector; static;
   end;
 
@@ -176 +178 @@
 { TVector }
 
-function TVector.GetLength: Integer;
-begin
-  Result := Trunc(Sqrt(Sqr(Direction.X) + Sqr(Direction.Y)));
+function TVector.GetLength: Double;
+begin
+  Result := Sqrt(Sqr(Direction.X) + Sqr(Direction.Y));
 end;
 
@@ -186 +188 @@
 end;
 
+procedure TVector.SetLength(Value: Double);
+var
+  Angle: Double;
+begin
+  Angle := GetAngle;
+  Direction := Point(Round(Cos(Angle) * Value),
+    Round(Sin(Angle) * Value));
+end;
+
+class function TVector.Create(P1, P2: TPoint): TVector;
+begin
+  Result.Position := P1;
+  Result.Direction := Point(P2.X - P1.X, P2.Y - P1.Y);
+end;
+
 end.
 

trunk/Packages/Common/UMetaCanvas.pas

@@ -63 +63 @@
 
   TCanvasPolygon = class(TCanvasObject)
+    Pen: TPen;
+    Brush: TBrush;
+    Points: array of TPoint;
+    procedure Paint(Canvas: TCanvas); override;
+    procedure Zoom(Factor: Double); override;
+    procedure Move(Delta: TPoint); override;
+    constructor Create;
+    destructor Destroy; override;
+  end;
+
+  { TCanvasPolyline }
+
+  TCanvasPolyline = class(TCanvasObject)
+    Pen: TPen;
+    Brush: TBrush;
+    Points: array of TPoint;
+    procedure Paint(Canvas: TCanvas); override;
+    procedure Zoom(Factor: Double); override;
+    procedure Move(Delta: TPoint); override;
+    constructor Create;
+    destructor Destroy; override;
+  end;
+
+  { TCanvasPolyBezier }
+
+  TCanvasPolyBezier = class(TCanvasObject)
     Pen: TPen;
     Brush: TBrush;
@@ -133 +159 @@
     procedure DoMoveTo(X, Y: Integer); override;
     procedure DoLineTo(X, Y: Integer); override;
+    procedure DoPolyline(const Points: array of TPoint); override;
+    procedure DoPolyBezier(Points: PPoint; NumPts: Integer;
+      Filled: Boolean = False; Continuous: Boolean = False); override;
   public
     Objects: TCanvasObjects;
@@ -141 +170 @@
     procedure TextOut(X,Y: Integer; const Text: String); override;
     procedure Polygon(Points: PPoint; NumPts: Integer; Winding: Boolean = False); override;
+    procedure Polyline(Points: PPoint; NumPts: Integer); override;
+    procedure PolyBezier(Points: PPoint; NumPts: Integer;
+      Filled: Boolean = False; Continuous: Boolean = True); override;
     procedure Ellipse(x1, y1, x2, y2: Integer); override;
     procedure StretchDraw(const DestRect: TRect; SrcGraphic: TGraphic); override;
@@ -161 +193 @@
   UGeometric, LCLIntf;
 
+{ TCanvasPolyBezier }
+
+procedure TCanvasPolyBezier.Paint(Canvas: TCanvas);
+begin
+  Canvas.Pen.Assign(Pen);
+  Canvas.Brush.Assign(Brush);
+  Canvas.PolyBezier(Points);
+end;
+
+procedure TCanvasPolyBezier.Zoom(Factor: Double);
+var
+  I: Integer;
+begin
+  for I := 0 to High(Points) do
+    Points[I] := Point(Trunc(Points[I].X * Factor),
+      Trunc(Points[I].Y * Factor));
+  Pen.Width := Trunc(Pen.Width * Factor);
+end;
+
+procedure TCanvasPolyBezier.Move(Delta: TPoint);
+var
+  I: Integer;
+begin
+  for I := 0 to High(Points) do
+    Points[I] := AddPoint(Points[I], Delta);
+end;
+
+constructor TCanvasPolyBezier.Create;
+begin
+  Pen := TPen.Create;
+  Brush := TBrush.Create;
+end;
+
+destructor TCanvasPolyBezier.Destroy;
+begin
+  FreeAndNil(Brush);
+  FreeAndNil(Pen);
+  inherited;
+end;
+
+{ TCanvasPolyline }
+
+procedure TCanvasPolyline.Paint(Canvas: TCanvas);
+begin
+  Canvas.Pen.Assign(Pen);
+  Canvas.Brush.Assign(Brush);
+  Canvas.Polyline(Points);
+end;
+
+procedure TCanvasPolyline.Zoom(Factor: Double);
+var
+  I: Integer;
+begin
+  for I := 0 to High(Points) do
+    Points[I] := Point(Trunc(Points[I].X * Factor),
+      Trunc(Points[I].Y * Factor));
+  Pen.Width := Trunc(Pen.Width * Factor);
+end;
+
+procedure TCanvasPolyline.Move(Delta: TPoint);
+var
+  I: Integer;
+begin
+  for I := 0 to High(Points) do
+    Points[I] := AddPoint(Points[I], Delta);
+end;
+
+constructor TCanvasPolyline.Create;
+begin
+  Pen := TPen.Create;
+  Brush := TBrush.Create;
+end;
+
+destructor TCanvasPolyline.Destroy;
+begin
+  FreeAndNil(Brush);
+  FreeAndNil(Pen);
+  inherited;
+end;
+
 { TCanvasPie }
 
@@ -304 +416 @@
 destructor TCanvasPolygon.Destroy;
 begin
-  Brush.Free;
-  Pen.Free;
+  FreeAndNil(Brush);
+  FreeAndNil(Pen);
   inherited;
 end;
@@ -511 +623 @@
     APoints[I] := Points[I];
   DoPolygon(APoints);
+end;
+
+procedure TMetaCanvas.Polyline(Points: PPoint; NumPts: Integer);
+var
+  APoints: array of TPoint;
+  I: Integer;
+begin
+  APoints := nil;
+  SetLength(APoints, NumPts);
+  for I := 0 to High(APoints) do
+    APoints[I] := Points[I];
+  DoPolyline(APoints);
+end;
+
+procedure TMetaCanvas.PolyBezier(Points: PPoint; NumPts: Integer;
+  Filled: Boolean; Continuous: Boolean);
+begin
+  DoPolyBezier(Points, NumPts, Filled, Continuous);
 end;
 
@@ -580 +710 @@
 end;
 
+procedure TMetaCanvas.DoPolyline(const Points: array of TPoint);
+var
+  NewObj: TCanvasPolyline;
+  I: Integer;
+begin
+  NewObj := TCanvasPolyline.Create;
+  NewObj.Brush.Assign(Brush);
+  NewObj.Pen.Assign(Pen);
+  SetLength(NewObj.Points, Length(Points));
+  for I := 0 to High(Points) do
+    NewObj.Points[I] := Points[I];
+  Objects.Add(NewObj);
+end;
+
+procedure TMetaCanvas.DoPolyBezier(Points: PPoint; NumPts: Integer;
+  Filled: Boolean; Continuous: Boolean);
+var
+  NewObj: TCanvasPolyBezier;
+  I: Integer;
+begin
+  NewObj := TCanvasPolyBezier.Create;
+  NewObj.Brush.Assign(Brush);
+  NewObj.Pen.Assign(Pen);
+  SetLength(NewObj.Points, NumPts);
+  for I := 0 to High(NewObj.Points) do
+    NewObj.Points[I] := Points[I];
+  Objects.Add(NewObj);
+end;
+
 procedure TMetaCanvas.FillRect(const ARect: TRect);
 begin

trunk/UEngine.pas

@@ -361 +361 @@
     OldHighestServedDaysCount: Integer;
     RegistryContext: TRegistryContext;
+    CurvedLines: Boolean;
     procedure InitMenus;
     procedure InitCities;
@@ -415 +416 @@
   TrackClickDistance = 15;
   EndStationLength = 50;
+  EndStationWidth = 20;
   ShowDistances = False;
   TimePerSecondNormal = 60 * OneMinute;
@@ -3086 +3088 @@
 var
   MetroLine: TMetroLine;
-  S: Integer;
+  I: Integer;
+  Points: array of TPoint;
+  Vector: TVector;
+  HalfDownPoint: TPoint;
+  HalfUpPoint: TPoint;
+  Angle: Double;
+  EndPoint: TPoint;
+const
+  CurveRadius: Double = 0;
 begin
   for MetroLine in Lines do
@@ -3093 +3103 @@
     Canvas.Pen.Style := psSolid;
     Canvas.Pen.Width := GetMetroLineThickness;
-    if Track.Points.Count > 0 then Canvas.MoveTo(Track.Points[0].Position);
-    for S := 1 to Track.Points.Count - 1 do begin
-      Canvas.LineTo(Track.Points[S].Position);
-{      if (S = TrackPoints.Count - 1) then begin
+
+    if CurvedLines then begin
+      Points := nil;
+      if Track.Points.Count >= 2 then begin
+        SetLength(Points, (Track.Points.Count - 1) * 3 - 2);
+        for I := 1 to Track.Points.Count - 2 do begin
+          if I = 1 then begin
+            HalfDownPoint := Track.Points[I - 1].Position;
+          end else
+          if I > 0 then begin
+            HalfDownPoint := Point((Track.Points[I].Position.X + Track.Points[I - 1].Position.X) div 2,
+              (Track.Points[I].Position.Y + Track.Points[I - 1].Position.Y) div 2)
+          end else begin
+            HalfDownPoint := Track.Points[0].Position;
+          end;
+
+          if I = Track.Points.Count - 2 then begin
+            HalfUpPoint := Track.Points[I + 1].Position
+          end else
+          if I < Track.Points.Count - 1 then begin
+            HalfUpPoint := Point((Track.Points[I].Position.X + Track.Points[I + 1].Position.X) div 2,
+              (Track.Points[I].Position.Y + Track.Points[I + 1].Position.Y) div 2)
+          end else begin
+            HalfUpPoint := Track.Points[Track.Points.Count - 1].Position;
+          end;
+
+          Points[(I - 1) * 3] := HalfDownPoint;
+          Points[I * 3] := HalfUpPoint;
+
+          if (I > 0) and (I < Track.Points.Count - 1) then begin
+            Vector := TVector.Create(HalfDownPoint, Track.Points[I].Position);
+            Vector.SetLength(Vector.GetLength - CurveRadius);
+            Points[(I - 1) * 3 + 1] := AddPoint(Vector.Position, Vector.Direction);
+          end;
+          if I < Track.Points.Count - 1 then begin
+            Vector := TVector.Create(HalfUpPoint, Track.Points[I].Position);
+            Vector.SetLength(Vector.GetLength - CurveRadius);
+            Points[(I - 1) * 3 + 2] := AddPoint(Vector.Position, Vector.Direction);
+          end;
+        end;
+        if Length(Points) > 1 then
+          Canvas.PolyBezier(@Points[0], Length(Points));
+      end;
+    end else begin
+      if Track.Points.Count > 0 then Canvas.MoveTo(Track.Points[0].Position);
+      for I := 1 to Track.Points.Count - 1 do begin
+        Canvas.LineTo(Track.Points[I].Position);
+      end;
+    end;
+
+    if VisualStyle = vsLondon then begin
+      // Starting orthogonal line
+      if (Track.Points.Count > 1) then begin
         Canvas.Pen.EndCap := pecSquare;
-        Angle := arctan2D(((TrackPoints[S].Position.Y - TrackPoints[S - 1].Position.Y),
-          (TrackPoints[S].Position.X - TrackPoints[S - 1].Position.X));
-        EndPoint := Point(Round(TrackPoints[S].Position.X + EndStationLength * Cos(Angle)),
-          Round(TrackPoints[S].Position.Y + EndStationLength * Sin(Angle)));
+        Angle := Arctan2((Track.Points[1].Position.Y - Track.Points[0].Position.Y),
+          (Track.Points[1].Position.X - Track.Points[0].Position.X));
+        Canvas.MoveTo(Track.Points[1].Position);
+        EndPoint := Point(Round(Track.Points[1].Position.X - EndStationLength * Cos(Angle)),
+          Round(Track.Points[1].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.MoveTo(Point(Round(EndPoint.X - Cos(Angle + Pi / 2) * EndStationWidth / 2),
+          Round(EndPoint.Y - Sin(Angle + Pi / 2) * EndStationWidth / 2)));
+        Canvas.LineTo(Point(Round(EndPoint.X - Cos(Angle - Pi / 2) * EndStationWidth / 2),
+          Round(EndPoint.Y - Sin(Angle - Pi / 2) * EndStationWidth / 2)));
         Canvas.Pen.EndCap := pecRound;
-      end;}
-    end;
-(*    Canvas.Pen.Color := Color;
-    Canvas.Pen.Style := psSolid;
-    Canvas.Pen.Width := GetMetroLineThickness div 2;
-    if Track.Points.Count > 0 then Canvas.MoveTo(Track.Points[0].PositionDesigned);
-    for S := 1 to Track.Points.Count - 1 do begin
-      Canvas.LineTo(Track.Points[S].PositionDesigned);
-{      if (S = TrackPoints.Count - 1) then begin
+      end;
+
+      // Ending orthogonal line
+      if (Track.Points.Count > 1) then begin
         Canvas.Pen.EndCap := pecSquare;
-        Angle := arctan2((TrackPoints[S].Position.Y - TrackPoints[S - 1].Position.Y),
-          (TrackPoints[S].Position.X - TrackPoints[S - 1].Position.X));
-        EndPoint := Point(Round(TrackPoints[S].Position.X + EndStationLength * Cos(Angle)),
-          Round(TrackPoints[S].Position.Y + EndStationLength * Sin(Angle)));
+        Angle := Arctan2((Track.Points[Track.Points.Count - 1].Position.Y - Track.Points[Track.Points.Count - 2].Position.Y),
+          (Track.Points[Track.Points.Count - 1].Position.X - Track.Points[Track.Points.Count - 2].Position.X));
+        Canvas.MoveTo(Track.Points[Track.Points.Count - 2].Position);
+        EndPoint := Point(Round(Track.Points[Track.Points.Count - 2].Position.X + EndStationLength * Cos(Angle)),
+          Round(Track.Points[Track.Points.Count - 2].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.MoveTo(Point(Round(EndPoint.X + Cos(Angle + Pi / 2) * EndStationWidth / 2),
+        Round(EndPoint.Y + Sin(Angle + Pi / 2) * EndStationWidth / 2)));
+        Canvas.LineTo(Point(Round(EndPoint.X + Cos(Angle - Pi / 2) * EndStationWidth / 2),
+          Round(EndPoint.Y + Sin(Angle - Pi / 2) * EndStationWidth / 2)));
         Canvas.Pen.EndCap := pecRound;
-      end;}
-    end;
-    {
-    if (TrackPoints.Count > 1) then begin
-      Canvas.Pen.EndCap := pecSquare;
-      Angle := arctan2((TrackPoints[1].Position.Y - TrackPoints[0].Position.Y),
-        (TrackPoints[1].Position.X - TrackPoints[0].Position.X));
-      Canvas.MoveTo(TrackPoints[0].Position);
-      EndPoint := Point(Round(TrackPoints[0].Position.X - EndStationLength * Cos(Angle)),
-        Round(TrackPoints[0].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;
+    end;
   end;
 
@@ -4233 +4273 @@
 begin
   inherited;
+  CurvedLines := True;
   MovableTracks := True;
   Colors := TColors.Create;