From: env Date: Thu, 11 Aug 2005 04:43:57 +0000 (+0000) Subject: ENV: Windows porting. X-Git-Tag: T_3_0_2a1~20 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=e2dcf4323c7d7c36e8e1a4fda4dd6cf86c99be81;p=modules%2Fgeom.git ENV: Windows porting. --- diff --git a/src/GEOMImpl/GEOMImpl_ArcDriver.cxx b/src/GEOMImpl/GEOMImpl_ArcDriver.cxx index 2e8b5d7ec..c00640c07 100644 --- a/src/GEOMImpl/GEOMImpl_ArcDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_ArcDriver.cxx @@ -1,9 +1,10 @@ -using namespace std; -#include "GEOMImpl_ArcDriver.hxx" -#include "GEOMImpl_IArc.hxx" -#include "GEOMImpl_Types.hxx" -#include "GEOM_Function.hxx" +#include + +#include +#include +#include +#include #include #include diff --git a/src/GEOMImpl/GEOMImpl_Block6Explorer.cxx b/src/GEOMImpl/GEOMImpl_Block6Explorer.cxx index 1e73a5d33..c660f5a33 100644 --- a/src/GEOMImpl/GEOMImpl_Block6Explorer.cxx +++ b/src/GEOMImpl/GEOMImpl_Block6Explorer.cxx @@ -1,8 +1,8 @@ -using namespace std; +#include #include -#include "GEOMImpl_Block6Explorer.hxx" +#include #include "utilities.h" @@ -720,7 +720,8 @@ void GEOMImpl_Block6Explorer::InitByBlockAndVertices (const TopoDS_Shape& theBlo TopTools_IndexedMapOfShape aFaceEdges; TopExp::MapShapes(myFaces(1), TopAbs_EDGE, aFaceEdges); - for (Standard_Integer i = 1; i <= 4; i++) { + Standard_Integer i = 1; + for (; i <= 4; i++) { // Get i-th vertex of the face 1 TopoDS_Shape Vi = myVertices(vertex_id(1, i)); if (!MB.Contains(Vi)) { @@ -757,7 +758,7 @@ void GEOMImpl_Block6Explorer::InitByBlockAndVertices (const TopoDS_Shape& theBlo } // 3. Store edges of the second (opposite to the first) face - for (Standard_Integer i = 1; i <= 4; i++) { + for (i = 1; i <= 4; i++) { // Get i-th and (i+1)-th vertices of the face 2 TopoDS_Shape Vi = myVertices(vertex_id(2, i)); TopoDS_Shape Vj = myVertices(vertex_id(2, mod4(i + 1))); @@ -792,7 +793,7 @@ void GEOMImpl_Block6Explorer::InitByBlockAndVertices (const TopoDS_Shape& theBlo Standard_TypeMismatch::Raise("Block has wrong number of edges"); } - for (Standard_Integer i = 2; i <= NBFACES; i++) { + for (i = 2; i <= NBFACES; i++) { TopoDS_Shape Ei1 = myEdges(edge_id(i, 1)); TopoDS_Shape Ei2 = myEdges(edge_id(i, 2)); const TopTools_ListOfShape& aFacesOfEi1 = MBE.FindFromKey(Ei1); @@ -915,7 +916,8 @@ void GEOMImpl_Block6Explorer::InitByTwoFaces (const TopoDS_Shape& theFace1, Standard_Real Dist_min = RealLast(); // try all possible locations to find the best (with minimum sum distance) - for (Standard_Integer i = 1; i <= 4; i++) { + Standard_Integer i = 1; + for (; i <= 4; i++) { // try direct orientation Standard_Real Dist_plus = aPnts1(1).Distance(aPnts2(i)) + aPnts1(2).Distance(aPnts2(mod4(i + 1))) + @@ -941,7 +943,7 @@ void GEOMImpl_Block6Explorer::InitByTwoFaces (const TopoDS_Shape& theFace1, // 3. Put vertices and edges of the second face to they // permanent location in and - for (Standard_Integer i = 1; i <= 4; i++) { + for (i = 1; i <= 4; i++) { Standard_Integer nb = mod4(i_min + s_min*(i - 1)); if (aPnts1(i).Distance(aPnts2(nb)) < Precision::Confusion()) { diff --git a/src/GEOMImpl/GEOMImpl_BlockDriver.cxx b/src/GEOMImpl/GEOMImpl_BlockDriver.cxx index 65cdc29b2..c6527f70e 100644 --- a/src/GEOMImpl/GEOMImpl_BlockDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_BlockDriver.cxx @@ -1,22 +1,22 @@ -using namespace std; +#include #include -#include "GEOMImpl_BlockDriver.hxx" -#include "GEOMImpl_IBlocks.hxx" -#include "GEOMImpl_IBlockTrsf.hxx" -#include "GEOMImpl_GlueDriver.hxx" -#include "GEOMImpl_Types.hxx" -#include "GEOMImpl_ILocalOperations.hxx" -#include "GEOMImpl_Block6Explorer.hxx" -#include "GEOMImpl_IBlocksOperations.hxx" +#include +#include +#include +#include +#include +#include +#include +#include -#include "GEOM_Function.hxx" +#include -#include "ShHealOper_Sewing.hxx" -#include "NMTAlgo_Splitter1.hxx" -#include "BlockFix_BlockFixAPI.hxx" +#include +#include +#include #include "utilities.h" diff --git a/src/GEOMImpl/GEOMImpl_BooleanDriver.cxx b/src/GEOMImpl/GEOMImpl_BooleanDriver.cxx index 32599b5a3..53be70dda 100644 --- a/src/GEOMImpl/GEOMImpl_BooleanDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_BooleanDriver.cxx @@ -1,9 +1,10 @@ -using namespace std; -#include "GEOMImpl_BooleanDriver.hxx" -#include "GEOMImpl_IBoolean.hxx" -#include "GEOMImpl_Types.hxx" -#include "GEOM_Function.hxx" +#include + +#include +#include +#include +#include #include #include diff --git a/src/GEOMImpl/GEOMImpl_BoxDriver.cxx b/src/GEOMImpl/GEOMImpl_BoxDriver.cxx index f89ccf678..0ea8ec594 100644 --- a/src/GEOMImpl/GEOMImpl_BoxDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_BoxDriver.cxx @@ -1,9 +1,10 @@ -using namespace std; -#include "GEOMImpl_BoxDriver.hxx" -#include "GEOMImpl_IBox.hxx" -#include "GEOMImpl_Types.hxx" -#include "GEOM_Function.hxx" +#include + +#include +#include +#include +#include #include #include diff --git a/src/GEOMImpl/GEOMImpl_ChamferDriver.cxx b/src/GEOMImpl/GEOMImpl_ChamferDriver.cxx index d28ed4633..2d1714931 100644 --- a/src/GEOMImpl/GEOMImpl_ChamferDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_ChamferDriver.cxx @@ -1,11 +1,12 @@ -using namespace std; -#include "GEOMImpl_ChamferDriver.hxx" -#include "GEOMImpl_IChamfer.hxx" -#include "GEOMImpl_Types.hxx" -#include "GEOMImpl_ILocalOperations.hxx" -#include "GEOM_Function.hxx" -#include "GEOMImpl_Block6Explorer.hxx" +#include + +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/GEOMImpl/GEOMImpl_CircleDriver.cxx b/src/GEOMImpl/GEOMImpl_CircleDriver.cxx index caa7ac4c3..998c6384d 100644 --- a/src/GEOMImpl/GEOMImpl_CircleDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_CircleDriver.cxx @@ -1,9 +1,10 @@ -using namespace std; -#include "GEOMImpl_CircleDriver.hxx" -#include "GEOMImpl_ICircle.hxx" -#include "GEOMImpl_Types.hxx" -#include "GEOM_Function.hxx" +#include + +#include +#include +#include +#include #include #include diff --git a/src/GEOMImpl/GEOMImpl_ConeDriver.cxx b/src/GEOMImpl/GEOMImpl_ConeDriver.cxx index a4486bf98..57e8f5381 100644 --- a/src/GEOMImpl/GEOMImpl_ConeDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_ConeDriver.cxx @@ -1,9 +1,10 @@ -using namespace std; -#include "GEOMImpl_ConeDriver.hxx" -#include "GEOMImpl_ICone.hxx" -#include "GEOMImpl_Types.hxx" -#include "GEOM_Function.hxx" +#include + +#include +#include +#include +#include #include #include diff --git a/src/GEOMImpl/GEOMImpl_CopyDriver.cxx b/src/GEOMImpl/GEOMImpl_CopyDriver.cxx index 8eb25b407..92ded20b0 100644 --- a/src/GEOMImpl/GEOMImpl_CopyDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_CopyDriver.cxx @@ -1,9 +1,10 @@ -using namespace std; -#include "GEOMImpl_CopyDriver.hxx" -#include "GEOMImpl_ICopy.hxx" -#include "GEOMImpl_Types.hxx" -#include "GEOM_Function.hxx" +#include + +#include +#include +#include +#include #include #include diff --git a/src/GEOMImpl/GEOMImpl_CylinderDriver.cxx b/src/GEOMImpl/GEOMImpl_CylinderDriver.cxx index 7706ebef6..50e69d22d 100644 --- a/src/GEOMImpl/GEOMImpl_CylinderDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_CylinderDriver.cxx @@ -1,9 +1,10 @@ -using namespace std; -#include "GEOMImpl_CylinderDriver.hxx" -#include "GEOMImpl_ICylinder.hxx" -#include "GEOMImpl_Types.hxx" -#include "GEOM_Function.hxx" +#include + +#include +#include +#include +#include #include #include diff --git a/src/GEOMImpl/GEOMImpl_EllipseDriver.cxx b/src/GEOMImpl/GEOMImpl_EllipseDriver.cxx index e21f90c59..a38b6b8ca 100644 --- a/src/GEOMImpl/GEOMImpl_EllipseDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_EllipseDriver.cxx @@ -1,9 +1,10 @@ -using namespace std; -#include "GEOMImpl_EllipseDriver.hxx" -#include "GEOMImpl_IEllipse.hxx" -#include "GEOMImpl_Types.hxx" -#include "GEOM_Function.hxx" +#include + +#include +#include +#include +#include #include #include diff --git a/src/GEOMImpl/GEOMImpl_ExportDriver.cxx b/src/GEOMImpl/GEOMImpl_ExportDriver.cxx index 21f8c4639..19a2593c0 100644 --- a/src/GEOMImpl/GEOMImpl_ExportDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_ExportDriver.cxx @@ -1,9 +1,10 @@ -using namespace std; -#include "GEOMImpl_ExportDriver.hxx" -#include "GEOMImpl_IImportExport.hxx" -#include "GEOMImpl_Types.hxx" -#include "GEOM_Function.hxx" +#include + +#include +#include +#include +#include #include #include diff --git a/src/GEOMImpl/GEOMImpl_FilletDriver.cxx b/src/GEOMImpl/GEOMImpl_FilletDriver.cxx index 78a6df186..33cd76469 100644 --- a/src/GEOMImpl/GEOMImpl_FilletDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_FilletDriver.cxx @@ -1,10 +1,11 @@ -using namespace std; -#include "GEOMImpl_FilletDriver.hxx" -#include "GEOMImpl_IFillet.hxx" -#include "GEOMImpl_Types.hxx" -#include "GEOMImpl_ILocalOperations.hxx" -#include "GEOM_Function.hxx" +#include + +#include +#include +#include +#include +#include #include #include diff --git a/src/GEOMImpl/GEOMImpl_FillingDriver.cxx b/src/GEOMImpl/GEOMImpl_FillingDriver.cxx index 0a5bdedf6..43e206ef1 100644 --- a/src/GEOMImpl/GEOMImpl_FillingDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_FillingDriver.cxx @@ -1,10 +1,10 @@ -using namespace std; +#include -#include "GEOMImpl_FillingDriver.hxx" -#include "GEOM_Function.hxx" -#include "GEOMImpl_IFilling.hxx" -#include "GEOMImpl_Types.hxx" +#include +#include +#include +#include #include #include diff --git a/src/GEOMImpl/GEOMImpl_Gen.cxx b/src/GEOMImpl/GEOMImpl_Gen.cxx index 124c0499c..2420f7f83 100644 --- a/src/GEOMImpl/GEOMImpl_Gen.cxx +++ b/src/GEOMImpl/GEOMImpl_Gen.cxx @@ -1,53 +1,57 @@ -using namespace std; +#ifdef WNT +#pragma warning( disable:4786 ) +#endif -#include "GEOMImpl_Gen.hxx" +#include + +#include #include "utilities.h" -#include "OpUtil.hxx" -#include "Utils_ExceptHandlers.hxx" +#include +#include #include #include -#include "GEOMImpl_PointDriver.hxx" -#include "GEOMImpl_VectorDriver.hxx" -#include "GEOMImpl_LineDriver.hxx" -#include "GEOMImpl_PlaneDriver.hxx" -#include "GEOMImpl_MarkerDriver.hxx" -#include "GEOMImpl_ArcDriver.hxx" -#include "GEOMImpl_CircleDriver.hxx" -#include "GEOMImpl_EllipseDriver.hxx" -#include "GEOMImpl_PolylineDriver.hxx" -#include "GEOMImpl_SplineDriver.hxx" -#include "GEOMImpl_SketcherDriver.hxx" -#include "GEOMImpl_BoxDriver.hxx" -#include "GEOMImpl_ConeDriver.hxx" -#include "GEOMImpl_CylinderDriver.hxx" -#include "GEOMImpl_PrismDriver.hxx" -#include "GEOMImpl_PipeDriver.hxx" -#include "GEOMImpl_RevolutionDriver.hxx" -#include "GEOMImpl_ShapeDriver.hxx" -#include "GEOMImpl_BlockDriver.hxx" -#include "GEOMImpl_SphereDriver.hxx" -#include "GEOMImpl_TorusDriver.hxx" -#include "GEOMImpl_BooleanDriver.hxx" -#include "GEOMImpl_ChamferDriver.hxx" -#include "GEOMImpl_FilletDriver.hxx" -#include "GEOMImpl_TranslateDriver.hxx" -#include "GEOMImpl_RotateDriver.hxx" -#include "GEOMImpl_MirrorDriver.hxx" -#include "GEOMImpl_OffsetDriver.hxx" -#include "GEOMImpl_ScaleDriver.hxx" -#include "GEOMImpl_PositionDriver.hxx" -#include "GEOMImpl_PartitionDriver.hxx" -#include "GEOMImpl_CopyDriver.hxx" -#include "GEOMImpl_ExportDriver.hxx" -#include "GEOMImpl_ImportDriver.hxx" -#include "GEOMImpl_ArchimedeDriver.hxx" -#include "GEOMImpl_HealingDriver.hxx" -#include "GEOMImpl_FillingDriver.hxx" -#include "GEOMImpl_GlueDriver.hxx" -#include "GEOMImpl_MeasureDriver.hxx" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include //============================================================================= /*! diff --git a/src/GEOMImpl/GEOMImpl_Gen.hxx b/src/GEOMImpl/GEOMImpl_Gen.hxx index 255b4f54e..8b1b072e5 100644 --- a/src/GEOMImpl/GEOMImpl_Gen.hxx +++ b/src/GEOMImpl/GEOMImpl_Gen.hxx @@ -18,7 +18,13 @@ #include "GEOMImpl_IGroupOperations.hxx" #include "GEOM_Engine.hxx" -class GEOMImpl_Gen : public GEOM_Engine +#ifdef WNT +#include +#else +#define SALOME_WNT_EXPORT +#endif + +class SALOME_WNT_EXPORT GEOMImpl_Gen : public GEOM_Engine { public: GEOMImpl_Gen(); diff --git a/src/GEOMImpl/GEOMImpl_GlueDriver.cxx b/src/GEOMImpl/GEOMImpl_GlueDriver.cxx index 0c08d6627..d9ed67437 100644 --- a/src/GEOMImpl/GEOMImpl_GlueDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_GlueDriver.cxx @@ -1,13 +1,14 @@ -using namespace std; -#include "GEOMImpl_GlueDriver.hxx" -#include "GEOMImpl_IGlue.hxx" -#include "GEOMImpl_Types.hxx" +#include -#include "GEOM_Object.hxx" -#include "GEOM_Function.hxx" +#include +#include +#include -#include "GEOMAlgo_Gluer.hxx" +#include +#include + +#include #include "utilities.h" diff --git a/src/GEOMImpl/GEOMImpl_HealingDriver.cxx b/src/GEOMImpl/GEOMImpl_HealingDriver.cxx index a1b1d8bda..b1fc5e41b 100644 --- a/src/GEOMImpl/GEOMImpl_HealingDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_HealingDriver.cxx @@ -1,17 +1,18 @@ -using namespace std; -#include "GEOMImpl_HealingDriver.hxx" -#include "GEOMImpl_Types.hxx" -#include "GEOMImpl_IHealing.hxx" -#include "GEOM_Function.hxx" - -#include "ShHealOper_ShapeProcess.hxx" -#include "ShHealOper_RemoveFace.hxx" -#include "ShHealOper_CloseContour.hxx" -#include "ShHealOper_RemoveInternalWires.hxx" -#include "ShHealOper_FillHoles.hxx" -#include "ShHealOper_Sewing.hxx" -#include "ShHealOper_EdgeDivide.hxx" +#include + +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/GEOMImpl/GEOMImpl_I3DPrimOperations.cxx b/src/GEOMImpl/GEOMImpl_I3DPrimOperations.cxx index 36e4c667c..38439febc 100644 --- a/src/GEOMImpl/GEOMImpl_I3DPrimOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_I3DPrimOperations.cxx @@ -1,42 +1,42 @@ -using namespace std; +#include -#include "GEOMImpl_I3DPrimOperations.hxx" +#include #include "utilities.h" -#include "OpUtil.hxx" -#include "Utils_ExceptHandlers.hxx" +#include +#include #include #include #include #include -#include "GEOM_Function.hxx" -#include "GEOM_PythonDump.hxx" - -#include "GEOMImpl_Types.hxx" - -#include "GEOMImpl_BoxDriver.hxx" -#include "GEOMImpl_CylinderDriver.hxx" -#include "GEOMImpl_ConeDriver.hxx" -#include "GEOMImpl_SphereDriver.hxx" -#include "GEOMImpl_TorusDriver.hxx" -#include "GEOMImpl_PrismDriver.hxx" -#include "GEOMImpl_PipeDriver.hxx" -#include "GEOMImpl_RevolutionDriver.hxx" -#include "GEOMImpl_ShapeDriver.hxx" -#include "GEOMImpl_FillingDriver.hxx" - -#include "GEOMImpl_IBox.hxx" -#include "GEOMImpl_ICylinder.hxx" -#include "GEOMImpl_ICone.hxx" -#include "GEOMImpl_ISphere.hxx" -#include "GEOMImpl_ITorus.hxx" -#include "GEOMImpl_IPrism.hxx" -#include "GEOMImpl_IPipe.hxx" -#include "GEOMImpl_IRevolution.hxx" -#include "GEOMImpl_IShapes.hxx" -#include "GEOMImpl_IFilling.hxx" +#include +#include + +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include // CAREFUL ! position of this file is critic : see Lucien PIGNOLONI / OCC diff --git a/src/GEOMImpl/GEOMImpl_I3DPrimOperations.hxx b/src/GEOMImpl/GEOMImpl_I3DPrimOperations.hxx index 5e43a2d55..7cbf81700 100644 --- a/src/GEOMImpl/GEOMImpl_I3DPrimOperations.hxx +++ b/src/GEOMImpl/GEOMImpl_I3DPrimOperations.hxx @@ -10,49 +10,49 @@ class GEOMImpl_I3DPrimOperations : public GEOM_IOperations { public: - GEOMImpl_I3DPrimOperations(GEOM_Engine* theEngine, int theDocID); - ~GEOMImpl_I3DPrimOperations(); + Standard_EXPORT GEOMImpl_I3DPrimOperations(GEOM_Engine* theEngine, int theDocID); + Standard_EXPORT ~GEOMImpl_I3DPrimOperations(); - Handle(GEOM_Object) MakeBoxDXDYDZ (double theDX, double theDY, double theDZ); - Handle(GEOM_Object) MakeBoxTwoPnt (Handle(GEOM_Object) thePnt1, + Standard_EXPORT Handle(GEOM_Object) MakeBoxDXDYDZ (double theDX, double theDY, double theDZ); + Standard_EXPORT Handle(GEOM_Object) MakeBoxTwoPnt (Handle(GEOM_Object) thePnt1, Handle(GEOM_Object) thePnt2); - Handle(GEOM_Object) MakeCylinderRH (double theR, double theH); - Handle(GEOM_Object) MakeCylinderPntVecRH (Handle(GEOM_Object) thePnt, + Standard_EXPORT Handle(GEOM_Object) MakeCylinderRH (double theR, double theH); + Standard_EXPORT Handle(GEOM_Object) MakeCylinderPntVecRH (Handle(GEOM_Object) thePnt, Handle(GEOM_Object) theVec, double theR, double theH); - Handle(GEOM_Object) MakeConeR1R2H (double theR1, double theR2, double theH); - Handle(GEOM_Object) MakeConePntVecR1R2H (Handle(GEOM_Object) thePnt, + Standard_EXPORT Handle(GEOM_Object) MakeConeR1R2H (double theR1, double theR2, double theH); + Standard_EXPORT Handle(GEOM_Object) MakeConePntVecR1R2H (Handle(GEOM_Object) thePnt, Handle(GEOM_Object) theVec, double theR1, double theR2, double theH); - Handle(GEOM_Object) MakeSphereR (double theR); - Handle(GEOM_Object) MakeSpherePntR (Handle(GEOM_Object) thePnt, double theR); + Standard_EXPORT Handle(GEOM_Object) MakeSphereR (double theR); + Standard_EXPORT Handle(GEOM_Object) MakeSpherePntR (Handle(GEOM_Object) thePnt, double theR); - Handle(GEOM_Object) MakeTorusRR (double theRMajor, double theRMinor); + Standard_EXPORT Handle(GEOM_Object) MakeTorusRR (double theRMajor, double theRMinor); - Handle(GEOM_Object) MakeTorusPntVecRR (Handle(GEOM_Object) thePnt, + Standard_EXPORT Handle(GEOM_Object) MakeTorusPntVecRR (Handle(GEOM_Object) thePnt, Handle(GEOM_Object) theVec, double theRMajor, double theRMinor); - Handle(GEOM_Object) MakePrismVecH (Handle(GEOM_Object) theBase, + Standard_EXPORT Handle(GEOM_Object) MakePrismVecH (Handle(GEOM_Object) theBase, Handle(GEOM_Object) theVec, double theH); - Handle(GEOM_Object) MakePrismTwoPnt (Handle(GEOM_Object) theBase, + Standard_EXPORT Handle(GEOM_Object) MakePrismTwoPnt (Handle(GEOM_Object) theBase, Handle(GEOM_Object) thePoint1, Handle(GEOM_Object) thePoint2); - Handle(GEOM_Object) MakePipe (Handle(GEOM_Object) theBase, + Standard_EXPORT Handle(GEOM_Object) MakePipe (Handle(GEOM_Object) theBase, Handle(GEOM_Object) thePath); - Handle(GEOM_Object) MakeRevolutionAxisAngle (Handle(GEOM_Object) theBase, + Standard_EXPORT Handle(GEOM_Object) MakeRevolutionAxisAngle (Handle(GEOM_Object) theBase, Handle(GEOM_Object) theAxis, double theAngle); - Handle(GEOM_Object) MakeSolidShell (Handle(GEOM_Object) theShell); + Standard_EXPORT Handle(GEOM_Object) MakeSolidShell (Handle(GEOM_Object) theShell); - Handle(GEOM_Object) MakeFilling (Handle(GEOM_Object) theShape, int theMinDeg, int theMaxDeg, double theTol2D, double theTol3D, int theNbIter); + Standard_EXPORT Handle(GEOM_Object) MakeFilling (Handle(GEOM_Object) theShape, int theMinDeg, int theMaxDeg, double theTol2D, double theTol3D, int theNbIter); }; diff --git a/src/GEOMImpl/GEOMImpl_IBasicOperations.cxx b/src/GEOMImpl/GEOMImpl_IBasicOperations.cxx index 3178373b5..d252f6ebb 100644 --- a/src/GEOMImpl/GEOMImpl_IBasicOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_IBasicOperations.cxx @@ -1,32 +1,32 @@ -using namespace std; +#include -#include "GEOMImpl_IBasicOperations.hxx" +#include #include "utilities.h" -#include "OpUtil.hxx" -#include "Utils_ExceptHandlers.hxx" +#include +#include #include #include #include #include -#include "GEOM_Function.hxx" -#include "GEOM_PythonDump.hxx" +#include +#include -#include "GEOMImpl_PointDriver.hxx" -#include "GEOMImpl_VectorDriver.hxx" -#include "GEOMImpl_LineDriver.hxx" -#include "GEOMImpl_PlaneDriver.hxx" -#include "GEOMImpl_MarkerDriver.hxx" +#include +#include +#include +#include +#include -#include "GEOMImpl_IPoint.hxx" -#include "GEOMImpl_IVector.hxx" -#include "GEOMImpl_ILine.hxx" -#include "GEOMImpl_IPlane.hxx" -#include "GEOMImpl_IMarker.hxx" +#include +#include +#include +#include +#include -#include "GEOMImpl_Types.hxx" +#include #include // CAREFUL ! position of this file is critic : see Lucien PIGNOLONI / OCC diff --git a/src/GEOMImpl/GEOMImpl_IBasicOperations.hxx b/src/GEOMImpl/GEOMImpl_IBasicOperations.hxx index da601f7b4..631559b8a 100644 --- a/src/GEOMImpl/GEOMImpl_IBasicOperations.hxx +++ b/src/GEOMImpl/GEOMImpl_IBasicOperations.hxx @@ -10,45 +10,45 @@ class GEOMImpl_IBasicOperations : public GEOM_IOperations { public: - GEOMImpl_IBasicOperations(GEOM_Engine* theEngine, int theDocID); - ~GEOMImpl_IBasicOperations(); + Standard_EXPORT GEOMImpl_IBasicOperations(GEOM_Engine* theEngine, int theDocID); + Standard_EXPORT ~GEOMImpl_IBasicOperations(); // Point - Handle(GEOM_Object) MakePointXYZ (double theX, double theY, double theZ); + Standard_EXPORT Handle(GEOM_Object) MakePointXYZ (double theX, double theY, double theZ); - Handle(GEOM_Object) MakePointWithReference (Handle(GEOM_Object) theReference, + Standard_EXPORT Handle(GEOM_Object) MakePointWithReference (Handle(GEOM_Object) theReference, double theX, double theY, double theZ); - Handle(GEOM_Object) MakePointOnCurve (Handle(GEOM_Object) theCurve, + Standard_EXPORT Handle(GEOM_Object) MakePointOnCurve (Handle(GEOM_Object) theCurve, double theParameter); // Vector - Handle(GEOM_Object) MakeVectorDXDYDZ (double theDX, double theDY, double theDZ); + Standard_EXPORT Handle(GEOM_Object) MakeVectorDXDYDZ (double theDX, double theDY, double theDZ); - Handle(GEOM_Object) MakeVectorTwoPnt (Handle(GEOM_Object) thePnt1, + Standard_EXPORT Handle(GEOM_Object) MakeVectorTwoPnt (Handle(GEOM_Object) thePnt1, Handle(GEOM_Object) thePnt2); // Line - Handle(GEOM_Object) MakeLineTwoPnt (Handle(GEOM_Object) thePnt1, + Standard_EXPORT Handle(GEOM_Object) MakeLineTwoPnt (Handle(GEOM_Object) thePnt1, Handle(GEOM_Object) thePnt2); - Handle(GEOM_Object) MakeLine (Handle(GEOM_Object) thePnt, + Standard_EXPORT Handle(GEOM_Object) MakeLine (Handle(GEOM_Object) thePnt, Handle(GEOM_Object) theDir); // Plane - Handle(GEOM_Object) MakePlaneThreePnt (Handle(GEOM_Object) thePnt1, + Standard_EXPORT Handle(GEOM_Object) MakePlaneThreePnt (Handle(GEOM_Object) thePnt1, Handle(GEOM_Object) thePnt2, Handle(GEOM_Object) thePnt3, double theSize); - Handle(GEOM_Object) MakePlanePntVec (Handle(GEOM_Object) thePnt, + Standard_EXPORT Handle(GEOM_Object) MakePlanePntVec (Handle(GEOM_Object) thePnt, Handle(GEOM_Object) theVec, double theSize); - Handle(GEOM_Object) MakePlaneFace (Handle(GEOM_Object) theFace, double theSize); + Standard_EXPORT Handle(GEOM_Object) MakePlaneFace (Handle(GEOM_Object) theFace, double theSize); // Marker - Handle(GEOM_Object) MakeMarker (double theOX, double theOY, double theOZ, + Standard_EXPORT Handle(GEOM_Object) MakeMarker (double theOX, double theOY, double theOZ, double theXDX, double theXDY, double theXDZ, double theYDX, double theYDY, double theYDZ); }; diff --git a/src/GEOMImpl/GEOMImpl_IBlocksOperations.cxx b/src/GEOMImpl/GEOMImpl_IBlocksOperations.cxx index afc0223b6..9f0bcc926 100644 --- a/src/GEOMImpl/GEOMImpl_IBlocksOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_IBlocksOperations.cxx @@ -1,27 +1,31 @@ -using namespace std; +#ifdef WNT +#pragma warning( disable:4786 ) +#endif -#include "GEOMImpl_IBlocksOperations.hxx" +#include -#include "GEOMImpl_Types.hxx" +#include -#include "GEOMImpl_BlockDriver.hxx" -#include "GEOMImpl_IBlocks.hxx" -#include "GEOMImpl_IBlockTrsf.hxx" -#include "GEOMImpl_CopyDriver.hxx" -#include "GEOMImpl_Block6Explorer.hxx" +#include -#include "GEOM_Function.hxx" -#include "GEOM_PythonDump.hxx" +#include +#include +#include +#include +#include -#include "GEOMAlgo_GlueAnalyser.hxx" -#include "GEOMAlgo_CoupleOfShapes.hxx" -#include "GEOMAlgo_ListOfCoupleOfShapes.hxx" -#include "GEOMAlgo_ListIteratorOfListOfCoupleOfShapes.hxx" -#include "BlockFix_CheckTool.hxx" +#include +#include + +#include +#include +#include +#include +#include #include "utilities.h" -#include "OpUtil.hxx" -#include "Utils_ExceptHandlers.hxx" +#include +#include #include #include diff --git a/src/GEOMImpl/GEOMImpl_IBlocksOperations.hxx b/src/GEOMImpl/GEOMImpl_IBlocksOperations.hxx index 9c7010594..1b41e9585 100644 --- a/src/GEOMImpl/GEOMImpl_IBlocksOperations.hxx +++ b/src/GEOMImpl/GEOMImpl_IBlocksOperations.hxx @@ -15,70 +15,70 @@ class Handle(TColStd_HArray1OfInteger); class GEOMImpl_IBlocksOperations : public GEOM_IOperations { public: - GEOMImpl_IBlocksOperations(GEOM_Engine* theEngine, int theDocID); - ~GEOMImpl_IBlocksOperations(); + Standard_EXPORT GEOMImpl_IBlocksOperations(GEOM_Engine* theEngine, int theDocID); + Standard_EXPORT ~GEOMImpl_IBlocksOperations(); // Creation of blocks and block faces - Handle(GEOM_Object) MakeQuad (Handle(GEOM_Object) theEdge1, + Standard_EXPORT Handle(GEOM_Object) MakeQuad (Handle(GEOM_Object) theEdge1, Handle(GEOM_Object) theEdge2, Handle(GEOM_Object) theEdge3, Handle(GEOM_Object) theEdge4); - Handle(GEOM_Object) MakeQuad2Edges (Handle(GEOM_Object) theEdge1, + Standard_EXPORT Handle(GEOM_Object) MakeQuad2Edges (Handle(GEOM_Object) theEdge1, Handle(GEOM_Object) theEdge2); - Handle(GEOM_Object) MakeQuad4Vertices (Handle(GEOM_Object) thePoint1, + Standard_EXPORT Handle(GEOM_Object) MakeQuad4Vertices (Handle(GEOM_Object) thePoint1, Handle(GEOM_Object) thePoint2, Handle(GEOM_Object) thePoint3, Handle(GEOM_Object) thePoint4); - Handle(GEOM_Object) MakeHexa (Handle(GEOM_Object) theFace1, + Standard_EXPORT Handle(GEOM_Object) MakeHexa (Handle(GEOM_Object) theFace1, Handle(GEOM_Object) theFace2, Handle(GEOM_Object) theFace3, Handle(GEOM_Object) theFace4, Handle(GEOM_Object) theFace5, Handle(GEOM_Object) theFace6); - Handle(GEOM_Object) MakeHexa2Faces (Handle(GEOM_Object) theFace1, + Standard_EXPORT Handle(GEOM_Object) MakeHexa2Faces (Handle(GEOM_Object) theFace1, Handle(GEOM_Object) theFace2); - Handle(GEOM_Object) MakeBlockCompound (Handle(GEOM_Object) theCompound); + Standard_EXPORT Handle(GEOM_Object) MakeBlockCompound (Handle(GEOM_Object) theCompound); // Extract elements of blocks and blocks compounds - Handle(GEOM_Object) GetPoint (Handle(GEOM_Object) theShape, + Standard_EXPORT Handle(GEOM_Object) GetPoint (Handle(GEOM_Object) theShape, const Standard_Real theX, const Standard_Real theY, const Standard_Real theZ, const Standard_Real theEpsilon); - Handle(GEOM_Object) GetEdge (Handle(GEOM_Object) theShape, + Standard_EXPORT Handle(GEOM_Object) GetEdge (Handle(GEOM_Object) theShape, Handle(GEOM_Object) thePoint1, Handle(GEOM_Object) thePoint2); - Handle(GEOM_Object) GetEdgeNearPoint (Handle(GEOM_Object) theBlock, + Standard_EXPORT Handle(GEOM_Object) GetEdgeNearPoint (Handle(GEOM_Object) theBlock, Handle(GEOM_Object) thePoint); - Handle(GEOM_Object) GetFaceByPoints (Handle(GEOM_Object) theShape, + Standard_EXPORT Handle(GEOM_Object) GetFaceByPoints (Handle(GEOM_Object) theShape, Handle(GEOM_Object) thePoint1, Handle(GEOM_Object) thePoint2, Handle(GEOM_Object) thePoint3, Handle(GEOM_Object) thePoint4); - Handle(GEOM_Object) GetFaceByEdges (Handle(GEOM_Object) theShape, + Standard_EXPORT Handle(GEOM_Object) GetFaceByEdges (Handle(GEOM_Object) theShape, Handle(GEOM_Object) theEdge1, Handle(GEOM_Object) theEdge2); - Handle(GEOM_Object) GetOppositeFace (Handle(GEOM_Object) theBlock, + Standard_EXPORT Handle(GEOM_Object) GetOppositeFace (Handle(GEOM_Object) theBlock, Handle(GEOM_Object) theFace); - Handle(GEOM_Object) GetFaceNearPoint (Handle(GEOM_Object) theBlock, + Standard_EXPORT Handle(GEOM_Object) GetFaceNearPoint (Handle(GEOM_Object) theBlock, Handle(GEOM_Object) thePoint); - Handle(GEOM_Object) GetFaceByNormale (Handle(GEOM_Object) theBlock, + Standard_EXPORT Handle(GEOM_Object) GetFaceByNormale (Handle(GEOM_Object) theBlock, Handle(GEOM_Object) theVector); // Check blocks compounds - Standard_Boolean IsCompoundOfBlocks (Handle(GEOM_Object) theCompound, + Standard_EXPORT Standard_Boolean IsCompoundOfBlocks (Handle(GEOM_Object) theCompound, const Standard_Integer theMinNbFaces, const Standard_Integer theMaxNbFaces, Standard_Integer& theNbBlocks); @@ -96,48 +96,48 @@ class GEOMImpl_IBlocksOperations : public GEOM_IOperations { list incriminated; }; - Standard_Boolean CheckCompoundOfBlocksOld (Handle(GEOM_Object) theCompound, + Standard_EXPORT Standard_Boolean CheckCompoundOfBlocksOld (Handle(GEOM_Object) theCompound, list& theErrors); - Standard_Boolean CheckCompoundOfBlocks (Handle(GEOM_Object) theCompound, + Standard_EXPORT Standard_Boolean CheckCompoundOfBlocks (Handle(GEOM_Object) theCompound, list& theErrors); - TCollection_AsciiString PrintBCErrors (Handle(GEOM_Object) theCompound, + Standard_EXPORT TCollection_AsciiString PrintBCErrors (Handle(GEOM_Object) theCompound, const list& theErrors); - Handle(GEOM_Object) RemoveExtraEdges (Handle(GEOM_Object) theShape); + Standard_EXPORT Handle(GEOM_Object) RemoveExtraEdges (Handle(GEOM_Object) theShape); - Handle(GEOM_Object) CheckAndImprove (Handle(GEOM_Object) theCompound); + Standard_EXPORT Handle(GEOM_Object) CheckAndImprove (Handle(GEOM_Object) theCompound); - static void AddBlocksFrom (const TopoDS_Shape& theShape, + Standard_EXPORT static void AddBlocksFrom (const TopoDS_Shape& theShape, TopTools_ListOfShape& BLO, TopTools_ListOfShape& NOT, TopTools_ListOfShape& EXT); // Extract blocks from blocks compounds - Handle(TColStd_HSequenceOfTransient) ExplodeCompoundOfBlocks + Standard_EXPORT Handle(TColStd_HSequenceOfTransient) ExplodeCompoundOfBlocks (Handle(GEOM_Object) theCompound, const Standard_Integer theMinNbFaces, const Standard_Integer theMaxNbFaces); - Handle(GEOM_Object) GetBlockNearPoint (Handle(GEOM_Object) theCompound, + Standard_EXPORT Handle(GEOM_Object) GetBlockNearPoint (Handle(GEOM_Object) theCompound, Handle(GEOM_Object) thePoint); - Handle(GEOM_Object) GetBlockByParts + Standard_EXPORT Handle(GEOM_Object) GetBlockByParts (Handle(GEOM_Object) theCompound, const Handle(TColStd_HSequenceOfTransient)& theParts); - Handle(TColStd_HSequenceOfTransient) GetBlocksByParts + Standard_EXPORT Handle(TColStd_HSequenceOfTransient) GetBlocksByParts (Handle(GEOM_Object) theCompound, const Handle(TColStd_HSequenceOfTransient)& theParts); // Operations on blocks with gluing of result - Handle(GEOM_Object) MakeMultiTransformation1D (Handle(GEOM_Object) theBlock, + Standard_EXPORT Handle(GEOM_Object) MakeMultiTransformation1D (Handle(GEOM_Object) theBlock, const Standard_Integer theDirFace1, const Standard_Integer theDirFace2, const Standard_Integer theNbTimes); - Handle(GEOM_Object) MakeMultiTransformation2D (Handle(GEOM_Object) theBlock, + Standard_EXPORT Handle(GEOM_Object) MakeMultiTransformation2D (Handle(GEOM_Object) theBlock, const Standard_Integer theDirFace1U, const Standard_Integer theDirFace2U, const Standard_Integer theNbTimesU, @@ -146,7 +146,7 @@ class GEOMImpl_IBlocksOperations : public GEOM_IOperations { const Standard_Integer theNbTimesV); // Build groups for Propagation of 1D hypotheses - Handle(TColStd_HSequenceOfTransient) Propagate (Handle(GEOM_Object) theShape); + Standard_EXPORT Handle(TColStd_HSequenceOfTransient) Propagate (Handle(GEOM_Object) theShape); }; #endif diff --git a/src/GEOMImpl/GEOMImpl_IBooleanOperations.cxx b/src/GEOMImpl/GEOMImpl_IBooleanOperations.cxx index 61b65e4b5..cd635dfce 100644 --- a/src/GEOMImpl/GEOMImpl_IBooleanOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_IBooleanOperations.cxx @@ -1,17 +1,17 @@ -using namespace std; +#include -#include "GEOMImpl_IBooleanOperations.hxx" +#include -#include "GEOM_Function.hxx" -#include "GEOM_PythonDump.hxx" +#include +#include -#include "GEOMImpl_Types.hxx" +#include -#include "GEOMImpl_BooleanDriver.hxx" -#include "GEOMImpl_IBoolean.hxx" +#include +#include -#include "GEOMImpl_PartitionDriver.hxx" -#include "GEOMImpl_IPartition.hxx" +#include +#include #include diff --git a/src/GEOMImpl/GEOMImpl_IBooleanOperations.hxx b/src/GEOMImpl/GEOMImpl_IBooleanOperations.hxx index baebc89e0..336911d62 100644 --- a/src/GEOMImpl/GEOMImpl_IBooleanOperations.hxx +++ b/src/GEOMImpl/GEOMImpl_IBooleanOperations.hxx @@ -14,14 +14,14 @@ class Handle(TColStd_HArray1OfInteger); class GEOMImpl_IBooleanOperations : public GEOM_IOperations { public: - GEOMImpl_IBooleanOperations(GEOM_Engine* theEngine, int theDocID); - ~GEOMImpl_IBooleanOperations(); + Standard_EXPORT GEOMImpl_IBooleanOperations(GEOM_Engine* theEngine, int theDocID); + Standard_EXPORT ~GEOMImpl_IBooleanOperations(); - Handle(GEOM_Object) MakeBoolean (Handle(GEOM_Object) theShape1, + Standard_EXPORT Handle(GEOM_Object) MakeBoolean (Handle(GEOM_Object) theShape1, Handle(GEOM_Object) theShape2, Standard_Integer theOp); - Handle(GEOM_Object) MakePartition (const Handle(TColStd_HSequenceOfTransient)& theShapes, + Standard_EXPORT Handle(GEOM_Object) MakePartition (const Handle(TColStd_HSequenceOfTransient)& theShapes, const Handle(TColStd_HSequenceOfTransient)& theTools, const Handle(TColStd_HSequenceOfTransient)& theKeepInside, const Handle(TColStd_HSequenceOfTransient)& theRemoveInside, @@ -29,7 +29,7 @@ class GEOMImpl_IBooleanOperations : public GEOM_IOperations { const Standard_Boolean theRemoveWebs, const Handle(TColStd_HArray1OfInteger)& theMaterials); - Handle(GEOM_Object) MakeHalfPartition (Handle(GEOM_Object) theShape, + Standard_EXPORT Handle(GEOM_Object) MakeHalfPartition (Handle(GEOM_Object) theShape, Handle(GEOM_Object) thePlane); }; diff --git a/src/GEOMImpl/GEOMImpl_ICurvesOperations.cxx b/src/GEOMImpl/GEOMImpl_ICurvesOperations.cxx index cb5857aa7..b977e80b9 100644 --- a/src/GEOMImpl/GEOMImpl_ICurvesOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_ICurvesOperations.cxx @@ -1,25 +1,25 @@ -using namespace std; +#include -#include "GEOMImpl_ICurvesOperations.hxx" +#include -#include "GEOM_Function.hxx" -#include "GEOM_PythonDump.hxx" +#include +#include -#include "GEOMImpl_Types.hxx" +#include -#include "GEOMImpl_PolylineDriver.hxx" -#include "GEOMImpl_CircleDriver.hxx" -#include "GEOMImpl_SplineDriver.hxx" -#include "GEOMImpl_EllipseDriver.hxx" -#include "GEOMImpl_ArcDriver.hxx" -#include "GEOMImpl_SketcherDriver.hxx" +#include +#include +#include +#include +#include +#include -#include "GEOMImpl_IPolyline.hxx" -#include "GEOMImpl_ICircle.hxx" -#include "GEOMImpl_ISpline.hxx" -#include "GEOMImpl_IEllipse.hxx" -#include "GEOMImpl_IArc.hxx" -#include "GEOMImpl_ISketcher.hxx" +#include +#include +#include +#include +#include +#include #include "utilities.h" diff --git a/src/GEOMImpl/GEOMImpl_ICurvesOperations.hxx b/src/GEOMImpl/GEOMImpl_ICurvesOperations.hxx index e421f642e..df281573b 100644 --- a/src/GEOMImpl/GEOMImpl_ICurvesOperations.hxx +++ b/src/GEOMImpl/GEOMImpl_ICurvesOperations.hxx @@ -12,30 +12,30 @@ class Handle(GEOM_Object); class GEOMImpl_ICurvesOperations : public GEOM_IOperations { public: - GEOMImpl_ICurvesOperations(GEOM_Engine* theEngine, int theDocID); - ~GEOMImpl_ICurvesOperations(); + Standard_EXPORT GEOMImpl_ICurvesOperations(GEOM_Engine* theEngine, int theDocID); + Standard_EXPORT ~GEOMImpl_ICurvesOperations(); - Handle(GEOM_Object) MakePolyline (list thePoints); + Standard_EXPORT Handle(GEOM_Object) MakePolyline (list thePoints); - Handle(GEOM_Object) MakeCircleThreePnt (Handle(GEOM_Object) thePnt1, + Standard_EXPORT Handle(GEOM_Object) MakeCircleThreePnt (Handle(GEOM_Object) thePnt1, Handle(GEOM_Object) thePnt2, Handle(GEOM_Object) thePnt3); - Handle(GEOM_Object) MakeCirclePntVecR (Handle(GEOM_Object) thePnt, + Standard_EXPORT Handle(GEOM_Object) MakeCirclePntVecR (Handle(GEOM_Object) thePnt, Handle(GEOM_Object) theVec, double theR); - Handle(GEOM_Object) MakeEllipse (Handle(GEOM_Object) thePnt, + Standard_EXPORT Handle(GEOM_Object) MakeEllipse (Handle(GEOM_Object) thePnt, Handle(GEOM_Object) theVec, double theRMajor, double theRMinor); - Handle(GEOM_Object) MakeArc (Handle(GEOM_Object) thePnt1, + Standard_EXPORT Handle(GEOM_Object) MakeArc (Handle(GEOM_Object) thePnt1, Handle(GEOM_Object) thePnt2, Handle(GEOM_Object) thePnt3); - Handle(GEOM_Object) MakeSplineBezier (list thePoints); - Handle(GEOM_Object) MakeSplineInterpolation (list thePoints); + Standard_EXPORT Handle(GEOM_Object) MakeSplineBezier (list thePoints); + Standard_EXPORT Handle(GEOM_Object) MakeSplineInterpolation (list thePoints); - Handle(GEOM_Object) MakeSketcher (const char* theCommand, list theWorkingPlane); - Handle(GEOM_Object) MakeSketcherOnPlane (const char* theCommand, + Standard_EXPORT Handle(GEOM_Object) MakeSketcher (const char* theCommand, list theWorkingPlane); + Standard_EXPORT Handle(GEOM_Object) MakeSketcherOnPlane (const char* theCommand, Handle(GEOM_Object) theWorkingPlane); }; diff --git a/src/GEOMImpl/GEOMImpl_IGroupOperations.cxx b/src/GEOMImpl/GEOMImpl_IGroupOperations.cxx index a641ad29d..07a634d7c 100644 --- a/src/GEOMImpl/GEOMImpl_IGroupOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_IGroupOperations.cxx @@ -1,16 +1,16 @@ -using namespace std; +#include -#include "GEOMImpl_IGroupOperations.hxx" +#include -#include "GEOMImpl_Types.hxx" +#include -#include "GEOM_Function.hxx" -#include "GEOM_ISubShape.hxx" -#include "GEOM_PythonDump.hxx" +#include +#include +#include #include "utilities.h" -#include "OpUtil.hxx" -#include "Utils_ExceptHandlers.hxx" +#include +#include #include #include diff --git a/src/GEOMImpl/GEOMImpl_IGroupOperations.hxx b/src/GEOMImpl/GEOMImpl_IGroupOperations.hxx index 61d0d9037..a5566d26d 100644 --- a/src/GEOMImpl/GEOMImpl_IGroupOperations.hxx +++ b/src/GEOMImpl/GEOMImpl_IGroupOperations.hxx @@ -13,32 +13,32 @@ class GEOMImpl_IGroupOperations : public GEOM_IOperations { public: - GEOMImpl_IGroupOperations(GEOM_Engine* theEngine, int theDocID); - ~GEOMImpl_IGroupOperations(); + Standard_EXPORT GEOMImpl_IGroupOperations(GEOM_Engine* theEngine, int theDocID); + Standard_EXPORT ~GEOMImpl_IGroupOperations(); - Handle(GEOM_Object) CreateGroup(Handle(GEOM_Object) theMainShape, TopAbs_ShapeEnum theShapeType); + Standard_EXPORT Handle(GEOM_Object) CreateGroup(Handle(GEOM_Object) theMainShape, TopAbs_ShapeEnum theShapeType); - void AddObject(Handle(GEOM_Object) theGroup, int theSubShapeID); + Standard_EXPORT void AddObject(Handle(GEOM_Object) theGroup, int theSubShapeID); - void RemoveObject(Handle(GEOM_Object) theGroup, int theSubShapeID); + Standard_EXPORT void RemoveObject(Handle(GEOM_Object) theGroup, int theSubShapeID); - void UnionList (Handle(GEOM_Object) theGroup, + Standard_EXPORT void UnionList (Handle(GEOM_Object) theGroup, const Handle(TColStd_HSequenceOfTransient)& theSubShapes); - void DifferenceList (Handle(GEOM_Object) theGroup, + Standard_EXPORT void DifferenceList (Handle(GEOM_Object) theGroup, const Handle(TColStd_HSequenceOfTransient)& theSubShapes); - void UnionIDs (Handle(GEOM_Object) theGroup, + Standard_EXPORT void UnionIDs (Handle(GEOM_Object) theGroup, const Handle(TColStd_HSequenceOfInteger)& theSubShapes); - void DifferenceIDs (Handle(GEOM_Object) theGroup, + Standard_EXPORT void DifferenceIDs (Handle(GEOM_Object) theGroup, const Handle(TColStd_HSequenceOfInteger)& theSubShapes); - TopAbs_ShapeEnum GetType(Handle(GEOM_Object) theGroup); + Standard_EXPORT TopAbs_ShapeEnum GetType(Handle(GEOM_Object) theGroup); - Handle(GEOM_Object) GetMainShape(Handle(GEOM_Object) theGroup); + Standard_EXPORT Handle(GEOM_Object) GetMainShape(Handle(GEOM_Object) theGroup); - Handle(TColStd_HArray1OfInteger) GetObjects(Handle(GEOM_Object) theGroup); + Standard_EXPORT Handle(TColStd_HArray1OfInteger) GetObjects(Handle(GEOM_Object) theGroup); }; diff --git a/src/GEOMImpl/GEOMImpl_IHealingOperations.cxx b/src/GEOMImpl/GEOMImpl_IHealingOperations.cxx index 3fc9299b7..cdf948d8c 100644 --- a/src/GEOMImpl/GEOMImpl_IHealingOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_IHealingOperations.cxx @@ -1,19 +1,23 @@ -using namespace std; +#ifdef WNT +#pragma warning( disable:4786 ) +#endif -#include "GEOMImpl_IHealingOperations.hxx" +#include -#include "GEOM_PythonDump.hxx" +#include -#include "GEOMImpl_HealingDriver.hxx" -#include "GEOMImpl_Types.hxx" -#include "GEOMImpl_IHealing.hxx" -#include "GEOMImpl_CopyDriver.hxx" +#include -#include "ShHealOper_ShapeProcess.hxx" +#include +#include +#include +#include + +#include #include "utilities.h" -#include "OpUtil.hxx" -#include "Utils_ExceptHandlers.hxx" +#include +#include #include diff --git a/src/GEOMImpl/GEOMImpl_IHealingOperations.hxx b/src/GEOMImpl/GEOMImpl_IHealingOperations.hxx index 3203ea99a..c74403e8c 100644 --- a/src/GEOMImpl/GEOMImpl_IHealingOperations.hxx +++ b/src/GEOMImpl/GEOMImpl_IHealingOperations.hxx @@ -13,45 +13,45 @@ class GEOMImpl_IHealingOperations : public GEOM_IOperations { public: - GEOMImpl_IHealingOperations(GEOM_Engine* theEngine, int theDocID); - ~GEOMImpl_IHealingOperations(); + Standard_EXPORT GEOMImpl_IHealingOperations(GEOM_Engine* theEngine, int theDocID); + Standard_EXPORT ~GEOMImpl_IHealingOperations(); // Apply Shape Processing to the selected Object - Handle(GEOM_Object) ShapeProcess( Handle(GEOM_Object) theObject, + Standard_EXPORT Handle(GEOM_Object) ShapeProcess( Handle(GEOM_Object) theObject, const Handle(TColStd_HArray1OfExtendedString)& theOperations, const Handle(TColStd_HArray1OfExtendedString)& theParams, const Handle(TColStd_HArray1OfExtendedString)& theValues ); // Retrieve default Shape Process parameters (from resource file) - void GetShapeProcessParameters( list& theOperations, + Standard_EXPORT void GetShapeProcessParameters( list& theOperations, list& theParams, list& theValues ); // Retrieve default Shape Process parameters for given operator - bool GetOperatorParameters( const string theOperation, + Standard_EXPORT bool GetOperatorParameters( const string theOperation, list& theParams, list& theValues ); // returns all parameters that are valid for the given operation (Shape Process operator) - static bool GetParameters( const string theOperation, list& theParams ); + Standard_EXPORT static bool GetParameters( const string theOperation, list& theParams ); - Handle(GEOM_Object) SuppressFaces( Handle(GEOM_Object) theObject, + Standard_EXPORT Handle(GEOM_Object) SuppressFaces( Handle(GEOM_Object) theObject, const Handle(TColStd_HArray1OfInteger)& theFaces); - Handle(GEOM_Object) CloseContour( Handle(GEOM_Object) theObject, + Standard_EXPORT Handle(GEOM_Object) CloseContour( Handle(GEOM_Object) theObject, const Handle(TColStd_HArray1OfInteger)& theWires, bool isCommonVertex ); - Handle(GEOM_Object) RemoveIntWires( Handle(GEOM_Object) theObject, + Standard_EXPORT Handle(GEOM_Object) RemoveIntWires( Handle(GEOM_Object) theObject, const Handle(TColStd_HArray1OfInteger)& theWires); - Handle(GEOM_Object) FillHoles( Handle(GEOM_Object) theObject, + Standard_EXPORT Handle(GEOM_Object) FillHoles( Handle(GEOM_Object) theObject, const Handle(TColStd_HArray1OfInteger)& theWires); - Handle(GEOM_Object) Sew( Handle(GEOM_Object) theObject, + Standard_EXPORT Handle(GEOM_Object) Sew( Handle(GEOM_Object) theObject, double theTolerance ); - Handle(GEOM_Object) DivideEdge( Handle(GEOM_Object) theObject, + Standard_EXPORT Handle(GEOM_Object) DivideEdge( Handle(GEOM_Object) theObject, int theIndex, double theValue, bool isByParameter ); @@ -59,7 +59,7 @@ class GEOMImpl_IHealingOperations : public GEOM_IOperations { // this function does not use Function-Driver mechanism, it just computes the free // boundary edges and returns them in the sequence. It is called just for information reasons // and it's not intended for history/undo/redo/etc.. - bool GetFreeBoundary ( Handle(GEOM_Object) theObject, + Standard_EXPORT bool GetFreeBoundary ( Handle(GEOM_Object) theObject, Handle(TColStd_HSequenceOfTransient)& theOutClosedWires, Handle(TColStd_HSequenceOfTransient)& theOutOpenWires ); }; diff --git a/src/GEOMImpl/GEOMImpl_IInsertOperations.cxx b/src/GEOMImpl/GEOMImpl_IInsertOperations.cxx index 11ec04762..74a8c8302 100644 --- a/src/GEOMImpl/GEOMImpl_IInsertOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_IInsertOperations.cxx @@ -1,27 +1,27 @@ -using namespace std; +#include -#include "GEOMImpl_IInsertOperations.hxx" +#include #include "utilities.h" -#include "OpUtil.hxx" -#include "Utils_ExceptHandlers.hxx" +#include +#include #include #include #include #include -#include "GEOM_Function.hxx" -#include "GEOM_PythonDump.hxx" +#include +#include -#include "GEOMImpl_CopyDriver.hxx" -#include "GEOMImpl_ExportDriver.hxx" -#include "GEOMImpl_ImportDriver.hxx" +#include +#include +#include -#include "GEOMImpl_ICopy.hxx" -#include "GEOMImpl_IImportExport.hxx" +#include +#include -#include "GEOMImpl_Types.hxx" +#include #include // CAREFUL ! position of this file is critic : see Lucien PIGNOLONI / OCC diff --git a/src/GEOMImpl/GEOMImpl_IInsertOperations.hxx b/src/GEOMImpl/GEOMImpl_IInsertOperations.hxx index 953cf3e79..6a61e36a6 100644 --- a/src/GEOMImpl/GEOMImpl_IInsertOperations.hxx +++ b/src/GEOMImpl/GEOMImpl_IInsertOperations.hxx @@ -13,25 +13,25 @@ class GEOMImpl_IInsertOperations : public GEOM_IOperations { public: - GEOMImpl_IInsertOperations(GEOM_Engine* theEngine, int theDocID); - ~GEOMImpl_IInsertOperations(); + Standard_EXPORT GEOMImpl_IInsertOperations(GEOM_Engine* theEngine, int theDocID); + Standard_EXPORT ~GEOMImpl_IInsertOperations(); - Handle(GEOM_Object) MakeCopy (Handle(GEOM_Object) theOriginal); + Standard_EXPORT Handle(GEOM_Object) MakeCopy (Handle(GEOM_Object) theOriginal); - Handle(GEOM_Object) Import (const char* theFileName, const char* theFormatType); + Standard_EXPORT Handle(GEOM_Object) Import (const char* theFileName, const char* theFormatType); - void Export (const Handle(GEOM_Object) theOriginal, + Standard_EXPORT void Export (const Handle(GEOM_Object) theOriginal, const char* theFileName, const char* theFormatType); - Standard_Boolean ImportTranslators (Handle(TColStd_HSequenceOfAsciiString)& theFormats, + Standard_EXPORT Standard_Boolean ImportTranslators (Handle(TColStd_HSequenceOfAsciiString)& theFormats, Handle(TColStd_HSequenceOfAsciiString)& thePatterns); - Standard_Boolean ExportTranslators (Handle(TColStd_HSequenceOfAsciiString)& theFormats, + Standard_EXPORT Standard_Boolean ExportTranslators (Handle(TColStd_HSequenceOfAsciiString)& theFormats, Handle(TColStd_HSequenceOfAsciiString)& thePatterns); - Standard_Boolean IsSupported (const Standard_Boolean isImport, + Standard_EXPORT Standard_Boolean IsSupported (const Standard_Boolean isImport, const TCollection_AsciiString theFormat, Handle(TCollection_HAsciiString)& theLibName); diff --git a/src/GEOMImpl/GEOMImpl_ILocalOperations.cxx b/src/GEOMImpl/GEOMImpl_ILocalOperations.cxx index 031ab0eaf..28438e616 100644 --- a/src/GEOMImpl/GEOMImpl_ILocalOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_ILocalOperations.cxx @@ -1,24 +1,24 @@ -using namespace std; +#include -#include "GEOMImpl_ILocalOperations.hxx" +#include -#include "GEOM_Function.hxx" -#include "GEOM_PythonDump.hxx" +#include +#include -#include "GEOMImpl_Types.hxx" +#include -#include "GEOMImpl_FilletDriver.hxx" -#include "GEOMImpl_ChamferDriver.hxx" +#include +#include -#include "GEOMImpl_IFillet.hxx" -#include "GEOMImpl_IChamfer.hxx" +#include +#include -#include "GEOMImpl_IArchimede.hxx" -#include "GEOMImpl_ArchimedeDriver.hxx" +#include +#include #include "utilities.h" -#include "OpUtil.hxx" -#include "Utils_ExceptHandlers.hxx" +#include +#include #include #include diff --git a/src/GEOMImpl/GEOMImpl_ILocalOperations.hxx b/src/GEOMImpl/GEOMImpl_ILocalOperations.hxx index 8b1110810..597e3199c 100644 --- a/src/GEOMImpl/GEOMImpl_ILocalOperations.hxx +++ b/src/GEOMImpl/GEOMImpl_ILocalOperations.hxx @@ -12,31 +12,31 @@ class GEOMImpl_ILocalOperations : public GEOM_IOperations { public: - GEOMImpl_ILocalOperations(GEOM_Engine* theEngine, int theDocID); - ~GEOMImpl_ILocalOperations(); + Standard_EXPORT GEOMImpl_ILocalOperations(GEOM_Engine* theEngine, int theDocID); + Standard_EXPORT ~GEOMImpl_ILocalOperations(); - Handle(GEOM_Object) MakeFilletAll (Handle(GEOM_Object) theShape, double theR); - Handle(GEOM_Object) MakeFilletEdges (Handle(GEOM_Object) theShape, double theR, + Standard_EXPORT Handle(GEOM_Object) MakeFilletAll (Handle(GEOM_Object) theShape, double theR); + Standard_EXPORT Handle(GEOM_Object) MakeFilletEdges (Handle(GEOM_Object) theShape, double theR, list theEdges); - Handle(GEOM_Object) MakeFilletFaces (Handle(GEOM_Object) theShape, double theR, + Standard_EXPORT Handle(GEOM_Object) MakeFilletFaces (Handle(GEOM_Object) theShape, double theR, list theFaces); - Handle(GEOM_Object) MakeChamferAll (Handle(GEOM_Object) theShape, double theD); - Handle(GEOM_Object) MakeChamferEdge (Handle(GEOM_Object) theShape, + Standard_EXPORT Handle(GEOM_Object) MakeChamferAll (Handle(GEOM_Object) theShape, double theD); + Standard_EXPORT Handle(GEOM_Object) MakeChamferEdge (Handle(GEOM_Object) theShape, double theD1, double theD2, int theFace1, int theFace2); - Handle(GEOM_Object) MakeChamferFaces (Handle(GEOM_Object) theShape, + Standard_EXPORT Handle(GEOM_Object) MakeChamferFaces (Handle(GEOM_Object) theShape, double theD1, double theD2, list theFaces); - Handle(GEOM_Object) MakeArchimede (Handle(GEOM_Object) theShape, + Standard_EXPORT Handle(GEOM_Object) MakeArchimede (Handle(GEOM_Object) theShape, double theWeight, double theWaterDensity, double theMeshingDeflection); - Standard_Integer GetSubShapeIndex (Handle(GEOM_Object) theShape, + Standard_EXPORT Standard_Integer GetSubShapeIndex (Handle(GEOM_Object) theShape, Handle(GEOM_Object) theSubShape); - static bool GetSubShape (const TopoDS_Shape& theShape, + Standard_EXPORT static bool GetSubShape (const TopoDS_Shape& theShape, const int theIndex, TopoDS_Shape& theSubShape); }; diff --git a/src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx b/src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx index 883b5a8ad..bd91bc57a 100644 --- a/src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx @@ -1,17 +1,17 @@ -using namespace std; +#include -#include "GEOMImpl_IMeasureOperations.hxx" +#include -#include "GEOMImpl_Types.hxx" -#include "GEOMImpl_MeasureDriver.hxx" -#include "GEOMImpl_IMeasure.hxx" +#include +#include +#include -#include "GEOM_Function.hxx" -#include "GEOM_PythonDump.hxx" +#include +#include #include "utilities.h" -#include "OpUtil.hxx" -#include "Utils_ExceptHandlers.hxx" +#include +#include #include #include diff --git a/src/GEOMImpl/GEOMImpl_IMeasureOperations.hxx b/src/GEOMImpl/GEOMImpl_IMeasureOperations.hxx index 9193fb91b..675590da5 100644 --- a/src/GEOMImpl/GEOMImpl_IMeasureOperations.hxx +++ b/src/GEOMImpl/GEOMImpl_IMeasureOperations.hxx @@ -14,42 +14,42 @@ class Handle(GEOM_Object); class GEOMImpl_IMeasureOperations : public GEOM_IOperations { public: - GEOMImpl_IMeasureOperations(GEOM_Engine* theEngine, int theDocID); - ~GEOMImpl_IMeasureOperations(); + Standard_EXPORT GEOMImpl_IMeasureOperations(GEOM_Engine* theEngine, int theDocID); + Standard_EXPORT ~GEOMImpl_IMeasureOperations(); - Handle(GEOM_Object) GetCentreOfMass (Handle(GEOM_Object) theShape); + Standard_EXPORT Handle(GEOM_Object) GetCentreOfMass (Handle(GEOM_Object) theShape); - void GetBasicProperties (Handle(GEOM_Object) theShape, + Standard_EXPORT void GetBasicProperties (Handle(GEOM_Object) theShape, Standard_Real& theLength, Standard_Real& theSurfArea, Standard_Real& theVolume); - void GetInertia (Handle(GEOM_Object) theShape, + Standard_EXPORT void GetInertia (Handle(GEOM_Object) theShape, Standard_Real& I11, Standard_Real& I12, Standard_Real& I13, Standard_Real& I21, Standard_Real& I22, Standard_Real& I23, Standard_Real& I31, Standard_Real& I32, Standard_Real& I33, Standard_Real& Ix , Standard_Real& Iy , Standard_Real& Iz); - void GetBoundingBox (Handle(GEOM_Object) theShape, + Standard_EXPORT void GetBoundingBox (Handle(GEOM_Object) theShape, Standard_Real& Xmin, Standard_Real& Xmax, Standard_Real& Ymin, Standard_Real& Ymax, Standard_Real& Zmin, Standard_Real& Zmax); - void GetTolerance (Handle(GEOM_Object) theShape, + Standard_EXPORT void GetTolerance (Handle(GEOM_Object) theShape, Standard_Real& FaceMin, Standard_Real& FaceMax, Standard_Real& EdgeMin, Standard_Real& EdgeMax, Standard_Real& VertMin, Standard_Real& VertMax); - bool CheckShape (Handle(GEOM_Object) theShape, + Standard_EXPORT bool CheckShape (Handle(GEOM_Object) theShape, TCollection_AsciiString& theDump); - TCollection_AsciiString WhatIs (Handle(GEOM_Object) theShape); + Standard_EXPORT TCollection_AsciiString WhatIs (Handle(GEOM_Object) theShape); - Standard_Real GetMinDistance (Handle(GEOM_Object) theShape1, Handle(GEOM_Object) theShape2, + Standard_EXPORT Standard_Real GetMinDistance (Handle(GEOM_Object) theShape1, Handle(GEOM_Object) theShape2, Standard_Real& X1, Standard_Real& Y1, Standard_Real& Z1, Standard_Real& X2, Standard_Real& Y2, Standard_Real& Z2); - void PointCoordinates( Handle(GEOM_Object) theShape, + Standard_EXPORT void PointCoordinates( Handle(GEOM_Object) theShape, Standard_Real& theX, Standard_Real& theY, Standard_Real& theZ ); private: diff --git a/src/GEOMImpl/GEOMImpl_IShapesOperations.cxx b/src/GEOMImpl/GEOMImpl_IShapesOperations.cxx index 2d187465d..47433ca3d 100644 --- a/src/GEOMImpl/GEOMImpl_IShapesOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_IShapesOperations.cxx @@ -1,28 +1,28 @@ -using namespace std; +#include -#include "GEOMImpl_IShapesOperations.hxx" +#include -#include "GEOMImpl_Types.hxx" +#include -#include "GEOMImpl_VectorDriver.hxx" -#include "GEOMImpl_ShapeDriver.hxx" -#include "GEOMImpl_CopyDriver.hxx" -#include "GEOMImpl_GlueDriver.hxx" +#include +#include +#include +#include -#include "GEOMImpl_IVector.hxx" -#include "GEOMImpl_IShapes.hxx" -#include "GEOMImpl_IGlue.hxx" +#include +#include +#include -#include "GEOMImpl_Block6Explorer.hxx" +#include -#include "GEOM_Function.hxx" -#include "GEOM_PythonDump.hxx" +#include +#include -#include "GEOMAlgo_FinderShapeOn1.hxx" +#include #include "utilities.h" -#include "OpUtil.hxx" -#include "Utils_ExceptHandlers.hxx" +#include +#include #include #include diff --git a/src/GEOMImpl/GEOMImpl_IShapesOperations.hxx b/src/GEOMImpl/GEOMImpl_IShapesOperations.hxx index 0c8f57395..3424f6e07 100644 --- a/src/GEOMImpl/GEOMImpl_IShapesOperations.hxx +++ b/src/GEOMImpl/GEOMImpl_IShapesOperations.hxx @@ -18,100 +18,100 @@ class Handle(TColStd_HArray1OfInteger); class GEOMImpl_IShapesOperations : public GEOM_IOperations { public: - GEOMImpl_IShapesOperations(GEOM_Engine* theEngine, int theDocID); - ~GEOMImpl_IShapesOperations(); + Standard_EXPORT GEOMImpl_IShapesOperations(GEOM_Engine* theEngine, int theDocID); + Standard_EXPORT ~GEOMImpl_IShapesOperations(); - Handle(GEOM_Object) MakeEdge (Handle(GEOM_Object) thePoint1, + Standard_EXPORT Handle(GEOM_Object) MakeEdge (Handle(GEOM_Object) thePoint1, Handle(GEOM_Object) thePoint2); - Handle(GEOM_Object) MakeWire (list theEdgesAndWires); + Standard_EXPORT Handle(GEOM_Object) MakeWire (list theEdgesAndWires); - Handle(GEOM_Object) MakeFace (Handle(GEOM_Object) theWire, const bool isPlanarWanted); + Standard_EXPORT Handle(GEOM_Object) MakeFace (Handle(GEOM_Object) theWire, const bool isPlanarWanted); - Handle(GEOM_Object) MakeFaceWires (list theWires, + Standard_EXPORT Handle(GEOM_Object) MakeFaceWires (list theWires, const bool isPlanarWanted); - Handle(GEOM_Object) MakeShell (list theShapes); + Standard_EXPORT Handle(GEOM_Object) MakeShell (list theShapes); - Handle(GEOM_Object) MakeSolidShell (Handle(GEOM_Object) theShell); + Standard_EXPORT Handle(GEOM_Object) MakeSolidShell (Handle(GEOM_Object) theShell); - Handle(GEOM_Object) MakeSolidShells (list theShells); + Standard_EXPORT Handle(GEOM_Object) MakeSolidShells (list theShells); - Handle(GEOM_Object) MakeCompound (list theShapes); + Standard_EXPORT Handle(GEOM_Object) MakeCompound (list theShapes); - Handle(GEOM_Object) MakeGlueFaces (Handle(GEOM_Object) theShape, + Standard_EXPORT Handle(GEOM_Object) MakeGlueFaces (Handle(GEOM_Object) theShape, const Standard_Real theTolerance); - Handle(TColStd_HSequenceOfTransient) MakeExplode (Handle(GEOM_Object) theShape, + Standard_EXPORT Handle(TColStd_HSequenceOfTransient) MakeExplode (Handle(GEOM_Object) theShape, const Standard_Integer theShapeType, const Standard_Boolean isSorted); - Handle(TColStd_HSequenceOfInteger) SubShapeAllIDs (Handle(GEOM_Object) theShape, + Standard_EXPORT Handle(TColStd_HSequenceOfInteger) SubShapeAllIDs (Handle(GEOM_Object) theShape, const Standard_Integer theShapeType, const Standard_Boolean isSorted); - Handle(GEOM_Object) GetSubShape (Handle(GEOM_Object) theMainShape, + Standard_EXPORT Handle(GEOM_Object) GetSubShape (Handle(GEOM_Object) theMainShape, const Standard_Integer theID); - Standard_Integer NumberOfFaces (Handle(GEOM_Object) theShape); - Standard_Integer NumberOfEdges (Handle(GEOM_Object) theShape); + Standard_EXPORT Standard_Integer NumberOfFaces (Handle(GEOM_Object) theShape); + Standard_EXPORT Standard_Integer NumberOfEdges (Handle(GEOM_Object) theShape); - Handle(GEOM_Object) ReverseShape(Handle(GEOM_Object) theShapes); + Standard_EXPORT Handle(GEOM_Object) ReverseShape(Handle(GEOM_Object) theShapes); - Handle(TColStd_HSequenceOfInteger) GetFreeFacesIDs (Handle(GEOM_Object) theShape); + Standard_EXPORT Handle(TColStd_HSequenceOfInteger) GetFreeFacesIDs (Handle(GEOM_Object) theShape); - Handle(TColStd_HSequenceOfTransient) GetSharedShapes (Handle(GEOM_Object) theShape1, + Standard_EXPORT Handle(TColStd_HSequenceOfTransient) GetSharedShapes (Handle(GEOM_Object) theShape1, Handle(GEOM_Object) theShape2, const Standard_Integer theShapeType); - Handle(TColStd_HSequenceOfTransient) GetShapesOnPlane (const Handle(GEOM_Object)& theShape, + Standard_EXPORT Handle(TColStd_HSequenceOfTransient) GetShapesOnPlane (const Handle(GEOM_Object)& theShape, const Standard_Integer theShapeType, const Handle(GEOM_Object)& theAx1, const GEOMAlgo_State theState); - Handle(TColStd_HSequenceOfTransient) GetShapesOnCylinder (const Handle(GEOM_Object)& theShape, + Standard_EXPORT Handle(TColStd_HSequenceOfTransient) GetShapesOnCylinder (const Handle(GEOM_Object)& theShape, const Standard_Integer theShapeType, const Handle(GEOM_Object)& theAxis, const Standard_Real theRadius, const GEOMAlgo_State theState); - Handle(TColStd_HSequenceOfTransient) GetShapesOnSphere (const Handle(GEOM_Object)& theShape, + Standard_EXPORT Handle(TColStd_HSequenceOfTransient) GetShapesOnSphere (const Handle(GEOM_Object)& theShape, const Standard_Integer theShapeType, const Handle(GEOM_Object)& theCenter, const Standard_Real theRadius, const GEOMAlgo_State theState); - Handle(TColStd_HSequenceOfInteger) GetShapesOnPlaneIDs (const Handle(GEOM_Object)& theShape, + Standard_EXPORT Handle(TColStd_HSequenceOfInteger) GetShapesOnPlaneIDs (const Handle(GEOM_Object)& theShape, const Standard_Integer theShapeType, const Handle(GEOM_Object)& theAx1, const GEOMAlgo_State theState); - Handle(TColStd_HSequenceOfInteger) GetShapesOnCylinderIDs (const Handle(GEOM_Object)& theShape, + Standard_EXPORT Handle(TColStd_HSequenceOfInteger) GetShapesOnCylinderIDs (const Handle(GEOM_Object)& theShape, const Standard_Integer theShapeType, const Handle(GEOM_Object)& theAxis, const Standard_Real theRadius, const GEOMAlgo_State theState); - Handle(TColStd_HSequenceOfInteger) GetShapesOnSphereIDs (const Handle(GEOM_Object)& theShape, + Standard_EXPORT Handle(TColStd_HSequenceOfInteger) GetShapesOnSphereIDs (const Handle(GEOM_Object)& theShape, const Standard_Integer theShapeType, const Handle(GEOM_Object)& theCenter, const Standard_Real theRadius, const GEOMAlgo_State theState); - Handle(GEOM_Object) GetShapesOnCylinderOld (Handle(GEOM_Object) theShape, + Standard_EXPORT Handle(GEOM_Object) GetShapesOnCylinderOld (Handle(GEOM_Object) theShape, const Standard_Integer theShapeType, Handle(GEOM_Object) theAxis, const Standard_Real theRadius); - Handle(GEOM_Object) GetShapesOnSphereOld (Handle(GEOM_Object) theShape, + Standard_EXPORT Handle(GEOM_Object) GetShapesOnSphereOld (Handle(GEOM_Object) theShape, const Standard_Integer theShapeType, Handle(GEOM_Object) theCenter, const Standard_Real theRadius); - Handle(GEOM_Object) GetInPlace (Handle(GEOM_Object) theShapeWhere, + Standard_EXPORT Handle(GEOM_Object) GetInPlace (Handle(GEOM_Object) theShapeWhere, Handle(GEOM_Object) theShapeWhat); - static void SortShapes (TopTools_ListOfShape& SL); + Standard_EXPORT static void SortShapes (TopTools_ListOfShape& SL); private: Handle(GEOM_Object) MakeShape (list theShapes, diff --git a/src/GEOMImpl/GEOMImpl_ITransformOperations.cxx b/src/GEOMImpl/GEOMImpl_ITransformOperations.cxx index 5b287e669..7d6c5c792 100644 --- a/src/GEOMImpl/GEOMImpl_ITransformOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_ITransformOperations.cxx @@ -1,34 +1,34 @@ -using namespace std; +#include -#include "GEOMImpl_ITransformOperations.hxx" +#include #include "utilities.h" -#include "OpUtil.hxx" -#include "Utils_ExceptHandlers.hxx" +#include +#include #include #include #include #include -#include "GEOM_Function.hxx" -#include "GEOM_PythonDump.hxx" +#include +#include -#include "GEOMImpl_TranslateDriver.hxx" -#include "GEOMImpl_MirrorDriver.hxx" -#include "GEOMImpl_OffsetDriver.hxx" -#include "GEOMImpl_ScaleDriver.hxx" -#include "GEOMImpl_RotateDriver.hxx" -#include "GEOMImpl_PositionDriver.hxx" +#include +#include +#include +#include +#include +#include -#include "GEOMImpl_ITranslate.hxx" -#include "GEOMImpl_IMirror.hxx" -#include "GEOMImpl_IOffset.hxx" -#include "GEOMImpl_IScale.hxx" -#include "GEOMImpl_IRotate.hxx" -#include "GEOMImpl_IPosition.hxx" +#include +#include +#include +#include +#include +#include -#include "GEOMImpl_Types.hxx" +#include #include // CAREFUL ! position of this file is critic : see Lucien PIGNOLONI / OCC diff --git a/src/GEOMImpl/GEOMImpl_ITransformOperations.hxx b/src/GEOMImpl/GEOMImpl_ITransformOperations.hxx index 5ac2879a3..fe40e5917 100644 --- a/src/GEOMImpl/GEOMImpl_ITransformOperations.hxx +++ b/src/GEOMImpl/GEOMImpl_ITransformOperations.hxx @@ -10,79 +10,79 @@ class GEOMImpl_ITransformOperations : public GEOM_IOperations { public: - GEOMImpl_ITransformOperations(GEOM_Engine* theEngine, int theDocID); - ~GEOMImpl_ITransformOperations(); + Standard_EXPORT GEOMImpl_ITransformOperations(GEOM_Engine* theEngine, int theDocID); + Standard_EXPORT ~GEOMImpl_ITransformOperations(); - Handle(GEOM_Object) TranslateTwoPoints (Handle(GEOM_Object) theObject, + Standard_EXPORT Handle(GEOM_Object) TranslateTwoPoints (Handle(GEOM_Object) theObject, Handle(GEOM_Object) thePoint1, Handle(GEOM_Object) thePoint2); - Handle(GEOM_Object) TranslateTwoPointsCopy (Handle(GEOM_Object) theObject, + Standard_EXPORT Handle(GEOM_Object) TranslateTwoPointsCopy (Handle(GEOM_Object) theObject, Handle(GEOM_Object) thePoint1, Handle(GEOM_Object) thePoint2); - Handle(GEOM_Object) TranslateDXDYDZ (Handle(GEOM_Object) theObject, double theX, double theY, double theZ); + Standard_EXPORT Handle(GEOM_Object) TranslateDXDYDZ (Handle(GEOM_Object) theObject, double theX, double theY, double theZ); - Handle(GEOM_Object) TranslateDXDYDZCopy (Handle(GEOM_Object) theObject, double theX, double theY, double theZ); + Standard_EXPORT Handle(GEOM_Object) TranslateDXDYDZCopy (Handle(GEOM_Object) theObject, double theX, double theY, double theZ); - Handle(GEOM_Object) TranslateVector (Handle(GEOM_Object) theObject, + Standard_EXPORT Handle(GEOM_Object) TranslateVector (Handle(GEOM_Object) theObject, Handle(GEOM_Object) theVector); - Handle(GEOM_Object) TranslateVectorCopy (Handle(GEOM_Object) theObject, + Standard_EXPORT Handle(GEOM_Object) TranslateVectorCopy (Handle(GEOM_Object) theObject, Handle(GEOM_Object) theVector); - Handle(GEOM_Object) Translate1D (Handle(GEOM_Object) theObject, Handle(GEOM_Object) theVector, double theStep, Standard_Integer theNbTimes); + Standard_EXPORT Handle(GEOM_Object) Translate1D (Handle(GEOM_Object) theObject, Handle(GEOM_Object) theVector, double theStep, Standard_Integer theNbTimes); - Handle(GEOM_Object) Translate2D (Handle(GEOM_Object) theObject, Handle(GEOM_Object) theVector, double theStep1, Standard_Integer theNbTimes1, + Standard_EXPORT Handle(GEOM_Object) Translate2D (Handle(GEOM_Object) theObject, Handle(GEOM_Object) theVector, double theStep1, Standard_Integer theNbTimes1, Handle(GEOM_Object) theVector2, double theStep2, Standard_Integer theNbTimes2); - Handle(GEOM_Object) MirrorPlane (Handle(GEOM_Object) theObject, + Standard_EXPORT Handle(GEOM_Object) MirrorPlane (Handle(GEOM_Object) theObject, Handle(GEOM_Object) thePlane); - Handle(GEOM_Object) MirrorPlaneCopy (Handle(GEOM_Object) theObject, + Standard_EXPORT Handle(GEOM_Object) MirrorPlaneCopy (Handle(GEOM_Object) theObject, Handle(GEOM_Object) thePlane); - Handle(GEOM_Object) MirrorAxis (Handle(GEOM_Object) theObject, + Standard_EXPORT Handle(GEOM_Object) MirrorAxis (Handle(GEOM_Object) theObject, Handle(GEOM_Object) theAxis); - Handle(GEOM_Object) MirrorAxisCopy (Handle(GEOM_Object) theObject, + Standard_EXPORT Handle(GEOM_Object) MirrorAxisCopy (Handle(GEOM_Object) theObject, Handle(GEOM_Object) theAxis); - Handle(GEOM_Object) MirrorPoint (Handle(GEOM_Object) theObject, + Standard_EXPORT Handle(GEOM_Object) MirrorPoint (Handle(GEOM_Object) theObject, Handle(GEOM_Object) thePoint); - Handle(GEOM_Object) MirrorPointCopy (Handle(GEOM_Object) theObject, + Standard_EXPORT Handle(GEOM_Object) MirrorPointCopy (Handle(GEOM_Object) theObject, Handle(GEOM_Object) thePoint); - Handle(GEOM_Object) OffsetShape (Handle(GEOM_Object) theObject, + Standard_EXPORT Handle(GEOM_Object) OffsetShape (Handle(GEOM_Object) theObject, double theOffset); - Handle(GEOM_Object) OffsetShapeCopy (Handle(GEOM_Object) theObject, + Standard_EXPORT Handle(GEOM_Object) OffsetShapeCopy (Handle(GEOM_Object) theObject, double theOffset); - Handle(GEOM_Object) ScaleShape (Handle(GEOM_Object) theObject, + Standard_EXPORT Handle(GEOM_Object) ScaleShape (Handle(GEOM_Object) theObject, Handle(GEOM_Object) thePoint, double theFactor); - Handle(GEOM_Object) ScaleShapeCopy (Handle(GEOM_Object) theObject, + Standard_EXPORT Handle(GEOM_Object) ScaleShapeCopy (Handle(GEOM_Object) theObject, Handle(GEOM_Object) thePoint, double theFactor); - Handle(GEOM_Object) PositionShape (Handle(GEOM_Object) theObject, + Standard_EXPORT Handle(GEOM_Object) PositionShape (Handle(GEOM_Object) theObject, Handle(GEOM_Object) theStartLCS, Handle(GEOM_Object) theEndLCS); - Handle(GEOM_Object) PositionShapeCopy (Handle(GEOM_Object) theObject, + Standard_EXPORT Handle(GEOM_Object) PositionShapeCopy (Handle(GEOM_Object) theObject, Handle(GEOM_Object) theStartLCS, Handle(GEOM_Object) theEndLCS); - Handle(GEOM_Object) Rotate (Handle(GEOM_Object) theObject, Handle(GEOM_Object) theAxis, double theAngle); + Standard_EXPORT Handle(GEOM_Object) Rotate (Handle(GEOM_Object) theObject, Handle(GEOM_Object) theAxis, double theAngle); - Handle(GEOM_Object) RotateCopy (Handle(GEOM_Object) theObject, Handle(GEOM_Object) theAxis, double theAngle); + Standard_EXPORT Handle(GEOM_Object) RotateCopy (Handle(GEOM_Object) theObject, Handle(GEOM_Object) theAxis, double theAngle); - Handle(GEOM_Object) Rotate1D (Handle(GEOM_Object) theObject, Handle(GEOM_Object) theAxis, Standard_Integer theNbTimes); + Standard_EXPORT Handle(GEOM_Object) Rotate1D (Handle(GEOM_Object) theObject, Handle(GEOM_Object) theAxis, Standard_Integer theNbTimes); - Handle(GEOM_Object) Rotate2D (Handle(GEOM_Object) theObject, + Standard_EXPORT Handle(GEOM_Object) Rotate2D (Handle(GEOM_Object) theObject, Handle(GEOM_Object) theAxis, double theAngle, Standard_Integer theNbTimes1, diff --git a/src/GEOMImpl/GEOMImpl_ImportDriver.cxx b/src/GEOMImpl/GEOMImpl_ImportDriver.cxx index 5f3fef221..fb4d4e0f3 100644 --- a/src/GEOMImpl/GEOMImpl_ImportDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_ImportDriver.cxx @@ -1,9 +1,10 @@ -using namespace std; -#include "GEOMImpl_ImportDriver.hxx" -#include "GEOMImpl_IImportExport.hxx" -#include "GEOMImpl_Types.hxx" -#include "GEOM_Function.hxx" +#include + +#include +#include +#include +#include #include "utilities.h" diff --git a/src/GEOMImpl/GEOMImpl_LineDriver.cxx b/src/GEOMImpl/GEOMImpl_LineDriver.cxx index 57903e3d2..b76dd1e5e 100644 --- a/src/GEOMImpl/GEOMImpl_LineDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_LineDriver.cxx @@ -1,9 +1,10 @@ -using namespace std; -#include "GEOMImpl_LineDriver.hxx" -#include "GEOMImpl_ILine.hxx" -#include "GEOMImpl_Types.hxx" -#include "GEOM_Function.hxx" +#include + +#include +#include +#include +#include #include #include diff --git a/src/GEOMImpl/GEOMImpl_MarkerDriver.cxx b/src/GEOMImpl/GEOMImpl_MarkerDriver.cxx index e5594d16e..1f1f653da 100644 --- a/src/GEOMImpl/GEOMImpl_MarkerDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_MarkerDriver.cxx @@ -1,9 +1,10 @@ -using namespace std; -#include "GEOMImpl_MarkerDriver.hxx" -#include "GEOMImpl_IMarker.hxx" -#include "GEOMImpl_Types.hxx" -#include "GEOM_Function.hxx" +#include + +#include +#include +#include +#include #include #include diff --git a/src/GEOMImpl/GEOMImpl_MeasureDriver.cxx b/src/GEOMImpl/GEOMImpl_MeasureDriver.cxx index c2b5a15d3..79f5fccdc 100644 --- a/src/GEOMImpl/GEOMImpl_MeasureDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_MeasureDriver.cxx @@ -1,10 +1,11 @@ -using namespace std; -#include "GEOMImpl_MeasureDriver.hxx" -#include "GEOMImpl_IMeasure.hxx" -#include "GEOMImpl_IMeasureOperations.hxx" -#include "GEOMImpl_Types.hxx" -#include "GEOM_Function.hxx" +#include + +#include +#include +#include +#include +#include #include #include diff --git a/src/GEOMImpl/GEOMImpl_MirrorDriver.cxx b/src/GEOMImpl/GEOMImpl_MirrorDriver.cxx index fefb1531d..20303383f 100644 --- a/src/GEOMImpl/GEOMImpl_MirrorDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_MirrorDriver.cxx @@ -1,10 +1,11 @@ -using namespace std; -#include "GEOMImpl_MirrorDriver.hxx" +#include + +#include #include #include -#include "GEOM_Function.hxx" +#include #include #include diff --git a/src/GEOMImpl/GEOMImpl_OffsetDriver.cxx b/src/GEOMImpl/GEOMImpl_OffsetDriver.cxx index 5d82b97b4..5716e5aad 100644 --- a/src/GEOMImpl/GEOMImpl_OffsetDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_OffsetDriver.cxx @@ -1,9 +1,10 @@ -using namespace std; -#include "GEOMImpl_OffsetDriver.hxx" -#include "GEOMImpl_IOffset.hxx" -#include "GEOMImpl_Types.hxx" -#include "GEOM_Function.hxx" +#include + +#include +#include +#include +#include #include #include diff --git a/src/GEOMImpl/GEOMImpl_PartitionDriver.cxx b/src/GEOMImpl/GEOMImpl_PartitionDriver.cxx index 61f3fde20..1f44ec42b 100644 --- a/src/GEOMImpl/GEOMImpl_PartitionDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_PartitionDriver.cxx @@ -1,11 +1,12 @@ -using namespace std; -#include "GEOMImpl_PartitionDriver.hxx" -#include "GEOMImpl_IPartition.hxx" -#include "GEOMImpl_Types.hxx" +#include -#include "GEOM_Object.hxx" -#include "GEOM_Function.hxx" +#include +#include +#include + +#include +#include #include diff --git a/src/GEOMImpl/GEOMImpl_PipeDriver.cxx b/src/GEOMImpl/GEOMImpl_PipeDriver.cxx index 54b81eddc..21c0195d9 100644 --- a/src/GEOMImpl/GEOMImpl_PipeDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_PipeDriver.cxx @@ -1,9 +1,10 @@ -using namespace std; -#include "GEOMImpl_PipeDriver.hxx" -#include "GEOMImpl_IPipe.hxx" -#include "GEOMImpl_Types.hxx" -#include "GEOM_Function.hxx" +#include + +#include +#include +#include +#include #include #include diff --git a/src/GEOMImpl/GEOMImpl_PlaneDriver.cxx b/src/GEOMImpl/GEOMImpl_PlaneDriver.cxx index 510d7a291..0fcf0c36b 100644 --- a/src/GEOMImpl/GEOMImpl_PlaneDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_PlaneDriver.cxx @@ -1,9 +1,10 @@ -using namespace std; -#include "GEOMImpl_PlaneDriver.hxx" -#include "GEOMImpl_IPlane.hxx" -#include "GEOMImpl_Types.hxx" -#include "GEOM_Function.hxx" +#include + +#include +#include +#include +#include #include #include diff --git a/src/GEOMImpl/GEOMImpl_PointDriver.cxx b/src/GEOMImpl/GEOMImpl_PointDriver.cxx index 98a839b58..e7e529bde 100644 --- a/src/GEOMImpl/GEOMImpl_PointDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_PointDriver.cxx @@ -1,9 +1,10 @@ -using namespace std; -#include "GEOMImpl_PointDriver.hxx" -#include "GEOMImpl_IPoint.hxx" -#include "GEOMImpl_Types.hxx" -#include "GEOM_Function.hxx" +#include + +#include +#include +#include +#include #include #include diff --git a/src/GEOMImpl/GEOMImpl_PolylineDriver.cxx b/src/GEOMImpl/GEOMImpl_PolylineDriver.cxx index 83dde5be4..64619ee30 100644 --- a/src/GEOMImpl/GEOMImpl_PolylineDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_PolylineDriver.cxx @@ -1,9 +1,10 @@ -using namespace std; -#include "GEOMImpl_PolylineDriver.hxx" -#include "GEOMImpl_IPolyline.hxx" -#include "GEOMImpl_Types.hxx" -#include "GEOM_Function.hxx" +#include + +#include +#include +#include +#include #include #include diff --git a/src/GEOMImpl/GEOMImpl_PositionDriver.cxx b/src/GEOMImpl/GEOMImpl_PositionDriver.cxx index 8bbf2e3bd..c28ec1a99 100644 --- a/src/GEOMImpl/GEOMImpl_PositionDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_PositionDriver.cxx @@ -1,9 +1,10 @@ -using namespace std; -#include "GEOMImpl_PositionDriver.hxx" -#include "GEOMImpl_IPosition.hxx" -#include "GEOMImpl_Types.hxx" -#include "GEOM_Function.hxx" +#include + +#include +#include +#include +#include #include #include diff --git a/src/GEOMImpl/GEOMImpl_PrismDriver.cxx b/src/GEOMImpl/GEOMImpl_PrismDriver.cxx index 71b460c5a..5da11dc6a 100644 --- a/src/GEOMImpl/GEOMImpl_PrismDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_PrismDriver.cxx @@ -1,9 +1,10 @@ -using namespace std; -#include "GEOMImpl_PrismDriver.hxx" -#include "GEOMImpl_IPrism.hxx" -#include "GEOMImpl_Types.hxx" -#include "GEOM_Function.hxx" +#include + +#include +#include +#include +#include #include #include diff --git a/src/GEOMImpl/GEOMImpl_RevolutionDriver.cxx b/src/GEOMImpl/GEOMImpl_RevolutionDriver.cxx index f5ca6cf2a..1eb85b835 100644 --- a/src/GEOMImpl/GEOMImpl_RevolutionDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_RevolutionDriver.cxx @@ -1,9 +1,10 @@ -using namespace std; -#include "GEOMImpl_RevolutionDriver.hxx" -#include "GEOMImpl_IRevolution.hxx" -#include "GEOMImpl_Types.hxx" -#include "GEOM_Function.hxx" +#include + +#include +#include +#include +#include #include #include diff --git a/src/GEOMImpl/GEOMImpl_RotateDriver.cxx b/src/GEOMImpl/GEOMImpl_RotateDriver.cxx index 4f656dd5e..c3ae0aecb 100644 --- a/src/GEOMImpl/GEOMImpl_RotateDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_RotateDriver.cxx @@ -1,9 +1,10 @@ -using namespace std; -#include "GEOMImpl_RotateDriver.hxx" +#include + +#include #include #include -#include "GEOM_Function.hxx" +#include #include #include #include @@ -149,7 +150,8 @@ Standard_Integer GEOMImpl_RotateDriver::Execute(TFunction_Logbook& log) const } Handle(Geom_Line) Line = new Geom_Line(AX1); - gp_Pnt P2 = GeomAPI_ProjectPointOnCurve( P1, Line ) ; + GeomAPI_ProjectPointOnCurve aPrjTool( P1, Line ) ; + gp_Pnt P2 = aPrjTool.NearestPoint(); if ( P1.IsEqual(P2, Precision::Confusion() ) ) return 0; diff --git a/src/GEOMImpl/GEOMImpl_ScaleDriver.cxx b/src/GEOMImpl/GEOMImpl_ScaleDriver.cxx index 4e707cb72..01106835f 100644 --- a/src/GEOMImpl/GEOMImpl_ScaleDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_ScaleDriver.cxx @@ -1,9 +1,10 @@ -using namespace std; -#include "GEOMImpl_ScaleDriver.hxx" -#include "GEOMImpl_IScale.hxx" -#include "GEOMImpl_Types.hxx" -#include "GEOM_Function.hxx" +#include + +#include +#include +#include +#include #include #include diff --git a/src/GEOMImpl/GEOMImpl_ShapeDriver.cxx b/src/GEOMImpl/GEOMImpl_ShapeDriver.cxx index df96b659d..b2c57e879 100644 --- a/src/GEOMImpl/GEOMImpl_ShapeDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_ShapeDriver.cxx @@ -1,10 +1,11 @@ -using namespace std; -#include "GEOMImpl_ShapeDriver.hxx" -#include "GEOMImpl_IShapes.hxx" -#include "GEOMImpl_IShapesOperations.hxx" -#include "GEOMImpl_Types.hxx" -#include "GEOM_Function.hxx" +#include + +#include +#include +#include +#include +#include #include #include diff --git a/src/GEOMImpl/GEOMImpl_SketcherDriver.cxx b/src/GEOMImpl/GEOMImpl_SketcherDriver.cxx index b0822626a..eb34dcb0d 100644 --- a/src/GEOMImpl/GEOMImpl_SketcherDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_SketcherDriver.cxx @@ -1,9 +1,10 @@ -using namespace std; -#include "GEOMImpl_SketcherDriver.hxx" -#include "GEOMImpl_ISketcher.hxx" -#include "GEOMImpl_Types.hxx" -#include "GEOM_Function.hxx" +#include + +#include +#include +#include +#include #include #include diff --git a/src/GEOMImpl/GEOMImpl_SphereDriver.cxx b/src/GEOMImpl/GEOMImpl_SphereDriver.cxx index af97bbc45..c5fbb6c7c 100644 --- a/src/GEOMImpl/GEOMImpl_SphereDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_SphereDriver.cxx @@ -1,9 +1,10 @@ -using namespace std; -#include "GEOMImpl_SphereDriver.hxx" -#include "GEOMImpl_ISphere.hxx" -#include "GEOMImpl_Types.hxx" -#include "GEOM_Function.hxx" +#include + +#include +#include +#include +#include #include #include diff --git a/src/GEOMImpl/GEOMImpl_SplineDriver.cxx b/src/GEOMImpl/GEOMImpl_SplineDriver.cxx index f63021373..2bd1c0d60 100644 --- a/src/GEOMImpl/GEOMImpl_SplineDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_SplineDriver.cxx @@ -1,9 +1,10 @@ -using namespace std; -#include "GEOMImpl_SplineDriver.hxx" -#include "GEOMImpl_ISpline.hxx" -#include "GEOMImpl_Types.hxx" -#include "GEOM_Function.hxx" +#include + +#include +#include +#include +#include #include #include @@ -95,7 +96,7 @@ Standard_Integer GEOMImpl_SplineDriver::Execute(TFunction_Logbook& log) const GeomAPI_Interpolate GBC (aHCurvePoints, Standard_False, gp::Resolution()); GBC.Perform(); if (GBC.IsDone()) - aShape = BRepBuilderAPI_MakeEdge(GBC).Edge(); + aShape = BRepBuilderAPI_MakeEdge(GBC.Curve()).Edge(); else return 0; } diff --git a/src/GEOMImpl/GEOMImpl_Template.cxx b/src/GEOMImpl/GEOMImpl_Template.cxx index 1db7d00d3..4bdb57128 100644 --- a/src/GEOMImpl/GEOMImpl_Template.cxx +++ b/src/GEOMImpl/GEOMImpl_Template.cxx @@ -1,7 +1,8 @@ -using namespace std; -#include "GEOMImpl_Template.hxx" -#include "GEOM_Function.hxx" +#include + +#include +#include #include //======================================================================= diff --git a/src/GEOMImpl/GEOMImpl_TorusDriver.cxx b/src/GEOMImpl/GEOMImpl_TorusDriver.cxx index 17b93936c..9bcfc0219 100644 --- a/src/GEOMImpl/GEOMImpl_TorusDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_TorusDriver.cxx @@ -1,9 +1,10 @@ -using namespace std; -#include "GEOMImpl_TorusDriver.hxx" -#include "GEOMImpl_ITorus.hxx" -#include "GEOMImpl_Types.hxx" -#include "GEOM_Function.hxx" +#include + +#include +#include +#include +#include #include #include diff --git a/src/GEOMImpl/GEOMImpl_TranslateDriver.cxx b/src/GEOMImpl/GEOMImpl_TranslateDriver.cxx index 699209886..7fc447bb3 100644 --- a/src/GEOMImpl/GEOMImpl_TranslateDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_TranslateDriver.cxx @@ -1,9 +1,10 @@ -using namespace std; -#include "GEOMImpl_TranslateDriver.hxx" +#include + +#include #include #include -#include "GEOM_Function.hxx" +#include #include #include #include diff --git a/src/GEOMImpl/GEOMImpl_VectorDriver.cxx b/src/GEOMImpl/GEOMImpl_VectorDriver.cxx index 8544418ee..1c9602cc9 100644 --- a/src/GEOMImpl/GEOMImpl_VectorDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_VectorDriver.cxx @@ -1,9 +1,9 @@ +#include -using namespace std; -#include "GEOMImpl_VectorDriver.hxx" -#include "GEOMImpl_IVector.hxx" -#include "GEOMImpl_Types.hxx" -#include "GEOM_Function.hxx" +#include +#include +#include +#include #include #include diff --git a/src/IGESExport/IGESExport.cxx b/src/IGESExport/IGESExport.cxx index 8ce7f9933..463f31c96 100644 --- a/src/IGESExport/IGESExport.cxx +++ b/src/IGESExport/IGESExport.cxx @@ -12,6 +12,12 @@ #include #include +#ifdef WNT +#include +#else +#define SALOME_WNT_EXPORT +#endif + //============================================================================= /*! * @@ -20,9 +26,7 @@ extern "C" { -#ifdef WNT - __declspec(__dllexport) -#endif +SALOME_WNT_EXPORT int Export(const TopoDS_Shape& theShape, const TCollection_AsciiString& theFileName) { MESSAGE("Export IGES into file " << theFileName.ToCString()); diff --git a/src/IGESImport/IGESImport.cxx b/src/IGESImport/IGESImport.cxx index f0cb68c8b..840f25835 100644 --- a/src/IGESImport/IGESImport.cxx +++ b/src/IGESImport/IGESImport.cxx @@ -11,6 +11,12 @@ #include #include +#ifdef WNT +#include +#else +#define SALOME_WNT_EXPORT +#endif + //============================================================================= /*! * @@ -19,9 +25,7 @@ extern "C" { -#ifdef WNT - __declspec(__dllexport) -#endif +SALOME_WNT_EXPORT TopoDS_Shape Import (const TCollection_AsciiString& theFileName, TCollection_AsciiString& theError) { diff --git a/src/NMTTools/NMTTools_PaveFiller.cxx b/src/NMTTools/NMTTools_PaveFiller.cxx index 0b0c3c521..7e0ded5f8 100644 --- a/src/NMTTools/NMTTools_PaveFiller.cxx +++ b/src/NMTTools/NMTTools_PaveFiller.cxx @@ -206,7 +206,7 @@ aDEP.Do(); // } - catch (BOPTColStd_Failure& x) { + catch (BOPTColStd_Failure& /*x*/) { //QQ MESSAGE(x.Message() << flush); } } diff --git a/src/OBJECT/GEOM_AISShape.cxx b/src/OBJECT/GEOM_AISShape.cxx index c442b4c6c..eb2b741d9 100644 --- a/src/OBJECT/GEOM_AISShape.cxx +++ b/src/OBJECT/GEOM_AISShape.cxx @@ -26,7 +26,6 @@ // Module : GEOM // $Header$ -using namespace std; /*! \class GEOM_AISShape GEOM_AISShape.hxx \brief .... @@ -59,6 +58,8 @@ using namespace std; #include #include +using namespace std; + static void getEntityOwners( const Handle(AIS_InteractiveObject)& theObj, const Handle(AIS_InteractiveContext)& theIC, SelectMgr_IndexedMapOfOwner& theMap ) diff --git a/src/OBJECT/GEOM_Actor.cxx b/src/OBJECT/GEOM_Actor.cxx index 0ebbf32f4..e16b174ba 100644 --- a/src/OBJECT/GEOM_Actor.cxx +++ b/src/OBJECT/GEOM_Actor.cxx @@ -185,7 +185,7 @@ void GEOM_Actor::SetShadingProperty(vtkProperty* Prop) { // Mapper creating function //------------------------------------------------------------- void GEOM_Actor::CreateMapper(int theMode) { - this->myIsInfinite = myShape.Infinite(); + this->myIsInfinite = (bool)myShape.Infinite(); if(myShape.ShapeType() == TopAbs_VERTEX) { gp_Pnt aPnt = BRep_Tool::Pnt(TopoDS::Vertex(myShape)); this->SetPosition(aPnt.X(),aPnt.Y(),aPnt.Z()); diff --git a/src/OBJECT/GEOM_Actor.h b/src/OBJECT/GEOM_Actor.h index ebd49b780..7229b9e2b 100644 --- a/src/OBJECT/GEOM_Actor.h +++ b/src/OBJECT/GEOM_Actor.h @@ -38,13 +38,13 @@ class vtkCamera; class TopoDS_Shape; -#ifdef _WIN_32 -#define VTKOCC_EXPORT __declspec (dllexport) +#ifdef WNT +#include #else -#define VTKOCC_EXPORT +#define SALOME_WNT_EXPORT #endif -class VTKOCC_EXPORT GEOM_Actor : public SALOME_Actor { +class SALOME_WNT_EXPORT GEOM_Actor : public SALOME_Actor { public: vtkTypeMacro(GEOM_Actor,SALOME_Actor); diff --git a/src/OBJECT/GEOM_AssemblyBuilder.cxx b/src/OBJECT/GEOM_AssemblyBuilder.cxx index 6c0f4df92..a44aa7dbf 100644 --- a/src/OBJECT/GEOM_AssemblyBuilder.cxx +++ b/src/OBJECT/GEOM_AssemblyBuilder.cxx @@ -26,7 +26,6 @@ // Module : GEOM // $Header$ -using namespace std; /*! \class GEOM_AssemblyBuilder GEOM_AssemblyBuilder.h \brief .... @@ -48,6 +47,7 @@ using namespace std; #include #include +using namespace std; // SALOME #define MAX2(X, Y) ( Abs(X) > Abs(Y)? Abs(X) : Abs(Y) ) diff --git a/src/OBJECT/GEOM_AssemblyBuilder.h b/src/OBJECT/GEOM_AssemblyBuilder.h index a396b9e25..4436b0b01 100644 --- a/src/OBJECT/GEOM_AssemblyBuilder.h +++ b/src/OBJECT/GEOM_AssemblyBuilder.h @@ -34,7 +34,13 @@ #include #include -class GEOM_AssemblyBuilder { +#ifdef WNT +#include +#else +#define SALOME_WNT_EXPORT +#endif + +class SALOME_WNT_EXPORT GEOM_AssemblyBuilder { private: diff --git a/src/OBJECT/GEOM_InteractiveObject.cxx b/src/OBJECT/GEOM_InteractiveObject.cxx index 00c179a21..caa8567e5 100644 --- a/src/OBJECT/GEOM_InteractiveObject.cxx +++ b/src/OBJECT/GEOM_InteractiveObject.cxx @@ -26,7 +26,6 @@ // Module : GEOM // $Header$ -using namespace std; /*! \class GEOM_InteractiveObject GEOM_InteractiveObject.hxx \brief .... @@ -34,6 +33,8 @@ using namespace std; #include "GEOM_InteractiveObject.ixx" +using namespace std; + GEOM_InteractiveObject::GEOM_InteractiveObject() : SALOME_InteractiveObject() { diff --git a/src/OBJECT/GEOM_VTKTrihedron.hxx b/src/OBJECT/GEOM_VTKTrihedron.hxx index 165fbe8e6..92332c8c6 100644 --- a/src/OBJECT/GEOM_VTKTrihedron.hxx +++ b/src/OBJECT/GEOM_VTKTrihedron.hxx @@ -33,6 +33,13 @@ #include "SALOME_Actor.h" #include "VTKViewer_Trihedron.h" +#ifdef WNT +#include +#else +#define SALOME_WNT_EXPORT +#endif + + class vtkActorCollection; class vtkRenderer; class vtkPolyDataMapper; @@ -43,7 +50,7 @@ class vtkPolyDataMapper; Placement of trihedron is chahged with SetPlacement() method */ -class GEOM_VTKTrihedron : public SALOME_Actor +class SALOME_WNT_EXPORT GEOM_VTKTrihedron : public SALOME_Actor { protected: diff --git a/src/SKETCHER/Sketcher_Profile.cxx b/src/SKETCHER/Sketcher_Profile.cxx index acd72451f..3f320dd0c 100644 --- a/src/SKETCHER/Sketcher_Profile.cxx +++ b/src/SKETCHER/Sketcher_Profile.cxx @@ -26,8 +26,9 @@ // Module : GEOM // $Header: -using namespace std; -#include "Sketcher_Profile.hxx" +#include + +#include #include #include @@ -90,267 +91,272 @@ Sketcher_Profile::Sketcher_Profile(const char* aCmd) TCollection_AsciiString aCommand(CORBA::string_dup(aCmd)); TCollection_AsciiString aToken = aCommand.Token(":", 1); int n = 0; - TCollection_AsciiString aTab[aCommand.Length()]; - while(aToken.Length() != 0) { - if(aCommand.Token(":", n + 1).Length() > 0) - aTab[n] = aCommand.Token(":", n + 1); - aToken = aCommand.Token(":", ++n); - } - n = n - 1; - - while(i < n) { - Standard_Real length = 0, radius = 0, angle = 0; - move = point; - - int n1 = 0; - TCollection_AsciiString a[aTab[0].Length()]; - aToken = aTab[i].Token(" ", 1); + // porting to WNT + TCollection_AsciiString* aTab = 0; + if ( aCommand.Length() ) + { + aTab = new TCollection_AsciiString[ aCommand.Length() ]; while(aToken.Length() != 0) { - if(aTab[i].Token(" ", n1 + 1).Length() > 0) - a[n1] = aTab[i].Token(" ", n1 + 1); - aToken = aTab[i].Token(" ", ++n1); + if(aCommand.Token(":", n + 1).Length() > 0) + aTab[n] = aCommand.Token(":", n + 1); + aToken = aCommand.Token(":", ++n); } - n1 = n1 - 1; - - switch(a[0].Value(1)) - { - case 'F': - { - if (n1 != 3) goto badargs; - if (!first) { - MESSAGE("profile : The F instruction must precede all moves"); - return; - } - x0 = x = a[1].RealValue(); - y0 = y = a[2].RealValue(); - stayfirst = Standard_True; - break; - } - case 'O': - { - if (n1 != 4) goto badargs; - P.SetLocation(gp_Pnt(a[1].RealValue(), a[2].RealValue(), a[3].RealValue())); - stayfirst = Standard_True; - break; - } - case 'P': - { - if (n1 != 7) goto badargs; - gp_Vec vn(a[1].RealValue(), a[2].RealValue(), a[3].RealValue()); - gp_Vec vx(a[4].RealValue(), a[5].RealValue(), a[6].RealValue()); - if (vn.Magnitude() <= Precision::Confusion() || vx.Magnitude() <= Precision::Confusion()) { - MESSAGE("profile : null direction"); - return; - } - gp_Ax2 ax(P.Location(), vn, vx); - P.SetPosition(ax); - stayfirst = Standard_True; - break; - } - case 'X': - { - if (n1 != 2) goto badargs; - length = a[1].RealValue(); - if (a[0] == "XX") - length -= x; - dx = 1; dy = 0; - move = line; - break; - } - case 'Y': - { - if (n1 != 2) goto badargs; - length = a[1].RealValue(); - if (a[0] == "YY") - length -= y; - dx = 0; dy = 1; - move = line; - break; - } - case 'L': - { - if (n1 != 2) goto badargs; - length = a[1].RealValue(); - if (Abs(length) > Precision::Confusion()) - move = line; - else - move = none; - break; - } - case 'T': - { - if (n1 != 3) goto badargs; - Standard_Real vx = a[1].RealValue(); - Standard_Real vy = a[2].RealValue(); - if (a[0] == "TT") { - vx -= x; - vy -= y; - } - length = Sqrt(vx * vx + vy * vy); - if (length > Precision::Confusion()) { - move = line; - dx = vx / length; - dy = vy / length; - } - else - move = none; - break; - } - case 'R': - { - if (n1 != 2) goto badargs; - angle = a[1].RealValue() * PI180; - if (a[0] == "RR") { - dx = Cos(angle); - dy = Sin(angle); - } - else { - Standard_Real c = Cos(angle); - Standard_Real s = Sin(angle); - Standard_Real t = c * dx - s * dy; - dy = s * dx + c * dy; - dx = t; - } - break; - } - case 'D': - { - if (n1 != 3) goto badargs; - Standard_Real vx = a[1].RealValue(); - Standard_Real vy = a[2].RealValue(); - length = Sqrt(vx * vx + vy * vy); - if (length > Precision::Confusion()) { - dx = vx / length; - dy = vy / length; - } - else - move = none; - break; - } - case 'C': - { - if (n1 != 3) goto badargs; - radius = a[1].RealValue(); - if (Abs(radius) > Precision::Confusion()) { - angle = a[2].RealValue() * PI180; - move = circle; - } - else - move = none; - break; - } - case 'I': - { - if (n1 != 2) goto badargs; - length = a[1].RealValue(); - if (a[0] == "IX") { - if (Abs(dx) < Precision::Confusion()) { - MESSAGE("profile : cannot intersect, arg "< Precision::Confusion()) - move = line; - else - move = none; - break; - } - case 'W': - { - if (a[0] == "WW") - close = Standard_True; - else if(a[0] == "WF") { - close = Standard_True; - face = Standard_True; - } - i = n - 1; - break; + n = n - 1; + } + if ( aTab && aTab[0].Length() ) + while(i < n) { + Standard_Real length = 0, radius = 0, angle = 0; + move = point; + + int n1 = 0; + TCollection_AsciiString* a = new TCollection_AsciiString[ aTab[0].Length() ]; + aToken = aTab[i].Token(" ", 1); + while(aToken.Length() != 0) { + if(aTab[i].Token(" ", n1 + 1).Length() > 0) + a[n1] = aTab[i].Token(" ", n1 + 1); + aToken = aTab[i].Token(" ", ++n1); } - default: + n1 = n1 - 1; + + switch(a[0].Value(1)) { - MESSAGE("profile : unknown code "< Precision::Confusion()) + move = line; + else + move = none; + break; + } + case 'T': + { + if (n1 != 3) goto badargs; + Standard_Real vx = a[1].RealValue(); + Standard_Real vy = a[2].RealValue(); + if (a[0] == "TT") { + vx -= x; + vy -= y; + } + length = Sqrt(vx * vx + vy * vy); + if (length > Precision::Confusion()) { + move = line; + dx = vx / length; + dy = vy / length; + } + else + move = none; + break; + } + case 'R': + { + if (n1 != 2) goto badargs; + angle = a[1].RealValue() * PI180; + if (a[0] == "RR") { + dx = Cos(angle); + dy = Sin(angle); + } + else { + Standard_Real c = Cos(angle); + Standard_Real s = Sin(angle); + Standard_Real t = c * dx - s * dy; + dy = s * dx + c * dy; + dx = t; + } + break; + } + case 'D': + { + if (n1 != 3) goto badargs; + Standard_Real vx = a[1].RealValue(); + Standard_Real vy = a[2].RealValue(); + length = Sqrt(vx * vx + vy * vy); + if (length > Precision::Confusion()) { + dx = vx / length; + dy = vy / length; + } + else + move = none; + break; + } + case 'C': + { + if (n1 != 3) goto badargs; + radius = a[1].RealValue(); + if (Abs(radius) > Precision::Confusion()) { + angle = a[2].RealValue() * PI180; + move = circle; + } + else + move = none; + break; + } + case 'I': + { + if (n1 != 2) goto badargs; + length = a[1].RealValue(); + if (a[0] == "IX") { + if (Abs(dx) < Precision::Confusion()) { + MESSAGE("profile : cannot intersect, arg "< Precision::Confusion()) + move = line; + else + move = none; + break; + } + case 'W': + { + if (a[0] == "WW") + close = Standard_True; + else if(a[0] == "WF") { + close = Standard_True; + face = Standard_True; + } + i = n - 1; + break; + } + default: + { + MESSAGE("profile : unknown code "<D1(angle,p,v); - x = p.X(); - y = p.Y(); - dx = v.X() / radius; - dy = v.Y() / radius; - break; + MW.Add(ME); + gp_Pnt2d p; + gp_Vec2d v; + c->D1(angle,p,v); + x = p.X(); + y = p.Y(); + dx = v.X() / radius; + dy = v.Y() / radius; + break; } case point: { - MP = BRepBuilderAPI_MakeVertex(gp_Pnt(x, y, 0.0)); - break; + MP = BRepBuilderAPI_MakeVertex(gp_Pnt(x, y, 0.0)); + break; } case none: { - i = n - 1; - break; + i = n - 1; + break; } } - + // update first first = stayfirst; stayfirst = Standard_False; - + if(!(dx == 0 && dy == 0)) myLastDir.SetCoord(dx, dy, 0.0); else return; myLastPoint.SetX(x); myLastPoint.SetY(y); - + // next segment.... i++; if ((i == n) && close) { @@ -360,13 +366,16 @@ Sketcher_Profile::Sketcher_Profile(const char* aCmd) length = Sqrt(dx * dx + dy * dy); move = line; if (length > Precision::Confusion()) { - dx = dx / length; - dy = dy / length; - goto again; + dx = dx / length; + dy = dy / length; + goto again; } } + delete a; } - + delete aTab; + aTab = 0; + // get the result, face or wire if (move == none) { return; diff --git a/src/SKETCHER/Sketcher_Profile.hxx b/src/SKETCHER/Sketcher_Profile.hxx index f8389f3aa..79762a9d1 100644 --- a/src/SKETCHER/Sketcher_Profile.hxx +++ b/src/SKETCHER/Sketcher_Profile.hxx @@ -34,8 +34,8 @@ class Sketcher_Profile { public: - Sketcher_Profile(); - Sketcher_Profile(const char* aCmd); + Standard_EXPORT Sketcher_Profile(); + Standard_EXPORT Sketcher_Profile(const char* aCmd); private: gp_Pnt myLastPoint; @@ -45,10 +45,10 @@ private: bool myOK; public: - gp_Pnt GetLastPoint(){return myLastPoint;}; - gp_Dir GetLastDir(){return myLastDir;}; + Standard_EXPORT gp_Pnt GetLastPoint(){return myLastPoint;}; + Standard_EXPORT gp_Dir GetLastDir(){return myLastDir;}; - const TopoDS_Shape& GetShape(){return myShape;}; - bool IsDone(){return myOK;}; + Standard_EXPORT const TopoDS_Shape& GetShape(){return myShape;}; + Standard_EXPORT bool IsDone(){return myOK;}; }; diff --git a/src/STEPExport/STEPExport.cxx b/src/STEPExport/STEPExport.cxx index 83c88215b..7614e4bda 100644 --- a/src/STEPExport/STEPExport.cxx +++ b/src/STEPExport/STEPExport.cxx @@ -12,6 +12,12 @@ #include #include +#ifdef WNT +#include +#else +#define SALOME_WNT_EXPORT +#endif + //============================================================================= /*! * @@ -20,9 +26,7 @@ extern "C" { -#ifdef WNT - __declspec(__dllexport) -#endif +SALOME_WNT_EXPORT int Export(const TopoDS_Shape& theShape, const TCollection_AsciiString& theFileName) { MESSAGE("Export STEP into file " << theFileName.ToCString()); diff --git a/src/STEPImport/STEPImport.cxx b/src/STEPImport/STEPImport.cxx index 02a0dd823..653524126 100644 --- a/src/STEPImport/STEPImport.cxx +++ b/src/STEPImport/STEPImport.cxx @@ -17,6 +17,12 @@ #include // CAREFUL ! position of this file is critic : see Lucien PIGNOLONI / OCC +#ifdef WNT +#include +#else +#define SALOME_WNT_EXPORT +#endif + //============================================================================= /*! * Import() @@ -25,9 +31,7 @@ extern "C" { -#ifdef WNT - __declspec(__dllexport) -#endif +SALOME_WNT_EXPORT TopoDS_Shape Import (const TCollection_AsciiString& theFileName, TCollection_AsciiString& theError) {