ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2024-12-26 09:20:35 +05:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Additional changes: improve insertion markers to minimize accidental removing of them from the source code
This commit is contained in:
vsr 2010-04-29 16:22:24 +00:00
parent 05f6ac13c1
commit 67726293a6
23 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/salome/gui/GEOM/input/creating_adv_obj.doc
View File

@ -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>
*/

2
doc/salome/gui/GEOM/input/tui_advanced_geom_objs.doc
View File

@ -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 @@-->
*/

2
idl/GEOM_Gen.idl
View File

@ -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 @@*/
};
/*!

2
idl/GEOM_Superv.idl
View File

@ -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 @@*/
};
};

2
resources/GEOMCatalog.xml.in
View File

@ -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>

2
resources/Makefile.am
View File

@ -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)

4
src/AdvancedGUI/AdvancedGUI.cxx
View File

@ -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;

6
src/AdvancedGUI/Makefile.am
View File

@ -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)

2
src/DlgRef/Makefile.am
View File

@ -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)

2
src/GEOMGUI/GEOM_images.ts
View File

@ -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>

2
src/GEOMGUI/GEOM_msg_en.ts
View File

@ -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>

8
src/GEOMGUI/GeometryGUI.cxx
View File

@ -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 --------------------------

2
src/GEOMGUI/GeometryGUI_Operations.h
View File

@ -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 @@//
};
}

4
src/GEOMImpl/GEOMImpl_Gen.cxx
View File

@ -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);
}

4
src/GEOMImpl/GEOMImpl_IAdvancedOperations.cxx
View File

@ -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 @@*/

2
src/GEOMImpl/GEOMImpl_IAdvancedOperations.hxx
View File

@ -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

4
src/GEOMImpl/GEOMImpl_Types.hxx
View File

@ -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 @@*/

4
src/GEOMImpl/Makefile.am
View File

@ -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)

2
src/GEOM_I/GEOM_IAdvancedOperations_i.cc
View File

@ -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 @@*/

2
src/GEOM_I/GEOM_IAdvancedOperations_i.hh
View File

@ -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(); }

2
src/GEOM_I_Superv/GEOM_Superv_i.cc
View File

@ -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

2
src/GEOM_I_Superv/GEOM_Superv_i.hh
View File

@ -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;

2
src/GEOM_SWIG/geompyDC.py
View File

@ -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
## @}