Changeset 494 for GraphicTest/Packages/bgrabitmap/bgrasvg.pas

Timestamp:

Dec 22, 2016, 8:49:19 PM (8 years ago)

Author:

chronos

Message:

• Modified: Updated BGRABitmap package.

File:

• GraphicTest/Packages/bgrabitmap/bgrasvg.pas (modified) (10 diffs)

GraphicTest/Packages/bgrabitmap/bgrasvg.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, BGRABitmapTypes, laz2_DOM, BGRAUnits, BGRASVGShapes, BGRACanvas2D;
+  Classes, SysUtils, BGRABitmapTypes, laz2_DOM, BGRAUnits, BGRASVGShapes,
+  BGRACanvas2D;
 
 type
@@ -64 +65 @@
     function GetPreserveAspectRatio: string;
     function GetViewBox: TSVGViewBox;
+    function GetViewBox(AUnit: TCSSUnit): TSVGViewBox;
+    procedure GetViewBoxIndirect(AUnit: TCSSUnit; out AViewBox: TSVGViewBox);
     function GetWidth: TFloatWithCSSUnit;
     function GetWidthAsCm: single;
@@ -87 +90 @@
     FContent: TSVGContent;
     procedure Init(ACreateEmpty: boolean);
-    procedure InternalDraw(ACanvas2d: TBGRACanvas2D; x,y: single; AUnit: TCSSUnit; destDpi: TPointF); overload;
-    procedure InternalDraw(ACanvas2d: TBGRACanvas2D; x,y: single; AUnit: TCSSUnit; destDpi: single); overload;
+    function GetViewBoxAlignment(AHorizAlign: TAlignment; AVertAlign: TTextLayout): TPointF;
   public
     constructor Create; overload;
@@ -100 +102 @@
     procedure SaveToFile(AFilenameUTF8: string);
     procedure SaveToStream(AStream: TStream);
+    procedure Draw(ACanvas2d: TBGRACanvas2D; AHorizAlign: TAlignment; AVertAlign: TTextLayout; x,y: single; AUnit: TCSSUnit = cuPixel); overload;
+    procedure Draw(ACanvas2d: TBGRACanvas2D; AHorizAlign: TAlignment; AVertAlign: TTextLayout; x,y: single; destDpi: single); overload;
+    procedure Draw(ACanvas2d: TBGRACanvas2D; AHorizAlign: TAlignment; AVertAlign: TTextLayout; x,y: single; destDpi: TPointF); overload;
+    procedure Draw(ACanvas2d: TBGRACanvas2D; x,y: single; AUnit: TCSSUnit = cuPixel); overload;
     procedure Draw(ACanvas2d: TBGRACanvas2D; x,y: single; destDpi: single); overload;
     procedure Draw(ACanvas2d: TBGRACanvas2D; x,y: single; destDpi: TPointF); overload;
-    procedure Draw(ACanvas2d: TBGRACanvas2D; x,y: single; AUnit: TCSSUnit); overload;
+    procedure StretchDraw(ACanvas2d: TBGRACanvas2D; x,y,w,h: single); overload;
+    procedure StretchDraw(ACanvas2d: TBGRACanvas2D; AHorizAlign: TAlignment; AVertAlign: TTextLayout; x,y,w,h: single); overload;
     property Units: TSVGUnits read FUnits;
     property Width: TFloatWithCSSUnit read GetWidth write SetWidth;
@@ -112 +119 @@
     property Zoomable: boolean read GetZoomable write SetZoomable;
     property ViewBox: TSVGViewBox read GetViewBox write SetViewBox;
+    property ViewBoxInUnit[AUnit: TCSSUnit]: TSVGViewBox read GetViewBox;
     property Attribute[AName: string]: string read GetAttribute write SetAttribute;
     property DefaultDpi: single read FDefaultDpi write SetDefaultDpi; //this is not saved in the SVG file
@@ -121 +129 @@
 implementation
 
-uses laz2_XMLRead, laz2_XMLWrite, lazutf8classes, BGRATransform;
+uses laz2_XMLRead, laz2_XMLWrite, BGRAUTF8;
 
 const SvgNamespace = 'http://www.w3.org/2000/svg';
@@ -168 +176 @@
   function parseNextFloat: single;
   var
-    idxSpace,errPos: integer;
+    idxSpace,{%H-}errPos: integer;
   begin
     idxSpace:= pos(' ',viewBoxStr);
@@ -335 +343 @@
 end;
 
+function TBGRASVG.GetViewBox(AUnit: TCSSUnit): TSVGViewBox;
+begin
+  GetViewBoxIndirect(AUnit,result);
+end;
+
+procedure TBGRASVG.GetViewBoxIndirect(AUnit: TCSSUnit; out AViewBox: TSVGViewBox);
+begin
+  with FUnits.ViewBox do
+  begin
+    AViewBox.min := FUnits.ConvertCoord(min,cuCustom,AUnit);
+    AViewBox.size := FUnits.ConvertCoord(size,cuCustom,AUnit);
+  end;
+end;
+
 function TBGRASVG.GetWidth: TFloatWithCSSUnit;
 begin
@@ -443 +465 @@
 end;
 
+function TBGRASVG.GetViewBoxAlignment(AHorizAlign: TAlignment;
+  AVertAlign: TTextLayout): TPointF;
+var vb: TSVGViewBox;
+begin
+  GetViewBoxIndirect(cuPixel, vb);
+  with vb do
+  begin
+    case AHorizAlign of
+      taCenter: result.x := -(min.x+size.x*0.5);
+      taRightJustify: result.x := -(min.x+size.x);
+    else
+      {taLeftJustify:} result.x := -min.x;
+    end;
+    case AVertAlign of
+      tlCenter: result.y := -(min.y+size.y*0.5);
+      tlBottom: result.y := -(min.y+size.y);
+    else
+      {tlTop:} result.y := -min.y;
+    end;
+  end;
+end;
+
 constructor TBGRASVG.Create;
 begin
@@ -547 +591 @@
 end;
 
-procedure TBGRASVG.Draw(ACanvas2d: TBGRACanvas2D; x, y: single; AUnit: TCSSUnit);
+procedure TBGRASVG.Draw(ACanvas2d: TBGRACanvas2D; AHorizAlign: TAlignment;
+  AVertAlign: TTextLayout; x, y: single; AUnit: TCSSUnit);
 var prevMatrix: TAffineMatrix;
 begin
-  if (x<>0) or (y<>0) then
-  begin
-    prevMatrix := ACanvas2d.matrix;
-    ACanvas2d.translate(x,y);
-    Content.Draw(ACanvas2d,AUnit);
-    ACanvas2d.matrix := prevMatrix;
-  end else
-    Content.Draw(ACanvas2d,AUnit);
-end;
-
-procedure TBGRASVG.Draw(ACanvas2d: TBGRACanvas2D; x, y: single; destDpi: TPointF);
-begin
-  InternalDraw(ACanvas2d,x,y,cuPixel,destDpi);
-end;
-
-procedure TBGRASVG.Draw(ACanvas2d: TBGRACanvas2D; x, y: single; destDpi: single);
-begin
-  InternalDraw(ACanvas2d,x,y,cuPixel,destDpi);
-end;
-
-procedure TBGRASVG.InternalDraw(ACanvas2d: TBGRACanvas2D; x, y: single;
-  AUnit: TCSSUnit; destDpi: TPointF);
-var prevMatrix: TAffineMatrix;
-begin
-  if (Units.DpiX = 0) or (Units.DpiY = 0) then exit;
   prevMatrix := ACanvas2d.matrix;
   ACanvas2d.translate(x,y);
-  if AUnit = cuPixel then
-    ACanvas2d.scale(destDpi.x/Units.DpiX,destDpi.y/Units.DpiY);
+  with GetViewBoxAlignment(AHorizAlign,AVertAlign) do ACanvas2d.translate(x,y);
+  Draw(ACanvas2d, 0,0, AUnit);
+  ACanvas2d.matrix := prevMatrix;
+end;
+
+procedure TBGRASVG.Draw(ACanvas2d: TBGRACanvas2D; AHorizAlign: TAlignment;
+  AVertAlign: TTextLayout; x, y: single; destDpi: single);
+begin
+  Draw(ACanvas2d, AHorizAlign,AVertAlign, x,y, PointF(destDpi,destDpi));
+end;
+
+procedure TBGRASVG.Draw(ACanvas2d: TBGRACanvas2D; AHorizAlign: TAlignment;
+  AVertAlign: TTextLayout; x, y: single; destDpi: TPointF);
+begin
+  ACanvas2d.save;
+  ACanvas2d.translate(x,y);
+  ACanvas2d.scale(destDpi.x/Units.DpiX,destDpi.y/Units.DpiY);
+  ACanvas2d.strokeResetTransform;
+  ACanvas2d.strokeScale(destDpi.x/Units.DpiX,destDpi.y/Units.DpiY);
+  with GetViewBoxAlignment(AHorizAlign,AVertAlign) do ACanvas2d.translate(x,y);
+  Draw(ACanvas2d, 0,0, cuPixel);
+  ACanvas2d.restore;
+end;
+
+procedure TBGRASVG.Draw(ACanvas2d: TBGRACanvas2D; x, y: single; AUnit: TCSSUnit);
+var prevLinearBlend: boolean;
+begin
+  prevLinearBlend:= ACanvas2d.linearBlend;
+  acanvas2d.linearBlend := true;
+  ACanvas2d.save;
+  ACanvas2d.translate(x,y);
   Content.Draw(ACanvas2d,AUnit);
-  ACanvas2d.matrix := prevMatrix;
-end;
-
-procedure TBGRASVG.InternalDraw(ACanvas2d: TBGRACanvas2D; x, y: single;
-  AUnit: TCSSUnit; destDpi: single);
-begin
-  InternalDraw(ACanvas2d,x,y,AUnit,PointF(destDpi,destDpi));
+  ACanvas2d.restore;
+  ACanvas2d.linearBlend := prevLinearBlend;
+end;
+
+procedure TBGRASVG.Draw(ACanvas2d: TBGRACanvas2D; x, y: single; destDpi: single);
+begin
+  Draw(ACanvas2d, x,y, PointF(destDpi,destDpi));
+end;
+
+procedure TBGRASVG.Draw(ACanvas2d: TBGRACanvas2D; x, y: single; destDpi: TPointF);
+begin
+  ACanvas2d.save;
+  ACanvas2d.translate(x,y);
+  ACanvas2d.scale(destDpi.x/Units.DpiX,destDpi.y/Units.DpiY);
+  ACanvas2d.strokeResetTransform;
+  ACanvas2d.strokeScale(destDpi.x/Units.DpiX,destDpi.y/Units.DpiY);
+  Draw(ACanvas2d, 0,0, cuPixel);
+  ACanvas2d.restore;
+end;
+
+procedure TBGRASVG.StretchDraw(ACanvas2d: TBGRACanvas2D; x, y, w, h: single);
+var vb: TSVGViewBox;
+begin
+  ACanvas2d.save;
+  ACanvas2d.translate(x,y);
+  ACanvas2d.strokeResetTransform;
+  GetViewBoxIndirect(cuPixel,vb);
+  with vb do
+  begin
+    ACanvas2d.translate(-min.x,-min.y);
+    if size.x <> 0 then
+    begin
+      ACanvas2d.scale(w/size.x,1);
+      ACanvas2d.strokeScale(w/size.x,1);
+    end;
+    if size.y <> 0 then
+    begin
+      ACanvas2d.scale(1,h/size.y);
+      ACanvas2d.strokeScale(1,h/size.y);
+    end;
+  end;
+  Draw(ACanvas2d, 0,0);
+  ACanvas2d.restore;
+end;
+
+procedure TBGRASVG.StretchDraw(ACanvas2d: TBGRACanvas2D;
+  AHorizAlign: TAlignment; AVertAlign: TTextLayout; x, y, w, h: single);
+var ratio,stretchRatio,zoom: single;
+  vb: TSVGViewBox;
+  sx,sy,sw,sh: single;
+begin
+  GetViewBoxIndirect(cuPixel,vb);
+  if (h = 0) or (w = 0) or (vb.size.x = 0) or (vb.size.y = 0) then exit;
+  ratio := vb.size.x/vb.size.y;
+  stretchRatio := w/h;
+  if ratio > stretchRatio then
+    zoom := w / vb.size.x
+  else
+    zoom := h / vb.size.y;
+
+  sx := x;
+  sy := y;
+  sw := vb.size.x*zoom;
+  sh := vb.size.y*zoom;
+
+  case AHorizAlign of
+    taCenter: sx += (w - sw)/2;
+    taRightJustify: sx += w - sw;
+  end;
+  case AVertAlign of
+    tlCenter: sy += (h - sh)/2;
+    tlBottom: sy += h - sh;
+  end;
+  StretchDraw(ACanvas2d, sx,sy,sw,sh);
 end;