pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

lazmapviewer: Less hints and warnings. Some cosmetic changes.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@6807 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2019-01-27 10:42:57 +00:00
parent 4110bb5f65
commit d5f756b59e
7 changed files with 92 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/lazmapviewer/source/mvdlefpc.pas
View File

@ -36,7 +36,7 @@ type
{ TMVDEFPC } { TMVDEFPC }
TMVDEFPC = class(TMvCustomDownloadEngine) TMVDEFPC = class(TMvCustomDownloadEngine)
protected public
procedure DownloadFile(const Url: string; AStream: TStream); override; procedure DownloadFile(const Url: string; AStream: TStream); override;
{$IF FPC_FullVersion >= 30101} {$IF FPC_FullVersion >= 30101}
published published

2
components/lazmapviewer/source/mvdownloadengine.pas
View File

@ -31,7 +31,7 @@ type
TMvCustomDownloadEngine = class(TComponent) TMvCustomDownloadEngine = class(TComponent)
public public
procedure DownloadFile(const Url: string; AStream: TStream); virtual; procedure DownloadFile(const {%H-}Url: string; {%H-}AStream: TStream); virtual;
end; end;

17
components/lazmapviewer/source/mvengine.pas
View File

@ -132,12 +132,12 @@ Type
procedure DblClick(Sender: TObject); procedure DblClick(Sender: TObject);
procedure MouseDown(Sender: TObject; Button: TMouseButton; procedure MouseDown(Sender: TObject; Button: TMouseButton;
Shift: TShiftState; X, Y: Integer); {%H-}Shift: TShiftState; X, Y: Integer);
procedure MouseMove(Sender: TObject; Shift: TShiftState; X, Y: Integer); procedure MouseMove(Sender: TObject; {%H-}Shift: TShiftState; X, Y: Integer);
procedure MouseUp(Sender: TObject; Button: TMouseButton; procedure MouseUp(Sender: TObject; Button: TMouseButton;
Shift: TShiftState; X, Y: Integer); {%H-}Shift: TShiftState; X, Y: Integer);
procedure MouseWheel(Sender: TObject; Shift: TShiftState; WheelDelta: Integer; procedure MouseWheel(Sender: TObject; {%H-}Shift: TShiftState; WheelDelta: Integer;
MousePos: TPoint; var Handled: Boolean); {%H-}MousePos: TPoint; var Handled: Boolean);
procedure ZoomOnArea(const aArea: TRealArea); procedure ZoomOnArea(const aArea: TRealArea);
property Center: TRealPoint read GetCenter write SetCenter; property Center: TRealPoint read GetCenter write SetCenter;
@ -355,8 +355,8 @@ function TMapViewerEngine.CalculateVisibleTiles(const aWin: TMapWindow): TArea;
var var
MaxX, MaxY, startX, startY: int64; MaxX, MaxY, startX, startY: int64;
begin begin
MaxX := (aWin.Width div TILE_SIZE) + 1; MaxX := (Int64(aWin.Width) div TILE_SIZE) + 1;
MaxY := (aWin.Height div TILE_SIZE) + 1; MaxY := (Int64(aWin.Height) div TILE_SIZE) + 1;
startX := (-(aWin.X)) div TILE_SIZE; startX := (-(aWin.X)) div TILE_SIZE;
startY := (-(aWin.Y)) div TILE_SIZE; startY := (-(aWin.Y)) div TILE_SIZE;
Result.Left := startX; Result.Left := startX;
@ -589,7 +589,6 @@ function TMapViewerEngine.LonLatToMapWin(const aWin: TMapWindow;
var var
tiles: Int64; tiles: Int64;
circumference: Int64; circumference: Int64;
lat: Extended;
res: Extended; res: Extended;
tmpX,tmpY : Double; tmpX,tmpY : Double;
begin begin
@ -711,7 +710,6 @@ procedure TMapViewerEngine.MoveMapCenter(Sender: TDragObj);
var var
old: TMemObj; old: TMemObj;
nCenter: TRealPoint; nCenter: TRealPoint;
Job: TJob;
aPt: TPoint; aPt: TPoint;
Begin Begin
if Sender.LnkObj=nil then if Sender.LnkObj=nil then
@ -876,7 +874,6 @@ end;
procedure TMapViewerEngine.SetMapProvider(AValue: String); procedure TMapViewerEngine.SetMapProvider(AValue: String);
var var
idx: integer; idx: integer;
zMin, zMax: integer;
begin begin
idx := lstProvider.IndexOf(aValue); idx := lstProvider.IndexOf(aValue);
if not ((aValue = '') or (idx <> -1)) then if not ((aValue = '') or (idx <> -1)) then

12
components/lazmapviewer/source/mvgeonames.pas
View File

@ -53,7 +53,7 @@ type
FFirstLocation: TResRec; FFirstLocation: TResRec;
FFoundLocation: TResRec; FFoundLocation: TResRec;
FOnNameFound: TNameFoundEvent; FOnNameFound: TNameFoundEvent;
procedure FoundTagHandler(NoCaseTag, ActualTag: string); procedure FoundTagHandler(NoCaseTag, {%H-}ActualTag: string);
procedure FoundTextHandler(AText: String); procedure FoundTextHandler(AText: String);
function Parse(AStr: PChar): TRealPoint; function Parse(AStr: PChar): TRealPoint;
// function RemoveTag(const str: String): TStringArray; // function RemoveTag(const str: String): TStringArray;
@ -231,9 +231,11 @@ end;
*) *)
function TMVGeoNames.Search(ALocationName: String; function TMVGeoNames.Search(ALocationName: String;
ADownloadEngine: TMvCustomDownloadEngine): TRealPoint; ADownloadEngine: TMvCustomDownloadEngine): TRealPoint;
{
const const
LAT_ID = '<span class="latitude">'; LAT_ID = '<span class="latitude">';
LONG_ID = '<span class="longitude">'; LONG_ID = '<span class="longitude">';
}
var var
s: string; s: string;
@ -257,11 +259,13 @@ var
var var
ms: TMemoryStream; ms: TMemoryStream;
url: String;
{
iRes,i : integer; iRes,i : integer;
lstRes : Array of TResRec; lstRes : Array of TResRec;
iStartDescr : integer; iStartDescr : integer;
lst : TStringArray; lst : TStringArray;
url: String; }
begin begin
FLocationName := ALocationName; FLocationName := ALocationName;
ms := TMemoryStream.Create; ms := TMemoryStream.Create;
@ -276,7 +280,7 @@ begin
end; end;
Result := Parse(PChar(s)); Result := Parse(PChar(s));
(* {
Result.Lon := 0; Result.Lon := 0;
Result.Lat := 0; Result.Lat := 0;
SetLength(lstRes, 0); SetLength(lstRes, 0);
@ -315,7 +319,7 @@ begin
FOnNameFound(lstRes[iRes].Name, lstRes[iRes].Descr, lstRes[iRes].Loc); FOnNameFound(lstRes[iRes].Name, lstRes[iRes].Descr, lstRes[iRes].Loc);
end; end;
end; end;
*) }
end; end;
end. end.

31
components/lazmapviewer/source/mvgpsobj.pas
View File

@ -120,7 +120,7 @@ type
FItems: TGPSObjList; FItems: TGPSObjList;
function Getcount: integer; function Getcount: integer;
protected protected
Procedure _Delete(Idx : Integer;out DelLst : TGPSObjList); Procedure _Delete(Idx: Integer; var DelLst: TGPSObjList);
Procedure FreePending; Procedure FreePending;
Procedure DecRef; Procedure DecRef;
procedure Lock; procedure Lock;
@ -267,8 +267,9 @@ begin
Result:=FItems.Count Result:=FItems.Count
end; end;
procedure TGPSObjectList._Delete(Idx: Integer; out DelLst: TGPSObjList); procedure TGPSObjectList._Delete(Idx: Integer; var DelLst: TGPSObjList); // wp: was "out"
var Item : TGpsObj; var
Item: TGpsObj;
begin begin
Lock; Lock;
Try Try
@ -331,7 +332,8 @@ end;
procedure TGPSObjectList.IdsToObj(const Ids: TIdArray; out objs: TGPSObjArray;IdOwner : integer); procedure TGPSObjectList.IdsToObj(const Ids: TIdArray; out objs: TGPSObjArray;IdOwner : integer);
function ToSelect(aId: integer): boolean; function ToSelect(aId: integer): boolean;
var i : integer; var
i: integer;
begin begin
result:=false; result:=false;
for i:=low(Ids) to high(Ids) do for i:=low(Ids) to high(Ids) do
@ -342,7 +344,8 @@ begin
end; end;
end; end;
var i,nb : integer; var
i,nb : integer;
begin begin
SetLength(objs,length(Ids)); SetLength(objs,length(Ids));
nb:=0; nb:=0;
@ -550,8 +553,10 @@ begin
end; end;
procedure TGPSObjectList.DeleteById(const Ids: array of integer); procedure TGPSObjectList.DeleteById(const Ids: array of integer);
function ToDelete(const AId : integer) : Boolean; function ToDelete(const AId : integer) : Boolean;
var i : integer; var
i: integer;
begin begin
result:=false; result:=false;
For i:=low(Ids) to high(Ids) do For i:=low(Ids) to high(Ids) do
@ -562,22 +567,25 @@ begin
end; end;
end; end;
var Extr : TDrawingExtraData; var
Extr: TDrawingExtraData;
i: integer; i: integer;
DelLst: TGPSObjList; DelLst: TGPSObjList;
begin begin
DelLst:=nil; DelLst:=nil;
Lock; Lock;
try try
For i:=Pred(Items.Count) downto 0 do for i:=Pred(Items.Count) downto 0 do
Begin begin
if Assigned(Items[i].ExtraData) then if Assigned(Items[i].ExtraData) then
Begin begin
if Items[i].ExtraData.InheritsFrom(TDrawingExtraData) then if Items[i].ExtraData.InheritsFrom(TDrawingExtraData) then
Begin begin
Extr := TDrawingExtraData(Items[i]); Extr := TDrawingExtraData(Items[i]);
// !!! wp: There is a warning that TGPSObj and TDrawingExtraData are not related !!!
if ToDelete(Extr.Id) then if ToDelete(Extr.Id) then
_Delete(i,DelLst); _Delete(i,DelLst);
// !!! wp: DelLst is a local var and created by _Delete but not destroyed anywhere here !!!
end; end;
end; end;
end; end;
@ -603,6 +611,7 @@ begin
end; end;
end; end;
{ TGPSTrack } { TGPSTrack }
function TGPSTrack.GetDateTime: TDateTime; function TGPSTrack.GetDateTime: TDateTime;

4
components/lazmapviewer/source/mvjobs.pas
View File

@ -35,7 +35,7 @@ type
protected protected
function pGetTask: integer; override; function pGetTask: integer; override;
procedure pTaskStarted(aTask: integer); override; procedure pTaskStarted(aTask: integer); override;
procedure pTaskEnded(aTask: integer; aExcept: Exception); override; procedure pTaskEnded(aTask: integer; {%H-}aExcept: Exception); override;
public public
function Running: boolean; override; function Running: boolean; override;
end; end;
@ -53,7 +53,7 @@ type
constructor Create(aEvent: TJobProc; Data: TObject; OwnData: Boolean; constructor Create(aEvent: TJobProc; Data: TObject; OwnData: Boolean;
JobName: String = ''); virtual; JobName: String = ''); virtual;
destructor Destroy; override; destructor Destroy; override;
procedure ExecuteTask(aTask: integer; FromWaiting: boolean); override; procedure ExecuteTask(aTask: integer; {%H-}FromWaiting: boolean); override;
end; end;

47
components/lazmapviewer/source/mvmapviewer.pas
View File

@ -61,10 +61,10 @@ Type
FPOIImage: TBitmap; FPOIImage: TBitmap;
FOnDrawGpsPoint: TDrawGpsPointEvent; FOnDrawGpsPoint: TDrawGpsPointEvent;
procedure CallAsyncInvalidate; procedure CallAsyncInvalidate;
procedure DoAsyncInvalidate(Data: PtrInt); procedure DoAsyncInvalidate({%H-}Data: PtrInt);
procedure DrawObjects(const TileId: TTileId; aLeft, aTop, aRight,aBottom: integer); procedure DrawObjects(const {%H-}TileId: TTileId; aLeft, aTop, aRight,aBottom: integer);
procedure DrawPt(const Area: TRealArea;aPOI: TGPSPoint); procedure DrawPt(const {%H-}Area: TRealArea;aPOI: TGPSPoint);
procedure DrawTrk(const Area: TRealArea;trk: TGPSTrack); procedure DrawTrack(const Area: TRealArea;trk: TGPSTrack);
function GetCacheOnDisk: boolean; function GetCacheOnDisk: boolean;
function GetCachePath: String; function GetCachePath: String;
function GetCenter: TRealPoint; function GetCenter: TRealPoint;
@ -77,7 +77,7 @@ Type
function GetZoom: integer; function GetZoom: integer;
procedure SetActive(AValue: boolean); procedure SetActive(AValue: boolean);
procedure SetCacheOnDisk(AValue: boolean); procedure SetCacheOnDisk(AValue: boolean);
procedure SetCachePath(AValue: String); procedure SetCachePath({%H-}AValue: String);
procedure SetCenter(AValue: TRealPoint); procedure SetCenter(AValue: TRealPoint);
procedure SetDownloadEngine(AValue: TMvCustomDownloadEngine); procedure SetDownloadEngine(AValue: TMvCustomDownloadEngine);
procedure SetInactiveColor(AValue: TColor); procedure SetInactiveColor(AValue: TColor);
@ -235,10 +235,11 @@ Type
{ TDrawObjJob } { TDrawObjJob }
function TDrawObjJob.pGetTask: integer; function TDrawObjJob.pGetTask: integer;
var i : integer; var
i: integer;
begin begin
if not(AllRun) and not(Cancelled) then if not(AllRun) and not(Cancelled) then
Begin begin
For i:=low(FStates) to high(FStates) do For i:=low(FStates) to high(FStates) do
if FStates[i]=0 then if FStates[i]=0 then
Begin Begin
@ -248,9 +249,9 @@ begin
AllRun:=True; AllRun:=True;
end; end;
Result:=ALL_TASK_COMPLETED; Result:=ALL_TASK_COMPLETED;
For i:=low(FStates) to high(FStates) do for i:=low(FStates) to high(FStates) do
if FStates[i]=1 then if FStates[i]=1 then
Begin begin
Result:=NO_MORE_TASK; Result:=NO_MORE_TASK;
Exit; Exit;
end; end;
@ -266,7 +267,7 @@ procedure TDrawObjJob.pTaskEnded(aTask: integer; aExcept: Exception);
begin begin
if Assigned(aExcept) then if Assigned(aExcept) then
FStates[aTask-1]:=3 FStates[aTask-1]:=3
Else else
FStates[aTask-1]:=2; FStates[aTask-1]:=2;
end; end;
@ -277,11 +278,11 @@ begin
iObj:=aTask-1; iObj:=aTask-1;
Obj:=FLst[iObj]; Obj:=FLst[iObj];
if Obj.InheritsFrom(TGPSTrack) then if Obj.InheritsFrom(TGPSTrack) then
Begin begin
Viewer.DrawTrk(FArea,TGPSTrack(Obj)); Viewer.DrawTrack(FArea,TGPSTrack(Obj));
End; end;
if Obj.InheritsFrom(TGPSPoint) then if Obj.InheritsFrom(TGPSPoint) then
Begin begin
Viewer.DrawPt(FArea,TGPSPoint(Obj)); Viewer.DrawPt(FArea,TGPSPoint(Obj));
end; end;
end; end;
@ -467,8 +468,6 @@ begin
end; end;
procedure TMapView.MouseMove(Shift: TShiftState; X, Y: Integer); procedure TMapView.MouseMove(Shift: TShiftState; X, Y: Integer);
var
aPt: TPoint;
begin begin
inherited MouseMove(Shift, X, Y); inherited MouseMove(Shift, X, Y);
if IsActive then if IsActive then
@ -552,7 +551,7 @@ begin
end; end;
end; end;
procedure TMapView.DrawTrk(const Area : TRealArea;trk : TGPSTrack); procedure TMapView.DrawTrack(const Area : TRealArea;trk : TGPSTrack);
var Old,New : TPoint; var Old,New : TPoint;
i : integer; i : integer;
aPt : TRealPoint; aPt : TRealPoint;
@ -641,11 +640,10 @@ Begin
end; end;
procedure TMapView.DrawObjects(const TileId: TTileId; aLeft, aTop,aRight,aBottom: integer); procedure TMapView.DrawObjects(const TileId: TTileId; aLeft, aTop,aRight,aBottom: integer);
var aPt : TPoint; var
aPt: TPoint;
Area: TRealArea; Area: TRealArea;
lst: TGPSObjList; lst: TGPSObjList;
i : integer;
trk : TGPSTrack;
begin begin
aPt.X:=aLeft; aPt.X:=aLeft;
aPt.Y:=aTop; aPt.Y:=aTop;
@ -660,11 +658,11 @@ begin
Engine.Jobqueue.AddJob(TDrawObjJob.Create(self,lst,Area),Engine) Engine.Jobqueue.AddJob(TDrawObjJob.Create(self,lst,Area),Engine)
else else
begin begin
freeAndNil(Lst); FreeAndNil(Lst);
CallAsyncInvalidate; CallAsyncInvalidate;
end; end;
end end
Else else
CallAsyncInvalidate; CallAsyncInvalidate;
end; end;
@ -676,15 +674,12 @@ end;
procedure TMapView.DoDrawTile(const TileId: TTileId; X, Y: integer; procedure TMapView.DoDrawTile(const TileId: TTileId; X, Y: integer;
TileImg: TLazIntfImage); TileImg: TLazIntfImage);
var
{$IFDEF USE_RGBGRAPHICS} {$IFDEF USE_RGBGRAPHICS}
var
temp : TRGB32Bitmap; temp : TRGB32Bitmap;
ri : TRawImage; ri : TRawImage;
BuffLaz : TLazIntfImage; BuffLaz : TLazIntfImage;
{$ENDIF} {$ENDIF}
{$IFDEF USE_LAZINTFIMAGE}
temp: TBitmap;
{$ENDIF}
begin begin
if Assigned(Buffer) then if Assigned(Buffer) then
begin begin