paweld/lazarus-ccr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

LazMapViewer: Rename TMarkerSelectAndDragPlugin to TMarkerEditorPlugin. New option to add markers by the plugin.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@9695 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz 2025-03-22 12:33:27 +00:00
parent 3d757daf7d
commit e02d3d772e
3 changed files with 160 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
components/lazmapviewer/examples/plugin_demos/markerselectdrag_demo/main.lfm
View File

@ -2,17 +2,17 @@ object MainForm: TMainForm
Left = 513 Left = 513
Height = 566 Height = 566
Top = 157 Top = 157
Width = 796 Width = 833
Caption = 'Marker Select & Drag Demo' Caption = 'Marker Select & Drag Demo'
ClientHeight = 566 ClientHeight = 566
ClientWidth = 796 ClientWidth = 833
LCLVersion = '4.99.0.0' LCLVersion = '4.99.0.0'
OnCreate = FormCreate OnCreate = FormCreate
object MapView: TMapView object MapView: TMapView
Left = 0 Left = 0
Height = 457 Height = 442
Top = 0 Top = 0
Width = 796 Width = 833
Align = alClient Align = alClient
DownloadEngine = MapView.BuiltInDLE DownloadEngine = MapView.BuiltInDLE
DrawingEngine = MapView.BuiltInDE DrawingEngine = MapView.BuiltInDE
@ -25,7 +25,7 @@ object MainForm: TMainForm
object Bevel1: TBevel object Bevel1: TBevel
AnchorSideLeft.Control = Owner AnchorSideLeft.Control = Owner
AnchorSideLeft.Side = asrCenter AnchorSideLeft.Side = asrCenter
Left = 395 Left = 413
Height = 50 Height = 50
Top = 108 Top = 108
Width = 6 Width = 6
@ -33,14 +33,14 @@ object MainForm: TMainForm
end end
object Panel1: TPanel object Panel1: TPanel
Left = 0 Left = 0
Height = 109 Height = 124
Top = 457 Top = 442
Width = 796 Width = 833
Align = alBottom Align = alBottom
AutoSize = True AutoSize = True
BevelOuter = bvNone BevelOuter = bvNone
ClientHeight = 109 ClientHeight = 124
ClientWidth = 796 ClientWidth = 833
TabOrder = 1 TabOrder = 1
object cgPointTypes: TCheckGroup object cgPointTypes: TCheckGroup
AnchorSideLeft.Control = Panel1 AnchorSideLeft.Control = Panel1
@ -51,6 +51,7 @@ object MainForm: TMainForm
Width = 363 Width = 363
AutoFill = True AutoFill = True
AutoSize = True AutoSize = True
BorderSpacing.Right = 8
BorderSpacing.Around = 8 BorderSpacing.Around = 8
Caption = 'Allowed point types' Caption = 'Allowed point types'
ChildSizing.LeftRightSpacing = 12 ChildSizing.LeftRightSpacing = 12
@ -111,16 +112,17 @@ object MainForm: TMainForm
object rgClickMode: TRadioGroup object rgClickMode: TRadioGroup
AnchorSideLeft.Control = cgPointTypes AnchorSideLeft.Control = cgPointTypes
AnchorSideLeft.Side = asrBottom AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = cgPointTypes AnchorSideTop.Control = Panel1
AnchorSideBottom.Control = cbMultiSelect AnchorSideBottom.Control = cbMultiSelect
AnchorSideBottom.Side = asrBottom AnchorSideBottom.Side = asrBottom
Left = 379 Left = 387
Height = 95 Height = 108
Top = 8 Top = 8
Width = 166 Width = 166
Anchors = [akTop, akLeft, akBottom]
AutoFill = True AutoFill = True
AutoSize = True AutoSize = True
BorderSpacing.Right = 8
BorderSpacing.Around = 8
Caption = 'Click mode' Caption = 'Click mode'
ChildSizing.LeftRightSpacing = 12 ChildSizing.LeftRightSpacing = 12
ChildSizing.TopBottomSpacing = 6 ChildSizing.TopBottomSpacing = 6
@ -130,10 +132,11 @@ object MainForm: TMainForm
ChildSizing.ShrinkVertical = crsScaleChilds ChildSizing.ShrinkVertical = crsScaleChilds
ChildSizing.Layout = cclLeftToRightThenTopToBottom ChildSizing.Layout = cclLeftToRightThenTopToBottom
ChildSizing.ControlsPerLine = 1 ChildSizing.ControlsPerLine = 1
ClientHeight = 75 ClientHeight = 88
ClientWidth = 162 ClientWidth = 162
ItemIndex = 0 ItemIndex = 0
Items.Strings = ( Items.Strings = (
'Create new point'
'Add point to selection' 'Add point to selection'
'Add shape to selection' 'Add shape to selection'
'Toggle selected point' 'Toggle selected point'
@ -142,29 +145,26 @@ object MainForm: TMainForm
OnClick = rgClickModeClick OnClick = rgClickModeClick
end end
object cbMultiSelect: TCheckBox object cbMultiSelect: TCheckBox
AnchorSideLeft.Control = Label2 AnchorSideLeft.Control = rgNewPointType
AnchorSideLeft.Side = asrBottom AnchorSideTop.Control = rgNewPointType
AnchorSideTop.Control = Label1 AnchorSideTop.Side = asrBottom
AnchorSideTop.Side = asrCenter Left = 569
Left = 219
Height = 19 Height = 19
Top = 84 Top = 83
Width = 77 Width = 77
BorderSpacing.Left = 24
Caption = 'MultiSelect' Caption = 'MultiSelect'
TabOrder = 2 TabOrder = 2
OnChange = cbMultiSelectChange OnChange = cbMultiSelectChange
end end
object btnDeleteSelection: TButton object btnDeleteSelection: TButton
AnchorSideLeft.Control = rgClickMode AnchorSideLeft.Control = rgNewPointType
AnchorSideLeft.Side = asrBottom AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = rgClickMode AnchorSideTop.Control = rgClickMode
Left = 553 Left = 685
Height = 25 Height = 25
Top = 8 Top = 8
Width = 109 Width = 109
AutoSize = True AutoSize = True
BorderSpacing.Left = 8
Caption = 'Delete selection' Caption = 'Delete selection'
TabOrder = 3 TabOrder = 3
OnClick = btnDeleteSelectionClick OnClick = btnDeleteSelectionClick
@ -173,7 +173,7 @@ object MainForm: TMainForm
AnchorSideLeft.Control = btnDeleteSelection AnchorSideLeft.Control = btnDeleteSelection
AnchorSideTop.Control = btnDeleteSelection AnchorSideTop.Control = btnDeleteSelection
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
Left = 553 Left = 685
Height = 25 Height = 25
Top = 33 Top = 33
Width = 111 Width = 111
@ -186,7 +186,7 @@ object MainForm: TMainForm
AnchorSideLeft.Control = btnDeleteSelection AnchorSideLeft.Control = btnDeleteSelection
AnchorSideTop.Control = btnConvertToTrack AnchorSideTop.Control = btnConvertToTrack
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
Left = 553 Left = 685
Height = 25 Height = 25
Top = 58 Top = 58
Width = 107 Width = 107
@ -195,21 +195,22 @@ object MainForm: TMainForm
TabOrder = 5 TabOrder = 5
OnClick = btnConvertToAreaClick OnClick = btnConvertToAreaClick
end end
object rgGpsObjOrMapItem: TRadioGroup object rgNewPointType: TRadioGroup
AnchorSideLeft.Control = btnConvertToTrack AnchorSideLeft.Control = rgClickMode
AnchorSideLeft.Side = asrBottom AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = btnDeleteSelection AnchorSideTop.Control = Panel1
AnchorSideBottom.Control = btnConvertToArea AnchorSideBottom.Control = btnConvertToArea
AnchorSideBottom.Side = asrBottom AnchorSideBottom.Side = asrBottom
Left = 672 Left = 569
Height = 63 Height = 67
Top = 20 Top = 8
Width = 103 Width = 100
Anchors = [akTop, akLeft, akBottom] Anchors = [akTop, akLeft, akBottom]
AutoFill = True AutoFill = True
AutoSize = True AutoSize = True
BorderSpacing.Left = 8 BorderSpacing.Right = 8
BorderSpacing.Top = 12 BorderSpacing.Around = 8
Caption = 'New point type'
ChildSizing.LeftRightSpacing = 6 ChildSizing.LeftRightSpacing = 6
ChildSizing.EnlargeHorizontal = crsHomogenousChildResize ChildSizing.EnlargeHorizontal = crsHomogenousChildResize
ChildSizing.EnlargeVertical = crsHomogenousChildResize ChildSizing.EnlargeVertical = crsHomogenousChildResize
@ -217,14 +218,15 @@ object MainForm: TMainForm
ChildSizing.ShrinkVertical = crsScaleChilds ChildSizing.ShrinkVertical = crsScaleChilds
ChildSizing.Layout = cclLeftToRightThenTopToBottom ChildSizing.Layout = cclLeftToRightThenTopToBottom
ChildSizing.ControlsPerLine = 1 ChildSizing.ControlsPerLine = 1
ClientHeight = 43 ClientHeight = 47
ClientWidth = 99 ClientWidth = 96
ItemIndex = 0 ItemIndex = 0
Items.Strings = ( Items.Strings = (
'as TGPSObj' 'TGPSPoint'
'as TMapItem' 'TMapPoint'
) )
TabOrder = 6 TabOrder = 6
OnClick = rgNewPointTypeClick
end end
end end
object PluginManager: TMvPluginManager object PluginManager: TMvPluginManager

44
components/lazmapviewer/examples/plugin_demos/markerselectdrag_demo/main.pas
View File

@ -26,7 +26,7 @@ type
POI_Images: TImageList; POI_Images: TImageList;
MapView: TMapView; MapView: TMapView;
PluginManager: TMvPluginManager; PluginManager: TMvPluginManager;
rgGpsObjOrMapItem: TRadioGroup; rgNewPointType: TRadioGroup;
rgClickMode: TRadioGroup; rgClickMode: TRadioGroup;
procedure btnDeleteSelectionClick(Sender: TObject); procedure btnDeleteSelectionClick(Sender: TObject);
procedure btnConvertToTrackClick(Sender: TObject); procedure btnConvertToTrackClick(Sender: TObject);
@ -35,8 +35,10 @@ type
procedure cbMultiSelectChange(Sender: TObject); procedure cbMultiSelectChange(Sender: TObject);
procedure FormCreate(Sender: TObject); procedure FormCreate(Sender: TObject);
procedure rgClickModeClick(Sender: TObject); procedure rgClickModeClick(Sender: TObject);
procedure rgNewPointTypeClick(Sender: TObject);
private private
Plugin: TMarkerSelectAndDragPlugin; Plugin: TMarkerEditorPlugin;
procedure NewPointHandler(AMapView: TMapView; APoint: TGPSPoint);
public public
end; end;
@ -169,7 +171,8 @@ begin
AddGPSArea ([RealPoint(-60, -142), RealPoint(-70, -148), RealPoint(-64, -129)]); AddGPSArea ([RealPoint(-60, -142), RealPoint(-70, -148), RealPoint(-64, -129)]);
AddMapArea ([RealPoint(-60, -42), RealPoint(-70, -48), RealPoint(-64, -29)]); AddMapArea ([RealPoint(-60, -42), RealPoint(-70, -48), RealPoint(-64, -29)]);
Plugin := TMarkerSelectAndDragPlugin.Create(PluginManager); Plugin := TMarkerEditorPlugin.Create(PluginManager);
Plugin.OnNewPoint := @NewPointHandler;
for i := 0 to cgPointTypes.Items.Count-1 do for i := 0 to cgPointTypes.Items.Count-1 do
cgPointTypes.Checked[i] := true; cgPointTypes.Checked[i] := true;
@ -180,6 +183,11 @@ begin
Plugin.ClickMode := TMarkerClickMode(rgClickMode.ItemIndex); Plugin.ClickMode := TMarkerClickMode(rgClickMode.ItemIndex);
end; end;
procedure TMainForm.rgNewPointTypeClick(Sender: TObject);
begin
plugin.NewPointType := TMarkerNewPointType(rgNewPointType.ItemIndex);
end;
procedure TMainForm.cgPointTypesItemClick(Sender: TObject; Index: integer); procedure TMainForm.cgPointTypesItemClick(Sender: TObject; Index: integer);
var var
pointTypes: TMvPointTypes; pointTypes: TMvPointTypes;
@ -201,16 +209,18 @@ procedure TMainForm.btnConvertToTrackClick(Sender: TObject);
const const
counter: Integer = 0; counter: Integer = 0;
begin begin
case rgGpsObjOrMapItem.ItemIndex of case Plugin.NewPointType of
0: with Plugin.ConvertSelectedPointsToGPSTrack(MapView, 2000 + counter) do nptGPSPoint:
begin with Plugin.ConvertSelectedPointsToGPSTrack(MapView, 2000 + counter) do
LineColor := clGreen; begin
lineWidth := 1.0; LineColor := clGreen;
end; lineWidth := 1.0;
1: with Plugin.ConvertSelectedPointsToMapTrack(MapView, MapView.Layers[0]) do end;
begin nptMapPoint:
LineColor := clGreen; with Plugin.ConvertSelectedPointsToMapTrack(MapView, MapView.Layers[0]) do
LineWidth := 1.0; begin
LineColor := clGreen;
LineWidth := 1.0;
end; end;
end; end;
inc(counter); inc(counter);
@ -220,7 +230,7 @@ procedure TMainForm.btnConvertToAreaClick(Sender: TObject);
var var
counter: Integer = 0; counter: Integer = 0;
begin begin
case rgGpsObjOrMapItem.ItemIndex of case rgNewPointType.ItemIndex of
0: with Plugin.ConvertSelectedPointsToGPSArea(MapView, 3000 + counter) do 0: with Plugin.ConvertSelectedPointsToGPSArea(MapView, 3000 + counter) do
begin begin
FillColor := clGray; FillColor := clGray;
@ -242,5 +252,11 @@ begin
Plugin.MultiSelect := cbMultiSelect.Checked; Plugin.MultiSelect := cbMultiSelect.Checked;
end; end;
procedure TMainForm.NewPointHandler(AMapView: TMapView; APoint: TGPSPoint);
begin
if (Plugin.NewPointType = nptMapPoint) and (APoint is TGPSPointOfInterest) then
TGPSPointOfInterest(APoint).ImageIndex := 0;
end;
end. end.

123
components/lazmapviewer/source/addons/plugins/markers/mvmarkerplugins.pas
View File

@ -90,25 +90,31 @@ type
end; end;
{ TMarkerSelectAndDragPlugin } { TMarkerEditorPlugin }
TMarkerDrawPointEvent = procedure (AMapView: TMapView; TMarkerDrawPointEvent = procedure (AMapView: TMapView;
ADrawingEngine: TMvCustomDrawingEngine; AGPSPoint: TGPSPoint; ADrawingEngine: TMvCustomDrawingEngine; AGPSPoint: TGPSPoint;
AScreenPoint: TPoint; AMarkerSize: Integer) of object; AScreenPoint: TPoint; AMarkerSize: Integer) of object;
TMarkerNewPointEvent = procedure (AMapView: TMapView; APoint: TGPSPoint) of object;
TMarkerStartDragEvent = procedure (AMapView: TMapView; var CanDrag: Boolean) of object; TMarkerStartDragEvent = procedure (AMapView: TMapView; var CanDrag: Boolean) of object;
TMarkerClickMode = (mcmAddPointToSelection, mcmAddShapeToSelection, mcmToggleSelectedPoint); TMarkerClickMode = (mcmNewPoint, mcmAddPointToSelection, mcmAddShapeToSelection, mcmToggleSelectedPoint);
TMarkerSelectAndDragPlugin = class(TMarkerClickPlugin) TMarkerNewPointType = (nptGPSPoint, nptMapPoint);
TMarkerEditorPlugin = class(TMarkerClickPlugin)
private private
FClickMode: TMarkerClickMode; FClickMode: TMarkerClickMode;
FDragCursor: TCursor; FDragCursor: TCursor;
FDragging: Boolean; FDragging: Boolean;
FMultiSelect: Boolean; FMultiSelect: Boolean;
FNewPointType: TMarkerNewPointType;
FSelection: TGPSPointList; FSelection: TGPSPointList;
FOrigSelection: array of TRealPoint; // Selection before dragging starts FOrigSelection: array of TRealPoint; // Selection before dragging starts
FOnDrawPoint: TMarkerDrawPointEvent; FOnDrawPoint: TMarkerDrawPointEvent;
FOnNewPoint: TMarkerNewPointEvent;
FOnSelectionChange: TNotifyEvent; FOnSelectionChange: TNotifyEvent;
FOnStartDrag: TMarkerStartDragEvent; FOnStartDrag: TMarkerStartDragEvent;
FOnEndDrag: TNotifyEvent; FOnEndDrag: TNotifyEvent;
@ -144,14 +150,17 @@ type
procedure DeleteSelectedPoints(AMapView: TMapView); procedure DeleteSelectedPoints(AMapView: TMapView);
procedure MoveSelectionBy(AMapView: TMapView; dx, dy: Double); procedure MoveSelectionBy(AMapView: TMapView; dx, dy: Double);
procedure MoveSelectionBy(AMapView: TMapView; dx, dy: Integer); procedure MoveSelectionBy(AMapView: TMapView; dx, dy: Integer);
function NewPoint(AMapView: TMapView; X, Y: Integer): TGPSPoint;
procedure SelectAllPointsOfShape(AMapView: TMapView; APoint: TGPSPoint); procedure SelectAllPointsOfShape(AMapView: TMapView; APoint: TGPSPoint);
property Selection: TGPSPointList read FSelection; property Selection: TGPSPointList read FSelection;
published published
property ClickMode: TMarkerClickMode read FClickMode write FClickMode default mcmAddPointToSelection; property ClickMode: TMarkerClickMode read FClickMode write FClickMode default mcmAddPointToSelection;
property DragCursor: TCursor read FDragCursor write FDragCursor default crSizeAll; property DragCursor: TCursor read FDragCursor write FDragCursor default crSizeAll;
property MultiSelect: Boolean read FMultiSelect write SetMultiSelect default false; property MultiSelect: Boolean read FMultiSelect write SetMultiSelect default false;
property NewPointType: TMarkerNewPointType read FNewPointType write FNewPointType default nptGPSPoint;
property OnDrawPoint: TMarkerDrawPointEvent read FOnDrawPoint write FOnDrawPoint; property OnDrawPoint: TMarkerDrawPointEvent read FOnDrawPoint write FOnDrawPoint;
property OnEndDrag: TNotifyEvent read FOnEndDrag write FOnEndDrag; property OnEndDrag: TNotifyEvent read FOnEndDrag write FOnEndDrag;
property OnNewPoint: TMarkerNewPointEvent read FOnNewPoint write FOnNewPoint;
property OnSelectionChange: TNotifyEvent read FOnSelectionChange write FOnSelectionChange; property OnSelectionChange: TNotifyEvent read FOnSelectionChange write FOnSelectionChange;
property OnStartDrag: TMarkerStartDragEvent read FOnStartDrag write FOnStartDrag; property OnStartDrag: TMarkerStartDragEvent read FOnStartDrag write FOnStartDrag;
end; end;
@ -368,7 +377,7 @@ begin
end; end;
{ TMarkerSelectAndDragPlugin } { TMarkerEditorPlugin }
type type
TMarkerData = record TMarkerData = record
@ -393,20 +402,20 @@ begin
P.DateTime := M.DateTime; P.DateTime := M.DateTime;
end; end;
constructor TMarkerSelectAndDragPlugin.Create(AOwner: TComponent); constructor TMarkerEditorPlugin.Create(AOwner: TComponent);
begin begin
inherited; inherited;
FDragCursor := crSizeAll; FDragCursor := crSizeAll;
FSelection := TGPSPointList.Create(false); // false = do not free objects FSelection := TGPSPointList.Create(false); // false = do not free objects
end; end;
destructor TMarkerSelectAndDragPlugin.Destroy; destructor TMarkerEditorPlugin.Destroy;
begin begin
FSelection.Free; FSelection.Free;
inherited; inherited;
end; end;
procedure TMarkerSelectAndDragPlugin.AddToSelection(AMapView: TMapView; procedure TMarkerEditorPlugin.AddToSelection(AMapView: TMapView;
APoint: TGPSPoint); APoint: TGPSPoint);
var var
idx: Integer; idx: Integer;
@ -426,14 +435,14 @@ begin
DoSelectionChange(AMapView); DoSelectionChange(AMapView);
end; end;
procedure TMarkerSelectAndDragPlugin.AfterDrawObjects(AMapView: TMapView; procedure TMarkerEditorPlugin.AfterDrawObjects(AMapView: TMapView;
var {%H-}Handled: Boolean); var {%H-}Handled: Boolean);
begin begin
inherited; inherited;
DrawSelection(AMapView); DrawSelection(AMapView);
end; end;
function TMarkerSelectAndDragPlugin.ConvertSelectedPointsToGPSArea( function TMarkerEditorPlugin.ConvertSelectedPointsToGPSArea(
AMapView: TMapView; AreaID: Integer): TGPSArea; AMapView: TMapView; AreaID: Integer): TGPSArea;
var var
M: TMarkerData; M: TMarkerData;
@ -457,7 +466,7 @@ begin
DoSelectionChange(AMapView); DoSelectionChange(AMapView);
end; end;
function TMarkerSelectAndDragPlugin.ConvertSelectedPointsToMapArea( function TMarkerEditorPlugin.ConvertSelectedPointsToMapArea(
AMapView: TMapView; ALayer: TMapLayer): TMapArea; AMapView: TMapView; ALayer: TMapLayer): TMapArea;
var var
M: TMarkerData; M: TMarkerData;
@ -479,7 +488,7 @@ begin
DoSelectionChange(AMapView); DoSelectionChange(AMapView);
end; end;
function TMarkerSelectAndDragPlugin.ConvertSelectedPointsToGPSTrack( function TMarkerEditorPlugin.ConvertSelectedPointsToGPSTrack(
AMapView: TMapView; ATrackID: Integer): TGPSTrack; AMapView: TMapView; ATrackID: Integer): TGPSTrack;
var var
M: TMarkerData; M: TMarkerData;
@ -503,7 +512,7 @@ begin
DoSelectionChange(AMapView); DoSelectionChange(AMapView);
end; end;
function TMarkerSelectAndDragPlugin.ConvertSelectedPointsToMapTrack( function TMarkerEditorPlugin.ConvertSelectedPointsToMapTrack(
AMapView: TMapView; ALayer: TMapLayer): TMapTrack; AMapView: TMapView; ALayer: TMapLayer): TMapTrack;
var var
M: TMarkerData; M: TMarkerData;
@ -528,7 +537,7 @@ end;
{ Searches for the given point in all the point lists of the mapviewer { Searches for the given point in all the point lists of the mapviewer
(GPSItems, Layers, Tracks, Areas, POIs). If found, the point is removed (GPSItems, Layers, Tracks, Areas, POIs). If found, the point is removed
from the list and destroyed. } from the list and destroyed. }
procedure TMarkerSelectAndDragPlugin.DeleteFromList(AMapView: TMapView; procedure TMarkerEditorPlugin.DeleteFromList(AMapView: TMapView;
APoint: TGPSPoint); APoint: TGPSPoint);
var var
gpsObj: TGPSObj; gpsObj: TGPSObj;
@ -554,7 +563,7 @@ begin
collection.Delete(idx); collection.Delete(idx);
end; end;
procedure TMarkerSelectAndDragPlugin.DeleteSelectedPoints(AMapView: TMapView); procedure TMarkerEditorPlugin.DeleteSelectedPoints(AMapView: TMapView);
var var
i: Integer; i: Integer;
begin begin
@ -566,13 +575,13 @@ begin
Update; Update;
end; end;
procedure TMarkerSelectAndDragPlugin.DoSelectionChange(AMapView: TMapView); procedure TMarkerEditorPlugin.DoSelectionChange(AMapView: TMapView);
begin begin
if Assigned(FOnSelectionChange) then if Assigned(FOnSelectionChange) then
FOnSelectionChange(AMapView); FOnSelectionChange(AMapView);
end; end;
procedure TMarkerSelectAndDragPlugin.DragStart(AMapView: TMapView); procedure TMarkerEditorPlugin.DragStart(AMapView: TMapView);
var var
i: Integer; i: Integer;
canDrag: Boolean; canDrag: Boolean;
@ -591,7 +600,7 @@ begin
FOrigSelection[i] := FSelection[i].RealPoint; FOrigSelection[i] := FSelection[i].RealPoint;
end; end;
procedure TMarkerSelectAndDragPlugin.DragTo(AMapView: TMapView; X, Y: Integer); procedure TMarkerEditorPlugin.DragTo(AMapView: TMapView; X, Y: Integer);
var var
dX, dY: Integer; dX, dY: Integer;
begin begin
@ -605,7 +614,7 @@ begin
end; end;
end; end;
procedure TMarkerSelectAndDragPlugin.DragEnd(AMapView: TMapView); procedure TMarkerEditorPlugin.DragEnd(AMapView: TMapView);
begin begin
FDragging := false; FDragging := false;
AMapView.Cursor := FSavedCursor; AMapView.Cursor := FSavedCursor;
@ -615,7 +624,7 @@ end;
{ Draw the selection marker for the given point. The drawing engine already { Draw the selection marker for the given point. The drawing engine already
has been setup for the correct settings. } has been setup for the correct settings. }
procedure TMarkerSelectAndDragPlugin.DrawPoint(AMapView: TMapView; procedure TMarkerEditorPlugin.DrawPoint(AMapView: TMapView;
ADrawingEngine: TMvCustomDrawingEngine; AGpsPoint: TGPSPoint; ADrawingEngine: TMvCustomDrawingEngine; AGpsPoint: TGPSPoint;
AScreenPoint: TPoint; AMarkerSize: Integer); AScreenPoint: TPoint; AMarkerSize: Integer);
begin begin
@ -630,7 +639,7 @@ begin
); );
end; end;
procedure TMarkerSelectAndDragPlugin.DrawSelection(AMapView: TMapView); procedure TMarkerEditorPlugin.DrawSelection(AMapView: TMapView);
const const
MARKER_SIZE = 5; MARKER_SIZE = 5;
var var
@ -674,7 +683,7 @@ end;
{ Tries to find the point in one of the gps-type lists. { Tries to find the point in one of the gps-type lists.
If found, returns the found object and the index of the point in the list. If found, returns the found object and the index of the point in the list.
Otherwise, nil and -1 are returned, respectively. } Otherwise, nil and -1 are returned, respectively. }
procedure TMarkerSelectAndDragPlugin.FindContainerOfPoint(AMapView: TMapView; procedure TMarkerEditorPlugin.FindContainerOfPoint(AMapView: TMapView;
APoint: TGPSPoint; var AContainer: TGPSObj; var AIndex: Integer); APoint: TGPSPoint; var AContainer: TGPSObj; var AIndex: Integer);
var var
i, j, k: Integer; i, j, k: Integer;
@ -721,7 +730,7 @@ end;
{ Tries to find the point in one of the map-type collections of all layers. { Tries to find the point in one of the map-type collections of all layers.
If found, returns the collection and the index of the point in the collection. If found, returns the collection and the index of the point in the collection.
Otherwise, nil and -1 are returned, respectively. } Otherwise, nil and -1 are returned, respectively. }
procedure TMarkerSelectAndDragPlugin.FindMapCollection(AMapView: TMapView; procedure TMarkerEditorPlugin.FindMapCollection(AMapView: TMapView;
APoint: TGPSPoint; var ACollection: TMapCollectionBase; var AIndex: Integer); APoint: TGPSPoint; var ACollection: TMapCollectionBase; var AIndex: Integer);
var var
i, j, k: Integer; i, j, k: Integer;
@ -782,7 +791,7 @@ begin
end; end;
{ Moves the selection by the given amound of pixels in x and y direction. } { Moves the selection by the given amound of pixels in x and y direction. }
procedure TMarkerSelectAndDragPlugin.MoveSelectionBy(AMapView: TMapView; dx, dy: Integer); procedure TMarkerEditorPlugin.MoveSelectionBy(AMapView: TMapView; dx, dy: Integer);
var var
i: Integer; i: Integer;
P: TPoint; P: TPoint;
@ -799,7 +808,7 @@ begin
end; end;
{ Moves the selection by the given amound of degrees in x and y direction } { Moves the selection by the given amound of degrees in x and y direction }
procedure TMarkerSelectAndDragPlugin.MoveSelectionBy(AMapView: TMapView; dx, dy: Double); procedure TMarkerEditorPlugin.MoveSelectionBy(AMapView: TMapView; dx, dy: Double);
var var
i: Integer; i: Integer;
P: TPoint; P: TPoint;
@ -820,7 +829,7 @@ begin
end; end;
end; end;
procedure TMarkerSelectAndDragPlugin.MouseDown(AMapView: TMapView; procedure TMarkerEditorPlugin.MouseDown(AMapView: TMapView;
{%H-}Button: TMouseButton; {%H-}AShift: TShiftState; {%H-}Button: TMouseButton; {%H-}AShift: TShiftState;
X, Y: Integer; var Handled: Boolean); X, Y: Integer; var Handled: Boolean);
begin begin
@ -829,20 +838,31 @@ begin
if FMouseDownOnMarker then if FMouseDownOnMarker then
begin begin
case FClickMode of case FClickMode of
mcmAddPointToSelection: AddToSelection(AMapView, FOrigGPSPoint); mcmAddPointToSelection:
mcmAddShapeToSelection: SelectAllPointsOfShape(AMapView, FOrigGPSPoint); AddToSelection(AMapView, FOrigGPSPoint);
mcmToggleSelectedPoint: ToggleSelected(AMapView, FOrigGPSPoint); mcmAddShapeToSelection:
SelectAllPointsOfShape(AMapView, FOrigGPSPoint);
mcmToggleSelectedPoint:
ToggleSelected(AMapView, FOrigGPSPoint);
end; end;
Update; Update;
Handled := true; Handled := true;
end else end else
begin begin
FSelection.Clear; case FClickMode of
mcmNewPoint:
begin
FOrigGPSPoint := NewPoint(AMapView, X, Y);
AddToSelection(AMapView, FOrigGPSPoint);
end;
else
FSelection.Clear;
end;
Update; Update;
end; end;
end; end;
procedure TMarkerSelectAndDragPlugin.MouseMove(AMapView: TMapView; procedure TMarkerEditorPlugin.MouseMove(AMapView: TMapView;
{%H-}AShift: TShiftState; X,Y: Integer; var Handled: Boolean); {%H-}AShift: TShiftState; X,Y: Integer; var Handled: Boolean);
const const
SENSITIVITY = 5; SENSITIVITY = 5;
@ -869,7 +889,7 @@ begin
end; end;
end; end;
procedure TMarkerSelectAndDragPlugin.MouseUp(AMapView: TMapView; procedure TMarkerEditorPlugin.MouseUp(AMapView: TMapView;
{%H-}Button: TMouseButton; {%H-}AShift: TShiftState; {%H-}Button: TMouseButton; {%H-}AShift: TShiftState;
X, Y: Integer; var Handled: Boolean); X, Y: Integer; var Handled: Boolean);
begin begin
@ -878,7 +898,40 @@ begin
DragEnd(AMapView); DragEnd(AMapView);
end; end;
procedure TMarkerSelectAndDragPlugin.SelectAllPointsOfShape(AMapView: TMapView; function TMarkerEditorPlugin.NewPoint(AMapView: TMapView;
X, Y: Integer): TGPSPoint;
const
ID = 4000;
var
gpsPoint: TGPSPoint;
mapPoint: TMapPoint;
layer: TMapLayer;
rPt: TRealPoint;
begin
rPt := AMapView.ScreenToLatLon(Point(X, Y));
case FNewPointType of
nptGPSPoint:
begin
gpsPoint := TGPSPointOfInterest.CreateFrom(rPt);
AMapView.GPSItems.Add(gpsPoint, ID);
Result := gpsPoint;
end;
nptMapPoint:
begin
if AMapView.Layers.Count = 0 then
layer := AMapView.Layers.Add as TMapLayer
else
layer := AMapView.Layers[0];
mapPoint := layer.PointsOfInterest.Add as TMapPoint;
mapPoint.RealPoint := rPt;
Result := mapPoint.GPSObj as TGPSPoint;
end;
end;
if Assigned(FOnNewPoint) then
FOnNewPoint(AMapView, Result);
end;
procedure TMarkerEditorPlugin.SelectAllPointsOfShape(AMapView: TMapView;
APoint: TGPSPoint); APoint: TGPSPoint);
var var
obj: TGPSObj = nil; obj: TGPSObj = nil;
@ -938,7 +991,7 @@ begin
Finished; Finished;
end; end;
procedure TMarkerSelectAndDragPlugin.SetMultiSelect(AValue: Boolean); procedure TMarkerEditorPlugin.SetMultiSelect(AValue: Boolean);
begin begin
if FMultiSelect = AValue then exit; if FMultiSelect = AValue then exit;
FMultiSelect := AValue; FMultiSelect := AValue;
@ -950,7 +1003,7 @@ begin
Update; Update;
end; end;
procedure TMarkerSelectAndDragPlugin.ToggleSelected(AMapView: TMapView; procedure TMarkerEditorPlugin.ToggleSelected(AMapView: TMapView;
APoint: TGPSPoint); APoint: TGPSPoint);
var var
idx: Integer; idx: Integer;
@ -1141,7 +1194,7 @@ end;
initialization initialization
RegisterPluginClass(TMarkerHintPlugin, 'Marker hint'); RegisterPluginClass(TMarkerHintPlugin, 'Marker hint');
RegisterPluginClass(TMarkerClickPlugin, 'Marker click'); RegisterPluginClass(TMarkerClickPlugin, 'Marker click');
RegisterPluginClass(TMarkerSelectAndDragPlugin, 'Marker select and drag'); RegisterPluginClass(TMarkerEditorPlugin, 'Marker select and drag');
RegisterPluginClass(TDraggableMarkerPlugin, 'Draggable marker'); RegisterPluginClass(TDraggableMarkerPlugin, 'Draggable marker');
end. end.