paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-10 20:59:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

LazReport, refactored TfrBarCodeView into TfrCustomBarcodeView

Browse Source 
git-svn-id: trunk@48545 -
This commit is contained in:
jesus 2015-03-30 19:12:16 +00:00
parent 054dc48d1e
commit 267c003ecb
5 changed files with 57 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
components/lazreport/source/addons/cairoexport/lr_e_cairo.pas
View File

@ -68,7 +68,7 @@ type
procedure Frame(View: TfrView; x, y, h, w: integer);
procedure ShowFrame(View: TfrView; x, y, h, w: integer);
procedure Line(View: TfrView; x1,y1, x2,y2: Integer);
procedure ShowBarCode(View: TfrBarCodeView; x, y, h, w: integer);
procedure ShowBarCode(View: TfrCustomBarCodeView; x, y, h, w: integer);
procedure ShowPicture(View: TfrPictureView; x, y, h, w: integer);
procedure ShowRoundRect(View: TfrRoundRectView; x, y, h, w: integer);
procedure ShowShape(View: TfrShapeView; x, y, h, w: integer);
@ -158,18 +158,18 @@ procedure TlrCairoExportFilter.DefaultShowView(View: TfrView; nx, ny, ndy,
ndx: Integer);
begin
if (View.FillColor <> clNone)
and not (View is TfrBarCodeView)
and not (View is TfrCustomBarCodeView)
and not ((View is TfrPictureView) and
TfrPictureView(View).Stretched and not TfrPictureView(View).KeepAspect)
then
ShowBackGround(View, nx, ny, ndy, ndx);
if View is TfrBarCodeView then
ShowBarCode(TfrBarCodeView(View), nx, ny, ndy, ndx)
if View is TfrCustomBarCodeView then
ShowBarCode(TfrCustomBarCodeView(View), nx, ny, ndy, ndx)
else if View is TfrPictureView then
ShowPicture(TfrPictureView(View), nx, ny, ndy, ndx);
if (View.Frames<>[]) and not (View is TfrBarCodeView) then
if (View.Frames<>[]) and not (View is TfrCustomBarCodeView) then
ShowFrame(View, nx, ny, ndy, ndx);
end;
@ -370,7 +370,7 @@ end;
{$NOTES ON}
{$HINTS ON}
procedure TlrCairoExportFilter.ShowBarCode(View: TfrBarCodeView; x, y, h,
procedure TlrCairoExportFilter.ShowBarCode(View: TfrCustomBarCodeView; x, y, h,
w: integer);
const
cbDefaultText = '12345678';

6
components/lazreport/source/addons/imgexport/lr_e_htmldiv.pas
View File

@ -243,7 +243,7 @@ begin
if View.FillColor <> clNone then
St := St + 'background-color:' + ColorToCSS(View.FillColor) + ';';
if ExportImages and ((View is TfrPictureView) or (View is TfrBarCodeView)) then
if ExportImages and ((View is TfrPictureView) or (View is TfrCustomBarCodeView)) then
begin
WriteString(Format(HTML_IMG1, [St]));
Inc(FImgCnt);
@ -257,9 +257,9 @@ begin
CS := TChunkStream.Create(Stream);
B64 := TBase64EncodingStream.Create(CS);
end;
if View is TfrBarCodeView then
if View is TfrCustomBarCodeView then
begin
BCBmp := TfrBarCodeView(View).GenerateBitmap;
BCBmp := TfrCustomBarCodeView(View).GenerateBitmap;
Png.Assign(BCBmp);
BCBmp.Free;
end

4
components/lazreport/source/addons/lrcodereport/lr_codereport.pas
View File

@ -760,9 +760,9 @@ end;
procedure TlrCodeReport.DrawBarCode(X, Y, W, H: double; Code: string;
Style: TlrBarCodeStyle);
var
ABarCode: TfrBarCodeView;
ABarCode: TfrCustomBarCodeView;
begin
ABarCode := TfrBarCodeView.Create(nil);
ABarCode := TfrCustomBarCodeView.Create(nil);
ABarCode.Left := X * XRatio;
ABarCode.Top := Y * YRatio;
ABarCode.Width := W * XRatio;

14
components/lazreport/source/addons/pdfexport/lr_e_pdf.pas
View File

@ -58,7 +58,7 @@ type
procedure ShowBackGround(View: TfrView; x, y, h, w: integer);
procedure Frame(View: TfrView; x, y, h, w: integer);
procedure ShowFrame(View: TfrView; x, y, h, w: integer);
procedure ShowBarCode(View: TfrBarCodeView; x, y, h, w: integer);
procedure ShowBarCode(View: TfrCustomBarCodeView; x, y, h, w: integer);
procedure ShowPicture(View: TfrPictureView; x, y, h, w: integer);
procedure ShowRoundRect(View: TfrRoundRectView; x, y, h, w: integer);
procedure ShowShape(View: TfrShapeView; x, y, h, w: integer);
@ -137,17 +137,17 @@ procedure TfrTNPDFExportFilter.DefaultShowView(View: TfrView;
nx, ny, ndy, ndx: Integer);
begin
if (View.FillColor <> clNone)
and not (View is TfrBarCodeView)
and not (View is TfrCustomBarCodeView)
and not (View is TfrPictureView)
then
ShowBackGround(View, nx, ny, ndy, ndx);
if View is TfrBarCodeView then
ShowBarCode(TfrBarCodeView(View), nx, ny, ndy, ndx)
if View is TfrCustomBarCodeView then
ShowBarCode(TfrCustomBarCodeView(View), nx, ny, ndy, ndx)
else if View is TfrPictureView then
ShowPicture(TfrPictureView(View), nx, ny, ndy, ndx);
if (View.Frames<>[]) and not (View is TfrBarCodeView) then
if (View.Frames<>[]) and not (View is TfrCustomBarCodeView) then
ShowFrame(View, nx, ny, ndy, ndx);
end;
@ -262,7 +262,7 @@ begin
end;
end;
procedure TfrTNPDFExportFilter.ShowBarCode(View: TfrBarCodeView; x, y, h, w:
procedure TfrTNPDFExportFilter.ShowBarCode(View: TfrCustomBarCodeView; x, y, h, w:
integer);
var
Bitmap: TBitmap;
@ -274,7 +274,7 @@ begin
View.x := 0;
View.y := 0;
Bitmap := TfrBarCodeView(View).GenerateBitmap;
Bitmap := TfrCustomBarCodeView(View).GenerateBitmap;
try
w := trunc(Bitmap.Width * PDFEscx + 1.5) ;
h := trunc(Bitmap.Height * PDFEscy + 1.5) ;

70
components/lazreport/source/lr_barc.pas
View File

@ -66,9 +66,9 @@ type
cAngle : Double;
end;
{ TfrBarCodeView }
{ TfrCustomBarCodeView }
TfrBarCodeView = class(TfrView)
TfrCustomBarCodeView = class(TfrView)
private
BarC: TBarCode;
FText: string;
@ -92,21 +92,29 @@ type
constructor Create(AOwnerPage:TfrPage);override;
destructor Destroy; override;
procedure Assign(Source: TPersistent); override;
function GenerateBitmap: TBitmap;
function GenerateBitmap: TBitmap; virtual;
procedure LoadFromStream(Stream: TStream); override;
procedure SaveToStream(Stream: TStream); override;
procedure Draw(aCanvas: TCanvas); override;
procedure Print(Stream: TStream); override;
procedure DefinePopupMenu({%H-}Popup: TPopupMenu); override;
procedure LoadFromXML(XML: TLrXMLConfig; const Path: String); override;
procedure SaveToXML(XML: TLrXMLConfig; const Path: String); override;
published
property CheckSum : Boolean read GetCheckSum write SetCheckSum;
property BarType : TBarcodeType read GetBarType write SetBarType;
property ShowText : Boolean read GetShowText write SetShowText;
property Zoom : Double read GetZoom write SetZoom;
property Angle: Double read GetAngle write SetAngle;
end;
TfrBarcodeView = class(TfrCustomBarcodeView)
published
property CheckSum;
property BarType;
property ShowText;
property Zoom;
property Angle;
property Memo;
property Frames;
property FrameColor;
@ -205,32 +213,32 @@ end;
{$NOTES ON}
{$HINTS ON}
function TfrBarCodeView.GetBarType: TBarcodeType;
function TfrCustomBarCodeView.GetBarType: TBarcodeType;
begin
Result:=Param.cBarType;
end;
function TfrBarCodeView.GetAngle: Double;
function TfrCustomBarCodeView.GetAngle: Double;
begin
Result := Param.cAngle;
end;
function TfrBarCodeView.GetCheckSum: Boolean;
function TfrCustomBarCodeView.GetCheckSum: Boolean;
begin
Result:=Param.cCheckSum;
end;
function TfrBarCodeView.GetShowText: Boolean;
function TfrCustomBarCodeView.GetShowText: Boolean;
begin
Result:=Param.cShowText;
end;
function TfrBarCodeView.GetZoom: Double;
function TfrCustomBarCodeView.GetZoom: Double;
begin
Result:=Param.cRatio;
end;
procedure TfrBarCodeView.SetAngle(AValue: Double);
procedure TfrCustomBarCodeView.SetAngle(AValue: Double);
begin
if (Param.cAngle<>AValue) and
((AValue=0.0) or (AValue=90.0) or (AValue=180.0) or (AValue=270.0)) then
@ -241,7 +249,7 @@ begin
end;
end;
procedure TfrBarCodeView.SetBarType(const AValue: TBarcodeType);
procedure TfrCustomBarCodeView.SetBarType(const AValue: TBarcodeType);
begin
if Param.cBarType<>AValue then
begin
@ -251,7 +259,7 @@ begin
end;
end;
procedure TfrBarCodeView.SetCheckSum(const AValue: Boolean);
procedure TfrCustomBarCodeView.SetCheckSum(const AValue: Boolean);
begin
if Param.cCheckSum<>AValue then
begin
@ -261,7 +269,7 @@ begin
end;
end;
procedure TfrBarCodeView.SetShowText(const AValue: Boolean);
procedure TfrCustomBarCodeView.SetShowText(const AValue: Boolean);
begin
if Param.cShowText<>AValue then
begin
@ -271,7 +279,7 @@ begin
end;
end;
procedure TfrBarCodeView.SetZoom(const AValue: Double);
procedure TfrCustomBarCodeView.SetZoom(const AValue: Double);
begin
if (Param.cRatio<>AValue) and
((AValue>=1.0)and(Avalue<=4.0)) then
@ -282,7 +290,7 @@ begin
end;
end;
function TfrBarCodeView.CreateBarcode: TBitmap;
function TfrCustomBarCodeView.CreateBarcode: TBitmap;
begin
Result := nil;
@ -387,7 +395,7 @@ begin
end;
function TfrBarCodeView.CreateLabelFont(aCanvas: TCanvas) :TFont;
function TfrCustomBarCodeView.CreateLabelFont(aCanvas: TCanvas) :TFont;
begin
with aCanvas do
begin
@ -413,7 +421,7 @@ begin
end;
procedure TfrBarCodeView.DrawLabel(aCanvas: TCanvas; R: TRect);
procedure TfrCustomBarCodeView.DrawLabel(aCanvas: TCanvas; R: TRect);
var fs: integer;
begin
if Param.cShowText then
@ -462,7 +470,7 @@ begin
end;
constructor TfrBarCodeView.Create(AOwnerPage: TfrPage);
constructor TfrCustomBarCodeView.Create(AOwnerPage: TfrPage);
begin
inherited Create(AOwnerPage);
@ -479,20 +487,20 @@ begin
BaseName := 'Bar';
end;
destructor TfrBarCodeView.Destroy;
destructor TfrCustomBarCodeView.Destroy;
begin
BarC.Free;
inherited Destroy;
end;
procedure TfrBarCodeView.Assign(Source: TPersistent);
procedure TfrCustomBarCodeView.Assign(Source: TPersistent);
begin
inherited Assign(Source);
if Source is TfrBarCodeView then
Param := TfrBarCodeView(Source).Param;
if Source is TfrCustomBarCodeView then
Param := TfrCustomBarCodeView(Source).Param;
end;
function TfrBarCodeView.GenerateBitmap: TBitmap;
function TfrCustomBarCodeView.GenerateBitmap: TBitmap;
var
R: TRect;
barcodeFont: TFont;
@ -511,19 +519,19 @@ begin
end;
end;
procedure TfrBarCodeView.LoadFromStream(Stream:TStream);
procedure TfrCustomBarCodeView.LoadFromStream(Stream:TStream);
begin
inherited LoadFromStream(Stream);
Stream.Read(Param, SizeOf(Param));
end;
procedure TfrBarCodeView.SaveToStream(Stream:TStream);
procedure TfrCustomBarCodeView.SaveToStream(Stream:TStream);
begin
inherited SaveToStream(Stream);
Stream.Write(Param, SizeOf(Param));
end;
procedure TfrBarCodeView.Draw(aCanvas:TCanvas);
procedure TfrCustomBarCodeView.Draw(aCanvas:TCanvas);
var
Bmp : TBitMap;
R: TRect;
@ -598,7 +606,7 @@ begin
end;
end;
procedure TfrBarCodeView.Print(Stream: TStream);
procedure TfrCustomBarCodeView.Print(Stream: TStream);
begin
BeginDraw(Canvas);
Memo1.Assign(Memo);
@ -614,12 +622,12 @@ begin
SaveToStream(Stream);
end;
procedure TfrBarCodeView.DefinePopupMenu(Popup: TPopupMenu);
procedure TfrCustomBarCodeView.DefinePopupMenu(Popup: TPopupMenu);
begin
// no specific items in popup menu
end;
procedure TfrBarCodeView.LoadFromXML(XML: TLrXMLConfig; const Path: String);
procedure TfrCustomBarCodeView.LoadFromXML(XML: TLrXMLConfig; const Path: String);
begin
inherited LoadFromXML(XML, Path);
@ -630,7 +638,7 @@ begin
RestoreProperty('Angle',XML.GetValue(Path+'BarCode/Angle','0'));
end;
procedure TfrBarCodeView.SaveToXML(XML: TLrXMLConfig; const Path: String);
procedure TfrCustomBarCodeView.SaveToXML(XML: TLrXMLConfig; const Path: String);
begin
inherited SaveToXML(XML, Path);