Changeset 3

Timestamp:

Mar 26, 2015, 11:06:50 AM (9 years ago)

Author:

chronos

Message:

• Added: Select metro line by clicking on its track.

Location:

trunk

Files:

• BigMetro.lpi (modified) (3 diffs)
• BigMetro.lpr (modified) (1 diff)
• UEngine.pas (modified) (9 diffs)
• UFormMain.pas (modified) (2 diffs)
• UGeometric.pas (added)

trunk/BigMetro.lpi

@@ -33 +33 @@
       </Item1>
     </RequiredPackages>
-    <Units Count="3">
+    <Units Count="4">
       <Unit0>
         <Filename Value="BigMetro.lpr"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="BigMetro"/>
       </Unit0>
       <Unit1>
@@ -43 +42 @@
         <IsPartOfProject Value="True"/>
         <ComponentName Value="FormMain"/>
+        <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="UFormMain"/>
@@ -51 +51 @@
         <UnitName Value="UEngine"/>
       </Unit2>
+      <Unit3>
+        <Filename Value="UGeometric.pas"/>
+        <IsPartOfProject Value="True"/>
+        <UnitName Value="UGeometric"/>
+      </Unit3>
     </Units>
   </ProjectOptions>

trunk/BigMetro.lpr

@@ -8 +8 @@
   {$ENDIF}{$ENDIF}
   Interfaces, // this includes the LCL widgetset
-  Forms, UFormMain, UEngine
+  Forms, UFormMain, UEngine, UGeometric
   { you can add units after this };
 

trunk/UEngine.pas

@@ -70 +70 @@
     TargetStation: TMetroStation;
     function GetPos: TPoint;
-    function GetNextStation: TMetroStation;
     constructor Create;
     destructor Destroy; override;
@@ -115 +114 @@
     function GetExistStationShapes: TStationShapeSet;
     function GetStationOnPos(Pos: TPoint): TMetroStation;
+    function GetLineOnPos(Pos: TPoint): TMetroLine;
     procedure DrawLine(Canvas: TCanvas; Pos: TPoint);
     procedure DrawShape(Canvas: TCanvas; Position: TPoint; Shape: TStationShape;
@@ -133 +133 @@
     procedure Tick;
     procedure MouseMove(Position: TPoint);
-    procedure MouseClick(Button: TMouseButton; Position: TPoint);
+    procedure MouseUp(Button: TMouseButton; Position: TPoint);
+    procedure MouseDown(Button: TMouseButton; Position: TPoint);
     procedure Reset;
     constructor Create;
@@ -155 +156 @@
 implementation
 
-
-function Distance(P1, P2: TPoint): Integer;
-begin
-  Result := Trunc(Sqrt(Sqr(P2.x - P1.X) + Sqr(P2.Y - P1.Y)));
-end;
+uses
+  UGeometric;
 
 { TMetroPassengers }
@@ -303 +301 @@
 end;
 
-function TMetroTrain.GetNextStation: TMetroStation;
-begin
-
-end;
-
 constructor TMetroTrain.Create;
 begin
@@ -361 +354 @@
   if I < Stations.Count then Result := TMetroStation(Stations[I])
     else Result := nil;
+end;
+
+function TEngine.GetLineOnPos(Pos: TPoint): TMetroLine;
+var
+  I: Integer;
+  T: Integer;
+  D: Integer;
+const
+  Distance = 30;
+begin
+  Result := nil;
+  I := 0;
+  while (I < Lines.Count) do
+  with TMetroLine(Lines[I]) do begin
+    for T := 1 to High(TrackPoints) do begin
+      D := PointToLineDistance(Pos, TrackPoints[T - 1], TrackPoints[T]);
+      if D < Distance then begin
+        Result := TMetroLine(Lines[I]);
+        Break;
+      end;
+    end;
+    if Assigned(Result) then Break;
+    Inc(I);
+  end;
 end;
 
@@ -515 +532 @@
 end;
 
-procedure TEngine.MouseClick(Button: TMouseButton; Position: TPoint);
+procedure TEngine.MouseUp(Button: TMouseButton; Position: TPoint);
 var
   Station: TMetroStation;
+  Line: TMetroLine;
   I: Integer;
   Train: TMetroTrain;
 begin
   if Button = mbLeft then begin
+    // Line color selection
     for I := 0 to Lines.Count - 1 do
       if Distance(Point(View.Size.X div 2 - Length(LineColors) div 2 * LineColorsDist + I * LineColorsDist,
@@ -529 +548 @@
         end;
 
+    // Station selection
     Station := GetStationOnPos(Position);
     if Assigned(Station) then
-      if Assigned(SelectedLine) and (SelectedLine.Stations.IndexOf(Station) = -1) then begin
+      if Assigned(SelectedLine) and ((SelectedLine.Stations.IndexOf(Station) = -1) or
+      (((SelectedLine.Stations.First = Station) and (SelectedLine.Stations.Last <> Station)))) then begin
         SelectedLine.Stations.Add(Station);
         Station.Lines.Add(SelectedLine);
@@ -548 +569 @@
           end;
         end;
+        Exit
       end;
+
+    // Line selection
+    Line := GetLineOnPos(Position);
+    if Assigned(Line) then begin
+      SelectedLine := Line;
+      Exit;
+    end;
   end;
   if Button = mbRight then begin
     SelectedLine := nil;
   end;
+end;
+
+procedure TEngine.MouseDown(Button: TMouseButton; Position: TPoint);
+begin
+
 end;
 

trunk/UFormMain.pas

@@ -70 +70 @@
   Shift: TShiftState; X, Y: Integer);
 begin
-
+  Engine.MouseDown(Button, Point(X, Y));
 end;
 
@@ -82 +82 @@
   Shift: TShiftState; X, Y: Integer);
 begin
-  Engine.MouseClick(Button, Point(X, Y));
+  Engine.MouseUp(Button, Point(X, Y));
 end;