// 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.salome-platform.org 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.salome-platform.org or email : webmaster.salome@opencascade.org
//
//
//
#include "SMESHGUI_GroupDlg.h"
#include "SMESHGUI_FilterDlg.h"
-#include "SMESHGUI_Filter.h"
#include "SMESHGUI.h"
#include "SMESHGUI_Utils.h"
#include "SMESHGUI_FilterUtils.h"
#include "SMESHGUI_GEOMGenUtils.h"
-#include "SALOMEGUI_QtCatchCorbaException.hxx"
+#include "SMESH_TypeFilter.hxx"
+#include "SMESH_Actor.h"
+#include "GEOMBase.h"
+
+#include "SUIT_Desktop.h"
+#include "SUIT_ResourceMgr.h"
+
+#include "SalomeApp_Tools.h"
+#include "SALOMEDSClient_Study.hxx"
+#include "SALOME_ListIO.hxx"
#include "SALOME_ListIteratorOfListIO.hxx"
-#include "VTKViewer_ViewFrame.h"
-#include "QAD_Application.h"
-#include "QAD_Desktop.h"
-#include "QAD_MessageBox.h"
-#include "QAD_RightFrame.h"
-#include "utilities.h"
-#include "SMESH_Actor.h"
+#include "SVTK_ViewWindow.h"
+#include "SVTK_Selector.h"
-#include "GEOMBase.h"
+#include "utilities.h"
+
+// OCCT Includes
+#include <TColStd_MapOfInteger.hxx>
// QT Includes
#include <qbuttongroup.h>
using namespace std;
//=================================================================================
-// class : SMESHGUI_GroupDlg()
-// purpose :
+// function : SMESHGUI_GroupDlg()
+// purpose :
//=================================================================================
-SMESHGUI_GroupDlg::SMESHGUI_GroupDlg( QWidget* parent, const char* name, SALOME_Selection* theSel,
- SMESH::SMESH_Mesh_ptr theMesh, bool modal, WFlags fl )
- : QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu | WDestructiveClose )
+SMESHGUI_GroupDlg::SMESHGUI_GroupDlg( SMESHGUI* theModule, const char* name,
+ SMESH::SMESH_Mesh_ptr theMesh, 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 ) ),
+ myViewWindow( SMESH::GetViewWindow( theModule ) ),
+ mySelector( myViewWindow->GetSelector() ),
+ myIsBusy( false )
{
- if ( !name ) setName( "SMESHGUI_GroupDlg" );
- initDialog(theSel, true);
+ if (!name) setName("SMESHGUI_GroupDlg");
+ initDialog(true);
if (!theMesh->_is_nil())
init(theMesh);
else {
myGeomGroupBtn->setEnabled(false);
myGeomGroupLine->setEnabled(false);
}
-
+
/* Move widget on the botton right corner of main widget */
int x, y ;
mySMESHGUI->DefineDlgPosition(this, x, y);
this->move(x, y);
}
-SMESHGUI_GroupDlg::SMESHGUI_GroupDlg( QWidget* parent, const char* name, SALOME_Selection* theSel,
- SMESH::SMESH_Group_ptr theGroup, bool modal, WFlags fl )
- : QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu | WDestructiveClose )
+//=================================================================================
+// function : SMESHGUI_GroupDlg()
+// purpose :
+//=================================================================================
+SMESHGUI_GroupDlg::SMESHGUI_GroupDlg( SMESHGUI* theModule, const char* name,
+ SMESH::SMESH_Group_ptr theGroup, 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 ) ),
+ myViewWindow( SMESH::GetViewWindow( theModule ) ),
+ mySelector( myViewWindow->GetSelector() ),
+ myIsBusy( false )
{
- if ( !name ) setName( "SMESHGUI_GroupDlg" );
- initDialog(theSel, false);
+ if (!name) setName("SMESHGUI_GroupDlg");
+ initDialog(false);
if (!theGroup->_is_nil())
init(theGroup);
else {
mySelectSubMesh->setEnabled(false);
mySelectGroup->setEnabled(false);
}
-
+
/* Move widget on the botton right corner of main widget */
int x, y ;
mySMESHGUI->DefineDlgPosition(this, x, y);
this->move(x, y);
}
-void SMESHGUI_GroupDlg::initDialog(SALOME_Selection* theSel, bool create)
+//=================================================================================
+// function : SMESHGUI_GroupDlg()
+// purpose :
+//=================================================================================
+void SMESHGUI_GroupDlg::initDialog(bool create)
{
myFilterDlg = 0;
myCreate = create;
myCurrentLineEdit = 0;
-
- QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "SMESH",tr("ICON_SELECT")));
+
+ QPixmap image0 (SMESHGUI::resourceMgr()->loadPixmap("SMESH", tr("ICON_SELECT")));
if (create)
- setCaption( tr( "SMESH_CREATE_GROUP_TITLE" ) );
+ setCaption(tr("SMESH_CREATE_GROUP_TITLE"));
else
- setCaption( tr( "SMESH_EDIT_GROUP_TITLE" ) );
-
- setSizeGripEnabled( TRUE );
+ setCaption(tr("SMESH_EDIT_GROUP_TITLE"));
+
+ setSizeGripEnabled(TRUE);
QGridLayout* aMainLayout = new QGridLayout(this, 7, 3, 11, 6);
-
+
/***************************************************************/
QLabel* meshGroupLab = new QLabel(this, "mesh/group label");
if (create)
myMeshGroupBtn->setPixmap(image0);
myMeshGroupLine = new QLineEdit(this, "mesh/group line");
myMeshGroupLine->setReadOnly(true);
-
+
/***************************************************************/
myTypeGroup = new QButtonGroup(1, Qt::Vertical, this, "Group types");
myTypeGroup->setTitle(tr("SMESH_ELEMENTS_TYPE"));
}
myTypeGroup->setEnabled(create);
myTypeId = -1;
-
+
/***************************************************************/
QLabel* aName = new QLabel(this, "name label");
aName->setText(tr("SMESH_NAME"));
myWGStack = new QWidgetStack( this, "widget stack");
QWidget* wg1 = new QFrame( myWGStack, "first widget" );
QWidget* wg2 = new QFrame( myWGStack, "second widget" );
-
+
/***************************************************************/
QGroupBox* aContentBox = new QGroupBox(1, Qt::Horizontal, wg1, "content box");
aContentBox->setTitle(tr("SMESH_CONTENT"));
/***************************************************************/
QGroupBox* aSelectBox = new QGroupBox(3, Qt::Horizontal, wg1, "select box");
aSelectBox->setTitle(tr("SMESH_SELECT_FROM"));
-
+
mySelectSubMesh = new QCheckBox(aSelectBox, "submesh checkbox");
mySelectSubMesh->setText(tr("SMESH_SUBMESH"));
mySelectSubMesh->setMinimumSize(50, 0);
mySubMeshLine = new QLineEdit(aSelectBox, "submesh line");
mySubMeshLine->setReadOnly(true);
onSelectSubMesh(false);
-
+
mySelectGroup = new QCheckBox(aSelectBox, "group checkbox");
mySelectGroup->setText(tr("SMESH_GROUP"));
mySelectGroup->setMinimumSize(50, 0);
myGroupLine = new QLineEdit(aSelectBox, "group line");
myGroupLine->setReadOnly(true);
onSelectGroup(false);
-
+
/***************************************************************/
QGridLayout* wg1Layout = new QGridLayout( wg1, 3, 1, 0, 6 );
wg1Layout->addWidget(aContentBox, 0, 0);
myGeomGroupLine = new QLineEdit(wg2, "geometry group line");
myGeomGroupLine->setReadOnly(true); //VSR ???
onSelectGeomGroup(false);
-
+
/***************************************************************/
QGridLayout* wg2Layout = new QGridLayout( wg2, 2, 3, 0, 6 );
wg2Layout->addWidget(geomObject, 0, 0);
connect(aCloseBtn, SIGNAL(clicked()), this, SLOT(onClose()));
/* Init selection */
- mySelection = theSel;
- mySMESHGUI = SMESHGUI::GetSMESHGUI();
mySMESHGUI->SetActiveDialogBox(this);
mySMESHGUI->SetState(800);
connect(mySMESHGUI, SIGNAL(SignalDeactivateActiveDialog()), this, SLOT(onDeactivate()));
connect(mySMESHGUI, SIGNAL(SignalCloseAllDialogs()), this, SLOT(onClose()));
- connect(mySelection, SIGNAL(currentSelectionChanged()), this, SLOT(onObjectSelectionChanged()));
+ connect(mySelectionMgr, SIGNAL(currentSelectionChanged()), this, SLOT(onObjectSelectionChanged()));
myGrpTypeGroup->setButton(myGrpTypeGroup->id(rb1)); // VSR !!!
onGrpTypeChanged(myGrpTypeGroup->id(rb1)); // VSR!!!
if (myMesh->_is_nil() )
myTypeGroup->setButton(0);
-
+
updateButtons();
}
}
}
-
//=================================================================================
// function : Init()
// purpose :
//=================================================================================
-void SMESHGUI_GroupDlg::init(SMESH::SMESH_Mesh_ptr theMesh)
+void SMESHGUI_GroupDlg::init (SMESH::SMESH_Mesh_ptr theMesh)
{
+ mySelectionMgr->installFilter(myMeshFilter);
+
/* init data from current selection */
myMesh = SMESH::SMESH_Mesh::_duplicate(theMesh);
myGroup = SMESH::SMESH_Group::_nil();
-
+
myActor = SMESH::FindActorByObject(myMesh);
SMESH::SetPickable(myActor);
-
- QString aName = mySelection->firstIObject()->getName();
- myMeshGroupLine->setText(aName) ;
- myMeshGroupLine->home( false );
+
+ SALOME_ListIO aList;
+ mySelectionMgr->selectedObjects( aList );
+ if( !aList.IsEmpty() )
+ {
+ QString aName = aList.First()->getName();
+ myMeshGroupLine->setText(aName) ;
+ myMeshGroupLine->home( false );
+ }
myCurrentLineEdit = 0;
// function : Init()
// purpose :
//=================================================================================
-void SMESHGUI_GroupDlg::init(SMESH::SMESH_Group_ptr theGroup)
+void SMESHGUI_GroupDlg::init (SMESH::SMESH_Group_ptr theGroup)
{
myMesh = theGroup->GetMesh();
myGroup = SMESH::SMESH_Group::_duplicate(theGroup);
-
+
myActor = SMESH::FindActorByObject(myMesh);
if ( !myActor )
myActor = SMESH::FindActorByObject(myGroup);
SMESH::SetPickable(myActor);
-
+
int aType = 0;
switch(theGroup->GetType()) {
case SMESH::NODE: aType= 0; break;
case SMESH::EDGE: aType = 1; break;
case SMESH::FACE: aType = 2; break;
case SMESH::VOLUME: aType = 3; break;
- }
-
+ }
+
myName->setText(myGroup->GetName());
myName->home(false);
myMeshGroupLine->setText(myGroup->GetName());
myElements->clear();
setSelectionMode(aType);
myTypeId = aType;
-
+
myIdList.clear();
if (!theGroup->IsEmpty()) {
SMESH::long_array_var anElements = myGroup->GetListOfID();
}
}
-
//=================================================================================
// function : updateButtons()
-// purpose :
+// purpose :
//=================================================================================
void SMESHGUI_GroupDlg::updateButtons()
{
- bool enable;
-
+ bool enable;
+
if (myGrpTypeId == 0)
enable = !myName->text().stripWhiteSpace().isEmpty() && myElements->count() > 0;
else if (myGrpTypeId == 1)
//=================================================================================
// function : onNameChanged()
-// purpose :
+// purpose :
//=================================================================================
-void SMESHGUI_GroupDlg::onNameChanged(const QString& text)
+void SMESHGUI_GroupDlg::onNameChanged (const QString& text)
{
updateButtons();
}
// function : onTypeChanged()
// purpose : Group elements type radio button management
//=================================================================================
-void SMESHGUI_GroupDlg::onTypeChanged(int id)
+void SMESHGUI_GroupDlg::onTypeChanged (int id)
{
if (myTypeId != id) {
myElements->clear();
// function : onGrpTypeChanged()
// purpose : Group type radio button management
//=================================================================================
-void SMESHGUI_GroupDlg::onGrpTypeChanged(int id)
+void SMESHGUI_GroupDlg::onGrpTypeChanged (int id)
{
if (myGrpTypeId != id) {
myWGStack->raiseWidget( id );
// function : setSelectionMode()
// purpose : Radio button management
//=================================================================================
-void SMESHGUI_GroupDlg::setSelectionMode(int theMode)
+void SMESHGUI_GroupDlg::setSelectionMode (int theMode)
{
// PAL7314
if (myMesh->_is_nil())
return;
-
+
if (mySelectionMode != theMode) {
- mySelection->ClearIObjects();
- mySelection->ClearFilters();
+ mySelectionMgr->clearSelected();
+ mySelectionMgr->clearFilters();
SMESH::SetPointRepresentation(false);
if (theMode < 4) {
- switch(theMode){
+ switch (theMode) {
case 0:
- if ( myActor )
+ if (myActor)
myActor->SetPointRepresentation(true);
else
SMESH::SetPointRepresentation(true);
- QAD_Application::getDesktop()->SetSelectionMode(NodeSelection, true);
+ myViewWindow->SetSelectionMode(NodeSelection);
break;
case 1:
- QAD_Application::getDesktop()->SetSelectionMode(EdgeSelection, true);
+ myViewWindow->SetSelectionMode(EdgeSelection);
break;
case 2:
- QAD_Application::getDesktop()->SetSelectionMode(FaceSelection, true);
+ myViewWindow->SetSelectionMode(FaceSelection);
break;
default:
- QAD_Application::getDesktop()->SetSelectionMode(VolumeSelection, true);
+ myViewWindow->SetSelectionMode(VolumeSelection);
}
- }
- else {
- QAD_Application::getDesktop()->SetSelectionMode(ActorSelection, true);
+ } else {
+ myViewWindow->SetSelectionMode(ActorSelection);
if (theMode == 4)
- mySelection->AddFilter(mySubMeshFilter);
+ mySelectionMgr->installFilter(mySubMeshFilter);
else if (theMode == 5)
- mySelection->AddFilter(myGroupFilter);
+ mySelectionMgr->installFilter(myGroupFilter);
else if (theMode == 6)
- mySelection->AddFilter(myMeshFilter);
+ mySelectionMgr->installFilter(myMeshFilter);
}
mySelectionMode = theMode;
}
-}
+}
//=================================================================================
// function : onApply()
//=================================================================================
bool SMESHGUI_GroupDlg::onApply()
{
- if (mySMESHGUI->ActiveStudyLocked())
+ if (mySMESHGUI->isActiveStudyLocked())
return false;
-
- if ( myGrpTypeId == 0 && !myName->text().stripWhiteSpace().isEmpty() && myElements->count() > 0) {
- mySelection->ClearIObjects();
+
+ if (myGrpTypeId == 0 &&
+ !myName->text().stripWhiteSpace().isEmpty() &&
+ myElements->count() > 0) {
+ mySelectionMgr->clearSelected();
if (myGroup->_is_nil()) {
SMESH::ElementType aType = SMESH::ALL;
switch(myTypeId) {
myGroup = SMESH::AddGroup(myMesh, aType, myName->text());
myGroup->Add(anIdList.inout());
-
+
/* init for next operation */
myName->setText("");
myElements->clear();
myGroup = SMESH::SMESH_Group::_nil();
- }
- else {
+
+ } else {
myGroup->SetName(myName->text());
QValueList<int> aAddList;
QValueList<int>::iterator anIt;
QListBoxItem* anItem;
-
+
for (anItem = myElements->firstItem(); anItem != 0; anItem = anItem->next()) {
int anId = anItem->text().toInt();
if ((anIt = myIdList.find(anId)) == myIdList.end())
myIdList.append(anItem->text().toInt());
}
- mySMESHGUI->GetActiveStudy()->updateObjBrowser(true);
+ mySMESHGUI->updateObjBrowser(true);
SMESH::UpdateView(); // asv: fix of BUG PAL5515
- mySelection->ClearIObjects();
+ mySelectionMgr->clearSelected();
return true;
- }
- else if (myGrpTypeId == 1 && !myName->text().stripWhiteSpace().isEmpty() && !CORBA::is_nil( myGeomGroup ))
- {
- SMESH::ElementType aType = SMESH::ALL;
- switch(myTypeId) {
- case 0: aType = SMESH::NODE; break;
- case 1: aType = SMESH::EDGE; break;
- case 2: aType = SMESH::FACE; break;
- case 3: aType = SMESH::VOLUME; break;
- }
-
- SALOMEDS::Study_var aStudy = SMESH::GetActiveStudyDocument();
- GEOM::GEOM_IGroupOperations_var aGroupOp = SMESH::GetGEOMGen()->GetIGroupOperations(aStudy->StudyId());
-
- SMESH::SMESH_GroupOnGeom_var aGroupOnGeom = myMesh->CreateGroupFromGEOM(aType, myName->text(),myGeomGroup);
-
- mySMESHGUI->GetActiveStudy()->updateObjBrowser(true);
- mySelection->ClearIObjects();
- /* init for next operation */
- myName->setText("");
- return true;
+ } else if (myGrpTypeId == 1 &&
+ !myName->text().stripWhiteSpace().isEmpty() &&
+ !CORBA::is_nil(myGeomGroup))
+ {
+ SMESH::ElementType aType = SMESH::ALL;
+ switch (myTypeId) {
+ case 0: aType = SMESH::NODE; break;
+ case 1: aType = SMESH::EDGE; break;
+ case 2: aType = SMESH::FACE; break;
+ case 3: aType = SMESH::VOLUME; break;
}
-
+
+ _PTR(Study) aStudy = SMESH::GetActiveStudyDocument();
+ GEOM::GEOM_IGroupOperations_var aGroupOp =
+ SMESH::GetGEOMGen()->GetIGroupOperations(aStudy->StudyId());
+
+ SMESH::SMESH_GroupOnGeom_var aGroupOnGeom =
+ myMesh->CreateGroupFromGEOM(aType, myName->text(),myGeomGroup);
+
+ mySMESHGUI->updateObjBrowser(true);
+ mySelectionMgr->clearSelected();
+ /* init for next operation */
+ myName->setText("");
+ return true;
+ }
+
return false;
}
onClose();
}
-static bool busy = false;
//=================================================================================
// function : onListSelectionChanged()
// purpose : Called when selection in element list is changed
void SMESHGUI_GroupDlg::onListSelectionChanged()
{
// MESSAGE("SMESHGUI_GroupDlg::onListSelectionChanged(); myActor = " << myActor);
- if (busy || !myActor) return;
- busy = true;
+ if( myIsBusy || !myActor) return;
+ myIsBusy = true;
if (myCurrentLineEdit == 0) {
- mySelection->ClearIObjects();
+ mySelectionMgr->clearSelected();
TColStd_MapOfInteger aIndexes;
QListBoxItem* anItem;
for (anItem = myElements->firstItem(); anItem != 0; anItem = anItem->next()) {
aIndexes.Add(anId);
}
}
- mySelection->AddOrRemoveIndex(myActor->getIO(), aIndexes, false, false);
- mySelection->AddIObject(myActor->getIO());
+ mySelector->AddOrRemoveIndex(myActor->getIO(), aIndexes, false);
+ SALOME_ListIO aList;
+ aList.Append(myActor->getIO());
+ mySelectionMgr->setSelectedObjects(aList,false);
+ myViewWindow->highlight( myActor->getIO(), true, true );
}
- busy = false;
+ myIsBusy = false;
}
//=================================================================================
//=================================================================================
void SMESHGUI_GroupDlg::onObjectSelectionChanged()
{
- if (busy || !isEnabled()) return;
- busy = true;
+ if ( myIsBusy || !isEnabled()) return;
+ myIsBusy = true;
- int aNbSel = mySelection->IObjectCount();
+ SALOME_ListIO aList;
+ mySelectionMgr->selectedObjects( aList );
+
+ int aNbSel = aList.Extent();
myElements->clearSelection();
-
+
if (myCurrentLineEdit) {
- myCurrentLineEdit->setText("") ;
+ myCurrentLineEdit->setText("");
QString aString = "";
-
- if (myCurrentLineEdit == myMeshGroupLine)
- {
- mySelectSubMesh->setEnabled(false);
- mySelectGroup->setEnabled(false);
- myGroupLine->setText("");
- mySubMeshLine->setText("");
-
- myGeomGroupBtn->setEnabled(false);
- myGeomGroupLine->setEnabled(false);
- myGeomGroupLine->setText("");
- if (!myCreate)
- myName->setText("");
-
- myElements->clear();
-
- if(aNbSel != 1)
- {
- myGroup = SMESH::SMESH_Group::_nil();
- myMesh = SMESH::SMESH_Mesh::_nil();
- busy = false;
- return;
- }
- Handle(SALOME_InteractiveObject) IO = mySelection->firstIObject();
-
- if (myCreate)
- {
- myMesh = SMESH::IObjectToInterface<SMESH::SMESH_Mesh>(IO);
- if(myMesh->_is_nil())
- return;
- myGroup = SMESH::SMESH_Group::_nil();
-
- myActor = SMESH::FindActorByObject(myMesh);
- SMESH::SetPickable(myActor);
-
- aString = mySelection->firstIObject()->getName();
- myMeshGroupLine->setText(aString) ;
- myMeshGroupLine->home( false );
-
- mySelectSubMesh->setEnabled(true);
- mySelectGroup->setEnabled(true);
- myGeomGroupBtn->setEnabled(true);
- myGeomGroupLine->setEnabled(true);
- updateButtons();
- }
- else
- {
- SMESH::SMESH_Group_var aGroup = SMESH::IObjectToInterface<SMESH::SMESH_Group>(IO);
- if(aGroup->_is_nil())
- return;
- busy = false;
- myCurrentLineEdit = 0;
- init(aGroup);
- busy = true;
- mySelectSubMesh->setEnabled(true);
- mySelectGroup->setEnabled(true);
- myGeomGroupBtn->setEnabled(true);
- myGeomGroupLine->setEnabled(true);
- }
- myCurrentLineEdit = 0;
- busy = false;
- if (!myCreate)
- return;
- if (myTypeId == -1)
- onTypeChanged(0);
- else
- {
- myElements->clear();
- setSelectionMode(myTypeId);
- }
-
- return;
+ if (myCurrentLineEdit == myMeshGroupLine) {
+ mySelectSubMesh->setEnabled(false);
+ mySelectGroup->setEnabled(false);
+ myGroupLine->setText("");
+ mySubMeshLine->setText("");
+
+ myGeomGroupBtn->setEnabled(false);
+ myGeomGroupLine->setEnabled(false);
+ myGeomGroupLine->setText("");
+ if (!myCreate)
+ myName->setText("");
+
+ myElements->clear();
+
+ if (aNbSel == 0 ) {
+ myGroup = SMESH::SMESH_Group::_nil();
+ myMesh = SMESH::SMESH_Mesh::_nil();
+ myIsBusy = false;
+ return;
}
- else if (myCurrentLineEdit == myGeomGroupLine)
- {
-
- if(aNbSel != 1)
- {
- myGeomGroup = GEOM::GEOM_Object::_nil();
- busy = false;
- return;
- }
-
- Standard_Boolean testResult = Standard_False;
- myGeomGroup = GEOMBase::ConvertIOinGEOMObject(mySelection->firstIObject(), testResult );
-
- // Check if the object is a geometry group
- if(!testResult || CORBA::is_nil( myGeomGroup ))
- {
- myGeomGroup = GEOM::GEOM_Object::_nil();
- busy = false;
- return;
- }
- // Check if group constructed on the same shape as a mesh or on its child
- SALOMEDS::Study_var aStudy = SMESH::GetActiveStudyDocument();
- GEOM::GEOM_IGroupOperations_var anOp = SMESH::GetGEOMGen()->GetIGroupOperations(aStudy->StudyId());
- // The main shape of the group
- GEOM::GEOM_Object_var aGroupMainShape;
- if( myGeomGroup->GetType() == 37 )
- aGroupMainShape = anOp->GetMainShape( myGeomGroup );
- else
- aGroupMainShape = GEOM::GEOM_Object::_duplicate(myGeomGroup);
- SALOMEDS::SObject_var aGroupMainShapeSO = aStudy->FindObjectIOR( aStudy->ConvertObjectToIOR(aGroupMainShape) );
- // The mesh SObject
- SALOMEDS::SObject_var aMeshSO = aStudy->FindObjectIOR( aStudy->ConvertObjectToIOR(myMesh) );
-
- SALOMEDS::SObject_var anObj, aRef;
- bool isRefOrSubShape = false;
- if ( aMeshSO->FindSubObject( 1, anObj ) && anObj->ReferencedObject( aRef )) {
- if ( strcmp( aRef->GetID(), aGroupMainShapeSO->GetID() ) == 0 )
- isRefOrSubShape = true;
- else
- {
- SALOMEDS::SObject_var aFather = aGroupMainShapeSO->GetFather();
- SALOMEDS::SComponent_var aComponent = aGroupMainShapeSO->GetFatherComponent();
- while ( !isRefOrSubShape && strcmp( aFather->GetID(), aComponent->GetID() ) != 0 )
- {
- if (strcmp( aRef->GetID(), aFather->GetID() ) == 0)
- isRefOrSubShape = true;
- else
- aFather = aFather->GetFather();
- }
- }
+ Handle(SALOME_InteractiveObject) IO = aList.First();
+
+ if (myCreate) {
+ myMesh = SMESH::IObjectToInterface<SMESH::SMESH_Mesh>(IO);
+ if (myMesh->_is_nil())
+ {
+ myIsBusy = false;
+ return;
}
- if ( !isRefOrSubShape )
- {
- myGeomGroup = GEOM::GEOM_Object::_nil();
- busy = false;
- return;
- }
+ myGroup = SMESH::SMESH_Group::_nil();
+
+ myActor = SMESH::FindActorByObject(myMesh);
+ SMESH::SetPickable(myActor);
+
+ aString = aList.First()->getName();
+ myMeshGroupLine->setText(aString) ;
+ myMeshGroupLine->home( false );
+
+ mySelectSubMesh->setEnabled(true);
+ mySelectGroup->setEnabled(true);
+ myGeomGroupBtn->setEnabled(true);
+ myGeomGroupLine->setEnabled(true);
+ updateButtons();
+ } else {
+ SMESH::SMESH_Group_var aGroup = SMESH::IObjectToInterface<SMESH::SMESH_Group>(IO);
+ if (aGroup->_is_nil())
+ {
+ myIsBusy = false;
+ return;
+ }
+ myIsBusy = false;
+ myCurrentLineEdit = 0;
+ init(aGroup);
+ myIsBusy = true;
+ mySelectSubMesh->setEnabled(true);
+ mySelectGroup->setEnabled(true);
+ myGeomGroupBtn->setEnabled(true);
+ myGeomGroupLine->setEnabled(true);
}
-
- if (aNbSel >= 1) {
- if (aNbSel > 1) {
- if (myCurrentLineEdit == mySubMeshLine)
+ myCurrentLineEdit = 0;
+ myIsBusy = false;
+ if (!myCreate)
+ return;
+
+ if (myTypeId == -1)
+ onTypeChanged(0);
+ else {
+ myElements->clear();
+ setSelectionMode(myTypeId);
+ }
+
+ myIsBusy = false;
+ return;
+
+ } else if (myCurrentLineEdit == myGeomGroupLine) {
+ if (aNbSel == 0) {
+ myGeomGroup = GEOM::GEOM_Object::_nil();
+ myIsBusy = false;
+ return;
+ }
+
+ Standard_Boolean testResult = Standard_False;
+ myGeomGroup = GEOMBase::ConvertIOinGEOMObject(aList.First(), testResult);
+
+ // Check if the object is a geometry group
+ if (!testResult || CORBA::is_nil(myGeomGroup)) {
+ myGeomGroup = GEOM::GEOM_Object::_nil();
+ myIsBusy = false;
+ return;
+ }
+ // Check if group constructed on the same shape as a mesh or on its child
+ _PTR(Study) aStudy = SMESH::GetActiveStudyDocument();
+ GEOM::GEOM_IGroupOperations_var anOp =
+ SMESH::GetGEOMGen()->GetIGroupOperations(aStudy->StudyId());
+
+ // The main shape of the group
+ GEOM::GEOM_Object_var aGroupMainShape;
+ if (myGeomGroup->GetType() == 37)
+ aGroupMainShape = anOp->GetMainShape(myGeomGroup);
+ else
+ aGroupMainShape = GEOM::GEOM_Object::_duplicate(myGeomGroup);
+ _PTR(SObject) aGroupMainShapeSO =
+ //aStudy->FindObjectIOR(aStudy->ConvertObjectToIOR(aGroupMainShape));
+ aStudy->FindObjectIOR(aGroupMainShape->GetStudyEntry());
+
+ // The mesh SObject
+ _PTR(SObject) aMeshSO = SMESH::FindSObject(myMesh);
+ if (!aMeshSO) {
+ myGeomGroup = GEOM::GEOM_Object::_nil();
+ myIsBusy = false;
+ return;
+ }
+ _PTR(SObject) anObj, aRef;
+ bool isRefOrSubShape = false;
+ if (aMeshSO->FindSubObject(1, anObj) && anObj->ReferencedObject(aRef)) {
+ //if (strcmp(aRef->GetID(), aGroupMainShapeSO->GetID()) == 0) {
+ if (aRef->GetID() == aGroupMainShapeSO->GetID()) {
+ isRefOrSubShape = true;
+ } else {
+ _PTR(SObject) aFather = aGroupMainShapeSO->GetFather();
+ _PTR(SComponent) aComponent = aGroupMainShapeSO->GetFatherComponent();
+ //while (!isRefOrSubShape && strcmp(aFather->GetID(), aComponent->GetID()) != 0) {
+ while (!isRefOrSubShape && aFather->GetID() != aComponent->GetID()) {
+ //if (strcmp(aRef->GetID(), aFather->GetID()) == 0)
+ if (aRef->GetID() == aFather->GetID())
+ isRefOrSubShape = true;
+ else
+ aFather = aFather->GetFather();
+ }
+ }
+ }
+ if (!isRefOrSubShape) {
+ myGeomGroup = GEOM::GEOM_Object::_nil();
+ myIsBusy = false;
+ return;
+ }
+ }
+
+ if(aNbSel >= 1) {
+ if(aNbSel > 1) {
+ if(myCurrentLineEdit == mySubMeshLine)
aString = tr("SMESH_SUBMESH_SELECTED").arg(aNbSel);
- else if (myCurrentLineEdit == myGroupLine || myCurrentLineEdit == myGeomGroupLine)
+ else if(myCurrentLineEdit == myGroupLine || myCurrentLineEdit == myGeomGroupLine)
aString = tr("SMESH_GROUP_SELECTED").arg(aNbSel);
- }
- else {
- aString = mySelection->firstIObject()->getName();
+ } else {
+ aString = aList.First()->getName();
}
}
-
- myCurrentLineEdit->setText(aString) ;
- myCurrentLineEdit->home( false );
-
+
+ myCurrentLineEdit->setText(aString);
+ myCurrentLineEdit->home(false);
+
updateButtons();
- }
- else {
+
+ } else {
if (aNbSel == 1) {
QString aListStr = "";
int aNbItems = 0;
if (myTypeId == 0) {
- aNbItems = SMESH::GetNameOfSelectedNodes(mySelection, aListStr);
- }
- else {
- aNbItems = SMESH::GetNameOfSelectedElements(mySelection, aListStr);
+ aNbItems = SMESH::GetNameOfSelectedNodes(mySelector, myActor->getIO(), aListStr);
+ } else {
+ aNbItems = SMESH::GetNameOfSelectedElements(mySelector, myActor->getIO(), aListStr);
}
if (aNbItems > 0) {
QStringList anElements = QStringList::split(" ", aListStr);
}
}
}
-
- if ( !myActor ) {
- if ( !myGroup->_is_nil() )
+
+ if (!myActor) {
+ if (!myGroup->_is_nil())
myActor = SMESH::FindActorByObject(myGroup);
else
myActor = SMESH::FindActorByObject(myMesh);
}
-
- busy = false;
-}
+ myIsBusy = false;
+}
//=================================================================================
// function : onSelectSubMesh()
if (on) {
if (mySelectGroup->isChecked()) {
mySelectGroup->setChecked(false);
- }
+ }
//VSR: else if (mySelectGeomGroup->isChecked()) {
//VSR: mySelectGeomGroup->setChecked(false);
//VSR: }
//=================================================================================
// function : setFilters()
-// purpose : SLOT. Called when "Filter" button pressed.
+// purpose : SLOT. Called when "Filter" button pressed.
//=================================================================================
void SMESHGUI_GroupDlg::setFilters()
{
if ( myFilterDlg == 0 )
{
- myFilterDlg = new SMESHGUI_FilterDlg( (QWidget*)parent(), aType );
+ myFilterDlg = new SMESHGUI_FilterDlg( mySMESHGUI, aType );
connect( myFilterDlg, SIGNAL( Accepted() ), SLOT( onFilterAccepted() ) );
}
else
myFilterDlg->Init( aType );
- myFilterDlg->SetSelection( mySelection );
+ myFilterDlg->SetSelection();
myFilterDlg->SetMesh( myMesh );
myFilterDlg->SetSourceWg( myElements );
//=================================================================================
void SMESHGUI_GroupDlg::onAdd()
{
- int aNbSel = mySelection->IObjectCount();
+ SALOME_ListIO aList;
+ mySelectionMgr->selectedObjects( aList );
+
+ int aNbSel = aList.Extent();
+
if (aNbSel == 0 || !myActor || myMesh->_is_nil()) return;
- busy = true;
+ myIsBusy = true;
SMESH::ElementType aType = SMESH::ALL;
switch(myTypeId) {
}
if (myCurrentLineEdit == 0) {
- //if (aNbSel != 1) { busy = false; return; }
+ //if (aNbSel != 1) { myIsBusy = false; return; }
QString aListStr = "";
int aNbItems = 0;
if (myTypeId == 0) {
- aNbItems = SMESH::GetNameOfSelectedNodes(mySelection, myActor->getIO(), aListStr);
+ aNbItems = SMESH::GetNameOfSelectedNodes(mySelector, myActor->getIO(), aListStr);
}
else {
- aNbItems = SMESH::GetNameOfSelectedElements(mySelection, myActor->getIO(), aListStr);
+ aNbItems = SMESH::GetNameOfSelectedElements(mySelector, myActor->getIO(), aListStr);
}
if (aNbItems > 0) {
QStringList anElements = QStringList::split(" ", aListStr);
myElements->setSelected(anItem, true);
}
}
- }
- else if (myCurrentLineEdit == mySubMeshLine) {
- SALOME_ListIteratorOfListIO anIt(mySelection->StoredIObjects());
+ } else if (myCurrentLineEdit == mySubMeshLine) {
+ //SALOME_ListIteratorOfListIO anIt (mySelectionMgr->StoredIObjects());
+
+ SALOME_ListIO aList;
+ mySelectionMgr->selectedObjects( aList );
+
+ SALOME_ListIteratorOfListIO anIt (aList);
for (; anIt.More(); anIt.Next()) {
- SMESH::SMESH_subMesh_var aSubMesh = SMESH::IObjectToInterface<SMESH::SMESH_subMesh>(anIt.Value());
+ SMESH::SMESH_subMesh_var aSubMesh =
+ SMESH::IObjectToInterface<SMESH::SMESH_subMesh>(anIt.Value());
if (!aSubMesh->_is_nil()) {
// check if mesh is the same
if (aSubMesh->GetFather()->GetId() == myMesh->GetId()) {
try {
- SMESH::long_array_var anElements = aSubMesh->GetElementsByType ( aType );
+ SMESH::long_array_var anElements = aSubMesh->GetElementsByType(aType);
int k = anElements->length();
QListBoxItem* anItem = 0;
for (int i = 0; i < k; i++) {
}
}
catch (const SALOME::SALOME_Exception& ex) {
- QtCatchCorbaException(ex);
+ SalomeApp_Tools::QtCatchCorbaException(ex);
}
}
}
}
mySelectSubMesh->setChecked(false);
- busy = false;
+ myIsBusy = false;
onListSelectionChanged();
- }
- else if (myCurrentLineEdit == myGroupLine) {
- SALOME_ListIteratorOfListIO anIt(mySelection->StoredIObjects());
+
+ } else if (myCurrentLineEdit == myGroupLine) {
+ //SALOME_ListIteratorOfListIO anIt (mySelectionMgr->StoredIObjects());
+ SALOME_ListIO aList;
+ mySelectionMgr->selectedObjects( aList );
+
+ SALOME_ListIteratorOfListIO anIt (aList);
for (; anIt.More(); anIt.Next()) {
- SMESH::SMESH_Group_var aGroup = SMESH::IObjectToInterface<SMESH::SMESH_Group>(anIt.Value());
+ SMESH::SMESH_Group_var aGroup =
+ SMESH::IObjectToInterface<SMESH::SMESH_Group>(anIt.Value());
if (!aGroup->_is_nil()) {
// check if mesh is the same
if (aGroup->GetType() == aType && aGroup->GetMesh()->GetId() == myMesh->GetId()) {
}
}
mySelectGroup->setChecked(false);
- busy = false;
+ myIsBusy = false;
onListSelectionChanged();
- }
- else if (myCurrentLineEdit == myGeomGroupLine && !CORBA::is_nil(myGeomGroup)) {
-
- SALOMEDS::Study_var aStudy = SMESH::GetActiveStudyDocument();
- GEOM::GEOM_IGroupOperations_var aGroupOp = SMESH::GetGEOMGen()->GetIGroupOperations(aStudy->StudyId());
-
+
+ } else if (myCurrentLineEdit == myGeomGroupLine && !CORBA::is_nil(myGeomGroup)) {
+ _PTR(Study) aStudy = SMESH::GetActiveStudyDocument();
+ GEOM::GEOM_IGroupOperations_var aGroupOp =
+ SMESH::GetGEOMGen()->GetIGroupOperations(aStudy->StudyId());
+
SMESH::ElementType aGroupType = SMESH::ALL;
switch(aGroupOp->GetType(myGeomGroup)) {
case 7: aGroupType = SMESH::NODE; break;
case 6: aGroupType = SMESH::EDGE; break;
case 4: aGroupType = SMESH::FACE; break;
case 2: aGroupType = SMESH::VOLUME; break;
- default: return;
+ default: myIsBusy = false; return;
}
-
+
if (aGroupType == aType) {
- SALOMEDS::SObject_var aGroupSO = aStudy->FindObjectIOR( aStudy->ConvertObjectToIOR(myGeomGroup) );
+ _PTR(SObject) aGroupSO =
+ //aStudy->FindObjectIOR(aStudy->ConvertObjectToIOR(myGeomGroup));
+ aStudy->FindObjectIOR(myGeomGroup->GetStudyEntry());
// Construct filter
SMESH::FilterManager_var aFilterMgr = SMESH::GetFilterManager();
SMESH::Filter_var aFilter = aFilterMgr->CreateFilter();
SMESH::BelongToGeom_var aBelongToGeom = aFilterMgr->CreateBelongToGeom();;
aBelongToGeom->SetGeom(myGeomGroup);
- aBelongToGeom->SetShapeName(aGroupSO->GetName());
+ aBelongToGeom->SetShapeName(aGroupSO->GetName().c_str());
aBelongToGeom->SetElementType(aType);
- aFilter->SetPredicate( aBelongToGeom );
-
- SMESH::long_array_var anElements = aFilter->GetElementsId( myMesh );
-
+ aFilter->SetPredicate(aBelongToGeom);
+
+ SMESH::long_array_var anElements = aFilter->GetElementsId(myMesh);
+
int k = anElements->length();
QListBoxItem* anItem = 0;
for (int i = 0; i < k; i++) {
myElements->setSelected(anItem, true);
}
}
-
+
//VSR: mySelectGeomGroup->setChecked(false);
- busy = false;
+ myIsBusy = false;
onListSelectionChanged();
}
- busy = false;
- // mySelection->ClearIObjects();
+ myIsBusy = false;
+ // mySelectionMgr->clearSelected();
updateButtons();
}
//=================================================================================
void SMESHGUI_GroupDlg::onRemove()
{
- busy = true;
+ myIsBusy = true;
if (myCurrentLineEdit == 0) {
for (int i = myElements->count(); i > 0; i--) {
if (myElements->isSelected(i-1)) {
myElements->removeItem(i-1);
}
}
- }
- else {
- int aNbSel = mySelection->IObjectCount();
- if (aNbSel == 0) { busy = false; return; }
-
+ } else {
+ SALOME_ListIO aList;
+ mySelectionMgr->selectedObjects( aList );
+
+ int aNbSel = aList.Extent();
+
+ if (aNbSel == 0) { myIsBusy = false; return; }
+
SMESH::ElementType aType = SMESH::ALL;
switch(myTypeId) {
case 0: aType = SMESH::NODE; break;
}
if (myCurrentLineEdit == mySubMeshLine) {
- SALOME_ListIteratorOfListIO anIt(mySelection->StoredIObjects());
+ //SALOME_ListIteratorOfListIO anIt (mySelectionMgr->StoredIObjects());
+ SALOME_ListIO aList;
+ mySelectionMgr->selectedObjects( aList );
+
+ SALOME_ListIteratorOfListIO anIt (aList);
for (; anIt.More(); anIt.Next()) {
SMESH::SMESH_subMesh_var aSubMesh = SMESH::IObjectToInterface<SMESH::SMESH_subMesh>(anIt.Value());
if (!aSubMesh->_is_nil()) {
}
}
catch (const SALOME::SALOME_Exception& ex) {
- QtCatchCorbaException(ex);
+ SalomeApp_Tools::QtCatchCorbaException(ex);
}
}
else {
}
}
catch (const SALOME::SALOME_Exception& ex) {
- QtCatchCorbaException(ex);
+ SalomeApp_Tools::QtCatchCorbaException(ex);
}
}
}
}
else if (myCurrentLineEdit == myGroupLine) {
Standard_Boolean aRes;
- SALOME_ListIteratorOfListIO anIt(mySelection->StoredIObjects());
+ //SALOME_ListIteratorOfListIO anIt (mySelectionMgr->StoredIObjects());
+ SALOME_ListIO aList;
+ mySelectionMgr->selectedObjects( aList );
+
+ SALOME_ListIteratorOfListIO anIt (aList);
for (; anIt.More(); anIt.Next()) {
SMESH::SMESH_Group_var aGroup = SMESH::IObjectToInterface<SMESH::SMESH_Group>(anIt.Value());
if (aRes && !aGroup->_is_nil()) {
}
}
}
- busy = false;
+ myIsBusy = false;
updateButtons();
}
// myElements->update();
int i, k = myElements->count();
if (k > 0) {
- busy = true;
+ myIsBusy = true;
QStringList aSelected;
std::vector<int> anArray(k);
// QMemArray<int> anArray(k);
// fill the array
for (anItem = myElements->firstItem(), i = 0; anItem != 0; anItem = anItem->next(), i++) {
anArray[i] = anItem->text().toInt();
- if (anItem->isSelected())
+ if (anItem->isSelected())
aSelected.append(anItem->text());
}
// sort & update list
anItem = myElements->findItem(*it, Qt::ExactMatch);
if (anItem) myElements->setSelected(anItem, true);
}
- busy = false;
+ myIsBusy = false;
}
}
// function : closeEvent()
// purpose :
//=================================================================================
-void SMESHGUI_GroupDlg::closeEvent( QCloseEvent* e )
+void SMESHGUI_GroupDlg::closeEvent (QCloseEvent*)
{
onClose();
}
-//=======================================================================
-// name : SMESHGUI_GroupDlg::onClose
-// Purpose : SLOT called when "Close" button pressed. Close dialog
-//=======================================================================
+//=================================================================================
+// function : SMESHGUI_GroupDlg::onClose
+// purpose : SLOT called when "Close" button pressed. Close dialog
+//=================================================================================
void SMESHGUI_GroupDlg::onClose()
{
- QAD_StudyFrame* aStudyFrame = mySMESHGUI->GetActiveStudy()->getActiveStudyFrame();
- if (aStudyFrame->getTypeView() == VIEW_VTK) {
+ if (SMESH::GetCurrentVtkView()) {
+ SMESH::RemoveFilters(); // PAL6938 -- clean all mesh entity filters
SMESH::SetPointRepresentation(false);
SMESH::SetPickable();
-
- // remove filters from viewer
- if(VTKViewer_InteractorStyleSALOME* aStyle = SMESH::GetInteractorStyle()){
- SMESH::RemoveFilter(SMESHGUI_EdgeFilter,aStyle);
- SMESH::RemoveFilter(SMESHGUI_FaceFilter,aStyle);
- }
}
-
- mySelection->ClearIObjects();
- QAD_Application::getDesktop()->SetSelectionMode(ActorSelection);
- mySelection->ClearFilters();
+
+ mySelectionMgr->clearSelected();
+ myViewWindow->SetSelectionMode(ActorSelection);
+ mySelectionMgr->clearFilters();
mySMESHGUI->ResetState();
reject();
}
-//=======================================================================
-// name : SMESHGUI_GroupDlg::onDeactivate
-// Purpose : SLOT called when dialog must be deativated
-//=======================================================================
+//=================================================================================
+// function : SMESHGUI_GroupDlg::onDeactivate
+// purpose : SLOT called when dialog must be deativated
+//=================================================================================
void SMESHGUI_GroupDlg::onDeactivate()
{
mySMESHGUI->ResetState();
- setEnabled( false );
+ setEnabled(false);
}
-//=======================================================================
-// name : SMESHGUI_GroupDlg::enterEvent
-// Purpose : Event filter
-//=======================================================================
-void SMESHGUI_GroupDlg::enterEvent( QEvent* )
+//=================================================================================
+// function : SMESHGUI_GroupDlg::enterEvent
+// purpose : Event filter
+//=================================================================================
+void SMESHGUI_GroupDlg::enterEvent (QEvent*)
{
- if ( !isEnabled() ) {
- SMESHGUI::GetSMESHGUI()->EmitSignalDeactivateDialog();
- setEnabled( true );
+ if (!isEnabled()) {
+ mySMESHGUI->EmitSignalDeactivateDialog();
+ setEnabled(true);
mySelectionMode = -1;
- setSelectionMode( myTypeId );
- mySMESHGUI->SetActiveDialogBox( (QDialog*)this ) ;
+ setSelectionMode(myTypeId);
+ //mySMESHGUI->SetActiveDialogBox((QDialog*)this);
+ mySMESHGUI->SetActiveDialogBox(this);
mySMESHGUI->SetState(800);
}
}
-//=======================================================================
-//function : hideEvent
-//purpose : caused by ESC key
-//=======================================================================
-
-void SMESHGUI_GroupDlg::hideEvent ( QHideEvent * e )
+//=================================================================================
+// function : hideEvent
+// purpose : caused by ESC key
+//=================================================================================
+void SMESHGUI_GroupDlg::hideEvent (QHideEvent*)
{
- if ( !isMinimized() )
+ if (!isMinimized())
onClose();
}
