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

LazMapviewer: Use intermediate class TCustomMarkerClickPlugin to have more control on published properties. Rename some identifiers.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@9699 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz 2025-03-24 12:22:10 +00:00
parent 8441d2546f
commit f7d9f1cbd8
3 changed files with 48 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
components/lazmapviewer/examples/plugin_demos/markereditor_demo/main.lfm
View File

@ -113,7 +113,7 @@ object MainForm: TMainForm
AnchorSideLeft.Control = cgPointTypes
AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = Panel1
AnchorSideBottom.Control = cbMultiSelect
AnchorSideBottom.Control = cbExtendSelection
AnchorSideBottom.Side = asrBottom
Left = 387
Height = 127
@ -137,25 +137,25 @@ object MainForm: TMainForm
ItemIndex = 1
Items.Strings = (
'Create new point'
'Add point to selection'
'Add shape to selection'
'Select point'
'Select points of shape'
'Toggle selected point'
'Select by dragging rectangle'
)
TabOrder = 1
OnClick = rgClickModeClick
end
object cbMultiSelect: TCheckBox
object cbExtendSelection: TCheckBox
AnchorSideLeft.Control = rgNewPointType
AnchorSideTop.Control = rgNewPointType
AnchorSideTop.Side = asrBottom
Left = 599
Height = 19
Top = 83
Width = 77
Caption = 'MultiSelect'
Width = 103
Caption = 'Extend selection'
TabOrder = 2
OnChange = cbMultiSelectChange
OnChange = cbExtendSelectionChange
end
object btnDeleteSelection: TButton
AnchorSideLeft.Control = rgNewPointType

8
components/lazmapviewer/examples/plugin_demos/markereditor_demo/main.pas
View File

@ -19,7 +19,7 @@ type
btnConvertToTrack: TButton;
btnConvertToArea: TButton;
cgPointTypes: TCheckGroup;
cbMultiSelect: TCheckBox;
cbExtendSelection: TCheckBox;
Label1: TLabel;
Label2: TLabel;
Panel1: TPanel;
@ -32,7 +32,7 @@ type
procedure btnConvertToTrackClick(Sender: TObject);
procedure btnConvertToAreaClick(Sender: TObject);
procedure cgPointTypesItemClick(Sender: TObject; Index: integer);
procedure cbMultiSelectChange(Sender: TObject);
procedure cbExtendSelectionChange(Sender: TObject);
procedure FormCreate(Sender: TObject);
procedure rgClickModeClick(Sender: TObject);
procedure rgNewPointTypeClick(Sender: TObject);
@ -247,9 +247,9 @@ begin
inc(counter);
end;
procedure TMainForm.cbMultiSelectChange(Sender: TObject);
procedure TMainForm.cbExtendSelectionChange(Sender: TObject);
begin
Plugin.MultiSelect := cbMultiSelect.Checked;
Plugin.ExtendSelection := cbExtendSelection.Checked;
end;
procedure TMainForm.NewPointHandler(AMapView: TMapView; APoint: TGPSPoint);

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

@ -92,17 +92,17 @@ type
end;
{ TMarkerClickPlugin }
{ TCustomMarkerClickPlugin }
TMarkerCanClickEvent = procedure (AMapView: TMapView; APoint: TGPSPoint; var CanClick: Boolean) of object;
TMarkerClickEvent = procedure (AMapView: TMapView; APoint: TGPSPoint) of object;
TMarkerClickPlugin = class(TMvMarkerPlugin)
TCustomMarkerClickPlugin = class(TMvMarkerPlugin)
private
FCursor: TCursor;
FShift: TShiftState;
FOnCanClick: TMarkerCanClickEvent;
FOnMarkerClick: TMarkerClickEvent;
FShift: TShiftState;
protected
FMouseDownOnMarker: Boolean;
FMousePoint: TPoint;
@ -115,16 +115,23 @@ type
procedure MouseUp({%H-}AMapView: TMapView; {%H-}Button: TMouseButton;
{%H-}AShift: TShiftState; {%H-}X,{%H-}Y: Integer; var {%H-}Handled: Boolean); override;
procedure SetMapView(AValue: TMapView); override;
property Shift: TShiftState read FShift write FShift default [ssLeft];
public
constructor Create(AOwner: TComponent); override;
published
property Cursor: TCursor read FCursor write FCursor default crHandPoint;
property Shift: TShiftState read FShift write FShift default [ssLeft];
property OnCanClick: TMarkerCanClickEvent read FOnCanClick write FOnCanClick;
property OnMarkerClick: TMarkerClickEvent read FOnMarkerClick write FOnMarkerClick;
end;
{ TMarkerClickPlugin }
TMarkerClickPlugin = class(TCustomMarkerClickPlugin)
published
property Shift;
end;
{ TMarkerEditorPlugin }
TMarkerDrawPointEvent = procedure (AMapView: TMapView;
@ -135,15 +142,15 @@ type
TMarkerStartDragEvent = procedure (AMapView: TMapView; var CanDrag: Boolean) of object;
TMarkerClickMode = (cmNewPoint, cmAddPointToSelection, cmAddShapeToSelection,
cmToggleSelectedPoint, cmRubberband);
TMarkerClickMode = (cmNewPoint, cmSelectPoint, cmSelectShape,
cmTogglePoint, cmRubberband);
TMarkerNewPointType = (nptGPSPoint, nptMapPoint);
TMarkerEditorPlugin = class(TMarkerClickPlugin)
private
const
DEFAULT_CLICKMODE = cmAddPointToSelection;
DEFAULT_CLICKMODE = cmSelectPoint;
DEFAULT_RUBBERBAND_BORDERCOLOR = clGray;
DEFAULT_RUBBERBAND_FILLCOLOR = clWhite;
DEFAULT_RUBBERBAND_OPACITY = 0.55;
@ -151,7 +158,7 @@ type
FClickMode: TMarkerClickMode;
FDragCursor: TCursor;
FDragging: Boolean;
FMultiSelect: Boolean;
FExtendSelection: Boolean;
FNewPointType: TMarkerNewPointType;
FRubberbandBorderColor: TColor;
FRubberbandFillColor: TColor;
@ -167,7 +174,7 @@ type
FOnStartDrag: TMarkerStartDragEvent;
FOnEndDrag: TNotifyEvent;
function IsOpacityStored: Boolean;
procedure SetMultiSelect(AValue: Boolean);
procedure SetExtendSelection(AValue: Boolean);
protected
procedure AddToSelection(AMapView: TMapView; APoint: TGPSPoint; AExtendSelection: Boolean);
procedure DeleteFromList(AMapView: TMapView; APoint: TGPSPoint);
@ -211,11 +218,12 @@ type
published
property ClickMode: TMarkerClickMode read FClickMode write FClickMode default DEFAULT_CLICKMODE;
property DragCursor: TCursor read FDragCursor write FDragCursor default crSizeAll;
property MultiSelect: Boolean read FMultiSelect write SetMultiSelect default false;
property ExtendSelection: Boolean read FExtendSelection write SetExtendSelection default false;
property NewPointType: TMarkerNewPointType read FNewPointType write FNewPointType default nptGPSPoint;
property RubberbandBorderColor: TColor read FRubberbandBorderColor write FRubberbandBorderColor default DEFAULT_RUBBERBAND_BORDERCOLOR;
property RubberbandFillColor: TColor read FRubberbandFillColor write FRubberbandFillColor default DEFAULT_RUBBERBAND_FILLCOLOR;
property RubberbandOpacity: Single read FRubberbandOpacity write FRubberbandOpacity stored IsOpacityStored;
property Shift;
property OnDrawPoint: TMarkerDrawPointEvent read FOnDrawPoint write FOnDrawPoint;
property OnEndDrag: TNotifyEvent read FOnEndDrag write FOnEndDrag;
property OnNewPoint: TMarkerNewPointEvent read FOnNewPoint write FOnNewPoint;
@ -360,9 +368,9 @@ begin
end;
{ TMarkerClickPlugin }
{ TCustomMarkerClickPlugin }
constructor TMarkerClickPlugin.Create(AOwner: TComponent);
constructor TCustomMarkerClickPlugin.Create(AOwner: TComponent);
begin
inherited;
FCursor := crHandPoint;
@ -370,8 +378,8 @@ begin
FShift := [ssLeft];
end;
procedure TMarkerClickPlugin.MouseDown(AMapView: TMapView; Button: TMouseButton;
AShift: TShiftState; X, Y: Integer; var Handled: Boolean);
procedure TCustomMarkerClickPlugin.MouseDown(AMapView: TMapView;
Button: TMouseButton; AShift: TShiftState; X, Y: Integer; var Handled: Boolean);
var
canClick: Boolean;
begin
@ -396,7 +404,7 @@ begin
end;
end;
procedure TMarkerClickPlugin.MouseMove(AMapView: TMapView;
procedure TCustomMarkerClickPlugin.MouseMove(AMapView: TMapView;
{%H-}AShift: TShiftState; X,Y: Integer; var Handled: Boolean);
var
gpsPoint: TGPSPoint;
@ -416,7 +424,7 @@ begin
AMapView.Cursor := IfThen(canClick, FCursor, FSavedCursor);
end;
procedure TMarkerClickPlugin.MouseUp(AMapView: TMapView; Button: TMouseButton;
procedure TCustomMarkerClickPlugin.MouseUp(AMapView: TMapView; Button: TMouseButton;
AShift: TShiftState; X, Y: Integer; var Handled: Boolean);
begin
FMouseDownOnMarker := false;
@ -425,7 +433,7 @@ end;
{ Store the original MapView cursor. Is used when the mouse is not over a
clickable point. If no MapView is assigned to the plugin it is assumed that
the MapView has the default cursor. }
procedure TMarkerClickPlugin.SetMapView(AValue: TMapView);
procedure TCustomMarkerClickPlugin.SetMapView(AValue: TMapView);
begin
inherited;
if Assigned(MapView) then
@ -929,11 +937,11 @@ begin
if FMouseDownOnMarker then
begin
case FClickMode of
cmAddPointToSelection:
AddToSelection(AMapView, FOrigGPSPoint, FMultiSelect);
cmAddShapeToSelection:
SelectAllPointsOfShape(AMapView, FOrigGPSPoint, FMultiSelect);
cmToggleSelectedPoint:
cmSelectPoint:
AddToSelection(AMapView, FOrigGPSPoint, FExtendSelection);
cmSelectShape:
SelectAllPointsOfShape(AMapView, FOrigGPSPoint, FExtendSelection);
cmTogglePoint:
ToggleSelected(AMapView, FOrigGPSPoint);
end;
Update;
@ -944,7 +952,7 @@ begin
cmNewPoint:
begin
FOrigGPSPoint := NewPoint(AMapView, X, Y);
AddToSelection(AMapView, FOrigGPSPoint, FMultiSelect);
AddToSelection(AMapView, FOrigGPSPoint, FExtendSelection);
Handled := true;
end;
cmRubberband:
@ -1133,7 +1141,7 @@ var
pts: TGPSObjArray;
i: Integer;
begin
if not FMultiSelect then
if not FExtendSelection then
FSelection.Clear;
R := RubberbandRect;
area.TopLeft := AMapView.ScreenToLatLon(R.TopLeft);
@ -1144,11 +1152,11 @@ begin
Update;
end;
procedure TMarkerEditorPlugin.SetMultiSelect(AValue: Boolean);
procedure TMarkerEditorPlugin.SetExtendSelection(AValue: Boolean);
begin
if FMultiSelect = AValue then exit;
FMultiSelect := AValue;
if (not FMultiSelect) then
if FExtendSelection = AValue then exit;
FExtendSelection := AValue;
if (not FExtendSelection) then
begin
FSelection.Clear;
if (FOrigGPSPoint <> nil) then
@ -1165,7 +1173,7 @@ begin
idx := FSelection.IndexOf(APoint);
if idx = -1 then
begin
if not FMultiSelect then
if not FExtendSelection then
FSelection.Clear;
FSelection.Add(APoint);
end else