lazmapviewer: Improved drawing of tracks across the dateline. Patch by Yuliyan Ivanov.
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@9166 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
parent
b82be46994
commit
7df5988462
@ -99,7 +99,7 @@ procedure Register;
|
||||
implementation
|
||||
|
||||
uses
|
||||
GraphType, LCLType, FPImage, Math, Generics.Collections,
|
||||
GraphType, LCLType, FPImage, Math,
|
||||
mvTypes, RGBRoutines;
|
||||
|
||||
procedure Register;
|
||||
|
||||
@ -48,7 +48,6 @@ type
|
||||
procedure SetPenWidth(AValue: Integer); virtual; abstract;
|
||||
class procedure DoScanFill(APoly: array of TPoint; ALineDrawProc: TLineDrawProc);
|
||||
class procedure CalcBezier(APoints: array of TPoint; Continuous: Boolean; out APoly: TPointArray);
|
||||
class function ComparePoints(constref L, R: TPoint): Integer;
|
||||
public
|
||||
function GetCacheItemClass: TPictureCacheItemClass; virtual; abstract;
|
||||
procedure CreateBuffer(AWidth, AHeight: Integer); virtual; abstract;
|
||||
@ -99,14 +98,18 @@ function OrthoVec(X1, Y1, X2, Y2: Integer; out MX, MY: Double): Boolean;
|
||||
//
|
||||
function Intersect(P1, P2, P3, P4: TPoint; out PX: TPoint): Integer;
|
||||
|
||||
// Clip line segment <P1, P2> to rectangle ARect. Cohen-Sutherland algorithm.
|
||||
// Returns True when line entirely clipped.
|
||||
//
|
||||
function ClipLineToRect(constref ARect: TRect; var P1, P2: TPoint): Boolean;
|
||||
|
||||
// Polyline bounds
|
||||
procedure PolyBounds(APoly: array of TPoint; out ABounds: TRect);
|
||||
|
||||
implementation
|
||||
|
||||
uses
|
||||
Math, LCLType, FPImage, //GraphMath,
|
||||
Generics.Collections, Generics.Defaults;
|
||||
Math, LCLType, FPImage, fgl;
|
||||
|
||||
function Intersect(P1, P2, P3, P4: TPoint; out PX: TPoint): Integer;
|
||||
var
|
||||
@ -196,13 +199,87 @@ begin
|
||||
Result := True;
|
||||
end;
|
||||
|
||||
function ClipLineToRect(constref ARect: TRect; var P1, P2: TPoint): Boolean;
|
||||
|
||||
function PtArea(P: TPoint): Integer; inline;
|
||||
begin
|
||||
Result := 0;
|
||||
if P.X < ARect.Left then
|
||||
Result := Result or 1{L}
|
||||
else if P.X > ARect.Right then
|
||||
Result := Result or 2{R};
|
||||
if P.Y < ARect.Top then
|
||||
Result := Result or 4{T}
|
||||
else if P.Y > ARect.Bottom then
|
||||
Result := Result or 8{B};
|
||||
end;
|
||||
|
||||
var
|
||||
A, A1, A2: Integer;
|
||||
P: TPoint;
|
||||
begin
|
||||
A1 := PtArea(P1);
|
||||
A2 := PtArea(P2);
|
||||
while True do
|
||||
begin
|
||||
if (A1 = 0) and (A2 = 0) then
|
||||
Exit(False)
|
||||
else if (A1 and A2) <> 0 then
|
||||
Exit(True)
|
||||
else
|
||||
begin
|
||||
if A1 <> 0
|
||||
then A := A1
|
||||
else A := A2;
|
||||
if (A and 1{L}) <> 0 then
|
||||
begin
|
||||
P.X := ARect.Left;
|
||||
P.Y := P1.Y + ((P2.Y - P1.Y) * (ARect.Left - P1.X)) div (P2.X - P1.X);
|
||||
end
|
||||
else if (A and 2{R}) <> 0 then
|
||||
begin
|
||||
P.X := ARect.Right;
|
||||
P.Y := P1.Y + ((P2.Y - P1.Y) * (ARect.Right - P1.X)) div (P2.X - P1.X);
|
||||
end
|
||||
else if (A and 4{T}) <> 0 then
|
||||
begin
|
||||
P.X := P1.X + ((P2.X - P1.X) * (ARect.Top - P1.Y)) div (P2.Y - P1.Y);
|
||||
P.Y := ARect.Top;
|
||||
end
|
||||
else if (A and 8{B}) <> 0 then
|
||||
begin
|
||||
P.X := P1.X + ((P2.X - P1.X) * (ARect.Bottom - P1.Y)) div (P2.Y - P1.Y);
|
||||
P.Y := ARect.Bottom;
|
||||
end;
|
||||
if A = A1 then
|
||||
begin
|
||||
P1 := P;
|
||||
A1 := PtArea(P);
|
||||
end
|
||||
else
|
||||
begin
|
||||
P2 := P;
|
||||
A2 := PtArea(P);
|
||||
end;
|
||||
end;
|
||||
end;
|
||||
end;
|
||||
|
||||
function ComparePoints_1(const L, R: TPoint
|
||||
): Integer;
|
||||
begin
|
||||
Result := L.X - R.X;
|
||||
if Result = 0 then
|
||||
Result := L.Y - R.Y;
|
||||
end;
|
||||
|
||||
class procedure TMvCustomDrawingEngine.DoScanFill(APoly: array of TPoint;
|
||||
ALineDrawProc: TLineDrawProc);
|
||||
var
|
||||
XI, YI: LongInt;
|
||||
NPoly: array of TPoint = Nil;
|
||||
Bounds: TRect;
|
||||
XPoints: specialize TList<TPoint>;
|
||||
XPoints: specialize TFPGList<TPoint>;
|
||||
I, R, L: Integer;
|
||||
|
||||
// Intersect NPoly with the scan line segment <A, B>. Result in XPoints.
|
||||
@ -285,7 +362,7 @@ var
|
||||
otherwise ; // No intersection
|
||||
end;
|
||||
end;
|
||||
XPoints.Sort(specialize TComparer<TPoint>.Construct(@ComparePoints));
|
||||
XPoints.Sort(@ComparePoints_1);
|
||||
end;
|
||||
|
||||
begin
|
||||
@ -315,7 +392,7 @@ begin
|
||||
// Get bounds of the new polygon
|
||||
PolyBounds(NPoly, Bounds);
|
||||
|
||||
XPoints := specialize TList<TPoint>.Create;
|
||||
XPoints := specialize TFPGList<TPoint>.Create;
|
||||
try
|
||||
// Scan each other horizontal line
|
||||
YI := Bounds.Top;
|
||||
@ -360,14 +437,6 @@ begin
|
||||
end;
|
||||
end;
|
||||
|
||||
class function TMvCustomDrawingEngine.ComparePoints(constref L, R: TPoint
|
||||
): Integer;
|
||||
begin
|
||||
Result := L.X - R.X;
|
||||
if Result = 0 then
|
||||
Result := L.Y - R.Y;
|
||||
end;
|
||||
|
||||
procedure TMvCustomDrawingEngine.DrawBitmapOT(X, Y: Integer;
|
||||
ABitmap: TCustomBitmap; AOpaqueColor, ATransparentColor: TColor);
|
||||
var
|
||||
|
||||
@ -190,6 +190,7 @@ function PtInsideArea(const aPoint: TRealPoint; const Area: TRealArea): boolean;
|
||||
function AreaInsideArea(const AreaIn: TRealArea; const AreaOut: TRealArea): boolean;
|
||||
procedure ExtendArea(var AreaToExtend: TRealArea; const Area: TRealArea);
|
||||
function GetAreaOf(objs: TGPSObjList): TRealArea;
|
||||
function GoingEast(Lon1, Lon2: Double): Boolean;
|
||||
|
||||
|
||||
implementation
|
||||
@ -197,6 +198,13 @@ implementation
|
||||
uses
|
||||
mvExtraData, mvMapViewer;
|
||||
|
||||
function GoingEast(Lon1, Lon2: Double): Boolean;
|
||||
begin
|
||||
// Assume the shortest path (<180 deg)
|
||||
Result := ((Lon1 < Lon2) and (Lon2 - Lon1 < 180.0))
|
||||
or ((Lon1 > 0) and (Lon2 < 0) and (Lon1 - Lon2 > 180.0));
|
||||
end;
|
||||
|
||||
function hasIntersectArea(const Area1: TRealArea; const Area2: TRealArea): boolean;
|
||||
begin
|
||||
Result := Area1.Intersects(Area2);
|
||||
@ -773,15 +781,28 @@ procedure TGPSTrack.GetArea(out Area: TRealArea);
|
||||
var
|
||||
i: integer;
|
||||
ptArea: TRealArea;
|
||||
pt1, pt2: TRealPoint;
|
||||
begin
|
||||
Area.Init(0, 0, 0, 0);
|
||||
if FPoints.Count > 0 then
|
||||
begin
|
||||
pt1 := FPoints[0].RealPoint;
|
||||
Area := FPoints[0].BoundingBox;
|
||||
for i:=1 to pred(FPoints.Count) do
|
||||
begin
|
||||
ptArea := FPoints[i].BoundingBox;
|
||||
pt2 := FPoints[I].RealPoint;
|
||||
if GoingEast(pt1.Lon, pt2.Lon) then
|
||||
begin
|
||||
ptArea.TopLeft := pt1;
|
||||
ptArea.BottomRight := pt2;
|
||||
end
|
||||
else
|
||||
begin
|
||||
ptArea.TopLeft := pt2;
|
||||
ptArea.BottomRight := pt1;
|
||||
end;
|
||||
ExtendArea(Area, ptArea);
|
||||
pt1 := pt2;
|
||||
end;
|
||||
end;
|
||||
end;
|
||||
|
||||
@ -130,6 +130,7 @@ Type
|
||||
public
|
||||
constructor Create(AOwner: TComponent); override;
|
||||
destructor Destroy; override;
|
||||
function CyclicPointOf(APoint: TPoint; ARefX: LongInt; Eastwards: Boolean = True): TPoint;
|
||||
function CyclicPointsOf(APoint: TPoint): TPointArray;
|
||||
procedure DrawPointOfInterest(const {%H-}Area: TRealArea; APt: TGPSPointOfInterest);
|
||||
procedure DrawPt(const {%H-}Area: TRealArea; APt: TGPSPoint);
|
||||
@ -191,7 +192,7 @@ Type
|
||||
|
||||
{ TGPSTileLayerBase }
|
||||
|
||||
TGPSTileLayerBase = class(TGPSPoint)
|
||||
TGPSTileLayerBase = class(TGPSObj)
|
||||
private
|
||||
FDrawMode: TItemDrawMode;
|
||||
FMapProvider: String;
|
||||
@ -500,6 +501,7 @@ end;
|
||||
procedure TMapView.SetCenter(AValue: TRealPoint);
|
||||
begin
|
||||
Engine.Center := AValue;
|
||||
Invalidate;
|
||||
end;
|
||||
|
||||
procedure TMapView.SetCyclic(AValue: Boolean);
|
||||
@ -799,81 +801,89 @@ end;
|
||||
|
||||
procedure TMapView.DrawTrack(const Area: TRealArea; trk: TGPSTrack);
|
||||
var
|
||||
I, J, K: integer;
|
||||
iPt1, iPt2: TPoint;
|
||||
Pt1Cyc, Pt2Cyc: TPointArray;
|
||||
iPt1Visible, iPt2Visible: Boolean;
|
||||
I, L, T, WS: Integer;
|
||||
ClipRect: TRect;
|
||||
iPt1, iPt2, iPt3, iPt4: TPoint;
|
||||
ToEast: Boolean;
|
||||
pt1, pt2: TRealPoint;
|
||||
trkColor: TColor;
|
||||
trkWidth: Integer;
|
||||
VisibleArea: TRealArea;
|
||||
|
||||
function CheckAcrossArea(constref P1, P2: TRealPoint): Boolean; inline;
|
||||
var
|
||||
A: TRealArea;
|
||||
procedure ClipDrawLine(P1, P2: TPoint); inline;
|
||||
begin
|
||||
A.Init(P1, P2);
|
||||
Result := A.Intersects(VisibleArea);
|
||||
if not ClipLineToRect(ClipRect, P1, P2) then
|
||||
DrawingEngine.Line(P1.X, P1.Y, P2.X, P2.Y);
|
||||
end;
|
||||
|
||||
begin
|
||||
if not trk.Visible or (trk.Points.Count = 0) then
|
||||
exit;
|
||||
|
||||
// Determine track color
|
||||
if trk.LineColor = clDefault then
|
||||
// Determine track color
|
||||
if trk.LineColor = clDefault then
|
||||
begin
|
||||
trkColor := ColorToRGB(FDefaultTrackColor);
|
||||
if (trk.ExtraData <> nil) and trk.ExtraData.InheritsFrom(TDrawingExtraData) then
|
||||
trkColor := TDrawingExtraData(trk.ExtraData).Color;
|
||||
end else
|
||||
trkColor := ColorToRGB(trk.LineColor);
|
||||
|
||||
// Determine track width
|
||||
if trk.LineWidth = -1 then
|
||||
begin
|
||||
trkWidth := FDefaultTrackWidth;
|
||||
if (trk.ExtraData <> nil) and trk.ExtraData.InheritsFrom(TTrackExtraData) then
|
||||
trkWidth := mmToPx(TTrackExtraData(trk.ExtraData).Width);
|
||||
end else
|
||||
trkWidth := mmToPx(trk.LineWidth);
|
||||
if trkWidth < 1 then trkWidth := 1;
|
||||
|
||||
|
||||
DrawingEngine.PenColor := trkColor;
|
||||
DrawingEngine.PenWidth := trkWidth;
|
||||
|
||||
// Clipping rectangle
|
||||
if Cyclic then
|
||||
ClipRect := Rect(0, 0, ClientWidth, ClientHeight)
|
||||
else
|
||||
begin
|
||||
L := Max(0, Engine.MapLeft);
|
||||
T := Max(0, Engine.MapTop);
|
||||
WS := ZoomFactor(Zoom) * TILE_SIZE;
|
||||
ClipRect := Rect(L, T, Min(Engine.MapLeft + WS, ClientWidth),
|
||||
Min(Engine.MapTop + WS, ClientHeight));
|
||||
end;
|
||||
|
||||
pt1 := trk.Points[0].RealPoint;
|
||||
iPt1 := Engine.LonLatToScreen(pt1);
|
||||
for I := 1 to Pred(trk.Points.Count) do
|
||||
begin
|
||||
pt2 := trk.Points[I].RealPoint;
|
||||
iPt2 := Engine.LonLatToScreen(pt2);
|
||||
ToEast := GoingEast(pt1.Lon, pt2.Lon); // Eastwards?
|
||||
iPt2 := CyclicPointOf(iPt2, iPt1.X, ToEast); // Nearest iPt2 to iPt1
|
||||
|
||||
// Rightmost cyclic copy of the segment
|
||||
if ToEast then
|
||||
begin
|
||||
trkColor := ColorToRGB(FDefaultTrackColor);
|
||||
if (trk.ExtraData <> nil) and trk.ExtraData.InheritsFrom(TDrawingExtraData) then
|
||||
trkColor := TDrawingExtraData(trk.ExtraData).Color;
|
||||
end else
|
||||
trkColor := ColorToRGB(trk.LineColor);
|
||||
|
||||
// Determine track width
|
||||
if trk.LineWidth = -1 then
|
||||
iPt3 := CyclicPointOf(iPt1, ClipRect.Right); // Left point
|
||||
iPt4 := (iPt2 - iPt1); // delta to the right point
|
||||
end
|
||||
else
|
||||
begin
|
||||
trkWidth := FDefaultTrackWidth;
|
||||
if (trk.ExtraData <> nil) and trk.ExtraData.InheritsFrom(TTrackExtraData) then
|
||||
trkWidth := mmToPx(TTrackExtraData(trk.ExtraData).Width);
|
||||
end else
|
||||
trkWidth := mmToPx(trk.LineWidth);
|
||||
if trkWidth < 1 then trkWidth := 1;
|
||||
|
||||
with Engine do
|
||||
VisibleArea.Init(ScreenToLonLat(Point(0, 0)),
|
||||
ScreenToLonLat(Point(Width, Height)));
|
||||
|
||||
DrawingEngine.PenColor := trkColor;
|
||||
DrawingEngine.PenWidth := trkWidth;
|
||||
pt1 := trk.Points[0].RealPoint;
|
||||
iPt1Visible := Area.ContainsPoint(pt1);
|
||||
K := -1; // Last calculated LonLatToScreen() point index
|
||||
for I := 1 to Pred(trk.Points.Count) do
|
||||
begin
|
||||
pt2 := trk.Points[i].RealPoint;
|
||||
iPt2Visible := Area.ContainsPoint(pt2);
|
||||
if iPt1Visible or iPt2Visible or CheckAcrossArea(pt1, pt2) then
|
||||
begin
|
||||
if K < Pred(I) then
|
||||
iPt1 := Engine.LonLatToScreen(pt1);
|
||||
iPt2 := Engine.LonLatToScreen(pt2);
|
||||
K := I;
|
||||
|
||||
if Cyclic then
|
||||
begin
|
||||
Pt1Cyc := CyclicPointsOf(iPt1);
|
||||
Pt2Cyc := CyclicPointsOf(iPt2);
|
||||
for J := 0 to High(Pt1Cyc) do
|
||||
DrawingEngine.Line(Pt1Cyc[J].X, Pt1Cyc[J].Y, Pt2Cyc[J].X, Pt2Cyc[J].Y);
|
||||
end
|
||||
else
|
||||
DrawingEngine.Line(iPt1.X, iPt1.Y, iPt2.X, iPt2.Y);
|
||||
|
||||
iPt1 := iPt2;
|
||||
end;
|
||||
pt1 := pt2;
|
||||
iPt1Visible := iPt2Visible;
|
||||
iPt3 := CyclicPointOf(iPt2, ClipRect.Right); // Left point
|
||||
iPt4 := (iPt1 - iPt2); // delta to the right point
|
||||
end;
|
||||
|
||||
// Draw all copies of the segment, right to left
|
||||
repeat
|
||||
ClipDrawLine(iPt3, iPt3 + iPt4);
|
||||
iPt3 := CyclicPointOf(iPt3, Pred(iPt3.X), False); // Next left cyclic iPt3
|
||||
until Max(iPt3.X, iPt3.X + iPt4.X) < ClipRect.Left;
|
||||
|
||||
pt1 := pt2;
|
||||
iPt1 := iPt2;
|
||||
end;
|
||||
end;
|
||||
|
||||
procedure TMapView.DrawPointOfInterest(const Area: TRealArea; APt: TGPSPointOfInterest);
|
||||
@ -956,7 +966,6 @@ var
|
||||
PtColor: TColor;
|
||||
extent: TSize;
|
||||
s: String;
|
||||
R, L, WorldSize: LongInt;
|
||||
|
||||
procedure DrawOne(Pt: TPoint);
|
||||
begin
|
||||
@ -1184,6 +1193,29 @@ begin
|
||||
inherited Destroy;
|
||||
end;
|
||||
|
||||
function TMapView.CyclicPointOf(APoint: TPoint; ARefX: LongInt;
|
||||
Eastwards: Boolean): TPoint;
|
||||
var
|
||||
WorldSize: Int64;
|
||||
begin
|
||||
Result := APoint;
|
||||
WorldSize := ZoomFactor(Zoom) * TILE_SIZE;
|
||||
if Eastwards then
|
||||
begin
|
||||
while Result.X < ARefX do
|
||||
Inc(Result.X, WorldSize);
|
||||
while Result.X > ARefX + WorldSize do
|
||||
Dec(Result.X, WorldSize);
|
||||
end
|
||||
else
|
||||
begin
|
||||
while Result.X > ARefX do
|
||||
Dec(Result.X, WorldSize);
|
||||
while Result.X < ARefX - WorldSize do
|
||||
Inc(Result.X, WorldSize);
|
||||
end;
|
||||
end;
|
||||
|
||||
function TMapView.CyclicPointsOf(APoint: TPoint): TPointArray;
|
||||
var
|
||||
I, R, L, WorldSize: LongInt;
|
||||
@ -1196,7 +1228,7 @@ begin
|
||||
end
|
||||
else
|
||||
begin
|
||||
WorldSize := 1 shl Zoom * TILE_SIZE;
|
||||
WorldSize := ZoomFactor(Zoom) * TILE_SIZE;
|
||||
SetLength(Result, 1 + Canvas.Width div WorldSize);
|
||||
Result[0] := APoint;
|
||||
I := 1; R := APoint.X + WorldSize; L := APoint.X - WorldSize;
|
||||
@ -1217,6 +1249,8 @@ begin
|
||||
Inc(R, WorldSize);
|
||||
Dec(L, WorldSize);
|
||||
end;
|
||||
if I < Length(Result) then
|
||||
SetLength(Result, I);
|
||||
end;
|
||||
end;
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user