IMPs 19766 (Wire from unconnected edges) and 20004 (NumberOfSolids)

[modules/geom.git] / src / GEOM_I_Superv / GEOM_Superv_i.cc

diff --git a/src/GEOM_I_Superv/GEOM_Superv_i.cc b/src/GEOM_I_Superv/GEOM_Superv_i.cc
index 159bb6f4997a021ac5aa51250174cdb690ccab06..a5e8efb38c80547e1a38aee3f7f8124791a85bcb 100644 (file)
--- a/src/GEOM_I_Superv/GEOM_Superv_i.cc
+++ b/src/GEOM_I_Superv/GEOM_Superv_i.cc
@@ -690,6 +690,36 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::MakePlaneFace (GEOM::GEOM_Object_ptr theFac
   return anObj;
 }
 
+//=============================================================================
+//  MakePlane2Vec:
+//=============================================================================
+GEOM::GEOM_Object_ptr GEOM_Superv_i::MakePlane2Vec (GEOM::GEOM_Object_ptr theVec1,
+                                                   GEOM::GEOM_Object_ptr theVec2,
+                                                   CORBA::Double theTrimSize)
+{ 
+  beginService( " GEOM_Superv_i::MakePlane2Vec" );
+  MESSAGE("GEOM_Superv_i::MakePlane2Vec");
+  getBasicOp();
+  GEOM::GEOM_Object_ptr anObj = myBasicOp->MakePlane2Vec(theVec1, theVec2, theTrimSize);
+  endService( " GEOM_Superv_i::MakePlane2Vec" );
+  return anObj;
+}
+
+//=============================================================================
+//  MakePlaneLCS:
+//=============================================================================
+GEOM::GEOM_Object_ptr GEOM_Superv_i::MakePlaneLCS (GEOM::GEOM_Object_ptr theLCS,
+                                                  CORBA::Double theTrimSize,
+                                                  CORBA::Double theOrientation)
+{ 
+  beginService( " GEOM_Superv_i::MakePlaneLCS" );
+  MESSAGE("GEOM_Superv_i::MakePlaneLCS");
+  getBasicOp();
+  GEOM::GEOM_Object_ptr anObj = myBasicOp->MakePlaneLCS(theLCS, theTrimSize, theOrientation);
+  endService( " GEOM_Superv_i::MakePlaneLCS" );
+  return anObj;
+}
+
 //=============================================================================
 //  MakeMarker:
 //=============================================================================
@@ -1856,14 +1886,15 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeEdge (GEOM::GEOM_Object_ptr thePnt1,
 //=============================================================================
 //  MakeWire:
 //=============================================================================
-GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeWire (GEOM::GEOM_List_ptr theEdgesAndWires)
+GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeWire (GEOM::GEOM_List_ptr theEdgesAndWires,
+                                               CORBA::Double       theTolerance)
 {
   beginService( " GEOM_Superv_i::MakeWire" );
   MESSAGE("GEOM_Superv_i::MakeWire");
   if (GEOM_List_i<GEOM::ListOfGO>* aListImplEW = 
       dynamic_cast<GEOM_List_i<GEOM::ListOfGO>*>(GetServant(theEdgesAndWires, myPOA).in())) {
     getShapesOp();
-    GEOM::GEOM_Object_ptr anObj = myShapesOp->MakeWire(aListImplEW->GetList());
+    GEOM::GEOM_Object_ptr anObj = myShapesOp->MakeWire(aListImplEW->GetList(), theTolerance);
     endService( " GEOM_Superv_i::MakeWire" );
     return anObj;
   }
@@ -2532,6 +2563,23 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeEllipse (GEOM::GEOM_Object_ptr theCente
   return anObj;
 }
 
+//=============================================================================
+//  MakeEllipseVec:
+//=============================================================================
+GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeEllipseVec (GEOM::GEOM_Object_ptr theCenter,
+                                                    GEOM::GEOM_Object_ptr theVector,
+                                                    CORBA::Double theRMajor, 
+                                                    CORBA::Double theRMinor,
+                                                    GEOM::GEOM_Object_ptr theVectorMajor)
+{
+  beginService( " GEOM_Superv_i::MakeEllipseVec" );
+  MESSAGE("GEOM_Superv_i::MakeEllipseVec");
+  getCurvesOp();
+  GEOM::GEOM_Object_ptr anObj = myCurvesOp->MakeEllipseVec(theCenter, theVector, theRMajor, theRMinor, theVectorMajor);
+  endService( " GEOM_Superv_i::MakeEllipseVec" );
+  return anObj;
+}
+
 //=============================================================================
 //  MakeArc:
 //=============================================================================