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

LazMapViewer: Improved usability of Map Points Editor.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@9672 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz 2025-03-10 22:28:35 +00:00
parent d46dae3faa
commit e8c36f1bc2
2 changed files with 135 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

145
components/lazmapviewer/source/mvmapviewerpatheditform.lfm
View File

@ -1,25 +1,25 @@
object MapViewerPathEditForm: TMapViewerPathEditForm object MapViewerPathEditForm: TMapViewerPathEditForm
Left = 749 Left = 1036
Height = 227 Height = 227
Top = 324 Top = 315
Width = 324 Width = 413
AutoSize = True AutoSize = True
BorderStyle = bsSizeToolWin BorderStyle = bsSizeToolWin
Caption = 'MapViewer Path Editor' Caption = 'MapViewer Path Editor'
ClientHeight = 227 ClientHeight = 227
ClientWidth = 324 ClientWidth = 413
LCLVersion = '4.99.0.0' LCLVersion = '4.99.0.0'
OnActivate = FormActivate OnActivate = FormActivate
OnShow = FormShow OnShow = FormShow
object pnlFrame: TPanel object pnlFrame: TPanel
Left = 0 Left = 0
Height = 161 Height = 157
Top = 28 Top = 28
Width = 324 Width = 413
Align = alClient Align = alClient
BevelOuter = bvNone BevelOuter = bvNone
ClientHeight = 161 ClientHeight = 157
ClientWidth = 324 ClientWidth = 413
TabOrder = 0 TabOrder = 0
object lblSelectedLayer: TLabel object lblSelectedLayer: TLabel
AnchorSideTop.Control = cbSelectedLayer AnchorSideTop.Control = cbSelectedLayer
@ -27,7 +27,7 @@ object MapViewerPathEditForm: TMapViewerPathEditForm
AnchorSideRight.Control = cbSelectedLayer AnchorSideRight.Control = cbSelectedLayer
Left = 32 Left = 32
Height = 15 Height = 15
Top = 121 Top = 127
Width = 31 Width = 31
Alignment = taRightJustify Alignment = taRightJustify
Anchors = [akTop, akRight] Anchors = [akTop, akRight]
@ -42,12 +42,12 @@ object MapViewerPathEditForm: TMapViewerPathEditForm
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 68 Left = 68
Height = 23 Height = 23
Top = 117 Top = 123
Width = 253 Width = 342
Anchors = [akTop, akLeft, akRight] Anchors = [akTop, akLeft, akRight]
BorderSpacing.Top = 3 BorderSpacing.Top = 6
BorderSpacing.Right = 3 BorderSpacing.Right = 3
BorderSpacing.Bottom = 3 BorderSpacing.Bottom = 6
ItemHeight = 15 ItemHeight = 15
ParentColor = True ParentColor = True
ParentShowHint = False ParentShowHint = False
@ -63,28 +63,28 @@ object MapViewerPathEditForm: TMapViewerPathEditForm
AnchorSideRight.Control = pnlFrame AnchorSideRight.Control = pnlFrame
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 3 Left = 3
Height = 111 Height = 114
Top = 3 Top = 3
Width = 318 Width = 407
Anchors = [akTop, akLeft, akRight] Anchors = [akTop, akLeft, akRight]
AutoSize = True AutoSize = True
BorderSpacing.Around = 3 BorderSpacing.Around = 3
BevelInner = bvRaised BevelInner = bvRaised
BevelOuter = bvLowered BevelOuter = bvLowered
ClientHeight = 111 ClientHeight = 114
ClientWidth = 318 ClientWidth = 407
TabOrder = 1 TabOrder = 1
object lblSelectedPt: TLabel object lblSelectedPt: TLabel
AnchorSideLeft.Control = pnlSel AnchorSideLeft.Control = pnlSel
AnchorSideTop.Control = cbSelectedPt AnchorSideTop.Control = cbSelectedPt
AnchorSideTop.Side = asrCenter AnchorSideTop.Side = asrCenter
AnchorSideRight.Control = cbSelectedPt AnchorSideRight.Control = cbSelectedPt
Left = 8 Left = 14
Height = 15 Height = 15
Top = 9 Top = 9
Width = 51 Width = 51
Alignment = taRightJustify Alignment = taRightJustify
BorderSpacing.Left = 6 BorderSpacing.Left = 12
BorderSpacing.Right = 6 BorderSpacing.Right = 6
Caption = 'Selection:' Caption = 'Selection:'
ParentColor = False ParentColor = False
@ -95,10 +95,10 @@ object MapViewerPathEditForm: TMapViewerPathEditForm
AnchorSideTop.Control = pnlSel AnchorSideTop.Control = pnlSel
AnchorSideRight.Control = pnlSel AnchorSideRight.Control = pnlSel
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 65 Left = 71
Height = 23 Height = 23
Top = 5 Top = 5
Width = 248 Width = 331
Anchors = [akTop, akLeft, akRight] Anchors = [akTop, akLeft, akRight]
BorderSpacing.Top = 3 BorderSpacing.Top = 3
BorderSpacing.Right = 3 BorderSpacing.Right = 3
@ -110,29 +110,30 @@ object MapViewerPathEditForm: TMapViewerPathEditForm
TabOrder = 0 TabOrder = 0
end end
object lblLat: TLabel object lblLat: TLabel
AnchorSideLeft.Control = pnlSel
AnchorSideTop.Control = cbLat AnchorSideTop.Control = cbLat
AnchorSideTop.Side = asrCenter AnchorSideTop.Side = asrCenter
AnchorSideRight.Control = cbLat AnchorSideRight.Control = lblSelectedPt
Left = 40 AnchorSideRight.Side = asrBottom
Left = 19
Height = 15 Height = 15
Top = 35 Top = 35
Width = 19 Width = 46
Alignment = taRightJustify Alignment = taRightJustify
Anchors = [akTop, akRight] Anchors = [akTop, akRight]
BorderSpacing.Right = 6 BorderSpacing.Left = 6
Caption = 'Lat:' Caption = 'Latitude:'
ParentColor = False ParentColor = False
end end
object cbLat: TEdit object cbLat: TEdit
AnchorSideLeft.Control = cbSelectedPt AnchorSideLeft.Control = cbSelectedPt
AnchorSideTop.Control = cbSelectedPt AnchorSideTop.Control = cbSelectedPt
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = pnlSel
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 65 Left = 71
Height = 23 Height = 23
Top = 31 Top = 31
Width = 131 Width = 115
BorderSpacing.Top = 3 BorderSpacing.Top = 3
BorderSpacing.Right = 3 BorderSpacing.Right = 3
BorderSpacing.Bottom = 3 BorderSpacing.Bottom = 3
@ -146,15 +147,16 @@ object MapViewerPathEditForm: TMapViewerPathEditForm
object lblLon: TLabel object lblLon: TLabel
AnchorSideTop.Control = cbLon AnchorSideTop.Control = cbLon
AnchorSideTop.Side = asrCenter AnchorSideTop.Side = asrCenter
AnchorSideRight.Control = cbLon AnchorSideRight.Control = lblSelectedPt
Left = 36 AnchorSideRight.Side = asrBottom
Left = 8
Height = 15 Height = 15
Top = 61 Top = 61
Width = 23 Width = 57
Alignment = taRightJustify Alignment = taRightJustify
Anchors = [akTop, akRight] Anchors = [akTop, akRight]
BorderSpacing.Right = 6 BorderSpacing.Left = 6
Caption = 'Lon:' Caption = 'Longitude:'
ParentColor = False ParentColor = False
end end
object cbLon: TEdit object cbLon: TEdit
@ -164,10 +166,10 @@ object MapViewerPathEditForm: TMapViewerPathEditForm
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = pnlSel AnchorSideRight.Control = pnlSel
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 65 Left = 71
Height = 23 Height = 23
Top = 57 Top = 57
Width = 131 Width = 115
BorderSpacing.Right = 3 BorderSpacing.Right = 3
BorderSpacing.Bottom = 3 BorderSpacing.Bottom = 3
ParentShowHint = False ParentShowHint = False
@ -183,53 +185,56 @@ object MapViewerPathEditForm: TMapViewerPathEditForm
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = pnlSel AnchorSideRight.Control = pnlSel
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 65 Left = 71
Height = 23 Height = 23
Top = 83 Top = 83
Width = 248 Width = 331
Anchors = [akTop, akLeft, akRight] Anchors = [akTop, akLeft, akRight]
BorderSpacing.Top = 3 BorderSpacing.Top = 3
BorderSpacing.Right = 3 BorderSpacing.Right = 3
BorderSpacing.Bottom = 3 BorderSpacing.Bottom = 6
TabOrder = 3 TabOrder = 3
OnEditingDone = edCaptionEditingDone OnEditingDone = edCaptionEditingDone
end end
object lblCaption: TLabel object lblCaption: TLabel
AnchorSideTop.Control = edCaption AnchorSideTop.Control = edCaption
AnchorSideTop.Side = asrCenter AnchorSideTop.Side = asrCenter
AnchorSideRight.Control = edCaption AnchorSideRight.Control = lblSelectedPt
Left = 17 AnchorSideRight.Side = asrBottom
Left = 20
Height = 15 Height = 15
Top = 87 Top = 87
Width = 42 Width = 45
Alignment = taRightJustify
Anchors = [akTop, akRight] Anchors = [akTop, akRight]
BorderSpacing.Right = 6 BorderSpacing.Left = 6
Caption = 'Caption' Caption = 'Caption:'
end end
end end
end end
object pnlInfo: TPanel object pnlInfo: TPanel
Left = 0 Left = 0
Height = 38 Height = 39
Top = 189 Top = 188
Width = 324 Width = 413
Align = alBottom Align = alBottom
AutoSize = True AutoSize = True
ClientHeight = 38 BevelOuter = bvNone
ClientWidth = 324 ClientHeight = 39
ClientWidth = 413
TabOrder = 1 TabOrder = 1
object lblInfoTitle: TLabel object lblInfoTitle: TLabel
AnchorSideLeft.Control = pnlInfo AnchorSideLeft.Control = pnlInfo
AnchorSideTop.Control = pnlInfo AnchorSideTop.Control = pnlInfo
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
AnchorSideBottom.Side = asrBottom AnchorSideBottom.Side = asrBottom
Left = 4 Left = 6
Height = 15 Height = 15
Top = 4 Top = 3
Width = 59 Width = 59
BorderSpacing.Left = 3 BorderSpacing.Left = 6
BorderSpacing.Top = 3 BorderSpacing.Top = 3
BorderSpacing.Right = 3 BorderSpacing.Right = 6
Caption = 'lblInfotitle' Caption = 'lblInfotitle'
Font.Style = [fsBold] Font.Style = [fsBold]
Layout = tlCenter Layout = tlCenter
@ -239,11 +244,11 @@ object MapViewerPathEditForm: TMapViewerPathEditForm
AnchorSideLeft.Control = lblInfoTitle AnchorSideLeft.Control = lblInfoTitle
AnchorSideTop.Control = lblInfoTitle AnchorSideTop.Control = lblInfoTitle
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
Left = 4 Left = 6
Height = 15 Height = 15
Top = 19 Top = 18
Width = 55 Width = 55
BorderSpacing.Bottom = 3 BorderSpacing.Bottom = 6
Caption = 'lblInfoText' Caption = 'lblInfoText'
end end
end end
@ -251,7 +256,7 @@ object MapViewerPathEditForm: TMapViewerPathEditForm
Left = 0 Left = 0
Height = 28 Height = 28
Top = 0 Top = 0
Width = 324 Width = 413
AutoSize = True AutoSize = True
ButtonHeight = 28 ButtonHeight = 28
ButtonWidth = 28 ButtonWidth = 28
@ -271,15 +276,15 @@ object MapViewerPathEditForm: TMapViewerPathEditForm
Top = 0 Top = 0
Action = actNewPOI Action = actNewPOI
end end
object tbNewArea: TToolButton object tbNewTrack: TToolButton
Left = 57 Left = 57
Top = 0 Top = 0
Action = actNewArea Action = actNewTrack
end end
object tbNewTrack: TToolButton object tbNewArea: TToolButton
Left = 85 Left = 85
Top = 0 Top = 0
Action = actNewTrack Action = actNewArea
end end
object ToolButton6: TToolButton object ToolButton6: TToolButton
Left = 113 Left = 113
@ -316,10 +321,20 @@ object MapViewerPathEditForm: TMapViewerPathEditForm
Action = actZoomOut Action = actZoomOut
end end
end end
object Bevel: TBevel
Left = 3
Height = 3
Top = 185
Width = 407
Align = alBottom
BorderSpacing.Left = 3
BorderSpacing.Right = 3
Shape = bsTopLine
end
object alEditActions: TActionList object alEditActions: TActionList
Images = ilImages Images = ilImages
Left = 112 Left = 128
Top = 48 Top = 40
object actZoomIn: TAction object actZoomIn: TAction
Caption = 'Zoom In' Caption = 'Zoom In'
Hint = 'Zoom In' Hint = 'Zoom In'
@ -380,8 +395,8 @@ object MapViewerPathEditForm: TMapViewerPathEditForm
end end
object ilImages: TImageList object ilImages: TImageList
Scaled = True Scaled = True
Left = 240 Left = 272
Top = 48 Top = 40
Bitmap = { Bitmap = {
4C7A080000001000000010000000970800000000000078DAED987B5054F715C7 4C7A080000001000000010000000970800000000000078DAED987B5054F715C7
31A689669C4E53AB12291A3133A2409DFCD1496C6C9B76D28E694D334D42C768 31A689669C4E53AB12291A3133A2409DFCD1496C6C9B76D28E694D334D42C768

56
components/lazmapviewer/source/mvmapviewerpatheditform.pas
View File

@ -5,7 +5,7 @@ unit mvMapViewerPathEditForm;
interface interface
uses uses
Classes, ComCtrls, SysUtils, Forms, Controls, Graphics, Dialogs, StdCtrls, Classes, SysUtils, Math, Forms, Controls, Graphics, Dialogs, StdCtrls, ComCtrls,
ExtCtrls, Buttons, ActnList, mvMapViewer, mvGpsObj, mvTypes, Types; ExtCtrls, Buttons, ActnList, mvMapViewer, mvGpsObj, mvTypes, Types;
type type
@ -24,6 +24,7 @@ type
actZoomOut: TAction; actZoomOut: TAction;
actZoomIn: TAction; actZoomIn: TAction;
alEditActions: TActionList; alEditActions: TActionList;
Bevel: TBevel;
cbLon: TEdit; cbLon: TEdit;
cbSelectedLayer: TComboBox; cbSelectedLayer: TComboBox;
cbSelectedPt: TEdit; cbSelectedPt: TEdit;
@ -76,6 +77,8 @@ type
FTempPolyLine: TGPSPolyLine; FTempPolyLine: TGPSPolyLine;
FEditMode: TMapViewerPathEditMode; FEditMode: TMapViewerPathEditMode;
FSkipAPoint: Boolean; FSkipAPoint: Boolean;
FActivated: Boolean;
procedure AddTempPolylineOrRevert(ANewEditMode: TMapViewerPathEditMode);
procedure SetEditMode(AValue: TMapViewerPathEditMode); procedure SetEditMode(AValue: TMapViewerPathEditMode);
procedure CancelAddMode; procedure CancelAddMode;
procedure AddTempPoint; procedure AddTempPoint;
@ -140,21 +143,29 @@ end;
procedure TMapViewerPathEditForm.actSelectExecute(Sender: TObject); procedure TMapViewerPathEditForm.actSelectExecute(Sender: TObject);
begin begin
if (FTempPolyLine <> nil) and (FTempPolyLine.Points.Count > 0) then
AddTempPolyLineOrRevert(pemSelect);
EditMode := pemSelect; EditMode := pemSelect;
end; end;
procedure TMapViewerPathEditForm.actNewPOIExecute(Sender: TObject); procedure TMapViewerPathEditForm.actNewPOIExecute(Sender: TObject);
begin begin
if (FTempPolyLine <> nil) and (FTempPolyLine.Points.Count > 0) then
AddTempPolyLineOrRevert(pemAddPOI);
EditMode := pemAddPOI; EditMode := pemAddPOI;
end; end;
procedure TMapViewerPathEditForm.actNewTrackExecute(Sender: TObject); procedure TMapViewerPathEditForm.actNewTrackExecute(Sender: TObject);
begin begin
if (FTempPolyLine <> nil) and (FTempPolyLine.Points.Count > 0) then
AddTempPolyLineOrRevert(pemAddTrack);
EditMode := pemAddTrack; EditMode := pemAddTrack;
end; end;
procedure TMapViewerPathEditForm.actNewAreaExecute(Sender: TObject); procedure TMapViewerPathEditForm.actNewAreaExecute(Sender: TObject);
begin begin
if (FTempPolyLine <> nil) and (FTempPolyLine.Points.Count > 0) then
AddTempPolyLineOrRevert(pemAddArea);
EditMode := pemAddArea; EditMode := pemAddArea;
end; end;
@ -274,6 +285,36 @@ begin
UpdateControls; UpdateControls;
end; end;
{ When points for a new track or a new area are being added, but the user
selects another edit mode ("ANewEditMode"), the already prepared points
would be lost. --> We ask whether the track/area should be used or discarded. }
procedure TMapViewerPathEditForm.AddTempPolylineOrRevert(ANewEditMode: TMapViewerPathEditMode);
const
TRACK_AREA: array[boolean] of String = ('track', 'area');
var
msg: String;
begin
msg := Format(
'Click OK to really add the new %0:s.' + LineEnding +
'Click Cancel to discard the new %0:s.', [
TRACK_AREA[FEditMode = pemAddArea]
]);
if MessageDlg(msg, mtConfirmation, [mbOK, mbCancel], 0) = mrOK then
begin
case FEditMode of
pemAddArea: NewAreaFromTemp;
pemAddTrack: NewTrackFromTemp;
end;
// Tool button checked state was changed in previous command --> restore it.
case ANewEditMode of
pemSelect: actSelect.Checked := true;
pemAddPOI: actNewPOI.Checked := true;
pemAddArea: actNewArea.Checked := true;
pemAddTrack: actNewTrack.Checked := true;
end;
end;
end;
procedure TMapViewerPathEditForm.cbLatLonEditingDone(Sender: TObject); procedure TMapViewerPathEditForm.cbLatLonEditingDone(Sender: TObject);
var var
E: TEdit; E: TEdit;
@ -348,8 +389,18 @@ begin
end; end;
procedure TMapViewerPathEditForm.FormActivate(Sender: TObject); procedure TMapViewerPathEditForm.FormActivate(Sender: TObject);
var
w: Integer;
begin begin
if not FActivated then
begin
AutoSize := false;
w := MaxValue([lblSelectedPt.Width, lblLat.Width, lblLon.Width, lblCaption.Width]);
cbSelectedPt.Left := w + lblSelectedPt.BorderSpacing.Left + lblSelectedPt.BorderSpacing.Right;
cbSelectedLayer.Left := cbSelectedPt.Left + pnlSel.Left; cbSelectedLayer.Left := cbSelectedPt.Left + pnlSel.Left;
AutoSize := true;
FActivated := true;
end;
end; end;
procedure TMapViewerPathEditForm.FormShow(Sender: TObject); procedure TMapViewerPathEditForm.FormShow(Sender: TObject);
@ -500,7 +551,8 @@ begin
FTempPolyLine.Points.Add(TGPSPoint.CreateFrom(RealPt)); FTempPolyLine.Points.Add(TGPSPoint.CreateFrom(RealPt));
if EditMode = pemAddPOI then if EditMode = pemAddPOI then
NewPOIFromTemp NewPOIFromTemp
else if ssCtrl in GetKeyShiftState then else
if ssCtrl in GetKeyShiftState then
case EditMode of case EditMode of
pemAddTrack: NewTrackFromTemp; pemAddTrack: NewTrackFromTemp;
pemAddArea: NewAreaFromTemp; pemAddArea: NewAreaFromTemp;