-лишнее в зкадном rtti

zamtmn · Dec 21, 2024 · 5fe9c84 · 5fe9c84
1 parent 70b19d6
commit 5fe9c84
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 40 deletions.
diff --git a/cad_source/zcad/electrotech/uzccablemanager.pas b/cad_source/zcad/electrotech/uzccablemanager.pas
@@ -10,13 +10,11 @@ interface
 uses uzcenitiesvariablesextender,uzcvariablesutils,Varman,uzbstrproc,uzcentcable,
      uzeentdevice,uzeconsts,gzctnrVectorObjects,
      gzctnrVectorTypes,SysUtils,uzbtypes,varmandef,uzcdrawings,
-     uzcstrconsts{,uzctnrvectorpgdbaseobjects},uzCtnrVectorpBaseEntity;
+     uzcstrconsts,uzCtnrVectorpBaseEntity;
 resourcestring
      DefCableName='Created. Not named';
 type
-{EXPORT+}
     PTCableDesctiptor=^TCableDesctiptor;
-    {REGISTEROBJECTTYPE TCableDesctiptor}
     TCableDesctiptor= object(GDBaseObject)
                      Name:String;
                      Segments:TZctnrVectorPGDBaseEntity;   // сборщик всех кабелей с одинаковым именем (ШС..)
@@ -31,15 +29,13 @@ interface
                  end;
 
     PTCableManager=^TCableManager;
-    {---REGISTEROBJECTTYPE TCableManager}
     TCableManager= object(GZVectorObjects<TCableDesctiptor>)
                        constructor init;
                        procedure done;virtual;
                        procedure build;virtual;
                        function FindOrCreate(sname:String):PTCableDesctiptor;virtual;
                        function Find(sname:String):PTCableDesctiptor;virtual;
                  end;
-{EXPORT-}
 implementation
 function TCableDesctiptor.GetObjTypeName;
 begin

diff --git a/cad_source/zengine/containers/UGDBNamedObjectsArray.pas b/cad_source/zengine/containers/UGDBNamedObjectsArray.pas
@@ -24,13 +24,11 @@ interface
      uzeNamedObject,//gzctnrVectorClass,
      Strings;
 type
-{EXPORT+}
 TForCResult=(IsFounded(*'IsFounded'*)=1,
              IsCreated(*'IsCreated'*)=2,
              IsError(*'IsError'*)=3);
-{------REGISTEROBJECTTYPE GDBNamedObjectsArray}
-GDBNamedObjectsArray{-}<PTObj,TObj>{//}
-                     = object(GZVectorPObects{-}<PTObj,TObj>{//})
+GDBNamedObjectsArray<PTObj,TObj>
+                     = object(GZVectorPObects<PTObj,TObj>)
                     constructor init(m:Integer);
                     function getIndex(const name: String):Integer;
                     function getAddres(const name: String):Pointer;overload;
@@ -41,7 +39,6 @@ interface
                     function GetFreeName(const NameFormat:String;firstindex:integer):String;
                     procedure IterateCounter(PCounted:Pointer;var Counter:Integer;proc:TProcCounter);virtual;
               end;
-{EXPORT-}
 PTGenericNamedObjectsArray=^TGenericNamedObjectsArray;
 TGenericNamedObjectsArray=GDBNamedObjectsArray{-}<PGDBNamedObject,GDBNamedObject>{//};
 implementation

diff --git a/cad_source/zengine/styles/uzestylesdim.pas b/cad_source/zengine/styles/uzestylesdim.pas
@@ -119,16 +119,15 @@ TGDBDimUnitsProp=record
                       procedure ResolveTextstyles(const tst:TGenericNamedObjectsArray);
                       destructor Done;virtual;
              end;
+{EXPORT-}
 PGDBDimStyleArray=^GDBDimStyleArray;
-{REGISTEROBJECTTYPE GDBDimStyleArray}
 GDBDimStyleArray= object(GDBNamedObjectsArray{-}<PGDBDimStyle,GDBDimStyle>{//})
                     constructor init(m:Integer);
                     constructor initnul;
                     procedure ResolveDXFHandles(const Handle2BlockName:TMapBlockHandle_BlockNames);
                     procedure ResolveTextstyles(const tst:TGenericNamedObjectsArray);
                     procedure ResolveLineTypes(const lta:GDBLtypeArray);
               end;
-{EXPORT-}
 TDimArrowBlockArray=array[TArrowStyle] of TDimArrowBlockParam;
 var
      DimArrows:TDimArrowBlockArray=(

diff --git a/cad_source/zengine/styles/uzestyleshatchpatterns.pas b/cad_source/zengine/styles/uzestyleshatchpatterns.pas
@@ -26,7 +26,6 @@ interface
      uzeffdxfsupport,uzMVReader,
      Math;
 type
-{EXPORT+}
   PTPatStrokesArray=^TPatStrokesArray;
   TPatStrokesArray=object(TStrokesArray)
     fAngle:Double;
@@ -45,7 +44,6 @@ interface
   THatchPattern=object(GZVectorObjects<TPatStrokesArray>)
     procedure SaveToDXF(var outhandle:TZctnrVectorBytes;const MainAngle,MainScale:Double);
   end;
-{EXPORT-}
 
 function LoadPatternFromDXF(var PPattern:PTHatchPattern;var f:TZMemReader;DXFCode:Integer;const MainAngle,MainScale:Double):Boolean;
 

diff --git a/cad_source/zengine/styles/uzestyleslayers.pas b/cad_source/zengine/styles/uzestyleslayers.pas
@@ -43,10 +43,10 @@ interface
                procedure SetDefaultValues;virtual;
                destructor done;virtual;
          end;
+{EXPORT-}
 PGDBLayerPropArray=^GDBLayerPropArray;
 GDBLayerPropArray=packed array [0..0] of PGDBLayerProp;
 PGDBLayerArray=^GDBLayerArray;
-{REGISTEROBJECTTYPE GDBLayerArray}
 GDBLayerArray= object(GDBNamedObjectsArray{-}<PGDBLayerProp,GDBLayerProp>{//})
                     constructor init(m:Integer;psyslt:Pointer);
                     constructor initnul;
@@ -56,7 +56,6 @@ interface
                     function createlayerifneed(_source:PGDBLayerProp):PGDBLayerProp;
                     function createlayerifneedbyname(const lname:String;_source:PGDBLayerProp):PGDBLayerProp;
               end;
-{EXPORT-}
 TLayerProp=class(TNamedObject)
 end;
 function GetLTName(LT:PGDBLayerProp):String;

diff --git a/cad_source/zengine/styles/uzestyleslinetypes.pas b/cad_source/zengine/styles/uzestyleslinetypes.pas
@@ -107,10 +107,10 @@ shxprop=record
                function GetLTString:String;
                procedure CreateLineTypeFrom(var LT:String);
              end;
+{EXPORT-}
 PGDBLtypePropArray=^GDBLtypePropArray;
 GDBLtypePropArray=packed array [0..0] of GDBLtypeProp;
 PGDBLtypeArray=^GDBLtypeArray;
-{REGISTEROBJECTTYPE GDBLtypeArray}
 GDBLtypeArray= object(GDBNamedObjectsArray{-}<PGDBLtypeProp,GDBLtypeProp>{//})
                     constructor init(m:Integer);
                     constructor initnul;
@@ -125,10 +125,7 @@ shxprop=record
                     function createlayerifneed(_source:PGDBLayerProp):PGDBLayerProp;
                     function createlayerifneedbyname(lname:String;_source:PGDBLayerProp):PGDBLayerProp;}
               end;
-{EXPORT-}
 implementation
-//uses
-//    log;
 type
     TSeek=(TSeekInterface,TSeekImplementation);
 procedure GDBLtypeArray.format;

diff --git a/cad_source/zengine/styles/uzestylestables.pas b/cad_source/zengine/styles/uzestylestables.pas
@@ -46,14 +46,13 @@ TGDBTableCellStyle=record
                      constructor Init(const n:String);
                      destructor Done;virtual;
                end;
+{EXPORT-}
 PGDBTableStyleArray=^GDBTableStyleArray;
-{REGISTEROBJECTTYPE GDBTableStyleArray}
 GDBTableStyleArray= object(GDBNamedObjectsArray{-}<PTGDBTableStyle,TGDBTableStyle>{//})
                     constructor init(m:Integer);
                     constructor initnul;
                     function AddStyle(const name:String):PTGDBTableStyle;
               end;
-{EXPORT-}
 var
   PTempTableStyle:PTGDBTableStyle;
 implementation

diff --git a/cad_source/zengine/styles/uzestylestexts.pas b/cad_source/zengine/styles/uzestylestexts.pas
@@ -45,8 +45,8 @@   GDBTextStyleProp=record
     UsedInLTYPE:Boolean;
     destructor Done;virtual;
   end;
+{EXPORT-}
 PGDBTextStyleArray=^GDBTextStyleArray;
-{REGISTEROBJECTTYPE GDBTextStyleArray}
 GDBTextStyleArray= object(GDBNamedObjectsArray{-}<PGDBTextStyle,GDBTextStyle>{//})
                     constructor init(m:Integer);
                     constructor initnul;
@@ -58,7 +58,6 @@   GDBTextStyleProp=record
                     procedure freeelement(PItem:PT);virtual;
                     function CorrectNilledTextStyle(pts:PGDBTextStyle):PGDBTextStyle;
               end;
-{EXPORT-}
   TTextStyle = class(TNamedObject)
     public
       FontFile:String;

diff --git a/environment/typeexporter/zcad.files b/environment/typeexporter/zcad.files
@@ -1,3 +1,5 @@
+#коментарий
+;коментарий
 components/zcontainers/gzctnrvectortypes.pas
 components/zcontainers/gzctnrvector.pas
 components/zcontainers/gzctnrvectorsimple.pas
@@ -8,7 +10,7 @@ components/zcontainers/gzctnrvectorpobjects.pas
 components/zcontainers/gzctnrvectorobjects.pas
 components/zcontainers/uzctnralignedvectorbytes.pas
 components/zcontainers/gzctnralignedvectorobjects.pas
-components/zcontainers/gzctnrbinaryseparatedtree.pas
+;components/zcontainers/gzctnrbinaryseparatedtree.pas
 components/zcontainers/uzctnrvectorpointers.pas
 components/zcontainers/uzctnrvectorstrings.pas
 components/zmath/uzegeometrytypes.pas
@@ -17,19 +19,17 @@ components/zebase/uzbtypes.pas
 zengine/core/objects/uzepalette.pas
 zengine/core/objects/uzecamera.pas
 zcad/uzcsysparams.pas
-zengine/containers/uzctnrvectorpgdbaseobjects.pas
-zengine/containers/uzctnrvectorpbaseentity.pas
-zengine/containers/UGDBOpenArrayOfPV.pas
-zengine/containers/UGDBVisibleOpenArray.pas
-zengine/containers/UGDBControlPointArray.pas
-zengine/containers/UGDBOutbound2DIArray.pas
-zengine/containers/UGDBPoint3DArray.pas
-zengine/containers/UGDBPolyLine2DArray.pas
-zengine/containers/UGDBSelectedObjArray.pas
-zengine/containers/uzctnrvectorpgdbaseobjects.pas
+;zengine/containers/uzctnrvectorpgdbaseobjects.pas
+;zengine/containers/uzctnrvectorpbaseentity.pas
+;zengine/containers/UGDBOpenArrayOfPV.pas
+;zengine/containers/UGDBVisibleOpenArray.pas
+;zengine/containers/UGDBControlPointArray.pas
+;zengine/containers/UGDBOutbound2DIArray.pas
+;zengine/containers/UGDBPoint3DArray.pas
+;zengine/containers/UGDBPolyLine2DArray.pas
+;zengine/containers/UGDBSelectedObjArray.pas
+;zengine/containers/uzctnrvectorpgdbaseobjects.pas
 zengine/styles/uzenamedobject.pas
-zengine/containers/UGDBVectorSnapArray.pas
-zengine/containers/UGDBNamedObjectsArray.pas
 zengine/styles/uzestylestexts.pas
 zengine/styles/uzestyleslayers.pas
 zengine/styles/uzestyleslinetypes.pas
@@ -49,8 +49,8 @@ zcad/commands/uzccommand_move.pas
 zcad/commands/uzccommand_copy.pas
 zcad/commands/uzccomdraw.pas
 zengine/zgl/common/uzglviewareadata.pas
-zengine/zgl/gdi/uzgldrawergdi.pas
 zengine/zgl/opengl/uzgldrawerogl.pas
+zengine/zgl/gdi/uzgldrawergdi.pas
 zengine/zgl/dx/uzgldrawerdx.pas
 zcad/gui/odjectinspector/uzcoiwrapper.pas
 zcad/gui/odjectinspector/uzcoimultiobjects.pas
diff --git a/environment/typeexporter/zcadelectrotech.files b/environment/typeexporter/zcadelectrotech.files
@@ -1,3 +1,2 @@
 zcad/electrotech/uzccomops.pas
-zcad/electrotech/uzccomelectrical.pas
-zcad/electrotech/uzccablemanager.pas
+zcad/electrotech/uzccomelectrical.pas