more

Villavu · Mar 23, 2024 · b265451 · b265451
1 parent 12a0228
commit b265451
Show file tree

Hide file tree

Showing 69 changed files with 308 additions and 187 deletions.
diff --git a/Source/Simba.lpi b/Source/Simba.lpi
@@ -379,7 +379,7 @@
         <PackageName Value="LCL"/>
       </Item5>
     </RequiredPackages>
-    <Units Count="28">
+    <Units Count="33">
       <Unit0>
         <Filename Value="Simba.lpr"/>
         <IsPartOfProject Value="True"/>
@@ -552,9 +552,29 @@
         <IsPartOfProject Value="True"/>
       </Unit26>
       <Unit27>
-        <Filename Value="simba.array_relationship.pas"/>
+        <Filename Value="simba.vartype_point.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit27>
+      <Unit28>
+        <Filename Value="simba.vartype_string.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit28>
+      <Unit29>
+        <Filename Value="simba.vartype_circle.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit29>
+      <Unit30>
+        <Filename Value="simba.vartype_quad.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit30>
+      <Unit31>
+        <Filename Value="simba.vartype_box.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit31>
+      <Unit32>
+        <Filename Value="simba.vartype_windowhandle.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit32>
     </Units>
   </ProjectOptions>
   <CompilerOptions>

diff --git a/Source/array/simba.array_box.pas b/Source/array/simba.array_box.pas
@@ -45,7 +45,7 @@ implementation
 
 uses
   Math,
-  simba.math, simba.algo_sort, simba.box;
+  simba.math, simba.algo_sort, simba.vartype_box;
 
 class function TBoxArrayHelper.Create(Start: TPoint; Columns, Rows, Width, Height: Int32; Spacing: TPoint): TBoxArray;
 var

diff --git a/Source/array/simba.array_point.pas b/Source/array/simba.array_point.pas
@@ -39,7 +39,7 @@ interface
 
 uses
   Classes, SysUtils,
-  simba.base, simba.quad, simba.circle;
+  simba.base, simba.vartype_quad, simba.vartype_circle;
 
 type
   {$PUSH}
@@ -165,7 +165,8 @@ implementation
   Math,
   simba.array_pointarray, simba.containers, simba.geometry, simba.math,
   simba.algo_sort, simba.algo_intersection, simba.container_slacktree,
-  simba.array_ord, simba.matrix_bool, simba.matrix_int, simba.box;
+  simba.array_ord, simba.matrix_bool, simba.matrix_int,
+  simba.vartype_box, simba.vartype_point;
 
 procedure GetAdjacent4(var Adj: TPointArray; const P: TPoint); inline;
 begin

diff --git a/Source/array/simba.array_pointarray.pas b/Source/array/simba.array_pointarray.pas
@@ -67,7 +67,7 @@ interface
 implementation
 
 uses
-  simba.array_point, simba.algo_sort, simba.containers, simba.quad, simba.box,
+  simba.array_point, simba.algo_sort, simba.containers, simba.vartype_quad, simba.vartype_box,
   simba.matrix_int;
 
 function T2DPointArrayHelper.Sort(Weights: TIntegerArray; LowToHigh: Boolean): T2DPointArray;

diff --git a/Source/finders/simba.finder_color.pas b/Source/finders/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.array_pointarray, simba.matrix_float, 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 b/Source/finders/simba.finder_dtm.pas
@@ -39,7 +39,7 @@ function FindDTMRotatedOnTarget(Target: TSimbaTarget;
 implementation
 
 uses
-  simba.colormath_distance, simba.containers;
+  simba.colormath_distance, simba.containers, simba.vartype_box;
 
 type
   TSearchPoint = record

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

diff --git a/Source/forms/simba.aca.pas b/Source/forms/simba.aca.pas
@@ -118,7 +118,8 @@ implementation
 
 uses
   Clipbrd, TypInfo, LCLType,
-  simba.windowhandle, simba.image, simba.colormath_aca, simba.matrix_float, simba.dialog;
+  simba.vartype_windowhandle, simba.image, simba.colormath_aca, simba.matrix_float, simba.dialog,
+  simba.vartype_string;
 
 procedure TSimbaACAForm.ClientImageMouseMove(Sender: TSimbaImageBox; Shift: TShiftState; X, Y: Integer);
 begin

diff --git a/Source/forms/simba.dtmeditor.pas b/Source/forms/simba.dtmeditor.pas
@@ -118,7 +118,7 @@ implementation
 {$R *.lfm}
 
 uses
-  simba.windowhandle, simba.colormath, simba.dialog;
+  simba.vartype_windowhandle, simba.colormath, simba.dialog, simba.vartype_box;
 
 procedure TSimbaDTMEditorForm.DoImgMouseMove(Sender: TSimbaImageBox; Shift: TShiftState; X, Y: Integer);
 var

diff --git a/Source/ide/simba.form_colorpickhistory.pas b/Source/ide/simba.form_colorpickhistory.pas
@@ -56,7 +56,7 @@ implementation
 
 uses
   lcltype, types,
-  simba.base, simba.settings, simba.colormath,
+  simba.base, simba.settings, simba.colormath, simba.vartype_string,
   simba.ide_maintoolbar;
 
 type

diff --git a/Source/ide/simba.form_downloadsimba.pas b/Source/ide/simba.form_downloadsimba.pas
@@ -71,7 +71,7 @@ implementation
 
 uses
   ATCanvasPrimitives,
-  simba.httpclient, simba.ide_theme, simba.form_main;
+  simba.httpclient, simba.ide_theme, simba.form_main, simba.vartype_string;
 
 type
   TUpdateFormNode = class(TTreeNode)

diff --git a/Source/ide/simba.form_main.pas b/Source/ide/simba.form_main.pas
@@ -274,7 +274,7 @@ implementation
   simba.ide_tab,
   simba.aca, simba.dtmeditor, simba.env, simba.ide_dockinghelpers, simba.nativeinterface,
   simba.ide_simpleformatter, simba.ide_theme,
-  simba.threading, simba.ide_editor;
+  simba.threading, simba.ide_editor, simba.vartype_string;
 
 procedure TSimbaMainForm.HandleException(Sender: TObject; E: Exception);
 

diff --git a/Source/ide/simba.form_openexample.pas b/Source/ide/simba.form_openexample.pas
@@ -45,7 +45,8 @@ implementation
 
 uses
   LCLType, AnchorDocking,
-  simba.form_main, simba.form_tabs, simba.ide_package, simba.files, simba.ide_theme;
+  simba.form_main, simba.form_tabs, simba.ide_package, simba.files, simba.ide_theme,
+  simba.vartype_string;
 
 function ReadResourceString(ResourceName: String): String;
 begin

diff --git a/Source/ide/simba.form_output.pas b/Source/ide/simba.form_output.pas
@@ -12,7 +12,8 @@ interface
 uses
   classes, sysutils, forms, controls, comctrls, graphics, menus, extctrls, syncobjs,
   synedit, syneditmiscclasses, syneditmousecmds,
-  simba.settings, simba.base, simba.component_tabcontrol, simba.component_synedit;
+  simba.settings, simba.base, simba.component_tabcontrol, simba.component_synedit,
+  simba.vartype_string;
 
 type
   TSimbaOutputBox = class(TSimbaMemo)

diff --git a/Source/ide/simba.ide_areaselector.pas b/Source/ide/simba.ide_areaselector.pas
@@ -49,8 +49,8 @@   TSimbaAreaSelector = class(TObject)
 implementation
 
 uses
-  math, lcltype,
-  simba.windowhandle;
+  Math, LCLType,
+  simba.vartype_windowhandle;
 
 function ShowAreaSelector(Window: TWindowHandle): TBox;
 begin

diff --git a/Source/ide/simba.ide_codetools_arrayhelpers.pas b/Source/ide/simba.ide_codetools_arrayhelpers.pas
@@ -18,7 +18,7 @@ function GetArrayHelpers(Decl: TDeclaration): TCodeParser;
 implementation
 
 uses
-  simba.containers;
+  simba.containers, simba.vartype_string;
 
 type
   TArrayHelperGenerator = class(TObject)

diff --git a/Source/ide/simba.ide_colorpicker.pas b/Source/ide/simba.ide_colorpicker.pas
@@ -11,7 +11,7 @@ interface
 
 uses
   classes, sysutils, forms, controls, graphics, dialogs, extctrls, stdctrls,
-  simba.imagebox_zoom, simba.base;
+  simba.imagebox_zoom, simba.base, simba.vartype_box;
 
 type
   TSimbaColorPickerHint = class(THintWindow)
@@ -52,7 +52,7 @@ implementation
 
 uses
   LCLType,
-  simba.image, simba.windowhandle, simba.image_lazbridge,
+  simba.image, simba.vartype_windowhandle, simba.image_lazbridge,
   simba.form_colorpickhistory, simba.threading, simba.ide_dockinghelpers,
   simba.colormath;
 

diff --git a/Source/ide/simba.ide_editor.pas b/Source/ide/simba.ide_editor.pas
@@ -123,7 +123,7 @@ implementation
   simba.fonthelpers, simba.ide_editor_blockcompletion,
   simba.ide_editor_docgenerator, simba.ide_editor_commentblock,
   simba.ide_editor_mousewheelzoom, simba.ide_editor_multicaret,
-  simba.ide_theme;
+  simba.ide_theme, simba.vartype_string;
 
 function TSimbaEditor.IsHighlighterAttribute(Values: TStringArray): Boolean;
 var

diff --git a/Source/ide/simba.ide_editor_autocomplete.pas b/Source/ide/simba.ide_editor_autocomplete.pas
@@ -116,7 +116,7 @@ implementation
 uses
   ATCanvasPrimitives,
   simba.algo_sort, simba.ide_editor, simba.ide_theme, simba.fonthelpers,
-  simba.ide_codetools_setup, simba.ide_codetools_keywords;
+  simba.ide_codetools_setup, simba.ide_codetools_keywords, simba.vartype_string;
 
 {$IFDEF WINDOWS}
 function SetClassLong(Handle: HWND; Index: Integer = -26; Value: Integer = 0): UInt32; stdcall; external 'user32' name 'SetClassLongA';

diff --git a/Source/ide/simba.ide_editor_paramhint.pas b/Source/ide/simba.ide_editor_paramhint.pas
@@ -69,7 +69,8 @@ implementation
 
 uses
   mPasLexTypes, mPasLex,
-  simba.ide_editor, simba.ide_codetools_setup, simba.ide_theme;
+  simba.ide_editor, simba.ide_codetools_setup, simba.ide_theme,
+  simba.vartype_point;
 
 procedure TSimbaParamHintForm.SetBoldIndex(AValue: Integer);
 begin

diff --git a/Source/ide/simba.ide_maintoolbar.pas b/Source/ide/simba.ide_maintoolbar.pas
@@ -90,7 +90,7 @@ implementation
   simba.ide_initialization, simba.ide_events, simba.form_main, simba.form_tabs, simba.form_output,
   simba.ide_tab, simba.form_package,
   simba.ide_colorpicker, simba.ide_windowselector, simba.ide_areaselector,
-  simba.windowhandle;
+  simba.vartype_windowhandle, simba.vartype_box;
 
 procedure TSimbaMainToolBar.SetStates(ScriptState: ESimbaScriptState);
 

diff --git a/Source/ide/simba.ide_mouselogger.pas b/Source/ide/simba.ide_mouselogger.pas
@@ -13,7 +13,7 @@ interface
 
 uses
   Classes, SysUtils,
-  simba.base, simba.windowhandle, simba.simplelock;
+  simba.base, simba.vartype_windowhandle, simba.simplelock;
 
 type
   TSimbaMouseLogger = class(TThread)

diff --git a/Source/ide/simba.ide_package.pas b/Source/ide/simba.ide_package.pas
@@ -118,7 +118,7 @@ implementation
   inifiles, dateutils, fileutil, lazfileutils,
   simba.env, simba.httpclient,
   simba.ide_package_endpointgithub, simba.ide_package_endpointcustom, simba.threading,
-  simba.files;
+  simba.files, simba.vartype_string;
 
 function LoadPackageURLs: TStringArray;
 var

diff --git a/Source/ide/simba.ide_package_endpointcustom.pas b/Source/ide/simba.ide_package_endpointcustom.pas
@@ -64,7 +64,7 @@ implementation
 
 uses
   dateutils, fpjson,
-  simba.httpclient, simba.base;
+  simba.httpclient, simba.base, simba.vartype_string;
 
 function TSimbaPackageEndpoint_Custom.GetPage(URL: String): String;
 begin

diff --git a/Source/ide/simba.ide_package_endpointgithub.pas b/Source/ide/simba.ide_package_endpointgithub.pas
@@ -36,7 +36,7 @@ implementation
 
 uses
   forms, fpjson, dateutils,
-  simba.httpclient, simba.env, simba.base;
+  simba.httpclient, simba.env, simba.base, simba.vartype_string;
 
 const
   URL_REPOS            = 'https://api.github.com/repos/%s/%s';                       // {Owner} {Name}

diff --git a/Source/ide/simba.ide_package_menubuilder.pas b/Source/ide/simba.ide_package_menubuilder.pas
@@ -19,7 +19,7 @@ implementation
 
 uses
   Menus,
-  simba.form_main, simba.form_tabs, simba.files, simba.ide_mainmenubar;
+  simba.form_main, simba.form_tabs, simba.files, simba.ide_mainmenubar, simba.vartype_string;
 
 type
   TPackagePopupMenu = class(TPopupMenu)

diff --git a/Source/ide/simba.ide_tab.pas b/Source/ide/simba.ide_tab.pas
@@ -11,7 +11,7 @@ interface
 
 uses
   Classes, SysUtils, ComCtrls, Controls, Dialogs, Process, SynEdit, SynEditTypes,
-  simba.base, simba.ide_editor, simba.form_output, simba.component_tabcontrol, simba.windowhandle;
+  simba.base, simba.ide_editor, simba.form_output, simba.component_tabcontrol, simba.vartype_windowhandle;
 
 type
   TSimbaScriptTab = class;
@@ -147,7 +147,7 @@ implementation
   Forms,
   simba.files, simba.settings, simba.ide_events,
   simba.form_main, simba.form_tabs, simba.env, simba.ide_showdeclaration, simba.threading,
-  simba.scriptcommunication, simba.datetime, simba.ide_editor_popupmenu;
+  simba.scriptcommunication, simba.datetime, simba.ide_editor_popupmenu, simba.vartype_string;
 
 procedure TSimbaScriptTabRunner.DoOutputThread;
 var

diff --git a/Source/ide/simba.ide_windowselector.pas b/Source/ide/simba.ide_windowselector.pas
@@ -22,12 +22,12 @@ implementation
 
 uses
   {$IFDEF WINDOWS}
-  windows,
+  Windows,
   {$ENDIF}
   {$IFDEF DARWIN}
   CocoaAll, CocoaWSForms, CocoaUtils,
   {$ENDIF}
-  simba.baseclass, simba.windowhandle, simba.nativeinterface;
+  simba.baseclass, simba.vartype_windowhandle, simba.nativeinterface;
 
 type
   TSimbaWindowSelectorBase = class(TSimbaBaseClass)

diff --git a/Source/image/simba.image.pas b/Source/image/simba.image.pas
@@ -262,7 +262,7 @@ implementation
 
 uses
   Math, FPImage,
-  simba.zip, simba.box, simba.quad, simba.geometry, simba.nativeinterface,
+  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.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_bitmaparealoader.pas b/Source/image/simba.image_bitmaparealoader.pas
@@ -14,7 +14,7 @@ interface
 
 uses
   Classes, SysUtils,
-  simba.base, simba.image, simba.box;
+  simba.base, simba.image, simba.vartype_box;
 
 procedure SimbaImage_LoadBitmapArea(Image: TSimbaImage; FileName: String; Area: TBox);
 

diff --git a/Source/image/simba.image_stringconv.pas b/Source/image/simba.image_stringconv.pas
@@ -35,7 +35,7 @@ implementation
 
 uses
   FPReadPNG, FPWritePNG,
-  simba.encoding, simba.image_lazbridge;
+  simba.encoding, simba.image_lazbridge, simba.vartype_string;
 
 procedure SimbaImage_FromString(Image: TSimbaImage; Str: String);
 var

diff --git a/Source/image/simba.image_textdrawer.pas b/Source/image/simba.image_textdrawer.pas
@@ -113,7 +113,7 @@ implementation
 
 uses
   Forms, FileUtil, LazFileUtils, LazFreeTypeFontCollection,
-  simba.image, simba.image_utils, simba.fonthelpers;
+  simba.image, simba.image_utils, simba.fonthelpers, simba.vartype_box;
 
 function TSimbaFreeTypeFontLoader.GetFontNames: TStringArray;
 begin

diff --git a/Source/imagebox/simba.imagebox.pas b/Source/imagebox/simba.imagebox.pas
@@ -183,7 +183,7 @@   TSimbaImageBox = class(TCustomControl)
 implementation
 
 uses
-  simba.windowhandle, simba.datetime,
+  simba.vartype_windowhandle, simba.datetime, simba.vartype_box,
   GraphType, LCLIntf;
 
 generic procedure ZoomOut<_T>(Ratio, SrcX, SrcY, LoopEndX, LoopEndY: Integer; SrcImg, DestImg: TRawImage);

diff --git a/Source/imagebox/simba.imagebox_canvas.pas b/Source/imagebox/simba.imagebox_canvas.pas
@@ -111,7 +111,7 @@ implementation
 
 uses
   Math,
-  simba.colormath, simba.box;
+  simba.colormath, simba.vartype_box, simba.vartype_point;
 
 procedure TTextDrawer.MoveToPixel(x, y: integer);
 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.matrix_float, simba.algo_sort, simba.vartype_box;
 
 generic procedure DoDrawPolygonFilled<_T>(Poly: TPointArray; DrawInfo: TDrawInfo);
 type

diff --git a/Source/matrix/simba.matrix_float.pas b/Source/matrix/simba.matrix_float.pas
@@ -91,7 +91,7 @@ implementation
 
 uses
   Math,
-  simba.math, simba.containers, simba.container_heaparray, simba.array_point, simba.box;
+  simba.math, simba.containers, simba.container_heaparray, simba.array_point, simba.vartype_box;
 
 class operator TSingleSum.:=(const Right: Single): TSingleSum;
 begin