From: asl Date: Thu, 7 Jul 2005 11:33:00 +0000 (+0000) Subject: new operation AddSubMesh X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=71c8ad7da05932d1051255ea47cafa83e5f031d4;p=modules%2Fsmesh.git new operation AddSubMesh --- diff --git a/src/SMESHGUI/Makefile.in b/src/SMESHGUI/Makefile.in index 960180788..acc7d63ef 100644 --- a/src/SMESHGUI/Makefile.in +++ b/src/SMESHGUI/Makefile.in @@ -62,6 +62,7 @@ LIB_SRC = SMESHGUI.cxx \ SMESHGUI_InitMeshDlg.cxx \ SMESHGUI_InitMeshOp.cxx \ SMESHGUI_AddSubMeshDlg.cxx \ + SMESHGUI_AddSubMeshOp.cxx \ SMESHGUI_TransparencyDlg.cxx \ SMESHGUI_ClippingDlg.cxx \ SMESHGUI_GroupDlg.cxx \ @@ -121,6 +122,7 @@ LIB_MOC = \ SMESHGUI_InitMeshDlg.h \ SMESHGUI_InitMeshOp.h \ SMESHGUI_AddSubMeshDlg.h \ + SMESHGUI_AddSubMeshOp.h \ SMESHGUI_TransparencyDlg.h \ SMESHGUI_ClippingDlg.h \ SMESHGUI_GroupDlg.h \ diff --git a/src/SMESHGUI/SMESHGUI.cxx b/src/SMESHGUI/SMESHGUI.cxx index dba718184..2a2a55107 100644 --- a/src/SMESHGUI/SMESHGUI.cxx +++ b/src/SMESHGUI/SMESHGUI.cxx @@ -26,7 +26,7 @@ #include "SMESHGUI.h" #include "SMESHGUI_InitMeshOp.h" -#include "SMESHGUI_AddSubMeshDlg.h" +#include "SMESHGUI_AddSubMeshOp.h" #include "SMESHGUI_NodesDlg.h" #include "SMESHGUI_TransparencyDlg.h" #include "SMESHGUI_ClippingDlg.h" @@ -1369,7 +1369,8 @@ bool SMESHGUI::OnGUIEvent( int theCommandID ) case 702: // ADD SUB MESH { if(checkLock(aStudy)) break; - if( vtkwnd ) { + startOperation( 702 ); +/* if( vtkwnd ) { EmitSignalDeactivateDialog(); new SMESHGUI_AddSubMeshDlg( this ); } @@ -1377,15 +1378,13 @@ bool SMESHGUI::OnGUIEvent( int theCommandID ) SUIT_MessageBox::warn1(desktop(), tr("SMESH_WRN_WARNING"), tr("SMESH_WRN_VIEWER_VTK"), tr("SMESH_BUT_OK")); - } + }*/ break; } case 703: // INIT MESH { if(checkLock(aStudy)) break; - //EmitSignalDeactivateDialog(); - //new SMESHGUI_InitMeshDlg( this ); startOperation( 703 ); break; } @@ -3306,10 +3305,22 @@ void SMESHGUI::updateControls() //======================================================================= SalomeApp_Operation* SMESHGUI::createOperation( const int id ) const { - if( id==703 ) - return new SMESHGUI_InitMeshOp(); - else - return SalomeApp_Module::createOperation( id ); + SalomeApp_Operation* op = 0; + switch( id ) + { + case 702: + op = new SMESHGUI_AddSubMeshOp(); + break; + + case 703: + op = new SMESHGUI_InitMeshOp(); + break; + + default: + op = SalomeApp_Module::createOperation( id ); + break; + } + return op; } diff --git a/src/SMESHGUI/SMESHGUI_AddSubMeshDlg.cxx b/src/SMESHGUI/SMESHGUI_AddSubMeshDlg.cxx index 79cbb32c0..0735b21c2 100644 --- a/src/SMESHGUI/SMESHGUI_AddSubMeshDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_AddSubMeshDlg.cxx @@ -27,58 +27,14 @@ // $Header$ #include "SMESHGUI_AddSubMeshDlg.h" +#include -#include "SMESHGUI.h" -#include "SMESHGUI_Utils.h" -#include "SMESHGUI_GEOMGenUtils.h" -#include "SMESHGUI_HypothesesUtils.h" +#include -#include "SMESH_TypeFilter.hxx" -#include "SMESH_NumberFilter.hxx" - -#include "GEOMBase.h" - -#include "SUIT_Session.h" -#include "SUIT_MessageBox.h" -#include "SUIT_OverrideCursor.h" -#include "SUIT_Operation.h" -#include "SUIT_Desktop.h" - -#include "SALOMEDSClient_Study.hxx" -#include "SALOMEDS_SObject.hxx" -#include "SALOME_ListIO.hxx" -#include "SALOME_ListIteratorOfListIO.hxx" -#include "SalomeApp_Tools.h" - -#include "SVTK_ViewModel.h" - -#include "utilities.h" - -// QT Includes +#include #include #include #include -#include -#include -#include - -using namespace std; - -namespace SMESH { - SMESH::SMESH_subMesh_var AddSubMesh (SMESH::SMESH_Mesh_ptr theMesh, - GEOM::GEOM_Object_ptr theShapeObject, - const char* theMeshName) - { - SMESH::SMESH_subMesh_var aSubMesh; - try { - if (!theMesh->_is_nil() && !theShapeObject->_is_nil()) - aSubMesh = theMesh->GetSubMesh(theShapeObject, theMeshName); - } catch (const SALOME::SALOME_Exception& S_ex) { - SalomeApp_Tools::QtCatchCorbaException(S_ex); - } - return aSubMesh._retn(); - } -} //================================================================================= // function : SMESHGUI_AddSubMeshDlg() @@ -87,106 +43,36 @@ namespace SMESH { // The dialog will by default be modeless, unless you set 'modal' to // TRUE to construct a modal dialog. //================================================================================= -SMESHGUI_AddSubMeshDlg::SMESHGUI_AddSubMeshDlg( SMESHGUI* theModule, const char* name, - bool modal, WFlags fl) - : QDialog( SMESH::GetDesktop( theModule ), name, modal, WStyle_Customize | WStyle_NormalBorder | - WStyle_Title | WStyle_SysMenu | WDestructiveClose), - mySMESHGUI( theModule ), - mySelectionMgr( SMESH::GetSelectionMgr( theModule ) ) +SMESHGUI_AddSubMeshDlg::SMESHGUI_AddSubMeshDlg( SMESHGUI* theModule ) +: SMESHGUI_Dialog( theModule, false, true ) { - QPixmap image0 (SMESH::GetResourceMgr( mySMESHGUI )->loadPixmap("SMESH", tr("ICON_SELECT"))); - if (!name) - setName("SMESHGUI_AddSubMeshDlg"); setCaption(tr("SMESH_ADD_SUBMESH")); - setSizeGripEnabled(TRUE); - QGridLayout* SMESHGUI_AddSubMeshDlgLayout = new QGridLayout(this); - SMESHGUI_AddSubMeshDlgLayout->setSpacing(6); - SMESHGUI_AddSubMeshDlgLayout->setMargin(11); - - /***************************************************************/ - GroupC1 = new QGroupBox (tr("SMESH_ARGUMENTS"), this, "GroupC1"); - GroupC1->setColumnLayout(0, Qt::Vertical); - GroupC1->layout()->setSpacing(0); - GroupC1->layout()->setMargin(0); - QGridLayout* GroupC1Layout = new QGridLayout (GroupC1->layout()); - GroupC1Layout->setAlignment(Qt::AlignTop); - GroupC1Layout->setSpacing(6); - GroupC1Layout->setMargin(11); - - TextLabel_NameMesh = new QLabel (tr("SMESH_NAME"), GroupC1, "TextLabel_NameMesh"); - GroupC1Layout->addWidget(TextLabel_NameMesh, 0, 0); - LineEdit_NameMesh = new QLineEdit (GroupC1, "LineEdit_NameMesh"); - GroupC1Layout->addWidget(LineEdit_NameMesh, 0, 2); - - TextLabelC1A1 = new QLabel (tr("SMESH_OBJECT_MESH"), GroupC1, "TextLabelC1A1"); - GroupC1Layout->addWidget(TextLabelC1A1, 1, 0); - SelectButtonC1A1 = new QPushButton (GroupC1, "SelectButtonC1A1"); - SelectButtonC1A1->setPixmap(image0); - SelectButtonC1A1->setToggleButton(FALSE); - GroupC1Layout->addWidget(SelectButtonC1A1, 1, 1); - LineEditC1A1 = new QLineEdit (GroupC1, "LineEditC1A1"); - LineEditC1A1->setReadOnly(true); - GroupC1Layout->addWidget(LineEditC1A1, 1, 2); - - TextLabelC1A2 = new QLabel(tr("SMESH_OBJECT_GEOM"), GroupC1, "TextLabelC1A2"); - GroupC1Layout->addWidget(TextLabelC1A2, 2, 0); - SelectButtonC1A2 = new QPushButton(GroupC1, "SelectButtonC1A2"); - SelectButtonC1A2->setPixmap(image0); - SelectButtonC1A2->setToggleButton(FALSE); - GroupC1Layout->addWidget(SelectButtonC1A2, 2, 1); - LineEditC1A2 = new QLineEdit(GroupC1, "LineEditC1A2"); - LineEditC1A2->setReadOnly(true); - GroupC1Layout->addWidget(LineEditC1A2, 2, 2); - - TextLabelC1A1Hyp = new QLabel(tr("SMESH_OBJECT_HYPOTHESIS"), GroupC1, "TextLabelC1A1Hyp"); - GroupC1Layout->addWidget(TextLabelC1A1Hyp, 3, 0); - SelectButtonC1A1Hyp = new QPushButton(GroupC1, "SelectButtonC1A1Hyp"); - SelectButtonC1A1Hyp->setPixmap(image0); - GroupC1Layout->addWidget(SelectButtonC1A1Hyp, 3, 1); - LineEditC1A1Hyp = new QLineEdit(GroupC1, "LineEditC1A1Hyp"); - LineEditC1A1Hyp->setReadOnly(true); - GroupC1Layout->addWidget(LineEditC1A1Hyp, 3, 2); - - TextLabelC1A1Algo = new QLabel(tr("SMESH_OBJECT_ALGORITHM"), GroupC1, "TextLabelC1A1Algo"); - GroupC1Layout->addWidget(TextLabelC1A1Algo, 4, 0); - SelectButtonC1A1Algo = new QPushButton(GroupC1, "SelectButtonC1A1Algo"); - SelectButtonC1A1Algo->setPixmap(image0); - GroupC1Layout->addWidget(SelectButtonC1A1Algo, 4, 1); - LineEditC1A1Algo = new QLineEdit(GroupC1, "LineEditC1A1Algo"); - LineEditC1A1Algo->setReadOnly(true); - GroupC1Layout->addWidget(LineEditC1A1Algo, 4, 2); - SMESHGUI_AddSubMeshDlgLayout->addWidget(GroupC1, 1, 0); + QVBoxLayout* main = new QVBoxLayout( mainFrame() ); /***************************************************************/ - GroupButtons = new QGroupBox(this, "GroupButtons"); - GroupButtons->setColumnLayout(0, Qt::Vertical); - GroupButtons->layout()->setSpacing(0); - GroupButtons->layout()->setMargin(0); - QGridLayout* GroupButtonsLayout = new QGridLayout(GroupButtons->layout()); - GroupButtonsLayout->setAlignment(Qt::AlignTop); - GroupButtonsLayout->setSpacing(6); - GroupButtonsLayout->setMargin(11); + QGroupBox* GroupC1 = new QGroupBox (tr("SMESH_ARGUMENTS"), mainFrame(), "GroupC1"); + GroupC1->setColumnLayout(3, Qt::Horizontal); + GroupC1->layout()->setSpacing(6); + GroupC1->layout()->setMargin(11); - buttonOk = new QPushButton(tr("SMESH_BUT_OK"), GroupButtons, "buttonOk"); - buttonOk->setAutoDefault(TRUE); - buttonOk->setDefault(TRUE); - GroupButtonsLayout->addWidget(buttonOk, 0, 0); + new QLabel(tr("SMESH_NAME"), GroupC1, "TextLabel_NameMesh"); + GroupC1->addSpace(1); + myMeshName = new QLineEdit(GroupC1, "LineEdit_NameMesh"); - buttonApply = new QPushButton(tr("SMESH_BUT_APPLY"), GroupButtons, "buttonApply"); - buttonApply->setAutoDefault(TRUE); - GroupButtonsLayout->addWidget(buttonApply, 0, 1); + createObject( tr("SMESH_OBJECT_MESH"), GroupC1, MeshObj ); + createObject( tr("SMESH_OBJECT_GEOM"), GroupC1, GeomObj ); + createObject( tr("SMESH_OBJECT_HYPOTHESIS"), GroupC1, Hypo ); + createObject( tr("SMESH_OBJECT_ALGORITHM"), GroupC1, Algo ); - GroupButtonsLayout->addItem(new QSpacerItem(20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum), 0, 2); + setNameIndication( MeshObj, OneName ); + setNameIndication( GeomObj, OneName ); - buttonCancel = new QPushButton(tr("SMESH_BUT_CLOSE"), GroupButtons, "buttonCancel"); - buttonCancel->setAutoDefault(TRUE); - GroupButtonsLayout->addWidget(buttonCancel, 0, 3); + int _smesh = SMESHGUI_Operation::prefix( "SMESH" ); + setObjectType( Hypo, _smesh + HYPOTHESIS, -1 ); + setObjectType( Algo, _smesh + ALGORITHM, -1 ); - SMESHGUI_AddSubMeshDlgLayout->addWidget(GroupButtons, 2, 0); - - /***************************************************************/ - Init(); + main->addWidget( GroupC1 ); } //================================================================================= @@ -199,337 +85,29 @@ SMESHGUI_AddSubMeshDlg::~SMESHGUI_AddSubMeshDlg() } //================================================================================= -// function : Init() -// purpose : -//================================================================================= -void SMESHGUI_AddSubMeshDlg::Init () -{ - mySMESHGUI->SetActiveDialogBox((QDialog*)this); - - //myGeomFilter = new SALOME_TypeFilter("GEOM"); - TColStd_MapOfInteger allTypesMap; - for (int i = 0; i < 10; i++) - allTypesMap.Add(i); - myGeomFilter = new SMESH_NumberFilter ("GEOM", TopAbs_SHAPE, 0, allTypesMap); - myMeshFilter = new SMESH_TypeFilter (MESH); - myAlgorithmFilter = new SMESH_TypeFilter (ALGORITHM); - myHypothesisFilter = new SMESH_TypeFilter (HYPOTHESIS); - - /* signals and slots connections */ - connect(buttonOk, SIGNAL(clicked()), this, SLOT(ClickOnOk())); - connect(buttonApply, SIGNAL(clicked()), this, SLOT(ClickOnApply())); - connect(buttonCancel, SIGNAL(clicked()), this, SLOT(ClickOnCancel())); - - connect(SelectButtonC1A1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument())); - connect(SelectButtonC1A2, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument())); - connect(SelectButtonC1A1Hyp, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument())); - connect(SelectButtonC1A1Algo, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument())); - - connect(mySelectionMgr, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())); - connect(mySMESHGUI, SIGNAL(SignalDeactivateActiveDialog()), this, SLOT(DeactivateActiveDialog())); - connect(mySMESHGUI, SIGNAL(SignalCloseAllDialogs()), this, SLOT(ClickOnCancel())); - - int x, y; - mySMESHGUI->DefineDlgPosition(this, x, y); - this->move(x, y); - this->show(); - - LineEdit_NameMesh->setText(tr("SMESH_SUBMESH")); - LineEdit_NameMesh->setFocus(); - myEditCurrentArgument = LineEditC1A1; - mySelectionMgr->clearFilters(); - mySelectionMgr->installFilter(myMeshFilter); - - SelectionIntoArgument(); -} - -//================================================================================= -// function : ClickOnOk() -// purpose : -//================================================================================= -void SMESHGUI_AddSubMeshDlg::ClickOnOk() -{ - if (this->ClickOnApply()) - this->ClickOnCancel(); -} - -//================================================================================= -// function : ClickOnApply() +// function : updateControlState() // purpose : //================================================================================= -bool SMESHGUI_AddSubMeshDlg::ClickOnApply() +void SMESHGUI_AddSubMeshDlg::updateControlState( const bool isEnabled ) { - if (mySMESHGUI->isActiveStudyLocked()) - return false; - - QString myNameSubMesh = LineEdit_NameMesh->text().stripWhiteSpace(); - if (myNameSubMesh.isEmpty()) { - SUIT_MessageBox::warn1(this, tr("SMESH_WRN_WARNING"), - tr("SMESH_WRN_EMPTY_NAME"), tr("SMESH_BUT_OK")); - return false; - } - - if (myMesh->_is_nil() || myGeomShape->_is_nil() || - (!HypoList.count() && !AlgoList.count())) - return false; - - _PTR(SObject) aMeshSO = SMESH::FindSObject(myMesh); - GEOM::GEOM_Object_var myMainShape = SMESH::GetShapeOnMeshOrSubMesh(aMeshSO); - if (myMainShape->_is_nil()) - return false; - - SUIT_OverrideCursor wc; - - SUIT_Operation* op = - new SUIT_Operation (SUIT_Session::session()->activeApplication()); - - // start transaction - op->start(); - - // create submesh - SMESH::SMESH_subMesh_var aSubMesh = SMESH::AddSubMesh(myMesh, myGeomShape, myNameSubMesh); - int nbSuccess = 0; - - if (!aSubMesh->_is_nil()) { - // assign hypotheses - int nbAlgo = AlgoList.count(); - int nbHyps = HypoList.count() + nbAlgo; - for (int i = 0; i < nbHyps; i++) { - _PTR(SObject) aHypSOClient = - SMESH::GetActiveStudyDocument()->FindObjectID - (i < nbAlgo ? AlgoList[i].latin1() : HypoList[i-nbAlgo].latin1()); - if (aHypSOClient) { - CORBA::Object_var anObject = _CAST(SObject,aHypSOClient)->GetObject(); - if (!CORBA::is_nil(anObject)) { - SMESH::SMESH_Hypothesis_var aHyp = SMESH::SMESH_Hypothesis::_narrow(anObject); - if (!aHyp->_is_nil()) - if (SMESH::AddHypothesisOnSubMesh(aSubMesh, aHyp)) - nbSuccess++; - } else { - SCRUTE(CORBA::is_nil(anObject)); - } - } else { - SCRUTE(!aHypSOClient); - } - } - } else { - SCRUTE(aSubMesh->_is_nil()); - } - - // commit transaction - op->commit(); - mySMESHGUI->updateObjBrowser(); - return (nbSuccess > 0); + setButtonEnabled( isEnabled, OK | Apply ); } //================================================================================= -// function : ClickOnCancel() +// function : init() // purpose : //================================================================================= -void SMESHGUI_AddSubMeshDlg::ClickOnCancel() +void SMESHGUI_AddSubMeshDlg::init() { - close(); + clearSelection(); + myMeshName->setText( tr( "SMESH_SUBMESH" ) ); } //================================================================================= -// function : IsFatherOf() +// function : subMeshName // purpose : //================================================================================= -static bool IsFatherOf (_PTR(SObject) SO, _PTR(SObject) fatherSO) +QString SMESHGUI_AddSubMeshDlg::subMeshName() const { - if (SO && fatherSO) { - _PTR(SObject) aSO = SO->GetFather(); - //while (strlen(aSO->GetID()) >= strlen(fatherSO->GetID())) { - while (aSO->GetID().length() >= fatherSO->GetID().length()) { - //if (QString(aSO->GetID()) == QString(fatherSO->GetID())) - if (aSO->GetID() == fatherSO->GetID()) - return true; - aSO = aSO->GetFather(); - } - } - return false; -} - -//================================================================================= -// function : SelectionIntoArgument() -// purpose : Called when selection as changed or other case -//================================================================================= -void SMESHGUI_AddSubMeshDlg::SelectionIntoArgument() -{ - QString aString = ""; - - SALOME_ListIO aList; - mySelectionMgr->selectedObjects(aList, SVTK_Viewer::Type()); - int nbSel = SMESH::GetNameOfSelectedIObjects(mySelectionMgr, aString); - - if (myEditCurrentArgument == LineEditC1A1) { - // mesh - if (nbSel != 1) { - myMesh = SMESH::SMESH_Mesh::_nil(); - aString = ""; - } else { - Handle(SALOME_InteractiveObject) IO = aList.First(); - myMesh = SMESH::IObjectToInterface(IO); - if (myMesh->_is_nil()) { - aString = ""; - } - } - myGeomShape = GEOM::GEOM_Object::_nil(); - LineEditC1A2->setText(""); - - } else if (myEditCurrentArgument == LineEditC1A2) { - // geom shape - if (nbSel != 1) { - myGeomShape = GEOM::GEOM_Object::_nil(); - aString = ""; - } else { - Handle(SALOME_InteractiveObject) IO = aList.First(); - myGeomShape = SMESH::IObjectToInterface(IO); - if (myGeomShape->_is_nil() || !GEOMBase::IsShape(myGeomShape)) { - myGeomShape = GEOM::GEOM_Object::_nil(); - aString = ""; - } - if (!myMesh->_is_nil()) { - _PTR(SObject) aMeshSO = SMESH::FindSObject(myMesh); - GEOM::GEOM_Object_var aMainGeomShape = SMESH::GetShapeOnMeshOrSubMesh(aMeshSO); - _PTR(SObject) aMainGeomShapeSO = SMESH::FindSObject(aMainGeomShape); - if (!aMainGeomShapeSO || - !IsFatherOf(SMESH::GetActiveStudyDocument()->FindObjectID - (IO->getEntry()), aMainGeomShapeSO)) { - myGeomShape = GEOM::GEOM_Object::_nil(); - aString = ""; - } - } - } - } else if (myEditCurrentArgument == LineEditC1A1Hyp) { - // hypotheses - HypoList.clear(); - if (nbSel >= 1) { - SALOME_ListIteratorOfListIO Itinit (aList); - for (; Itinit.More(); Itinit.Next()) { - HypoList.append(Itinit.Value()->getEntry()); - } - if (nbSel > 1) - aString = tr("%1 Hypothesis").arg(nbSel); - } else { - aString = ""; - } - } else if (myEditCurrentArgument == LineEditC1A1Algo) { - // algorithms - AlgoList.clear(); - if (nbSel >= 1) { - SALOME_ListIteratorOfListIO Itinit (aList); - for (; Itinit.More(); Itinit.Next()) { - AlgoList.append(Itinit.Value()->getEntry()); - } - if (nbSel > 1) - aString = tr("%1 Algorithms").arg(nbSel); - } else { - aString = ""; - } - } else { - } - - myEditCurrentArgument->setText(aString); - myEditCurrentArgument->setCursorPosition( 0 ); - - UpdateControlState(); -} - -//================================================================================= -// function : SetEditCurrentArgument() -// purpose : -//================================================================================= -void SMESHGUI_AddSubMeshDlg::SetEditCurrentArgument() -{ - QPushButton* send = (QPushButton*)sender(); - if(send == SelectButtonC1A1) { - LineEditC1A1->setFocus(); - mySelectionMgr->clearFilters(); - mySelectionMgr->installFilter(myMeshFilter); - myEditCurrentArgument = LineEditC1A1; - } else if (send == SelectButtonC1A2) { - LineEditC1A2->setFocus(); - mySelectionMgr->clearFilters(); - mySelectionMgr->installFilter(myGeomFilter); - myEditCurrentArgument = LineEditC1A2; - } else if(send == SelectButtonC1A1Hyp) { - LineEditC1A1Hyp->setFocus(); - mySelectionMgr->clearFilters(); - mySelectionMgr->installFilter(myHypothesisFilter); - myEditCurrentArgument = LineEditC1A1Hyp; - } else if(send == SelectButtonC1A1Algo) { - LineEditC1A1Algo->setFocus(); - mySelectionMgr->clearFilters(); - mySelectionMgr->installFilter(myAlgorithmFilter); - myEditCurrentArgument = LineEditC1A1Algo; - } - SelectionIntoArgument(); -} - -//================================================================================= -// function : DeactivateActiveDialog() -// purpose : -//================================================================================= -void SMESHGUI_AddSubMeshDlg::DeactivateActiveDialog() -{ - if (GroupC1->isEnabled()) { - disconnect(mySelectionMgr, 0, this, 0); - GroupC1->setEnabled(false); - GroupButtons->setEnabled(false); - } -} - -//================================================================================= -// function : ActivateThisDialog() -// purpose : -//================================================================================= -void SMESHGUI_AddSubMeshDlg::ActivateThisDialog() -{ - mySMESHGUI->EmitSignalDeactivateDialog(); - GroupC1->setEnabled(true); - GroupButtons->setEnabled(true); - connect (mySelectionMgr, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())); -} - -//================================================================================= -// function : enterEvent() -// purpose : -//================================================================================= -void SMESHGUI_AddSubMeshDlg::enterEvent (QEvent*) -{ - if (!GroupC1->isEnabled()) - ActivateThisDialog(); -} - -//================================================================================= -// function : closeEvent() -// purpose : -//================================================================================= -void SMESHGUI_AddSubMeshDlg::closeEvent (QCloseEvent* e) -{ - disconnect(mySelectionMgr, 0, this, 0); - mySMESHGUI->ResetState(); - mySelectionMgr->clearFilters(); - QDialog::closeEvent(e); -} - -//================================================================================= -// function : UpdateControlState() -// purpose : -//================================================================================= -void SMESHGUI_AddSubMeshDlg::UpdateControlState() -{ - bool isEnabled = (!myMesh->_is_nil() && - !myGeomShape->_is_nil() && - (HypoList.count() || AlgoList.count())); - bool isImportedMesh = false; - if (!myMesh->_is_nil()) { - _PTR(SObject) aMeshSO = SMESH::FindSObject(myMesh); - GEOM::GEOM_Object_var myGeomShape = SMESH::GetShapeOnMeshOrSubMesh(aMeshSO); - isImportedMesh = myGeomShape->_is_nil(); - } - - buttonOk ->setEnabled(isEnabled && !isImportedMesh); - buttonApply->setEnabled(isEnabled && !isImportedMesh); + return myMeshName->text().stripWhiteSpace(); } diff --git a/src/SMESHGUI/SMESHGUI_AddSubMeshDlg.h b/src/SMESHGUI/SMESHGUI_AddSubMeshDlg.h index 20e197618..1ccde29f4 100644 --- a/src/SMESHGUI/SMESHGUI_AddSubMeshDlg.h +++ b/src/SMESHGUI/SMESHGUI_AddSubMeshDlg.h @@ -29,101 +29,32 @@ #ifndef DIALOGBOX_ADD_SUBMESH_H #define DIALOGBOX_ADD_SUBMESH_H -//#include "SMESH_TypeFilter.hxx" +#include -#include "SUIT_SelectionFilter.h" -#include "SalomeApp_SelectionMgr.h" - -// QT Includes -#include -#include - -// IDL Headers -#include -#include CORBA_SERVER_HEADER(GEOM_Gen) -#include CORBA_SERVER_HEADER(SMESH_Mesh) - -class QGroupBox; -class QLabel; class QLineEdit; -class QPushButton; -class SMESHGUI; //================================================================================= // class : SMESHGUI_AddSubMeshDlg // purpose : //================================================================================= -class SMESHGUI_AddSubMeshDlg : public QDialog +class SMESHGUI_AddSubMeshDlg : public SMESHGUI_Dialog { Q_OBJECT public: - SMESHGUI_AddSubMeshDlg( SMESHGUI*, - const char* name = 0, - bool modal = FALSE, - WFlags fl = 0); + enum { MeshObj, GeomObj, Hypo, Algo }; + +public: + SMESHGUI_AddSubMeshDlg( SMESHGUI* ); ~SMESHGUI_AddSubMeshDlg(); -protected: - void closeEvent (QCloseEvent* e); - void enterEvent (QEvent *) ; - -private: - void Init (); - - void UpdateControlState(); + void init(); + void updateControlState( const bool ); + QString subMeshName() const; private: - SMESHGUI* mySMESHGUI; - SalomeApp_SelectionMgr* mySelectionMgr; - - SMESH::SMESH_Mesh_var myMesh; - GEOM::GEOM_Object_var myGeomShape; - QLineEdit* myEditCurrentArgument; - - //Handle(SALOME_TypeFilter) myMeshFilter; - //Handle(SMESH_TypeFilter) myMeshFilter; - //Handle(SMESH_TypeFilter) myHypothesisFilter; - //Handle(SMESH_TypeFilter) myAlgorithmFilter; - SUIT_SelectionFilter* myGeomFilter; - SUIT_SelectionFilter* myMeshFilter; - SUIT_SelectionFilter* myHypothesisFilter; - SUIT_SelectionFilter* myAlgorithmFilter; - - QStringList HypoList; - QStringList AlgoList; - - QGroupBox* GroupButtons; - QPushButton* buttonOk; - QPushButton* buttonApply; - QPushButton* buttonCancel; - - QGroupBox* GroupC1; - QLabel* TextLabel_NameMesh; - QLineEdit* LineEdit_NameMesh; - QLabel* TextLabelC1A1; - QPushButton* SelectButtonC1A1; - QLineEdit* LineEditC1A1; - QLabel* TextLabelC1A2; - QPushButton* SelectButtonC1A2; - QLineEdit* LineEditC1A2; - - QLabel* TextLabelC1A1Hyp; - QPushButton* SelectButtonC1A1Hyp; - QLineEdit* LineEditC1A1Hyp; - - QLabel* TextLabelC1A1Algo; - QPushButton* SelectButtonC1A1Algo; - QLineEdit* LineEditC1A1Algo; + QLineEdit* myMeshName; -private slots: - void ClickOnOk(); - bool ClickOnApply(); - void ClickOnCancel(); - void SetEditCurrentArgument(); - void SelectionIntoArgument(); - void DeactivateActiveDialog(); - void ActivateThisDialog(); }; #endif // DIALOGBOX_ADD_SUBMESH_H diff --git a/src/SMESHGUI/SMESHGUI_AddSubMeshOp.cxx b/src/SMESHGUI/SMESHGUI_AddSubMeshOp.cxx new file mode 100644 index 000000000..64da71a7f --- /dev/null +++ b/src/SMESHGUI/SMESHGUI_AddSubMeshOp.cxx @@ -0,0 +1,359 @@ +// SMESH SMESHGUI : GUI for SMESH component +// +// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// +// +// +// File : SMESHGUI_AddSubMeshDlg.cxx +// Author : Nicolas REJNERI +// Module : SMESH +// $Header$ + +#include "SMESHGUI_AddSubMeshOp.h" +#include +#include +#include +#include +#include + +#include +#include + +#include +#include +#include + +#include +#include +#include + +#include + +#include + +#include + +//================================================================================= +// function : Constructor +// purpose : +//================================================================================= +SMESHGUI_AddSubMeshOp::SMESHGUI_AddSubMeshOp() +: SMESHGUI_Operation(), + myDlg( 0 ), + myMeshFilter( 0 ), + myGeomFilter( 0 ), + myHypothesisFilter( 0 ), + myAlgorithmFilter( 0 ) +{ +} + +//================================================================================= +// function : Destructor +// purpose : +//================================================================================= +SMESHGUI_AddSubMeshOp::~SMESHGUI_AddSubMeshOp() +{ + if( myDlg ) + delete myDlg; + + if( myMeshFilter ) + delete myMeshFilter; + + if( myGeomFilter ) + delete myGeomFilter; + + if( myAlgorithmFilter ) + delete myAlgorithmFilter; + + if( myHypothesisFilter ) + delete myHypothesisFilter; +} + +//================================================================================= +// function : startOperation +// purpose : +//================================================================================= +void SMESHGUI_AddSubMeshOp::startOperation() +{ + if( !myDlg ) + { + myDlg = new SMESHGUI_AddSubMeshDlg( getSMESHGUI() ); + connect( myDlg, SIGNAL( objectActivated( int ) ), this, SLOT( onActivateObject( int ) ) ); + connect( myDlg, SIGNAL( selectionChanged( int ) ), this, SLOT( onSelectionChanged( int ) ) ); + } + + SMESHGUI_Operation::startOperation(); + + if( !myGeomFilter ) + { + TColStd_MapOfInteger allTypesMap; + for (int i = 0; i < 10; i++) + allTypesMap.Add(i); + myGeomFilter = new SMESH_NumberFilter ("GEOM", TopAbs_SHAPE, 0, allTypesMap); + } + + if( !myMeshFilter ) + myMeshFilter = new SMESH_TypeFilter (MESH); + + if( !myAlgorithmFilter ) + myAlgorithmFilter = new SMESH_TypeFilter (ALGORITHM); + + if( !myHypothesisFilter ) + myHypothesisFilter = new SMESH_TypeFilter (HYPOTHESIS); + + init(); + myDlg->show(); +} + +//================================================================================= +// function : dlg +// purpose : +//================================================================================= +SalomeApp_Dialog* SMESHGUI_AddSubMeshOp::dlg() const +{ + return myDlg; +} + +//================================================================================= +// function : selectionDone +// purpose : +//================================================================================= +void SMESHGUI_AddSubMeshOp::selectionDone() +{ + QStringList names, ids; + SMESHGUI_Dialog::TypesList types; + selected( names, types, ids ); + if( myDlg ) + { + myDlg->selectObject( names, types, ids ); + myDlg->updateControlState( isValid() ); + } +} + +//================================================================================= +// function : onActivateObject +// purpose : +//================================================================================= +void SMESHGUI_AddSubMeshOp::onActivateObject( int obj ) +{ + SalomeApp_SelectionMgr* mgr = selectionMgr(); + + if( !mgr ) + return; + + mgr->clearFilters(); + + if( obj==SMESHGUI_AddSubMeshDlg::MeshObj ) + mgr->installFilter( myMeshFilter ); + + else if( obj==SMESHGUI_AddSubMeshDlg::GeomObj ) + mgr->installFilter( myGeomFilter ); + + else if( obj==SMESHGUI_AddSubMeshDlg::Hypo ) + mgr->installFilter( myHypothesisFilter ); + + else if( obj==SMESHGUI_AddSubMeshDlg::Algo ) + mgr->installFilter( myAlgorithmFilter ); +} + +//================================================================================= +// function : commitOperation +// purpose : +//================================================================================= +bool SMESHGUI_AddSubMeshOp::onApply() +{ + if( getSMESHGUI()->isActiveStudyLocked() ) + return false; + + QString myNameSubMesh = myDlg->subMeshName(); + if (myNameSubMesh.isEmpty()) + { + SUIT_MessageBox::warn1( dlg(), tr("SMESH_WRN_WARNING"), + tr("SMESH_WRN_EMPTY_NAME"), tr("SMESH_BUT_OK")); + return false; + } + + QStringList selMesh, selGeom, selHypo, selAlgo; + myDlg->selectedObject( SMESHGUI_AddSubMeshDlg::MeshObj, selMesh ); + myDlg->selectedObject( SMESHGUI_AddSubMeshDlg::GeomObj, selGeom ); + myDlg->selectedObject( SMESHGUI_AddSubMeshDlg::Hypo, selHypo ); + myDlg->selectedObject( SMESHGUI_AddSubMeshDlg::Algo, selAlgo ); + + _PTR(Study) study = studyDS(); + _PTR(SObject) aMeshSO = study->FindObjectID( selMesh.first() ); + SMESH::SMESH_Mesh_var myMesh = SMESH::SMESH_Mesh::_narrow( _CAST( SObject, aMeshSO )->GetObject() ); + GEOM::GEOM_Object_var myMainShape = SMESH::GetShapeOnMeshOrSubMesh(aMeshSO); + if (myMainShape->_is_nil()) + return false; + + SUIT_OverrideCursor wc; + + _PTR(SObject) aGeomSO = study->FindObjectID( selGeom.first() ); + GEOM::GEOM_Object_var myGeomShape = GEOM::GEOM_Object::_narrow( _CAST( SObject, aGeomSO )->GetObject() ); + + // create submesh + SMESH::SMESH_subMesh_var aSubMesh = addSubMesh(myMesh, myGeomShape, myNameSubMesh); + int nbSuccess = 0; + + if (!aSubMesh->_is_nil()) + { + // assign hypotheses + int nbAlgo = selAlgo.count(); + int nbHyps = selHypo.count() + nbAlgo; + for (int i = 0; i < nbHyps; i++) + { + _PTR(SObject) aHypSOClient = + study->FindObjectID + (i < nbAlgo ? selAlgo[i].latin1() : selHypo[i-nbAlgo].latin1()); + if (aHypSOClient) + { + CORBA::Object_var anObject = _CAST(SObject,aHypSOClient)->GetObject(); + if(!CORBA::is_nil(anObject)) + { + SMESH::SMESH_Hypothesis_var aHyp = SMESH::SMESH_Hypothesis::_narrow(anObject); + if(!aHyp->_is_nil()) + if (SMESH::AddHypothesisOnSubMesh(aSubMesh, aHyp)) + nbSuccess++; + } + else + { + SCRUTE(CORBA::is_nil(anObject)); + } + } + else + { + SCRUTE(!aHypSOClient); + } + } + } + else + { + SCRUTE(aSubMesh->_is_nil()); + } + + update( UF_Model | UF_ObjBrowser ); + init(); + + return (nbSuccess > 0); +} + +//================================================================================= +// function : init() +// purpose : +//================================================================================= +void SMESHGUI_AddSubMeshOp::init() +{ + if( myDlg ) + { + myDlg->init(); + myDlg->updateControlState( false ); + } +} + +//================================================================================= +// function : isValid() +// purpose : +//================================================================================= +bool SMESHGUI_AddSubMeshOp::isValid() const +{ + bool isEnabled = !myDlg->subMeshName().isEmpty() && + myDlg->hasSelection( SMESHGUI_AddSubMeshDlg::MeshObj ) && + myDlg->hasSelection( SMESHGUI_AddSubMeshDlg::GeomObj ) && + myDlg->hasSelection( SMESHGUI_AddSubMeshDlg::Hypo ) && + myDlg->hasSelection( SMESHGUI_AddSubMeshDlg::Algo ); + + bool isImportedMesh = false; + + QStringList selMesh; + myDlg->selectedObject( SMESHGUI_AddSubMeshDlg::MeshObj, selMesh ); + _PTR(SObject) SO = studyDS()->FindObjectID( selMesh.first() ); + GEOM::GEOM_Object_var myGeomShape = SMESH::GetShapeOnMeshOrSubMesh(SO); + isImportedMesh = myGeomShape->_is_nil(); + + return isEnabled && !isImportedMesh; +} + +//================================================================================= +// function : IsFatherOf() +// purpose : +//================================================================================= +static bool IsFatherOf (_PTR(SObject) SO, _PTR(SObject) fatherSO) +{ + if( SO && fatherSO ) + { + _PTR(SObject) aSO = SO->GetFather(); + while (aSO->GetID().length() >= fatherSO->GetID().length()) + { + if (aSO->GetID() == fatherSO->GetID()) + return true; + aSO = aSO->GetFather(); + } + } + return false; +} + +//================================================================================= +// function : onSelectionChanged() +// purpose : +//================================================================================= +void SMESHGUI_AddSubMeshOp::onSelectionChanged( int id ) +{ + if( !myDlg->hasSelection( id ) ) + return; + + if( id==SMESHGUI_AddSubMeshDlg::MeshObj ) + myDlg->clearSelection( SMESHGUI_AddSubMeshDlg::GeomObj ); + + else if( id==SMESHGUI_AddSubMeshDlg::GeomObj ) + { + QStringList selMesh, selGeom; + myDlg->selectedObject( SMESHGUI_AddSubMeshDlg::MeshObj, selMesh ); + myDlg->selectedObject( SMESHGUI_AddSubMeshDlg::GeomObj, selGeom ); + + _PTR(SObject) aMeshSO = studyDS()->FindObjectID( selMesh.first() ); + + GEOM::GEOM_Object_var aMainGeomShape = SMESH::GetShapeOnMeshOrSubMesh(aMeshSO); + _PTR(SObject) aMainGeomShapeSO = SMESH::FindSObject(aMainGeomShape); + if( !aMainGeomShapeSO || !IsFatherOf( studyDS()->FindObjectID( selGeom.first() ), aMainGeomShapeSO ) ) + myDlg->clearSelection( id ); + } +} + +//================================================================================= +// function : onSelectionChanged() +// purpose : +//================================================================================= +SMESH::SMESH_subMesh_var SMESHGUI_AddSubMeshOp::addSubMesh( SMESH::SMESH_Mesh_ptr theMesh, + GEOM::GEOM_Object_ptr theShapeObject, + const QString& theMeshName ) +{ + SMESH::SMESH_subMesh_var aSubMesh; + try + { + if(!theMesh->_is_nil() && !theShapeObject->_is_nil()) + aSubMesh = theMesh->GetSubMesh(theShapeObject, theMeshName); + } + catch (const SALOME::SALOME_Exception& S_ex) + { + SalomeApp_Tools::QtCatchCorbaException(S_ex); + } + + return aSubMesh._retn(); +} diff --git a/src/SMESHGUI/SMESHGUI_AddSubMeshOp.h b/src/SMESHGUI/SMESHGUI_AddSubMeshOp.h new file mode 100644 index 000000000..a9124eb71 --- /dev/null +++ b/src/SMESHGUI/SMESHGUI_AddSubMeshOp.h @@ -0,0 +1,79 @@ +// SMESH SMESHGUI : GUI for SMESH component +// +// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// +// +// +// File : SMESHGUI_AddSubMeshOp.h +// Author : Nicolas REJNERI +// Module : SMESH +// $Header$ + +#ifndef OPERATION_ADD_SUB_MESH_H +#define OPERATION_ADD_SUB_MESH_H + +#include + +#include +#include CORBA_SERVER_HEADER(GEOM_Gen) +#include CORBA_SERVER_HEADER(SMESH_Gen) + + +class SMESHGUI_AddSubMeshDlg; +class SUIT_SelectionFilter; + +//================================================================================= +// class : SMESHGUI_AddSubMeshOp +// purpose : +//================================================================================= +class SMESHGUI_AddSubMeshOp : public SMESHGUI_Operation +{ + Q_OBJECT + +public: + SMESHGUI_AddSubMeshOp(); + ~SMESHGUI_AddSubMeshOp(); + + virtual SalomeApp_Dialog* dlg() const; + void init(); + +protected: + virtual void startOperation(); + virtual void selectionDone(); + + bool isValid() const; + + SMESH::SMESH_subMesh_var addSubMesh( SMESH::SMESH_Mesh_ptr, + GEOM::GEOM_Object_ptr, + const QString& ); + +protected slots: + virtual bool onApply(); + +private slots: + void onActivateObject( int ); + void onSelectionChanged( int ); + +private: + SMESHGUI_AddSubMeshDlg *myDlg; + SUIT_SelectionFilter *myMeshFilter, *myGeomFilter, *myHypothesisFilter, *myAlgorithmFilter; +}; + +#endif // OPERATION_INIT_MESH_H