ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2025-01-24 11:00:33 +05:00
Code Issues Packages Projects Releases Wiki Activity

NRI : Replace Geometry by GEOM.

Browse Source
This commit is contained in:
nri 2003-05-19 07:18:06 +00:00
parent 15fed18c3e
commit 5608a7dcc0
53 changed files with 185 additions and 185 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/GEOMGUI/GeometryGUI.cxx
View File

@ -4195,7 +4195,7 @@ bool GeometryGUI::OnGUIEvent(int theCommandID, QAD_Desktop* parent)
if (!obj->FindAttribute(anAttr, "AttributeIOR") && if (!obj->FindAttribute(anAttr, "AttributeIOR") &&
obj->FindAttribute(anAttr, "AttributePersistentRef")) { obj->FindAttribute(anAttr, "AttributePersistentRef")) {
// load // load
Engines::Component_var comp = GeomGUI->myDesktop->getEngine("FactoryServer","Geometry"); Engines::Component_var comp = GeomGUI->myDesktop->getEngine("FactoryServer","GEOM");
if (!CORBA::is_nil(comp)) { if (!CORBA::is_nil(comp)) {
SALOMEDS::Driver_var driver = SALOMEDS::Driver::_narrow(comp); SALOMEDS::Driver_var driver = SALOMEDS::Driver::_narrow(comp);

6
src/GEOMGUI/GeometryGUI_ArcDlg.cxx
View File

@ -38,8 +38,8 @@ using namespace std;
GeometryGUI_ArcDlg::GeometryGUI_ArcDlg( QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl ) GeometryGUI_ArcDlg::GeometryGUI_ArcDlg( QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl )
: QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu ) : QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu )
{ {
QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_ARC"))); QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_ARC")));
QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_SELECT"))); QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_SELECT")));
if ( !name ) if ( !name )
setName( "GeometryGUI_ArcDlg" ); setName( "GeometryGUI_ArcDlg" );
@ -188,7 +188,7 @@ void GeometryGUI_ArcDlg::Init( SALOME_Selection* Sel )
// TODO : previous selection into argument ? // TODO : previous selection into argument ?
/* Filter definitions */ /* Filter definitions */
Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "Geometry"); Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
myGeom = GEOM::GEOM_Gen::_narrow(comp); myGeom = GEOM::GEOM_Gen::_narrow(comp);
myVertexFilter = new GEOM_ShapeTypeFilter( TopAbs_VERTEX, myGeom ); myVertexFilter = new GEOM_ShapeTypeFilter( TopAbs_VERTEX, myGeom );
mySelection->AddFilter(myVertexFilter) ; mySelection->AddFilter(myVertexFilter) ;

6
src/GEOMGUI/GeometryGUI_ArchimedeDlg.cxx
View File

@ -41,8 +41,8 @@ using namespace std;
GeometryGUI_ArchimedeDlg::GeometryGUI_ArchimedeDlg( QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl ) GeometryGUI_ArchimedeDlg::GeometryGUI_ArchimedeDlg( QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl )
: QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu ) : QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu )
{ {
QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_ARCHIMEDE"))); QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_ARCHIMEDE")));
QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_SELECT"))); QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_SELECT")));
if ( !name ) if ( !name )
setName( "GeometryGUI_ArchimedeDlg" ); setName( "GeometryGUI_ArchimedeDlg" );
@ -224,7 +224,7 @@ void GeometryGUI_ArchimedeDlg::Init( SALOME_Selection* Sel )
myGeomGUI->SetActiveDialogBox( (QDialog*)this ) ; myGeomGUI->SetActiveDialogBox( (QDialog*)this ) ;
/* Filter definitions */ /* Filter definitions */
Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "Geometry"); Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
myGeom = GEOM::GEOM_Gen::_narrow(comp); myGeom = GEOM::GEOM_Gen::_narrow(comp);
/* signals and slots connections */ /* signals and slots connections */

6
src/GEOMGUI/GeometryGUI_BndBoxDlg.cxx
View File

@ -42,8 +42,8 @@ using namespace std;
GeometryGUI_BndBoxDlg::GeometryGUI_BndBoxDlg( QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl ) GeometryGUI_BndBoxDlg::GeometryGUI_BndBoxDlg( QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl )
: QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu ) : QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu )
{ {
QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_BOUNDING_BOX"))); QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_BOUNDING_BOX")));
QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_SELECT"))); QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_SELECT")));
if ( !name ) if ( !name )
setName( "GeometryGUI_BndBoxDlg" ); setName( "GeometryGUI_BndBoxDlg" );
@ -235,7 +235,7 @@ void GeometryGUI_BndBoxDlg::Init( SALOME_Selection* Sel )
// TODO : previous selection into argument ? // TODO : previous selection into argument ?
/* Filter definitions */ /* Filter definitions */
Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "Geometry"); Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
myGeom = GEOM::GEOM_Gen::_narrow(comp); myGeom = GEOM::GEOM_Gen::_narrow(comp);
/* signals and slots connections */ /* signals and slots connections */

8
src/GEOMGUI/GeometryGUI_BoxDlg.cxx
View File

@ -46,9 +46,9 @@ using namespace std;
GeometryGUI_BoxDlg::GeometryGUI_BoxDlg( QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl ) GeometryGUI_BoxDlg::GeometryGUI_BoxDlg( QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl )
: QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu ) : QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu )
{ {
QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_BOX_2P"))); QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_BOX_2P")));
QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_SELECT"))); QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_SELECT")));
QPixmap image2(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_BOX_DXYZ"))); QPixmap image2(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_BOX_DXYZ")));
if ( !name ) if ( !name )
setName( "GeometryGUI_BoxDlg" ); setName( "GeometryGUI_BoxDlg" );
@ -243,7 +243,7 @@ void GeometryGUI_BoxDlg::Init(SALOME_Selection *Sel)
// TODO previous selection into argument ? // TODO previous selection into argument ?
/* Vertices Filter for all arguments */ /* Vertices Filter for all arguments */
Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "Geometry"); Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
myGeom = GEOM::GEOM_Gen::_narrow(comp); myGeom = GEOM::GEOM_Gen::_narrow(comp);
myVertexFilter = new GEOM_ShapeTypeFilter( TopAbs_VERTEX, myGeom ); myVertexFilter = new GEOM_ShapeTypeFilter( TopAbs_VERTEX, myGeom );
mySelection->AddFilter( myVertexFilter ); /* filter for next selection */ mySelection->AddFilter( myVertexFilter ); /* filter for next selection */

6
src/GEOMGUI/GeometryGUI_CenterMassDlg.cxx
View File

@ -36,8 +36,8 @@ using namespace std;
GeometryGUI_CenterMassDlg::GeometryGUI_CenterMassDlg( QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl ) GeometryGUI_CenterMassDlg::GeometryGUI_CenterMassDlg( QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl )
: QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu ) : QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu )
{ {
QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_CENTERMASS"))); QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_CENTERMASS")));
QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_SELECT"))); QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_SELECT")));
if ( !name ) if ( !name )
setName( "GeometryGUI_CenterMassDlg" ); setName( "GeometryGUI_CenterMassDlg" );
@ -223,7 +223,7 @@ void GeometryGUI_CenterMassDlg::Init( SALOME_Selection* Sel )
// TODO : previous selection into argument ? // TODO : previous selection into argument ?
/* Filter definitions */ /* Filter definitions */
Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "Geometry"); Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
myGeom = GEOM::GEOM_Gen::_narrow(comp); myGeom = GEOM::GEOM_Gen::_narrow(comp);
/* signals and slots connections */ /* signals and slots connections */

10
src/GEOMGUI/GeometryGUI_ChamferDlg.cxx
View File

@ -56,10 +56,10 @@ GeometryGUI_ChamferDlg::GeometryGUI_ChamferDlg( QWidget* parent,
: QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu ) : QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu )
{ {
/***************************************************************/ /***************************************************************/
QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_CHAMFER_ALL"))); QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_CHAMFER_ALL")));
QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_SELECT"))); QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_SELECT")));
QPixmap image2(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_CHAMFER_EDGE"))); QPixmap image2(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_CHAMFER_EDGE")));
QPixmap image3(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_CHAMFER_FACE"))); QPixmap image3(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_CHAMFER_FACE")));
if ( !name ) if ( !name )
setName( "GeometryGUI_ChamferDlg" ); setName( "GeometryGUI_ChamferDlg" );
@ -388,7 +388,7 @@ void GeometryGUI_ChamferDlg::Init( SALOME_Selection* Sel, Handle (AIS_Interactiv
mySimulationTopoDs.Nullify() ; mySimulationTopoDs.Nullify() ;
/* Filters definition */ /* Filters definition */
Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "Geometry"); Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
myGeom = GEOM::GEOM_Gen::_narrow(comp); myGeom = GEOM::GEOM_Gen::_narrow(comp);
/* signals and slots connections */ /* signals and slots connections */

6
src/GEOMGUI/GeometryGUI_CheckShape.cxx
View File

@ -44,8 +44,8 @@ using namespace std;
GeometryGUI_CheckShape::GeometryGUI_CheckShape( QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl ) GeometryGUI_CheckShape::GeometryGUI_CheckShape( QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl )
: QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu ) : QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu )
{ {
QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_CHECKSHAPE"))); QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_CHECKSHAPE")));
QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_SELECT"))); QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_SELECT")));
if ( !name ) if ( !name )
setName( "DialogBox_CHECKSHAPE" ); setName( "DialogBox_CHECKSHAPE" );
@ -170,7 +170,7 @@ void GeometryGUI_CheckShape::Init( SALOME_Selection* Sel )
// TODO : previous selection into argument ? // TODO : previous selection into argument ?
/* Filter definitions */ /* Filter definitions */
Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "Geometry"); Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
myGeom = GEOM::GEOM_Gen::_narrow(comp); myGeom = GEOM::GEOM_Gen::_narrow(comp);
/* signals and slots connections */ /* signals and slots connections */

6
src/GEOMGUI/GeometryGUI_CircleDlg.cxx
View File

@ -41,8 +41,8 @@ using namespace std;
GeometryGUI_CircleDlg::GeometryGUI_CircleDlg( QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl ) GeometryGUI_CircleDlg::GeometryGUI_CircleDlg( QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl )
: QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu ) : QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu )
{ {
QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_CIRCLE_PV"))); QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_CIRCLE_PV")));
QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_SELECT"))); QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_SELECT")));
if ( !name ) if ( !name )
setName( "GeometryGUI_CircleDlg" ); setName( "GeometryGUI_CircleDlg" );
@ -190,7 +190,7 @@ void GeometryGUI_CircleDlg::Init( SALOME_Selection* Sel )
// TODO : previous selection into argument ? // TODO : previous selection into argument ?
/* Filter definitions */ /* Filter definitions */
Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "Geometry"); Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
myGeom = GEOM::GEOM_Gen::_narrow(comp); myGeom = GEOM::GEOM_Gen::_narrow(comp);
myEdgeFilter = new GEOM_EdgeFilter( StdSelect_Line, myGeom ); myEdgeFilter = new GEOM_EdgeFilter( StdSelect_Line, myGeom );
myVertexFilter = new GEOM_ShapeTypeFilter( TopAbs_VERTEX, myGeom ); myVertexFilter = new GEOM_ShapeTypeFilter( TopAbs_VERTEX, myGeom );

6
src/GEOMGUI/GeometryGUI_CommonDlg.cxx
View File

@ -39,8 +39,8 @@ using namespace std;
GeometryGUI_CommonDlg::GeometryGUI_CommonDlg( QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl ) GeometryGUI_CommonDlg::GeometryGUI_CommonDlg( QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl )
: QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu ) : QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu )
{ {
QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_COMMON"))); QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_COMMON")));
QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_SELECT"))); QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_SELECT")));
if ( !name ) if ( !name )
setName( "GeometryGUI_CommonDlg" ); setName( "GeometryGUI_CommonDlg" );
@ -177,7 +177,7 @@ void GeometryGUI_CommonDlg::Init( SALOME_Selection* Sel )
myGeomGUI->SetActiveDialogBox( (QDialog*)this ) ; myGeomGUI->SetActiveDialogBox( (QDialog*)this ) ;
Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "Geometry"); Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
myGeom = GEOM::GEOM_Gen::_narrow(comp); myGeom = GEOM::GEOM_Gen::_narrow(comp);
// TODO previous selection into argument // TODO previous selection into argument

6
src/GEOMGUI/GeometryGUI_CompoundDlg.cxx
View File

@ -37,8 +37,8 @@ using namespace std;
GeometryGUI_CompoundDlg::GeometryGUI_CompoundDlg( QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl ) GeometryGUI_CompoundDlg::GeometryGUI_CompoundDlg( QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl )
: QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu ) : QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu )
{ {
QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_BUILD_COMPOUND"))); QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_BUILD_COMPOUND")));
QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_SELECT"))); QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_SELECT")));
if ( !name ) if ( !name )
setName( "GeometryGUI_CompoundDlg" ); setName( "GeometryGUI_CompoundDlg" );
resize( 303, 175 ); resize( 303, 175 );
@ -160,7 +160,7 @@ void GeometryGUI_CompoundDlg::Init( SALOME_Selection* Sel )
// TODO : previous selection into argument ? // TODO : previous selection into argument ?
/* Filter definitions */ /* Filter definitions */
Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "Geometry"); Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
myGeom = GEOM::GEOM_Gen::_narrow(comp); myGeom = GEOM::GEOM_Gen::_narrow(comp);
/* signals and slots connections */ /* signals and slots connections */

8
src/GEOMGUI/GeometryGUI_ConeDlg.cxx
View File

@ -42,9 +42,9 @@ using namespace std;
GeometryGUI_ConeDlg::GeometryGUI_ConeDlg( QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl ) GeometryGUI_ConeDlg::GeometryGUI_ConeDlg( QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl )
: QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu ) : QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu )
{ {
QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_CONE_PV"))); QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_CONE_PV")));
QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_SELECT"))); QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_SELECT")));
QPixmap image2(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_CONE_DXYZ"))); QPixmap image2(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_CONE_DXYZ")));
if ( !name ) if ( !name )
setName( "GeometryGUI_ConeDlg" ); setName( "GeometryGUI_ConeDlg" );
@ -285,7 +285,7 @@ void GeometryGUI_ConeDlg::Init( SALOME_Selection* Sel )
// TODO : previous selection into argument ? // TODO : previous selection into argument ?
/* Filter definitions */ /* Filter definitions */
Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "Geometry"); Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
myGeom = GEOM::GEOM_Gen::_narrow(comp); myGeom = GEOM::GEOM_Gen::_narrow(comp);
myEdgeFilter = new GEOM_EdgeFilter( StdSelect_Line, myGeom ); myEdgeFilter = new GEOM_EdgeFilter( StdSelect_Line, myGeom );
myVertexFilter = new GEOM_ShapeTypeFilter( TopAbs_VERTEX, myGeom ); myVertexFilter = new GEOM_ShapeTypeFilter( TopAbs_VERTEX, myGeom );

6
src/GEOMGUI/GeometryGUI_CutDlg.cxx
View File

@ -40,8 +40,8 @@ using namespace std;
GeometryGUI_CutDlg::GeometryGUI_CutDlg( QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl ) GeometryGUI_CutDlg::GeometryGUI_CutDlg( QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl )
: QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu ) : QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu )
{ {
QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_CUT"))); QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_CUT")));
QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_SELECT"))); QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_SELECT")));
if ( !name ) if ( !name )
setName( "GeometryGUI_CutDlg" ); setName( "GeometryGUI_CutDlg" );
@ -178,7 +178,7 @@ void GeometryGUI_CutDlg::Init( SALOME_Selection* Sel )
myGeomGUI->SetActiveDialogBox( (QDialog*)this ) ; myGeomGUI->SetActiveDialogBox( (QDialog*)this ) ;
Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "Geometry"); Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
myGeom = GEOM::GEOM_Gen::_narrow(comp); myGeom = GEOM::GEOM_Gen::_narrow(comp);
// TODO previous selection into argument ? // TODO previous selection into argument ?

8
src/GEOMGUI/GeometryGUI_CylinderDlg.cxx
View File

@ -40,9 +40,9 @@ using namespace std;
GeometryGUI_CylinderDlg::GeometryGUI_CylinderDlg( QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl ) GeometryGUI_CylinderDlg::GeometryGUI_CylinderDlg( QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl )
: QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu ) : QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu )
{ {
QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_CYLINDER_PV"))); QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_CYLINDER_PV")));
QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_SELECT"))); QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_SELECT")));
QPixmap image2(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_CYLINDER_DXYZ"))); QPixmap image2(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_CYLINDER_DXYZ")));
if ( !name ) if ( !name )
setName( "GeometryGUI_CylinderDlg" ); setName( "GeometryGUI_CylinderDlg" );
@ -263,7 +263,7 @@ void GeometryGUI_CylinderDlg::Init( SALOME_Selection* Sel )
// TODO : previous selection into argument ? // TODO : previous selection into argument ?
/* Filter definitions */ /* Filter definitions */
Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "Geometry"); Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
myGeom = GEOM::GEOM_Gen::_narrow(comp); myGeom = GEOM::GEOM_Gen::_narrow(comp);
myEdgeFilter = new GEOM_EdgeFilter( StdSelect_Line, myGeom ); myEdgeFilter = new GEOM_EdgeFilter( StdSelect_Line, myGeom );
myVertexFilter = new GEOM_ShapeTypeFilter( TopAbs_VERTEX, myGeom ); myVertexFilter = new GEOM_ShapeTypeFilter( TopAbs_VERTEX, myGeom );

6
src/GEOMGUI/GeometryGUI_DistanceDlg.cxx
View File

@ -52,8 +52,8 @@ using namespace std;
GeometryGUI_DistanceDlg::GeometryGUI_DistanceDlg( QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl ) GeometryGUI_DistanceDlg::GeometryGUI_DistanceDlg( QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl )
: QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu ) : QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu )
{ {
QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_MINDIST"))); QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_MINDIST")));
QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_SELECT"))); QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_SELECT")));
if ( !name ) if ( !name )
setName( "GeometryGUI_DistanceDlg" ); setName( "GeometryGUI_DistanceDlg" );
@ -202,7 +202,7 @@ void GeometryGUI_DistanceDlg::Init( SALOME_Selection* Sel )
myGeomGUI->SetActiveDialogBox( (QDialog*)this ) ; myGeomGUI->SetActiveDialogBox( (QDialog*)this ) ;
Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "Geometry"); Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
myGeom = GEOM::GEOM_Gen::_narrow(comp); myGeom = GEOM::GEOM_Gen::_narrow(comp);
// TODO previous selection into argument ? // TODO previous selection into argument ?

6
src/GEOMGUI/GeometryGUI_EdgeDlg.cxx
View File

@ -39,8 +39,8 @@ using namespace std;
GeometryGUI_EdgeDlg::GeometryGUI_EdgeDlg( QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl ) GeometryGUI_EdgeDlg::GeometryGUI_EdgeDlg( QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl )
: QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu ) : QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu )
{ {
QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_BUILD_EDGE"))); QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_BUILD_EDGE")));
QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_SELECT"))); QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_SELECT")));
if ( !name ) if ( !name )
setName( "GeometryGUI_EdgeDlg" ); setName( "GeometryGUI_EdgeDlg" );
@ -178,7 +178,7 @@ void GeometryGUI_EdgeDlg::Init( SALOME_Selection* Sel )
// TODO : previous selection into argument ? // TODO : previous selection into argument ?
/* Filters definition */ /* Filters definition */
Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "Geometry"); Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
myGeom = GEOM::GEOM_Gen::_narrow(comp); myGeom = GEOM::GEOM_Gen::_narrow(comp);
myVertexFilter = new GEOM_ShapeTypeFilter( TopAbs_VERTEX, myGeom ); myVertexFilter = new GEOM_ShapeTypeFilter( TopAbs_VERTEX, myGeom );
mySelection->AddFilter(myVertexFilter) ; /* first filter used */ mySelection->AddFilter(myVertexFilter) ; /* first filter used */

6
src/GEOMGUI/GeometryGUI_FaceDlg.cxx
View File

@ -41,8 +41,8 @@ using namespace std;
GeometryGUI_FaceDlg::GeometryGUI_FaceDlg( QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl ) GeometryGUI_FaceDlg::GeometryGUI_FaceDlg( QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl )
: QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu ) : QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu )
{ {
QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_BUILD_FACE"))); QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_BUILD_FACE")));
QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_SELECT"))); QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_SELECT")));
if ( !name ) if ( !name )
setName( "GeometryGUI_FaceDlg" ); setName( "GeometryGUI_FaceDlg" );
@ -171,7 +171,7 @@ void GeometryGUI_FaceDlg::Init( SALOME_Selection* Sel )
// TODO previous selection into argument ? // TODO previous selection into argument ?
/* Filter definitions */ /* Filter definitions */
Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "Geometry"); Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
myGeom = GEOM::GEOM_Gen::_narrow(comp); myGeom = GEOM::GEOM_Gen::_narrow(comp);
myWireFilter = new GEOM_ShapeTypeFilter( TopAbs_WIRE, myGeom ); myWireFilter = new GEOM_ShapeTypeFilter( TopAbs_WIRE, myGeom );
mySelection->AddFilter(myWireFilter) ; /* first filter used */ mySelection->AddFilter(myWireFilter) ; /* first filter used */

10
src/GEOMGUI/GeometryGUI_FilletDlg.cxx
View File

@ -55,10 +55,10 @@ GeometryGUI_FilletDlg::GeometryGUI_FilletDlg( QWidget* parent,
: QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu ) : QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu )
{ {
/***************************************************************/ /***************************************************************/
QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_FILLET_ALL"))); QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_FILLET_ALL")));
QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_SELECT"))); QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_SELECT")));
QPixmap image2(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_FILLET_EDGE"))); QPixmap image2(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_FILLET_EDGE")));
QPixmap image3(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_FILLET_FACE"))); QPixmap image3(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_FILLET_FACE")));
if ( !name ) if ( !name )
setName( "GeometryGUI_FilletDlg" ); setName( "GeometryGUI_FilletDlg" );
@ -321,7 +321,7 @@ void GeometryGUI_FilletDlg::Init( SALOME_Selection* Sel, Handle (AIS_Interactive
mySimulationTopoDs.Nullify() ; mySimulationTopoDs.Nullify() ;
/* Filters definition */ /* Filters definition */
Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "Geometry"); Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
myGeom = GEOM::GEOM_Gen::_narrow(comp); myGeom = GEOM::GEOM_Gen::_narrow(comp);
/* signals and slots connections */ /* signals and slots connections */

6
src/GEOMGUI/GeometryGUI_FillingDlg.cxx
View File

@ -45,8 +45,8 @@ GeometryGUI_FillingDlg::GeometryGUI_FillingDlg( QWidget* parent,
: QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu ) : QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu )
{ {
QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_FILLING"))); QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_FILLING")));
QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_SELECT"))); QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_SELECT")));
if ( !name ) if ( !name )
setName( "GeometryGUI_FillingDlg" ); setName( "GeometryGUI_FillingDlg" );
@ -389,7 +389,7 @@ void GeometryGUI_FillingDlg::Init( SALOME_Selection* Sel )
// TODO previous selection into argument ? // TODO previous selection into argument ?
/* Filter definitions */ /* Filter definitions */
Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "Geometry"); Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
myGeom = GEOM::GEOM_Gen::_narrow(comp); myGeom = GEOM::GEOM_Gen::_narrow(comp);
myCompoundFilter = new GEOM_ShapeTypeFilter( TopAbs_COMPOUND, myGeom ); myCompoundFilter = new GEOM_ShapeTypeFilter( TopAbs_COMPOUND, myGeom );
/* first filter used */ /* first filter used */

6
src/GEOMGUI/GeometryGUI_FillingHoleDlg.cxx
View File

@ -44,8 +44,8 @@ GeometryGUI_FillingHoleDlg::GeometryGUI_FillingHoleDlg( QWidget* parent,
: QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu ) : QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu )
{ {
QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_SEWING"))); QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_SEWING")));
QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_SELECT"))); QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_SELECT")));
if ( !name ) if ( !name )
setName( "GeometryGUI_FillingHoleDlg" ); setName( "GeometryGUI_FillingHoleDlg" );
@ -187,7 +187,7 @@ void GeometryGUI_FillingHoleDlg::Init( SALOME_Selection* Sel, Handle (AIS_Intera
// TODO : previous selection into argument ? // TODO : previous selection into argument ?
/* Filter definitions */ /* Filter definitions */
Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "Geometry"); Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
myGeom = GEOM::GEOM_Gen::_narrow(comp); myGeom = GEOM::GEOM_Gen::_narrow(comp);
/* signals and slots connections */ /* signals and slots connections */

6
src/GEOMGUI/GeometryGUI_FuseDlg.cxx
View File

@ -40,8 +40,8 @@ using namespace std;
GeometryGUI_FuseDlg::GeometryGUI_FuseDlg( QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl ) GeometryGUI_FuseDlg::GeometryGUI_FuseDlg( QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl )
: QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu ) : QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu )
{ {
QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_FUSE"))); QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_FUSE")));
QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_SELECT"))); QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_SELECT")));
if ( !name ) if ( !name )
setName( "GeometryGUI_FuseDlg" ); setName( "GeometryGUI_FuseDlg" );
@ -178,7 +178,7 @@ void GeometryGUI_FuseDlg::Init( SALOME_Selection* Sel )
myGeomGUI->SetActiveDialogBox( (QDialog*)this ) ; myGeomGUI->SetActiveDialogBox( (QDialog*)this ) ;
Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "Geometry"); Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
myGeom = GEOM::GEOM_Gen::_narrow(comp); myGeom = GEOM::GEOM_Gen::_narrow(comp);
// TODO previous selection into argument ? // TODO previous selection into argument ?

6
src/GEOMGUI/GeometryGUI_InertiaDlg.cxx
View File

@ -34,8 +34,8 @@ using namespace std;
GeometryGUI_InertiaDlg::GeometryGUI_InertiaDlg( QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl ) GeometryGUI_InertiaDlg::GeometryGUI_InertiaDlg( QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl )
: QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu ) : QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu )
{ {
QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_INERTIA"))); QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_INERTIA")));
QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_SELECT"))); QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_SELECT")));
if ( !name ) if ( !name )
setName( "GeometryGUI_InertiaDlg" ); setName( "GeometryGUI_InertiaDlg" );
@ -269,7 +269,7 @@ void GeometryGUI_InertiaDlg::Init( SALOME_Selection* Sel )
// TODO : previous selection into argument ? // TODO : previous selection into argument ?
/* Filter definitions */ /* Filter definitions */
Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "Geometry"); Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
myGeom = GEOM::GEOM_Gen::_narrow(comp); myGeom = GEOM::GEOM_Gen::_narrow(comp);
/* signals and slots connections */ /* signals and slots connections */

10
src/GEOMGUI/GeometryGUI_LineDlg.cxx
View File

@ -42,10 +42,10 @@ GeometryGUI_LineDlg::GeometryGUI_LineDlg( QWidget* parent, const char* name, SAL
: QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu ) : QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu )
{ {
QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_LINE_2P"))); QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_LINE_2P")));
QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_SELECT"))); QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_SELECT")));
QPixmap image2(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_LINE_PV"))); QPixmap image2(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_LINE_PV")));
QPixmap image3(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_LINE_EDGE"))); QPixmap image3(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_LINE_EDGE")));
if ( !name ) if ( !name )
setName( "GeometryGUI_LineDlg" ); setName( "GeometryGUI_LineDlg" );
@ -184,7 +184,7 @@ void GeometryGUI_LineDlg::Init( SALOME_Selection* Sel )
// TODO : previous selection into argument ? // TODO : previous selection into argument ?
/* Filters definition */ /* Filters definition */
Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "Geometry"); Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
myGeom = GEOM::GEOM_Gen::_narrow(comp); myGeom = GEOM::GEOM_Gen::_narrow(comp);
myVertexFilter = new GEOM_ShapeTypeFilter( TopAbs_VERTEX, myGeom ); myVertexFilter = new GEOM_ShapeTypeFilter( TopAbs_VERTEX, myGeom );
myEdgeFilter = new GEOM_ShapeTypeFilter( TopAbs_EDGE, myGeom ); myEdgeFilter = new GEOM_ShapeTypeFilter( TopAbs_EDGE, myGeom );

6
src/GEOMGUI/GeometryGUI_MaxToleranceDlg.cxx
View File

@ -45,8 +45,8 @@ using namespace std;
GeometryGUI_MaxToleranceDlg::GeometryGUI_MaxToleranceDlg( QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl ) GeometryGUI_MaxToleranceDlg::GeometryGUI_MaxToleranceDlg( QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl )
: QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu ) : QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu )
{ {
QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_TOLERANCE"))); QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_TOLERANCE")));
QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_SELECT"))); QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_SELECT")));
if ( !name ) if ( !name )
setName( "GeometryGUI_MaxToleranceDlg" ); setName( "GeometryGUI_MaxToleranceDlg" );
@ -244,7 +244,7 @@ void GeometryGUI_MaxToleranceDlg::Init( SALOME_Selection* Sel )
// TODO : previous selection into argument ? // TODO : previous selection into argument ?
/* Filter definitions */ /* Filter definitions */
Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "Geometry"); Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
myGeom = GEOM::GEOM_Gen::_narrow(comp); myGeom = GEOM::GEOM_Gen::_narrow(comp);
/* signals and slots connections */ /* signals and slots connections */

6
src/GEOMGUI/GeometryGUI_MirrorDlg.cxx
View File

@ -45,8 +45,8 @@ GeometryGUI_MirrorDlg::GeometryGUI_MirrorDlg( QWidget* parent, const char* name
: QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu ) : QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu )
{ {
QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_MIRROR"))); QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_MIRROR")));
QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_SELECT"))); QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_SELECT")));
if ( !name ) if ( !name )
setName( "GeometryGUI_MirrorDlg" ); setName( "GeometryGUI_MirrorDlg" );
@ -181,7 +181,7 @@ void GeometryGUI_MirrorDlg::Init( SALOME_Selection* Sel )
myGeomGUI->SetActiveDialogBox( (QDialog*)this ) ; myGeomGUI->SetActiveDialogBox( (QDialog*)this ) ;
Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "Geometry"); Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
myGeom = GEOM::GEOM_Gen::_narrow(comp); myGeom = GEOM::GEOM_Gen::_narrow(comp);
/* Filter definition */ /* Filter definition */

8
src/GEOMGUI/GeometryGUI_MultiRotationDlg.cxx
View File

@ -53,9 +53,9 @@ using namespace std;
GeometryGUI_MultiRotationDlg::GeometryGUI_MultiRotationDlg( QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl ) GeometryGUI_MultiRotationDlg::GeometryGUI_MultiRotationDlg( QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl )
: QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu ) : QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu )
{ {
QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_MULTIROTATION_SIMPLE"))); QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_MULTIROTATION_SIMPLE")));
QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_SELECT"))); QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_SELECT")));
QPixmap image2(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_MULTIROTATION_DOUBLE"))); QPixmap image2(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_MULTIROTATION_DOUBLE")));
if ( !name ) if ( !name )
setName( "GeometryGUI_MultiTranlationDlg" ); setName( "GeometryGUI_MultiTranlationDlg" );
@ -357,7 +357,7 @@ void GeometryGUI_MultiRotationDlg::Init( SALOME_Selection* Sel )
// TODO : set previous selection into argument ? // TODO : set previous selection into argument ?
/* Filter definitions */ /* Filter definitions */
Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "Geometry"); Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
myGeom = GEOM::GEOM_Gen::_narrow(comp); myGeom = GEOM::GEOM_Gen::_narrow(comp);
myEdgeFilter = new GEOM_EdgeFilter( StdSelect_Line, myGeom ); myEdgeFilter = new GEOM_EdgeFilter( StdSelect_Line, myGeom );

8
src/GEOMGUI/GeometryGUI_MultiTranslationDlg.cxx
View File

@ -49,9 +49,9 @@ using namespace std;
GeometryGUI_MultiTranslationDlg::GeometryGUI_MultiTranslationDlg( QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl ) GeometryGUI_MultiTranslationDlg::GeometryGUI_MultiTranslationDlg( QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl )
: QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu ) : QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu )
{ {
QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_MULTITRANSLATION_SIMPLE"))); QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_MULTITRANSLATION_SIMPLE")));
QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_SELECT"))); QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_SELECT")));
QPixmap image2(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_MULTITRANSLATION_DOUBLE"))); QPixmap image2(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_MULTITRANSLATION_DOUBLE")));
if ( !name ) if ( !name )
setName( "GeometryGUI_MultiTranlationDlg" ); setName( "GeometryGUI_MultiTranlationDlg" );
@ -394,7 +394,7 @@ void GeometryGUI_MultiTranslationDlg::Init( SALOME_Selection* Sel )
// TODO : set previous selection into argument ? // TODO : set previous selection into argument ?
/* Filter definitions */ /* Filter definitions */
Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "Geometry"); Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
myGeom = GEOM::GEOM_Gen::_narrow(comp); myGeom = GEOM::GEOM_Gen::_narrow(comp);
myEdgeFilter = new GEOM_EdgeFilter( StdSelect_Line, myGeom ); myEdgeFilter = new GEOM_EdgeFilter( StdSelect_Line, myGeom );

6
src/GEOMGUI/GeometryGUI_OrientationDlg.cxx
View File

@ -46,8 +46,8 @@ using namespace std;
GeometryGUI_OrientationDlg::GeometryGUI_OrientationDlg( QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl ) GeometryGUI_OrientationDlg::GeometryGUI_OrientationDlg( QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl )
: QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu ) : QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu )
{ {
QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_ORIENTATION"))); QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_ORIENTATION")));
QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_SELECT"))); QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_SELECT")));
if ( !name ) if ( !name )
setName( "GeometryGUI_OrientationDlg" ); setName( "GeometryGUI_OrientationDlg" );
resize( 303, 242 ); resize( 303, 242 );
@ -195,7 +195,7 @@ void GeometryGUI_OrientationDlg::Init( SALOME_Selection* Sel )
// TODO : previous selection into argument ? // TODO : previous selection into argument ?
/* Filter definitions */ /* Filter definitions */
Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "Geometry"); Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
myGeom = GEOM::GEOM_Gen::_narrow(comp); myGeom = GEOM::GEOM_Gen::_narrow(comp);
/* signals and slots connections */ /* signals and slots connections */

6
src/GEOMGUI/GeometryGUI_PartitionDlg.cxx
View File

@ -36,8 +36,8 @@ using namespace std;
GeometryGUI_PartitionDlg::GeometryGUI_PartitionDlg( QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl ) GeometryGUI_PartitionDlg::GeometryGUI_PartitionDlg( QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl )
: QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu ) : QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu )
{ {
QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_PARTITION"))); QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_PARTITION")));
QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_SELECT"))); QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_SELECT")));
// QPixmap image2(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_PARTITION_KEEP_FACES"))); // QPixmap image2(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_PARTITION_KEEP_FACES")));
if ( !name ) if ( !name )
@ -225,7 +225,7 @@ void GeometryGUI_PartitionDlg::Init( SALOME_Selection* Sel )
myLimit = ComboBox1->currentItem(); myLimit = ComboBox1->currentItem();
/* Filter definitions */ /* Filter definitions */
Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "Geometry"); Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
myGeom = GEOM::GEOM_Gen::_narrow(comp); myGeom = GEOM::GEOM_Gen::_narrow(comp);
/* signals and slots connections */ /* signals and slots connections */

6
src/GEOMGUI/GeometryGUI_PipeDlg.cxx
View File

@ -43,8 +43,8 @@ using namespace std;
GeometryGUI_PipeDlg::GeometryGUI_PipeDlg( QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl ) GeometryGUI_PipeDlg::GeometryGUI_PipeDlg( QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl )
: QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu ) : QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu )
{ {
QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_PIPE"))); QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_PIPE")));
QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_SELECT"))); QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_SELECT")));
if ( !name ) if ( !name )
setName( "GeometryGUI_PipeDlg" ); setName( "GeometryGUI_PipeDlg" );
@ -181,7 +181,7 @@ void GeometryGUI_PipeDlg::Init( SALOME_Selection* Sel )
myGeomGUI->SetActiveDialogBox( (QDialog*)this ) ; myGeomGUI->SetActiveDialogBox( (QDialog*)this ) ;
mySimulationTopoDs.Nullify() ; mySimulationTopoDs.Nullify() ;
Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "Geometry"); Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
myGeom = GEOM::GEOM_Gen::_narrow(comp); myGeom = GEOM::GEOM_Gen::_narrow(comp);
// TODO : previous selection into argument ? // TODO : previous selection into argument ?

10
src/GEOMGUI/GeometryGUI_PlaneDlg.cxx
View File

@ -50,10 +50,10 @@ GeometryGUI_PlaneDlg::GeometryGUI_PlaneDlg( QWidget* parent, const char* name, S
: QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu ) : QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu )
{ {
/***************************************************************/ /***************************************************************/
QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_PLANE_PV"))); QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_PLANE_PV")));
QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_SELECT"))); QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_SELECT")));
QPixmap image2(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_PLANE_DXYZ"))); QPixmap image2(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_PLANE_DXYZ")));
QPixmap image3(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_PLANE_FACE"))); QPixmap image3(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_PLANE_FACE")));
if ( !name ) if ( !name )
setName( "GeometryGUI_PlaneDlg" ); setName( "GeometryGUI_PlaneDlg" );
@ -356,7 +356,7 @@ void GeometryGUI_PlaneDlg::Init( SALOME_Selection* Sel )
// TODO previous selection into argument ? // TODO previous selection into argument ?
/* Filters definition */ /* Filters definition */
Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "Geometry"); Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
myGeom = GEOM::GEOM_Gen::_narrow(comp); myGeom = GEOM::GEOM_Gen::_narrow(comp);
myVertexFilter = new GEOM_ShapeTypeFilter( TopAbs_VERTEX, myGeom ); myVertexFilter = new GEOM_ShapeTypeFilter( TopAbs_VERTEX, myGeom );
myEdgeFilter = new GEOM_ShapeTypeFilter( TopAbs_EDGE, myGeom ); myEdgeFilter = new GEOM_ShapeTypeFilter( TopAbs_EDGE, myGeom );

8
src/GEOMGUI/GeometryGUI_PointDlg.cxx
View File

@ -58,9 +58,9 @@ GeometryGUI_PointDlg::GeometryGUI_PointDlg( QWidget* parent,
: QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu ) : QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu )
{ {
QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_POINT"))); QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_POINT")));
QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_SELECT"))); QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_SELECT")));
QPixmap image2(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_POINT_EDGE"))); QPixmap image2(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_POINT_EDGE")));
if ( !name ) if ( !name )
setName( "GeometryGUI_PointDlg" ); setName( "GeometryGUI_PointDlg" );
@ -259,7 +259,7 @@ void GeometryGUI_PointDlg::Init(SALOME_Selection* Sel, const Handle(AIS_Interact
Constructor1->setChecked( TRUE ); Constructor1->setChecked( TRUE );
/* filter for the second constructor */ /* filter for the second constructor */
Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "Geometry"); Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
myGeom = GEOM::GEOM_Gen::_narrow(comp); myGeom = GEOM::GEOM_Gen::_narrow(comp);
myEdgeFilter = new GEOM_ShapeTypeFilter( TopAbs_EDGE, myGeom ); myEdgeFilter = new GEOM_ShapeTypeFilter( TopAbs_EDGE, myGeom );

6
src/GEOMGUI/GeometryGUI_PrismDlg.cxx
View File

@ -46,8 +46,8 @@ GeometryGUI_PrismDlg::GeometryGUI_PrismDlg( QWidget* parent, const char* name, S
: QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu ) : QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu )
{ {
QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_PRISM"))); QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_PRISM")));
QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_SELECT"))); QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_SELECT")));
if ( !name ) if ( !name )
setName( "GeometryGUI_PrismDlg" ); setName( "GeometryGUI_PrismDlg" );
@ -208,7 +208,7 @@ void GeometryGUI_PrismDlg::Init( SALOME_Selection* Sel )
myGeomGUI->SetActiveDialogBox( (QDialog*)this ) ; myGeomGUI->SetActiveDialogBox( (QDialog*)this ) ;
/* Retrieves geom component */ /* Retrieves geom component */
Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "Geometry"); Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
myGeom = GEOM::GEOM_Gen::_narrow(comp); myGeom = GEOM::GEOM_Gen::_narrow(comp);
/* Filters definition */ /* Filters definition */
myEdgeFilter = new GEOM_ShapeTypeFilter( TopAbs_EDGE, myGeom ); myEdgeFilter = new GEOM_ShapeTypeFilter( TopAbs_EDGE, myGeom );

6
src/GEOMGUI/GeometryGUI_PropertiesDlg.cxx
View File

@ -40,8 +40,8 @@ using namespace std;
GeometryGUI_PropertiesDlg::GeometryGUI_PropertiesDlg( QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl ) GeometryGUI_PropertiesDlg::GeometryGUI_PropertiesDlg( QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl )
: QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu ) : QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu )
{ {
QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_BASICPROPERTIES"))); QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_BASICPROPERTIES")));
QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_SELECT"))); QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_SELECT")));
if ( !name ) if ( !name )
setName( "GeometryGUI_PropertiesDlg" ); setName( "GeometryGUI_PropertiesDlg" );
@ -186,7 +186,7 @@ void GeometryGUI_PropertiesDlg::Init( SALOME_Selection* Sel )
// TODO : previous selection into argument ? // TODO : previous selection into argument ?
/* Filter definitions */ /* Filter definitions */
Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "Geometry"); Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
myGeom = GEOM::GEOM_Gen::_narrow(comp); myGeom = GEOM::GEOM_Gen::_narrow(comp);
/* signals and slots connections */ /* signals and slots connections */

6
src/GEOMGUI/GeometryGUI_RevolDlg.cxx
View File

@ -42,8 +42,8 @@ using namespace std;
GeometryGUI_RevolDlg::GeometryGUI_RevolDlg( QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl ) GeometryGUI_RevolDlg::GeometryGUI_RevolDlg( QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl )
: QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu ) : QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu )
{ {
QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_REVOL"))); QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_REVOL")));
QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_SELECT"))); QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_SELECT")));
if ( !name ) if ( !name )
setName( "GeometryGUI_RevolDlg" ); setName( "GeometryGUI_RevolDlg" );
@ -206,7 +206,7 @@ void GeometryGUI_RevolDlg::Init( SALOME_Selection* Sel )
// TODO : previous selection into argument // TODO : previous selection into argument
/* Filter definitions */ /* Filter definitions */
Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "Geometry"); Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
myGeom = GEOM::GEOM_Gen::_narrow(comp); myGeom = GEOM::GEOM_Gen::_narrow(comp);
myEdgeFilter = new GEOM_EdgeFilter( StdSelect_Line, myGeom ); myEdgeFilter = new GEOM_EdgeFilter( StdSelect_Line, myGeom );

6
src/GEOMGUI/GeometryGUI_RotationDlg.cxx
View File

@ -43,8 +43,8 @@ using namespace std;
GeometryGUI_RotationDlg::GeometryGUI_RotationDlg( QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl ) GeometryGUI_RotationDlg::GeometryGUI_RotationDlg( QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl )
: QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu ) : QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu )
{ {
QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_ROTATION"))); QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_ROTATION")));
QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_SELECT"))); QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_SELECT")));
if ( !name ) if ( !name )
setName( "GeometryGUI_RotationDlg" ); setName( "GeometryGUI_RotationDlg" );
@ -201,7 +201,7 @@ void GeometryGUI_RotationDlg::Init( SALOME_Selection* Sel )
// TODO : set previous selection into argument ? // TODO : set previous selection into argument ?
/* Filter definitions */ /* Filter definitions */
Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "Geometry"); Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
myGeom = GEOM::GEOM_Gen::_narrow(comp); myGeom = GEOM::GEOM_Gen::_narrow(comp);
myEdgeFilter = new GEOM_EdgeFilter( StdSelect_Line, myGeom ); myEdgeFilter = new GEOM_EdgeFilter( StdSelect_Line, myGeom );

6
src/GEOMGUI/GeometryGUI_ScaleDlg.cxx
View File

@ -41,8 +41,8 @@ using namespace std;
GeometryGUI_ScaleDlg::GeometryGUI_ScaleDlg( QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl ) GeometryGUI_ScaleDlg::GeometryGUI_ScaleDlg( QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl )
: QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu ) : QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu )
{ {
QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_SCALE"))); QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_SCALE")));
QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_SELECT"))); QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_SELECT")));
if ( !name ) if ( !name )
setName( "GeometryGUI_ScaleDlg" ); setName( "GeometryGUI_ScaleDlg" );
@ -188,7 +188,7 @@ void GeometryGUI_ScaleDlg::Init( SALOME_Selection* Sel )
// TODO : previous selection into argument ? // TODO : previous selection into argument ?
/* Filters definition */ /* Filters definition */
Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "Geometry"); Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
myGeom = GEOM::GEOM_Gen::_narrow(comp); myGeom = GEOM::GEOM_Gen::_narrow(comp);
myVertexFilter = new GEOM_ShapeTypeFilter( TopAbs_VERTEX, myGeom ); myVertexFilter = new GEOM_ShapeTypeFilter( TopAbs_VERTEX, myGeom );
mySelection->AddFilter(myVertexFilter) ; /* first filter used */ mySelection->AddFilter(myVertexFilter) ; /* first filter used */

6
src/GEOMGUI/GeometryGUI_SectionDlg.cxx
View File

@ -41,8 +41,8 @@ using namespace std;
GeometryGUI_SectionDlg::GeometryGUI_SectionDlg( QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl ) GeometryGUI_SectionDlg::GeometryGUI_SectionDlg( QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl )
: QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu ) : QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu )
{ {
QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_SECTION"))); QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_SECTION")));
QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_SELECT"))); QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_SELECT")));
if ( !name ) if ( !name )
setName( "GeometryGUI_SectionDlg" ); setName( "GeometryGUI_SectionDlg" );
@ -177,7 +177,7 @@ void GeometryGUI_SectionDlg::Init( SALOME_Selection* Sel )
myGeomGUI->SetActiveDialogBox( (QDialog*)this ) ; myGeomGUI->SetActiveDialogBox( (QDialog*)this ) ;
Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "Geometry"); Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
myGeom = GEOM::GEOM_Gen::_narrow(comp); myGeom = GEOM::GEOM_Gen::_narrow(comp);
// TODO previous selection into argument ? // TODO previous selection into argument ?

6
src/GEOMGUI/GeometryGUI_SewingDlg.cxx
View File

@ -40,8 +40,8 @@ using namespace std;
GeometryGUI_SewingDlg::GeometryGUI_SewingDlg( QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl ) GeometryGUI_SewingDlg::GeometryGUI_SewingDlg( QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl )
: QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu ) : QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu )
{ {
QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_SEWING"))); QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_SEWING")));
QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_SELECT"))); QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_SELECT")));
if ( !name ) if ( !name )
setName( "GeometryGUI_SewingDlg" ); setName( "GeometryGUI_SewingDlg" );
@ -176,7 +176,7 @@ void GeometryGUI_SewingDlg::Init( SALOME_Selection* Sel )
// TODO previous selection into argument ? // TODO previous selection into argument ?
/* Filter definitions */ /* Filter definitions */
Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "Geometry"); Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
myGeom = GEOM::GEOM_Gen::_narrow(comp); myGeom = GEOM::GEOM_Gen::_narrow(comp);
/* signals and slots connections */ /* signals and slots connections */

6
src/GEOMGUI/GeometryGUI_ShellDlg.cxx
View File

@ -38,8 +38,8 @@ using namespace std;
GeometryGUI_ShellDlg::GeometryGUI_ShellDlg( QWidget* parent, const char* name, SALOME_Selection* Sel = 0, bool modal, WFlags fl ) GeometryGUI_ShellDlg::GeometryGUI_ShellDlg( QWidget* parent, const char* name, SALOME_Selection* Sel = 0, bool modal, WFlags fl )
: QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu ) : QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu )
{ {
QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_SHELL"))); QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_SHELL")));
QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_SELECT"))); QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_SELECT")));
if ( !name ) if ( !name )
setName( "GeometryGUI_ShellDlg" ); setName( "GeometryGUI_ShellDlg" );
resize( 303, 190 ); resize( 303, 190 );
@ -158,7 +158,7 @@ void GeometryGUI_ShellDlg::Init( SALOME_Selection* Sel )
// TODO : previous selection into argument ? // TODO : previous selection into argument ?
/* Filter definitions */ /* Filter definitions */
Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "Geometry"); Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
myGeom = GEOM::GEOM_Gen::_narrow(comp); myGeom = GEOM::GEOM_Gen::_narrow(comp);
/* signals and slots connections */ /* signals and slots connections */

8
src/GEOMGUI/GeometryGUI_SphereDlg.cxx
View File

@ -43,9 +43,9 @@ using namespace std;
GeometryGUI_SphereDlg::GeometryGUI_SphereDlg( QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl ) GeometryGUI_SphereDlg::GeometryGUI_SphereDlg( QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl )
: QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu ) : QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu )
{ {
QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_SPHERE_P"))); QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_SPHERE_P")));
QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_SELECT"))); QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_SELECT")));
QPixmap image2(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_SPHERE_DXYZ"))); QPixmap image2(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_SPHERE_DXYZ")));
if ( !name ) if ( !name )
setName( "GeometryGUI_SphereDlg" ); setName( "GeometryGUI_SphereDlg" );
@ -220,7 +220,7 @@ void GeometryGUI_SphereDlg::Init( SALOME_Selection* Sel )
myGeomGUI->SetActiveDialogBox( (QDialog*)this ) ; myGeomGUI->SetActiveDialogBox( (QDialog*)this ) ;
/* Filters definition */ /* Filters definition */
Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "Geometry"); Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
myGeom = GEOM::GEOM_Gen::_narrow(comp); myGeom = GEOM::GEOM_Gen::_narrow(comp);
myVertexFilter = new GEOM_ShapeTypeFilter( TopAbs_VERTEX, myGeom ); myVertexFilter = new GEOM_ShapeTypeFilter( TopAbs_VERTEX, myGeom );
mySelection->AddFilter(myVertexFilter) ; /* first filter used */ mySelection->AddFilter(myVertexFilter) ; /* first filter used */

6
src/GEOMGUI/GeometryGUI_SubShapeDlg.cxx
View File

@ -52,8 +52,8 @@ GeometryGUI_SubShapeDlg::GeometryGUI_SubShapeDlg( QWidget* parent,
: QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu ) : QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu )
{ {
QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_SUBSHAPE"))); QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_SUBSHAPE")));
QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_SELECT"))); QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_SELECT")));
if ( !name ) if ( !name )
setName( "GeometryGUI_SUBSHAPE" ); setName( "GeometryGUI_SUBSHAPE" );
@ -211,7 +211,7 @@ void GeometryGUI_SubShapeDlg::Init( SALOME_Selection* Sel, Handle (AIS_Interacti
// TODO : previous selection into argument ? // TODO : previous selection into argument ?
/* Filter definitions */ /* Filter definitions */
Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "Geometry"); Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
myGeom = GEOM::GEOM_Gen::_narrow(comp); myGeom = GEOM::GEOM_Gen::_narrow(comp);
/* signals and slots connections */ /* signals and slots connections */

6
src/GEOMGUI/GeometryGUI_SuppressFacesDlg.cxx
View File

@ -43,8 +43,8 @@ GeometryGUI_SuppressFacesDlg::GeometryGUI_SuppressFacesDlg( QWidget* parent,
WFlags fl ) WFlags fl )
: QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu ) : QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu )
{ {
QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_SUPRESS_FACE"))); QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_SUPRESS_FACE")));
QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_SELECT"))); QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_SELECT")));
if ( !name ) if ( !name )
setName( "GeometryGUI_SuppressFacesDlg" ); setName( "GeometryGUI_SuppressFacesDlg" );
@ -187,7 +187,7 @@ void GeometryGUI_SuppressFacesDlg::Init( SALOME_Selection* Sel, Handle (AIS_Inte
// TODO : previous selection into argument ? // TODO : previous selection into argument ?
/* Filter definitions */ /* Filter definitions */
Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "Geometry"); Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
myGeom = GEOM::GEOM_Gen::_narrow(comp); myGeom = GEOM::GEOM_Gen::_narrow(comp);
/* signals and slots connections */ /* signals and slots connections */

8
src/GEOMGUI/GeometryGUI_SuppressHoleDlg.cxx
View File

@ -50,9 +50,9 @@ GeometryGUI_SuppressHoleDlg::GeometryGUI_SuppressHoleDlg( QWidget* parent,
: QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu ) : QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu )
{ {
QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_SUPRESS_HOLE"))); QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_SUPRESS_HOLE")));
QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_SELECT"))); QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_SELECT")));
QPixmap image2(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_SUPRESS_HOLE_FACE_SHELL"))); QPixmap image2(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_SUPRESS_HOLE_FACE_SHELL")));
if ( !name ) if ( !name )
setName( "GeometryGUI_SuppressHoleDlg" ); setName( "GeometryGUI_SuppressHoleDlg" );
@ -287,7 +287,7 @@ void GeometryGUI_SuppressHoleDlg::Init( SALOME_Selection* Sel, Handle (AIS_Inter
// TODO : previous selection into argument ? // TODO : previous selection into argument ?
/* Filter definitions */ /* Filter definitions */
Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "Geometry"); Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
myGeom = GEOM::GEOM_Gen::_narrow(comp); myGeom = GEOM::GEOM_Gen::_narrow(comp);
/* signals and slots connections */ /* signals and slots connections */

26
src/GEOMGUI/GeometryGUI_Swig.cxx
View File

@ -39,24 +39,24 @@ using namespace std;
static GEOM_Client ShapeReader; static GEOM_Client ShapeReader;
GeometryGUI_Swig::GeometryGUI_Swig() GEOM_Swig::GEOM_Swig()
{ {
// MESSAGE("Constructeur"); // MESSAGE("Constructeur");
} }
GeometryGUI_Swig::~GeometryGUI_Swig() GEOM_Swig::~GEOM_Swig()
{ {
// MESSAGE("Destructeur"); // MESSAGE("Destructeur");
} }
void GeometryGUI_Swig::createAndDisplayGO(const char* Entry) void GEOM_Swig::createAndDisplayGO(const char* Entry)
{ {
// MESSAGE("createAndDisplayGO"); // MESSAGE("createAndDisplayGO");
QAD_Study* ActiveStudy = QAD_Application::getDesktop()->getActiveStudy(); QAD_Study* ActiveStudy = QAD_Application::getDesktop()->getActiveStudy();
SALOMEDS::Study_var aStudy = ActiveStudy->getStudyDocument(); SALOMEDS::Study_var aStudy = ActiveStudy->getStudyDocument();
SALOMEDS::StudyBuilder_var aStudyBuilder = aStudy->NewBuilder(); SALOMEDS::StudyBuilder_var aStudyBuilder = aStudy->NewBuilder();
Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "Geometry"); Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
GEOM::GEOM_Gen_var Geom = GEOM::GEOM_Gen::_narrow(comp); GEOM::GEOM_Gen_var Geom = GEOM::GEOM_Gen::_narrow(comp);
Standard_CString Fatherior = ""; Standard_CString Fatherior = "";
@ -133,9 +133,9 @@ void GeometryGUI_Swig::createAndDisplayGO(const char* Entry)
ActiveStudy->updateObjBrowser( true ); ActiveStudy->updateObjBrowser( true );
} }
int GeometryGUI_Swig::getIndexTopology(const char* SubIOR, const char* IOR) int GEOM_Swig::getIndexTopology(const char* SubIOR, const char* IOR)
{ {
Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "Geometry"); Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
GEOM::GEOM_Gen_var Geom = GEOM::GEOM_Gen::_narrow(comp); GEOM::GEOM_Gen_var Geom = GEOM::GEOM_Gen::_narrow(comp);
GEOM::GEOM_Shape_var aMainShape = Geom->GetIORFromString(IOR); GEOM::GEOM_Shape_var aMainShape = Geom->GetIORFromString(IOR);
@ -158,9 +158,9 @@ int GeometryGUI_Swig::getIndexTopology(const char* SubIOR, const char* IOR)
return -1; return -1;
} }
const char* GeometryGUI_Swig::getShapeTypeString(const char* IOR) const char* GEOM_Swig::getShapeTypeString(const char* IOR)
{ {
Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "Geometry"); Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
GEOM::GEOM_Gen_var Geom = GEOM::GEOM_Gen::_narrow(comp); GEOM::GEOM_Gen_var Geom = GEOM::GEOM_Gen::_narrow(comp);
GEOM::GEOM_Shape_var aShape = Geom->GetIORFromString(IOR); GEOM::GEOM_Shape_var aShape = Geom->GetIORFromString(IOR);
@ -225,9 +225,9 @@ const char* GeometryGUI_Swig::getShapeTypeString(const char* IOR)
} }
const char* GeometryGUI_Swig::getShapeTypeIcon(const char* IOR) const char* GEOM_Swig::getShapeTypeIcon(const char* IOR)
{ {
Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "Geometry"); Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
GEOM::GEOM_Gen_var Geom = GEOM::GEOM_Gen::_narrow(comp); GEOM::GEOM_Gen_var Geom = GEOM::GEOM_Gen::_narrow(comp);
GEOM::GEOM_Shape_var aShape = Geom->GetIORFromString(IOR); GEOM::GEOM_Shape_var aShape = Geom->GetIORFromString(IOR);
@ -258,7 +258,7 @@ const char* GeometryGUI_Swig::getShapeTypeIcon(const char* IOR)
return "None"; return "None";
} }
void GeometryGUI_Swig::setDisplayMode(const char* Entry, int mode) void GEOM_Swig::setDisplayMode(const char* Entry, int mode)
{ {
QAD_Study* myStudy = QAD_Application::getDesktop()->getActiveStudy(); QAD_Study* myStudy = QAD_Application::getDesktop()->getActiveStudy();
Handle(SALOME_InteractiveObject) IO = Handle(SALOME_InteractiveObject) IO =
@ -278,7 +278,7 @@ void GeometryGUI_Swig::setDisplayMode(const char* Entry, int mode)
} }
} }
void GeometryGUI_Swig::setColor(const char* Entry, int red, int green, int blue) void GEOM_Swig::setColor(const char* Entry, int red, int green, int blue)
{ {
QAD_Study* myStudy = QAD_Application::getDesktop()->getActiveStudy(); QAD_Study* myStudy = QAD_Application::getDesktop()->getActiveStudy();
QColor c = QColor (red, green, blue); QColor c = QColor (red, green, blue);
@ -298,7 +298,7 @@ void GeometryGUI_Swig::setColor(const char* Entry, int red, int green, int blue)
} }
} }
void GeometryGUI_Swig::setTransparency(const char* Entry, float transp) void GEOM_Swig::setTransparency(const char* Entry, float transp)
{ {
QAD_Study* myStudy = QAD_Application::getDesktop()->getActiveStudy(); QAD_Study* myStudy = QAD_Application::getDesktop()->getActiveStudy();
Handle(SALOME_InteractiveObject) IO = Handle(SALOME_InteractiveObject) IO =

6
src/GEOMGUI/GeometryGUI_Swig.hxx
View File

@ -16,11 +16,11 @@
class GEOM_Client; class GEOM_Client;
class GeometryGUI_Swig class GEOM_Swig
{ {
public: public:
GeometryGUI_Swig(); GEOM_Swig();
~GeometryGUI_Swig(); ~GEOM_Swig();
void createAndDisplayGO(const char* Entry); void createAndDisplayGO(const char* Entry);
void setDisplayMode(const char* Entry, int mode); void setDisplayMode(const char* Entry, int mode);

6
src/GEOMGUI/GeometryGUI_Swig.i
View File

@ -10,11 +10,11 @@
#include "GeometryGUI_Swig.hxx" #include "GeometryGUI_Swig.hxx"
%} %}
class GeometryGUI_Swig class GEOM_Swig
{ {
public: public:
GeometryGUI_Swig(); GEOM_Swig();
~GeometryGUI_Swig(); ~GEOM_Swig();
void createAndDisplayGO(const char* Entry); void createAndDisplayGO(const char* Entry);
int getIndexTopology(const char *SubEntry, const char *Entry); int getIndexTopology(const char *SubEntry, const char *Entry);

8
src/GEOMGUI/GeometryGUI_TorusDlg.cxx
View File

@ -44,9 +44,9 @@ GeometryGUI_TorusDlg::GeometryGUI_TorusDlg( QWidget* parent, const char* name, S
: QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu ) : QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu )
{ {
QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_TORUS_PV"))); QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_TORUS_PV")));
QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_SELECT"))); QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_SELECT")));
QPixmap image2(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_TORUS_DXYZ"))); QPixmap image2(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_TORUS_DXYZ")));
if ( !name ) if ( !name )
setName( "GeometryGUI_TorusDlg" ); setName( "GeometryGUI_TorusDlg" );
@ -264,7 +264,7 @@ void GeometryGUI_TorusDlg::Init( SALOME_Selection* Sel )
// TODO : previous selection into argument ? // TODO : previous selection into argument ?
/* Filter definitions */ /* Filter definitions */
Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "Geometry"); Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
myGeom = GEOM::GEOM_Gen::_narrow(comp); myGeom = GEOM::GEOM_Gen::_narrow(comp);
myEdgeFilter = new GEOM_EdgeFilter( StdSelect_Line, myGeom ); myEdgeFilter = new GEOM_EdgeFilter( StdSelect_Line, myGeom );
myVertexFilter = new GEOM_ShapeTypeFilter( TopAbs_VERTEX, myGeom ); myVertexFilter = new GEOM_ShapeTypeFilter( TopAbs_VERTEX, myGeom );

6
src/GEOMGUI/GeometryGUI_TranslationDlg.cxx
View File

@ -42,8 +42,8 @@ using namespace std;
GeometryGUI_TranslationDlg::GeometryGUI_TranslationDlg( QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl ) GeometryGUI_TranslationDlg::GeometryGUI_TranslationDlg( QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl )
: QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu ) : QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu )
{ {
QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_TRANSLATION"))); QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_TRANSLATION")));
QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_SELECT"))); QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_SELECT")));
if ( !name ) if ( !name )
setName( "GeometryGUI_TranslationDlg" ); setName( "GeometryGUI_TranslationDlg" );
@ -218,7 +218,7 @@ void GeometryGUI_TranslationDlg::Init( SALOME_Selection* Sel )
// TODO : previous selection into argument ? // TODO : previous selection into argument ?
/* Filter definitions */ /* Filter definitions */
Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "Geometry"); Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
myGeom = GEOM::GEOM_Gen::_narrow(comp); myGeom = GEOM::GEOM_Gen::_narrow(comp);
// myEdgeFilter = new GEOM_ShapeTypeFilter( TopAbs_EDGE, myGeom ); // myEdgeFilter = new GEOM_ShapeTypeFilter( TopAbs_EDGE, myGeom );

8
src/GEOMGUI/GeometryGUI_VectorDlg.cxx
View File

@ -46,9 +46,9 @@ using namespace std;
GeometryGUI_VectorDlg::GeometryGUI_VectorDlg( QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl ) GeometryGUI_VectorDlg::GeometryGUI_VectorDlg( QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl )
: QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu ) : QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu )
{ {
QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_VECTOR_2P"))); QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_VECTOR_2P")));
QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_SELECT"))); QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_SELECT")));
QPixmap image2(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_VECTOR_DXYZ"))); QPixmap image2(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_VECTOR_DXYZ")));
if ( !name ) if ( !name )
setName( "GeometryGUI_VectorDlg" ); setName( "GeometryGUI_VectorDlg" );
@ -246,7 +246,7 @@ void GeometryGUI_VectorDlg::Init( SALOME_Selection* Sel )
/* Filter definitions */ /* Filter definitions */
Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "Geometry"); Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
myGeom = GEOM::GEOM_Gen::_narrow(comp); myGeom = GEOM::GEOM_Gen::_narrow(comp);
myVertexFilter = new GEOM_ShapeTypeFilter( TopAbs_VERTEX, myGeom ); myVertexFilter = new GEOM_ShapeTypeFilter( TopAbs_VERTEX, myGeom );
myEdgeFilter = new GEOM_ShapeTypeFilter( TopAbs_EDGE, myGeom ); myEdgeFilter = new GEOM_ShapeTypeFilter( TopAbs_EDGE, myGeom );

6
src/GEOMGUI/GeometryGUI_WhatisDlg.cxx
View File

@ -45,8 +45,8 @@ using namespace std;
GeometryGUI_WhatisDlg::GeometryGUI_WhatisDlg( QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl ) GeometryGUI_WhatisDlg::GeometryGUI_WhatisDlg( QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl )
: QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu ) : QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu )
{ {
QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_WHATIS"))); QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_WHATIS")));
QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_SELECT"))); QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_SELECT")));
if ( !name ) if ( !name )
setName( "GeometryGUI_WhatisDlg" ); setName( "GeometryGUI_WhatisDlg" );
@ -164,7 +164,7 @@ void GeometryGUI_WhatisDlg::Init( SALOME_Selection* Sel )
// TODO : previous selection into argument ? // TODO : previous selection into argument ?
/* Filter definitions */ /* Filter definitions */
Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "Geometry"); Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
myGeom = GEOM::GEOM_Gen::_narrow(comp); myGeom = GEOM::GEOM_Gen::_narrow(comp);
/* signals and slots connections */ /* signals and slots connections */

6
src/GEOMGUI/GeometryGUI_WireDlg.cxx
View File

@ -38,8 +38,8 @@ using namespace std;
GeometryGUI_WireDlg::GeometryGUI_WireDlg( QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl ) GeometryGUI_WireDlg::GeometryGUI_WireDlg( QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl )
: QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu ) : QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu )
{ {
QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_BUILD_WIRE"))); QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_BUILD_WIRE")));
QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_SELECT"))); QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_SELECT")));
if ( !name ) if ( !name )
setName( "GeometryGUI_WireDlg" ); setName( "GeometryGUI_WireDlg" );
@ -160,7 +160,7 @@ void GeometryGUI_WireDlg::Init( SALOME_Selection* Sel )
// TODO : previous selection into argument // TODO : previous selection into argument
/* Filter definitions */ /* Filter definitions */
Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "Geometry"); Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
myGeom = GEOM::GEOM_Gen::_narrow(comp); myGeom = GEOM::GEOM_Gen::_narrow(comp);
/* signals and slots connections */ /* signals and slots connections */

6
src/GEOMGUI/GeometryGUI_WorkingPlaneDlg.cxx
View File

@ -42,8 +42,8 @@ using namespace std;
GeometryGUI_WorkingPlaneDlg::GeometryGUI_WorkingPlaneDlg( QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl ) GeometryGUI_WorkingPlaneDlg::GeometryGUI_WorkingPlaneDlg( QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl )
: QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu ) : QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu )
{ {
QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_WPLANE_FACE"))); QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_WPLANE_FACE")));
QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_SELECT"))); QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_SELECT")));
if ( !name ) if ( !name )
setName( "GeometryGUI_WorkingPlaneDlg" ); setName( "GeometryGUI_WorkingPlaneDlg" );
@ -164,7 +164,7 @@ void GeometryGUI_WorkingPlaneDlg::Init( SALOME_Selection* Sel )
// TODO : previous selection into argument ? // TODO : previous selection into argument ?
Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "Geometry"); Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
myGeom = GEOM::GEOM_Gen::_narrow(comp); myGeom = GEOM::GEOM_Gen::_narrow(comp);
/* Filter definition */ /* Filter definition */
myFaceFilter = new GEOM_FaceFilter( StdSelect_Plane, myGeom ); myFaceFilter = new GEOM_FaceFilter( StdSelect_Plane, myGeom );