From: eap Date: Wed, 20 Oct 2010 14:21:31 +0000 (+0000) Subject: 0020749: EDF 1291 SMESH : Create 2D Mesh from 3D improvement X-Git-Tag: V5_1_5rc1~12 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=b1346c00488dd532832531cccfc2f9a33e7da9cb;p=modules%2Fsmesh.git 0020749: EDF 1291 SMESH : Create 2D Mesh from 3D improvement rename SMESHGUI_CopyMeshDlg to SMESHGUI_Make2DFrom3DDlg --- diff --git a/src/SMESHGUI/SMESHGUI_Make2DFrom3DOp.cxx b/src/SMESHGUI/SMESHGUI_Make2DFrom3DOp.cxx index 364107306..4ffc3f09e 100644 --- a/src/SMESHGUI/SMESHGUI_Make2DFrom3DOp.cxx +++ b/src/SMESHGUI/SMESHGUI_Make2DFrom3DOp.cxx @@ -51,11 +51,11 @@ #define MARGIN 11 /*! - \class SMESHGUI_CopyMeshDlg + \class SMESHGUI_Make2DFrom3DDlg \brief Copy Mesh dialog box */ -SMESHGUI_CopyMeshDlg::SMESHGUI_CopyMeshDlg( QWidget* parent ) +SMESHGUI_Make2DFrom3DDlg::SMESHGUI_Make2DFrom3DDlg( QWidget* parent ) : SMESHGUI_Dialog( parent, false, true, OK | Apply | Close | Help ) { // title @@ -120,11 +120,11 @@ SMESHGUI_CopyMeshDlg::SMESHGUI_CopyMeshDlg( QWidget* parent ) onGroupChecked(); } -SMESHGUI_CopyMeshDlg::~SMESHGUI_CopyMeshDlg() +SMESHGUI_Make2DFrom3DDlg::~SMESHGUI_Make2DFrom3DDlg() { } -SMESH::Bnd_Dimension SMESHGUI_CopyMeshDlg::mode() const +SMESH::Bnd_Dimension SMESHGUI_Make2DFrom3DDlg::mode() const { if ( my2dFrom3dRB->isChecked() ) return SMESH::BND_2DFROM3D; @@ -134,54 +134,54 @@ SMESH::Bnd_Dimension SMESHGUI_CopyMeshDlg::mode() const return SMESH::BND_1DFROM3D; } -bool SMESHGUI_CopyMeshDlg::needNewMesh() const +bool SMESHGUI_Make2DFrom3DDlg::needNewMesh() const { return myNewMeshRB->isChecked(); } -QString SMESHGUI_CopyMeshDlg::getNewMeshName() const +QString SMESHGUI_Make2DFrom3DDlg::getNewMeshName() const { return myMeshName->text().trimmed(); } -void SMESHGUI_CopyMeshDlg::setNewMeshName( const QString& name ) +void SMESHGUI_Make2DFrom3DDlg::setNewMeshName( const QString& name ) { myMeshName->setText( name ); } -bool SMESHGUI_CopyMeshDlg::needGroup() const +bool SMESHGUI_Make2DFrom3DDlg::needGroup() const { return myGroupCheck->isChecked(); } -QString SMESHGUI_CopyMeshDlg::getGroupName() const +QString SMESHGUI_Make2DFrom3DDlg::getGroupName() const { return myGroupName->text().trimmed(); } -void SMESHGUI_CopyMeshDlg::setGroupName( const QString& name ) +void SMESHGUI_Make2DFrom3DDlg::setGroupName( const QString& name ) { myGroupName->setText( name ); } -bool SMESHGUI_CopyMeshDlg::copySource() const +bool SMESHGUI_Make2DFrom3DDlg::copySource() const { return myCopyCheck->isChecked(); } -bool SMESHGUI_CopyMeshDlg::copyMissingOnly() const +bool SMESHGUI_Make2DFrom3DDlg::copyMissingOnly() const { return myMissingCheck->isChecked(); } -void SMESHGUI_CopyMeshDlg::onTargetChanged() +void SMESHGUI_Make2DFrom3DDlg::onTargetChanged() { myMeshName->setEnabled( myNewMeshRB->isChecked() ); myCopyCheck->setEnabled( myNewMeshRB->isChecked() ); myMissingCheck->setEnabled( myNewMeshRB->isChecked() ); } -void SMESHGUI_CopyMeshDlg::onGroupChecked() +void SMESHGUI_Make2DFrom3DDlg::onGroupChecked() { myGroupName->setEnabled( myGroupCheck->isChecked() ); } @@ -210,15 +210,15 @@ LightApp_Dialog* SMESHGUI_Make2DFrom3DOp::dlg() const void SMESHGUI_Make2DFrom3DOp::startOperation() { if( !myDlg ) - myDlg = new SMESHGUI_CopyMeshDlg( desktop() ); + myDlg = new SMESHGUI_Make2DFrom3DDlg( desktop() ); mySrc = SMESH::SMESH_IDSource::_nil(); - myHelpFileName = "copy_mesh_page.html"; + myHelpFileName = "make_2dmesh_from_3d_page.html"; SMESHGUI_SelectionOp::startOperation(); - myDlg->activateObject( SMESHGUI_CopyMeshDlg::Mesh ); + myDlg->activateObject( SMESHGUI_Make2DFrom3DDlg::Mesh ); myDlg->setNewMeshName( SMESH::UniqueName( "Mesh_1" ) ); myDlg->setGroupName( SMESH::UniqueName( "Group" ) ); myDlg->show(); @@ -251,7 +251,7 @@ void SMESHGUI_Make2DFrom3DOp::selectionDone() SUIT_SelectionFilter* SMESHGUI_Make2DFrom3DOp::createFilter( const int theId ) const { SUIT_SelectionFilter* f = 0; - if ( theId == SMESHGUI_CopyMeshDlg::Mesh ) { + if ( theId == SMESHGUI_Make2DFrom3DDlg::Mesh ) { QList filters; filters.append( new SMESH_TypeFilter( MESHorSUBMESH ) ); filters.append( new SMESH_TypeFilter( GROUP ) ); @@ -265,7 +265,7 @@ bool SMESHGUI_Make2DFrom3DOp::isValid( QString& msg ) const if ( !dlg() ) return false; // check if any source data is selected - QString entry = myDlg->selectedObject( SMESHGUI_CopyMeshDlg::Mesh ); + QString entry = myDlg->selectedObject( SMESHGUI_Make2DFrom3DDlg::Mesh ); SMESH::SMESH_IDSource_var obj; _PTR(SObject) sobj = SMESHGUI::activeStudy()->studyDS()->FindObjectID( entry.toLatin1().constData() ); if ( sobj ) @@ -317,7 +317,7 @@ bool SMESHGUI_Make2DFrom3DOp::compute2DMesh() bool ok = false; try { - QString entry = myDlg->selectedObject( SMESHGUI_CopyMeshDlg::Mesh ); + QString entry = myDlg->selectedObject( SMESHGUI_Make2DFrom3DDlg::Mesh ); _PTR(SObject) sobj = SMESHGUI::activeStudy()->studyDS()->FindObjectID( entry.toLatin1().constData() ); SMESH::SMESH_IDSource_var obj = SMESH::SObjectToInterface( sobj ); diff --git a/src/SMESHGUI/SMESHGUI_Make2DFrom3DOp.h b/src/SMESHGUI/SMESHGUI_Make2DFrom3DOp.h index 871c3725c..23bab5e61 100644 --- a/src/SMESHGUI/SMESHGUI_Make2DFrom3DOp.h +++ b/src/SMESHGUI/SMESHGUI_Make2DFrom3DOp.h @@ -38,15 +38,15 @@ class QRadioButton; * \brief Dialog to show result mesh statistic */ -class SMESHGUI_EXPORT SMESHGUI_CopyMeshDlg : public SMESHGUI_Dialog +class SMESHGUI_EXPORT SMESHGUI_Make2DFrom3DDlg : public SMESHGUI_Dialog { Q_OBJECT public: enum { Mesh }; - SMESHGUI_CopyMeshDlg( QWidget* ); - virtual ~SMESHGUI_CopyMeshDlg(); + SMESHGUI_Make2DFrom3DDlg( QWidget* ); + virtual ~SMESHGUI_Make2DFrom3DDlg(); SMESH::Bnd_Dimension mode() const; @@ -106,7 +106,7 @@ private: private: SMESH::SMESH_IDSource_var mySrc; - QPointer myDlg; + QPointer myDlg; }; #endif // SMESHGUI_Make2DFrom3DOp_H diff --git a/src/SMESHGUI/SMESH_msg_en.ts b/src/SMESHGUI/SMESH_msg_en.ts index 09654364f..f4a3a78c5 100644 --- a/src/SMESHGUI/SMESH_msg_en.ts +++ b/src/SMESHGUI/SMESH_msg_en.ts @@ -181,7 +181,7 @@ MEN_2D_FROM_3D - Create 2D mesh from 3D + Create boundary elements MEN_MESH_ORDER @@ -2180,7 +2180,7 @@ Please check preferences of Mesh module. STB_2D_FROM_3D - Create 2D mesh from 3D + Create boundary elements STB_MESH_ORDER @@ -2700,7 +2700,7 @@ Please check preferences of Mesh module. TOP_2D_FROM_3D - Create 2D mesh from 3D + Create boundary elements TOP_MESH_ORDER @@ -3645,7 +3645,7 @@ Please specify it and try again SMESHGUI_Make2DFrom3DDlg CAPTION - Create 2D mesh from 3D + Create boundary elements @@ -5273,7 +5273,7 @@ It is impossible to read point coordinates from file - SMESHGUI_CopyMeshDlg + SMESHGUI_Make2DFrom3DDlg CAPTION Create boundary elements