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

Additional changes: improve insertion markers to minimize accidental removing of them from the source code

diff --git a/doc/salome/gui/GEOM/input/creating_adv_obj.doc b/doc/salome/gui/GEOM/input/creating_adv_obj.doc
index 69a9a9eb1735f1e3404d82948586b8826abf78c0..030b88666618aba5833ddee205aad485a4fef3d8 100644 (file)
--- a/doc/salome/gui/GEOM/input/creating_adv_obj.doc
+++ b/doc/salome/gui/GEOM/input/creating_adv_obj.doc
@@ -18,7 +18,7 @@ entities:
 
 <ul>
 <li>\subpage create_pipetshape_page</li>
-<!--@@ insert new functions before this line @@-->
+<!--@@ insert new functions before this line @@ do not remove this line @@-->
 </ul>
 
 */

diff --git a/doc/salome/gui/GEOM/input/tui_advanced_geom_objs.doc b/doc/salome/gui/GEOM/input/tui_advanced_geom_objs.doc
index 724b2da43f2b9a4a0ed61e197162c3a9eace5ccb..f9f402a7e158b66f7f93d10c051aba80c37da6a9 100644 (file)
--- a/doc/salome/gui/GEOM/input/tui_advanced_geom_objs.doc
+++ b/doc/salome/gui/GEOM/input/tui_advanced_geom_objs.doc
@@ -296,5 +296,5 @@ gg.createAndDisplayGO(id_pipetshapefillet_position)
 
 \endcode
 
-<!--@@ insert new functions before this line @@-->
+<!--@@ insert new functions before this line @@ do not remove this line @@-->
 */

diff --git a/idl/GEOM_Gen.idl b/idl/GEOM_Gen.idl
index e03c73e29187bab0af93902501b960f83e925e1f..baf88a7805c3ac1099c63a427695b6411304ab3d 100644 (file)
--- a/idl/GEOM_Gen.idl
+++ b/idl/GEOM_Gen.idl
@@ -3274,7 +3274,7 @@ 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 @@*/
+    /*@@ insert new functions before this line @@ do not remove this line @@*/
   };
     
   /*!

diff --git a/idl/GEOM_Superv.idl b/idl/GEOM_Superv.idl
index 49fc3a9bcb1e8c45fbf1b29fad14531175990926..9b544281f8a374b405ce8f74792d8339ca285b27 100644 (file)
--- a/idl/GEOM_Superv.idl
+++ b/idl/GEOM_Superv.idl
@@ -606,7 +606,7 @@ module GEOM
                           in double theRF, in boolean theHexMesh,
                           in GEOM_Object theP1, in GEOM_Object theP2, in GEOM_Object theP3);
 
-    /*@@ insert new functions before this line @@*/
+    /*@@ insert new functions before this line @@ do not remove this line @@*/
  };
 };
 

diff --git a/resources/GEOMCatalog.xml.in b/resources/GEOMCatalog.xml.in
index 123be7637eeb47f272458fd5ef7375f00ec93790..41bab2a6b5ae9ab75cc9ee55eac9078f9a4ef82a 100644 (file)
--- a/resources/GEOMCatalog.xml.in
+++ b/resources/GEOMCatalog.xml.in
@@ -5225,7 +5225,7 @@
                         </outParameter-list>
                         <DataStream-list></DataStream-list>
                     </component-service>
-                    <!-- @@ insert new functions before this line @@ -->
+                    <!-- @@ insert new functions before this line @@ do not remove this line @@ -->
                 </component-service-list>
             </component-interface-list>
     </component>

diff --git a/resources/Makefile.am b/resources/Makefile.am
index 10edfcebc4e30a6edc0d6a49f0c55924c06d9d85..5212a40b96eeb31fd0ee0e388ece9ca568d88bf8 100644 (file)
--- a/resources/Makefile.am
+++ b/resources/Makefile.am
@@ -237,7 +237,7 @@ ADVANCED_RESOURCES += dlg_pipetshapechamferh.png dlg_pipetshapechamferw.png
 ADVANCED_RESOURCES += dlg_pipetshapefilletl1.png dlg_pipetshapefilletr1.png dlg_pipetshapefilletw1.png
 ADVANCED_RESOURCES += dlg_pipetshapefilletl2.png dlg_pipetshapefilletr2.png dlg_pipetshapefilletw2.png
 ADVANCED_RESOURCES += dlg_pipetshapefilletrf.png
-##@@ insert new functions before this line @@##
+##@@ insert new functions before this line @@ do not remove this line @@##
 
 dist_salomeres_DATA += $(ADVANCED_RESOURCES)
 

diff --git a/src/AdvancedGUI/AdvancedGUI.cxx b/src/AdvancedGUI/AdvancedGUI.cxx
index fb2f5507e99f75a74df991614fdb36951d0d24c9..f01116aaaf1770e819b375e81e180882ea58b054 100644 (file)
--- a/src/AdvancedGUI/AdvancedGUI.cxx
+++ b/src/AdvancedGUI/AdvancedGUI.cxx
@@ -29,7 +29,7 @@
 #include <SalomeApp_Application.h>
 
 #include "AdvancedGUI_PipeTShapeDlg.h"
-//@@ insert new functions before this line @@//
+//@@ insert new functions before this line @@ do not remove this line @@ do not remove this line @@//
 
 #include <QDialog>
 
@@ -69,7 +69,7 @@ bool AdvancedGUI::OnGUIEvent( int theCommandID, SUIT_Desktop* parent )
 //   case GEOMOp::OpPipeTShapeGroups:
 //     aDlg = new AdvancedGUI_PipeTShapeGroupsDlg( getGeometryGUI(), parent );
 //     break;
-  //@@ insert new functions before this line @@//
+  //@@ insert new functions before this line @@ do not remove this line @@ do not remove this line @@//
   default:
     app->putInfo( tr( "GEOM_PRP_COMMAND" ).arg( theCommandID ) );
     break;

diff --git a/src/AdvancedGUI/Makefile.am b/src/AdvancedGUI/Makefile.am
index 63c9afa5fa68f955e64aed2ac94e0954ceab80b6..b85eeb6c0157e5e86ba68c6ed54378632c24f864 100644 (file)
--- a/src/AdvancedGUI/Makefile.am
+++ b/src/AdvancedGUI/Makefile.am
@@ -28,7 +28,7 @@ salomeinclude_HEADERS =                       \
 
 ADVANCED_INCLUDES  =
 ADVANCED_INCLUDES += AdvancedGUI_PipeTShapeDlg.h
-##@@ insert new functions before this line @@##
+##@@ insert new functions before this line @@ do not remove this line @@ do not remove this line @@ do not remove this line @@##
 
 salomeinclude_HEADERS += $(ADVANCED_INCLUDES)
 
@@ -41,7 +41,7 @@ dist_libAdvancedGUI_la_SOURCES =      \
 
 ADVANCED_SOURCES  =
 ADVANCED_SOURCES += AdvancedGUI_PipeTShapeDlg.h AdvancedGUI_PipeTShapeDlg.cxx
-##@@ insert new functions before this line @@##
+##@@ insert new functions before this line @@ do not remove this line @@ do not remove this line @@ do not remove this line @@##
 
 dist_libAdvancedGUI_la_SOURCES += $(ADVANCED_SOURCES)
 
@@ -49,7 +49,7 @@ MOC_FILES =
 
 ADVANCED_MOC_FILES  =
 ADVANCED_MOC_FILES += AdvancedGUI_PipeTShapeDlg_moc.cxx
-##@@ insert new functions before this line @@##
+##@@ insert new functions before this line @@ do not remove this line @@ do not remove this line @@ do not remove this line @@##
 
 MOC_FILES += $(ADVANCED_MOC_FILES)
 

diff --git a/src/DlgRef/Makefile.am b/src/DlgRef/Makefile.am
index 4326144fe0975122aaca4188e80e0729c479523f..0aadfc72d83a8b9645b863dc7277d7eceadd0e27 100644 (file)
--- a/src/DlgRef/Makefile.am
+++ b/src/DlgRef/Makefile.am
@@ -88,7 +88,7 @@ UIC_FILES =                                   \
        ui_DlgRef_Skeleton_QTD.h
 
 ADVANCED_UIC_FILES  = 
-##@@ insert new functions before this line @@##
+##@@ insert new functions before this line @@ do not remove this line @@##
 
 UIC_FILES += $(ADVANCED_UIC_FILES)
 

diff --git a/src/GEOMGUI/GEOM_images.ts b/src/GEOMGUI/GEOM_images.ts
index 28b1fbb799727e45c77867280f28f9d0d69ce97d..96696220c2047ed7335568491c2ee7d45ea81fd5 100644 (file)
--- a/src/GEOMGUI/GEOM_images.ts
+++ b/src/GEOMGUI/GEOM_images.ts
@@ -1202,6 +1202,6 @@
             <translation>pipetshapegroups.png</translation>
         </message>
 -->
-       <!-- @@ insert new functions before this line @@ -->
+       <!-- @@ insert new functions before this line @@ do not remove this line @@ -->
     </context>
 </TS>

diff --git a/src/GEOMGUI/GEOM_msg_en.ts b/src/GEOMGUI/GEOM_msg_en.ts
index 9122b17fad39d166fcc41bdad4da83cc98694b9f..b54be9129f35bc42939e961d8f9bea1f1b88a318 100644 (file)
--- a/src/GEOMGUI/GEOM_msg_en.ts
+++ b/src/GEOMGUI/GEOM_msg_en.ts
@@ -4647,5 +4647,5 @@ Would you like to continue?</translation>
             <translation>Junction 3</translation>
         </message>
     </context>
-    <!-- @@ insert new functions before this line @@ -->
+    <!-- @@ insert new functions before this line @@ do not remove this line @@ -->
 </TS>

diff --git a/src/GEOMGUI/GeometryGUI.cxx b/src/GEOMGUI/GeometryGUI.cxx
index a9d3622dcd871ce73a2d6ed966b8713e1efb152d..855e3b6d829de7346fd4deb3e7abd71fa19ba68c 100644 (file)
--- a/src/GEOMGUI/GeometryGUI.cxx
+++ b/src/GEOMGUI/GeometryGUI.cxx
@@ -505,7 +505,7 @@ void GeometryGUI::OnGUIEvent( int id )
   case GEOMOp::OpAdvancedNoOp:     // NO OPERATION (advanced operations base)
   case GEOMOp::OpPipeTShape:       // MENU NEW ENTITY - ADVANCED - PIPE TSHAPE
 //   case GEOMOp::OpPipeTShapeGroups:     // MENU NEW ENTITY - ADVANCED - PIPE TSHAPE GROUPS
-    //@@ insert new functions before this line @@//
+    //@@ insert new functions before this line @@ do not remove this line @@ do not remove this line @@ do not remove this line @@ do not remove this line @@//
     libName = "AdvancedGUI";
     break;
   default:
@@ -735,7 +735,7 @@ void GeometryGUI::initialize( CAM_Application* app )
   
   createGeomAction( GEOMOp::OpPipeTShape, "PIPETSHAPE" );
 //   createGeomAction( GEOMOp::OpPipeTShapeGroups, "PIPETSHAPEGROUPS" );
-  //@@ insert new functions before this line @@//
+  //@@ insert new functions before this line @@ do not remove this line @@ do not remove this line @@ do not remove this line @@ do not remove this line @@//
 
   // ---- create menus --------------------------
 
@@ -780,7 +780,7 @@ void GeometryGUI::initialize( CAM_Application* app )
   int advId = createMenu( tr( "MEN_ADVANCED" ), newEntId, -1 );
   createMenu( GEOMOp::OpPipeTShape, advId, -1 );
 //   createMenu( GEOMOp::OpPipeTShapeGroups, advId, -1 );
-  //@@ insert new functions before this line @@//
+  //@@ insert new functions before this line @@ do not remove this line @@ do not remove this line @@ do not remove this line @@ do not remove this line @@//
 
   createMenu( separator(), newEntId, -1 );
 
@@ -1005,7 +1005,7 @@ void GeometryGUI::initialize( CAM_Application* app )
 
   int advancedTbId = createTool( tr( "TOOL_ADVANCED" ) );
   createTool( GEOMOp::OpPipeTShape, advancedTbId );
-  //@@ insert new functions before this line @@//
+  //@@ insert new functions before this line @@ do not remove this line @@ do not remove this line @@ do not remove this line @@ do not remove this line @@//
 
   // ---- create popup menus --------------------------
 

diff --git a/src/GEOMGUI/GeometryGUI_Operations.h b/src/GEOMGUI/GeometryGUI_Operations.h
index dd4eca605ec01d6ad1919a544d03fab4535e92d5..5b0be0dfa5fe9724edf3b94d78267c2267a74616 100644 (file)
--- a/src/GEOMGUI/GeometryGUI_Operations.h
+++ b/src/GEOMGUI/GeometryGUI_Operations.h
@@ -157,7 +157,7 @@ namespace GEOMOp {
     OpAdvancedNoOp      = 10000,  // NO OPERATION (advanced operations base)
     OpPipeTShape        = 10001,  // MENU NEW ENTITY - ADVANCED - PIPE TSHAPE
 //     OpPipeTShapeGroups  = 10002,  // MENU NEW ENTITY - ADVANCED - PIPE TSHAPE GROUPS
-    //@@ insert new functions before this line @@//
+    //@@ insert new functions before this line @@ do not remove this line @@//
   };
 } 
 

diff --git a/src/GEOMImpl/GEOMImpl_Gen.cxx b/src/GEOMImpl/GEOMImpl_Gen.cxx
index 088ee4fa9a150bbf94dfc86c603229f5dcdfd289..95b33cd2db28bae3366f3e685ee4d85fbe1adee6 100644 (file)
--- a/src/GEOMImpl/GEOMImpl_Gen.cxx
+++ b/src/GEOMImpl/GEOMImpl_Gen.cxx
@@ -82,7 +82,7 @@
 #include <GEOMImpl_MeasureDriver.hxx>
 // Advanced operations
 #include <GEOMImpl_PipeTShapeDriver.hxx>
-/*@@ insert new functions before this line @@*/
+/*@@ insert new functions before this line @@ do not remove this line @@ do not remove this line @@*/
 
 //=============================================================================
 /*!
@@ -164,7 +164,7 @@ GEOMImpl_Gen::GEOMImpl_Gen()
 
    // Advanced operations
    TFunction_DriverTable::Get()->AddDriver(GEOMImpl_PipeTShapeDriver::GetID(), new GEOMImpl_PipeTShapeDriver());
-   /*@@ insert new functions before this line @@*/
+   /*@@ insert new functions before this line @@ do not remove this line @@ do not remove this line @@*/
 
    SetEngine(this);
 }

diff --git a/src/GEOMImpl/GEOMImpl_IAdvancedOperations.cxx b/src/GEOMImpl/GEOMImpl_IAdvancedOperations.cxx
index f6f81d5f95235649e3e815936c92a10c062ca181..4ca50c240eaf785585cac688b71492dbe42cf4e6 100644 (file)
--- a/src/GEOMImpl/GEOMImpl_IAdvancedOperations.cxx
+++ b/src/GEOMImpl/GEOMImpl_IAdvancedOperations.cxx
@@ -57,7 +57,7 @@
 #include <BRep_Tool.hxx>
 #include <cmath>
 
-/*@@ insert new functions before this line @@*/
+/*@@ insert new functions before this line @@ do not remove this line @@ do not remove this line @@*/
 
 #include <TFunction_DriverTable.hxx>
 #include <TFunction_Driver.hxx>
@@ -2063,4 +2063,4 @@ GEOMImpl_IAdvancedOperations::MakePipeTShapeFilletWithPosition(double theR1, dou
   return aSeq;
 }
 
-/*@@ insert new functions before this line @@*/
+/*@@ insert new functions before this line @@ do not remove this line @@ do not remove this line @@*/

diff --git a/src/GEOMImpl/GEOMImpl_IAdvancedOperations.hxx b/src/GEOMImpl/GEOMImpl_IAdvancedOperations.hxx
index a9c6fbd2281f0cc3f2267513fdbba4afe18c15b1..2b7b91892d446d83d6fb315784fcd9a6a4438030 100644 (file)
--- a/src/GEOMImpl/GEOMImpl_IAdvancedOperations.hxx
+++ b/src/GEOMImpl/GEOMImpl_IAdvancedOperations.hxx
@@ -108,6 +108,6 @@ public:
                                                   Handle(GEOM_Object) P1 = 0,
                                                   Handle(GEOM_Object) P2 = 0,
                                                   Handle(GEOM_Object) P3 = 0);
-  /*@@ insert new functions before this line @@*/
+  /*@@ insert new functions before this line @@ do not remove this line @@*/
 };
 #endif

diff --git a/src/GEOMImpl/GEOMImpl_Types.hxx b/src/GEOMImpl/GEOMImpl_Types.hxx
index 6de154defa4eb330fc89fab234177756da497a3d..b1d626427dad148325ce8ddf0f7e36db0bf09e71 100755 (executable)
--- a/src/GEOMImpl/GEOMImpl_Types.hxx
+++ b/src/GEOMImpl/GEOMImpl_Types.hxx
@@ -304,9 +304,9 @@
 // Advanced functions (base = 200)
 #define ADVANCED_BASE 200  // NO OPERATION (advanced operations base)
 #define GEOM_TSHAPE 201
-/*@@ insert new functions before this line @@*/
+/*@@ insert new functions before this line @@ do not remove this line @@ do not remove this line @@*/
 // Advanced functions sub-operations codes
 #define TSHAPE_BASIC 1
 #define TSHAPE_CHAMFER 2
 #define TSHAPE_FILLET 3
-/*@@ insert new functions before this line @@*/
+/*@@ insert new functions before this line @@ do not remove this line @@ do not remove this line @@*/

diff --git a/src/GEOMImpl/Makefile.am b/src/GEOMImpl/Makefile.am
index 2468b41ec429bb96d3b2a83744b6f0b6b638c65a..94094bca3535eee743716390738aa58e57d898a5 100644 (file)
--- a/src/GEOMImpl/Makefile.am
+++ b/src/GEOMImpl/Makefile.am
@@ -146,7 +146,7 @@ salomeinclude_HEADERS =                             \
 
 ADVANCED_INCLUDES  =
 ADVANCED_INCLUDES += GEOMImpl_IPipeTShape.hxx GEOMImpl_PipeTShapeDriver.hxx
-##@@ insert new functions before this line @@##
+##@@ insert new functions before this line @@ do not remove this line @@ do not remove this line @@##
 
 salomeinclude_HEADERS += $(ADVANCED_INCLUDES)
 
@@ -215,7 +215,7 @@ dist_libGEOMimpl_la_SOURCES =                       \
 
 ADVANCED_SOURCES  =
 ADVANCED_SOURCES += GEOMImpl_PipeTShapeDriver.cxx
-##@@ insert new functions before this line @@##
+##@@ insert new functions before this line @@ do not remove this line @@ do not remove this line @@##
 
 dist_libGEOMimpl_la_SOURCES += $(ADVANCED_SOURCES)
 

diff --git a/src/GEOM_I/GEOM_IAdvancedOperations_i.cc b/src/GEOM_I/GEOM_IAdvancedOperations_i.cc
index 56f601910c49db44acf47b285b489157e68670e4..ed10e3110ebda323c2aabdc14b7941093c4390f5 100644 (file)
--- a/src/GEOM_I/GEOM_IAdvancedOperations_i.cc
+++ b/src/GEOM_I/GEOM_IAdvancedOperations_i.cc
@@ -321,4 +321,4 @@ GEOM::ListOfGO* GEOM_IAdvancedOperations_i::MakePipeTShapeFilletWithPosition (CO
   return aSeq._retn();
 }
 
-/*@@ insert new functions before this line @@*/
+/*@@ insert new functions before this line @@ do not remove this line @@*/

diff --git a/src/GEOM_I/GEOM_IAdvancedOperations_i.hh b/src/GEOM_I/GEOM_IAdvancedOperations_i.hh
index 9be9a729878cdd88af5498eaa0e97d24d4e55d8c..1f7e2e3c9d71efdc53e55b1a9987fc168b1bd458 100644 (file)
--- a/src/GEOM_I/GEOM_IAdvancedOperations_i.hh
+++ b/src/GEOM_I/GEOM_IAdvancedOperations_i.hh
@@ -63,7 +63,7 @@ class GEOM_I_EXPORT GEOM_IAdvancedOperations_i :
                                                    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 @@*/
+  /*@@ insert new functions before this line @@ do not remove this line @@*/
 
   ::GEOMImpl_IAdvancedOperations* GetOperations()
   { return (::GEOMImpl_IAdvancedOperations*)GetImpl(); }

diff --git a/src/GEOM_I_Superv/GEOM_Superv_i.cc b/src/GEOM_I_Superv/GEOM_Superv_i.cc
index b87ca1c4570b9f124da22103efd855aba883cad1..95c581f7fafb0303cffc15fb005a0cd5b488c6b0 100644 (file)
--- a/src/GEOM_I_Superv/GEOM_Superv_i.cc
+++ b/src/GEOM_I_Superv/GEOM_Superv_i.cc
@@ -3315,7 +3315,7 @@ GEOM::GEOM_List_ptr GEOM_Superv_i::MakePipeTShapeFilletWithPosition (CORBA::Doub
   return aSeqPtr->_this();
 }
 
-/*@@ insert new functions before this line @@*/
+/*@@ insert new functions before this line @@ do not remove 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 aee8b2a06297647170116587c8b3d6a5fc906afa..c713705ed52a5571c2af52d2634f48ce96d6116f 100644 (file)
--- a/src/GEOM_I_Superv/GEOM_Superv_i.hh
+++ b/src/GEOM_I_Superv/GEOM_Superv_i.hh
@@ -691,7 +691,7 @@ public:
                                                        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 @@*/
+  /*@@ insert new functions before this line @@ do not remove this line @@*/
   
 private:
   SALOME_NamingService *  name_service; 

diff --git a/src/GEOM_SWIG/geompyDC.py b/src/GEOM_SWIG/geompyDC.py
index 24a1a961c5c9809a5fa86271329add89726528c9..24e2406f0104708475815a469faa3f5db076ed79 100644 (file)
--- a/src/GEOM_SWIG/geompyDC.py
+++ b/src/GEOM_SWIG/geompyDC.py
@@ -4224,7 +4224,7 @@ class geompyDC(GEOM._objref_GEOM_Gen):
             if Parameters: anObj[0].SetParameters(Parameters)
             return anObj
 
-        #@@ insert new functions before this line @@#
+        #@@ insert new functions before this line @@ do not remove this line @@#
 
         # end of l4_advanced
         ## @}