Changeset 521 for GraphicTest/Packages/bgrabitmap/bgraunits.pas

Timestamp:

Apr 17, 2019, 12:58:41 AM (5 years ago)

Author:

chronos

Message:

• Modified: Propagate project build mode options to used packages.
• Added: Check memory leaks using heaptrc.
• Modified: Update BGRABitmap package.

Location:

GraphicTest

Files:

• . (modified) (1 prop)
• Packages/bgrabitmap/bgraunits.pas (modified) (8 diffs)

GraphicTest

@@ -8 +8 @@
 GraphicTest.lps
 GraphicTest.dbg
+heaptrclog.trc

@@ -8 +8 @@
 GraphicTest.lps
 GraphicTest.dbg
+heaptrclog.trc

GraphicTest/Packages/bgrabitmap/bgraunits.pas

@@ -47 +47 @@
     property DefaultUnitHeight: TFloatWithCSSUnit read GetDefaultUnitHeight;
   public
-    function Convert(xy: single; sourceUnit, destUnit: TCSSUnit; dpi: single): single;
-    function ConvertWidth(x: single; sourceUnit, destUnit: TCSSUnit): single;
-    function ConvertHeight(y: single; sourceUnit, destUnit: TCSSUnit): single;
-    function ConvertWidth(AValue: TFloatWithCSSUnit; destUnit: TCSSUnit): TFloatWithCSSUnit;
-    function ConvertHeight(AValue: TFloatWithCSSUnit; destUnit: TCSSUnit): TFloatWithCSSUnit;
-    function ConvertCoord(pt: TPointF; sourceUnit, destUnit: TCSSUnit): TPointF; virtual;
-    class function parseValue(AValue: string; ADefault: TFloatWithCSSUnit): TFloatWithCSSUnit;
-    class function formatValue(AValue: TFloatWithCSSUnit; APrecision: integer = 7): string;
-    class function formatValue(AValue: single; APrecision: integer = 7): string;
+    function Convert(xy: single; sourceUnit, destUnit: TCSSUnit; dpi: single; containerSize: single = 0): single;
+    function ConvertWidth(x: single; sourceUnit, destUnit: TCSSUnit; containerWidth: single = 0): single; overload;
+    function ConvertHeight(y: single; sourceUnit, destUnit: TCSSUnit; containerHeight: single = 0): single; overload;
+    function ConvertWidth(AValue: TFloatWithCSSUnit; destUnit: TCSSUnit; containerWidth: single = 0): TFloatWithCSSUnit; overload;
+    function ConvertHeight(AValue: TFloatWithCSSUnit; destUnit: TCSSUnit; containerHeight: single = 0): TFloatWithCSSUnit; overload;
+    function ConvertCoord(pt: TPointF; sourceUnit, destUnit: TCSSUnit; containerWidth: single = 0; containerHeight: single = 0): TPointF; virtual;
+    class function parseValue(AValue: string; ADefault: TFloatWithCSSUnit): TFloatWithCSSUnit; overload;
+    class function parseValue(AValue: string; ADefault: single): single; overload;
+    class function formatValue(AValue: TFloatWithCSSUnit; APrecision: integer = 7): string; overload;
+    class function formatValue(AValue: single; APrecision: integer = 7): string; overload;
     property DpiX: single read GetDpiX;
     property DpiY: single read GetDpiY;
@@ -135 +136 @@
 
 function TCSSUnitConverter.Convert(xy: single; sourceUnit, destUnit: TCSSUnit;
-  dpi: single): single;
+  dpi: single; containerSize: single): single;
 var sourceFactor, destFactor: integer;
 begin
@@ -144 +145 @@
     result := xy
   else
+  if sourceUnit = cuPercent then
+  begin
+    result := xy/100*containerSize;
+  end else
   if sourceUnit = cuFontEmHeight then
   begin
@@ -185 +190 @@
 
 function TCSSUnitConverter.ConvertWidth(x: single; sourceUnit,
-  destUnit: TCSSUnit): single;
+  destUnit: TCSSUnit; containerWidth: single): single;
 begin
   if sourceUnit = destUnit then
@@ -192 +197 @@
   with DefaultUnitWidth do
   begin
-    result := x*ConvertWidth(value,CSSUnit, destUnit)
+    result := x*ConvertWidth(value,CSSUnit, destUnit, containerWidth)
   end
   else if destUnit = cuCustom then
@@ -202 +207 @@
       result := x/value;
   end else
-    result := Convert(x, sourceUnit, destUnit, DpiX);
+    result := Convert(x, sourceUnit, destUnit, DpiX, containerWidth);
 end;
 
 function TCSSUnitConverter.ConvertHeight(y: single; sourceUnit,
-  destUnit: TCSSUnit): single;
+  destUnit: TCSSUnit; containerHeight: single): single;
 begin
   if sourceUnit = cuCustom then
   with DefaultUnitHeight do
   begin
-    result := y*ConvertHeight(value,CSSUnit, destUnit)
+    result := y*ConvertHeight(value,CSSUnit, destUnit, containerHeight)
   end
   else if destUnit = cuCustom then
@@ -221 +226 @@
       result := y/value;
   end else
-    result := Convert(y, sourceUnit, destUnit, DpiY);
+    result := Convert(y, sourceUnit, destUnit, DpiY, containerHeight);
 end;
 
 function TCSSUnitConverter.ConvertWidth(AValue: TFloatWithCSSUnit;
-  destUnit: TCSSUnit): TFloatWithCSSUnit;
+  destUnit: TCSSUnit; containerWidth: single): TFloatWithCSSUnit;
 begin
   result.CSSUnit := destUnit;
-  result.value:= ConvertWidth(AValue.value,AValue.CSSUnit,destUnit);
+  result.value:= ConvertWidth(AValue.value,AValue.CSSUnit,destUnit,containerWidth);
 end;
 
 function TCSSUnitConverter.ConvertHeight(AValue: TFloatWithCSSUnit;
-  destUnit: TCSSUnit): TFloatWithCSSUnit;
+  destUnit: TCSSUnit; containerHeight: single): TFloatWithCSSUnit;
 begin
   result.CSSUnit := destUnit;
-  result.value:= ConvertHeight(AValue.value,AValue.CSSUnit,destUnit);
+  result.value:= ConvertHeight(AValue.value,AValue.CSSUnit,destUnit,containerHeight);
 end;
 
 function TCSSUnitConverter.ConvertCoord(pt: TPointF; sourceUnit,
-  destUnit: TCSSUnit): TPointF;
-begin
-  result.x := ConvertWidth(pt.x, sourceUnit, destUnit);
-  result.y := ConvertHeight(pt.y, sourceUnit, destUnit);
+  destUnit: TCSSUnit; containerWidth: single; containerHeight: single): TPointF;
+begin
+  result.x := ConvertWidth(pt.x, sourceUnit, destUnit, containerWidth);
+  result.y := ConvertHeight(pt.y, sourceUnit, destUnit, containerHeight);
 end;
 
@@ -266 +271 @@
 end;
 
+class function TCSSUnitConverter.parseValue(AValue: string; ADefault: single): single;
+var
+  errPos: integer;
+begin
+  AValue := trim(AValue);
+  val(AValue,result,errPos);
+  if errPos <> 0 then
+    result := ADefault;
+end; 
+
 class function TCSSUnitConverter.formatValue(AValue: TFloatWithCSSUnit; APrecision: integer = 7): string;
 begin

@@ -8 +8 @@
 GraphicTest.lps
 GraphicTest.dbg
+heaptrclog.trc