X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESHGUI%2FSMESHGUI_ShapeByMeshDlg.cxx;h=d1a2dd8b3a30611986d144ffa2520b93c7b7a52d;hp=d437ee1efc84c198ca5b1dbd450a352e214a11b5;hb=ea8a0289f14641c23d515de68aa4fdc24a6208ba;hpb=d0f366c4a3a66a71b0be94f7a6e2d146f80a94c4 diff --git a/src/SMESHGUI/SMESHGUI_ShapeByMeshDlg.cxx b/src/SMESHGUI/SMESHGUI_ShapeByMeshDlg.cxx index d437ee1ef..d1a2dd8b3 100644 --- a/src/SMESHGUI/SMESHGUI_ShapeByMeshDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_ShapeByMeshDlg.cxx @@ -1,30 +1,29 @@ -// SMESH SMESHGUI : GUI for SMESH component +// Copyright (C) 2007-2014 CEA/DEN, EDF R&D, OPEN CASCADE // -// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +// Copyright (C) 2003-2007 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 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, or (at your option) any later version. // -// 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. +// 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 +// 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// -// -// File : SMESHGUI_ShapeByMeshDlg.cxx -// Author : Edward AGAPOV -// Module : SMESH +// File : SMESHGUI_ShapeByMeshDlg.cxx +// Author : Edward AGAPOV, Open CASCADE S.A.S. +// SMESH includes +// #include "SMESHGUI_ShapeByMeshDlg.h" #include "SMESHGUI.h" @@ -34,41 +33,49 @@ #include "SMESHGUI_Utils.h" #include "SMESHGUI_VTKUtils.h" -#include "SMDS_Mesh.hxx" -#include "SMDS_MeshNode.hxx" -#include "SMESH_Actor.h" - -#include "GEOMBase.h" -#include "GeometryGUI.h" - -#include "LightApp_DataOwner.h" -#include "LightApp_SelectionMgr.h" -#include "SALOMEDSClient_SObject.hxx" -#include "SALOME_ListIO.hxx" -#include "SUIT_Desktop.h" -#include "SVTK_Selector.h" -#include "SVTK_ViewWindow.h" -#include "SVTK_ViewModel.h" -#include "SalomeApp_Tools.h" - -// OCCT Includes +#include +#include +#include + +// SALOME GEOM includes +#include +#include +#include + +// SALOME GUI includes +#include +#include +#include +#include +#include +#include +#include +#include + +// SALOME KERNEL includes +#include +#include +#include + +// OCCT includes #include #include #include -// QT Includes -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#define SPACING 5 -#define MARGIN 10 +// Qt includes +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define SPACING 6 +#define MARGIN 11 enum { EDGE = 0, FACE, VOLUME }; @@ -76,28 +83,21 @@ enum { EDGE = 0, FACE, VOLUME }; * \brief Dialog to publish a sub-shape of the mesh main shape * by selecting mesh elements */ -SMESHGUI_ShapeByMeshDlg::SMESHGUI_ShapeByMeshDlg( SMESHGUI* theModule, - const char* theName) - : QDialog( SMESH::GetDesktop( theModule ), theName, false, - WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu), - mySMESHGUI( theModule ), - mySelectionMgr( SMESH::GetSelectionMgr( theModule ) ) +SMESHGUI_ShapeByMeshDlg::SMESHGUI_ShapeByMeshDlg(bool isMultipleAllowed) + : SMESHGUI_Dialog( 0, false, true, OK | Close ), + myIsMultipleAllowed( isMultipleAllowed ) { - setCaption(tr("CAPTION")); + setWindowTitle(tr("CAPTION")); - QVBoxLayout* aDlgLay = new QVBoxLayout (this, MARGIN, SPACING); + QVBoxLayout* aDlgLay = new QVBoxLayout (mainFrame()); + aDlgLay->setMargin(MARGIN); + aDlgLay->setSpacing(SPACING); - QFrame* aMainFrame = createMainFrame (this); - QFrame* aBtnFrame = createButtonFrame(this); + QFrame* aMainFrame = createMainFrame (mainFrame()); aDlgLay->addWidget(aMainFrame); - aDlgLay->addWidget(aBtnFrame); aDlgLay->setStretchFactor(aMainFrame, 1); - - myViewWindow = SMESH::GetViewWindow( mySMESHGUI ); - - Init(); } //======================================================================= @@ -106,108 +106,131 @@ SMESHGUI_ShapeByMeshDlg::SMESHGUI_ShapeByMeshDlg( SMESHGUI* theModule, //======================================================================= QFrame* SMESHGUI_ShapeByMeshDlg::createMainFrame (QWidget* theParent) { - QFrame* aMainGrp = new QFrame(theParent, "main frame"); - QGridLayout* aLayout = new QGridLayout(aMainGrp, 3, 2); - aLayout->setSpacing(6); - aLayout->setAutoAdd(false); + QFrame* aMainGrp = new QFrame(theParent); + QGridLayout* aLayout = new QGridLayout(aMainGrp); + aLayout->setMargin(0); + aLayout->setSpacing(SPACING); // elem type - myElemTypeGroup = new QButtonGroup(1, Qt::Vertical, aMainGrp, "Group types"); - myElemTypeGroup->setTitle(tr("SMESH_ELEMENT_TYPE")); - myElemTypeGroup->setExclusive(true); - - (new QRadioButton( tr("SMESH_EDGE") , myElemTypeGroup))->setChecked(true); - new QRadioButton( tr("SMESH_FACE") , myElemTypeGroup); - new QRadioButton( tr("SMESH_VOLUME"), myElemTypeGroup); - + myElemTypeBox = new QGroupBox(tr("SMESH_ELEMENT_TYPE"), aMainGrp); + myElemTypeGroup = new QButtonGroup(aMainGrp); + QHBoxLayout* myElemTypeBoxLayout = new QHBoxLayout(myElemTypeBox); + myElemTypeBoxLayout->setMargin(MARGIN); + myElemTypeBoxLayout->setSpacing(SPACING); + + QRadioButton* aEdgeRb = new QRadioButton( tr("SMESH_EDGE"), myElemTypeBox); + QRadioButton* aFaceRb = new QRadioButton( tr("SMESH_FACE"), myElemTypeBox); + QRadioButton* aVolumeRb = new QRadioButton( tr("SMESH_VOLUME"), myElemTypeBox); + + myElemTypeBoxLayout->addWidget(aEdgeRb); + myElemTypeBoxLayout->addWidget(aFaceRb); + myElemTypeBoxLayout->addWidget(aVolumeRb); + myElemTypeGroup->addButton(aEdgeRb, 0); + myElemTypeGroup->addButton(aFaceRb, 1); + myElemTypeGroup->addButton(aVolumeRb, 2); + aEdgeRb->setChecked(true); + // element id - QLabel* anIdLabel = new QLabel( aMainGrp, "element id label"); - anIdLabel->setText( tr("ELEMENT_ID") ); - myElementId = new QLineEdit( aMainGrp, "element id"); - myElementId->setValidator( new SMESHGUI_IdValidator( theParent, "id validator", 1 )); + QLabel* anIdLabel = new QLabel( tr("ELEMENT_ID"), aMainGrp ); + myElementId = new QLineEdit( aMainGrp ); + myElementId->setValidator( new SMESHGUI_IdValidator( theParent, + !myIsMultipleAllowed ? 1 : 0 ) ); // 0 for any number of entities // shape name - QLabel* aNameLabel = new QLabel( aMainGrp, "geom name label"); - aNameLabel->setText( tr("GEOMETRY_NAME") ); - myGeomName = new QLineEdit( aMainGrp, "geom name"); + QLabel* aNameLabel = new QLabel( tr("GEOMETRY_NAME"), aMainGrp ); + myGeomName = new QLineEdit( aMainGrp ); - aLayout->addMultiCellWidget(myElemTypeGroup, 0, 0, 0, 1); + aLayout->addWidget(myElemTypeBox, 0, 0, 1, 2); aLayout->addWidget(anIdLabel, 1, 0); aLayout->addWidget(myElementId, 1, 1); aLayout->addWidget(aNameLabel, 2, 0); aLayout->addWidget(myGeomName, 2, 1); - connect(myElemTypeGroup, SIGNAL(clicked(int)), SLOT(onTypeChanged(int))); - connect(myElementId, SIGNAL(textChanged(const QString&)), SLOT(onElemIdChanged(const QString&))); - return aMainGrp; } //======================================================================= -// function : createButtonFrame() -// purpose : Create frame containing buttons +// function : ~SMESHGUI_ShapeByMeshDlg() +// purpose : Destructor //======================================================================= -QFrame* SMESHGUI_ShapeByMeshDlg::createButtonFrame (QWidget* theParent) +SMESHGUI_ShapeByMeshDlg::~SMESHGUI_ShapeByMeshDlg() { - QFrame* aFrame = new QFrame(theParent); - aFrame->setFrameStyle(QFrame::Box | QFrame::Sunken); - - myOkBtn = new QPushButton(tr("SMESH_BUT_OK" ), aFrame); - myCloseBtn = new QPushButton(tr("SMESH_BUT_CLOSE"), aFrame); - - QSpacerItem* aSpacer = new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum); +} - QHBoxLayout* aLay = new QHBoxLayout(aFrame, MARGIN, SPACING); +void SMESHGUI_ShapeByMeshDlg:: setMultipleAllowed( bool isAllowed ) +{ + myIsMultipleAllowed = isAllowed; +} - aLay->addWidget(myOkBtn); - aLay->addItem(aSpacer); - aLay->addWidget(myCloseBtn); +//================================================================================ +/*! + * \brief Constructor + */ +//================================================================================ +SMESHGUI_ShapeByMeshOp::SMESHGUI_ShapeByMeshOp(bool isMultipleAllowed): + myIsMultipleAllowed(isMultipleAllowed) +{ + if ( GeometryGUI::GetGeomGen()->_is_nil() )// check that GEOM_Gen exists + GeometryGUI::InitGeomGen(); - connect(myOkBtn, SIGNAL(clicked()), SLOT(onOk())); - connect(myCloseBtn, SIGNAL(clicked()), SLOT(onClose())); + myDlg = new SMESHGUI_ShapeByMeshDlg(myIsMultipleAllowed); - return aFrame; + connect(myDlg->myElemTypeGroup, SIGNAL(buttonClicked(int)), SLOT(onTypeChanged(int))); + connect(myDlg->myElementId, SIGNAL(textChanged(const QString&)), SLOT(onElemIdChanged(const QString&))); } -//======================================================================= -// function : ~SMESHGUI_ShapeByMeshDlg() -// purpose : Destructor -//======================================================================= -SMESHGUI_ShapeByMeshDlg::~SMESHGUI_ShapeByMeshDlg() -{ - // no need to delete child widgets, Qt does it all for us -} //======================================================================= -// function : Init() +// function : startOperation() // purpose : Init dialog fields, connect signals and slots, show dialog //======================================================================= -void SMESHGUI_ShapeByMeshDlg::Init() +void SMESHGUI_ShapeByMeshOp::startOperation() { - SetMesh( SMESH::SMESH_Mesh::_nil() ); + //SetMesh( SMESH::SMESH_Mesh::_nil() ); myIsManualIdEnter = false; - //erasePreview(); + SMESHGUI_SelectionOp::startOperation(); - mySMESHGUI->SetActiveDialogBox((QDialog*)this); + //activateSelection(); // set filters + onSelectionDone(); // desable/enable [ OK ] - // selection and SMESHGUI - connect(mySMESHGUI, SIGNAL(SignalDeactivateActiveDialog()), SLOT(onDeactivate())); - connect(mySMESHGUI, SIGNAL(SignalCloseAllDialogs()), SLOT(onClose())); + myDlg->show(); +} - setSizePolicy(QSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding)); - qApp->processEvents(); - updateGeometry(); - adjustSize(); - resize(minimumSize()); +//================================================================================ +/*! + * \brief Destructor + */ +//================================================================================ +SMESHGUI_ShapeByMeshOp::~SMESHGUI_ShapeByMeshOp() +{ + if ( myDlg ) + delete myDlg; +} - activateSelection(); - onSelectionDone(); +//================================================================================ +/*! + * \brief Gets dialog of this operation + * \retval LightApp_Dialog* - pointer to dialog of this operation + */ +//================================================================================ +LightApp_Dialog* SMESHGUI_ShapeByMeshOp::dlg() const +{ + return myDlg; +} - int x, y; - mySMESHGUI->DefineDlgPosition(this, x, y); - this->move(x, y); - this->show(); +SMESH::SMESH_Mesh_ptr SMESHGUI_ShapeByMeshOp::GetMesh() +{ + return myMesh; +} + +//======================================================================= +// function : GetShape() +// purpose : Return published sub-shape, it must be UnRegister()ed! +//======================================================================= +GEOM::GEOM_Object_ptr SMESHGUI_ShapeByMeshOp::GetShape() +{ + return myGeomObj.in(); } //======================================================================= @@ -215,134 +238,190 @@ void SMESHGUI_ShapeByMeshDlg::Init() // purpose : Set mesh to dialog //======================================================================= -void SMESHGUI_ShapeByMeshDlg::SetMesh (SMESH::SMESH_Mesh_ptr thePtr) +void SMESHGUI_ShapeByMeshOp::SetMesh (SMESH::SMESH_Mesh_ptr thePtr) { myMesh = SMESH::SMESH_Mesh::_duplicate(thePtr); myGeomObj = GEOM::GEOM_Object::_nil(); myHasSolids = false; - vector< bool > hasElement (myElemTypeGroup->count(), false); - if (!myMesh->_is_nil() && myViewWindow ) - { - _PTR(SObject) aSobj = SMESH::FindSObject(myMesh.in()); - SUIT_DataOwnerPtr anIObj (new LightApp_DataOwner(aSobj->GetID().c_str())); - - vector< int > nbShapes( TopAbs_SHAPE, 0 ); - int shapeDim = 0; // max dim with several shapes - if ( mySelectionMgr->isOk(anIObj) ) // check that the mesh has a valid shape + std::vector< bool > hasElement (myDlg->myElemTypeGroup->buttons().count(), false); + if (!myMesh->_is_nil() ) { - _PTR(SObject) aSO = SMESH::FindSObject(myMesh.in()); - GEOM::GEOM_Object_var mainShape = SMESH::GetGeom(aSO); - if ( !mainShape->_is_nil() ) - { - if ( GeometryGUI::GetGeomGen()->_is_nil() )// check that GEOM_Gen exists - GeometryGUI::InitGeomGen(); - TopoDS_Shape aShape; - if ( GEOMBase::GetShape(mainShape, aShape)) - { - TopAbs_ShapeEnum types[4] = { TopAbs_EDGE, TopAbs_FACE, TopAbs_SHELL, TopAbs_SOLID }; - for ( int dim = 4; dim > 0; --dim ) { - TopAbs_ShapeEnum type = types[ dim - 1 ]; - TopAbs_ShapeEnum avoid = ( type == TopAbs_SHELL ) ? TopAbs_SOLID : TopAbs_SHAPE; - TopExp_Explorer exp( aShape, type, avoid ); - for ( ; nbShapes[ type ] < 2 && exp.More(); exp.Next() ) - ++nbShapes[ type ]; - if ( nbShapes[ type ] > 1 ) { - shapeDim = dim; - break; - } - } - } - } - } - if (shapeDim > 0) - { - if ( nbShapes[ TopAbs_SHELL ] + nbShapes[ TopAbs_SOLID ] > 1 ) - shapeDim = 3; - hasElement[ EDGE ] = shapeDim > 0 && myMesh->NbEdges() ; - hasElement[ FACE ] = shapeDim > 1 && myMesh->NbFaces() ; - hasElement[ VOLUME ] = shapeDim > 2 && myMesh->NbVolumes(); + // _PTR(SObject) aSobj = SMESH::FindSObject(myMesh.in()); + // SUIT_DataOwnerPtr anIObj (new LightApp_DataOwner(aSobj->GetID().c_str())); - if ( hasElement[ EDGE ] && myViewWindow->GetSelector() ) + std::vector< int > nbShapes( TopAbs_SHAPE, 0 ); + int shapeDim = 0; // max dim with several shapes + //if ( /*mySelectionMgr*/ selectionMgr()->isOk(anIObj) ) // check that the mesh has a valid shape { - connect(mySelectionMgr, SIGNAL(currentSelectionChanged()), SLOT(onSelectionDone())); + _PTR(SObject) aSO = SMESH::FindSObject(myMesh.in()); + GEOM::GEOM_Object_var mainShape = SMESH::GetGeom(aSO); + if ( !mainShape->_is_nil() ) + { + TopoDS_Shape aShape; + if ( GEOMBase::GetShape(mainShape, aShape)) + { + TopAbs_ShapeEnum types[4] = { TopAbs_EDGE, TopAbs_FACE, TopAbs_SHELL, TopAbs_SOLID }; + for ( int dim = 4; dim > 0; --dim ) { + TopAbs_ShapeEnum type = types[ dim - 1 ]; + TopAbs_ShapeEnum avoid = ( type == TopAbs_SHELL ) ? TopAbs_SOLID : TopAbs_SHAPE; + TopExp_Explorer exp( aShape, type, avoid ); + for ( ; nbShapes[ type ] < 2 && exp.More(); exp.Next() ) + ++nbShapes[ type ]; + if ( nbShapes[ type ] > 1 ) { + shapeDim = dim; + break; + } + } + } + } } + if (shapeDim > 0) + { + if ( nbShapes[ TopAbs_SHELL ] + nbShapes[ TopAbs_SOLID ] > 1 ) + shapeDim = 3; + hasElement[ EDGE ] = shapeDim > 0 && myMesh->NbEdges(); + hasElement[ FACE ] = shapeDim > 1 && myMesh->NbFaces(); + hasElement[ VOLUME ] = shapeDim > 2 && myMesh->NbVolumes(); + } + myHasSolids = nbShapes[ TopAbs_SOLID ]; } - myHasSolids = nbShapes[ TopAbs_SOLID ]; - } // disable inexistant elem types - for ( int i = 0; i < myElemTypeGroup->count(); ++i ) { - if ( QButton* button = myElemTypeGroup->find( i ) ) + for ( int i = 0; i < myDlg->myElemTypeGroup->buttons().count(); ++i ) { + if ( QAbstractButton* button = myDlg->myElemTypeGroup->button( i ) ) button->setEnabled( hasElement[ i ] ); } - myElementId->setEnabled( hasElement[ EDGE ] ); - myGeomName-> setEnabled( hasElement[ EDGE ] ); + myDlg->myElementId->setEnabled( hasElement[ EDGE ] ); + myDlg->myGeomName-> setEnabled( hasElement[ EDGE ] ); setElementID(""); } //======================================================================= -// function : GetShape() -// purpose : Get published sub-shape +// function : commitOperation() +// purpose : called when "Ok" button pressed. //======================================================================= -GEOM::GEOM_Object_ptr SMESHGUI_ShapeByMeshDlg::GetShape() -{ - return myGeomObj.in(); -} -//======================================================================= -// function : onOk() -// purpose : SLOT called when "Ok" button pressed. -//======================================================================= -void SMESHGUI_ShapeByMeshDlg::onOk() +void SMESHGUI_ShapeByMeshOp::commitOperation() { + SMESHGUI_SelectionOp::commitOperation(); try { - int elemID = myElementId->text().toInt(); - myGeomObj = SMESHGUI::GetSMESHGen()->GetGeometryByMeshElement - ( myMesh.in(), elemID, myGeomName->text().latin1()); + QStringList aListId = myDlg->myElementId->text().split( " ", QString::SkipEmptyParts); + if (aListId.count() == 1) + { + int elemID = (aListId.first()).toInt(); + // GEOM_Object is published -> no need to UnRegister() + myGeomObj = GEOM::GEOM_Object::_duplicate + (SMESHGUI::GetSMESHGen()->GetGeometryByMeshElement + ( myMesh.in(), elemID, myDlg->myGeomName->text().toLatin1().constData()) ); + } + else + { + GEOM::GEOM_Gen_var geomGen = SMESH::GetGEOMGen(); + _PTR(Study) aStudy = SMESH::GetActiveStudyDocument(); + + if (geomGen->_is_nil() || !aStudy) + return; - accept(); - emit PublishShape(); + GEOM::GEOM_IShapesOperations_wrap aShapesOp = + geomGen->GetIShapesOperations(aStudy->StudyId()); + if (aShapesOp->_is_nil() ) + return; + + TopAbs_ShapeEnum aGroupType = TopAbs_SHAPE; + + std::map aGeomObjectsMap; + GEOM::GEOM_Object_wrap aGeomObject; + + GEOM::GEOM_Object_var aMeshShape = myMesh->GetShapeToMesh(); + + for ( int i = 0; i < aListId.count(); i++ ) + { + aGeomObject = // received object need UnRegister()! + SMESHGUI::GetSMESHGen()->FindGeometryByMeshElement(myMesh.in(), aListId[i].toInt()); + + if (aGeomObject->_is_nil()) continue; + + int anId = aShapesOp->GetSubShapeIndex(aMeshShape, aGeomObject); + if (aShapesOp->IsDone() && !aGeomObjectsMap.count(anId) ) + { + aGeomObjectsMap[anId] = aGeomObject; + + TopAbs_ShapeEnum aSubShapeType = (TopAbs_ShapeEnum)aGeomObject->GetShapeType(); + if (i == 0) + aGroupType = aSubShapeType; + else if (aSubShapeType != aGroupType) + aGroupType = TopAbs_SHAPE; + } + } + + int aNumberOfGO = aGeomObjectsMap.size(); + if (aNumberOfGO == 1) + { + aGeomObject = (*aGeomObjectsMap.begin()).second; + } + else if (aNumberOfGO > 1) + { + GEOM::GEOM_IGroupOperations_wrap aGroupOp = + geomGen->GetIGroupOperations(aStudy->StudyId()); + if(aGroupOp->_is_nil()) + return; + + GEOM::ListOfGO_var aGeomObjects = new GEOM::ListOfGO(); + aGeomObjects->length( aNumberOfGO ); + + int i = 0; + std::map::iterator anIter; + for (anIter = aGeomObjectsMap.begin(); anIter!=aGeomObjectsMap.end(); anIter++) + aGeomObjects[i++] = GEOM::GEOM_Object::_duplicate( (*anIter).second.in() ); + + //create geometry group + aGeomObject = aGroupOp->CreateGroup(aMeshShape, aGroupType); + aGroupOp->UnionList(aGeomObject, aGeomObjects); + + if (!aGroupOp->IsDone()) + return; + } + + // publish the GEOM object in study + QString aNewGeomGroupName ( myDlg->myGeomName->text() ); + SALOMEDS::Study_var aStudyVar = _CAST(Study,aStudy)->GetStudy(); + SALOMEDS::SObject_wrap aNewGroupSO = + geomGen->AddInStudy( aStudyVar, aGeomObject, + aNewGeomGroupName.toLatin1().data(), aMeshShape); + + // get a GEOM_Object already published, which doesn't need UnRegister() + CORBA::Object_var obj = aNewGroupSO->GetObject(); + myGeomObj = GEOM::GEOM_Object::_narrow( obj ); + } } catch (const SALOME::SALOME_Exception& S_ex) { SalomeApp_Tools::QtCatchCorbaException(S_ex); } catch (...) { } - myViewWindow->SetSelectionMode( ActorSelection ); - disconnect(mySelectionMgr, 0, this, 0); - disconnect(mySMESHGUI, 0, this, 0); - mySMESHGUI->ResetState(); + } -//======================================================================= -// function : onClose() -// purpose : SLOT called when "Close" button pressed. Close dialog -//======================================================================= -void SMESHGUI_ShapeByMeshDlg::onClose() +bool SMESHGUI_ShapeByMeshOp::onApply() { - myViewWindow->SetSelectionMode( ActorSelection ); - disconnect(mySelectionMgr, 0, this, 0); - disconnect(mySMESHGUI, 0, this, 0); - mySMESHGUI->ResetState(); - reject(); - emit Close(); + return true; } //======================================================================= // function : onSelectionDone() -// purpose : SLOT called when selection changed +// purpose : SLOT called when selection changed. Enable/desable [ OK ] //======================================================================= -void SMESHGUI_ShapeByMeshDlg::onSelectionDone() +void SMESHGUI_ShapeByMeshOp::onSelectionDone() { - myOkBtn->setEnabled( false ); + myDlg->setButtonEnabled( false, QtxDialog::OK ); setElementID(""); try { SALOME_ListIO aList; - mySelectionMgr->selectedObjects(aList, SVTK_Viewer::Type()); - if (aList.Extent() != 1) + selectionMgr()->selectedObjects(aList); + if (!myIsMultipleAllowed && aList.Extent() != 1) return; SMESH::SMESH_Mesh_var aMesh = SMESH::GetMeshByIO(aList.First()); @@ -350,82 +429,44 @@ void SMESHGUI_ShapeByMeshDlg::onSelectionDone() return; QString aString; - int nbElems = SMESH::GetNameOfSelectedElements(myViewWindow->GetSelector(), + int nbElems = SMESH::GetNameOfSelectedElements(selector(),//myViewWindow->GetSelector(), aList.First(), aString); - if ( nbElems == 1 ) { + if (nbElems > 0) { + if (!myIsMultipleAllowed && nbElems != 1 ) + return; setElementID( aString ); - myOkBtn->setEnabled( true ); + myDlg->setButtonEnabled( true, QtxDialog::OK ); } } catch (...) { } } -//======================================================================= -// function : onDeactivate() -// purpose : SLOT called when dialog must be deativated -//======================================================================= -void SMESHGUI_ShapeByMeshDlg::onDeactivate() -{ - if ( isEnabled() ) { - //disconnect(mySelectionMgr, 0, this, 0); - myViewWindow->SetSelectionMode( ActorSelection ); - setEnabled(false); - } -} - -//======================================================================= -// function : enterEvent() -// purpose : Event filter -//======================================================================= -void SMESHGUI_ShapeByMeshDlg::enterEvent (QEvent*) -{ - // there is a stange problem that enterEvent() comes after onSave() - if ( isVisible () && !isEnabled() ) { - mySMESHGUI->EmitSignalDeactivateDialog(); - setEnabled(true); - activateSelection(); - //connect(mySelectionMgr, SIGNAL(currentSelectionChanged()), SLOT(onSelectionDone())); - } -} - -//================================================================================= -// function : closeEvent() -// purpose : Close dialog box -//================================================================================= -void SMESHGUI_ShapeByMeshDlg::closeEvent (QCloseEvent*) -{ - onClose(); -} - //======================================================================= // function : activateSelection() // purpose : Activate selection in accordance with current pattern type //======================================================================= -void SMESHGUI_ShapeByMeshDlg::activateSelection() +void SMESHGUI_ShapeByMeshOp::activateSelection() { - mySelectionMgr->clearFilters(); - SMESH::SetPointRepresentation(false); - - myGeomName->setText(""); - - if ( myViewWindow ) - { - QString geomName; - Selection_Mode mode = EdgeSelection; - switch ( myElemTypeGroup->id( myElemTypeGroup->selected() )) { - case EDGE : - mode = EdgeSelection; geomName = tr("GEOM_EDGE"); break; - case FACE : - mode = FaceSelection; geomName = tr("GEOM_FACE"); break; - case VOLUME: - mode = VolumeSelection; geomName = tr(myHasSolids ? "GEOM_SOLID" : "GEOM_SHELL"); break; - default: return; - } - if ( myViewWindow->SelectionMode() != mode ) - myViewWindow->SetSelectionMode( mode ); - - myGeomName->setText( GEOMBase::GetDefaultName( geomName )); + selectionMgr()->clearFilters(); + //SMESH::SetPointRepresentation(false); + + myDlg->myGeomName->setText(""); + + QString geomName; + Selection_Mode mode = EdgeSelection; + switch ( myDlg->myElemTypeGroup->checkedId() ) { + case EDGE : + mode = EdgeSelection; geomName = tr("GEOM_EDGE"); break; + case FACE : + mode = FaceSelection; geomName = tr("GEOM_FACE"); break; + case VOLUME: + mode = VolumeSelection; geomName = tr(myHasSolids ? "GEOM_SOLID" : "GEOM_SHELL"); break; + default: return; } + if ( selectionMode() != mode ) + setSelectionMode( mode ); + + myDlg->myGeomName->setText( GEOMBase::GetDefaultName( geomName )); } //======================================================================= @@ -433,7 +474,7 @@ void SMESHGUI_ShapeByMeshDlg::activateSelection() //purpose : SLOT. Called when element type changed. //======================================================================= -void SMESHGUI_ShapeByMeshDlg::onTypeChanged (int theType) +void SMESHGUI_ShapeByMeshOp::onTypeChanged (int theType) { setElementID(""); activateSelection(); @@ -445,36 +486,44 @@ void SMESHGUI_ShapeByMeshDlg::onTypeChanged (int theType) // Highlight the element whose Ids the user entered manually //======================================================================= -void SMESHGUI_ShapeByMeshDlg::onElemIdChanged(const QString& theNewText) +void SMESHGUI_ShapeByMeshOp::onElemIdChanged(const QString& theNewText) { - myOkBtn->setEnabled( false ); + myDlg->setButtonEnabled( false, QtxDialog::OK ); - if ( myIsManualIdEnter && !myMesh->_is_nil() && myViewWindow ) + if ( myIsManualIdEnter && !myMesh->_is_nil() ) + { if ( SMESH_Actor* actor = SMESH::FindActorByObject(myMesh) ) + { if ( SMDS_Mesh* aMesh = actor->GetObject()->GetMesh() ) { SMDSAbs_ElementType type = SMDSAbs_Edge; - switch ( myElemTypeGroup->id( myElemTypeGroup->selected() )) { + switch ( myDlg->myElemTypeGroup->checkedId() ) { case EDGE : type = SMDSAbs_Edge; break; case FACE : type = SMDSAbs_Face; break; case VOLUME: type = SMDSAbs_Volume; break; default: return; } TColStd_MapOfInteger newIndices; - QStringList aListId = QStringList::split( " ", theNewText, false); + QStringList aListId = theNewText.split( " ", QString::SkipEmptyParts); for ( int i = 0; i < aListId.count(); i++ ) { if ( const SMDS_MeshElement * e = aMesh->FindElement( aListId[ i ].toInt() )) if ( e->GetType() == type ) newIndices.Add( e->GetID() ); } - - if ( !newIndices.IsEmpty() && newIndices.Extent() == 1 ) - if ( SVTK_Selector* s = myViewWindow->GetSelector() ) { + + if ( !newIndices.IsEmpty() ) + { + if (!myIsMultipleAllowed && newIndices.Extent() != 1) + return; + if ( SVTK_Selector* s = selector() ) { s->AddOrRemoveIndex( actor->getIO(), newIndices, false ); - myViewWindow->highlight( actor->getIO(), true, true ); - myOkBtn->setEnabled( true ); + viewWindow()->highlight( actor->getIO(), true, true ); + myDlg->setButtonEnabled( true, QtxDialog::OK ); } + } } + } + } } //======================================================================= @@ -482,9 +531,9 @@ void SMESHGUI_ShapeByMeshDlg::onElemIdChanged(const QString& theNewText) //purpose : programmatically set element id //======================================================================= -void SMESHGUI_ShapeByMeshDlg::setElementID(const QString& theText) +void SMESHGUI_ShapeByMeshOp::setElementID(const QString& theText) { myIsManualIdEnter = false; - myElementId->setText(theText); + myDlg->myElementId->setText(theText); myIsManualIdEnter = true; }