From 64723e46e1f3c47f0bf2ac429533b7df4dc93c29 Mon Sep 17 00:00:00 2001 From: wp_xxyyzz Date: Fri, 5 Apr 2024 15:12:11 +0000 Subject: [PATCH] LazMapViewer: Add missing PenStyle setters/getters to the LCL DrawingEngine. Some clean-up. git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@9327 8e941d3f-bd1b-0410-a28a-d453659cc2b4 --- .../lazmapviewer/examples/fulldemo/configframe.pas | 1 - .../examples/fulldemo/mapviewer_demo.lpi | 3 +-- .../source/addons/bgra_drawingengine/mvde_bgra.pas | 4 ++-- .../rgbgraphics_drawingengine/mvde_rgbgraphics.pas | 4 ++-- .../lazmapviewer/source/mvde_intfgraphics.pas | 6 +++--- components/lazmapviewer/source/mvde_lcl.pas | 13 ++++++++++++- components/lazmapviewer/source/mvdrawingengine.pas | 4 ++-- 7 files changed, 22 insertions(+), 13 deletions(-) diff --git a/components/lazmapviewer/examples/fulldemo/configframe.pas b/components/lazmapviewer/examples/fulldemo/configframe.pas index e459d68c0..3a023f08e 100644 --- a/components/lazmapviewer/examples/fulldemo/configframe.pas +++ b/components/lazmapviewer/examples/fulldemo/configframe.pas @@ -235,7 +235,6 @@ end; procedure TCfgFrame.ReadFromIni(ini: TCustomIniFile); var n: Integer; - s: String; begin n := ini.ReadInteger('Proxy', 'UseProxy', 0); case n of diff --git a/components/lazmapviewer/examples/fulldemo/mapviewer_demo.lpi b/components/lazmapviewer/examples/fulldemo/mapviewer_demo.lpi index 15761dcc9..3ccf50b20 100644 --- a/components/lazmapviewer/examples/fulldemo/mapviewer_demo.lpi +++ b/components/lazmapviewer/examples/fulldemo/mapviewer_demo.lpi @@ -38,9 +38,8 @@ - + - diff --git a/components/lazmapviewer/source/addons/bgra_drawingengine/mvde_bgra.pas b/components/lazmapviewer/source/addons/bgra_drawingengine/mvde_bgra.pas index f68b8a085..4e2dd26a5 100644 --- a/components/lazmapviewer/source/addons/bgra_drawingengine/mvde_bgra.pas +++ b/components/lazmapviewer/source/addons/bgra_drawingengine/mvde_bgra.pas @@ -47,7 +47,6 @@ type FFontSize: Integer; FFontStyle: TFontStyles; protected - function GetPenStyle: TPenStyle; override; function GetBrushColor: TColor; override; function GetBrushStyle: TBrushStyle; override; function GetFontColor: TColor; override; @@ -55,8 +54,8 @@ type function GetFontSize: Integer; override; function GetFontStyle: TFontStyles; override; function GetPenColor: TColor; override; + function GetPenStyle: TPenStyle; override; function GetPenWidth: Integer; override; - procedure SetPenStyle(AValue: TPenStyle); override; procedure SetBrushColor(AValue: TColor); override; procedure SetBrushStyle(AValue: TBrushStyle); override; procedure SetFontColor(AValue: TColor); override; @@ -64,6 +63,7 @@ type procedure SetFontSize(AValue: Integer); override; procedure SetFontStyle(AValue: TFontStyles); override; procedure SetPenColor(AValue: TColor); override; + procedure SetPenStyle(AValue: TPenStyle); override; procedure SetPenWidth(AValue: Integer); override; public diff --git a/components/lazmapviewer/source/addons/rgbgraphics_drawingengine/mvde_rgbgraphics.pas b/components/lazmapviewer/source/addons/rgbgraphics_drawingengine/mvde_rgbgraphics.pas index 39c61b620..5283a1094 100644 --- a/components/lazmapviewer/source/addons/rgbgraphics_drawingengine/mvde_rgbgraphics.pas +++ b/components/lazmapviewer/source/addons/rgbgraphics_drawingengine/mvde_rgbgraphics.pas @@ -52,7 +52,6 @@ type FPenWidth: Integer; protected procedure DrawBitmapOT(X, Y: Integer; ABitmap: TCustomBitmap; AOpaqueColor, ATransparentColor: TColor); - function GetPenStyle: TPenStyle; override; function GetBrushColor: TColor; override; function GetBrushStyle: TBrushStyle; override; function GetFontColor: TColor; override; @@ -60,8 +59,8 @@ type function GetFontSize: Integer; override; function GetFontStyle: TFontStyles; override; function GetPenColor: TColor; override; + function GetPenStyle: TPenStyle; override; function GetPenWidth: Integer; override; - procedure SetPenStyle(AValue: TPenStyle); override; procedure SetBrushColor(AValue: TColor); override; procedure SetBrushStyle(AValue: TBrushStyle); override; procedure SetFontColor(AValue: TColor); override; @@ -69,6 +68,7 @@ type procedure SetFontSize(AValue: Integer); override; procedure SetFontStyle(AValue: TFontStyles); override; procedure SetPenColor(AValue: TColor); override; + procedure SetPenStyle(AValue: TPenStyle); override; procedure SetPenWidth(AValue: Integer); override; procedure SetDrawMode; public diff --git a/components/lazmapviewer/source/mvde_intfgraphics.pas b/components/lazmapviewer/source/mvde_intfgraphics.pas index f40e5781a..23c1b11ea 100644 --- a/components/lazmapviewer/source/mvde_intfgraphics.pas +++ b/components/lazmapviewer/source/mvde_intfgraphics.pas @@ -49,9 +49,7 @@ type procedure CreateLazIntfImageAndCanvas(out ABuffer: TLazIntfImage; out ACanvas: TFPCustomCanvas; AWidth, AHeight: Integer); protected - // Drawing bitmap with a given opaque and transparent colors procedure DrawBitmapOT(X, Y: Integer; ABitmap: TCustomBitmap; AOpaqueColor, ATransparentColor: TColor); - function GetPenStyle: TPenStyle; override; function GetBrushColor: TColor; override; function GetBrushStyle: TBrushStyle; override; function GetFontColor: TColor; override; @@ -59,8 +57,8 @@ type function GetFontSize: Integer; override; function GetFontStyle: TFontStyles; override; function GetPenColor: TColor; override; + function GetPenStyle: TPenStyle; override; function GetPenWidth: Integer; override; - procedure SetPenStyle(AValue: TPenStyle); override; procedure SetBrushColor(AValue: TColor); override; procedure SetBrushStyle(AValue: TBrushStyle); override; procedure SetFontColor(AValue: TColor); override; @@ -68,6 +66,7 @@ type procedure SetFontSize(AValue: Integer); override; procedure SetFontStyle(AValue: TFontStyles); override; procedure SetPenColor(AValue: TColor); override; + procedure SetPenStyle(AValue: TPenStyle); override; procedure SetPenWidth(AValue: Integer); override; public destructor Destroy; override; @@ -305,6 +304,7 @@ begin Result := (AColor1.Red = AColor2.Red) and (AColor1.Green = AColor2.Green) and (AColor1.Blue = AColor2.Blue); end; +{ Drawing a bitmap with a given opaque and transparent color } procedure TMvIntfGraphicsDrawingEngine.DrawBitmapOT(X, Y: Integer; ABitmap: TCustomBitmap; AOpaqueColor, ATransparentColor: TColor); var diff --git a/components/lazmapviewer/source/mvde_lcl.pas b/components/lazmapviewer/source/mvde_lcl.pas index ff5c605fd..f5a8e62d2 100644 --- a/components/lazmapviewer/source/mvde_lcl.pas +++ b/components/lazmapviewer/source/mvde_lcl.pas @@ -49,6 +49,7 @@ type function GetFontSize: Integer; override; function GetFontStyle: TFontStyles; override; function GetPenColor: TColor; override; + function GetPenStyle: TPenstyle; override; function GetPenWidth: Integer; override; procedure SetBrushColor(AValue: TColor); override; procedure SetBrushStyle(AValue: TBrushStyle); override; @@ -57,6 +58,7 @@ type procedure SetFontSize(AValue: Integer); override; procedure SetFontStyle(AValue: TFontStyles); override; procedure SetPenColor(AValue: TColor); override; + procedure SetPenStyle(AValue: TPenStyle); override; procedure SetPenWidth(AValue: Integer); override; public destructor Destroy; override; @@ -173,7 +175,6 @@ procedure TMvLCLDrawingEngine.DrawScaledCacheItem(DestRect, SrcRect: TRect; ASrcImg: TPictureCacheItem); var item: TLCLCacheItem; - bmp: TBitmap; begin item := ASrcImg as TLCLCacheItem; FBuffer.Canvas.CopyRect(DestRect, item.Image.Canvas, SrcRect); @@ -243,6 +244,11 @@ begin Result := FBuffer.Canvas.Pen.Color; end; +function TMvLCLDrawingEngine.GetPenStyle: TPenStyle; +begin + Result := FBuffer.Canvas.Pen.Style; +end; + function TMvLCLDrawingEngine.GetPenWidth: Integer; begin Result := FBuffer.Canvas.Pen.Width; @@ -323,6 +329,11 @@ begin FBuffer.Canvas.Pen.Color := AValue; end; +procedure TMvLCLDrawingEngine.SetPenStyle(AValue: TPenStyle); +begin + FBuffer.Canvas.Pen.Style := AValue; +end; + procedure TMvLCLDrawingEngine.SetPenWidth(AValue: Integer); begin FBuffer.Canvas.Pen.Width := AValue; diff --git a/components/lazmapviewer/source/mvdrawingengine.pas b/components/lazmapviewer/source/mvdrawingengine.pas index 757609140..e2e2d1219 100644 --- a/components/lazmapviewer/source/mvdrawingengine.pas +++ b/components/lazmapviewer/source/mvdrawingengine.pas @@ -28,7 +28,6 @@ type TMvCustomDrawingEngine = class(TComponent) protected - function GetPenStyle: TPenStyle; virtual; abstract; function GetBrushColor: TColor; virtual; abstract; function GetBrushStyle: TBrushStyle; virtual; abstract; function GetFontColor: TColor; virtual; abstract; @@ -36,6 +35,7 @@ type function GetFontSize: Integer; virtual; abstract; function GetFontStyle: TFontStyles; virtual; abstract; function GetPenColor: TColor; virtual; abstract; + function GetPenStyle: TPenStyle; virtual; abstract; function GetPenWidth: Integer; virtual; abstract; procedure SetPenStyle(AValue: TPenStyle); virtual; abstract; procedure SetBrushColor(AValue: TColor); virtual; abstract; @@ -80,8 +80,8 @@ type property FontSize: Integer read GetFontSize write SetFontSize; property FontStyle: TFontStyles read GetFontStyle write SetFontStyle; property PenColor: TColor read GetPenColor write SetPenColor; - property PenWidth: Integer read GetPenWidth write SetPenWidth; property PenStyle: TPenStyle read GetPenStyle write SetPenStyle; + property PenWidth: Integer read GetPenWidth write SetPenWidth; end; // Vector orthogonal to a line ,