-// SMESH SMESHGUI : GUI for SMESH component
+// 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
+// Copyright (C) 2003 CEA
//
-// 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.
//
-// 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.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
+// File : SMESHGUI_GroupDlg.cxx
+// Author : Natalia KOPNOVA, Open CASCADE S.A.S.
//
-//
-// File : SMESHGUI_GroupDlg.cxx
-// Author : Natalia KOPNOVA
-// Module : SMESH
-// $Header$
+// SMESH includes
#include "SMESHGUI_GroupDlg.h"
-#include "SMESHGUI_FilterDlg.h"
-#include "SMESHGUI_ShapeByMeshDlg.h"
#include "SMESHGUI.h"
#include "SMESHGUI_Utils.h"
#include "SMESHGUI_VTKUtils.h"
-#include "SMESHGUI_MeshUtils.h"
#include "SMESHGUI_GroupUtils.h"
#include "SMESHGUI_FilterUtils.h"
#include "SMESHGUI_GEOMGenUtils.h"
+#include "SMESHGUI_FilterDlg.h"
+#include "SMESHGUI_ShapeByMeshDlg.h"
-#include "SMESH_TypeFilter.hxx"
-#include "SMESH_Actor.h"
+#include <SMESH_TypeFilter.hxx>
+#include <SMESH_Actor.h>
+#include <SMESH_ActorUtils.h>
-#include "GEOMBase.h"
-#include "GEOM_SelectionFilter.h"
+// SALOME GEOM includes
+#include <GEOMBase.h>
+#include <GEOM_SelectionFilter.h>
-#include "SUIT_Desktop.h"
-#include "SUIT_ResourceMgr.h"
-#include "SUIT_Session.h"
-#include "SUIT_MessageBox.h"
+// SALOME GUI includes
+#include <QtxColorButton.h>
-#include "SalomeApp_Tools.h"
-#include "SalomeApp_Application.h"
-#include "SalomeApp_Study.h"
-#include "LightApp_Application.h"
-#include "SALOMEDSClient_Study.hxx"
-#include "SALOME_ListIO.hxx"
-#include "SALOME_ListIteratorOfListIO.hxx"
+#include <SUIT_Desktop.h>
+#include <SUIT_ResourceMgr.h>
+#include <SUIT_Session.h>
+#include <SUIT_MessageBox.h>
-#include "SVTK_ViewWindow.h"
-#include "SVTK_Selector.h"
+#include <SalomeApp_Tools.h>
+#include <SalomeApp_Application.h>
+#include <SalomeApp_Study.h>
+#include <LightApp_SelectionMgr.h>
-#include "utilities.h"
+#include <SALOME_ListIO.hxx>
+#include <SALOME_ListIteratorOfListIO.hxx>
-// OCCT Includes
+#include <SVTK_ViewWindow.h>
+
+// SALOME KERNEL includes
+#include <SALOMEDSClient_Study.hxx>
+
+// OCCT includes
#include <TColStd_MapOfInteger.hxx>
-// QT Includes
-#include <qbuttongroup.h>
-#include <qcursor.h>
-#include <qgroupbox.h>
-#include <qhbox.h>
-#include <qlabel.h>
-#include <qlineedit.h>
-#include <qpushbutton.h>
-#include <qtoolbutton.h>
-#include <qradiobutton.h>
-#include <qcheckbox.h>
-#include <qlayout.h>
-#include <qlistbox.h>
-#include <qimage.h>
-#include <qpixmap.h>
-#include <qmemarray.h>
-#include <qwidgetstack.h>
-
-#include <QtxIntSpinBox.h>
+// Qt includes
+#include <QButtonGroup>
+#include <QGroupBox>
+#include <QLabel>
+#include <QLineEdit>
+#include <QPushButton>
+#include <QToolButton>
+#include <QRadioButton>
+#include <QCheckBox>
+#include <QGridLayout>
+#include <QHBoxLayout>
+#include <QVBoxLayout>
+#include <QListWidget>
+#include <QStackedWidget>
+#include <QKeyEvent>
+#include <QMenu>
// STL includes
#include <vector>
#include <algorithm>
+#include <set>
-using namespace std;
+#define SPACING 6
+#define MARGIN 11
//=================================================================================
// function : SMESHGUI_GroupDlg()
// purpose :
//=================================================================================
-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 ) ),
- mySelector(SMESH::GetViewWindow( theModule )->GetSelector()),
- myIsBusy( false ),
- myActor( 0 )
+SMESHGUI_GroupDlg::SMESHGUI_GroupDlg( SMESHGUI* theModule,
+ SMESH::SMESH_Mesh_ptr theMesh )
+ : QDialog( SMESH::GetDesktop( theModule ) ),
+ mySMESHGUI( theModule ),
+ mySelectionMgr( SMESH::GetSelectionMgr( theModule ) ),
+ mySelector(SMESH::GetViewWindow( theModule )->GetSelector()),
+ myIsBusy( false ),
+ myActor( 0 )
{
- if (!name) setName("SMESHGUI_GroupDlg");
initDialog(true);
if (!theMesh->_is_nil())
init(theMesh);
// function : SMESHGUI_GroupDlg()
// purpose :
//=================================================================================
-SMESHGUI_GroupDlg::SMESHGUI_GroupDlg( SMESHGUI* theModule, const char* name,
- SMESH::SMESH_GroupBase_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 ) ),
- mySelector(SMESH::GetViewWindow( theModule )->GetSelector()),
- myIsBusy( false )
+SMESHGUI_GroupDlg::SMESHGUI_GroupDlg( SMESHGUI* theModule,
+ SMESH::SMESH_GroupBase_ptr theGroup )
+ : QDialog( SMESH::GetDesktop( theModule ) ),
+ mySMESHGUI( theModule ),
+ mySelectionMgr( SMESH::GetSelectionMgr( theModule ) ),
+ mySelector(SMESH::GetViewWindow( theModule )->GetSelector()),
+ myIsBusy( false )
{
- if (!name) setName("SMESHGUI_GroupDlg");
-
initDialog(false);
if (!theGroup->_is_nil())
init(theGroup);
//=================================================================================
void SMESHGUI_GroupDlg::initDialog(bool create)
{
+ setModal( false );
+ setAttribute( Qt::WA_DeleteOnClose, true );
+
myFilterDlg = 0;
myCreate = create;
myCurrentLineEdit = 0;
QPixmap image0 (SMESH::GetResourceMgr( mySMESHGUI )->loadPixmap("SMESH", tr("ICON_SELECT")));
- if (create) {
- setCaption(tr("SMESH_CREATE_GROUP_TITLE"));
- myHelpFileName = "/files/creating_groups.htm";
- }
- else {
- setCaption(tr("SMESH_EDIT_GROUP_TITLE"));
- myHelpFileName = "/files/editing_groups.htm";
- }
+ setWindowTitle(create ? tr("SMESH_CREATE_GROUP_TITLE") : tr("SMESH_EDIT_GROUP_TITLE"));
+ myHelpFileName = create ? "creating_groups_page.html" : "editing_groups_page.html";
- setSizeGripEnabled(TRUE);
+ setSizeGripEnabled(true);
- QGridLayout* aMainLayout = new QGridLayout(this, 7, 3, 11, 6);
+ QGridLayout* aMainLayout = new QGridLayout(this);
+ aMainLayout->setMargin( MARGIN );
+ aMainLayout->setSpacing( SPACING );
/***************************************************************/
- QLabel* meshGroupLab = new QLabel(this, "mesh/group label");
- if (create)
- meshGroupLab->setText(tr("SMESH_MESH"));
- else
- meshGroupLab->setText(tr("SMESH_GROUP"));
- myMeshGroupBtn = new QPushButton(this, "mesh/group button");
- myMeshGroupBtn->setPixmap(image0);
- myMeshGroupLine = new QLineEdit(this, "mesh/group line");
+ QLabel* meshGroupLab = new QLabel(create ? tr("SMESH_MESH") : tr("SMESH_GROUP"), this);
+ myMeshGroupBtn = new QPushButton(this);
+ myMeshGroupBtn->setIcon(image0);
+ myMeshGroupLine = new QLineEdit(this);
myMeshGroupLine->setReadOnly(true);
/***************************************************************/
- myTypeGroup = new QButtonGroup(1, Qt::Vertical, this, "Group types");
- myTypeGroup->setTitle(tr("SMESH_ELEMENTS_TYPE"));
- myTypeGroup->setExclusive(true);
+ QGroupBox* aTypeBox = new QGroupBox(tr("SMESH_ELEMENTS_TYPE"), this);
+ myTypeGroup = new QButtonGroup(this);
+ QHBoxLayout* aTypeBoxLayout = new QHBoxLayout( aTypeBox );
+ aTypeBoxLayout->setMargin( MARGIN );
+ aTypeBoxLayout->setSpacing( SPACING );
QStringList types;
types.append(tr("MESH_NODE"));
types.append(tr("SMESH_VOLUME"));
QRadioButton* rb;
for (int i = 0; i < types.count(); i++) {
- rb = new QRadioButton(types[i], myTypeGroup);
+ rb = new QRadioButton(types[i], aTypeBox);
+ myTypeGroup->addButton(rb, i);
+ aTypeBoxLayout->addWidget( rb );
}
- myTypeGroup->setEnabled(create);
+ aTypeBox->setEnabled(create);
myTypeId = -1;
/***************************************************************/
- QLabel* aName = new QLabel(this, "name label");
- aName->setText(tr("SMESH_NAME"));
- aName->setMinimumSize(50,0);
- myName = new QLineEdit(this, "name");
+ QLabel* aName = new QLabel(tr("SMESH_NAME"), this);
+ aName->setMinimumWidth(50);
+ myName = new QLineEdit(this);
/***************************************************************/
- myGrpTypeGroup = new QButtonGroup(1, Qt::Vertical, this, "Type of group");
- myGrpTypeGroup->setTitle(tr("SMESH_GROUP_TYPE"));
- myGrpTypeGroup->setExclusive(true);
- QRadioButton* rb1 = new QRadioButton( tr("SMESH_GROUP_STANDALONE"), myGrpTypeGroup);
- QRadioButton* rb2 = new QRadioButton( tr("SMESH_GROUP_GEOMETRY"), myGrpTypeGroup);
- myGrpTypeGroup->setEnabled(create);
+ QGroupBox* aGrpTypeBox = new QGroupBox(tr("SMESH_GROUP_TYPE"), this);
+ myGrpTypeGroup = new QButtonGroup(this);
+ QHBoxLayout* aGrpTypeBoxLayout = new QHBoxLayout( aGrpTypeBox );
+ aGrpTypeBoxLayout->setMargin( MARGIN );
+ aGrpTypeBoxLayout->setSpacing( SPACING );
+
+ QRadioButton* rb1 = new QRadioButton( tr("SMESH_GROUP_STANDALONE"), aGrpTypeBox);
+ QRadioButton* rb2 = new QRadioButton( tr("SMESH_GROUP_GEOMETRY"), aGrpTypeBox);
+ myGrpTypeGroup->addButton(rb1, 0);
+ myGrpTypeGroup->addButton(rb2, 1);
+ aGrpTypeBoxLayout->addWidget(rb1);
+ aGrpTypeBoxLayout->addWidget(rb2);
+ aGrpTypeBox->setEnabled(create);
myGrpTypeId = -1;
/***************************************************************/
- myWGStack = new QWidgetStack( this, "widget stack");
- QWidget* wg1 = new QFrame( myWGStack, "first widget" );
- QWidget* wg2 = new QFrame( myWGStack, "second widget" );
+ myWGStack = new QStackedWidget(this);
+ QWidget* wg1 = new QWidget( myWGStack );
+ QWidget* wg2 = new QWidget( myWGStack );
/***************************************************************/
- QGroupBox* aContentBox = new QGroupBox(1, Qt::Horizontal, wg1, "content box");
- aContentBox->setTitle(tr("SMESH_CONTENT"));
- QFrame* aContent = new QFrame(aContentBox, "content");
- QGridLayout* aLayout = new QGridLayout(aContent, 7, 4);
- aLayout->setSpacing(6);
- aLayout->setAutoAdd(false);
-
- QLabel* aLabel = new QLabel(aContent, "elements label");
- aLabel->setText(tr("SMESH_ID_ELEMENTS"));
- myElements = new QListBox(aContent, "elements list");
- myElements->setSelectionMode(QListBox::Extended);
-
- myFilter = new QPushButton(aContent, "filter");
- myFilter->setText(tr("SMESH_BUT_FILTER"));
- QPushButton* aAddBtn = new QPushButton(aContent, "add");
- aAddBtn->setText(tr("SMESH_BUT_ADD"));
- QPushButton* aRemoveBtn = new QPushButton(aContent, "remove");
- aRemoveBtn->setText(tr("SMESH_BUT_REMOVE"));
- QPushButton* aSortBtn = new QPushButton(aContent, "sort");
- aSortBtn->setText(tr("SMESH_BUT_SORT"));
-
- aLayout->addWidget(aLabel, 0, 0);
- aLayout->addMultiCellWidget(myElements, 1, 6, 0, 0);
- aLayout->addWidget(myFilter, 1, 2);
- aLayout->addWidget(aAddBtn, 3, 2);
- aLayout->addWidget(aRemoveBtn, 4, 2);
- aLayout->addWidget(aSortBtn, 6, 2);
-
- aLayout->setColStretch(0, 1);
- aLayout->addColSpacing(1, 20);
- aLayout->addColSpacing(3, 20);
- aLayout->setRowStretch(2, 1);
- aLayout->setRowStretch(5, 1);
+ QGroupBox* aContentBox = new QGroupBox(tr("SMESH_CONTENT"), wg1);
+ QGridLayout* aContentBoxLayout = new QGridLayout(aContentBox);
+ aContentBoxLayout->setMargin(MARGIN);
+ aContentBoxLayout->setSpacing(SPACING);
+
+ QLabel* aLabel = new QLabel(tr("SMESH_ID_ELEMENTS"), aContentBox);
+ myElements = new QListWidget(aContentBox);
+ myElements->setSelectionMode(QListWidget::ExtendedSelection);
+
+ myFilter = new QPushButton(tr("SMESH_BUT_FILTER"), aContentBox);
+ QPushButton* aAddBtn = new QPushButton(tr("SMESH_BUT_ADD"), aContentBox);
+ QPushButton* aRemoveBtn = new QPushButton(tr("SMESH_BUT_REMOVE"), aContentBox);
+ QPushButton* aSortBtn = new QPushButton(tr("SMESH_BUT_SORT"), aContentBox);
+
+ aContentBoxLayout->addWidget(aLabel, 0, 0);
+ aContentBoxLayout->addWidget(myElements, 1, 0, 6, 1);
+ aContentBoxLayout->addWidget(myFilter, 1, 1);
+ aContentBoxLayout->addWidget(aAddBtn, 3, 1);
+ aContentBoxLayout->addWidget(aRemoveBtn, 4, 1);
+ aContentBoxLayout->addWidget(aSortBtn, 6, 1);
+
+ aContentBoxLayout->setColumnStretch(0, 1);
+ aContentBoxLayout->setRowStretch(2, 1);
+ aContentBoxLayout->setRowStretch(5, 1);
/***************************************************************/
- 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);
- mySubMeshBtn = new QPushButton(aSelectBox, "submesh button");
- mySubMeshBtn->setText("");
- mySubMeshBtn->setPixmap(image0);
- mySubMeshLine = new QLineEdit(aSelectBox, "submesh line");
+ QGroupBox* aSelectBox = new QGroupBox(tr("SMESH_SELECT_FROM"), wg1);
+ QGridLayout* aSelectBoxLayout = new QGridLayout(aSelectBox);
+ aSelectBoxLayout->setMargin(MARGIN);
+ aSelectBoxLayout->setSpacing(SPACING);
+
+ mySelectSubMesh = new QCheckBox(tr("SMESH_SUBMESH"), aSelectBox);
+ mySubMeshBtn = new QPushButton(aSelectBox);
+ mySubMeshBtn->setIcon(image0);
+ mySubMeshLine = new QLineEdit(aSelectBox);
mySubMeshLine->setReadOnly(true);
onSelectSubMesh(false);
- mySelectGroup = new QCheckBox(aSelectBox, "group checkbox");
- mySelectGroup->setText(tr("SMESH_GROUP"));
- mySelectGroup->setMinimumSize(50, 0);
- myGroupBtn = new QPushButton(aSelectBox, "group button");
- myGroupBtn->setText("");
- myGroupBtn->setPixmap(image0);
- myGroupLine = new QLineEdit(aSelectBox, "group line");
+ mySelectGroup = new QCheckBox(tr("SMESH_GROUP"), aSelectBox);
+ myGroupBtn = new QPushButton(aSelectBox);
+ myGroupBtn->setIcon(image0);
+ myGroupLine = new QLineEdit(aSelectBox);
myGroupLine->setReadOnly(true);
onSelectGroup(false);
-
+
+ aSelectBoxLayout->addWidget(mySelectSubMesh, 0, 0);
+ aSelectBoxLayout->addWidget(mySubMeshBtn, 0, 1);
+ aSelectBoxLayout->addWidget(mySubMeshLine, 0, 2);
+ aSelectBoxLayout->addWidget(mySelectGroup, 1, 0);
+ aSelectBoxLayout->addWidget(myGroupBtn, 1, 1);
+ aSelectBoxLayout->addWidget(myGroupLine, 1, 2);
+
/***************************************************************/
- QGridLayout* wg1Layout = new QGridLayout( wg1, 3, 1, 0, 6 );
- wg1Layout->addWidget(aContentBox, 0, 0);
- wg1Layout->addWidget(aSelectBox, 1, 0);
- wg1Layout->setRowStretch(2, 5);
+ QVBoxLayout* wg1Layout = new QVBoxLayout(wg1);
+ wg1Layout->setMargin(0);
+ wg1Layout->setSpacing(SPACING);
+ wg1Layout->addWidget(aContentBox);
+ wg1Layout->addWidget(aSelectBox);
+ wg1Layout->setStretchFactor(aContentBox, 10);
/***************************************************************/
- QLabel* geomObject = new QLabel(wg2, "geometry object label");
- geomObject->setText(tr("SMESH_OBJECT_GEOM"));
- myGeomGroupBtn = new QToolButton(wg2, "geometry group button");
- myGeomGroupBtn->setIconSet( QIconSet(image0) );
- myGeomGroupBtn->setToggleButton(true);
- myGeomGroupLine = new QLineEdit(wg2, "geometry group line");
+ QLabel* geomObject = new QLabel(tr("SMESH_OBJECT_GEOM"), wg2);
+ myGeomGroupBtn = new QToolButton(wg2);
+ myGeomGroupBtn->setIcon(image0);
+ myGeomGroupBtn->setCheckable(true);
+ myGeomGroupLine = new QLineEdit(wg2);
myGeomGroupLine->setReadOnly(true); //VSR ???
onSelectGeomGroup(false);
-
- if (!create)
- {
- myGeomGroupBtn->setEnabled(false);
- myGeomGroupLine->setEnabled(false);
- }
-
+
+ myGeomGroupBtn->setEnabled(create);
+ myGeomGroupLine->setEnabled(create);
+
/***************************************************************/
- QGridLayout* wg2Layout = new QGridLayout( wg2, 2, 3, 0, 6 );
+ QGridLayout* wg2Layout = new QGridLayout( wg2 );
+ wg2Layout->setMargin(0);
+ wg1Layout->setSpacing(SPACING);
wg2Layout->addWidget(geomObject, 0, 0);
wg2Layout->addWidget(myGeomGroupBtn, 0, 1);
wg2Layout->addWidget(myGeomGroupLine,0, 2);
wg2Layout->setRowStretch(1, 5);
/***************************************************************/
- QVBoxLayout* dumb = new QVBoxLayout(myWGStack);
- dumb->addWidget(wg1);
- dumb->addWidget(wg2);
- myWGStack->addWidget( wg1, myGrpTypeGroup->id(rb1) );
- myWGStack->addWidget( wg2, myGrpTypeGroup->id(rb2) );
+ myWGStack->insertWidget( 0, wg1 );
+ myWGStack->insertWidget( 1, wg2 );
/***************************************************************/
- QGroupBox* aColorBox = new QGroupBox(2, Qt::Horizontal, this, "color box");
- aColorBox->setTitle(tr("SMESH_SET_COLOR"));
-
- mySelectColorGroup = new QCheckBox(aColorBox, "color checkbox");
- mySelectColorGroup->setText(tr("SMESH_CHECK_COLOR"));
-
- myColorSpinBox = new QtxIntSpinBox( aColorBox );
- myColorSpinBox->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
- myColorSpinBox->setMinValue( 0 );
- myColorSpinBox->setMaxValue( 9999 );
-
- onSelectColorGroup(false);
-
+ QGroupBox* aColorBox = new QGroupBox(tr("SMESH_SET_COLOR"), this);
+ QHBoxLayout* aColorBoxLayout = new QHBoxLayout(aColorBox);
+ aColorBoxLayout->setMargin(MARGIN);
+ aColorBoxLayout->setSpacing(SPACING);
+
+ QLabel* aColorLab = new QLabel(tr("SMESH_CHECK_COLOR"), aColorBox );
+ myColorBtn = new QtxColorButton(aColorBox);
+ myColorBtn->setSizePolicy( QSizePolicy::MinimumExpanding,
+ myColorBtn->sizePolicy().verticalPolicy() );
+
+ aColorBoxLayout->addWidget(aColorLab);
+ aColorBoxLayout->addWidget(myColorBtn);
+
/***************************************************************/
-
- QFrame* aButtons = new QFrame(this, "button box");
- aButtons->setFrameStyle(QFrame::Box | QFrame::Sunken);
- QHBoxLayout* aBtnLayout = new QHBoxLayout(aButtons, 11, 6);
- aBtnLayout->setAutoAdd(false);
-
- QPushButton* aOKBtn = new QPushButton(aButtons, "ok");
- aOKBtn->setText(tr("SMESH_BUT_OK"));
- aOKBtn->setAutoDefault(true);
- aOKBtn->setDefault(true);
- QPushButton* aApplyBtn = new QPushButton(aButtons, "apply");
- aApplyBtn->setText(tr("SMESH_BUT_APPLY"));
- aApplyBtn->setAutoDefault(true);
- QPushButton* aCloseBtn = new QPushButton(aButtons, "close");
- aCloseBtn->setText(tr("SMESH_BUT_CLOSE"));
- aCloseBtn->setAutoDefault(true);
- QPushButton* aHelpBtn = new QPushButton(aButtons, "help");
- aHelpBtn->setText(tr("SMESH_BUT_HELP"));
- aHelpBtn->setAutoDefault(true);
-
- aBtnLayout->addWidget(aOKBtn);
- aBtnLayout->addWidget(aApplyBtn);
+
+ QFrame* aButtons = new QFrame(this);
+ aButtons->setFrameStyle( QFrame::Box | QFrame::Sunken );
+ QHBoxLayout* aBtnLayout = new QHBoxLayout(aButtons);
+ aBtnLayout->setMargin(MARGIN);
+ aBtnLayout->setSpacing(SPACING);
+
+ myOKBtn = new QPushButton(tr("SMESH_BUT_OK"), aButtons);
+ myOKBtn->setAutoDefault(true);
+ myOKBtn->setDefault(true);
+ myApplyBtn = new QPushButton(tr("SMESH_BUT_APPLY"), aButtons);
+ myApplyBtn->setAutoDefault(true);
+ myCloseBtn = new QPushButton(tr("SMESH_BUT_CLOSE"), aButtons);
+ myCloseBtn->setAutoDefault(true);
+ myHelpBtn = new QPushButton(tr("SMESH_BUT_HELP"), aButtons);
+ myHelpBtn->setAutoDefault(true);
+
+ aBtnLayout->addWidget(myOKBtn);
+ aBtnLayout->addSpacing(10);
+ aBtnLayout->addWidget(myApplyBtn);
+ aBtnLayout->addSpacing(10);
aBtnLayout->addStretch();
- aBtnLayout->addWidget(aCloseBtn);
- aBtnLayout->addWidget(aHelpBtn);
+ aBtnLayout->addWidget(myCloseBtn);
+ aBtnLayout->addWidget(myHelpBtn);
/***************************************************************/
aMainLayout->addWidget(meshGroupLab, 0, 0);
aMainLayout->addWidget(myMeshGroupBtn, 0, 1);
aMainLayout->addWidget(myMeshGroupLine, 0, 2);
- aMainLayout->addMultiCellWidget(myTypeGroup, 1, 1, 0, 2);
- aMainLayout->addWidget(aName, 2, 0);
- aMainLayout->addWidget(myName, 2, 2);
- aMainLayout->addMultiCellWidget(myGrpTypeGroup, 3, 3, 0, 2);
- aMainLayout->addMultiCellWidget(myWGStack, 4, 4, 0, 2);
- aMainLayout->setRowStretch( 5, 5 );
- aMainLayout->addMultiCellWidget(aColorBox, 6, 6, 0, 2);
- aMainLayout->addMultiCellWidget(aButtons, 7, 7, 0, 2);
+ aMainLayout->addWidget(aTypeBox, 1, 0, 1, 3);
+ aMainLayout->addWidget(aName, 2, 0);
+ aMainLayout->addWidget(myName, 2, 2);
+ aMainLayout->addWidget(aGrpTypeBox, 3, 0, 1, 3);
+ aMainLayout->addWidget(myWGStack, 4, 0, 1, 3);
+ aMainLayout->addWidget(aColorBox, 5, 0, 1, 3);
+ aMainLayout->addWidget(aButtons, 6, 0, 1, 3);
/* signals and slots connections */
- connect(myMeshGroupBtn, SIGNAL(clicked()), this, SLOT(setCurrentSelection()));
-
- connect(myGrpTypeGroup, SIGNAL(clicked(int)), this, SLOT(onGrpTypeChanged(int)));
-
- connect(myTypeGroup, SIGNAL(clicked(int)), this, SLOT(onTypeChanged(int)));
+ connect(myMeshGroupBtn, SIGNAL(clicked()), this, SLOT(setCurrentSelection()));
+ connect(myGrpTypeGroup, SIGNAL(buttonClicked(int)), this, SLOT(onGrpTypeChanged(int)));
+ connect(myTypeGroup, SIGNAL(buttonClicked(int)), this, SLOT(onTypeChanged(int)));
- connect(myName, SIGNAL(textChanged(const QString&)), this, SLOT(onNameChanged(const QString&)));
- connect(myElements, SIGNAL(selectionChanged()), this, SLOT(onListSelectionChanged()));
+ connect(myName, SIGNAL(textChanged(const QString&)), this, SLOT(onNameChanged(const QString&)));
+ connect(myElements, SIGNAL(itemSelectionChanged()), this, SLOT(onListSelectionChanged()));
- connect(myFilter, SIGNAL(clicked()), this, SLOT(setFilters()));
- connect(aAddBtn, SIGNAL(clicked()), this, SLOT(onAdd()));
+ connect(myFilter, SIGNAL(clicked()), this, SLOT(setFilters()));
+ connect(aAddBtn, SIGNAL(clicked()), this, SLOT(onAdd()));
connect(aRemoveBtn, SIGNAL(clicked()), this, SLOT(onRemove()));
- connect(aSortBtn, SIGNAL(clicked()), this, SLOT(onSort()));
+ connect(aSortBtn, SIGNAL(clicked()), this, SLOT(onSort()));
connect(mySelectSubMesh, SIGNAL(toggled(bool)), this, SLOT(onSelectSubMesh(bool)));
- connect(mySelectGroup, SIGNAL(toggled(bool)), this, SLOT(onSelectGroup(bool)));
- connect(mySubMeshBtn, SIGNAL(clicked()), this, SLOT(setCurrentSelection()));
- connect(myGroupBtn, SIGNAL(clicked()), this, SLOT(setCurrentSelection()));
- connect(myGeomGroupBtn, SIGNAL(toggled(bool)), this, SLOT(onGeomSelectionButton(bool)));
- connect(mySelectColorGroup, SIGNAL(toggled(bool)), this, SLOT(onSelectColorGroup(bool)));
- connect(myColorSpinBox, SIGNAL(valueChanged(const QString&)), this, SLOT(onNbColorsChanged(const QString&)));
-
- connect(aOKBtn, SIGNAL(clicked()), this, SLOT(onOK()));
- connect(aApplyBtn, SIGNAL(clicked()), this, SLOT(onApply()));
- connect(aCloseBtn, SIGNAL(clicked()), this, SLOT(onClose()));
- connect(aHelpBtn, SIGNAL(clicked()), this, SLOT(onHelp()));
+ connect(mySelectGroup, SIGNAL(toggled(bool)), this, SLOT(onSelectGroup(bool)));
+ connect(mySubMeshBtn, SIGNAL(clicked()), this, SLOT(setCurrentSelection()));
+ connect(myGroupBtn, SIGNAL(clicked()), this, SLOT(setCurrentSelection()));
+ connect(myGeomGroupBtn, SIGNAL(toggled(bool)), this, SLOT(onGeomSelectionButton(bool)));
+
+ connect(myOKBtn, SIGNAL(clicked()), this, SLOT(onOK()));
+ connect(myApplyBtn, SIGNAL(clicked()), this, SLOT(onApply()));
+ connect(myCloseBtn, SIGNAL(clicked()), this, SLOT(onClose()));
+ connect(myHelpBtn, SIGNAL(clicked()), this, SLOT(onHelp()));
/* Init selection */
mySMESHGUI->SetActiveDialogBox(this);
myGroupFilter = new SMESH_TypeFilter(GROUP);
SalomeApp_Study* aStudy = dynamic_cast<SalomeApp_Study*>( mySMESHGUI->application()->activeStudy() );
myGeomFilter = new GEOM_SelectionFilter( aStudy, true );
-
+
connect(mySMESHGUI, SIGNAL(SignalDeactivateActiveDialog()), this, SLOT(onDeactivate()));
- connect(mySMESHGUI, SIGNAL(SignalCloseAllDialogs()), this, SLOT(onClose()));
- connect(mySelectionMgr, SIGNAL(currentSelectionChanged()), this, SLOT(onObjectSelectionChanged()));
+ connect(mySMESHGUI, SIGNAL(SignalCloseAllDialogs()), this, SLOT(onClose()));
+ connect(mySelectionMgr, SIGNAL(currentSelectionChanged()), this, SLOT(onObjectSelectionChanged()));
- myGrpTypeGroup->setButton(myGrpTypeGroup->id(rb1)); // VSR !!!
- onGrpTypeChanged(myGrpTypeGroup->id(rb1)); // VSR!!!
+ rb1->setChecked(true); // VSR !!!
+ onGrpTypeChanged(0); // VSR!!!
if (myMesh->_is_nil() )
- myTypeGroup->setButton(0);
+ myTypeGroup->button(0)->setChecked(true);
updateButtons();
+ //myName->setText(GetDefaultName(tr("SMESH_GROUP")));
}
//=================================================================================
SMESHGUI_GroupDlg::~SMESHGUI_GroupDlg()
{
// no need to delete child widgets, Qt does it all for us
- if ( myFilterDlg != 0 )
- {
- myFilterDlg->reparent( 0, QPoint() );
+ if ( myFilterDlg != 0 ) {
+ myFilterDlg->setParent( 0 );
delete myFilterDlg;
}
}
+//=================================================================================
+// function : GetDefaultName()
+// purpose : Get the Group Name if Create new Group
+//=================================================================================
+QString SMESHGUI_GroupDlg::GetDefaultName(const QString& theOperation)
+{
+ QString aName = "";
+
+ // collect all object names of SMESH component
+ SalomeApp_Study* appStudy =
+ dynamic_cast<SalomeApp_Study*>( SUIT_Session::session()->activeApplication()->activeStudy() );
+ if ( !appStudy ) return aName;
+ _PTR(Study) aStudy = appStudy->studyDS();
+
+ std::set<std::string> aSet;
+ _PTR(SComponent) aMeshCompo (aStudy->FindComponent("SMESH"));
+ if (aMeshCompo) {
+ _PTR(ChildIterator) it (aStudy->NewChildIterator(aMeshCompo));
+ _PTR(SObject) obj;
+ for (it->InitEx(true); it->More(); it->Next()) {
+ obj = it->Value();
+ aSet.insert(obj->GetName());
+ }
+ }
+
+ // build a unique name
+ int aNumber = 0;
+ bool isUnique = false;
+ while (!isUnique) {
+ aName = theOperation + "_" + QString::number(++aNumber);
+ isUnique = (aSet.count(aName.toLatin1().data()) == 0);
+ }
+
+ return aName;
+}
+
//=================================================================================
// function : Init()
// purpose :
myActor = SMESH::FindActorByObject(myMesh);
SMESH::SetPickable(myActor);
+ setDefaultGroupColor();
+
SALOME_ListIO aList;
mySelectionMgr->selectedObjects( aList );
if( !aList.IsEmpty() )
{
QString aName = aList.First()->getName();
- myMeshGroupLine->setText(aName) ;
+ myMeshGroupLine->setText(aName);
myMeshGroupLine->home( false );
}
myCurrentLineEdit = 0;
- myTypeGroup->setButton(0);
+ myTypeGroup->button(0)->setChecked(true);
onTypeChanged(0);
}
void SMESHGUI_GroupDlg::init (SMESH::SMESH_GroupBase_ptr theGroup)
{
myMesh = theGroup->GetMesh();
-
+
myName->setText(theGroup->GetName());
myName->home(false);
+ myOldName = myName->text();
+
+ SALOMEDS::Color aColor = theGroup->GetColor();
+ setGroupColor( aColor );
- myColorSpinBox->setValue( theGroup->GetColorNumber() );
-
myMeshGroupLine->setText(theGroup->GetName());
int aType = 0;
case SMESH::FACE: aType = 2; break;
case SMESH::VOLUME: aType = 3; break;
}
- myTypeGroup->setButton(aType);
-
+ myTypeGroup->button(aType)->setChecked(true);
+
myGroup = SMESH::SMESH_Group::_narrow( theGroup );
if ( !myGroup->_is_nil() )
myActor = SMESH::FindActorByObject(myGroup);
SMESH::SetPickable(myActor);
- myGrpTypeGroup->setButton(0);
+ myGrpTypeGroup->button(0)->setChecked(true);
onGrpTypeChanged(0);
-
+
myCurrentLineEdit = 0;
myElements->clear();
setSelectionMode(aType);
myTypeId = aType;
-
+
myIdList.clear();
if (!myGroup->IsEmpty()) {
SMESH::long_array_var anElements = myGroup->GetListOfID();
int k = anElements->length();
for (int i = 0; i < k; i++) {
myIdList.append(anElements[i]);
- myElements->insertItem(QString::number(anElements[i]));
+ myElements->addItem(QString::number(anElements[i]));
}
- myElements->selectAll(true);
+ myElements->selectAll();
}
}
else
{
myGroupOnGeom = SMESH::SMESH_GroupOnGeom::_narrow( theGroup );
-
+
if ( !myGroupOnGeom->_is_nil() )
{
myActor = SMESH::FindActorByObject(myMesh);
myActor = SMESH::FindActorByObject(myGroup);
SMESH::SetPickable(myActor);
- myGrpTypeGroup->setButton(1);
+ myGrpTypeGroup->button(1)->setChecked(true);
onGrpTypeChanged(1);
-
+
QString aShapeName("");
_PTR(Study) aStudy = SMESH::GetActiveStudyDocument();
GEOM::GEOM_Object_var aGroupShape = myGroupOnGeom->GetShape();
aShapeName = aGroupShapeSO->GetName().c_str();
}
myGeomGroupLine->setText( aShapeName );
+ myName->setText("Group On " + aShapeName);
}
}
}
//=================================================================================
void SMESHGUI_GroupDlg::updateButtons()
{
- bool enable = !myName->text().stripWhiteSpace().isEmpty();
+ bool enable = !myName->text().trimmed().isEmpty();
if (myGrpTypeId == 0) {
enable = enable && myElements->count() > 0;
}
}
- QPushButton* aBtn;
- aBtn = (QPushButton*) child("ok", "QPushButton");
- if (aBtn) aBtn->setEnabled(enable);
- aBtn = (QPushButton*) child("apply", "QPushButton");
- if (aBtn) aBtn->setEnabled(enable);
+ myOKBtn->setEnabled(enable);
+ myApplyBtn->setEnabled(enable);
}
//=================================================================================
updateButtons();
}
-//=================================================================================
-// function : onNbColorsChanged()
-// purpose :
-//=================================================================================
-void SMESHGUI_GroupDlg::onNbColorsChanged (const QString& text)
-{
- updateButtons();
-}
-
//=================================================================================
// function : onTypeChanged()
// purpose : Group elements type radio button management
void SMESHGUI_GroupDlg::onGrpTypeChanged (int id)
{
if (myGrpTypeId != id) {
- myWGStack->raiseWidget( id );
+ myWGStack->setCurrentIndex( id );
+ if (id == 0)
+ myName->setText(myOldName);
onSelectGeomGroup(id == 1);
}
myGrpTypeId = id;
mySelectionMgr->installFilter(myMeshFilter);
else if (theMode == 7)
mySelectionMgr->installFilter(myGeomFilter);
-
+
if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
aViewWindow->SetSelectionMode(ActorSelection);
}
mySelectionMode = theMode;
- }
+ }
}
//=================================================================================
if (mySMESHGUI->isActiveStudyLocked())
return false;
- if (myName->text().stripWhiteSpace().isEmpty())
+ if (myName->text().trimmed().isEmpty())
return false;
if (myGrpTypeId == 0) { // on mesh elements
SMESH::long_array_var anIdList = new SMESH::long_array;
int i, k = myElements->count();
anIdList->length(k);
- QListBoxItem* anItem;
- for (i = 0, anItem = myElements->firstItem(); anItem != 0; i++, anItem = anItem->next()) {
- anIdList[i] = anItem->text().toInt();
+ for (i = 0; i < k; i++) {
+ anIdList[i] = myElements->item(i)->text().toInt();
}
myGroup = SMESH::AddGroup(myMesh, aType, myName->text());
myGroup->Add(anIdList.inout());
- int aColorNumber = myColorSpinBox->value();
- myGroup->SetColorNumber(aColorNumber);
+ SALOMEDS::Color aColor = getGroupColor();
+ myGroup->SetColor(aColor);
_PTR(SObject) aMeshGroupSO = SMESH::FindSObject(myGroup);
- SMESH::setFileName ( aMeshGroupSO, QString::number(myColorSpinBox->value()) );
+ //SMESH::setFileName ( aMeshGroupSO, QString::number(myColorSpinBox->value()) );
SMESH::setFileType ( aMeshGroupSO, "COULEURGROUP" );
/* init for next operation */
myName->setText("");
- myColorSpinBox->setValue(0);
myElements->clear();
myGroup = SMESH::SMESH_Group::_nil();
} else { // edition
- myGroup->SetName(myName->text());
-
- int aColorNumber = myColorSpinBox->value();
- myGroup->SetColorNumber(aColorNumber);
-
- 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())
+ myGroup->SetName(myName->text().toLatin1().data());
+
+ SALOMEDS::Color aColor = getGroupColor();
+ myGroup->SetColor(aColor);
+
+ _PTR(SObject) aMeshGroupSO = SMESH::FindSObject(myGroup);
+ if(SMESH_Actor *anActor = SMESH::FindActorByEntry(aMeshGroupSO->GetID().c_str()))
+ anActor->SetSufaceColor( aColor.R, aColor.G, aColor.B );
+
+ QList<int> aAddList;
+
+ int i, total = myElements->count();
+ for (i = 0; i < total; i++) {
+ int anId = myElements->item(i)->text().toInt();
+ int idx = myIdList.indexOf(anId);
+ if ( idx == -1 )
aAddList.append(anId);
else
- myIdList.remove(anIt);
+ myIdList.removeAt(idx);
}
if (!aAddList.empty()) {
SMESH::long_array_var anIdList = new SMESH::long_array;
- anIdList->length(aAddList.count());
- int i;
- for (i = 0, anIt = aAddList.begin(); anIt != aAddList.end(); anIt++, i++)
- anIdList[i] = *anIt;
+ int added = aAddList.count();
+ anIdList->length(added);
+ for (i = 0; i < added; i++)
+ anIdList[i] = aAddList[i];
myGroup->Add(anIdList.inout());
}
if (!myIdList.empty()) {
SMESH::long_array_var anIdList = new SMESH::long_array;
- anIdList->length(myIdList.count());
- int i;
- for (i = 0, anIt = myIdList.begin(); anIt != myIdList.end(); anIt++, i++)
- anIdList[i] = *anIt;
+ int removed = myIdList.count();
+ anIdList->length(removed);
+ for (i = 0; i < removed; i++)
+ anIdList[i] = myIdList[i];
myGroup->Remove(anIdList.inout());
}
/* init for next operation */
myIdList.clear();
- for (anItem = myElements->firstItem(); anItem != 0; anItem = anItem->next())
- myIdList.append(anItem->text().toInt());
+ for (i = 0; i < total; i++) {
+ myIdList.append(myElements->item(i)->text().toInt());
+ }
}
mySMESHGUI->updateObjBrowser(true);
SMESH::GetGEOMGen()->GetIGroupOperations(aStudy->StudyId());
if (myGeomObjects->length() == 1) {
- myGroupOnGeom = myMesh->CreateGroupFromGEOM(aType, myName->text(),myGeomObjects[0]);
+ myGroupOnGeom = myMesh->CreateGroupFromGEOM(aType,
+ myName->text().toLatin1().data(),
+ myGeomObjects[0]);
}
else {
SMESH::SMESH_Gen_var aSMESHGen = SMESHGUI::GetSMESHGen();
QString aNewGeomGroupName ("Auto_group_for_");
aNewGeomGroupName += myName->text();
SALOMEDS::SObject_var aNewGroupSO =
- geomGen->AddInStudy(aSMESHGen->GetCurrentStudy(), aGroupVar, aNewGeomGroupName, aMeshShape);
+ geomGen->AddInStudy(aSMESHGen->GetCurrentStudy(), aGroupVar,
+ aNewGeomGroupName.toLatin1().data(), aMeshShape);
}
- myGroupOnGeom = myMesh->CreateGroupFromGEOM(aType, myName->text(), aGroupVar);
+ myGroupOnGeom = myMesh->CreateGroupFromGEOM(aType,
+ myName->text().toLatin1().data(),
+ aGroupVar);
}
- int aColorNumber = myColorSpinBox->value();
- myGroupOnGeom->SetColorNumber(aColorNumber);
+ SALOMEDS::Color aColor = getGroupColor();
+ myGroupOnGeom->SetColor(aColor);
_PTR(SObject) aMeshGroupSO = SMESH::FindSObject(myGroupOnGeom);
- SMESH::setFileName ( aMeshGroupSO, QString::number(myColorSpinBox->value()) );
-
+ //SMESH::setFileName ( aMeshGroupSO, QString::number(myColorSpinBox->value()) );
SMESH::setFileType ( aMeshGroupSO,"COULEURGROUP" );
/* init for next operation */
myName->setText("");
- myColorSpinBox->setValue(0);
myGroupOnGeom = SMESH::SMESH_GroupOnGeom::_nil();
}
else { // edition
- myGroupOnGeom->SetName(myName->text());
+ myGroupOnGeom->SetName(myName->text().toLatin1().data());
+
+ SALOMEDS::Color aColor = getGroupColor();
+ myGroupOnGeom->SetColor(aColor);
- int aColorNumber = myColorSpinBox->value();
- myGroupOnGeom->SetColorNumber(aColorNumber);
+ _PTR(SObject) aMeshGroupSO = SMESH::FindSObject(myGroupOnGeom);
+ if(SMESH_Actor *anActor = SMESH::FindActorByEntry(aMeshGroupSO->GetID().c_str()))
+ anActor->SetSufaceColor( aColor.R, aColor.G, aColor.B );
}
mySMESHGUI->updateObjBrowser(true);
if (myCurrentLineEdit == 0) {
mySelectionMgr->clearSelected();
TColStd_MapOfInteger aIndexes;
- QListBoxItem* anItem;
- for (anItem = myElements->firstItem(); anItem != 0; anItem = anItem->next()) {
- if (anItem->isSelected()) {
- int anId = anItem->text().toInt();
- aIndexes.Add(anId);
- }
- }
+ QList<QListWidgetItem*> selItems = myElements->selectedItems();
+ QListWidgetItem* anItem;
+ foreach(anItem, selItems) aIndexes.Add(anItem->text().toInt());
mySelector->AddOrRemoveIndex(myActor->getIO(), aIndexes, false);
SALOME_ListIO aList;
aList.Append(myActor->getIO());
void SMESHGUI_GroupDlg::onObjectSelectionChanged()
{
if ( myIsBusy || !isEnabled()) return;
- if (myCurrentLineEdit == myGeomGroupLine && !myGeomGroupBtn->isOn()) return;
+ if (myCurrentLineEdit == myGeomGroupLine && !myGeomGroupBtn->isDown()) return;
myIsBusy = true;
SALOME_ListIO aList;
mySelectionMgr->selectedObjects( aList );
-
+
int aNbSel = aList.Extent();
myElements->clearSelection();
myGeomObjects = new GEOM::ListOfGO();
myGeomObjects->length(0);
- if (myGeomGroupBtn->isOn())
- myGeomGroupBtn->setOn(false);
+ if (myGeomGroupBtn->isDown())
+ myGeomGroupBtn->setDown(false);
if (!myCreate)
myName->setText("");
if (aNbSel != 1 ) {
myGroup = SMESH::SMESH_Group::_nil();
- myGroupOnGeom = SMESH::SMESH_GroupOnGeom::_nil();
+ myGroupOnGeom = SMESH::SMESH_GroupOnGeom::_nil();
myMesh = SMESH::SMESH_Mesh::_nil();
updateGeomPopup();
updateButtons();
SMESH::SetPickable(myActor);
aString = aList.First()->getName();
- myMeshGroupLine->setText(aString) ;
+ myMeshGroupLine->setText(aString);
myMeshGroupLine->home( false );
mySelectSubMesh->setEnabled(true);
myGroup = SMESH::SMESH_Group::_nil();
myGroupOnGeom = SMESH::SMESH_GroupOnGeom::_nil();
-
+
init(aGroup);
myIsBusy = true;
mySelectSubMesh->setEnabled(true);
GEOM::GEOM_Object_var aGeomGroup;
Standard_Boolean testResult;
int i = 0;
-
+
SALOME_ListIteratorOfListIO anIt (aList);
- for (; anIt.More(); anIt.Next()) {
-
+ for ( ; anIt.More(); anIt.Next()) {
+
testResult = Standard_False;
aGeomGroup = GEOMBase::ConvertIOinGEOMObject(anIt.Value(), testResult);
// Check if the object is a geometry group
if (!testResult || CORBA::is_nil(aGeomGroup))
continue;
-
+
// Check if group constructed on the same shape as a mesh or on its child
_PTR(Study) aStudy = SMESH::GetActiveStudyDocument();
_PTR(SObject) aGroupMainShapeSO =
//aStudy->FindObjectIOR(aStudy->ConvertObjectToIOR(aGroupMainShape));
aStudy->FindObjectID(aGroupMainShape->GetStudyEntry());
-
+
_PTR(SObject) anObj, aRef;
bool isRefOrSubShape = false;
if (aMeshSO->FindSubObject(1, anObj) && anObj->ReferencedObject(aRef)) {
if (isRefOrSubShape)
myGeomObjects[i++] = aGeomGroup;
}
-
+
myGeomObjects->length(i);
if ( i == 0 )
{
myIsBusy = false;
return;
}
-
+
aNbSel = i;
}
}
myCurrentLineEdit->setText(aString);
+ myOldName = myName->text();
+ myName->setText(aString);
myCurrentLineEdit->home(false);
updateButtons();
aNbItems = SMESH::GetNameOfSelectedElements(mySelector, myActor->getIO(), aListStr);
}
if (aNbItems > 0) {
- QStringList anElements = QStringList::split(" ", aListStr);
- QListBoxItem* anItem = 0;
+ QStringList anElements = aListStr.split(" ", QString::SkipEmptyParts);
for (QStringList::iterator it = anElements.begin(); it != anElements.end(); ++it) {
- anItem = myElements->findItem(*it, Qt::ExactMatch);
- if (anItem) myElements->setSelected(anItem, true);
+ QList<QListWidgetItem*> found = myElements->findItems(*it, Qt::MatchExactly);
+ QListWidgetItem* anItem;
+ foreach(anItem, found) anItem->setSelected(true);
}
}
}
setSelectionMode(8);
}
else {
- myGeomGroupBtn->setOn(false);
+ myGeomGroupBtn->setDown(false);
myGeomObjects->length(0);
myGeomGroupLine->setText("");
myCurrentLineEdit = 0;
}
}
-//=================================================================================
-// function : (onSelectColorGroup)
-// purpose : Called when setting a color on group
-//=================================================================================
-void SMESHGUI_GroupDlg::onSelectColorGroup(bool on)
-{
- if (!on)
- myColorSpinBox->setValue(0);
-
- myColorSpinBox->setEnabled(on);
-}
//=================================================================================
// function : setCurrentSelection()
SMESH::ElementType aType = SMESH::ALL;
switch(myTypeId) {
- case 0:
- aType = SMESH::NODE;
+ case 0:
+ aType = SMESH::NODE;
mySelector->SetSelectionMode(NodeSelection);
break;
- case 1:
- aType = SMESH::EDGE;
+ case 1:
+ aType = SMESH::EDGE;
mySelector->SetSelectionMode(EdgeSelection);
break;
- case 2:
- aType = SMESH::FACE;
+ case 2:
+ aType = SMESH::FACE;
mySelector->SetSelectionMode(FaceSelection);
break;
- case 3:
- aType = SMESH::VOLUME;
+ case 3:
+ aType = SMESH::VOLUME;
mySelector->SetSelectionMode(VolumeSelection);
break;
default:
aNbItems = SMESH::GetNameOfSelectedElements(mySelector, myActor->getIO(), aListStr);
}
if (aNbItems > 0) {
- QStringList anElements = QStringList::split(" ", aListStr);
- QListBoxItem* anItem = 0;
+ QStringList anElements = aListStr.split(" ", QString::SkipEmptyParts);
for (QStringList::iterator it = anElements.begin(); it != anElements.end(); ++it) {
- anItem = myElements->findItem(*it, Qt::ExactMatch);
- if (!anItem) {
- anItem = new QListBoxText(*it);
- myElements->insertItem(anItem);
+ QList<QListWidgetItem*> found = myElements->findItems(*it, Qt::MatchExactly);
+ QListWidgetItem* anItem;
+ if (found.count() == 0) {
+ anItem = new QListWidgetItem(*it);
+ myElements->addItem(anItem);
+ anItem->setSelected(true);
+ }
+ else {
+ foreach(anItem, found) anItem->setSelected(true);
}
- myElements->setSelected(anItem, true);
}
}
} else if (myCurrentLineEdit == mySubMeshLine) {
//SALOME_ListIteratorOfListIO anIt (mySelectionMgr->StoredIObjects());
-
+
SALOME_ListIO aList;
mySelectionMgr->selectedObjects( aList );
SALOME_ListIteratorOfListIO anIt (aList);
- for (; anIt.More(); anIt.Next()) {
+ for ( ; anIt.More(); anIt.Next()) {
SMESH::SMESH_subMesh_var aSubMesh =
SMESH::IObjectToInterface<SMESH::SMESH_subMesh>(anIt.Value());
if (!aSubMesh->_is_nil()) {
try {
SMESH::long_array_var anElements = aSubMesh->GetElementsByType(aType);
int k = anElements->length();
- QListBoxItem* anItem = 0;
for (int i = 0; i < k; i++) {
QString aText = QString::number(anElements[i]);
- anItem = myElements->findItem(aText, Qt::ExactMatch);
- if (!anItem) {
- anItem = new QListBoxText(aText);
- myElements->insertItem(anItem);
+ QList<QListWidgetItem*> found = myElements->findItems(aText, Qt::MatchExactly);
+ QListWidgetItem* anItem = 0;
+ if (found.count() == 0) {
+ anItem = new QListWidgetItem(aText);
+ myElements->addItem(anItem);
+ anItem->setSelected(true);
}
- myElements->setSelected(anItem, true);
+ else {
+ foreach(anItem, found) anItem->setSelected(true);
+ }
}
}
catch (const SALOME::SALOME_Exception& ex) {
//SALOME_ListIteratorOfListIO anIt (mySelectionMgr->StoredIObjects());
SALOME_ListIO aList;
mySelectionMgr->selectedObjects( aList );
-
+
SALOME_ListIteratorOfListIO anIt (aList);
- for (; anIt.More(); anIt.Next()) {
+ for ( ; anIt.More(); anIt.Next()) {
SMESH::SMESH_Group_var aGroup =
SMESH::IObjectToInterface<SMESH::SMESH_Group>(anIt.Value());
if (!aGroup->_is_nil()) {
if (aGroup->GetType() == aType && aGroup->GetMesh()->GetId() == myMesh->GetId()) {
SMESH::long_array_var anElements = aGroup->GetListOfID();
int k = anElements->length();
- QListBoxItem* anItem = 0;
for (int i = 0; i < k; i++) {
QString aText = QString::number(anElements[i]);
- anItem = myElements->findItem(aText, Qt::ExactMatch);
- if (!anItem) {
- anItem = new QListBoxText(aText);
- myElements->insertItem(anItem);
+ QList<QListWidgetItem*> found = myElements->findItems(aText, Qt::MatchExactly);
+ QListWidgetItem* anItem = 0;
+ if (found.count() == 0) {
+ anItem = new QListWidgetItem(aText);
+ myElements->addItem(anItem);
+ anItem->setSelected(true);
+ }
+ else {
+ foreach(anItem, found) anItem->setSelected(true);
}
- myElements->setSelected(anItem, true);
}
}
}
SMESH::long_array_var anElements = aFilter->GetElementsId(myMesh);
int k = anElements->length();
- QListBoxItem* anItem = 0;
for (int i = 0; i < k; i++) {
QString aText = QString::number(anElements[i]);
- anItem = myElements->findItem(aText, Qt::ExactMatch);
- if (!anItem) {
- anItem = new QListBoxText(aText);
- myElements->insertItem(anItem);
+ QList<QListWidgetItem*> found = myElements->findItems(aText, Qt::MatchExactly);
+ QListWidgetItem* anItem = 0;
+ if (found.count() == 0) {
+ anItem = new QListWidgetItem(aText);
+ myElements->addItem(anItem);
+ anItem->setSelected(true);
+ }
+ else {
+ foreach(anItem, found) anItem->setSelected(true);
}
- myElements->setSelected(anItem, true);
}
}
{
myIsBusy = true;
if (myCurrentLineEdit == 0) {
- for (int i = myElements->count(); i > 0; i--) {
- if (myElements->isSelected(i-1)) {
- myElements->removeItem(i-1);
- }
- }
+ QList<QListWidgetItem*> selItems = myElements->selectedItems();
+ QListWidgetItem* item;
+ foreach(item, selItems) delete item;
} else {
SALOME_ListIO aList;
mySelectionMgr->selectedObjects( aList );
mySelectionMgr->selectedObjects( aList );
SALOME_ListIteratorOfListIO anIt (aList);
- for (; anIt.More(); anIt.Next()) {
+ for ( ; anIt.More(); anIt.Next()) {
SMESH::SMESH_subMesh_var aSubMesh = SMESH::IObjectToInterface<SMESH::SMESH_subMesh>(anIt.Value());
if (!aSubMesh->_is_nil()) {
// check if mesh is the same
try {
SMESH::long_array_var anElements = aSubMesh->GetNodesId();
int k = anElements->length();
- QListBoxItem* anItem = 0;
for (int i = 0; i < k; i++) {
- anItem = myElements->findItem(QString::number(anElements[i]), Qt::ExactMatch);
- if (anItem) delete anItem;
+ QList<QListWidgetItem*> found =
+ myElements->findItems(QString::number(anElements[i]), Qt::MatchExactly);
+ QListWidgetItem* anItem;
+ foreach(anItem, found) delete anItem;
}
}
catch (const SALOME::SALOME_Exception& ex) {
try {
SMESH::long_array_var anElements = aSubMesh->GetElementsId();
int k = anElements->length();
- QListBoxItem* anItem = 0;
for (int i = 0; i < k; i++) {
- anItem = myElements->findItem(QString::number(anElements[i]), Qt::ExactMatch);
- if (anItem) delete anItem;
+ QList<QListWidgetItem*> found =
+ myElements->findItems(QString::number(anElements[i]), Qt::MatchExactly);
+ QListWidgetItem* anItem;
+ foreach(anItem, found) delete anItem;
}
}
catch (const SALOME::SALOME_Exception& ex) {
mySelectionMgr->selectedObjects( aList );
SALOME_ListIteratorOfListIO anIt (aList);
- for (; anIt.More(); anIt.Next()) {
+ for ( ; anIt.More(); anIt.Next()) {
SMESH::SMESH_Group_var aGroup = SMESH::IObjectToInterface<SMESH::SMESH_Group>(anIt.Value());
if (aRes && !aGroup->_is_nil()) {
// check if mesh is the same
if (aGroup->GetType() == aType && aGroup->GetMesh()->GetId() == myMesh->GetId()) {
SMESH::long_array_var anElements = aGroup->GetListOfID();
int k = anElements->length();
- QListBoxItem* anItem = 0;
for (int i = 0; i < k; i++) {
- anItem = myElements->findItem(QString::number(anElements[i]), Qt::ExactMatch);
- if (anItem) delete anItem;
+ QList<QListWidgetItem*> found =
+ myElements->findItems(QString::number(anElements[i]), Qt::MatchExactly);
+ QListWidgetItem* anItem;
+ foreach(anItem, found) delete anItem;
}
}
}
int i, k = myElements->count();
if (k > 0) {
myIsBusy = true;
- QStringList aSelected;
+ QList<int> aSelected;
std::vector<int> anArray(k);
// QMemArray<int> anArray(k);
- QListBoxItem* anItem;
// fill the array
- for (anItem = myElements->firstItem(), i = 0; anItem != 0; anItem = anItem->next(), i++) {
- anArray[i] = anItem->text().toInt();
- if (anItem->isSelected())
- aSelected.append(anItem->text());
+ for (i = 0; i < k; i++) {
+ int id = myElements->item(i)->text().toInt();
+ anArray[i] = id;
+ if (myElements->item(i)->isSelected())
+ aSelected.append(id);
}
// sort & update list
std::sort(anArray.begin(), anArray.end());
// anArray.sort();
myElements->clear();
for (i = 0; i < k; i++) {
- myElements->insertItem(QString::number(anArray[i]));
- }
- for (QStringList::iterator it = aSelected.begin(); it != aSelected.end(); ++it) {
- anItem = myElements->findItem(*it, Qt::ExactMatch);
- if (anItem) myElements->setSelected(anItem, true);
+ QListWidgetItem* anItem = new QListWidgetItem(QString::number(anArray[i]));
+ myElements->addItem(anItem);
+ anItem->setSelected(aSelected.contains(anArray[i]));
}
myIsBusy = false;
}
void SMESHGUI_GroupDlg::onHelp()
{
LightApp_Application* app = (LightApp_Application*)(SUIT_Session::session()->activeApplication());
- if (app)
+ if (app)
app->onHelpContextModule(mySMESHGUI ? app->moduleName(mySMESHGUI->moduleName()) : QString(""), myHelpFileName);
else {
- QString platform;
+ QString platform;
#ifdef WIN32
- platform = "winapplication";
+ platform = "winapplication";
#else
- platform = "application";
+ platform = "application";
#endif
- SUIT_MessageBox::warn1(0, QObject::tr("WRN_WARNING"),
- QObject::tr("EXTERNAL_BROWSER_CANNOT_SHOW_PAGE").
- arg(app->resourceMgr()->stringValue("ExternalBrowser", platform)).arg(myHelpFileName),
- QObject::tr("BUT_OK"));
+ SUIT_MessageBox::warning(this, tr("WRN_WARNING"),
+ tr("EXTERNAL_BROWSER_CANNOT_SHOW_PAGE").
+ arg(app->resourceMgr()->stringValue("ExternalBrowser",
+ platform)).
+ arg(myHelpFileName));
}
}
if ( e->isAccepted() )
return;
- if ( e->key() == Key_F1 )
+ if ( e->key() == Qt::Key_F1 )
{
e->accept();
onHelp();
disconnect( myGeomGroupBtn, SIGNAL( toggled(bool) ), this, SLOT( onGeomSelectionButton(bool) ));
if ( enable ) {
if ( !myGeomPopup ) {
- myGeomPopup = new QPopupMenu();
- myGeomPopup->insertItem( tr("DIRECT_GEOM_SELECTION"), DIRECT_GEOM_INDEX );
- myGeomPopup->insertItem( tr("GEOM_BY_MESH_ELEM_SELECTION"), GEOM_BY_MESH_INDEX );
- connect( myGeomPopup, SIGNAL( activated( int ) ), SLOT( onGeomPopup( int ) ) );
+ myGeomPopup = new QMenu(this);
+ myActions[myGeomPopup->addAction( tr("DIRECT_GEOM_SELECTION") )] = DIRECT_GEOM_INDEX;
+ myActions[myGeomPopup->addAction( tr("GEOM_BY_MESH_ELEM_SELECTION") )] = GEOM_BY_MESH_INDEX;
+ connect( myGeomPopup, SIGNAL( triggered( QAction* ) ), SLOT( onGeomPopup( QAction* ) ) );
}
connect( myGeomGroupBtn, SIGNAL( toggled(bool) ), this, SLOT( onGeomSelectionButton(bool) ));
}
if ( myGeomPopup && isBtnOn )
{
myCurrentLineEdit = myGeomGroupLine;
- int id = myGeomPopup->exec( QCursor::pos() );
- if (id == DIRECT_GEOM_INDEX || id == -1)
+ QAction* a = myGeomPopup->exec( QCursor::pos() );
+ if (!a || myActions[a] == DIRECT_GEOM_INDEX)
setSelectionMode(7);
}
else if (!isBtnOn)
// function : onGeomPopup()
// purpose :
//=================================================================================
-void SMESHGUI_GroupDlg::onGeomPopup( int index )
+void SMESHGUI_GroupDlg::onGeomPopup( QAction* a )
{
+ int index = myActions[a];
if ( index == GEOM_BY_MESH_INDEX )
{
mySelectionMode = -1;
{
QString ID = aGeomVar->GetStudyEntry();
_PTR(Study) aStudy = SMESH::GetActiveStudyDocument();
- if ( _PTR(SObject) aGeomSO = aStudy->FindObjectID( ID.latin1() )) {
+ if ( _PTR(SObject) aGeomSO = aStudy->FindObjectID( ID.toLatin1().data() )) {
SALOME_ListIO anIOList;
Handle(SALOME_InteractiveObject) anIO = new SALOME_InteractiveObject
( aGeomSO->GetID().c_str(), "SMESH", aGeomSO->GetName().c_str() );
setSelectionMode(7);
}
}
+
+//=================================================================================
+// function : setGroupColor()
+// purpose :
+//=================================================================================
+void SMESHGUI_GroupDlg::setGroupColor( const SALOMEDS::Color& theColor )
+{
+ QColor aQColor( (int)( theColor.R * 255.0 ),
+ (int)( theColor.G * 255.0 ),
+ (int)( theColor.B * 255.0 ) );
+ setGroupQColor( aQColor );
+}
+
+//=================================================================================
+// function : getGroupColor()
+// purpose :
+//=================================================================================
+SALOMEDS::Color SMESHGUI_GroupDlg::getGroupColor() const
+{
+ QColor aQColor = getGroupQColor();
+
+ SALOMEDS::Color aColor;
+ aColor.R = (float)aQColor.red() / 255.0;
+ aColor.G = (float)aQColor.green() / 255.0;
+ aColor.B = (float)aQColor.blue() / 255.0;
+
+ return aColor;
+}
+
+//=================================================================================
+// function : setGroupQColor()
+// purpose :
+//=================================================================================
+void SMESHGUI_GroupDlg::setGroupQColor( const QColor& theColor )
+{
+ if( theColor.isValid() )
+ myColorBtn->setColor( theColor );
+}
+
+//=================================================================================
+// function : getGroupQColor()
+// purpose :
+//=================================================================================
+QColor SMESHGUI_GroupDlg::getGroupQColor() const
+{
+ return myColorBtn->color();
+}
+
+//=================================================================================
+// function : setDefaultGroupColor()
+// purpose :
+//=================================================================================
+void SMESHGUI_GroupDlg::setDefaultGroupColor()
+{
+ if( myMesh->_is_nil() )
+ return;
+
+ bool isAutoColor = myMesh->GetAutoColor();
+
+ QColor aQColor;
+ if( !isAutoColor )
+ {
+ int r = 0, g = 0, b = 0;
+ SMESH::GetColor( "SMESH", "fill_color", r, g, b, QColor( 0, 170, 255 ) );
+ aQColor.setRgb( r, g, b );
+ }
+ else
+ {
+ SMESH::ListOfGroups aListOfGroups = *myMesh->GetGroups();
+
+ QList<SALOMEDS::Color> aReservedColors;
+ for( int i = 0, n = aListOfGroups.length(); i < n; i++ )
+ {
+ SMESH::SMESH_GroupBase_var aGroupObject = aListOfGroups[i];
+ SALOMEDS::Color aReservedColor = aGroupObject->GetColor();
+ aReservedColors.append( aReservedColor );
+ }
+
+ SALOMEDS::Color aColor = SMESHGUI::getUniqueColor( aReservedColors );
+ aQColor.setRgb( (int)( aColor.R * 255.0 ),
+ (int)( aColor.G * 255.0 ),
+ (int)( aColor.B * 255.0 ) );
+
+ }
+
+ setGroupQColor( aQColor );
+}
