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

Timestamp:

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

Author:

chronos

Message:

• Modified: Updated BGRABitmap package.

File:

• GraphicTest/Packages/bgrabitmap/bgrasvgtype.pas (modified) (14 diffs)

GraphicTest/Packages/bgrabitmap/bgrasvgtype.pas

@@ -26 +26 @@
       function GetIsStrokeNone: boolean;
       function GetMatrix(AUnit: TCSSUnit): TAffineMatrix;
+      function GetOpacity: single;
       function GetOrthoAttributeOrStyleWithUnit(AName: string
         ): TFloatWithCSSUnit;
       function GetStroke: string;
       function GetStrokeColor: TBGRAPixel;
+      function GetStrokeLineCap: string;
+      function GetStrokeLineJoin: string;
+      function GetStrokeMiterLimit: single;
       function GetStrokeOpacity: single;
       function GetStrokeWidth: TFloatWithCSSUnit;
@@ -50 +54 @@
       procedure SetHorizAttributeWithUnit(AName: string; AValue: TFloatWithCSSUnit);
       procedure SetMatrix(AUnit: TCSSUnit; const AValue: TAffineMatrix);
+      procedure SetOpacity(AValue: single);
       procedure SetStroke(AValue: string);
       procedure SetStrokeColor(AValue: TBGRAPixel);
+      procedure SetStrokeLineCap(AValue: string);
+      procedure SetStrokeLineJoin(AValue: string);
+      procedure SetStrokeMiterLimit(AValue: single);
       procedure SetStrokeOpacity(AValue: single);
       procedure SetStrokeWidth(AValue: TFloatWithCSSUnit);
@@ -66 +74 @@
       procedure InternalDraw({%H-}ACanvas2d: TBGRACanvas2D; {%H-}AUnit: TCSSUnit); virtual;
       procedure LocateStyleDeclaration(AText: string; AProperty: string; out AStartPos,AColonPos,AValueLength: integer);
+      procedure ApplyStrokeStyle(ACanvas2D: TBGRACanvas2D; AUnit: TCSSUnit);
     public
       constructor Create({%H-}ADocument: TXMLDocument; AElement: TDOMElement; AUnits: TCSSUnitConverter); virtual;
@@ -93 +102 @@
       property strokeColor: TBGRAPixel read GetStrokeColor write SetStrokeColor;
       property strokeOpacity: single read GetStrokeOpacity write SetStrokeOpacity;
+      property strokeMiterLimit: single read GetStrokeMiterLimit write SetStrokeMiterLimit;
+      property strokeLineJoin: string read GetStrokeLineJoin write SetStrokeLineJoin;
+      property strokeLineCap: string read GetStrokeLineCap write SetStrokeLineCap;
       property fill: string read GetFill write SetFill;
       property fillColor: TBGRAPixel read GetFillColor write SetFillColor;
       property fillOpacity: single read GetFillOpacity write SetFillOpacity;
+      property opacity: single read GetOpacity write SetOpacity;
   end;
 
@@ -123 +136 @@
 implementation
 
-uses Math;
-
 { TSVGParser }
 
@@ -264 +275 @@
 begin
   result := StrToBGRA(fill,BGRABlack);
-  result.alpha := round(result.alpha*fillOpacity);
+  result.alpha := round(result.alpha*fillOpacity*opacity);
   if result.alpha = 0 then result := BGRAPixelTransparent;
 end;
@@ -359 +370 @@
     begin
       angle := parser.ParseFloat;
-      result *= AffineMatrix(1,tan(angle*Pi/180),0,
-                             0,        1,        0);
+      result *= AffineMatrixSkewXDeg(angle);
     end else
     if compareText(kind,'skewy')=0 then
     begin
       angle := parser.ParseFloat;
-      result *= AffineMatrix(1,         0        ,0,
-                     tan(angle*Pi/180), 1,        0);
+      result *= AffineMatrixSkewYDeg(angle);
     end;
     parser.SkipUpToSymbol(')');
@@ -375 +384 @@
 end;
 
+function TSVGElement.GetOpacity: single;
+var errPos: integer;
+begin
+  val(AttributeOrStyle['opacity'], result, errPos);
+  if errPos <> 0 then result := 1 else
+    if result < 0 then result := 0 else
+      if result > 1 then result := 1;
+end;
+
 function TSVGElement.GetOrthoAttributeOrStyleWithUnit(AName: string
   ): TFloatWithCSSUnit;
@@ -390 +408 @@
 begin
   result := StrToBGRA(stroke);
-  result.alpha := round(result.alpha*strokeOpacity);
+  result.alpha := round(result.alpha*strokeOpacity*opacity);
   if result.alpha = 0 then result := BGRAPixelTransparent;
+end;
+
+function TSVGElement.GetStrokeLineCap: string;
+begin
+  result := AttributeOrStyle['stroke-linecap'];
+  if result = '' then result := 'butt';
+end;
+
+function TSVGElement.GetStrokeLineJoin: string;
+begin
+  result := AttributeOrStyle['stroke-linejoin'];
+  if result = '' then result := 'miter';
+end;
+
+function TSVGElement.GetStrokeMiterLimit: single;
+var errPos: integer;
+begin
+  val(AttributeOrStyle['stroke-miterlimit'], result, errPos);
+  if errPos <> 0 then result := 4 else
+    if result < 1 then result := 1;
 end;
 
@@ -405 +443 @@
 function TSVGElement.GetStrokeWidth: TFloatWithCSSUnit;
 begin
-  result := HorizAttributeOrStyleWithUnit['stroke-width'];
+  result := OrthoAttributeOrStyleWithUnit['stroke-width'];
 end;
 
@@ -525 +563 @@
 end;
 
+procedure TSVGElement.SetOpacity(AValue: single);
+begin
+  Attribute['opacity'] := Units.formatValue(AValue);
+  RemoveStyle('opacity');
+end;
+
 procedure TSVGElement.SetStroke(AValue: string);
 begin
@@ -536 +580 @@
   AValue.alpha:= 255;
   stroke := BGRAToStr(AValue, CSSColors);
+end;
+
+procedure TSVGElement.SetStrokeLineCap(AValue: string);
+begin
+  Attribute['stroke-linecap'] := AValue;
+  RemoveStyle('stroke-linecap');
+end;
+
+procedure TSVGElement.SetStrokeLineJoin(AValue: string);
+begin
+  Attribute['stroke-linejoin'] := AValue;
+  RemoveStyle('stroke-linejoin');
+end;
+
+procedure TSVGElement.SetStrokeMiterLimit(AValue: single);
+begin
+  if AValue < 1 then AValue := 1;
+  Attribute['stroke-miterlimit'] := Units.formatValue(AValue);
+  RemoveStyle('stroke-miterlimit');
 end;
 
@@ -671 +734 @@
     if AText[i] = ';' then
     begin
-      curValueLength := i-curColon;
+      curValueLength := i-(curColon+1);
       if CheckShouldReturnResult then exit;
       curStart := -1;
@@ -680 +743 @@
   if curColon <> -1 then
   begin
-    curValueLength:= length(AText)-curColon;
+    curValueLength:= length(AText)-(curColon+1)+1;
     if CheckShouldReturnResult then exit;
   end;
+end;
+
+procedure TSVGElement.ApplyStrokeStyle(ACanvas2D: TBGRACanvas2D; AUnit: TCSSUnit);
+begin
+  ACanvas2d.strokeStyle(strokeColor);
+  ACanvas2d.lineWidth := Units.ConvertWidth(strokeWidth,AUnit).value;
+  ACanvas2d.lineCap := strokeLineCap;
+  ACanvas2d.lineJoin := strokeLineJoin;
+  ACanvas2d.miterLimit := strokeMiterLimit;
 end;