Merge branch 'master' of https://github.com/zamtmn/zcad

Author: zamtmn

cad_source/components/fpdwg

@@ -1305,7 +1305,7 @@
     </Target>
     <SearchPaths>
       <IncludeFiles Value="zengine;autogenerated;$(ProjOutDir);other/AGraph/Vectors"/>
-      <OtherUnitFiles Value="zengine/containers;zengine/styles;zengine;zengine/core;zengine/core/entities;zengine/core/drawings;zengine/fonts;zengine/zgl/common;zengine/zgl/gdi;zengine/zgl/canvas;zengine/zgl/opengl;zengine/zgl/openglmodern;zengine/zgl/dx;zengine/geomlib;zengine/misc;zengine/fileformats;zengine/core/utils;zengine/core/objects;other;../cad;autogenerated;zcad/electrotech;zcad/lclmod;zcad/commands;zcad/devicebase;zcad/gui;zcad/gui/forms;zcad/entities;zcad;zcad/gui/odjectinspector;zcad/core/undostack;zcad/register;zcad/core/drawings;zcad/core/utils;zcad/core;zcad/misc;zcad/electrotech/gui;zcad/electrotech/gui/forms;components/callstack_memprofiler/source/nodetree;components/callstack_memprofiler/source;zcad/velec;zcad/velec/managerem;zcad/velec/connectcontrol;zcad/velec/dialuximport;zcad/velec/lightexchange;zcad/velec/space;zcad/velec/uzvspreadsheet;zcad/velec/ucvrestoretable;zengine/core/entities/uzeentproxy"/>
+      <OtherUnitFiles Value="zengine/containers;zengine/styles;zengine;zengine/core;zengine/core/entities;zengine/core/drawings;zengine/fonts;zengine/zgl/common;zengine/zgl/gdi;zengine/zgl/canvas;zengine/zgl/opengl;zengine/zgl/openglmodern;zengine/zgl/dx;zengine/geomlib;zengine/misc;zengine/fileformats;zengine/core/utils;zengine/core/objects;other;../cad;autogenerated;zcad/electrotech;zcad/lclmod;zcad/commands;zcad/devicebase;zcad/gui;zcad/gui/forms;zcad/entities;zcad;zcad/gui/odjectinspector;zcad/core/undostack;zcad/register;zcad/core/drawings;zcad/core/utils;zcad/core;zcad/misc;zcad/electrotech/gui;zcad/electrotech/gui/forms;components/callstack_memprofiler/source/nodetree;components/callstack_memprofiler/source;zcad/velec;zcad/velec/managerem;zcad/velec/connectcontrol;zcad/velec/dialuximport;zcad/velec/lightexchange;zcad/velec/space;zcad/velec/uzvspreadsheet;zcad/velec/ucvrestoretable;zengine/core/entities/uzeentproxy;zengine/fileformats/dwg;zengine/fileformats/dwg/entities"/>
       <UnitOutputDirectory Value="../lib/$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Parsing>

cad_source/zcad.lpi

@@ -32,6 +32,7 @@ interface
                             procedure done;virtual;
                             procedure free;virtual;
                             function AddPEntity(var entity:GDBObjEntity):TArrayIndex;virtual;
+                            function AddPEntityToArrayOnly(var entity:GDBObjEntity):TArrayIndex;virtual;
                             procedure RemoveFromTree(p:PGDBObjEntity);
 
                       end;
@@ -66,6 +67,12 @@ function GDBObjEntityTreeArray.AddPEntity;
   //result:=inherited PushBackPointerToEntity({ppointer(p)^}@entity);
   //{pGDBObjEntity(p^)}entity.bp.ListPos.SelfIndex:=result;
 end;
+function GDBObjEntityTreeArray.AddPEntityToArrayOnly;
+begin
+  result:=inherited AddPEntity(entity);
+  entity.bp.TreePos.Owner:=nil;
+  entity.bp.TreePos.SelfIndexInNode:=-1;
+end;
 constructor GDBObjEntityTreeArray.init;
 begin
   inherited init(m);

cad_source/zengine/containers/UGDBVisibleTreeArray.pas

@@ -93,6 +93,8 @@ interface
     function IsStagedFormatEntity:boolean;virtual;
   end;
 
+function AllocAndInitArc(owner:PGDBObjGenericWithSubordinated):PGDBObjArc;
+
 implementation
 
 function GDBObjARC.IsStagedFormatEntity:boolean;

cad_source/zengine/core/entities/uzeentarc.pas

@@ -97,8 +97,11 @@   tcirclertmodify=record
     class function CreateInstance:PGDBObjCircle;static;
     function GetObjType:TObjID;virtual;
     function IsStagedFormatEntity:boolean;virtual;
+
   end;
 
+function AllocAndInitCircle(owner:PGDBObjGenericWithSubordinated):PGDBObjCircle;
+
 implementation
 
 function GDBObjCircle.IsStagedFormatEntity:boolean;

cad_source/zengine/core/entities/uzeentcircle.pas

@@ -86,6 +86,7 @@   TDrawingPreCalcData=record
       var drawing:TDrawingDef);virtual;
     //** Добавляет объект в область ConstructObjRoot или mainObjRoot или итд. Пример добавления gdb.GetCurrentDWG^.ConstructObjRoot.AddMi(@sampleObj);
     procedure AddMi(var pobj:PGDBObjSubordinated);virtual;
+    procedure AddMiToArrayOnly(var pobj:PGDBObjSubordinated);virtual;
     procedure ImEdited(pobj:PGDBObjSubordinated;
       pobjinarray:integer;var drawing:TDrawingDef);virtual;
     function ReturnLastOnMouse(InSubEntry:boolean):PGDBObjEntity;
@@ -436,6 +437,14 @@ procedure GDBObjGenericSubEntry.AddMi;
     pGDBObjEntity(pobj)^.EntExtensions.RunSetRoot(pobj,@self);
 end;
 
+procedure GDBObjGenericSubEntry.AddMiToArrayOnly;
+begin
+  ObjArray.AddPEntityToArrayOnly(pGDBObjEntity(pobj)^);
+  pGDBObjEntity(pobj)^.bp.ListPos.Owner:=@self;
+  if assigned(pGDBObjEntity(pobj)^.EntExtensions) then
+    pGDBObjEntity(pobj)^.EntExtensions.RunSetRoot(pobj,@self);
+end;
+
 procedure GDBObjGenericSubEntry.correctobjects;
 var
   pobj:PGDBObjEntity;

cad_source/zengine/core/entities/uzeentgenericsubentry.pas

@@ -27,7 +27,7 @@ interface
   uzegeometry,uzestyleslayers,uzeentity,UGDBPoint3DArray,UGDBPolyLine2DArray,
   uzctnrVectorBytesStream,uzeTypes,uzeentwithlocalcs,uzeconsts,Math,
   gzctnrVectorTypes,uzegeometrytypes,uzeffdxfsupport,SysUtils,
-  UGDBSelectedObjArray,uzMVReader,uzCtnrVectorpBaseEntity;
+  UGDBSelectedObjArray,uzMVReader,uzCtnrVectorpBaseEntity,uzclog;
 
 type
 
@@ -100,6 +100,8 @@   GLLWWidth=record
     function GetObjType:TObjID;virtual;
   end;
 
+function AllocAndInitLWpolyline(owner:PGDBObjGenericWithSubordinated):PGDBObjLWPolyline;
+
 implementation
 
 var
@@ -516,6 +518,7 @@ procedure GDBObjLWpolyline.LoadFromDXF;
 begin
   hlGDBWord:=0;
   numv:=0;
+      //programlog.LogOutStr('GDBObjLWpolyline: Внутри LoadFromDXF', LM_Info);
   globalwidth:=0;
   widthload:=False;
   closed:=False;
@@ -656,6 +659,7 @@ procedure GDBObjLWpolyline.FormatEntity(var drawing:TDrawingDef;
   createpoint;
   CalcWidthSegment;
   Square:=CalcSquare;
+    //programlog.LogOutStr('GDBObjLWpolyline: Внутри formatEntity', LM_Info);
   calcbb(dc);
   if assigned(EntExtensions) then
     EntExtensions.RunOnAfterEntityFormat(@self,drawing,DC);

cad_source/zengine/core/entities/uzeentlwpolyline.pas

@@ -71,6 +71,7 @@ procedure FormatMtext(pfont:pgdbfont;Width,size,wfactor:double;
 function GetLinesH(linespace,size:double;var Lines:XYZWStringArray):double;
 function GetLinesW(var Lines:XYZWStringArray):double;
 function GetLineSpaceFromLineSpaceF(linespacef,size:double):double;
+function AllocAndInitMText(owner:PGDBObjGenericWithSubordinated):PGDBObjMText;
 
 implementation
 

cad_source/zengine/core/entities/uzeentmtext.pas

@@ -69,6 +69,8 @@ interface
     function GetObjType:TObjID;virtual;
   end;
 
+function AllocAndInitPoint(owner:PGDBObjGenericWithSubordinated):PGDBObjPoint;
+
 implementation
 
 procedure GDBObjPoint.TransformAt;

cad_source/zengine/core/entities/uzeentpoint.pas

@@ -80,6 +80,7 @@   TEdgePair = record
   public
     constructor init(own:Pointer;layeraddres:PGDBLayerProp;
       LW:smallint);
+    constructor initnul(owner:PGDBObjGenericWithSubordinated);
 
     // Основные методы сущности
     //procedure LoadFromDXF(var rdr:TZMemReader;ptu:PExtensionData;
@@ -125,6 +126,14 @@ constructor GDBObjPolyFaceMesh.init(own:Pointer;layeraddres:PGDBLayerProp;
   FFaces.initnul;
 end;
 
+constructor GDBObjPolyFaceMesh.initnul(owner:PGDBObjGenericWithSubordinated);
+begin
+  inherited initnul(owner);
+  FVertexCount := 0;
+  FFaceCount := 0;
+  FFaces.initnul;
+end;
+
 procedure GDBObjPolyFaceMesh.BuildEdgePairs(out edgePairs: GDBEdgePairArray;
   out edgeCount: Integer);
 var
@@ -677,7 +686,7 @@ procedure GDBObjPolyFaceMesh.InitFacesFromTempFaces(TempFaces:PTempFaceIndices;C
   pFace:PTempFaceIndices;
 begin
   //programlog.LogOutFormatStr('uzeentpolyfacemesh: InitFacesFromTempFaces START Count=%d',[Count],LM_Info);
-  FFaces.initnul; // Инициализация вектора перед использованием
+  FFaces.Clear;
   FFaceCount:=Count;
   for i:=0 to Count-1 do begin
     pFace:=PTempFaceIndices(PtrUInt(TempFaces)+PtrUInt(i*SizeOf(TTempFaceIndices)));