more

Villavu · Mar 24, 2024 · f4c6dd3 · f4c6dd3
1 parent b265451
commit f4c6dd3
Show file tree

Hide file tree

Showing 47 changed files with 682 additions and 671 deletions.
diff --git a/Source/Simba.lpi b/Source/Simba.lpi
diff --git a/Source/array/simba.array_pointarray.pas b/Source/array/simba.array_pointarray.pas
diff --git a/Source/image/simba.image.pas b/Source/image/simba.image.pas
@@ -262,8 +262,8 @@ implementation
 
 uses
   Math, FPImage,
-  simba.zip, simba.vartype_box, simba.vartype_quad, simba.geometry, simba.nativeinterface,
-  simba.matrix_float, simba.matrix_int, simba.array_point, simba.algo_sort,
+  simba.zip, simba.vartype_floatmatrix, simba.vartype_box, simba.vartype_quad, simba.geometry, simba.nativeinterface,
+  simba.vartype_ordmatrix, simba.vartype_pointarray, simba.algo_sort,
   simba.image_lazbridge, simba.image_integral, simba.image_gaussblur,
   simba.image_bitmaparealoader, simba.image_stringconv, simba.containers, simba.array_relationship;
 

diff --git a/Source/image/simba.image_integral.pas b/Source/image/simba.image_integral.pas
@@ -39,7 +39,7 @@     TData = record Value: Double; ValueSqr: Double; end;
 implementation
 
 uses
-  simba.matrix_int;
+  simba.vartype_ordmatrix;
 
 class function TSimbaIntegralImageF.Create(const From: TByteMatrix): TSimbaIntegralImageF;
 var

diff --git a/Source/image/simba.image_utils.pas b/Source/image/simba.image_utils.pas
@@ -37,7 +37,7 @@ procedure FillData(const Data: PColorBGRA; const Count: SizeInt; const Value: TC
 implementation
 
 uses
-  simba.array_point, simba.geometry;
+  simba.vartype_pointarray, simba.geometry;
 
 procedure BlendPixel(const Pixel: PColorBGRA; const Color: TColorBGRA);
 begin

diff --git a/Source/imagebox/simba.imagebox_drawers.pas b/Source/imagebox/simba.imagebox_drawers.pas
@@ -56,7 +56,7 @@ implementation
 
 uses
   Math,
-  simba.matrix_float, simba.algo_sort, simba.vartype_box;
+  simba.vartype_floatmatrix, simba.algo_sort, simba.vartype_box;
 
 generic procedure DoDrawPolygonFilled<_T>(Poly: TPointArray; DrawInfo: TDrawInfo);
 type

diff --git a/Source/matchtemplate/simba.matchtemplate.pas b/Source/matchtemplate/simba.matchtemplate.pas
@@ -73,7 +73,7 @@ implementation
 uses
   simba.matchtemplate_ccorr, simba.matchtemplate_sqdiff, simba.matchtemplate_ccoeff,
   simba.threadpool,
-  simba.matrix_float, simba.matrix_int;
+  simba.vartype_floatmatrix, simba.vartype_ordmatrix;
 
 // How much to "Slice" (vertically) the image up for multithreading.
 function CalculateSlices(SearchWidth, SearchHeight: Integer): Integer;

diff --git a/Source/matchtemplate/simba.matchtemplate_ccoeff.pas b/Source/matchtemplate/simba.matchtemplate_ccoeff.pas
@@ -43,7 +43,7 @@ implementation
 
 uses
   simba.threadpool, simba.simplelock,
-  simba.matrix_float, simba.matrix_int;
+  simba.vartype_floatmatrix, simba.vartype_ordmatrix;
 
 // MatchTemplate_CCOEFF
 function __MatchTemplate_CCOEFF(Image, Template: TIntegerMatrix; Normed: Boolean): TSingleMatrix;

diff --git a/Source/matchtemplate/simba.matchtemplate_ccorr.pas b/Source/matchtemplate/simba.matchtemplate_ccorr.pas
@@ -43,7 +43,7 @@ implementation
 
 uses
   simba.threadpool, simba.simplelock,
-  simba.matrix_float, simba.matrix_int;
+  simba.vartype_floatmatrix, simba.vartype_ordmatrix;
 
 // MatchTemplate_CCORR
 function __MatchTemplate_CCORR(Image, Templ: TIntegerMatrix; Normed: Boolean): TSingleMatrix;

diff --git a/Source/matchtemplate/simba.matchtemplate_helpers.pas b/Source/matchtemplate/simba.matchtemplate_helpers.pas
@@ -28,7 +28,7 @@ implementation
 
 uses
   simba.FFTPACK4, simba.threadpool,
-  simba.matrix_float, simba.matrix_int;
+  simba.vartype_floatmatrix, simba.vartype_ordmatrix;
 
 function DoFFT2(const Matrix: TSingleMatrix; const outW, outH: Integer): TComplexMatrix;
 var

diff --git a/Source/matchtemplate/simba.matchtemplate_matrix.pas b/Source/matchtemplate/simba.matchtemplate_matrix.pas
@@ -82,7 +82,7 @@ function Rot90(const Matrix: TComplexMatrix): TComplexMatrix;
 implementation
 
 uses
-  simba.matrix_int, simba.matrix_float;
+  simba.vartype_floatmatrix, simba.vartype_ordmatrix;
 
 function SumsPd(const Matrix: TSingleMatrix; out Square: TDoubleMatrix): TDoubleMatrix;
 var

diff --git a/Source/matchtemplate/simba.matchtemplate_sqdiff.pas b/Source/matchtemplate/simba.matchtemplate_sqdiff.pas
@@ -43,7 +43,7 @@ implementation
 
 uses
   simba.threadpool, simba.simplelock,
-  simba.matrix_int, simba.matrix_float;
+  simba.vartype_floatmatrix, simba.vartype_ordmatrix;
 
 // MatchTemplate_SQDIFF
 function __MatchTemplate_SQDIFF(Image, Templ: TIntegerMatrix; Normed: Boolean): TSingleMatrix;

diff --git a/Source/matrix/simba.matrix_bool.pas b/Source/matrix/simba.matrix_bool.pas
diff --git a/Source/script/imports/simba.import_atpa.pas b/Source/script/imports/simba.import_atpa.pas
@@ -14,7 +14,7 @@ implementation
 
 uses
   lptypes,
-  simba.array_pointarray;
+  simba.vartype_pointarray;
 
 (*
 T2DPointArray

diff --git a/Source/script/imports/simba.import_boxarray.pas b/Source/script/imports/simba.import_boxarray.pas
@@ -14,7 +14,7 @@ implementation
 
 uses
   lptypes,
-  simba.array_box,
+  simba.vartype_boxarray,
   simba.algo_difference, simba.algo_intersection, simba.algo_symmetricDifference;
 
 (*

diff --git a/Source/script/imports/simba.import_internal.pas b/Source/script/imports/simba.import_internal.pas
@@ -15,7 +15,7 @@ implementation
 uses
   simba.algo_difference, simba.algo_intersection, simba.algo_symmetricDifference,
   simba.script, simba.image, simba.process,
-  simba.array_point, simba.array_ord, simba.array_string;
+  simba.vartype_pointarray, simba.vartype_ordarray, simba.vartype_stringarray;
 
 procedure _LapeWrite(const Params: PParamArray); LAPE_WRAPPER_CALLING_CONV
 begin

diff --git a/Source/script/imports/simba.import_matrix.pas b/Source/script/imports/simba.import_matrix.pas
@@ -14,7 +14,7 @@ implementation
 
 uses
   lptypes,
-  simba.matrix_int, simba.matrix_float, simba.matrix_bool;
+  simba.vartype_ordarray, simba.vartype_floatmatrix, simba.vartype_ordmatrix;
 
 (*
 Matrix

diff --git a/Source/script/imports/simba.import_tpa.pas b/Source/script/imports/simba.import_tpa.pas
@@ -19,7 +19,7 @@ implementation
 
 uses
   lptypes,
-  simba.array_point,
+  simba.vartype_pointarray,
   simba.algo_difference, simba.algo_intersection, simba.algo_symmetricDifference;
 
 (*

diff --git a/Source/colormath/simba.colormath.pas → Source/simba.colormath.pas b/Source/colormath/simba.colormath.pas → Source/simba.colormath.pas
diff --git a/Source/colormath/simba.colormath_aca.pas → Source/simba.colormath_aca.pas b/Source/colormath/simba.colormath_aca.pas → Source/simba.colormath_aca.pas
diff --git a/.../colormath/simba.colormath_conversion.pas → Source/simba.colormath_conversion.pas b/.../colormath/simba.colormath_conversion.pas → Source/simba.colormath_conversion.pas
diff --git a/...ce/colormath/simba.colormath_distance.pas → Source/simba.colormath_distance.pas b/...ce/colormath/simba.colormath_distance.pas → Source/simba.colormath_distance.pas
diff --git a/...ath/simba.colormath_distance_unrolled.pas → Source/simba.colormath_distance_unrolled.pas b/...ath/simba.colormath_distance_unrolled.pas → Source/simba.colormath_distance_unrolled.pas
diff --git a/Source/forms/simba.dialog.lfm → Source/simba.dialog.lfm b/Source/forms/simba.dialog.lfm → Source/simba.dialog.lfm
diff --git a/Source/forms/simba.dialog.pas → Source/simba.dialog.pas b/Source/forms/simba.dialog.pas → Source/simba.dialog.pas
diff --git a/Source/simba.externalimage.pas b/Source/simba.externalimage.pas
@@ -145,7 +145,7 @@ implementation
 uses
   Math,
   simba.vartype_box, simba.vartype_quad,
-  simba.array_point, simba.array_pointarray, simba.array_box;
+  simba.vartype_pointarray, simba.vartype_boxarray;
 
 procedure TSimbaExternalImage.CheckInUpdate;
 begin

diff --git a/Source/simba.finder.pas b/Source/simba.finder.pas
@@ -88,7 +88,7 @@   TColorTolerance = record
 implementation
 
 uses
-  simba.matrix_float, simba.matrix_int, simba.array_point,
+  simba.vartype_floatmatrix, simba.vartype_ordmatrix, simba.vartype_pointarray,
   simba.finder_color, simba.finder_image, simba.finder_dtm,
   simba.containers, simba.matchtemplate, simba.vartype_box;
 

diff --git a/Source/finders/simba.finder_color.pas → Source/simba.finder_color.pas b/Source/finders/simba.finder_color.pas → Source/simba.finder_color.pas
@@ -50,7 +50,7 @@ implementation
 
 uses
   simba.containers, simba.colormath_distance_unrolled, simba.threadpool,
-  simba.array_pointarray, simba.matrix_float, simba.datetime, simba.vartype_box;
+  simba.vartype_pointarray, simba.vartype_floatmatrix, simba.datetime, simba.vartype_box;
 
 // How much to "Slice" (vertically) the image up for multithreading.
 function CalculateSlices(SearchWidth, SearchHeight: Integer): Integer;

diff --git a/Source/finders/simba.finder_dtm.pas → Source/simba.finder_dtm.pas b/Source/finders/simba.finder_dtm.pas → Source/simba.finder_dtm.pas
diff --git a/Source/finders/simba.finder_image.pas → Source/simba.finder_image.pas b/Source/finders/simba.finder_image.pas → Source/simba.finder_image.pas
@@ -37,8 +37,7 @@ function FindImageOnBuffer(var Limit: TSimpleThreadsafeLimit;
 implementation
 
 uses
-  simba.containers, simba.threadpool, simba.array_point, simba.array_pointarray,
-  simba.vartype_box;
+  simba.containers, simba.threadpool, simba.vartype_pointarray, simba.vartype_box;
 
 // How much to "Slice" (vertically) the image up for multithreading.
 function CalculateSlices(SearchWidth, SearchHeight: Integer): Integer;

diff --git a/Source/simba.shapebox.pas b/Source/simba.shapebox.pas
@@ -294,7 +294,7 @@   TSimbaShapeBox = class(TSimbaImageBox)
 implementation
 
 uses
-  LCLType, simba.geometry, simba.array_point,
+  LCLType, simba.geometry, simba.vartype_pointarray,
   simba.vartype_box, simba.vartype_string, simba.vartype_point;
 
 const

diff --git a/Source/targets/simba.target_eios.pas → Source/simba.target_eios.pas b/Source/targets/simba.target_eios.pas → Source/simba.target_eios.pas
diff --git a/Source/targets/simba.target_image.pas → Source/simba.target_image.pas b/Source/targets/simba.target_image.pas → Source/simba.target_image.pas
diff --git a/Source/targets/simba.target_plugin.pas → Source/simba.target_plugin.pas b/Source/targets/simba.target_plugin.pas → Source/simba.target_plugin.pas
diff --git a/Source/targets/simba.target_window.pas → Source/simba.target_window.pas b/Source/targets/simba.target_window.pas → Source/simba.target_window.pas
diff --git a/Source/array/simba.array_box.pas → Source/simba.vartype_boxarray.pas b/Source/array/simba.array_box.pas → Source/simba.vartype_boxarray.pas
@@ -3,7 +3,7 @@
   Project: Simba (https://github.com/MerlijnWajer/Simba)
   License: GNU General Public License (https://www.gnu.org/licenses/gpl-3.0)
 }
-unit simba.array_box;
+unit simba.vartype_boxarray;
 
 {$i simba.inc}
 

diff --git a/Source/simba.vartype_circle.pas b/Source/simba.vartype_circle.pas
@@ -43,7 +43,7 @@ implementation
 
 uses
   Math,
-  simba.math, simba.array_point, simba.random, simba.containers, simba.geometry,
+  simba.math, simba.vartype_pointarray, simba.random, simba.containers, simba.geometry,
   simba.vartype_box;
 
 class function TCircleHelper.Create(AX, AY: Integer; ARadius: Integer): TCircle;

diff --git a/Source/matrix/simba.matrix_float.pas → Source/simba.vartype_floatmatrix.pas b/Source/matrix/simba.matrix_float.pas → Source/simba.vartype_floatmatrix.pas
@@ -11,7 +11,7 @@
   - ArgExtrema
 }
 
-unit simba.matrix_float;
+unit simba.vartype_floatmatrix;
 
 {$DEFINE SIMBA_MAX_OPTIMIZATION}
 {$i simba.inc}
@@ -91,7 +91,7 @@ implementation
 
 uses
   Math,
-  simba.math, simba.containers, simba.container_heaparray, simba.array_point, simba.vartype_box;
+  simba.math, simba.containers, simba.container_heaparray, simba.vartype_pointarray, simba.vartype_box;
 
 class operator TSingleSum.:=(const Right: Single): TSingleSum;
 begin

diff --git a/Source/array/simba.array_ord.pas → Source/simba.vartype_ordarray.pas b/Source/array/simba.array_ord.pas → Source/simba.vartype_ordarray.pas
@@ -3,7 +3,7 @@
   Project: Simba (https://github.com/MerlijnWajer/Simba)
   License: GNU General Public License (https://www.gnu.org/licenses/gpl-3.0)
 }
-unit simba.array_ord;
+unit simba.vartype_ordarray;
 
 {$i simba.inc}
 

diff --git a/Source/matrix/simba.matrix_int.pas → Source/simba.vartype_ordmatrix.pas b/Source/matrix/simba.matrix_int.pas → Source/simba.vartype_ordmatrix.pas
@@ -3,7 +3,7 @@
   Project: Simba (https://github.com/MerlijnWajer/Simba)
   License: GNU General Public License (https://www.gnu.org/licenses/gpl-3.0)
 }
-unit simba.matrix_int;
+unit simba.vartype_ordmatrix;
 
 {$i simba.inc}
 
@@ -40,6 +40,15 @@ interface
     procedure SetSize(AWidth, AHeight: Integer);
   end;
 
+  TBooleanMatrixHelper = type helper for TBooleanMatrix
+  public
+    function Width: Integer;
+    function Height: Integer;
+    function Area: Integer;
+    function GetSize(out AWidth, AHeight: Integer): Boolean;
+    procedure SetSize(AWidth, AHeight: Integer);
+  end;
+
 implementation
 
 uses
@@ -224,5 +233,36 @@ procedure TByteMatrixHelper.SetSize(AWidth, AHeight: Integer);
   SetLength(Self, AHeight, AWidth);
 end;
 
+function TBooleanMatrixHelper.Width: Integer;
+begin
+  if (Length(Self) > 0) then
+    Result := Length(Self[0])
+  else
+    Result := 0;
+end;
+
+function TBooleanMatrixHelper.Height: Integer;
+begin
+  Result := Length(Self);
+end;
+
+function TBooleanMatrixHelper.Area: Integer;
+begin
+  Result := Width * Height;
+end;
+
+function TBooleanMatrixHelper.GetSize(out AWidth, AHeight: Integer): Boolean;
+begin
+  AWidth := Width;
+  AHeight := Height;
+
+  Result := (AWidth > 0) and (AHeight > 0);
+end;
+
+procedure TBooleanMatrixHelper.SetSize(AWidth, AHeight: Integer);
+begin
+  SetLength(Self, AHeight, AWidth);
+end;
+
 end.