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

LazMapViewer: Lock list of gps items during painting.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@8006 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2021-05-02 12:24:25 +00:00
parent ebe671bdf4
commit 9063163a69
2 changed files with 39 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -125,8 +125,6 @@ type
procedure _Delete(Idx: Integer; var DelLst: TGPSObjList); procedure _Delete(Idx: Integer; var DelLst: TGPSObjList);
procedure FreePending; procedure FreePending;
procedure DecRef; procedure DecRef;
procedure Lock;
procedure UnLock;
procedure CallModified(lst: TGPSObjList; Adding: boolean); procedure CallModified(lst: TGPSObjList; Adding: boolean);
// property Items: TGPSObjList read FItems; // property Items: TGPSObjList read FItems;
procedure IdsToObj(const Ids: TIdArray; out objs: TGPSObjArray; AIdOwner: integer); procedure IdsToObj(const Ids: TIdArray; out objs: TGPSObjArray; AIdOwner: integer);
@ -146,6 +144,9 @@ type
procedure BeginUpdate; procedure BeginUpdate;
procedure EndUpdate; procedure EndUpdate;
procedure Lock;
procedure UnLock;
property Count: integer read GetCount; property Count: integer read GetCount;
property Items[AIndex: Integer]: TGpsObj read GetItem; default; property Items[AIndex: Integer]: TGpsObj read GetItem; default;
property OnModified: TModifiedEvent read FOnModified write FOnModified; property OnModified: TModifiedEvent read FOnModified write FOnModified;

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

@ -617,6 +617,8 @@ var
extent: TSize; extent: TSize;
s: String; s: String;
begin begin
GPSItems.Lock;
try
if Assigned(FOnDrawGpsPoint) then begin if Assigned(FOnDrawGpsPoint) then begin
FOnDrawGpsPoint(Self, DrawingEngine, aPOI); FOnDrawGpsPoint(Self, DrawingEngine, aPOI);
exit; exit;
@ -651,6 +653,10 @@ begin
end; end;
extent := DrawingEngine.TextExtent(s); extent := DrawingEngine.TextExtent(s);
DrawingEngine.Textout(Pt.X - extent.CX div 2, Pt.Y + 5, s); DrawingEngine.Textout(Pt.X - extent.CX div 2, Pt.Y + 5, s);
finally
GPSItems.Unlock;
end;
end; end;
procedure TMapView.CallAsyncInvalidate; procedure TMapView.CallAsyncInvalidate;