Cleanup2

zamtmn · Sep 18, 2024 · c7a7150 · c7a7150
1 parent c2855d4
commit c7a7150
Show file tree

Hide file tree

Showing 11 changed files with 17 additions and 23 deletions.
diff --git a/cad_source/components/zcontainers/gzctnrvectorclass.pas b/cad_source/components/zcontainers/gzctnrvectorclass.pas
@@ -19,12 +19,12 @@
 unit gzctnrVectorClass;
 
 interface
-uses gzctnrVectorTypes,gzctnrVectorc,gvector;
+uses gzctnrVectorTypes,gzctnrVector,gvector;
 type
 {Export+}
 {----REGISTEROBJECTTYPE GZVectorClass}
-GZVectorClass{-}<T:class>{//}=class
-                               (GZVectorc{-}<T>{//})
+GZVectorClass{-}<T:class>{//}=object
+                               (GZVector{-}<T>{//})
                                procedure cleareraseobjfrom2(n:Integer);
                                  end;
 {Export-}

diff --git a/cad_source/components/zundostack/zeundostack.pas b/cad_source/components/zundostack/zeundostack.pas
@@ -30,7 +30,7 @@ interface
                  URRNoCommandsToRedo);
 TOnUndoRedoProc=procedure of object;
 PTZctnrVectorUndoCommands=^TZctnrVectorUndoCommands;
-TZctnrVectorUndoCommands=class(specialize GZVectorClass{-}<{PTElementaryCommand,}TUCmdBase>{//})
+TZctnrVectorUndoCommands=object(specialize GZVectorClass<TUCmdBase>)
                                  public
                                  CurrentCommand:TArrayIndex;
                                  currentcommandstartmarker:TArrayIndex;
@@ -42,7 +42,7 @@ TZctnrVectorUndoCommands=class(specialize GZVectorClass{-}<{PTElementaryCommand,
                                  function undo(out msg:string;prevheap:TArrayIndex;overlay:Boolean):TUndoRedoResult;
                                  procedure KillLastCommand;
                                  function redo(out msg:string):TUndoRedoResult;
-                                 constructor Create;
+                                 constructor init;
                                  procedure doOnUndoRedo;
                                  function PushBackData(const data:TUCmdBase):TArrayIndex;virtual;
                                  Procedure ClearFrom(cc:TArrayIndex);
@@ -216,9 +216,9 @@ function TZctnrVectorUndoCommands.redo(out msg:string):TUndoRedoResult;
      doOnUndoRedo;
 end;
 
-constructor TZctnrVectorUndoCommands.Create;
+constructor TZctnrVectorUndoCommands.init;
 begin
-     inherited Create(1);
+     inherited init(1);
      CurrentCommand:=0;
      onUndoRedo:=nil;;
 end;

diff --git a/cad_source/zcad/commands/uzccommand_move.pas b/cad_source/zcad/commands/uzccommand_move.pas
@@ -185,7 +185,7 @@ function Move_com.Move(const dispmatr:DMatrix4D;UndoMaker:String): Integer;
     uzegeometry.MatrixInvert(im);
     PTZCADDrawing(drawings.GetCurrentDWG)^.UndoStack.PushStartMarker(UndoMaker);
     dc:=drawings.GetCurrentDWG^.CreateDrawingRC;
-    with PushCreateTGMultiObjectChangeCommand(PTZCADDrawing(drawings.GetCurrentDWG)^.UndoStack,dispmatr,im,pcoa^.Count) do
+    with PushCreateTGMultiObjectChangeCommand(@PTZCADDrawing(drawings.GetCurrentDWG)^.UndoStack,dispmatr,im,pcoa^.Count) do
     begin
      pcd:=pcoa^.beginiterate(ir);
    if pcd<>nil then

diff --git a/cad_source/zcad/commands/uzccommand_rotate.pas b/cad_source/zcad/commands/uzccommand_rotate.pas
@@ -95,7 +95,7 @@ procedure rotate_com.rot(a:Double; button: Byte);
                   im:=dispmatr;
                   uzegeometry.MatrixInvert(im);
                   PTZCADDrawing(drawings.GetCurrentDWG)^.UndoStack.PushStartMarker('Rotate');
-                  with PushCreateTGMultiObjectChangeCommand(PTZCADDrawing(drawings.GetCurrentDWG)^.UndoStack,dispmatr,im,pcoa^.Count) do
+                  with PushCreateTGMultiObjectChangeCommand(@PTZCADDrawing(drawings.GetCurrentDWG)^.UndoStack,dispmatr,im,pcoa^.Count) do
                   begin
                    pcd:=pcoa^.beginiterate(ir);
                   if pcd<>nil then

diff --git a/cad_source/zcad/commands/uzccommand_rotateents.pas b/cad_source/zcad/commands/uzccommand_rotateents.pas
@@ -79,7 +79,7 @@ function RotateEnts_com(const Context:TZCADCommandContext;operands:TCommandOpera
         im:=dispmatr;
         uzegeometry.MatrixInvert(im);
 
-        with PushCreateTGMultiObjectChangeCommand(PTZCADDrawing(drawings.GetCurrentDWG)^.UndoStack,dispmatr,im,1) do
+        with PushCreateTGMultiObjectChangeCommand(@PTZCADDrawing(drawings.GetCurrentDWG)^.UndoStack,dispmatr,im,1) do
         begin
           m:=TMethod(@pv^.Transform);
           AddMethod(m);

diff --git a/cad_source/zcad/commands/uzccommand_scale.pas b/cad_source/zcad/commands/uzccommand_scale.pas
@@ -112,7 +112,7 @@ procedure scale_com.scale(a:Double; button: Byte);
                    im:=dispmatr;
                    uzegeometry.MatrixInvert(im);
                    PTZCADDrawing(drawings.GetCurrentDWG)^.UndoStack.PushStartMarker('Scale');
-                   with PushCreateTGMultiObjectChangeCommand(PTZCADDrawing(drawings.GetCurrentDWG)^.UndoStack,dispmatr,im,pcoa^.Count) do
+                   with PushCreateTGMultiObjectChangeCommand(@PTZCADDrawing(drawings.GetCurrentDWG)^.UndoStack,dispmatr,im,pcoa^.Count) do
                    begin
                     pcd:=pcoa^.beginiterate(ir);
                    if pcd<>nil then

diff --git a/cad_source/zcad/core/drawings/uzcdrawing.pas b/cad_source/zcad/core/drawings/uzcdrawing.pas
@@ -276,7 +276,7 @@ constructor TZCADDrawing.init;
   Pointer(FileName):=nil;
   FileName:=rsHardUnnamed;
   Changed:=False;
-  UndoStack:=TZctnrVectorUndoCommands.Create;
+  UndoStack.init;//:=TZctnrVectorUndoCommands.Create;
   UndoStack.onUndoRedo:=self.onUndoRedo;
   zebaseundocommands.onUndoRedoDataOwner:=self.onUndoRedoDataOwner;
 

diff --git a/cad_source/zcad/core/undostack/zcmultiobjectchangeundocommand.pas b/cad_source/zcad/core/undostack/zcmultiobjectchangeundocommand.pas
@@ -48,7 +48,7 @@     generic TGMultiObjectChangeCommand<_T> =class(TUCmdBase)
 
 {IFDEF CLASSDECLARATION}
 function CreateTGMultiObjectChangeCommand(const data,undodata:DMatrix4D;const objcount:Integer):TGDBTransformChangeCommand;overload;
-function PushCreateTGMultiObjectChangeCommand(const us:TZctnrVectorUndoCommands; const data,undodata:DMatrix4D;const objcount:Integer):TGDBTransformChangeCommand;overload;
+function PushCreateTGMultiObjectChangeCommand(const us:PTZctnrVectorUndoCommands; const data,undodata:DMatrix4D;const objcount:Integer):TGDBTransformChangeCommand;overload;
 {ENDIF}
 
 implementation
@@ -116,10 +116,10 @@ function {TZctnrVectorUndoCommands.}CreateTGMultiObjectChangeCommand(const data,
      //Getmem(result,sizeof(TGDBTransformChangeCommand));
      result:=TGDBTransformChangeCommand.Create(data,undodata,objcount);
 end;
-function {TZctnrVectorUndoCommands.}PushCreateTGMultiObjectChangeCommand(const us:TZctnrVectorUndoCommands; const data,undodata:DMatrix4D;const objcount:Integer):TGDBTransformChangeCommand;overload;
+function {TZctnrVectorUndoCommands.}PushCreateTGMultiObjectChangeCommand(const us:PTZctnrVectorUndoCommands; const data,undodata:DMatrix4D;const objcount:Integer):TGDBTransformChangeCommand;overload;
 begin
   result:=CreateTGMultiObjectChangeCommand(data,undodata,objcount);
-  us.PushBackData(result);
-  inc(us.CurrentCommand);
+  us^.PushBackData(result);
+  inc(us^.CurrentCommand);
 end;
 end.
diff --git a/cad_source/zcad/core/utils/uzcutils.pas b/cad_source/zcad/core/utils/uzcutils.pas
@@ -194,7 +194,7 @@ procedure zcTransformSelectedEntsInDrawingWithUndo(CommandName:String;Transform:
     uzegeometry.MatrixInvert(im);
     pcd^.UndoStack.PushStartMarker(CommandName);
     dc:=pcd^.CreateDrawingRC;
-    with PushCreateTGMultiObjectChangeCommand(pcd^.UndoStack,Transform,im,Count) do begin
+    with PushCreateTGMultiObjectChangeCommand(@pcd^.UndoStack,Transform,im,Count) do begin
       pobj:=pcd^.GetCurrentROOT.ObjArray.beginiterate(ir);
       if pobj<>nil then
       repeat

diff --git a/cad_source/zengine/containers/UGDBNamedObjectsArray.pas b/cad_source/zengine/containers/UGDBNamedObjectsArray.pas
@@ -44,9 +44,6 @@ interface
 {EXPORT-}
 PTGenericNamedObjectsArray=^TGenericNamedObjectsArray;
 TGenericNamedObjectsArray=GDBNamedObjectsArray{-}<PGDBNamedObject,GDBNamedObject>{//};
-TNamedObjectsArray{-}<TCls:Class>{//}
-                     = class(GZVectorClass{-}<TCls>{//})
-              end;
 implementation
 procedure GDBNamedObjectsArray<PTObj,TObj>.IterateCounter(PCounted:Pointer;var Counter:Integer;proc:TProcCounter);
 var p:PGDBNamedObject;

diff --git a/cad_source/zengine/styles/uzestyleslayers.pas b/cad_source/zengine/styles/uzestyleslayers.pas
@@ -59,9 +59,6 @@ interface
 {EXPORT-}
 TLayerProp=class(TNamedObject)
 end;
-TLayerPropClass=class of TLayerProp;
-TLayers=GZVectorClass<TLayerProp>;
-TLayersClass=class of TLayers;
 function GetLTName(LT:PGDBLayerProp):String;
 var
    DefaultErrorLayer:GDBLayerProp;