Отмена 7dc55c8, правильный фикс #138

zamtmn · Sep 14, 2024 · 0dc5324 · 0dc5324
1 parent 7dc55c8
commit 0dc5324
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 20 deletions.
diff --git a/cad_source/zcad/entities/uzcenitiesvariablesextender.pas b/cad_source/zcad/entities/uzcenitiesvariablesextender.pas
@@ -260,12 +260,12 @@ procedure TVariablesExtender.onEntityClone(pSourceEntity,pDestEntity:pointer);
 var
     pDestVariablesExtender,pbdunit:TVariablesExtender;
 begin
-     pDestVariablesExtender:=PGDBObjEntity(pDestEntity)^.EntExtensions.GetExtension<TVariablesExtender>;
+     pDestVariablesExtender:=PGDBObjEntity(pDestEntity)^.EntExtensions.GetExtensionOf<TVariablesExtender>;
      if pDestVariablesExtender=nil then
                        pDestVariablesExtender:=AddVariablesToEntity(pDestEntity);
      entityunit.CopyTo(@pDestVariablesExtender.entityunit);
      if pMainFuncEntity<>nil then begin
-       pbdunit:=pMainFuncEntity^.EntExtensions.GetExtension<TVariablesExtender>;
+       pbdunit:=pMainFuncEntity^.EntExtensions.GetExtensionOf<TVariablesExtender>;
        if pbdunit<>nil then
          pbdunit.addDelegate(pDestEntity,pDestVariablesExtender);
      end;
@@ -278,7 +278,7 @@ procedure TVariablesExtender.onEntityBuildVarGeometry(pEntity:pointer;const draw
      pblockdef:=PGDBObjBlockdefArray(drawing.GetBlockDefArraySimple).getDataMutable(PGDBObjDevice(pEntity)^.index);
      pbdunit:=nil;
      if assigned(pblockdef^.EntExtensions)then
-     pbdunit:=pblockdef^.EntExtensions.GetExtension<TVariablesExtender>;
+     pbdunit:=pblockdef^.EntExtensions.GetExtensionOf<TVariablesExtender>;
      if pbdunit<>nil then
        pbdunit.entityunit.CopyTo(@self.entityunit);
      //PTEntityUnit(pblockdef^.ou.Instance)^.copyto(PTEntityUnit(ou.Instance));
@@ -330,10 +330,10 @@ procedure TVariablesExtender.ReorganizeEnts(OldEnts2NewEntsMap:TMapPointerToPoin
   if pMainFuncEntity<>nil then begin
     if OldEnts2NewEntsMap.TryGetValue(pMainFuncEntity,CopiedMainfunction)then
       if CopiedMainfunction<>nil then begin
-        pbdunit:=pMainFuncEntity^.EntExtensions.GetExtension<TVariablesExtender>;
+        pbdunit:=pMainFuncEntity^.EntExtensions.GetExtensionOf<TVariablesExtender>;
         if pbdunit<>nil then
           pbdunit.removeDelegate(pThisEntity,self);
-        pbdunit:=CopiedMainfunction^.EntExtensions.GetExtension<TVariablesExtender>;
+        pbdunit:=CopiedMainfunction^.EntExtensions.GetExtensionOf<TVariablesExtender>;
         if pbdunit<>nil then
           pbdunit.addDelegate(pThisEntity,self);
       end;
@@ -362,7 +362,7 @@ procedure TVariablesExtender.PostLoad(var context:TIODXFLoadContext);
     if pThisEntity.PExtAttrib<>nil then
       if pThisEntity.PExtAttrib^.MainFunctionHandle<>0 then begin
         if context.h2p.TryGetValue(pThisEntity.PExtAttrib^.MainFunctionHandle,pmf)then begin
-          pbdunit:=pmf^.EntExtensions.GetExtension<TVariablesExtender>;
+          pbdunit:=pmf^.EntExtensions.GetExtensionOf<TVariablesExtender>;
           if pbdunit<>nil then
             pbdunit.addDelegate(pThisEntity,self);
         end;

diff --git a/cad_source/zcad/entities/uzcextdrlayercontrol.pas b/cad_source/zcad/entities/uzcextdrlayercontrol.pas
@@ -84,7 +84,7 @@ procedure TLayerControlExtender.onEntityClone(pSourceEntity,pDestEntity:pointer)
 var
     pDestLayerControlExtender:TLayerControlExtender;
 begin
-     pDestLayerControlExtender:=PGDBObjEntity(pDestEntity)^.EntExtensions.GetExtension<TLayerControlExtender>;
+     pDestLayerControlExtender:=PGDBObjEntity(pDestEntity)^.EntExtensions.GetExtensionOf<TLayerControlExtender>;
      if pDestLayerControlExtender=nil then
                        pDestLayerControlExtender:=AddLayerControlExtenderToEntity(pDestEntity);
      pDestLayerControlExtender.Assign(self);

diff --git a/cad_source/zcad/entities/uzcextdrreport.pas b/cad_source/zcad/entities/uzcextdrreport.pas
@@ -98,10 +98,10 @@ procedure TReportExtender.onEntityClone(pSourceEntity,pDestEntity:pointer);
 var
   ReportExtender:TReportExtender;
 begin
-  ReportExtender:=PGDBObjEntity(pDestEntity)^.EntExtensions.GetExtension<TReportExtender>;
+  ReportExtender:=PGDBObjEntity(pDestEntity)^.EntExtensions.GetExtensionOf<TReportExtender>;
   if ReportExtender=nil then
     ReportExtender:=AddReportExtenderToEntity(pDestEntity);
-  ReportExtender.Assign(PGDBObjEntity(pSourceEntity)^.EntExtensions.GetExtension<TReportExtender>);
+  ReportExtender.Assign(PGDBObjEntity(pSourceEntity)^.EntExtensions.GetExtensionOf<TReportExtender>);
 end;
 
 procedure TReportExtender.onEntityBuildVarGeometry(pEntity:pointer;const drawing:TDrawingDef);

diff --git a/cad_source/zcad/entities/uzcextdrschconnector.pas b/cad_source/zcad/entities/uzcextdrschconnector.pas
@@ -329,10 +329,10 @@ procedure TSCHConnectorExtender.onEntityClone(pSourceEntity,pDestEntity:pointer)
 var
   NetConnectorExtender:TSCHConnectorExtender;
 begin
-  NetConnectorExtender:=PGDBObjEntity(pDestEntity)^.EntExtensions.GetExtension<TSCHConnectorExtender>;
+  NetConnectorExtender:=PGDBObjEntity(pDestEntity)^.EntExtensions.GetExtensionOf<TSCHConnectorExtender>;
   if NetConnectorExtender=nil then
     NetConnectorExtender:=AddConnectorExtenderToEntity(pDestEntity);
-  NetConnectorExtender.Assign(PGDBObjEntity(pSourceEntity)^.EntExtensions.GetExtension<TSCHConnectorExtender>);
+  NetConnectorExtender.Assign(PGDBObjEntity(pSourceEntity)^.EntExtensions.GetExtensionOf<TSCHConnectorExtender>);
 end;
 procedure TSCHConnectorExtender.onEntityBuildVarGeometry(pEntity:pointer;const drawing:TDrawingDef);
 begin

diff --git a/cad_source/zcad/gui/odjectinspector/uzcoimultiobjects.pas b/cad_source/zcad/gui/odjectinspector/uzcoimultiobjects.pas
@@ -534,10 +534,7 @@ procedure TMSEditor.CreateMultiPropertys;
                 for j:=0 to pv^.GetExtensionsCount-1 do begin
                   Extender:=pv^.GetExtension(j);
                   ObjIDWithExtender.ObjID:=pv^.GetObjType;
-                  if Extender=nil then
-                    ObjIDWithExtender.ExtenderClass:=nil
-                  else
-                    ObjIDWithExtender.ExtenderClass:=typeof(Extender);
+                  ObjIDWithExtender.ExtenderClass:=typeof(Extender);
                   if MultiPropertiesManager.MultiPropertyVector[i].MPObjectsData.tryGetValue(ObjIDWithExtender,MultiPropertyDataForObjects)then begin
                     if @MultiPropertyDataForObjects.EntBeforeIterateProc<>nil then begin
                       ChangedData:=CreateChangedData(Extender,MultiPropertyDataForObjects.GSData);
@@ -582,10 +579,7 @@ procedure TMSEditor.CreateMultiPropertys;
                 for j:=0 to pv^.GetExtensionsCount-1 do begin
                   Extender:=pv^.GetExtension(j);
                   ObjIDWithExtender.ObjID:=pv^.GetObjType;
-                    if Extender=nil then
-                      ObjIDWithExtender.ExtenderClass:=nil
-                    else
-                      ObjIDWithExtender.ExtenderClass:=typeof(Extender);
+                  ObjIDWithExtender.ExtenderClass:=typeof(Extender);
                   if MultiPropertiesManager.MultiPropertyVector[i].MPObjectsData.tryGetValue(ObjIDWithExtender,MultiPropertyDataForObjects)then begin
                     if @MultiPropertyDataForObjects.EntIterateProc<>nil then begin
                       ChangedData:=CreateChangedData(Extender,MultiPropertyDataForObjects.GSData);

diff --git a/cad_source/zengine/core/entities/uzeentsubordinated.pas b/cad_source/zengine/core/entities/uzeentsubordinated.pas
@@ -125,7 +125,7 @@ procedure GDBObjExtendable.RemoveExtension(ExtType:TMetaEntityExtender);
 function GDBObjExtendable.GetExtension<GEntityExtenderType>:GEntityExtenderType;
 begin
      if assigned(EntExtensions) then
-                                    result:=EntExtensions.GetExtension<GEntityExtenderType>
+                                    result:=EntExtensions.GetExtensionOf<GEntityExtenderType>
                                 else
                                     result:=nil;
 end;