0020695: EDF 1076 GEOM: Add a new shape in GEOM: T-shape

Additional changes for Supervision interface of GEOM module

diff --git a/idl/GEOM_Superv.idl b/idl/GEOM_Superv.idl
index 3e6f4b9c23867c7366ace119804299c70527a454..49fc3a9bcb1e8c45fbf1b29fad14531175990926 100644 (file)
--- a/idl/GEOM_Superv.idl
+++ b/idl/GEOM_Superv.idl
@@ -605,6 +605,8 @@ module GEOM
                           in double theR2, in double theW2, in double theL2, 
                           in double theRF, in boolean theHexMesh,
                           in GEOM_Object theP1, in GEOM_Object theP2, in GEOM_Object theP3);
+
+    /*@@ insert new functions before this line @@*/
  };
 };
 

diff --git a/src/GEOM_I_Superv/GEOM_Superv_i.cc b/src/GEOM_I_Superv/GEOM_Superv_i.cc
index b76c1e3eb8a180377421123c50290195d3aa4a65..b87ca1c4570b9f124da22103efd855aba883cad1 100644 (file)
--- a/src/GEOM_I_Superv/GEOM_Superv_i.cc
+++ b/src/GEOM_I_Superv/GEOM_Superv_i.cc
@@ -353,8 +353,8 @@ void GEOM_Superv_i::getAdvancedOp()
 {
   if (CORBA::is_nil(myGeomEngine))
     setGeomEngine();
-  // get GEOM_IGroupOperations interface
-  if (CORBA::is_nil(myGroupOp) || isNewStudy(myLastStudyID,myStudyID))
+  // get GEOM_IAdvancedOperations interface
+  if (CORBA::is_nil(myAdvancedOp) || isNewStudy(myLastStudyID,myStudyID))
     myAdvancedOp = myGeomEngine->GetIAdvancedOperations(myStudyID);
 }
 
@@ -3315,6 +3315,8 @@ GEOM::GEOM_List_ptr GEOM_Superv_i::MakePipeTShapeFilletWithPosition (CORBA::Doub
   return aSeqPtr->_this();
 }
 
+/*@@ insert new functions before this line @@*/
+
 //=====================================================================================
 // EXPORTED METHODS
 //=====================================================================================

diff --git a/src/GEOM_I_Superv/GEOM_Superv_i.hh b/src/GEOM_I_Superv/GEOM_Superv_i.hh
index 121b565d65feec7528a59deeb138b4879d21e1c5..aee8b2a06297647170116587c8b3d6a5fc906afa 100644 (file)
--- a/src/GEOM_I_Superv/GEOM_Superv_i.hh
+++ b/src/GEOM_I_Superv/GEOM_Superv_i.hh
@@ -671,26 +671,27 @@ public:
   // Advanced Operations                                       //
   //-----------------------------------------------------------//
   GEOM::GEOM_List_ptr MakePipeTShape (CORBA::Double theR1, CORBA::Double theW1, CORBA::Double theL1, 
-                  CORBA::Double theR2, CORBA::Double theW2, CORBA::Double theL2,
-                  CORBA::Boolean theHexMesh);
+                                     CORBA::Double theR2, CORBA::Double theW2, CORBA::Double theL2,
+                                     CORBA::Boolean theHexMesh);
   GEOM::GEOM_List_ptr MakePipeTShapeWithPosition (CORBA::Double theR1, CORBA::Double theW1, CORBA::Double theL1, 
-                          CORBA::Double theR2, CORBA::Double theW2, CORBA::Double theL2,
-                          CORBA::Boolean theHexMesh,
-                          GEOM::GEOM_Object_ptr theP1, GEOM::GEOM_Object_ptr theP2, GEOM::GEOM_Object_ptr theP3);
+                                                 CORBA::Double theR2, CORBA::Double theW2, CORBA::Double theL2,
+                                                 CORBA::Boolean theHexMesh,
+                                                 GEOM::GEOM_Object_ptr theP1, GEOM::GEOM_Object_ptr theP2, GEOM::GEOM_Object_ptr theP3);
   GEOM::GEOM_List_ptr MakePipeTShapeChamfer (CORBA::Double theR1, CORBA::Double theW1, CORBA::Double theL1, 
-                     CORBA::Double theR2, CORBA::Double theW2, CORBA::Double theL2,
-                     CORBA::Double theH, CORBA::Double theW, CORBA::Boolean theHexMesh);
+                                            CORBA::Double theR2, CORBA::Double theW2, CORBA::Double theL2,
+                                            CORBA::Double theH, CORBA::Double theW, CORBA::Boolean theHexMesh);
   GEOM::GEOM_List_ptr MakePipeTShapeChamferWithPosition (CORBA::Double theR1, CORBA::Double theW1, CORBA::Double theL1, 
-                             CORBA::Double theR2, CORBA::Double theW2, CORBA::Double theL2,
-                             CORBA::Double theH, CORBA::Double theW, CORBA::Boolean theHexMesh,
-                             GEOM::GEOM_Object_ptr theP1, GEOM::GEOM_Object_ptr theP2, GEOM::GEOM_Object_ptr theP3);
+                                                        CORBA::Double theR2, CORBA::Double theW2, CORBA::Double theL2,
+                                                        CORBA::Double theH, CORBA::Double theW, CORBA::Boolean theHexMesh,
+                                                        GEOM::GEOM_Object_ptr theP1, GEOM::GEOM_Object_ptr theP2, GEOM::GEOM_Object_ptr theP3);
   GEOM::GEOM_List_ptr MakePipeTShapeFillet (CORBA::Double theR1, CORBA::Double theW1, CORBA::Double theL1, 
-                        CORBA::Double theR2, CORBA::Double theW2, CORBA::Double theL2, 
-                        CORBA::Double theRF, CORBA::Boolean theHexMesh);
+                                           CORBA::Double theR2, CORBA::Double theW2, CORBA::Double theL2, 
+                                           CORBA::Double theRF, CORBA::Boolean theHexMesh);
   GEOM::GEOM_List_ptr MakePipeTShapeFilletWithPosition (CORBA::Double theR1, CORBA::Double theW1, CORBA::Double theL1, 
-                            CORBA::Double theR2, CORBA::Double theW2, CORBA::Double theL2, 
-                            CORBA::Double theRF, CORBA::Boolean theHexMesh,
-                            GEOM::GEOM_Object_ptr theP1, GEOM::GEOM_Object_ptr theP2, GEOM::GEOM_Object_ptr theP3);
+                                                       CORBA::Double theR2, CORBA::Double theW2, CORBA::Double theL2, 
+                                                       CORBA::Double theRF, CORBA::Boolean theHexMesh,
+                                                       GEOM::GEOM_Object_ptr theP1, GEOM::GEOM_Object_ptr theP2, GEOM::GEOM_Object_ptr theP3);
+  /*@@ insert new functions before this line @@*/
   
 private:
   SALOME_NamingService *  name_service; 
@@ -710,7 +711,6 @@ private:
   GEOM::GEOM_ILocalOperations_var     myLocalOp;
   GEOM::GEOM_IGroupOperations_var     myGroupOp;
   GEOM::GEOM_IAdvancedOperations_var  myAdvancedOp;
-
 };
 
 #endif