Coding - Refactor HArray and HSequence Definitions (#962)

- Replaced custom DEFINE_HARRAY1 and DEFINE_HSEQUENCE macros with typedefs to NCollection_HArray1 and NCollection_HSequence for various data types across multiple files. - Updated header files in the following modules: - HLRAlgo - TKShHealing - TKBRep - TKG2d - TKG3d - TKGeomBase - TKMeshVS - TKV3d - This change improves consistency and reduces the complexity of the codebase by utilizing the standard NCollection templates.
2026-05-22 12:48:37 +08:00 · 2025-12-28 11:42:24 +00:00
parent 4c975e6a62
commit b5d2fc73fb
289 changed files with 1133 additions and 1341 deletions
--- a/src/ModelingAlgorithms/TKBool/TopOpeBRep/TopOpeBRep_HArray1OfLineInter.hxx
+++ b/src/ModelingAlgorithms/TKBool/TopOpeBRep/TopOpeBRep_HArray1OfLineInter.hxx
@@ -18,8 +18,6 @@
 #define TopOpeBRep_HArray1OfLineInter_HeaderFile

 #include <TopOpeBRep_Array1OfLineInter.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(TopOpeBRep_HArray1OfLineInter, TopOpeBRep_Array1OfLineInter)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<TopOpeBRep_LineInter> TopOpeBRep_HArray1OfLineInter;
 #endif
--- a/src/ModelingAlgorithms/TKBool/TopOpeBRep/TopOpeBRep_HArray1OfVPointInter.hxx
+++ b/src/ModelingAlgorithms/TKBool/TopOpeBRep/TopOpeBRep_HArray1OfVPointInter.hxx
@@ -18,8 +18,6 @@
 #define TopOpeBRep_HArray1OfVPointInter_HeaderFile

 #include <TopOpeBRep_Array1OfVPointInter.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(TopOpeBRep_HArray1OfVPointInter, TopOpeBRep_Array1OfVPointInter)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<TopOpeBRep_VPointInter> TopOpeBRep_HArray1OfVPointInter;
 #endif
--- a/src/ModelingAlgorithms/TKBool/TopOpeBRepDS/TopOpeBRepDS_HArray1OfDataMapOfIntegerListOfInterference.hxx
+++ b/src/ModelingAlgorithms/TKBool/TopOpeBRepDS/TopOpeBRepDS_HArray1OfDataMapOfIntegerListOfInterference.hxx
@@ -18,9 +18,7 @@
 #define TopOpeBRepDS_HArray1OfDataMapOfIntegerListOfInterference_HeaderFile

 #include <TopOpeBRepDS_Array1OfDataMapOfIntegerListOfInterference.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(TopOpeBRepDS_HArray1OfDataMapOfIntegerListOfInterference,
-               TopOpeBRepDS_Array1OfDataMapOfIntegerListOfInterference)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<TopOpeBRepDS_DataMapOfIntegerListOfInterference>
+  TopOpeBRepDS_HArray1OfDataMapOfIntegerListOfInterference;
 #endif
--- a/src/ModelingAlgorithms/TKFillet/ChFiDS/ChFiDS_HData.hxx
+++ b/src/ModelingAlgorithms/TKFillet/ChFiDS/ChFiDS_HData.hxx
@@ -18,8 +18,6 @@
 #define ChFiDS_HData_HeaderFile

 #include <ChFiDS_SequenceOfSurfData.hxx>
-#include <NCollection_DefineHSequence.hxx>
-
-DEFINE_HSEQUENCE(ChFiDS_HData, ChFiDS_SequenceOfSurfData)
-
+#include <NCollection_HSequence.hxx>
+typedef NCollection_HSequence<Handle(ChFiDS_SurfData)> ChFiDS_HData;
 #endif
--- a/src/ModelingAlgorithms/TKFillet/ChFiDS/ChFiDS_SecHArray1.hxx
+++ b/src/ModelingAlgorithms/TKFillet/ChFiDS/ChFiDS_SecHArray1.hxx
@@ -18,8 +18,6 @@
 #define ChFiDS_SecHArray1_HeaderFile

 #include <ChFiDS_SecArray1.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(ChFiDS_SecHArray1, ChFiDS_SecArray1)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<ChFiDS_CircSection> ChFiDS_SecHArray1;
 #endif
--- a/src/ModelingAlgorithms/TKGeomAlgo/GeomFill/GeomFill_HArray1OfLocationLaw.hxx
+++ b/src/ModelingAlgorithms/TKGeomAlgo/GeomFill/GeomFill_HArray1OfLocationLaw.hxx
@@ -18,8 +18,6 @@
 #define GeomFill_HArray1OfLocationLaw_HeaderFile

 #include <GeomFill_Array1OfLocationLaw.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(GeomFill_HArray1OfLocationLaw, GeomFill_Array1OfLocationLaw)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(GeomFill_LocationLaw)> GeomFill_HArray1OfLocationLaw;
 #endif
--- a/src/ModelingAlgorithms/TKGeomAlgo/GeomFill/GeomFill_HArray1OfSectionLaw.hxx
+++ b/src/ModelingAlgorithms/TKGeomAlgo/GeomFill/GeomFill_HArray1OfSectionLaw.hxx
@@ -18,8 +18,6 @@
 #define GeomFill_HArray1OfSectionLaw_HeaderFile

 #include <GeomFill_Array1OfSectionLaw.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(GeomFill_HArray1OfSectionLaw, GeomFill_Array1OfSectionLaw)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(GeomFill_SectionLaw)> GeomFill_HArray1OfSectionLaw;
 #endif
--- a/src/ModelingAlgorithms/TKGeomAlgo/GeomFill/GeomFill_HSequenceOfAx2.hxx
+++ b/src/ModelingAlgorithms/TKGeomAlgo/GeomFill/GeomFill_HSequenceOfAx2.hxx
@@ -19,8 +19,6 @@

 #include <gp_Ax2.hxx>
 #include <GeomFill_SequenceOfAx2.hxx>
-#include <NCollection_DefineHSequence.hxx>
-
-DEFINE_HSEQUENCE(GeomFill_HSequenceOfAx2, GeomFill_SequenceOfAx2)
-
+#include <NCollection_HSequence.hxx>
+typedef NCollection_HSequence<gp_Ax2> GeomFill_HSequenceOfAx2;
 #endif
--- a/src/ModelingAlgorithms/TKGeomAlgo/GeomPlate/GeomPlate_HArray1OfHCurve.hxx
+++ b/src/ModelingAlgorithms/TKGeomAlgo/GeomPlate/GeomPlate_HArray1OfHCurve.hxx
@@ -18,8 +18,6 @@
 #define GeomPlate_HArray1OfHCurve_HeaderFile

 #include <GeomPlate_Array1OfHCurve.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(GeomPlate_HArray1OfHCurve, GeomPlate_Array1OfHCurve)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(Adaptor3d_Curve)> GeomPlate_HArray1OfHCurve;
 #endif
--- a/src/ModelingAlgorithms/TKGeomAlgo/GeomPlate/GeomPlate_HArray1OfSequenceOfReal.hxx
+++ b/src/ModelingAlgorithms/TKGeomAlgo/GeomPlate/GeomPlate_HArray1OfSequenceOfReal.hxx
@@ -19,8 +19,6 @@

 #include <TColStd_SequenceOfReal.hxx>
 #include <GeomPlate_Array1OfSequenceOfReal.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(GeomPlate_HArray1OfSequenceOfReal, GeomPlate_Array1OfSequenceOfReal)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<TColStd_SequenceOfReal> GeomPlate_HArray1OfSequenceOfReal;
 #endif
--- a/src/ModelingAlgorithms/TKGeomAlgo/GeomPlate/GeomPlate_HSequenceOfCurveConstraint.hxx
+++ b/src/ModelingAlgorithms/TKGeomAlgo/GeomPlate/GeomPlate_HSequenceOfCurveConstraint.hxx
@@ -19,8 +19,7 @@

 #include <GeomPlate_CurveConstraint.hxx>
 #include <GeomPlate_SequenceOfCurveConstraint.hxx>
-#include <NCollection_DefineHSequence.hxx>
-
-DEFINE_HSEQUENCE(GeomPlate_HSequenceOfCurveConstraint, GeomPlate_SequenceOfCurveConstraint)
-
+#include <NCollection_HSequence.hxx>
+typedef NCollection_HSequence<Handle(GeomPlate_CurveConstraint)>
+  GeomPlate_HSequenceOfCurveConstraint;
 #endif
--- a/src/ModelingAlgorithms/TKGeomAlgo/GeomPlate/GeomPlate_HSequenceOfPointConstraint.hxx
+++ b/src/ModelingAlgorithms/TKGeomAlgo/GeomPlate/GeomPlate_HSequenceOfPointConstraint.hxx
@@ -18,8 +18,7 @@
 #define GeomPlate_HSequenceOfPointConstraint_HeaderFile

 #include <GeomPlate_SequenceOfPointConstraint.hxx>
-#include <NCollection_DefineHSequence.hxx>
-
-DEFINE_HSEQUENCE(GeomPlate_HSequenceOfPointConstraint, GeomPlate_SequenceOfPointConstraint)
-
+#include <NCollection_HSequence.hxx>
+typedef NCollection_HSequence<Handle(GeomPlate_PointConstraint)>
+  GeomPlate_HSequenceOfPointConstraint;
 #endif
--- a/src/ModelingAlgorithms/TKGeomAlgo/Plate/Plate_HArray1OfPinpointConstraint.hxx
+++ b/src/ModelingAlgorithms/TKGeomAlgo/Plate/Plate_HArray1OfPinpointConstraint.hxx
@@ -19,8 +19,6 @@

 #include <Plate_PinpointConstraint.hxx>
 #include <Plate_Array1OfPinpointConstraint.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(Plate_HArray1OfPinpointConstraint, Plate_Array1OfPinpointConstraint)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Plate_PinpointConstraint> Plate_HArray1OfPinpointConstraint;
 #endif
--- a/src/ModelingAlgorithms/TKHLR/Contap/Contap_TheHSequenceOfPoint.hxx
+++ b/src/ModelingAlgorithms/TKHLR/Contap/Contap_TheHSequenceOfPoint.hxx
@@ -19,8 +19,6 @@

 #include <Contap_Point.hxx>
 #include <Contap_TheSequenceOfPoint.hxx>
-#include <NCollection_DefineHSequence.hxx>
-
-DEFINE_HSEQUENCE(Contap_TheHSequenceOfPoint, Contap_TheSequenceOfPoint)
-
+#include <NCollection_HSequence.hxx>
+typedef NCollection_HSequence<Contap_Point> Contap_TheHSequenceOfPoint;
 #endif
--- a/src/ModelingAlgorithms/TKHLR/HLRAlgo/HLRAlgo_HArray1OfPHDat.hxx
+++ b/src/ModelingAlgorithms/TKHLR/HLRAlgo/HLRAlgo_HArray1OfPHDat.hxx
@@ -18,8 +18,6 @@
 #define HLRAlgo_HArray1OfPHDat_HeaderFile

 #include <HLRAlgo_Array1OfPHDat.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(HLRAlgo_HArray1OfPHDat, HLRAlgo_Array1OfPHDat)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<HLRAlgo_PolyHidingData> HLRAlgo_HArray1OfPHDat;
 #endif
--- a/src/ModelingAlgorithms/TKHLR/HLRAlgo/HLRAlgo_HArray1OfPINod.hxx
+++ b/src/ModelingAlgorithms/TKHLR/HLRAlgo/HLRAlgo_HArray1OfPINod.hxx
@@ -18,8 +18,6 @@
 #define HLRAlgo_HArray1OfPINod_HeaderFile

 #include <HLRAlgo_Array1OfPINod.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(HLRAlgo_HArray1OfPINod, HLRAlgo_Array1OfPINod)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(HLRAlgo_PolyInternalNode)> HLRAlgo_HArray1OfPINod;
 #endif
--- a/src/ModelingAlgorithms/TKHLR/HLRAlgo/HLRAlgo_HArray1OfPISeg.hxx
+++ b/src/ModelingAlgorithms/TKHLR/HLRAlgo/HLRAlgo_HArray1OfPISeg.hxx
@@ -18,8 +18,6 @@
 #define HLRAlgo_HArray1OfPISeg_HeaderFile

 #include <HLRAlgo_Array1OfPISeg.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(HLRAlgo_HArray1OfPISeg, HLRAlgo_Array1OfPISeg)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<HLRAlgo_PolyInternalSegment> HLRAlgo_HArray1OfPISeg;
 #endif
--- a/src/ModelingAlgorithms/TKHLR/HLRAlgo/HLRAlgo_HArray1OfTData.hxx
+++ b/src/ModelingAlgorithms/TKHLR/HLRAlgo/HLRAlgo_HArray1OfTData.hxx
@@ -18,8 +18,6 @@
 #define HLRAlgo_HArray1OfTData_HeaderFile

 #include <HLRAlgo_Array1OfTData.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(HLRAlgo_HArray1OfTData, HLRAlgo_Array1OfTData)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<HLRAlgo_TriangleData> HLRAlgo_HArray1OfTData;
 #endif
--- a/src/ModelingAlgorithms/TKShHealing/ShapeAnalysis/ShapeAnalysis_HSequenceOfFreeBounds.hxx
+++ b/src/ModelingAlgorithms/TKShHealing/ShapeAnalysis/ShapeAnalysis_HSequenceOfFreeBounds.hxx
@@ -18,8 +18,7 @@
 #define ShapeAnalysis_HSequenceOfFreeBounds_HeaderFile

 #include <ShapeAnalysis_SequenceOfFreeBounds.hxx>
-#include <NCollection_DefineHSequence.hxx>
-
-DEFINE_HSEQUENCE(ShapeAnalysis_HSequenceOfFreeBounds, ShapeAnalysis_SequenceOfFreeBounds)
-
+#include <NCollection_HSequence.hxx>
+typedef NCollection_HSequence<Handle(ShapeAnalysis_FreeBoundData)>
+  ShapeAnalysis_HSequenceOfFreeBounds;
 #endif