Храним данные в utf8 в переменных AnsiString rtti зкада. fix #107 про…

…должение 4222abd
zamtmn · Mar 26, 2024 · 214a56f · 214a56f
1 parent 3daef46
commit 214a56f
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 17 deletions.
diff --git a/cad_source/components/zscript/UBaseTypeDescriptor.pas b/cad_source/components/zscript/UBaseTypeDescriptor.pas
@@ -18,7 +18,7 @@
 
 unit UBaseTypeDescriptor;
 
-{$MODE DELPHI}
+{$MODE DELPHI}{$Codepage UTF8}
 interface
 uses
       typinfo,LCLProc,Graphics,classes,Themes,
@@ -363,36 +363,36 @@ class procedure TFloatTypeManipulator<T>.setFormattedValueAsString(var data:T; c
 end;
 class function TStringTypeManipulator<T>.GetValueAsString(const data:T):TInternalScriptString;
 begin
-    result:=uni2cp(data);
+    result:={uni2cp}(data);
 end;
 class function TStringTypeManipulator<T>.GetFormattedValueAsString(const data:T; const f:TzeUnitsFormat):TInternalScriptString;
 begin
    result:=GetValueAsString(data);
 end;
 class procedure TStringTypeManipulator<T>.SetValueFromString(var data:T;Value:TInternalScriptString);
 begin
-     data:=cp2uni(Value);
+     data:={cp2uni}(Value);
 end;
 class procedure TStringTypeManipulator<T>.setFormattedValueAsString(var data:T; const f:TzeUnitsFormat;Value:TInternalScriptString);
 begin
-     data:=cp2uni(Value);
+     data:={cp2uni}(Value);
 end;
 
 class function TAnsiStringTypeManipulator<T>.GetValueAsString(const data:T):TInternalScriptString;
 begin
-    result:=ansi2cp(data);
+    result:={ansi2cp}(data);;
 end;
 class function TAnsiStringTypeManipulator<T>.GetFormattedValueAsString(const data:T; const f:TzeUnitsFormat):TInternalScriptString;
 begin
    result:=GetValueAsString(data);
 end;
 class procedure TAnsiStringTypeManipulator<T>.SetValueFromString(var data:T;Value:TInternalScriptString);
 begin
-     data:=cp2ansi(Value);
+     data:={cp2ansi}(Value);
 end;
 class procedure TAnsiStringTypeManipulator<T>.setFormattedValueAsString(var data:T; const f:TzeUnitsFormat;Value:TInternalScriptString);
 begin
-     data:=cp2uni(Value);
+     data:={cp2uni}(Value);
 end;
 
 

diff --git a/cad_source/components/zscript/langsystem.pas b/cad_source/components/zscript/langsystem.pas
@@ -18,7 +18,7 @@
 
 unit langsystem;
 
-{$MODE DELPHI}
+{$MODE DELPHI}{$Codepage UTF8}
 interface
 uses uzbstrproc,varmandef,UBaseTypeDescriptor,
      base64;
@@ -359,8 +359,8 @@ function TAnsiString_let_TString(var rez, hrez: vardesk): vardesk;
     rez.SetInstance(FundamentalStringDescriptorObj.AllocAndInitInstance);
   end else
     AnsiString(rez.data.Addr.Instance^):='';
-  AnsiString(result.data.Addr.Instance^) := Tria_Utf8ToAnsi(String(hrez.data.Addr.Instance^));
-  AnsiString(rez.data.Addr.Instance^) := Tria_Utf8ToAnsi(String(hrez.data.Addr.Instance^));
+  AnsiString(result.data.Addr.Instance^) := {Tria_Utf8ToAnsi}(String(hrez.data.Addr.Instance^));
+  AnsiString(rez.data.Addr.Instance^) := {Tria_Utf8ToAnsi}(String(hrez.data.Addr.Instance^));
 end;
 function TAnsiString_let_TAnsiString(var rez, hrez: vardesk): vardesk;
 begin

diff --git a/cad_source/zcad/commands/uzccommand_drawsuperline.pas b/cad_source/zcad/commands/uzccommand_drawsuperline.pas
@@ -299,18 +299,18 @@ procedure createline;
 
     if operands = '1' then
     begin
-       hotkeyname:=Tria_AnsiToUtf8(DrawSuperlineParams.SLSetting1);
-       hotkeytypeline:=Tria_AnsiToUtf8(DrawSuperlineParams.SLSettingTypeLine1);
+       hotkeyname:={Tria_AnsiToUtf8}(DrawSuperlineParams.SLSetting1);
+       hotkeytypeline:={Tria_AnsiToUtf8}(DrawSuperlineParams.SLSettingTypeLine1);
     end;
     if operands = '2' then
     begin
-       hotkeyname:=Tria_AnsiToUtf8(DrawSuperlineParams.SLSetting2);
-       hotkeytypeline:=Tria_AnsiToUtf8(DrawSuperlineParams.SLSettingTypeLine2);
+       hotkeyname:={Tria_AnsiToUtf8}(DrawSuperlineParams.SLSetting2);
+       hotkeytypeline:={Tria_AnsiToUtf8}(DrawSuperlineParams.SLSettingTypeLine2);
     end;
     if operands = '3' then
     begin
-       hotkeyname:=Tria_AnsiToUtf8(DrawSuperlineParams.SLSetting3);
-       hotkeytypeline:=Tria_AnsiToUtf8(DrawSuperlineParams.SLSettingTypeLine3);
+       hotkeyname:={Tria_AnsiToUtf8}(DrawSuperlineParams.SLSetting3);
+       hotkeytypeline:={Tria_AnsiToUtf8}(DrawSuperlineParams.SLSettingTypeLine3);
     end;
 
      //ZCMsgCallBackInterface.TextMessage('hotkeyname:'+hotkeyname,TMWOHistoryOut);

diff --git a/cad_source/zcad/commands/uzccommand_numdevices.pas b/cad_source/zcad/commands/uzccommand_numdevices.pas
@@ -190,7 +190,7 @@ procedure FillMetrixDictionary(var md:TMetrixDictionary);
             pvd:=pdevvarext.entityunit.FindVariable('NMO_BaseName');
             if pvd<>nil then begin
               if uppercase(pvd^.data.PTD^.GetUserValueAsString(pvd^.data.Addr.Instance))=
-                 uppercase(Tria_AnsiToUtf8(NumberingParams.BaseName)) then
+                 uppercase({Tria_AnsiToUtf8}(NumberingParams.BaseName)) then
                 process:=true
               else begin
                 process:=false;

diff --git a/cad_source/zcad/register/uzcregnavigatordevices.pas b/cad_source/zcad/register/uzcregnavigatordevices.pas
@@ -17,6 +17,7 @@
 }
 
 unit uzcregnavigatordevices;
+{$Codepage UTF8}
 {$INCLUDE zengineconfig.inc}
 interface
 uses uzcfnavigatordevices,uzcfcommandline,uzbpaths,TypeDescriptors,uzctranslations,Forms,