X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESHGUI%2FSMESHGUI_SingleEditDlg.cxx;h=404d6a6d82a5e286bf4709e52ee0204b1e99e18e;hp=b25953d4cd3e6ff3326c9cea17b7b855c5cda2d0;hb=0e020f2e93a8acfb51faccf221116530c23871ad;hpb=e4737e85f0da6d3f90fd08f6be1c2825195fe16f diff --git a/src/SMESHGUI/SMESHGUI_SingleEditDlg.cxx b/src/SMESHGUI/SMESHGUI_SingleEditDlg.cxx index b25953d4c..404d6a6d8 100755 --- a/src/SMESHGUI/SMESHGUI_SingleEditDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_SingleEditDlg.cxx @@ -1,23 +1,23 @@ // 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 +// 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 // // // @@ -27,20 +27,31 @@ #include "SMESHGUI_SingleEditDlg.h" -#include "QAD_Desktop.h" - #include "SMESHGUI.h" #include "SMESHGUI_Utils.h" #include "SMESHGUI_VTKUtils.h" #include "SMESHGUI_MeshUtils.h" - #include "SMESHGUI_SpinBox.h" -#include "utilities.h" -#include "SALOME_Selection.h" #include "SMESH_Actor.h" #include "SMDS_Mesh.hxx" +#include "SalomeApp_SelectionMgr.h" +#include "SUIT_ResourceMgr.h" +#include "SUIT_MessageBox.h" +#include "SUIT_Desktop.h" + +#include "SVTK_Selector.h" +#include "SVTK_ViewWindow.h" +#include "SALOME_ListIO.hxx" + +#include "utilities.h" + +// OCCT Includes +#include +#include + +// QT Includes #include #include #include @@ -55,139 +66,143 @@ #define MARGIN 10 -/* - Class : SMESHGUI_DiagValidator - Description : validate munual input of edge like "id1-id2" -*/ +/*! + * Class : SMESHGUI_DiagValidator + * Description : validate munual input of edge like "id1-id2" + */ class SMESHGUI_DiagValidator: public QValidator { public: - - SMESHGUI_DiagValidator(QWidget * parent, const char * name = 0): + SMESHGUI_DiagValidator (QWidget * parent, const char * name = 0): QValidator(parent,name) {} - State validate ( QString & text, int & pos) const + State validate (QString & text, int & pos) const { text.stripWhiteSpace(); - text.replace( QRegExp("[^0-9]+"), "-" ); - if ( text == "-" ) + text.replace(QRegExp("[^0-9]+"), "-"); + if (text == "-") text = ""; - int ind = text.find( QRegExp("-[0-9]+-")); - if ( ind > 0 ) { // leave only two ids - ind = text.find( '-', ind + 1 ); - if ( ind > 0 ) - text.truncate( ind ); + int ind = text.find(QRegExp("-[0-9]+-")); + if (ind > 0) { // leave only two ids + ind = text.find('-', ind + 1); + if (ind > 0) + text.truncate(ind); } - if ( pos > text.length() ) + if (pos > text.length()) pos = text.length(); return Acceptable; } }; -/* - Class : SMESHGUI_SingleEditDlg - Description : Inversion of the diagonal of a pseudo-quadrangle formed by - 2 neighboring triangles with 1 common edge -*/ +/*! + * Class : SMESHGUI_SingleEditDlg + * Description : Inversion of the diagonal of a pseudo-quadrangle formed by + * 2 neighboring triangles with 1 common edge + */ //======================================================================= -// name : SMESHGUI_SingleEditDlg::SMESHGUI_SingleEditDlg +// name : SMESHGUI_SingleEditDlg() // Purpose : Constructor //======================================================================= -SMESHGUI_SingleEditDlg::SMESHGUI_SingleEditDlg( QWidget* theParent, - SALOME_Selection* theSelection, - const char* theName ) -: QDialog( theParent, theName, false, - WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu ) +SMESHGUI_SingleEditDlg +::SMESHGUI_SingleEditDlg(SMESHGUI* theModule, + const char* theName): + QDialog(SMESH::GetDesktop(theModule), + theName, + false, + WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu), + mySelector(SMESH::GetViewWindow(theModule)->GetSelector()), + mySelectionMgr(SMESH::GetSelectionMgr(theModule)), + myViewWindow(SMESH::GetViewWindow(theModule)), + mySMESHGUI(theModule) { - //setCaption( tr( "CAPTION" ) ); - - QVBoxLayout* aDlgLay = new QVBoxLayout( this, MARGIN, SPACING ); + QVBoxLayout* aDlgLay = new QVBoxLayout(this, MARGIN, SPACING); - QFrame* aMainFrame = createMainFrame ( this ); - QFrame* aBtnFrame = createButtonFrame( this ); + QFrame* aMainFrame = createMainFrame (this); + QFrame* aBtnFrame = createButtonFrame(this); - aDlgLay->addWidget( aMainFrame ); - aDlgLay->addWidget( aBtnFrame ); + aDlgLay->addWidget(aMainFrame); + aDlgLay->addWidget(aBtnFrame); - aDlgLay->setStretchFactor( aMainFrame, 1 ); + aDlgLay->setStretchFactor(aMainFrame, 1); - Init( theSelection ) ; + Init(); } //======================================================================= -// name : SMESHGUI_SingleEditDlg::createMainFrame +// name : createMainFrame() // Purpose : Create frame containing dialog's input fields //======================================================================= -QFrame* SMESHGUI_SingleEditDlg::createMainFrame( QWidget* theParent ) +QFrame* SMESHGUI_SingleEditDlg::createMainFrame (QWidget* theParent) { - QGroupBox* aMainGrp = new QGroupBox( 1, Qt::Vertical, tr( "EDGE_BETWEEN" ), theParent ); + QGroupBox* aMainGrp = new QGroupBox(1, Qt::Vertical, tr("EDGE_BETWEEN"), theParent); - QPixmap aPix( QAD_Desktop::getResourceManager()->loadPixmap( "SMESH",tr( "ICON_SELECT" ) ) ); - - new QLabel( tr( "SMESH_EDGE" ), aMainGrp ); - ( new QPushButton( aMainGrp ) )->setPixmap( aPix ); - myEdge = new QLineEdit( aMainGrp ); - myEdge->setValidator( new SMESHGUI_DiagValidator( this, "validator" )); + QPixmap aPix (SMESH::GetResourceMgr( mySMESHGUI )->loadPixmap("SMESH", tr("ICON_SELECT"))); + + new QLabel(tr("SMESH_EDGE"), aMainGrp); + (new QPushButton(aMainGrp))->setPixmap(aPix); + myEdge = new QLineEdit(aMainGrp); + myEdge->setValidator(new SMESHGUI_DiagValidator(this, "validator")); return aMainGrp; } //======================================================================= -// name : SMESHGUI_SingleEditDlg::createButtonFrame +// name : createButtonFrame() // Purpose : Create frame containing buttons //======================================================================= -QFrame* SMESHGUI_SingleEditDlg::createButtonFrame( QWidget* theParent ) +QFrame* SMESHGUI_SingleEditDlg::createButtonFrame (QWidget* theParent) { - QFrame* aFrame = new QFrame( theParent ); - aFrame->setFrameStyle( QFrame::Box | QFrame::Sunken ); + QFrame* aFrame = new QFrame(theParent); + aFrame->setFrameStyle(QFrame::Box | QFrame::Sunken); - myOkBtn = new QPushButton( tr( "SMESH_BUT_OK" ), aFrame ); - myApplyBtn = new QPushButton( tr( "SMESH_BUT_APPLY" ), aFrame ); - myCloseBtn = new QPushButton( tr( "SMESH_BUT_CLOSE" ), aFrame ); + myOkBtn = new QPushButton(tr("SMESH_BUT_OK" ), aFrame); + myApplyBtn = new QPushButton(tr("SMESH_BUT_APPLY"), aFrame); + myCloseBtn = new QPushButton(tr("SMESH_BUT_CLOSE"), aFrame); - QSpacerItem* aSpacer = new QSpacerItem( 0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum ); + QSpacerItem* aSpacer = new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum); - QHBoxLayout* aLay = new QHBoxLayout( aFrame, MARGIN, SPACING ); + QHBoxLayout* aLay = new QHBoxLayout(aFrame, MARGIN, SPACING); - aLay->addWidget( myOkBtn ); - aLay->addWidget( myApplyBtn ); - aLay->addItem( aSpacer); - aLay->addWidget( myCloseBtn ); + aLay->addWidget(myOkBtn); + aLay->addWidget(myApplyBtn); + aLay->addItem(aSpacer); + aLay->addWidget(myCloseBtn); return aFrame; } //======================================================================= -// name : SMESHGUI_SingleEditDlg::isValid +// name : isValid() // Purpose : Verify validity of input data //======================================================================= -bool SMESHGUI_SingleEditDlg::isValid( const bool theMess ) const +bool SMESHGUI_SingleEditDlg::isValid (const bool theMess) const { int id1, id2; - return getNodeIds( myEdge->text(), id1, id2 ); + return getNodeIds(myEdge->text(), id1, id2); } //======================================================================= -// name : SMESHGUI_SingleEditDlg::getNodeIds +// name : getNodeIds() // Purpose : Retrieve node ids from string //======================================================================= -bool SMESHGUI_SingleEditDlg::getNodeIds( const QString& theStr, int& theId1, int& theId2 ) const +bool SMESHGUI_SingleEditDlg::getNodeIds (const QString& theStr, + int& theId1, int& theId2) const { - if ( !theStr.contains( '-' ) ) + if (!theStr.contains('-')) return false; bool ok1, ok2; - QString str1 = theStr.section( '-', 0, 0, QString::SectionSkipEmpty ); - QString str2 = theStr.section( '-', 1, 1, QString::SectionSkipEmpty ); - theId1 = str1.toInt( &ok1 ); - theId2 = str2.toInt( &ok2 ); - + QString str1 = theStr.section('-', 0, 0, QString::SectionSkipEmpty); + QString str2 = theStr.section('-', 1, 1, QString::SectionSkipEmpty); + theId1 = str1.toInt(&ok1); + theId2 = str2.toInt(&ok2); + return ok1 & ok2; } //======================================================================= -// name : SMESHGUI_SingleEditDlg::~SMESHGUI_SingleEditDlg +// name : ~SMESHGUI_SingleEditDlg() // Purpose : Destructor //======================================================================= SMESHGUI_SingleEditDlg::~SMESHGUI_SingleEditDlg() @@ -195,83 +210,78 @@ SMESHGUI_SingleEditDlg::~SMESHGUI_SingleEditDlg() } //======================================================================= -// name : SMESHGUI_SingleEditDlg::Init +// name : Init() // Purpose : Init dialog fields, connect signals and slots, show dialog //======================================================================= -void SMESHGUI_SingleEditDlg::Init( SALOME_Selection* theSelection ) +void SMESHGUI_SingleEditDlg::Init() { - mySelection = theSelection; - SMESHGUI* aSMESHGUI = SMESHGUI::GetSMESHGUI(); - aSMESHGUI->SetActiveDialogBox( ( QDialog* )this ) ; + mySMESHGUI->SetActiveDialogBox((QDialog*)this); myBusy = false; myActor = 0; - + // main buttons - connect( myOkBtn, SIGNAL( clicked() ), SLOT( onOk() ) ); - connect( myCloseBtn, SIGNAL( clicked() ), SLOT( onClose() ) ) ; - connect( myApplyBtn, SIGNAL( clicked() ), SLOT( onApply() ) ); + connect(myOkBtn, SIGNAL(clicked()), SLOT(onOk())); + connect(myCloseBtn, SIGNAL(clicked()), SLOT(onClose())); + connect(myApplyBtn, SIGNAL(clicked()), SLOT(onApply())); // selection and SMESHGUI - connect( mySelection, SIGNAL( currentSelectionChanged() ), SLOT( onSelectionDone() ) ); - connect( aSMESHGUI, SIGNAL( SignalDeactivateActiveDialog() ), SLOT( onDeactivate() ) ); - connect( aSMESHGUI, SIGNAL( SignalCloseAllDialogs() ), SLOT( onClose() ) ); - connect( myEdge, SIGNAL( textChanged(const QString&)), SLOT( onTextChange(const QString&))); + connect(mySelectionMgr, SIGNAL(currentSelectionChanged()), SLOT(onSelectionDone())); + connect(mySMESHGUI, SIGNAL(SignalDeactivateActiveDialog()), SLOT(onDeactivate())); + connect(mySMESHGUI, SIGNAL(SignalCloseAllDialogs()), SLOT(onClose())); + connect(myEdge, SIGNAL(textChanged(const QString&)), SLOT(onTextChange(const QString&))); - myOkBtn->setEnabled( false ); - myApplyBtn->setEnabled( false ); - setEnabled( true ); + myOkBtn->setEnabled(false); + myApplyBtn->setEnabled(false); + setEnabled(true); - int x, y ; - aSMESHGUI->DefineDlgPosition( this, x, y ); - this->move( x, y ); - this->show(); + int x, y; + mySMESHGUI->DefineDlgPosition(this, x, y); + this->move(x, y); + this->show(); // set selection mode - QAD_Application::getDesktop()->SetSelectionMode( EdgeOfCellSelection, true ); + myViewWindow->SetSelectionMode(EdgeOfCellSelection); onSelectionDone(); - - return; } //======================================================================= -// name : SMESHGUI_SingleEditDlg::onOk -// Purpose : SLOT called when "Ok" button pressed. +// name : onOk() +// Purpose : SLOT called when "Ok" button pressed. // Assign filters VTK viewer and close dialog //======================================================================= void SMESHGUI_SingleEditDlg::onOk() { - if ( onApply() ) + if (onApply()) onClose(); } //======================================================================= -// name : SMESHGUI_SingleEditDlg::onClose +// name : onClose() // Purpose : SLOT called when "Close" button pressed. Close dialog //======================================================================= void SMESHGUI_SingleEditDlg::onClose() { - QAD_Application::getDesktop()->SetSelectionMode( ActorSelection ); - mySelection->ClearIObjects(); - disconnect( mySelection, 0, this, 0 ); - disconnect( SMESHGUI::GetSMESHGUI(), 0, this, 0 ); - SMESHGUI::GetSMESHGUI()->ResetState() ; + myViewWindow->SetSelectionMode(ActorSelection); + mySelectionMgr->clearSelected(); + disconnect(mySelectionMgr, 0, this, 0); + disconnect(mySMESHGUI, 0, this, 0); + mySMESHGUI->ResetState(); reject(); } //======================================================================= -//function : findTriangles +//function : findTriangles() //purpose : find triangles sharing theNode1-theNode2 link -// THIS IS A PIECE OF SMESH_MeshEditor.cxx -// TO DO: make it available in SMDS for ex. +// THIS IS A PIECE OF SMESH_MeshEditor.cxx +// TO DO: make it available in SMDS for ex. //======================================================================= - -static bool findTriangles(const SMDS_MeshNode * theNode1, - const SMDS_MeshNode * theNode2, - const SMDS_MeshElement*& theTria1, - const SMDS_MeshElement*& theTria2) +static bool findTriangles (const SMDS_MeshNode * theNode1, + const SMDS_MeshNode * theNode2, + const SMDS_MeshElement*& theTria1, + const SMDS_MeshElement*& theTria2) { - if ( !theNode1 || !theNode2 ) return false; + if (!theNode1 || !theNode2) return false; theTria1 = theTria2 = 0; @@ -279,266 +289,270 @@ static bool findTriangles(const SMDS_MeshNode * theNode1, SMDS_ElemIteratorPtr it = theNode1->GetInverseElementIterator(); while (it->more()) { const SMDS_MeshElement* elem = it->next(); - if ( elem->GetType() == SMDSAbs_Face && elem->NbNodes() == 3 ) - emap.insert( elem ); + if (elem->GetType() == SMDSAbs_Face && elem->NbNodes() == 3) + emap.insert(elem); } it = theNode2->GetInverseElementIterator(); while (it->more()) { const SMDS_MeshElement* elem = it->next(); - if ( elem->GetType() == SMDSAbs_Face && - emap.find( elem ) != emap.end() ) - if ( theTria1 ) { + if (elem->GetType() == SMDSAbs_Face && + emap.find(elem) != emap.end()) + if (theTria1) { theTria2 = elem; break; } else { theTria1 = elem; } } - return ( theTria1 && theTria2 ); + return (theTria1 && theTria2); } //======================================================================= -//function : onTextChange -//purpose : +//function : onTextChange() +//purpose : //======================================================================= - -void SMESHGUI_SingleEditDlg::onTextChange( const QString& theNewText ) +void SMESHGUI_SingleEditDlg::onTextChange (const QString& theNewText) { - if ( myBusy ) return; + if (myBusy) return; - myOkBtn->setEnabled( false ); - myApplyBtn->setEnabled( false ); + myOkBtn->setEnabled(false); + myApplyBtn->setEnabled(false); // hilight entered edge - SMDS_Mesh* aMesh = 0; - if ( myActor ) - aMesh = myActor->GetObject()->GetMesh(); - if ( aMesh ) { - - myBusy = true; // block onSelectionDone() - mySelection->ClearIObjects(); - mySelection->AddIObject( myActor->getIO() ); - myBusy = false; - - QStringList aListId = QStringList::split( "-", theNewText, false); - if ( aListId.count() != 2 ) - return; - const SMDS_MeshNode* a2Nodes[2]; - bool allOk = true; - int i; - for ( i = 0; i < aListId.count(); i++ ) { - const SMDS_MeshNode * n = aMesh->FindNode( aListId[ i ].toInt() ); - if ( n ) - a2Nodes[ i ] = n; - else - allOk = false; - } - - // find a triangle and an edge nb - const SMDS_MeshElement* tria[2]; - if (allOk && - a2Nodes[0] != a2Nodes[1] && - findTriangles( a2Nodes[0], - a2Nodes[1], - tria[0], - tria[1])) { + if(myActor){ + if(SMDS_Mesh* aMesh = myActor->GetObject()->GetMesh()){ myBusy = true; // block onSelectionDone() - mySelection->AddOrRemoveIndex (myActor->getIO(), tria[0]->GetID(), true, false); - - const SMDS_MeshNode* a3Nodes [3]; - SMDS_ElemIteratorPtr it; - int edgeInd = 2; - for (i = 0, it = tria[0]->nodesIterator(); it->more(); i++ ) { - a3Nodes[ i ] = static_cast( it->next() ); - if ( i > 0 ) - if (( a3Nodes[ i ] == a2Nodes[ 0 ] && a3Nodes[ i - 1] == a2Nodes[ 1 ] ) || - ( a3Nodes[ i ] == a2Nodes[ 1 ] && a3Nodes[ i - 1] == a2Nodes[ 0 ] ) ) { - edgeInd = i - 1; - break; - } - } - - mySelection->AddOrRemoveIndex( myActor->getIO(), -edgeInd-1, true, true ); + Handle(SALOME_InteractiveObject) anIO = myActor->getIO(); + SALOME_ListIO aList; + aList.Append(anIO); + mySelectionMgr->setSelectedObjects(aList,false); + + TColStd_IndexedMapOfInteger selectedIndices; + TColStd_MapOfInteger newIndices; + mySelector->GetIndex(anIO,selectedIndices); myBusy = false; - myOkBtn->setEnabled( true ); - myApplyBtn->setEnabled( true ); + QStringList aListId = QStringList::split("-", theNewText, false); + if (aListId.count() != 2) + return; + + int i; + bool allOk = true; + const SMDS_MeshNode* a2Nodes[2]; + for (i = 0; i < aListId.count(); i++) { + if(const SMDS_MeshNode *aNode = aMesh->FindNode(aListId[ i ].toInt())) + a2Nodes[ i ] = aNode; + else + allOk = false; + } + + // find a triangle and an edge nb + const SMDS_MeshElement* tria[2]; + allOk &= a2Nodes[0] != a2Nodes[1] && findTriangles(a2Nodes[0],a2Nodes[1],tria[0],tria[1]); + if(allOk){ + myBusy = true; // block onSelectionDone() + newIndices.Add(tria[0]->GetID()); + mySelector->AddOrRemoveIndex(anIO,newIndices, true); + + const SMDS_MeshNode* a3Nodes [3]; + SMDS_ElemIteratorPtr it; + int edgeInd = 2; + for (i = 0, it = tria[0]->nodesIterator(); it->more(); i++) { + a3Nodes[ i ] = static_cast(it->next()); + if (i > 0) { + allOk = (a3Nodes[ i ] == a2Nodes[ 0 ] && a3Nodes[ i - 1] == a2Nodes[ 1 ]) || + (a3Nodes[ i ] == a2Nodes[ 1 ] && a3Nodes[ i - 1] == a2Nodes[ 0 ]); + if (allOk) { + edgeInd = i - 1; + break; + } + } + } + + newIndices.Clear(); + newIndices.Add(-edgeInd-1); + mySelector->AddOrRemoveIndex(anIO,newIndices,true); + myBusy = false; + + myOkBtn->setEnabled(true); + myApplyBtn->setEnabled(true); + } } } } + //======================================================================= -// name : SMESHGUI_SingleEditDlg::onSelectionDone +// name : onSelectionDone() // Purpose : SLOT called when selection changed //======================================================================= void SMESHGUI_SingleEditDlg::onSelectionDone() { - if ( myBusy ) return; + if (myBusy) return; int anId1 = 0, anId2 = 0; - myOkBtn->setEnabled( false ); - myApplyBtn->setEnabled( false ); + myOkBtn->setEnabled(false); + myApplyBtn->setEnabled(false); - if ( mySelection->IObjectCount() != 1 ) - { + SALOME_ListIO aList; + mySelectionMgr->selectedObjects(aList); + + if (aList.Extent() != 1) { myEdge->clear(); return; } - myActor = SMESH::FindActorByEntry( mySelection->firstIObject()->getEntry() ); - SMDS_Mesh* aMesh = 0; - if ( myActor ) - aMesh = myActor->GetObject()->GetMesh(); - if ( !aMesh ) - return; - - if (SMESH::GetEdgeNodes( mySelection, anId1, anId2 ) >= 1 ) { - QString aText = QString( "%1-%2" ).arg( anId1 ).arg( anId2 ); - myBusy = true; - myEdge->setText( aText ); - myBusy = false; - - const SMDS_MeshElement* tria[2]; - if ( findTriangles( aMesh->FindNode( anId1 ), aMesh->FindNode( anId2 ), tria[0],tria[1])) - { - myOkBtn->setEnabled( true ); - myApplyBtn->setEnabled( true ); + Handle(SALOME_InteractiveObject) anIO = aList.First(); + myActor = SMESH::FindActorByEntry(anIO->getEntry()); + if(myActor){ + TVisualObjPtr aVisualObj = myActor->GetObject(); + if(SMDS_Mesh* aMesh = aVisualObj->GetMesh()){ + if(SMESH::GetEdgeNodes(mySelector, aVisualObj, anId1, anId2) >= 1){ + QString aText = QString("%1-%2").arg(anId1).arg(anId2); + myBusy = true; + myEdge->setText(aText); + myBusy = false; + + const SMDS_MeshElement* tria[2]; + if (findTriangles(aMesh->FindNode(anId1), aMesh->FindNode(anId2), tria[0],tria[1])) { + myOkBtn->setEnabled(true); + myApplyBtn->setEnabled(true); + } + } else { + myEdge->clear(); + } } } - else - myEdge->clear(); } //======================================================================= -// name : SMESHGUI_SingleEditDlg::onDeactivate +// name : onDeactivate() // Purpose : SLOT called when dialog must be deativated //======================================================================= void SMESHGUI_SingleEditDlg::onDeactivate() { - setEnabled( false ); + setEnabled(false); } //======================================================================= -// name : SMESHGUI_SingleEditDlg::enterEvent +// name : enterEvent() // Purpose : Event filter //======================================================================= -void SMESHGUI_SingleEditDlg::enterEvent( QEvent* ) +void SMESHGUI_SingleEditDlg::enterEvent (QEvent*) { - if ( !isEnabled() ) { - SMESHGUI::GetSMESHGUI()->EmitSignalDeactivateDialog(); - // set selection mode - QAD_Application::getDesktop()->SetSelectionMode( EdgeOfCellSelection, true ); - setEnabled( true ); + if (!isEnabled()) { + mySMESHGUI->EmitSignalDeactivateDialog(); + myViewWindow->SetSelectionMode(EdgeOfCellSelection); + setEnabled(true); } } - //================================================================================= // function : closeEvent() // purpose : //================================================================================= -void SMESHGUI_SingleEditDlg::closeEvent( QCloseEvent* e ) +void SMESHGUI_SingleEditDlg::closeEvent (QCloseEvent*) { - onClose() ; + onClose(); } + //======================================================================= -//function : hideEvent +//function : hideEvent() //purpose : caused by ESC key //======================================================================= - -void SMESHGUI_SingleEditDlg::hideEvent ( QHideEvent * e ) +void SMESHGUI_SingleEditDlg::hideEvent (QHideEvent*) { - if ( !isMinimized() ) + if (!isMinimized()) onClose(); } //================================================================================= -// function : onApply +// function : onApply() // purpose : SLOT. Called when apply button is pressed //================================================================================= bool SMESHGUI_SingleEditDlg::onApply() { - if (SMESHGUI::GetSMESHGUI()->ActiveStudyLocked()) + if (mySMESHGUI->isActiveStudyLocked()) return false; // verify validity of input data - if ( !isValid( true ) ) + if (!isValid(true)) return false; - // get mesh, actor and nodes - SMESH::SMESH_Mesh_var aMesh = SMESH::GetMeshByIO( mySelection->firstIObject() ); + // get mesh, actor and nodes + SALOME_ListIO aList; + mySelectionMgr->selectedObjects(aList); - if ( aMesh->_is_nil() ) - { - QMessageBox::information( SMESHGUI::GetSMESHGUI()->GetDesktop(), - tr( "SMESH_ERROR" ), tr( "SMESHG_NO_MESH" ), QMessageBox::Ok ); + SMESH::SMESH_Mesh_var aMesh = SMESH::GetMeshByIO(aList.First()); + + if (aMesh->_is_nil()) { + SUIT_MessageBox::info1(SMESH::GetDesktop(mySMESHGUI), + tr("SMESH_ERROR"), + tr("SMESHG_NO_MESH"), + tr("SMESH_BUT_OK")); return false; } SMESH::SMESH_MeshEditor_var aMeshEditor = aMesh->GetMeshEditor(); int anId1= 0, anId2 = 0; - if ( aMeshEditor->_is_nil() || !getNodeIds( myEdge->text(), anId1, anId2 ) ) + if (aMeshEditor->_is_nil() || !getNodeIds(myEdge->text(), anId1, anId2)) return false; // perform operation - bool aResult = process( aMeshEditor.in(), anId1, anId2 ); + bool aResult = process(aMeshEditor.in(), anId1, anId2); // update actor - if ( aResult ) - { - Handle(SALOME_InteractiveObject) anIO = mySelection->firstIObject(); - mySelection->ClearIObjects(); + if (aResult) { + mySelectionMgr->setSelectedObjects(aList, false); SMESH::UpdateView(); - mySelection->AddIObject( anIO, false ); } return aResult; } -/* - Class : SMESHGUI_TrianglesInversionDlg - Description : Inversion of the diagonal of a pseudo-quadrangle formed by - 2 neighboring triangles with 1 common edge -*/ +/*! + * Class : SMESHGUI_TrianglesInversionDlg + * Description : Inversion of the diagonal of a pseudo-quadrangle formed by + * 2 neighboring triangles with 1 common edge + */ -SMESHGUI_TrianglesInversionDlg::SMESHGUI_TrianglesInversionDlg( QWidget* theParent, - SALOME_Selection* theSelection, - const char* theName ) -: SMESHGUI_SingleEditDlg( theParent, theSelection, theName ) +SMESHGUI_TrianglesInversionDlg +::SMESHGUI_TrianglesInversionDlg(SMESHGUI* theModule, + const char* theName) +: SMESHGUI_SingleEditDlg(theModule,theName) { - setCaption( tr( "CAPTION" ) ); + setCaption(tr("CAPTION")); } SMESHGUI_TrianglesInversionDlg::~SMESHGUI_TrianglesInversionDlg() { } -bool SMESHGUI_TrianglesInversionDlg::process( - SMESH::SMESH_MeshEditor_ptr theMeshEditor, const int theId1, const int theId2 ) +bool SMESHGUI_TrianglesInversionDlg::process (SMESH::SMESH_MeshEditor_ptr theMeshEditor, + const int theId1, const int theId2) { - return theMeshEditor->InverseDiag( theId1, theId2 ); + return theMeshEditor->InverseDiag(theId1, theId2); } -/* - Class : SMESHGUI_UnionOfTwoTrianglesDlg - Description : Construction of a quadrangle by deletion of the - common border of 2 neighboring triangles -*/ +/*! + * Class : SMESHGUI_UnionOfTwoTrianglesDlg + * Description : Construction of a quadrangle by deletion of the + * common border of 2 neighboring triangles + */ -SMESHGUI_UnionOfTwoTrianglesDlg::SMESHGUI_UnionOfTwoTrianglesDlg( QWidget* theParent, - SALOME_Selection* theSelection, - const char* theName ) -: SMESHGUI_SingleEditDlg( theParent, theSelection, theName ) +SMESHGUI_UnionOfTwoTrianglesDlg +::SMESHGUI_UnionOfTwoTrianglesDlg(SMESHGUI* theModule, + const char* theName) +: SMESHGUI_SingleEditDlg(theModule,theName) { - setCaption( tr( "CAPTION" ) ); + setCaption(tr("CAPTION")); } SMESHGUI_UnionOfTwoTrianglesDlg::~SMESHGUI_UnionOfTwoTrianglesDlg() { } -bool SMESHGUI_UnionOfTwoTrianglesDlg::process( - SMESH::SMESH_MeshEditor_ptr theMeshEditor, const int theId1, const int theId2 ) +bool SMESHGUI_UnionOfTwoTrianglesDlg::process (SMESH::SMESH_MeshEditor_ptr theMeshEditor, + const int theId1, const int theId2) { - return theMeshEditor->DeleteDiag( theId1, theId2 ); + return theMeshEditor->DeleteDiag(theId1, theId2); } -