]> SALOME platform Git repositories - modules/geom.git/commitdiff
Salome HOME
ENV: Windows porting.
authorenv <env@opencascade.com>
Thu, 11 Aug 2005 04:43:57 +0000 (04:43 +0000)
committerenv <env@opencascade.com>
Thu, 11 Aug 2005 04:43:57 +0000 (04:43 +0000)
80 files changed:
src/GEOMImpl/GEOMImpl_ArcDriver.cxx
src/GEOMImpl/GEOMImpl_Block6Explorer.cxx
src/GEOMImpl/GEOMImpl_BlockDriver.cxx
src/GEOMImpl/GEOMImpl_BooleanDriver.cxx
src/GEOMImpl/GEOMImpl_BoxDriver.cxx
src/GEOMImpl/GEOMImpl_ChamferDriver.cxx
src/GEOMImpl/GEOMImpl_CircleDriver.cxx
src/GEOMImpl/GEOMImpl_ConeDriver.cxx
src/GEOMImpl/GEOMImpl_CopyDriver.cxx
src/GEOMImpl/GEOMImpl_CylinderDriver.cxx
src/GEOMImpl/GEOMImpl_EllipseDriver.cxx
src/GEOMImpl/GEOMImpl_ExportDriver.cxx
src/GEOMImpl/GEOMImpl_FilletDriver.cxx
src/GEOMImpl/GEOMImpl_FillingDriver.cxx
src/GEOMImpl/GEOMImpl_Gen.cxx
src/GEOMImpl/GEOMImpl_Gen.hxx
src/GEOMImpl/GEOMImpl_GlueDriver.cxx
src/GEOMImpl/GEOMImpl_HealingDriver.cxx
src/GEOMImpl/GEOMImpl_I3DPrimOperations.cxx
src/GEOMImpl/GEOMImpl_I3DPrimOperations.hxx
src/GEOMImpl/GEOMImpl_IBasicOperations.cxx
src/GEOMImpl/GEOMImpl_IBasicOperations.hxx
src/GEOMImpl/GEOMImpl_IBlocksOperations.cxx
src/GEOMImpl/GEOMImpl_IBlocksOperations.hxx
src/GEOMImpl/GEOMImpl_IBooleanOperations.cxx
src/GEOMImpl/GEOMImpl_IBooleanOperations.hxx
src/GEOMImpl/GEOMImpl_ICurvesOperations.cxx
src/GEOMImpl/GEOMImpl_ICurvesOperations.hxx
src/GEOMImpl/GEOMImpl_IGroupOperations.cxx
src/GEOMImpl/GEOMImpl_IGroupOperations.hxx
src/GEOMImpl/GEOMImpl_IHealingOperations.cxx
src/GEOMImpl/GEOMImpl_IHealingOperations.hxx
src/GEOMImpl/GEOMImpl_IInsertOperations.cxx
src/GEOMImpl/GEOMImpl_IInsertOperations.hxx
src/GEOMImpl/GEOMImpl_ILocalOperations.cxx
src/GEOMImpl/GEOMImpl_ILocalOperations.hxx
src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx
src/GEOMImpl/GEOMImpl_IMeasureOperations.hxx
src/GEOMImpl/GEOMImpl_IShapesOperations.cxx
src/GEOMImpl/GEOMImpl_IShapesOperations.hxx
src/GEOMImpl/GEOMImpl_ITransformOperations.cxx
src/GEOMImpl/GEOMImpl_ITransformOperations.hxx
src/GEOMImpl/GEOMImpl_ImportDriver.cxx
src/GEOMImpl/GEOMImpl_LineDriver.cxx
src/GEOMImpl/GEOMImpl_MarkerDriver.cxx
src/GEOMImpl/GEOMImpl_MeasureDriver.cxx
src/GEOMImpl/GEOMImpl_MirrorDriver.cxx
src/GEOMImpl/GEOMImpl_OffsetDriver.cxx
src/GEOMImpl/GEOMImpl_PartitionDriver.cxx
src/GEOMImpl/GEOMImpl_PipeDriver.cxx
src/GEOMImpl/GEOMImpl_PlaneDriver.cxx
src/GEOMImpl/GEOMImpl_PointDriver.cxx
src/GEOMImpl/GEOMImpl_PolylineDriver.cxx
src/GEOMImpl/GEOMImpl_PositionDriver.cxx
src/GEOMImpl/GEOMImpl_PrismDriver.cxx
src/GEOMImpl/GEOMImpl_RevolutionDriver.cxx
src/GEOMImpl/GEOMImpl_RotateDriver.cxx
src/GEOMImpl/GEOMImpl_ScaleDriver.cxx
src/GEOMImpl/GEOMImpl_ShapeDriver.cxx
src/GEOMImpl/GEOMImpl_SketcherDriver.cxx
src/GEOMImpl/GEOMImpl_SphereDriver.cxx
src/GEOMImpl/GEOMImpl_SplineDriver.cxx
src/GEOMImpl/GEOMImpl_Template.cxx
src/GEOMImpl/GEOMImpl_TorusDriver.cxx
src/GEOMImpl/GEOMImpl_TranslateDriver.cxx
src/GEOMImpl/GEOMImpl_VectorDriver.cxx
src/IGESExport/IGESExport.cxx
src/IGESImport/IGESImport.cxx
src/NMTTools/NMTTools_PaveFiller.cxx
src/OBJECT/GEOM_AISShape.cxx
src/OBJECT/GEOM_Actor.cxx
src/OBJECT/GEOM_Actor.h
src/OBJECT/GEOM_AssemblyBuilder.cxx
src/OBJECT/GEOM_AssemblyBuilder.h
src/OBJECT/GEOM_InteractiveObject.cxx
src/OBJECT/GEOM_VTKTrihedron.hxx
src/SKETCHER/Sketcher_Profile.cxx
src/SKETCHER/Sketcher_Profile.hxx
src/STEPExport/STEPExport.cxx
src/STEPImport/STEPImport.cxx

index 2e8b5d7ec2b14f6881b0c546f50767f148b12fbb..c00640c072020e242f87ef779fecbc752c670845 100644 (file)
@@ -1,9 +1,10 @@
 
-using namespace std;
-#include "GEOMImpl_ArcDriver.hxx"
-#include "GEOMImpl_IArc.hxx"
-#include "GEOMImpl_Types.hxx"
-#include "GEOM_Function.hxx"
+#include <Standard_Stream.hxx>
+
+#include <GEOMImpl_ArcDriver.hxx>
+#include <GEOMImpl_IArc.hxx>
+#include <GEOMImpl_Types.hxx>
+#include <GEOM_Function.hxx>
 
 #include <BRepBuilderAPI_MakeEdge.hxx>
 #include <BRep_Tool.hxx>
index 1e73a5d3345d73d2cb09d3228ab658d0385dc85e..c660f5a33950ecec4cd25ef4f94df61e897f63da 100644 (file)
@@ -1,8 +1,8 @@
-using namespace std;
+#include <Standard_Stream.hxx>
 
 #include <BRepOffsetAPI_MakeFilling.hxx>
 
-#include "GEOMImpl_Block6Explorer.hxx"
+#include <GEOMImpl_Block6Explorer.hxx>
 
 #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 <myVertices> and <myEdges>
-  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()) {
index 65cdc29b234a02325ddd07e986bbfc2bd9024c65..c6527f70ea3e1e3444bf0160bb698cee68139c16 100644 (file)
@@ -1,22 +1,22 @@
 
-using namespace std;
+#include <Standard_Stream.hxx>
 
 #include <BRepOffsetAPI_MakeFilling.hxx>
 
-#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 <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 "GEOM_Function.hxx"
+#include <GEOM_Function.hxx>
 
-#include "ShHealOper_Sewing.hxx"
-#include "NMTAlgo_Splitter1.hxx"
-#include "BlockFix_BlockFixAPI.hxx"
+#include <ShHealOper_Sewing.hxx>
+#include <NMTAlgo_Splitter1.hxx>
+#include <BlockFix_BlockFixAPI.hxx>
 
 #include "utilities.h"
 
index 32599b5a382e2e04c55b67bf3712bf3229da994b..53be70dda518f4b5f9513fd21c1aa3632895ac28 100644 (file)
@@ -1,9 +1,10 @@
 
-using namespace std;
-#include "GEOMImpl_BooleanDriver.hxx"
-#include "GEOMImpl_IBoolean.hxx"
-#include "GEOMImpl_Types.hxx"
-#include "GEOM_Function.hxx"
+#include <Standard_Stream.hxx>
+
+#include <GEOMImpl_BooleanDriver.hxx>
+#include <GEOMImpl_IBoolean.hxx>
+#include <GEOMImpl_Types.hxx>
+#include <GEOM_Function.hxx>
 
 #include <BRepAlgo.hxx>
 #include <BRepAlgoAPI_Common.hxx>
index f89ccf678adb5d7e744c1ec5d2291e2adc329413..0ea8ec59489f9a05c87c8bc67d472698dc62108c 100644 (file)
@@ -1,9 +1,10 @@
 
-using namespace std;
-#include "GEOMImpl_BoxDriver.hxx"
-#include "GEOMImpl_IBox.hxx"
-#include "GEOMImpl_Types.hxx"
-#include "GEOM_Function.hxx"
+#include <Standard_Stream.hxx>
+
+#include <GEOMImpl_BoxDriver.hxx>
+#include <GEOMImpl_IBox.hxx>
+#include <GEOMImpl_Types.hxx>
+#include <GEOM_Function.hxx>
 
 #include <BRepPrimAPI_MakeBox.hxx>
 #include <BRep_Tool.hxx>
index d28ed4633a1f3d3c2d511522308c04fa84a9bac6..2d1714931b4fbdee032bbd728dc7b0f2effccf7f 100644 (file)
@@ -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 <Standard_Stream.hxx>
+
+#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 <BRep_Tool.hxx>
 #include <BRepTools.hxx>
index caa7ac4c3a02c8afe6d2341d80be8a733e2ee7f0..998c6384d8018340c93800de4b3a3249eb33cf60 100644 (file)
@@ -1,9 +1,10 @@
 
-using namespace std;
-#include "GEOMImpl_CircleDriver.hxx"
-#include "GEOMImpl_ICircle.hxx"
-#include "GEOMImpl_Types.hxx"
-#include "GEOM_Function.hxx"
+#include <Standard_Stream.hxx>
+
+#include <GEOMImpl_CircleDriver.hxx>
+#include <GEOMImpl_ICircle.hxx>
+#include <GEOMImpl_Types.hxx>
+#include <GEOM_Function.hxx>
 
 #include <BRepBuilderAPI_MakeEdge.hxx>
 #include <BRep_Tool.hxx>
index a4486bf9802a7fea9cc51733ce48ce01d11b3395..57e8f5381d6052ab61659bb9afe6fff38f1bbdee 100644 (file)
@@ -1,9 +1,10 @@
 
-using namespace std;
-#include "GEOMImpl_ConeDriver.hxx"
-#include "GEOMImpl_ICone.hxx"
-#include "GEOMImpl_Types.hxx"
-#include "GEOM_Function.hxx"
+#include <Standard_Stream.hxx>
+
+#include <GEOMImpl_ConeDriver.hxx>
+#include <GEOMImpl_ICone.hxx>
+#include <GEOMImpl_Types.hxx>
+#include <GEOM_Function.hxx>
 
 #include <BRepPrimAPI_MakeCone.hxx>
 #include <BRepPrimAPI_MakeCylinder.hxx>
index 8eb25b4079c2073bcee7235411c235f3eabe0935..92ded20b0f545762986e375033f97e8e9e9ff2d5 100644 (file)
@@ -1,9 +1,10 @@
 
-using namespace std;
-#include "GEOMImpl_CopyDriver.hxx"
-#include "GEOMImpl_ICopy.hxx"
-#include "GEOMImpl_Types.hxx"
-#include "GEOM_Function.hxx"
+#include <Standard_Stream.hxx>
+
+#include <GEOMImpl_CopyDriver.hxx>
+#include <GEOMImpl_ICopy.hxx>
+#include <GEOMImpl_Types.hxx>
+#include <GEOM_Function.hxx>
 
 #include <BRep_Tool.hxx>
 #include <gp_Pnt.hxx>
index 7706ebef67786f18ea072b7429d941bd25da769e..50e69d22deb8ecf5a8c74a843825d6dff7195d59 100644 (file)
@@ -1,9 +1,10 @@
 
-using namespace std;
-#include "GEOMImpl_CylinderDriver.hxx"
-#include "GEOMImpl_ICylinder.hxx"
-#include "GEOMImpl_Types.hxx"
-#include "GEOM_Function.hxx"
+#include <Standard_Stream.hxx>
+
+#include <GEOMImpl_CylinderDriver.hxx>
+#include <GEOMImpl_ICylinder.hxx>
+#include <GEOMImpl_Types.hxx>
+#include <GEOM_Function.hxx>
 
 #include <BRepPrimAPI_MakeCylinder.hxx>
 #include <BRep_Tool.hxx>
index e21f90c59b24f6504e144b15ade5e4671dcf4ff9..a38b6b8ca1bc2eda3eef9a566e17514a3dc80ab2 100644 (file)
@@ -1,9 +1,10 @@
 
-using namespace std;
-#include "GEOMImpl_EllipseDriver.hxx"
-#include "GEOMImpl_IEllipse.hxx"
-#include "GEOMImpl_Types.hxx"
-#include "GEOM_Function.hxx"
+#include <Standard_Stream.hxx>
+
+#include <GEOMImpl_EllipseDriver.hxx>
+#include <GEOMImpl_IEllipse.hxx>
+#include <GEOMImpl_Types.hxx>
+#include <GEOM_Function.hxx>
 
 #include <BRepBuilderAPI_MakeEdge.hxx>
 #include <BRep_Tool.hxx>
index 21f8c4639bf2854510e3efa5dceab858fc59e22e..19a2593c0bfadebfa01672ed5bf36206002b3e3e 100644 (file)
@@ -1,9 +1,10 @@
 
-using namespace std;
-#include "GEOMImpl_ExportDriver.hxx"
-#include "GEOMImpl_IImportExport.hxx"
-#include "GEOMImpl_Types.hxx"
-#include "GEOM_Function.hxx"
+#include <Standard_Stream.hxx>
+
+#include <GEOMImpl_ExportDriver.hxx>
+#include <GEOMImpl_IImportExport.hxx>
+#include <GEOMImpl_Types.hxx>
+#include <GEOM_Function.hxx>
 
 #include <TopoDS_Shape.hxx>
 #include <TCollection_AsciiString.hxx>
index 78a6df18633afd14c8c3aff1ea10ea6eebdf9dda..33cd76469d7cb07506c97091b5101111a529f614 100644 (file)
@@ -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 <Standard_Stream.hxx>
+
+#include <GEOMImpl_FilletDriver.hxx>
+#include <GEOMImpl_IFillet.hxx>
+#include <GEOMImpl_Types.hxx>
+#include <GEOMImpl_ILocalOperations.hxx>
+#include <GEOM_Function.hxx>
 
 #include <BRepFilletAPI_MakeFillet.hxx>
 #include <BRepCheck_Analyzer.hxx>
index 0a5bdedf6a72cc6fbd5ba78a5350267fc3831c83..43e206ef1bdb021868787b2ee9b2f95572e70356 100644 (file)
@@ -1,10 +1,10 @@
 
-using namespace std;
+#include <Standard_Stream.hxx>
 
-#include "GEOMImpl_FillingDriver.hxx"
-#include "GEOM_Function.hxx"
-#include "GEOMImpl_IFilling.hxx"
-#include "GEOMImpl_Types.hxx"
+#include <GEOMImpl_FillingDriver.hxx>
+#include <GEOM_Function.hxx>
+#include <GEOMImpl_IFilling.hxx>
+#include <GEOMImpl_Types.hxx>
 
 #include <BRep_Tool.hxx>
 #include <BRepAlgo.hxx>
index 124c0499c147fb7586c382bfe303e7a4675ebffb..2420f7f836e4eebce253a49e0a7763f2c4971db6 100644 (file)
@@ -1,53 +1,57 @@
-using namespace std;
+#ifdef WNT
+#pragma warning( disable:4786 )
+#endif
 
-#include "GEOMImpl_Gen.hxx"
+#include <Standard_Stream.hxx>
+
+#include <GEOMImpl_Gen.hxx>
 
 #include "utilities.h"
-#include "OpUtil.hxx"
-#include "Utils_ExceptHandlers.hxx"
+#include <OpUtil.hxx>
+#include <Utils_ExceptHandlers.hxx>
 
 #include <TFunction_Driver.hxx>
 #include <TFunction_DriverTable.hxx>
 
-#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 <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>
 
 //=============================================================================
 /*!
index 255b4f54e5a6cca8bee9e5e15914f6c1558f20c3..8b1b072e5037af4213b72ebbc7ddade19bb6bcb5 100644 (file)
 #include "GEOMImpl_IGroupOperations.hxx"
 #include "GEOM_Engine.hxx"
 
-class GEOMImpl_Gen : public GEOM_Engine
+#ifdef WNT
+#include <SALOME_WNT.hxx>
+#else
+#define SALOME_WNT_EXPORT 
+#endif
+
+class SALOME_WNT_EXPORT GEOMImpl_Gen : public GEOM_Engine
 {
  public:
   GEOMImpl_Gen();
index 0c08d662797410e9111ff96e4f4f20b43b449fcf..d9ed67437b8dd907d5296f93681de02e8044c942 100644 (file)
@@ -1,13 +1,14 @@
 
-using namespace std;
-#include "GEOMImpl_GlueDriver.hxx"
-#include "GEOMImpl_IGlue.hxx"
-#include "GEOMImpl_Types.hxx"
+#include <Standard_Stream.hxx>
 
-#include "GEOM_Object.hxx"
-#include "GEOM_Function.hxx"
+#include <GEOMImpl_GlueDriver.hxx>
+#include <GEOMImpl_IGlue.hxx>
+#include <GEOMImpl_Types.hxx>
 
-#include "GEOMAlgo_Gluer.hxx"
+#include <GEOM_Object.hxx>
+#include <GEOM_Function.hxx>
+
+#include <GEOMAlgo_Gluer.hxx>
 
 #include "utilities.h"
 
index a1b1d8bdaeeb0a81073dff3ba4119b33a33d310d..b1fc5e41b82776838121bce2bc736a8e1f88dcc2 100644 (file)
@@ -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 <Standard_Stream.hxx>
+
+#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 <TopoDS.hxx>
 #include <TopExp.hxx>
index 36e4c667ca15eeadf95dfda9b71f404c042e8c96..38439febce40921d4d5c8836946fa81f17b870dd 100644 (file)
@@ -1,42 +1,42 @@
-using namespace std;
+#include <Standard_Stream.hxx>
 
-#include "GEOMImpl_I3DPrimOperations.hxx"
+#include <GEOMImpl_I3DPrimOperations.hxx>
 
 #include "utilities.h"
-#include "OpUtil.hxx"
-#include "Utils_ExceptHandlers.hxx"
+#include <OpUtil.hxx>
+#include <Utils_ExceptHandlers.hxx>
 
 #include <TFunction_DriverTable.hxx>
 #include <TFunction_Driver.hxx>
 #include <TFunction_Logbook.hxx>
 #include <TDF_Tool.hxx>
 
-#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 <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 <Standard_ErrorHandler.hxx> // CAREFUL ! position of this file is critic : see Lucien PIGNOLONI / OCC
 
index 5e43a2d5595a006a58b64fd4edfbd48c5230f92d..7cbf81700c89e411d5fdf5995a85c61021eb53bc 100644 (file)
 
 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);
 
 };
 
index 3178373b5579ec6f33859cb4c11112fbf9f5cea0..d252f6ebb6b665dafcbec77a71e5ed85083c26c2 100644 (file)
@@ -1,32 +1,32 @@
-using namespace std;
+#include <Standard_Stream.hxx>
 
-#include "GEOMImpl_IBasicOperations.hxx"
+#include <GEOMImpl_IBasicOperations.hxx>
 
 #include "utilities.h"
-#include "OpUtil.hxx"
-#include "Utils_ExceptHandlers.hxx"
+#include <OpUtil.hxx>
+#include <Utils_ExceptHandlers.hxx>
 
 #include <TFunction_DriverTable.hxx>
 #include <TFunction_Driver.hxx>
 #include <TFunction_Logbook.hxx>
 #include <TDF_Tool.hxx>
 
-#include "GEOM_Function.hxx"
-#include "GEOM_PythonDump.hxx"
+#include <GEOM_Function.hxx>
+#include <GEOM_PythonDump.hxx>
 
-#include "GEOMImpl_PointDriver.hxx"
-#include "GEOMImpl_VectorDriver.hxx"
-#include "GEOMImpl_LineDriver.hxx"
-#include "GEOMImpl_PlaneDriver.hxx"
-#include "GEOMImpl_MarkerDriver.hxx"
+#include <GEOMImpl_PointDriver.hxx>
+#include <GEOMImpl_VectorDriver.hxx>
+#include <GEOMImpl_LineDriver.hxx>
+#include <GEOMImpl_PlaneDriver.hxx>
+#include <GEOMImpl_MarkerDriver.hxx>
 
-#include "GEOMImpl_IPoint.hxx"
-#include "GEOMImpl_IVector.hxx"
-#include "GEOMImpl_ILine.hxx"
-#include "GEOMImpl_IPlane.hxx"
-#include "GEOMImpl_IMarker.hxx"
+#include <GEOMImpl_IPoint.hxx>
+#include <GEOMImpl_IVector.hxx>
+#include <GEOMImpl_ILine.hxx>
+#include <GEOMImpl_IPlane.hxx>
+#include <GEOMImpl_IMarker.hxx>
 
-#include "GEOMImpl_Types.hxx"
+#include <GEOMImpl_Types.hxx>
 
 #include <Standard_ErrorHandler.hxx> // CAREFUL ! position of this file is critic : see Lucien PIGNOLONI / OCC
 
index da601f7b42568481b94a1d33841e11e23fe405bd..631559b8a808e5effd3c3e6ec6ef01a900117bba 100644 (file)
 
 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);
 };
index afc0223b611e73fd6061a05fee59658436738259..9f0bcc926625d8baaa2440c8d386f00eb69bcc4e 100644 (file)
@@ -1,27 +1,31 @@
-using namespace std;
+#ifdef WNT
+#pragma warning( disable:4786 )
+#endif
 
-#include "GEOMImpl_IBlocksOperations.hxx"
+#include <Standard_Stream.hxx>
 
-#include "GEOMImpl_Types.hxx"
+#include <GEOMImpl_IBlocksOperations.hxx>
 
-#include "GEOMImpl_BlockDriver.hxx"
-#include "GEOMImpl_IBlocks.hxx"
-#include "GEOMImpl_IBlockTrsf.hxx"
-#include "GEOMImpl_CopyDriver.hxx"
-#include "GEOMImpl_Block6Explorer.hxx"
+#include <GEOMImpl_Types.hxx>
 
-#include "GEOM_Function.hxx"
-#include "GEOM_PythonDump.hxx"
+#include <GEOMImpl_BlockDriver.hxx>
+#include <GEOMImpl_IBlocks.hxx>
+#include <GEOMImpl_IBlockTrsf.hxx>
+#include <GEOMImpl_CopyDriver.hxx>
+#include <GEOMImpl_Block6Explorer.hxx>
 
-#include "GEOMAlgo_GlueAnalyser.hxx"
-#include "GEOMAlgo_CoupleOfShapes.hxx"
-#include "GEOMAlgo_ListOfCoupleOfShapes.hxx"
-#include "GEOMAlgo_ListIteratorOfListOfCoupleOfShapes.hxx"
-#include "BlockFix_CheckTool.hxx"
+#include <GEOM_Function.hxx>
+#include <GEOM_PythonDump.hxx>
+
+#include <GEOMAlgo_GlueAnalyser.hxx>
+#include <GEOMAlgo_CoupleOfShapes.hxx>
+#include <GEOMAlgo_ListOfCoupleOfShapes.hxx>
+#include <GEOMAlgo_ListIteratorOfListOfCoupleOfShapes.hxx>
+#include <BlockFix_CheckTool.hxx>
 
 #include "utilities.h"
-#include "OpUtil.hxx"
-#include "Utils_ExceptHandlers.hxx"
+#include <OpUtil.hxx>
+#include <Utils_ExceptHandlers.hxx>
 
 #include <TFunction_DriverTable.hxx>
 #include <TFunction_Driver.hxx>
index 9c7010594e18fbc389474af8a5541b4ad7fea340..1b41e9585d88449c639a8f467550d5dd8fca0e33 100644 (file)
@@ -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<int>   incriminated;
   };
 
-  Standard_Boolean CheckCompoundOfBlocksOld (Handle(GEOM_Object) theCompound,
+  Standard_EXPORT Standard_Boolean CheckCompoundOfBlocksOld (Handle(GEOM_Object) theCompound,
                                              list<BCError>&      theErrors);
 
-  Standard_Boolean CheckCompoundOfBlocks (Handle(GEOM_Object) theCompound,
+  Standard_EXPORT Standard_Boolean CheckCompoundOfBlocks (Handle(GEOM_Object) theCompound,
                                           list<BCError>&      theErrors);
 
-  TCollection_AsciiString PrintBCErrors (Handle(GEOM_Object)  theCompound,
+  Standard_EXPORT TCollection_AsciiString PrintBCErrors (Handle(GEOM_Object)  theCompound,
                                          const list<BCError>& 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
index 61b65e4b512467d0427623585b9a057596bef089..cd635dfce126fefea0e87903ab7cce435e2e1f09 100644 (file)
@@ -1,17 +1,17 @@
-using namespace std; 
+#include <Standard_Stream.hxx>
 
-#include "GEOMImpl_IBooleanOperations.hxx"
+#include <GEOMImpl_IBooleanOperations.hxx>
 
-#include "GEOM_Function.hxx"
-#include "GEOM_PythonDump.hxx"
+#include <GEOM_Function.hxx>
+#include <GEOM_PythonDump.hxx>
 
-#include "GEOMImpl_Types.hxx"
+#include <GEOMImpl_Types.hxx>
 
-#include "GEOMImpl_BooleanDriver.hxx"
-#include "GEOMImpl_IBoolean.hxx"
+#include <GEOMImpl_BooleanDriver.hxx>
+#include <GEOMImpl_IBoolean.hxx>
 
-#include "GEOMImpl_PartitionDriver.hxx"
-#include "GEOMImpl_IPartition.hxx"
+#include <GEOMImpl_PartitionDriver.hxx>
+#include <GEOMImpl_IPartition.hxx>
 
 #include <TDF_Tool.hxx>
 
index baebc89e02a0972bbcac739c2c7d4157430c7e3a..336911d62ef05407a10dc9fd4d5f2eb42d625100 100644 (file)
@@ -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);
 };
 
index cb5857aa713dce63a236a6d67737d02df8f82136..b977e80b906789289d56ec2c4390a0085910780a 100644 (file)
@@ -1,25 +1,25 @@
-using namespace std;
+#include <Standard_Stream.hxx>
 
-#include "GEOMImpl_ICurvesOperations.hxx"
+#include <GEOMImpl_ICurvesOperations.hxx>
 
-#include "GEOM_Function.hxx"
-#include "GEOM_PythonDump.hxx"
+#include <GEOM_Function.hxx>
+#include <GEOM_PythonDump.hxx>
 
-#include "GEOMImpl_Types.hxx"
+#include <GEOMImpl_Types.hxx>
 
-#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 <GEOMImpl_PolylineDriver.hxx>
+#include <GEOMImpl_CircleDriver.hxx>
+#include <GEOMImpl_SplineDriver.hxx>
+#include <GEOMImpl_EllipseDriver.hxx>
+#include <GEOMImpl_ArcDriver.hxx>
+#include <GEOMImpl_SketcherDriver.hxx>
 
-#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 <GEOMImpl_IPolyline.hxx>
+#include <GEOMImpl_ICircle.hxx>
+#include <GEOMImpl_ISpline.hxx>
+#include <GEOMImpl_IEllipse.hxx>
+#include <GEOMImpl_IArc.hxx>
+#include <GEOMImpl_ISketcher.hxx>
 
 #include "utilities.h"
 
index e421f642ea7eef8015f7febef0a1863875e4bfdb..df281573bb96f5f09edc830281f3c72dda465349 100644 (file)
@@ -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<Handle(GEOM_Object)> thePoints);
+  Standard_EXPORT Handle(GEOM_Object) MakePolyline (list<Handle(GEOM_Object)> 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<Handle(GEOM_Object)> thePoints);
-  Handle(GEOM_Object) MakeSplineInterpolation (list<Handle(GEOM_Object)> thePoints);
+  Standard_EXPORT Handle(GEOM_Object) MakeSplineBezier        (list<Handle(GEOM_Object)> thePoints);
+  Standard_EXPORT Handle(GEOM_Object) MakeSplineInterpolation (list<Handle(GEOM_Object)> thePoints);
 
-  Handle(GEOM_Object) MakeSketcher (const char* theCommand, list<double> theWorkingPlane);
-  Handle(GEOM_Object) MakeSketcherOnPlane (const char*         theCommand,
+  Standard_EXPORT Handle(GEOM_Object) MakeSketcher (const char* theCommand, list<double> theWorkingPlane);
+  Standard_EXPORT Handle(GEOM_Object) MakeSketcherOnPlane (const char*         theCommand,
                                            Handle(GEOM_Object) theWorkingPlane);
 };
 
index a641ad29d88d0086ada213560ba1bf8bb93c27fa..07a634d7c05a05af05ff9c72b4545b676768a781 100644 (file)
@@ -1,16 +1,16 @@
-using namespace std;
+#include <Standard_Stream.hxx>
 
-#include "GEOMImpl_IGroupOperations.hxx"
+#include <GEOMImpl_IGroupOperations.hxx>
 
-#include "GEOMImpl_Types.hxx"
+#include <GEOMImpl_Types.hxx>
 
-#include "GEOM_Function.hxx"
-#include "GEOM_ISubShape.hxx"
-#include "GEOM_PythonDump.hxx"
+#include <GEOM_Function.hxx>
+#include <GEOM_ISubShape.hxx>
+#include <GEOM_PythonDump.hxx>
 
 #include "utilities.h"
-#include "OpUtil.hxx"
-#include "Utils_ExceptHandlers.hxx"
+#include <OpUtil.hxx>
+#include <Utils_ExceptHandlers.hxx>
 
 #include <TFunction_DriverTable.hxx>
 #include <TFunction_Driver.hxx>
index 61d0d903761c478e05edecd95a7c35fbbab41a50..a5566d26daa65649e8546adbc79d5bf5c3732623 100644 (file)
 
 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);
 
 };
 
index 3fc9299b783d485a00c8e1ccc411815259b8efe9..cdf948d8c9c4b90e5398ac1dc1382c01a3053d29 100644 (file)
@@ -1,19 +1,23 @@
-using namespace std;
+#ifdef WNT
+#pragma warning( disable:4786 )
+#endif
 
-#include "GEOMImpl_IHealingOperations.hxx"
+#include <Standard_Stream.hxx>
 
-#include "GEOM_PythonDump.hxx"
+#include <GEOMImpl_IHealingOperations.hxx>
 
-#include "GEOMImpl_HealingDriver.hxx"
-#include "GEOMImpl_Types.hxx"
-#include "GEOMImpl_IHealing.hxx"
-#include "GEOMImpl_CopyDriver.hxx"
+#include <GEOM_PythonDump.hxx>
 
-#include "ShHealOper_ShapeProcess.hxx"
+#include <GEOMImpl_HealingDriver.hxx>
+#include <GEOMImpl_Types.hxx>
+#include <GEOMImpl_IHealing.hxx>
+#include <GEOMImpl_CopyDriver.hxx>
+
+#include <ShHealOper_ShapeProcess.hxx>
 
 #include "utilities.h"
-#include "OpUtil.hxx"
-#include "Utils_ExceptHandlers.hxx"
+#include <OpUtil.hxx>
+#include <Utils_ExceptHandlers.hxx>
 
 #include <ShapeAnalysis_FreeBounds.hxx>
 
index 3203ea99ae926bcdc26aa9dc66006ee597c40a0a..c74403e8c9e9e2f98211016d2405187e8d3149bb 100644 (file)
 
 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<string>& theOperations,
+  Standard_EXPORT void GetShapeProcessParameters( list<string>& theOperations,
                                   list<string>& theParams,
                                   list<string>& theValues );
 
   // Retrieve default Shape Process parameters for given operator
-  bool GetOperatorParameters( const string theOperation, 
+  Standard_EXPORT bool GetOperatorParameters( const string theOperation, 
                               list<string>& theParams,
                               list<string>& theValues );
 
   // returns all parameters that are valid for the given operation (Shape Process operator)
-  static bool GetParameters( const string theOperation, list<string>& theParams );                                      
+  Standard_EXPORT static bool GetParameters( const string theOperation, list<string>& 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 );
 };
index 11ec04762fdd77179271e04d7e5948dd8cf28853..74a8c8302330affa8f1a898af9d243917b54d857 100644 (file)
@@ -1,27 +1,27 @@
-using namespace std;
+#include <Standard_Stream.hxx>
 
-#include "GEOMImpl_IInsertOperations.hxx"
+#include <GEOMImpl_IInsertOperations.hxx>
 
 #include "utilities.h"
-#include "OpUtil.hxx"
-#include "Utils_ExceptHandlers.hxx"
+#include <OpUtil.hxx>
+#include <Utils_ExceptHandlers.hxx>
 
 #include <TFunction_DriverTable.hxx>
 #include <TFunction_Driver.hxx>
 #include <TFunction_Logbook.hxx>
 #include <TDF_Tool.hxx>
 
-#include "GEOM_Function.hxx"
-#include "GEOM_PythonDump.hxx"
+#include <GEOM_Function.hxx>
+#include <GEOM_PythonDump.hxx>
 
-#include "GEOMImpl_CopyDriver.hxx"
-#include "GEOMImpl_ExportDriver.hxx"
-#include "GEOMImpl_ImportDriver.hxx"
+#include <GEOMImpl_CopyDriver.hxx>
+#include <GEOMImpl_ExportDriver.hxx>
+#include <GEOMImpl_ImportDriver.hxx>
 
-#include "GEOMImpl_ICopy.hxx"
-#include "GEOMImpl_IImportExport.hxx"
+#include <GEOMImpl_ICopy.hxx>
+#include <GEOMImpl_IImportExport.hxx>
 
-#include "GEOMImpl_Types.hxx"
+#include <GEOMImpl_Types.hxx>
 
 #include <Standard_ErrorHandler.hxx> // CAREFUL ! position of this file is critic : see Lucien PIGNOLONI / OCC
 
index 953cf3e79cd2c0c6dc9bfd99327ea80f870aa66a..6a61e36a6be7d0a0488bc78ad3b3626e450525f7 100644 (file)
 
 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);
 
index 031ab0eaf3490a0165e0c2cb92eab72cd1e765a8..28438e616802c1ca6e48e176730a66610ba4825d 100644 (file)
@@ -1,24 +1,24 @@
-using namespace std;
+#include <Standard_Stream.hxx>
 
-#include "GEOMImpl_ILocalOperations.hxx"
+#include <GEOMImpl_ILocalOperations.hxx>
 
-#include "GEOM_Function.hxx"
-#include "GEOM_PythonDump.hxx"
+#include <GEOM_Function.hxx>
+#include <GEOM_PythonDump.hxx>
 
-#include "GEOMImpl_Types.hxx"
+#include <GEOMImpl_Types.hxx>
 
-#include "GEOMImpl_FilletDriver.hxx"
-#include "GEOMImpl_ChamferDriver.hxx"
+#include <GEOMImpl_FilletDriver.hxx>
+#include <GEOMImpl_ChamferDriver.hxx>
 
-#include "GEOMImpl_IFillet.hxx"
-#include "GEOMImpl_IChamfer.hxx"
+#include <GEOMImpl_IFillet.hxx>
+#include <GEOMImpl_IChamfer.hxx>
 
-#include "GEOMImpl_IArchimede.hxx"
-#include "GEOMImpl_ArchimedeDriver.hxx"
+#include <GEOMImpl_IArchimede.hxx>
+#include <GEOMImpl_ArchimedeDriver.hxx>
 
 #include "utilities.h"
-#include "OpUtil.hxx"
-#include "Utils_ExceptHandlers.hxx"
+#include <OpUtil.hxx>
+#include <Utils_ExceptHandlers.hxx>
 
 #include <TFunction_DriverTable.hxx>
 #include <TFunction_Driver.hxx>
index 8b11108104eeec05ed88880cf38865eb0acd6b52..597e3199c6d768d5a8e911c0c07642ecdf9851e8 100644 (file)
 
 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<int> theEdges);
-  Handle(GEOM_Object) MakeFilletFaces (Handle(GEOM_Object) theShape, double theR,
+  Standard_EXPORT Handle(GEOM_Object) MakeFilletFaces (Handle(GEOM_Object) theShape, double theR,
                                        list<int> 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<int> 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);
 };
index 883b5a8add4e14e5288276a765668757f7a308e3..bd91bc57abf29b7c7314a73c071e99bd4a69d69f 100644 (file)
@@ -1,17 +1,17 @@
-using namespace std;
+#include <Standard_Stream.hxx>
 
-#include "GEOMImpl_IMeasureOperations.hxx"
+#include <GEOMImpl_IMeasureOperations.hxx>
 
-#include "GEOMImpl_Types.hxx"
-#include "GEOMImpl_MeasureDriver.hxx"
-#include "GEOMImpl_IMeasure.hxx"
+#include <GEOMImpl_Types.hxx>
+#include <GEOMImpl_MeasureDriver.hxx>
+#include <GEOMImpl_IMeasure.hxx>
 
-#include "GEOM_Function.hxx"
-#include "GEOM_PythonDump.hxx"
+#include <GEOM_Function.hxx>
+#include <GEOM_PythonDump.hxx>
 
 #include "utilities.h"
-#include "OpUtil.hxx"
-#include "Utils_ExceptHandlers.hxx"
+#include <OpUtil.hxx>
+#include <Utils_ExceptHandlers.hxx>
 
 #include <TFunction_DriverTable.hxx>
 #include <TFunction_Driver.hxx>
index 9193fb91b8ed6e8e20777d4b257bfc05ee428742..675590da53f694028146010bdfc8f5d33362b8bf 100644 (file)
@@ -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:
index 2d187465db7a936fd326793f2ef7b5e0b4da51e4..47433ca3d4a20e6606723e7caf1b6f359164800a 100644 (file)
@@ -1,28 +1,28 @@
-using namespace std;
+#include <Standard_Stream.hxx>
 
-#include "GEOMImpl_IShapesOperations.hxx"
+#include <GEOMImpl_IShapesOperations.hxx>
 
-#include "GEOMImpl_Types.hxx"
+#include <GEOMImpl_Types.hxx>
 
-#include "GEOMImpl_VectorDriver.hxx"
-#include "GEOMImpl_ShapeDriver.hxx"
-#include "GEOMImpl_CopyDriver.hxx"
-#include "GEOMImpl_GlueDriver.hxx"
+#include <GEOMImpl_VectorDriver.hxx>
+#include <GEOMImpl_ShapeDriver.hxx>
+#include <GEOMImpl_CopyDriver.hxx>
+#include <GEOMImpl_GlueDriver.hxx>
 
-#include "GEOMImpl_IVector.hxx"
-#include "GEOMImpl_IShapes.hxx"
-#include "GEOMImpl_IGlue.hxx"
+#include <GEOMImpl_IVector.hxx>
+#include <GEOMImpl_IShapes.hxx>
+#include <GEOMImpl_IGlue.hxx>
 
-#include "GEOMImpl_Block6Explorer.hxx"
+#include <GEOMImpl_Block6Explorer.hxx>
 
-#include "GEOM_Function.hxx"
-#include "GEOM_PythonDump.hxx"
+#include <GEOM_Function.hxx>
+#include <GEOM_PythonDump.hxx>
 
-#include "GEOMAlgo_FinderShapeOn1.hxx"
+#include <GEOMAlgo_FinderShapeOn1.hxx>
 
 #include "utilities.h"
-#include "OpUtil.hxx"
-#include "Utils_ExceptHandlers.hxx"
+#include <OpUtil.hxx>
+#include <Utils_ExceptHandlers.hxx>
 
 #include <TFunction_DriverTable.hxx>
 #include <TFunction_Driver.hxx>
index 0c8f57395061dbbb1580e0e7686e8b5dc01de45d..3424f6e079e82d1024776cb6e4133c2819a9a137 100644 (file)
@@ -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<Handle(GEOM_Object)> theEdgesAndWires);
+  Standard_EXPORT Handle(GEOM_Object) MakeWire (list<Handle(GEOM_Object)> 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<Handle(GEOM_Object)> theWires,
+  Standard_EXPORT Handle(GEOM_Object) MakeFaceWires (list<Handle(GEOM_Object)> theWires,
                                      const bool isPlanarWanted);
 
-  Handle(GEOM_Object) MakeShell (list<Handle(GEOM_Object)> theShapes);
+  Standard_EXPORT Handle(GEOM_Object) MakeShell (list<Handle(GEOM_Object)> theShapes);
 
-  Handle(GEOM_Object) MakeSolidShell (Handle(GEOM_Object) theShell);
+  Standard_EXPORT Handle(GEOM_Object) MakeSolidShell (Handle(GEOM_Object) theShell);
 
-  Handle(GEOM_Object) MakeSolidShells (list<Handle(GEOM_Object)> theShells);
+  Standard_EXPORT Handle(GEOM_Object) MakeSolidShells (list<Handle(GEOM_Object)> theShells);
 
-  Handle(GEOM_Object) MakeCompound (list<Handle(GEOM_Object)> theShapes);
+  Standard_EXPORT Handle(GEOM_Object) MakeCompound (list<Handle(GEOM_Object)> 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<Handle(GEOM_Object)>     theShapes,
index 5b287e66900c30cba8cad7293536efc832757070..7d6c5c792fad185f1696e5698fa6590e0c982202 100644 (file)
@@ -1,34 +1,34 @@
-using namespace std;
+#include <Standard_Stream.hxx>
 
-#include "GEOMImpl_ITransformOperations.hxx"
+#include <GEOMImpl_ITransformOperations.hxx>
 
 #include "utilities.h"
-#include "OpUtil.hxx"
-#include "Utils_ExceptHandlers.hxx"
+#include <OpUtil.hxx>
+#include <Utils_ExceptHandlers.hxx>
 
 #include <TFunction_DriverTable.hxx>
 #include <TFunction_Driver.hxx>
 #include <TFunction_Logbook.hxx>
 #include <TDF_Tool.hxx>
 
-#include "GEOM_Function.hxx"
-#include "GEOM_PythonDump.hxx"
+#include <GEOM_Function.hxx>
+#include <GEOM_PythonDump.hxx>
 
-#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 <GEOMImpl_TranslateDriver.hxx>
+#include <GEOMImpl_MirrorDriver.hxx>
+#include <GEOMImpl_OffsetDriver.hxx>
+#include <GEOMImpl_ScaleDriver.hxx>
+#include <GEOMImpl_RotateDriver.hxx>
+#include <GEOMImpl_PositionDriver.hxx>
 
-#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 <GEOMImpl_ITranslate.hxx>
+#include <GEOMImpl_IMirror.hxx>
+#include <GEOMImpl_IOffset.hxx>
+#include <GEOMImpl_IScale.hxx>
+#include <GEOMImpl_IRotate.hxx>
+#include <GEOMImpl_IPosition.hxx>
 
-#include "GEOMImpl_Types.hxx"
+#include <GEOMImpl_Types.hxx>
 
 #include <Standard_ErrorHandler.hxx> // CAREFUL ! position of this file is critic : see Lucien PIGNOLONI / OCC
 
index 5ac2879a37b7d307630a11cf8c9bef61e54deabb..fe40e5917c404c3c4b2e62722997f95a458eea76 100644 (file)
 
 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,
index 5f3fef22192809224930f5281056a72830c3f6ac..fb4d4e0f397041d39923c395a62680cfdcac52fd 100644 (file)
@@ -1,9 +1,10 @@
 
-using namespace std;
-#include "GEOMImpl_ImportDriver.hxx"
-#include "GEOMImpl_IImportExport.hxx"
-#include "GEOMImpl_Types.hxx"
-#include "GEOM_Function.hxx"
+#include <Standard_Stream.hxx>
+
+#include <GEOMImpl_ImportDriver.hxx>
+#include <GEOMImpl_IImportExport.hxx>
+#include <GEOMImpl_Types.hxx>
+#include <GEOM_Function.hxx>
 
 #include "utilities.h"
 
index 57903e3d23915c715e7e787e80e242a474c572a3..b76dd1e5e9654ed49ab59ec6d1a2d1386880c717 100644 (file)
@@ -1,9 +1,10 @@
 
-using namespace std;
-#include "GEOMImpl_LineDriver.hxx"
-#include "GEOMImpl_ILine.hxx"
-#include "GEOMImpl_Types.hxx"
-#include "GEOM_Function.hxx"
+#include <Standard_Stream.hxx>
+
+#include <GEOMImpl_LineDriver.hxx>
+#include <GEOMImpl_ILine.hxx>
+#include <GEOMImpl_Types.hxx>
+#include <GEOM_Function.hxx>
 
 #include <BRep_Tool.hxx>
 #include <BRepBuilderAPI_MakeEdge.hxx>
index e5594d16ed15dde004b5667c5087d682ddc281f5..1f1f653da203e0b834f0714146305c347d3051b1 100644 (file)
@@ -1,9 +1,10 @@
 
-using namespace std;
-#include "GEOMImpl_MarkerDriver.hxx"
-#include "GEOMImpl_IMarker.hxx"
-#include "GEOMImpl_Types.hxx"
-#include "GEOM_Function.hxx"
+#include <Standard_Stream.hxx>
+
+#include <GEOMImpl_MarkerDriver.hxx>
+#include <GEOMImpl_IMarker.hxx>
+#include <GEOMImpl_Types.hxx>
+#include <GEOM_Function.hxx>
 
 #include <BRepBuilderAPI_MakeFace.hxx>
 #include <BRep_Tool.hxx>
index c2b5a15d39bc6df83fcd936bba9d7231b247d205..79f5fccdc2a432d2648b4b65d643859e3f063dfa 100644 (file)
@@ -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 <Standard_Stream.hxx>
+
+#include <GEOMImpl_MeasureDriver.hxx>
+#include <GEOMImpl_IMeasure.hxx>
+#include <GEOMImpl_IMeasureOperations.hxx>
+#include <GEOMImpl_Types.hxx>
+#include <GEOM_Function.hxx>
 
 #include <BRep_Tool.hxx>
 #include <BRepGProp.hxx>
index fefb1531d7c524c79e83c73c9c4f5cdb3677df00..20303383f68b129a08f2cb37f55f6fb2bbeaff03 100644 (file)
@@ -1,10 +1,11 @@
 
-using namespace std;
-#include "GEOMImpl_MirrorDriver.hxx"
+#include <Standard_Stream.hxx>
+
+#include <GEOMImpl_MirrorDriver.hxx>
 
 #include <GEOMImpl_IMirror.hxx>
 #include <GEOMImpl_Types.hxx>
-#include "GEOM_Function.hxx"
+#include <GEOM_Function.hxx>
 
 #include <BRep_Tool.hxx>
 #include <BRepBuilderAPI_Transform.hxx>
index 5d82b97b4c02130c1c03fdcace395b1630832164..5716e5aadcac57ae2b614f8165ee666b65ec0123 100644 (file)
@@ -1,9 +1,10 @@
 
-using namespace std;
-#include "GEOMImpl_OffsetDriver.hxx"
-#include "GEOMImpl_IOffset.hxx"
-#include "GEOMImpl_Types.hxx"
-#include "GEOM_Function.hxx"
+#include <Standard_Stream.hxx>
+
+#include <GEOMImpl_OffsetDriver.hxx>
+#include <GEOMImpl_IOffset.hxx>
+#include <GEOMImpl_Types.hxx>
+#include <GEOM_Function.hxx>
 
 #include <BRepOffsetAPI_MakeOffsetShape.hxx>
 #include <BRep_Tool.hxx>
index 61f3fde20e629c0a510cb0565c9e9d5ee947d79f..1f44ec42bd37df1ae11d4371725b9b02148fc16f 100644 (file)
@@ -1,11 +1,12 @@
 
-using namespace std;
-#include "GEOMImpl_PartitionDriver.hxx"
-#include "GEOMImpl_IPartition.hxx"
-#include "GEOMImpl_Types.hxx"
+#include <Standard_Stream.hxx>
 
-#include "GEOM_Object.hxx"
-#include "GEOM_Function.hxx"
+#include <GEOMImpl_PartitionDriver.hxx>
+#include <GEOMImpl_IPartition.hxx>
+#include <GEOMImpl_Types.hxx>
+
+#include <GEOM_Object.hxx>
+#include <GEOM_Function.hxx>
 
 #include <NMTAlgo_Splitter1.hxx>
 
index 54b81eddc60329ebb70230f06731c275844702c4..21c0195d9222e10992676d32dca6d08b0913e2ba 100644 (file)
@@ -1,9 +1,10 @@
 
-using namespace std;
-#include "GEOMImpl_PipeDriver.hxx"
-#include "GEOMImpl_IPipe.hxx"
-#include "GEOMImpl_Types.hxx"
-#include "GEOM_Function.hxx"
+#include <Standard_Stream.hxx>
+
+#include <GEOMImpl_PipeDriver.hxx>
+#include <GEOMImpl_IPipe.hxx>
+#include <GEOMImpl_Types.hxx>
+#include <GEOM_Function.hxx>
 
 #include <BRep_Tool.hxx>
 #include <BRepCheck_Analyzer.hxx>
index 510d7a291627ced379ae462366183c84d5e5985a..0fcf0c36b60e0a17f71ef8453012c3a223ad2350 100644 (file)
@@ -1,9 +1,10 @@
 
-using namespace std;
-#include "GEOMImpl_PlaneDriver.hxx"
-#include "GEOMImpl_IPlane.hxx"
-#include "GEOMImpl_Types.hxx"
-#include "GEOM_Function.hxx"
+#include <Standard_Stream.hxx>
+
+#include <GEOMImpl_PlaneDriver.hxx>
+#include <GEOMImpl_IPlane.hxx>
+#include <GEOMImpl_Types.hxx>
+#include <GEOM_Function.hxx>
 
 #include <BRepBuilderAPI_MakeFace.hxx>
 #include <BRep_Tool.hxx>
index 98a839b582f932059f7e102896c4382f73c4dc14..e7e529bdea961694509d7b2b29042500a7434283 100644 (file)
@@ -1,9 +1,10 @@
 
-using namespace std;
-#include "GEOMImpl_PointDriver.hxx"
-#include "GEOMImpl_IPoint.hxx"
-#include "GEOMImpl_Types.hxx"
-#include "GEOM_Function.hxx"
+#include <Standard_Stream.hxx>
+
+#include <GEOMImpl_PointDriver.hxx>
+#include <GEOMImpl_IPoint.hxx>
+#include <GEOMImpl_Types.hxx>
+#include <GEOM_Function.hxx>
 
 #include <BRep_Tool.hxx>
 #include <BRepBuilderAPI_MakeVertex.hxx>
index 83dde5be4be520ccaf8f3ecba3458bb004381f89..64619ee30a59b8427a232046dd3a7c64532d4e40 100644 (file)
@@ -1,9 +1,10 @@
 
-using namespace std;
-#include "GEOMImpl_PolylineDriver.hxx"
-#include "GEOMImpl_IPolyline.hxx"
-#include "GEOMImpl_Types.hxx"
-#include "GEOM_Function.hxx"
+#include <Standard_Stream.hxx>
+
+#include <GEOMImpl_PolylineDriver.hxx>
+#include <GEOMImpl_IPolyline.hxx>
+#include <GEOMImpl_Types.hxx>
+#include <GEOM_Function.hxx>
 
 #include <BRepBuilderAPI_MakePolygon.hxx>
 #include <BRep_Tool.hxx>
index 8bbf2e3bdd3f05e000256716e144d01018da25f7..c28ec1a99b2626cb123212e1d4773454accaac4c 100644 (file)
@@ -1,9 +1,10 @@
 
-using namespace std;
-#include "GEOMImpl_PositionDriver.hxx"
-#include "GEOMImpl_IPosition.hxx"
-#include "GEOMImpl_Types.hxx"
-#include "GEOM_Function.hxx"
+#include <Standard_Stream.hxx>
+
+#include <GEOMImpl_PositionDriver.hxx>
+#include <GEOMImpl_IPosition.hxx>
+#include <GEOMImpl_Types.hxx>
+#include <GEOM_Function.hxx>
 
 #include <BRepBuilderAPI_Transform.hxx>
 #include <BRep_Tool.hxx>
index 71b460c5a814e107461595cebc5f4dad8277343a..5da11dc6ad0156c24dba26824a009ae2f437dae2 100644 (file)
@@ -1,9 +1,10 @@
 
-using namespace std;
-#include "GEOMImpl_PrismDriver.hxx"
-#include "GEOMImpl_IPrism.hxx"
-#include "GEOMImpl_Types.hxx"
-#include "GEOM_Function.hxx"
+#include <Standard_Stream.hxx>
+
+#include <GEOMImpl_PrismDriver.hxx>
+#include <GEOMImpl_IPrism.hxx>
+#include <GEOMImpl_Types.hxx>
+#include <GEOM_Function.hxx>
 
 #include <BRepPrimAPI_MakePrism.hxx>
 #include <BRep_Tool.hxx>
index f5ca6cf2a8cf73eaed6b211bffa533500ed34249..1eb85b835c861beda4e8c1280d7b6115fdd8f276 100644 (file)
@@ -1,9 +1,10 @@
 
-using namespace std;
-#include "GEOMImpl_RevolutionDriver.hxx"
-#include "GEOMImpl_IRevolution.hxx"
-#include "GEOMImpl_Types.hxx"
-#include "GEOM_Function.hxx"
+#include <Standard_Stream.hxx>
+
+#include <GEOMImpl_RevolutionDriver.hxx>
+#include <GEOMImpl_IRevolution.hxx>
+#include <GEOMImpl_Types.hxx>
+#include <GEOM_Function.hxx>
 
 #include <BRepPrimAPI_MakeRevol.hxx>
 #include <BRep_Tool.hxx>
index 4f656dd5e87d6c249ea25f5f25481b63005202d5..c3ae0aecbc887d5db8b390be4db5b1811feff674 100644 (file)
@@ -1,9 +1,10 @@
 
-using namespace std;
-#include "GEOMImpl_RotateDriver.hxx"
+#include <Standard_Stream.hxx>
+
+#include <GEOMImpl_RotateDriver.hxx>
 #include <GEOMImpl_IRotate.hxx>
 #include <GEOMImpl_Types.hxx>
-#include "GEOM_Function.hxx"
+#include <GEOM_Function.hxx>
 #include <gp_Trsf.hxx>
 #include <gp_Pnt.hxx>
 #include <gp_Vec.hxx>
@@ -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;
     
index 4e707cb72a0998739c4946c38572e69407b3f679..01106835f3f93921bb598106648ed7233040c3fe 100644 (file)
@@ -1,9 +1,10 @@
 
-using namespace std;
-#include "GEOMImpl_ScaleDriver.hxx"
-#include "GEOMImpl_IScale.hxx"
-#include "GEOMImpl_Types.hxx"
-#include "GEOM_Function.hxx"
+#include <Standard_Stream.hxx>
+
+#include <GEOMImpl_ScaleDriver.hxx>
+#include <GEOMImpl_IScale.hxx>
+#include <GEOMImpl_Types.hxx>
+#include <GEOM_Function.hxx>
 
 #include <BRepBuilderAPI_Transform.hxx>
 #include <BRep_Tool.hxx>
index df96b659d131557ef2c6364c92c3bef55ac2a441..b2c57e879491014f2bf29bc787b988a62f014e4a 100644 (file)
@@ -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 <Standard_Stream.hxx>
+
+#include <GEOMImpl_ShapeDriver.hxx>
+#include <GEOMImpl_IShapes.hxx>
+#include <GEOMImpl_IShapesOperations.hxx>
+#include <GEOMImpl_Types.hxx>
+#include <GEOM_Function.hxx>
 
 #include <BRep_Tool.hxx>
 #include <BRep_Builder.hxx>
index b0822626abac35137f7e45b8a1939e982d475df8..eb34dcb0dd55b8f52ccc8c567b6005b529759988 100644 (file)
@@ -1,9 +1,10 @@
 
-using namespace std;
-#include "GEOMImpl_SketcherDriver.hxx"
-#include "GEOMImpl_ISketcher.hxx"
-#include "GEOMImpl_Types.hxx"
-#include "GEOM_Function.hxx"
+#include <Standard_Stream.hxx>
+
+#include <GEOMImpl_SketcherDriver.hxx>
+#include <GEOMImpl_ISketcher.hxx>
+#include <GEOMImpl_Types.hxx>
+#include <GEOM_Function.hxx>
 
 #include <BRepBuilderAPI_Transform.hxx>
 #include <BRep_Tool.hxx>
index af97bbc455af190e423c7cb78b2bbe8d45da5f14..c5fbb6c7c9cc853c1f5157e9f1f76d81296dc87a 100644 (file)
@@ -1,9 +1,10 @@
 
-using namespace std;
-#include "GEOMImpl_SphereDriver.hxx"
-#include "GEOMImpl_ISphere.hxx"
-#include "GEOMImpl_Types.hxx"
-#include "GEOM_Function.hxx"
+#include <Standard_Stream.hxx>
+
+#include <GEOMImpl_SphereDriver.hxx>
+#include <GEOMImpl_ISphere.hxx>
+#include <GEOMImpl_Types.hxx>
+#include <GEOM_Function.hxx>
 
 #include <BRepPrimAPI_MakeSphere.hxx>
 #include <BRep_Tool.hxx>
index f63021373e9d2fcab9a415ac737f9937675132f8..2bd1c0d6099147b8eb9eb748e0a8cf0e219cd53b 100644 (file)
@@ -1,9 +1,10 @@
 
-using namespace std;
-#include "GEOMImpl_SplineDriver.hxx"
-#include "GEOMImpl_ISpline.hxx"
-#include "GEOMImpl_Types.hxx"
-#include "GEOM_Function.hxx"
+#include <Standard_Stream.hxx>
+
+#include <GEOMImpl_SplineDriver.hxx>
+#include <GEOMImpl_ISpline.hxx>
+#include <GEOMImpl_Types.hxx>
+#include <GEOM_Function.hxx>
 
 #include <BRepBuilderAPI_MakeEdge.hxx>
 #include <BRep_Tool.hxx>
@@ -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;
     }
index 1db7d00d3477878428b45a6b0241e5bf5e1a187f..4bdb5712801d44cb9a77101492cb18b1cca9d431 100644 (file)
@@ -1,7 +1,8 @@
 
-using namespace std;
-#include "GEOMImpl_Template.hxx"
-#include "GEOM_Function.hxx"
+#include <Standard_Stream.hxx>
+
+#include <GEOMImpl_Template.hxx>
+#include <GEOM_Function.hxx>
 #include <TopoDS_Shape.hxx>
 
 //=======================================================================
index 17b93936cd25a6ea3cf65fb133c6bf3e97bda46b..9bcfc0219d61fdc241e1933e1b2d9e8487ec81ba 100644 (file)
@@ -1,9 +1,10 @@
 
-using namespace std;
-#include "GEOMImpl_TorusDriver.hxx"
-#include "GEOMImpl_ITorus.hxx"
-#include "GEOMImpl_Types.hxx"
-#include "GEOM_Function.hxx"
+#include <Standard_Stream.hxx>
+
+#include <GEOMImpl_TorusDriver.hxx>
+#include <GEOMImpl_ITorus.hxx>
+#include <GEOMImpl_Types.hxx>
+#include <GEOM_Function.hxx>
 
 #include <BRepPrimAPI_MakeTorus.hxx>
 #include <BRep_Tool.hxx>
index 699209886bb947510d59699a2c6a52cf6e0c57b0..7fc447bb38e266e6fd6dfa762ec0b6e286f9eb81 100644 (file)
@@ -1,9 +1,10 @@
 
-using namespace std;
-#include "GEOMImpl_TranslateDriver.hxx"
+#include <Standard_Stream.hxx>
+
+#include <GEOMImpl_TranslateDriver.hxx>
 #include <GEOMImpl_ITranslate.hxx>
 #include <GEOMImpl_Types.hxx>
-#include "GEOM_Function.hxx"
+#include <GEOM_Function.hxx>
 #include <gp_Trsf.hxx>
 #include <gp_Pnt.hxx>
 #include <gp_Vec.hxx>
index 8544418eeae1dd852a5af94fea80075107f36b9f..1c9602cc98e06e224f23742af6c8dd2315883a4b 100644 (file)
@@ -1,9 +1,9 @@
+#include <Standard_Stream.hxx>
 
-using namespace std;
-#include "GEOMImpl_VectorDriver.hxx"
-#include "GEOMImpl_IVector.hxx"
-#include "GEOMImpl_Types.hxx"
-#include "GEOM_Function.hxx"
+#include <GEOMImpl_VectorDriver.hxx>
+#include <GEOMImpl_IVector.hxx>
+#include <GEOMImpl_Types.hxx>
+#include <GEOM_Function.hxx>
 
 #include <BRep_Tool.hxx>
 #include <BRepBuilderAPI_MakeEdge.hxx>
index 8ce7f9933a6bd6bef99a5da29f435253cdcda1fc..463f31c966cc3b8f460dfd11576c90e86fd67b33 100644 (file)
 #include <TCollection_AsciiString.hxx>
 #include <TopoDS_Shape.hxx>
 
+#ifdef WNT
+#include <SALOME_WNT.hxx>
+#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());
index f0cb68c8b9443dec63b9f5c2c1113fcff749b44b..840f2583525684e96ed1eeef051ad960fa056a2a 100644 (file)
 #include <TCollection_AsciiString.hxx>
 #include <TopoDS_Shape.hxx>
 
+#ifdef WNT
+#include <SALOME_WNT.hxx>
+#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)
   {
index 0b0c3c521149d815f3d45c2b707d9dff8a9ee6a4..7e0ded5f895145742d75a06c5476dac6c907b850 100644 (file)
     aDEP.Do();
     //
   }
-  catch (BOPTColStd_Failure& x) {
+  catch (BOPTColStd_Failure& /*x*/) {
     //QQ MESSAGE(x.Message() << flush);
   }
 }
index c442b4c6c128a6cc6849e02609e744994b76ad5f..eb2b741d9777ab7b5fbdb5a3b1a7d9f760e2271c 100644 (file)
@@ -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 <TopoDS_Shape.hxx>
 #include <TopTools_IndexedMapOfShape.hxx>
 
+using namespace std;
+
 static void getEntityOwners( const Handle(AIS_InteractiveObject)& theObj,
                             const Handle(AIS_InteractiveContext)& theIC,
                             SelectMgr_IndexedMapOfOwner& theMap )
index 0ebbf32f4e412e0d78df0246bba60bbe9e8e3bf3..e16b174ba2a27eb17808357042eee5eaef78d1f3 100644 (file)
@@ -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());
index ebd49b780bf5bae2e0727b90e7758c9051968ae3..7229b9e2b934989d7f826dbfe2424f6cb39fbdca 100644 (file)
 class vtkCamera;
 class TopoDS_Shape;
 
-#ifdef _WIN_32
-#define VTKOCC_EXPORT __declspec (dllexport)
+#ifdef WNT
+#include <SALOME_WNT.hxx>
 #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);
 
index 6c0f4df9269c346a3fdb3ad343c1b0d308ac0d14..a44aa7dbf8cdd99b2deba015a93a1936362b4659 100644 (file)
@@ -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 <TopTools_ListOfShape.hxx>
 #include <TopoDS_Iterator.hxx>
 
+using namespace std;
 // SALOME
 
 #define MAX2(X, Y)     (  Abs(X) > Abs(Y)? Abs(X) : Abs(Y) )
index a396b9e25a469c86aaa9c0ab0f1dc48933787f67..4436b0b016c9055af15087f267c0e8e3cd11de36 100644 (file)
 #include <TopoDS.hxx>
 #include <TopoDS_Shape.hxx>
 
-class GEOM_AssemblyBuilder {
+#ifdef WNT
+#include <SALOME_WNT.hxx>
+#else
+#define SALOME_WNT_EXPORT
+#endif
+
+class SALOME_WNT_EXPORT GEOM_AssemblyBuilder {
 
  private:
 
index 00c179a21e47db1b7b8eac27432326e971c97557..caa8567e5b6413eb7832402601ce2890f179b6ef 100644 (file)
@@ -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()
 {
index 165fbe8e6981c9dc5a31a0cf2e23bcceb7dd3c75..92332c8c6f0a311f90c99c8aad2766ae11c029c8 100644 (file)
 #include "SALOME_Actor.h"
 #include "VTKViewer_Trihedron.h"
 
+#ifdef WNT
+#include <SALOME_WNT.hxx>
+#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:
index acd72451f5d3e450a15511abb8c80b42f237c6f4..3f320dd0c720908abda957913c06001cebafee41 100644 (file)
@@ -26,8 +26,9 @@
 //  Module : GEOM
 //  $Header: 
 
-using namespace std;
-#include "Sketcher_Profile.hxx"
+#include <Standard_Stream.hxx>
+
+#include <Sketcher_Profile.hxx>
 
 #include <TopoDS_Vertex.hxx>
 #include <TopoDS_Face.hxx>
@@ -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 "<<i-1);
-           return;
-         }
-         length = (length - x) / dx;
-       }
-       else if (a[0] == "IY") {
-         if (Abs(dy) < Precision::Confusion()) {
-           MESSAGE("profile : cannot intersect, arg "<<i-1);
-           return;
-         }
-         length = (length - y) / dy;
-       }
-       if (Abs(length) > 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 "<<a[i]);
-       return;
-      }
+      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 "<<i-1);
+              return;
+            }
+            length = (length - x) / dx;
+          }
+          else if (a[0] == "IY") {
+            if (Abs(dy) < Precision::Confusion()) {
+              MESSAGE("profile : cannot intersect, arg "<<i-1);
+              return;
+            }
+            length = (length - y) / dy;
+          }
+          if (Abs(length) > 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 "<<a[i]);
+          return;
+        }
     }
 
-  again :
+again :
     switch (move) 
     {
     case line :
       {
-       if (length < 0) {
-         length = -length;
-         dx = -dx;
-         dy = -dy;
-       }
-       Handle(Geom2d_Line) l = new Geom2d_Line(gp_Pnt2d(x,y),gp_Dir2d(dx,dy));
+        if (length < 0) {
+          length = -length;
+          dx = -dx;
+          dy = -dy;
+        }
+        Handle(Geom2d_Line) l = new Geom2d_Line(gp_Pnt2d(x,y),gp_Dir2d(dx,dy));
         BRepBuilderAPI_MakeEdge ME (GeomAPI::To3d(l,P),0,length);
         if (!ME.IsDone())
           return;
-       MW.Add(ME);
-       x += length*dx;
-       y += length*dy;
-       break;
+        MW.Add(ME);
+        x += length*dx;
+        y += length*dy;
+        break;
       }
     case circle :
       {
-       Standard_Boolean sense = Standard_True;
-       if (radius < 0) {
-         radius = -radius;
-         sense = !sense;
-         dx = -dx;
-         dy = -dy;
-       }
-       gp_Ax2d ax(gp_Pnt2d(x-radius*dy,y+radius*dx),gp_Dir2d(dy,-dx));
-       if (angle < 0) {
-         angle = -angle;
-         sense = !sense;
-       }
-       Handle(Geom2d_Circle) c = new Geom2d_Circle(ax,radius,sense);
+        Standard_Boolean sense = Standard_True;
+        if (radius < 0) {
+          radius = -radius;
+          sense = !sense;
+          dx = -dx;
+          dy = -dy;
+        }
+        gp_Ax2d ax(gp_Pnt2d(x-radius*dy,y+radius*dx),gp_Dir2d(dy,-dx));
+        if (angle < 0) {
+          angle = -angle;
+          sense = !sense;
+        }
+        Handle(Geom2d_Circle) c = new Geom2d_Circle(ax,radius,sense);
         BRepBuilderAPI_MakeEdge ME (GeomAPI::To3d(c,P),0,angle);
         if (!ME.IsDone())
           return;
-       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;
+        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;
index f8389f3aad63b6da153b90af74295fec38954db6..79762a9d16913da50714f1e7f7525f2ff1c35d92 100644 (file)
@@ -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;};
 
 };
index 83c88215bb9cbae327819ddea2499bfc391a18ca..7614e4bda9c3833ab0ce4f6442f0c5a870d844e5 100644 (file)
 #include <TCollection_AsciiString.hxx>
 #include <TopoDS_Shape.hxx>
 
+#ifdef WNT
+#include <SALOME_WNT.hxx>
+#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());
index 02a0dd823b2e6a8b04fbb8627370e204ce1900e1..6535241261f675e39ceccae967cd01b3f136e695 100644 (file)
 
 #include <Standard_ErrorHandler.hxx> // CAREFUL ! position of this file is critic : see Lucien PIGNOLONI / OCC
 
+#ifdef WNT
+#include <SALOME_WNT.hxx>
+#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)
   {