From b1be720320a3a1979f7be41f04091cbb673c1ec0 Mon Sep 17 00:00:00 2001 From: alpine-a110 Date: Fri, 29 Mar 2024 16:31:09 +0000 Subject: [PATCH] LazMapViewer: TMapViewer.CacheOnDisk property initialization fix. git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@9300 8e941d3f-bd1b-0410-a28a-d453659cc2b4 --- .../lazmapviewer/examples/elevations/main.lfm | 1 - .../lazmapviewer/examples/flights/main.lfm | 129 ++++++++---------- .../lazmapviewer/examples/fulldemo/main.lfm | 1 - .../examples/fulldemo_with_addons/main.lfm | 1 - .../lazmapviewer/source/mvmapviewer.pas | 2 +- 5 files changed, 61 insertions(+), 73 deletions(-) diff --git a/components/lazmapviewer/examples/elevations/main.lfm b/components/lazmapviewer/examples/elevations/main.lfm index 6fdbc2436..02b7e8b35 100644 --- a/components/lazmapviewer/examples/elevations/main.lfm +++ b/components/lazmapviewer/examples/elevations/main.lfm @@ -15,7 +15,6 @@ object MainForm: TMainForm Top = 0 Width = 614 Align = alClient - CacheOnDisk = False DownloadEngine = MapView.BuiltInDLE DrawingEngine = MapView.BuiltInDE Layers = <> diff --git a/components/lazmapviewer/examples/flights/main.lfm b/components/lazmapviewer/examples/flights/main.lfm index 46c91dc7b..6afe34bca 100644 --- a/components/lazmapviewer/examples/flights/main.lfm +++ b/components/lazmapviewer/examples/flights/main.lfm @@ -6,10 +6,9 @@ object MainForm: TMainForm Caption = 'Flights - LazMapViewer' ClientHeight = 662 ClientWidth = 942 - ShowHint = True - LCLVersion = '3.99.0.0' OnCreate = FormCreate OnDestroy = FormDestroy + ShowHint = True object MapView: TMapView Left = 0 Height = 662 @@ -17,7 +16,6 @@ object MainForm: TMainForm Width = 624 Active = True Align = alClient - CacheOnDisk = False Cyclic = True DefaultTrackColor = clSkyBlue DefaultTrackWidth = 3 @@ -28025,8 +28023,8 @@ object MainForm: TMainForm TabOrder = 1 object PgData: TTabSheet Caption = 'Tracking' - ClientHeight = 634 - ClientWidth = 310 + ClientHeight = 627 + ClientWidth = 312 object ZoomTrackBar: TTrackBar AnchorSideLeft.Control = PgData AnchorSideTop.Control = LblZoom @@ -28035,12 +28033,12 @@ object MainForm: TMainForm AnchorSideRight.Side = asrBottom Left = 2 Height = 40 - Top = 21 - Width = 306 + Top = 23 + Width = 308 Min = 1 + OnChange = ZoomTrackBarChange Position = 4 TickMarks = tmBoth - OnChange = ZoomTrackBarChange Anchors = [akTop, akLeft, akRight] BorderSpacing.Left = 2 BorderSpacing.Right = 2 @@ -28050,9 +28048,9 @@ object MainForm: TMainForm AnchorSideLeft.Control = PgData AnchorSideTop.Control = PgData Left = 6 - Height = 15 + Height = 17 Top = 6 - Width = 35 + Width = 43 BorderSpacing.Left = 6 BorderSpacing.Top = 6 Caption = 'Zoom:' @@ -28065,9 +28063,9 @@ object MainForm: TMainForm AnchorSideRight.Control = PgData AnchorSideRight.Side = asrBottom Left = 6 - Height = 70 - Top = 69 - Width = 298 + Height = 73 + Top = 71 + Width = 300 Anchors = [akTop, akLeft, akRight] AutoSize = True BorderSpacing.Left = 6 @@ -28075,17 +28073,17 @@ object MainForm: TMainForm BorderSpacing.Right = 6 BorderSpacing.InnerBorder = 4 Caption = 'Mouse position' - ClientHeight = 50 - ClientWidth = 294 + ClientHeight = 54 + ClientWidth = 296 TabOrder = 1 object lblMouseLon: TLabel AnchorSideLeft.Control = gbMouse AnchorSideTop.Control = lblMouseLat AnchorSideTop.Side = asrBottom Left = 8 - Height = 15 - Top = 27 - Width = 54 + Height = 17 + Top = 29 + Width = 68 BorderSpacing.Left = 8 BorderSpacing.Top = 4 Caption = 'Longitude' @@ -28095,9 +28093,9 @@ object MainForm: TMainForm AnchorSideLeft.Control = gbMouse AnchorSideTop.Control = gbMouse Left = 8 - Height = 15 + Height = 17 Top = 4 - Width = 43 + Width = 57 BorderSpacing.Left = 8 BorderSpacing.Top = 4 BorderSpacing.Bottom = 8 @@ -28110,10 +28108,10 @@ object MainForm: TMainForm AnchorSideTop.Side = asrBottom AnchorSideRight.Control = gbMouse AnchorSideRight.Side = asrBottom - Left = 244 - Height = 15 - Top = 27 - Width = 34 + Left = 235 + Height = 17 + Top = 29 + Width = 45 Alignment = taRightJustify Anchors = [akTop, akRight] BorderSpacing.Top = 4 @@ -28126,10 +28124,10 @@ object MainForm: TMainForm AnchorSideTop.Control = gbMouse AnchorSideRight.Control = gbMouse AnchorSideRight.Side = asrBottom - Left = 244 - Height = 15 + Left = 235 + Height = 17 Top = 4 - Width = 34 + Width = 45 Alignment = taRightJustify Anchors = [akTop, akRight] BorderSpacing.Top = 4 @@ -28146,25 +28144,25 @@ object MainForm: TMainForm AnchorSideRight.Control = gbMouse AnchorSideRight.Side = asrBottom Left = 6 - Height = 70 - Top = 147 - Width = 298 + Height = 73 + Top = 152 + Width = 300 Anchors = [akTop, akLeft, akRight] AutoSize = True BorderSpacing.Top = 8 BorderSpacing.InnerBorder = 4 Caption = 'Center' - ClientHeight = 50 - ClientWidth = 294 + ClientHeight = 54 + ClientWidth = 296 TabOrder = 2 object lblCenterLon: TLabel AnchorSideLeft.Control = gbCenter AnchorSideTop.Control = lblCenterLat AnchorSideTop.Side = asrBottom Left = 8 - Height = 15 - Top = 27 - Width = 54 + Height = 17 + Top = 29 + Width = 68 BorderSpacing.Left = 8 BorderSpacing.Top = 4 Caption = 'Longitude' @@ -28174,9 +28172,9 @@ object MainForm: TMainForm AnchorSideLeft.Control = gbCenter AnchorSideTop.Control = gbCenter Left = 8 - Height = 15 + Height = 17 Top = 4 - Width = 43 + Width = 57 BorderSpacing.Left = 8 BorderSpacing.Top = 4 BorderSpacing.Bottom = 8 @@ -28189,10 +28187,10 @@ object MainForm: TMainForm AnchorSideTop.Side = asrBottom AnchorSideRight.Control = gbCenter AnchorSideRight.Side = asrBottom - Left = 244 - Height = 15 - Top = 27 - Width = 34 + Left = 235 + Height = 17 + Top = 29 + Width = 45 Alignment = taRightJustify Anchors = [akTop, akRight] BorderSpacing.Top = 4 @@ -28205,10 +28203,10 @@ object MainForm: TMainForm AnchorSideTop.Control = gbCenter AnchorSideRight.Control = gbCenter AnchorSideRight.Side = asrBottom - Left = 244 - Height = 15 + Left = 235 + Height = 17 Top = 4 - Width = 34 + Width = 45 Alignment = taRightJustify Anchors = [akTop, akRight] BorderSpacing.Top = 4 @@ -28224,8 +28222,8 @@ object MainForm: TMainForm AnchorSideRight.Side = asrBottom AnchorSideBottom.Control = plInfo Left = 6 - Height = 246 - Top = 225 + Height = 231 + Top = 233 Width = 298 Anchors = [akTop, akLeft, akRight, akBottom] AutoFillColumns = True @@ -28233,8 +28231,6 @@ object MainForm: TMainForm ColCount = 3 Columns = < item - MinSize = 10 - MaxSize = 200 SizePriority = 0 Title.Alignment = taCenter Title.Caption = 'Flight' @@ -28242,19 +28238,14 @@ object MainForm: TMainForm ValueChecked = '-1' end item - ButtonStyle = cbsPickList - MinSize = 10 - MaxSize = 200 Title.Alignment = taCenter Title.Caption = 'Latitude' - Width = 112 + Width = 105 end item - MinSize = 10 - MaxSize = 200 Title.Alignment = taCenter Title.Caption = 'Longitude' - Width = 112 + Width = 106 end> FixedCols = 0 Options = [goFixedVertLine, goFixedHorzLine, goVertLine, goHorzLine, goRangeSelect, goRowSelect, goSmoothScroll] @@ -28263,8 +28254,8 @@ object MainForm: TMainForm OnDblClick = sgTracksDblClick ColWidths = ( 70 - 112 - 112 + 105 + 106 ) end object pnlFlightControl: TPanel @@ -28275,8 +28266,8 @@ object MainForm: TMainForm AnchorSideBottom.Side = asrBottom Left = 0 Height = 50 - Top = 584 - Width = 310 + Top = 577 + Width = 312 Anchors = [akLeft, akRight, akBottom] BevelOuter = bvNone ChildSizing.LeftRightSpacing = 5 @@ -28289,13 +28280,13 @@ object MainForm: TMainForm ChildSizing.Layout = cclLeftToRightThenTopToBottom ChildSizing.ControlsPerLine = 99 ClientHeight = 50 - ClientWidth = 310 + ClientWidth = 312 TabOrder = 4 object btnPlay: TSpeedButton Left = 5 Height = 40 Top = 5 - Width = 67 + Width = 65 Glyph.Data = { 36040000424D3604000000000000360000002800000010000000100000000100 2000000000000004000064000000640000000000000000000000000000000000 @@ -28335,10 +28326,10 @@ object MainForm: TMainForm OnClick = btnPlayClick end object btnPause: TSpeedButton - Left = 77 + Left = 75 Height = 40 Top = 5 - Width = 67 + Width = 65 Glyph.Data = { 36040000424D3604000000000000360000002800000010000000100000000100 2000000000000004000064000000640000000000000000000000000000000000 @@ -28378,10 +28369,10 @@ object MainForm: TMainForm OnClick = btnPauseClick end object btnStop: TSpeedButton - Left = 149 + Left = 145 Height = 40 Top = 5 - Width = 67 + Width = 65 Glyph.Data = { 36040000424D3604000000000000360000002800000010000000100000000100 2000000000000004000064000000640000000000000000000000000000000000 @@ -28421,10 +28412,10 @@ object MainForm: TMainForm OnClick = btnStopClick end object btnWarp: TSpeedButton - Left = 221 + Left = 215 Height = 40 Top = 5 - Width = 84 + Width = 92 Caption = 'Warp+' OnClick = btnWarpClick end @@ -28434,7 +28425,7 @@ object MainForm: TMainForm AnchorSideBottom.Control = pnlFlightControl Left = 6 Height = 33 - Top = 543 + Top = 536 Width = 298 Anchors = [akLeft, akRight, akBottom] BorderSpacing.Bottom = 8 @@ -28447,7 +28438,7 @@ object MainForm: TMainForm AnchorSideBottom.Control = pnlWarpInfo Left = 6 Height = 72 - Top = 471 + Top = 464 Width = 298 Anchors = [akLeft, akRight, akBottom] ClientHeight = 72 diff --git a/components/lazmapviewer/examples/fulldemo/main.lfm b/components/lazmapviewer/examples/fulldemo/main.lfm index eea57cc04..60b3abf05 100644 --- a/components/lazmapviewer/examples/fulldemo/main.lfm +++ b/components/lazmapviewer/examples/fulldemo/main.lfm @@ -19,7 +19,6 @@ object MainForm: TMainForm Top = 0 Width = 475 Align = alClient - CacheOnDisk = False Cyclic = True DefaultTrackColor = clBlue DefaultTrackWidth = 3 diff --git a/components/lazmapviewer/examples/fulldemo_with_addons/main.lfm b/components/lazmapviewer/examples/fulldemo_with_addons/main.lfm index a0180c717..bd3a9dcdb 100644 --- a/components/lazmapviewer/examples/fulldemo_with_addons/main.lfm +++ b/components/lazmapviewer/examples/fulldemo_with_addons/main.lfm @@ -18,7 +18,6 @@ object MainForm: TMainForm Top = 0 Width = 667 Align = alClient - CacheOnDisk = False Cyclic = True DefaultTrackColor = clBlue DefaultTrackWidth = 3 diff --git a/components/lazmapviewer/source/mvmapviewer.pas b/components/lazmapviewer/source/mvmapviewer.pas index 42c61399d..43504061f 100644 --- a/components/lazmapviewer/source/mvmapviewer.pas +++ b/components/lazmapviewer/source/mvmapviewer.pas @@ -2483,7 +2483,7 @@ begin FEngine := TMapViewerEngine.Create(self); FEngine.BkColor := colWhite; {FEngine.}CachePath := 'cache/'; - FEngine.CacheOnDisk := true; + {FEngine.}CacheOnDisk := true; FEngine.OnDrawTile := @DoDrawTile; FEngine.OnDrawStretchedTile := @DoDrawStretchedTile; FEngine.OnEraseBackground := @DoEraseBackground;