Changeset 44 for trunk

Timestamp:

Nov 19, 2017, 10:59:54 AM (6 years ago)

Author:

chronos

Message:

• Fixed: Removed compilation warnings.
• Modified: Preparation for 1.0.0 version release.

Location:

trunk

Files:

• BigMetro.lpi (modified) (3 diffs)
• BigMetro.res (modified) ( previous)
• Forms/UFormMain.pas (modified) (1 diff)
• Install/deb/debian/control (modified) (1 diff)
• Install/deb/debian/rules (modified) (1 diff)
• Install/win/BigMetro.iss (modified) (1 diff)
• Install/win/build.bat (modified) (1 diff)
• Release notes.txt (added)
• UEngine.pas (modified) (5 diffs)
• UGeometric.pas (modified) (2 diffs)
• UMetaCanvas.pas (modified) (2 diffs)

trunk/BigMetro.lpi

@@ -2 +2 @@
 <CONFIG>
   <ProjectOptions>
-    <Version Value="9"/>
+    <Version Value="10"/>
     <General>
       <SessionStorage Value="InProjectDir"/>
@@ -14 +14 @@
       <EnableI18N LFM="False"/>
     </i18n>
-    <VersionInfo>
-      <StringTable ProductVersion=""/>
-    </VersionInfo>
     <BuildModes Count="4">
       <Item1 Name="Debug" Default="True"/>
@@ -223 +220 @@
     </Linking>
     <Other>
+      <CompilerMessages>
+        <IgnoredMessages idx5024="True"/>
+      </CompilerMessages>
       <CustomOptions Value="-dDEBUG"/>
     </Other>

trunk/Forms/UFormMain.pas

@@ -33 +33 @@
     procedure PaintBox1Resize(Sender: TObject);
     procedure Timer1Timer(Sender: TObject);
-  private
-    procedure EraseBackground(DC: HDC); override;
   public
     Engine: TEngine;
+    procedure EraseBackground(DC: HDC); override;
   end;
 

trunk/Install/deb/debian/control

@@ -3 +3 @@
 Section: utils
 Priority: optional
-Standards-Version: 1.0.0
+Standards-Version: 1.1.0
 Build-Depends: fpc, lazarus, lcl, lcl-utils, debhelper (>= 8)
 

trunk/Install/deb/debian/rules

@@ -1 +1 @@
 #!/usr/bin/make -f
+
+# Set temporary HOME for lazarus primary config directory
+export HOME=$(CURDIR)/tmphome
 
 ROOT = $(CURDIR)/debian/bigmetro

trunk/Install/win/BigMetro.iss

@@ -4 +4 @@
 #define MyAppName "BigMetro"
 #define MyAppNameShort "BigMetro"
-#define MyAppVersion "1.0-alfa"
+#define MyAppVersion "1.1-alfa"
 #define MyAppPublisher "Chronosoft"
 #define MyAppPublisherShort "Chronosoft"

trunk/Install/win/build.bat

@@ -1 @@
-set LAZARUSDIR=C:\lazarus
-
-%LAZARUSDIR%\lazbuild ..\BigMetro.lpi --build-mode="Windows 32-bit" --lazarusdir=%LAZARUSDIR%
-%LAZARUSDIR%\lazbuild ..\BigMetro.lpi --build-mode="Windows 64-bit" --lazarusdir=%LAZARUSDIR%
+if not defined LAZDIR (
+  set LAZDIR=C:\lazarus
+)
+%LAZDIR%\lazbuild.exe --lazarusdir=%LAZDIR% --build-mode="Windows 32-bit" ..\..\BigMetro.lpi
+%LAZDIR%\lazbuild.exe --lazarusdir=%LAZDIR% --build-mode="Windows 64-bit" ..\..\BigMetro.lpi
 
 "c:\Program Files (x86)\Inno Setup 5\ISCC.exe" "BigMetro.iss"

trunk/UEngine.pas

@@ -1306 +1306 @@
 procedure TEngine.ResizeView;
 var
-  StationRect: TRect;
   NewPoint: TPoint;
 begin
@@ -1533 +1532 @@
 var
   I: Integer;
-  L: Integer;
   S: TStationShape;
 begin
@@ -2093 +2091 @@
 var
   Station: TMapStation;
-  Line: TMetroLine;
-  I: Integer;
   NewLine: TMetroLine;
   Track: TTrackLink;
@@ -2390 +2386 @@
     end;
 
-    if ShowDistances then begin
+{    if ShowDistances then begin
       Canvas.Brush.Style := bsClear;
       Text := '';
@@ -2397 +2393 @@
       Canvas.TextOut(Position.X + StationSize div 2, Position.Y + StationSize div 2, Text);
     end;
+    }
   end;
 

trunk/UGeometric.pas

@@ -53 +53 @@
 var
   l2, t: Double;
-  projection, tt: TPoint;
+  tt: TPoint;
 begin
   // Return minimum distance between line segment vw and point p
@@ -74 +74 @@
     Exit;
   end;
-  //projection := v + t * (w - v);  // Projection falls on the segment
   TT.X := Trunc(V.X + T * (W.X - V.X));
   TT.Y := Trunc(V.Y + T * (W.Y - V.Y));

trunk/UMetaCanvas.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, Graphics, Contnrs, GraphMath, Types;
+  Classes, SysUtils, Graphics, Contnrs, Types;
 
 type
@@ -124 +124 @@
     procedure DoLine (x1,y1,x2,y2:integer); override;
     procedure DoTextOut(X, Y: Integer; Text: string); override;
-    procedure TextOut(X,Y: Integer; const Text: String); override;
     procedure DoRectangle(const Bounds: TRect); override;
     procedure DoRectangleFill(const Bounds: TRect); override;
-    procedure Polygon(Points: PPoint; NumPts: Integer; Winding: boolean = False); override;
     procedure DoPolygon(const Points: array of TPoint); override;
     procedure CreateHandle; override;
+    procedure DoEllipse(const Bounds: TRect); override;
+    procedure DoMoveTo(X, Y: Integer); override;
+    procedure DoLineTo(X, Y: Integer); override;
+  public
+    Objects: TObjectList;
+    procedure TextOut(X,Y: Integer; const Text: String); override;
+    procedure Polygon(Points: PPoint; NumPts: Integer; Winding: boolean = False); override;
     procedure Ellipse(x1, y1, x2, y2: Integer); override;
-    procedure DoEllipse(const Bounds: TRect); override;
     procedure StretchDraw(const DestRect: TRect; SrcGraphic: TGraphic); override;
     function TextExtent(const Text: string): TSize; override;
-    procedure DoMoveTo(X, Y: Integer); override;
-    procedure DoLineTo(X, Y: Integer); override;
     procedure Pie(EllipseX1, EllipseY1, EllipseX2, EllipseY2,
       StartX, StartY, EndX, EndY: Integer); override;
-  public
-    Objects: TObjectList;
     procedure SetSize(Size: TPoint);
     procedure Reset;