Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge from V6_4_BR 05/12/2011
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_AddQuadraticElementDlg.cxx
diff --git
a/src/SMESHGUI/SMESHGUI_AddQuadraticElementDlg.cxx
b/src/SMESHGUI/SMESHGUI_AddQuadraticElementDlg.cxx
index 601006b705de9b2b3cb4bde2ed6202eb8a8276a1..4f7459785ee2c533d26f864faf4328b83fcb2b60 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_AddQuadraticElementDlg.cxx
+++ b/
src/SMESHGUI/SMESHGUI_AddQuadraticElementDlg.cxx
@@
-1,23
+1,23
@@
-//
Copyright (C) 2007-2010
CEA/DEN, EDF R&D, OPEN CASCADE
+//
Copyright (C) 2007-2011
CEA/DEN, EDF R&D, OPEN CASCADE
//
//
-//
Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//
CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
//
-//
This library is free software; you can redistribute it and/or
-//
modify it under the terms of the GNU Lesser General Public
-//
License as published by the Free Software Foundation; either
-//
version 2.1 of the License.
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
//
//
-//
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
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
// SMESH SMESHGUI : GUI for SMESH component
//
// SMESH SMESHGUI : GUI for SMESH component
@@
-359,8
+359,6
@@
static int LastPentahedronIds[] = {1,2,0,4,5,3,3,4,5};
static int FirstHexahedronIds[] = {0,1,2,3,4,5,6,7,0,1,2,3};
static int LastHexahedronIds[] = {1,2,3,0,5,6,7,4,4,5,6,7};
static int FirstHexahedronIds[] = {0,1,2,3,4,5,6,7,0,1,2,3};
static int LastHexahedronIds[] = {1,2,3,0,5,6,7,4,4,5,6,7};
-
-
/*!
\class BusyLocker
\brief Simple 'busy state' flag locker.
/*!
\class BusyLocker
\brief Simple 'busy state' flag locker.
@@
-419,7
+417,8
@@
SMESHGUI_AddQuadraticElementDlg::SMESHGUI_AddQuadraticElementDlg( SMESHGUI* theM
mySMESHGUI( theModule ),
mySelectionMgr( SMESH::GetSelectionMgr( theModule ) ),
myType( theType ),
mySMESHGUI( theModule ),
mySelectionMgr( SMESH::GetSelectionMgr( theModule ) ),
myType( theType ),
- myBusy( false )
+ myBusy( false ),
+ myIsEditCorners( false )
{
setModal( false );
setAttribute( Qt::WA_DeleteOnClose, true );
{
setModal( false );
setAttribute( Qt::WA_DeleteOnClose, true );
@@
-518,6
+517,7
@@
SMESHGUI_AddQuadraticElementDlg::SMESHGUI_AddQuadraticElementDlg( SMESHGUI* theM
TextLabel_GroupName = new QLabel( tr( "SMESH_GROUP" ), GroupGroups );
ComboBox_GroupName = new QComboBox( GroupGroups );
ComboBox_GroupName->setEditable( true );
TextLabel_GroupName = new QLabel( tr( "SMESH_GROUP" ), GroupGroups );
ComboBox_GroupName = new QComboBox( GroupGroups );
ComboBox_GroupName->setEditable( true );
+ ComboBox_GroupName->setInsertPolicy( QComboBox::NoInsert );
GroupGroupsLayout->addWidget( TextLabel_GroupName );
GroupGroupsLayout->addWidget( ComboBox_GroupName, 1 );
GroupGroupsLayout->addWidget( TextLabel_GroupName );
GroupGroupsLayout->addWidget( ComboBox_GroupName, 1 );
@@
-666,6
+666,7
@@
void SMESHGUI_AddQuadraticElementDlg::Init()
connect(mySMESHGUI, SIGNAL (SignalDeactivateActiveDialog()), SLOT(DeactivateActiveDialog()));
connect(mySMESHGUI, SIGNAL (SignalStudyFrameChanged()), SLOT(ClickOnCancel()));
connect(mySMESHGUI, SIGNAL (SignalDeactivateActiveDialog()), SLOT(DeactivateActiveDialog()));
connect(mySMESHGUI, SIGNAL (SignalStudyFrameChanged()), SLOT(ClickOnCancel()));
+ connect(mySMESHGUI, SIGNAL (SignalCloseAllDialogs()), SLOT(ClickOnCancel()));
// set selection mode
SMESH::SetPointRepresentation(true);
// set selection mode
SMESH::SetPointRepresentation(true);
@@
-730,15
+731,15
@@
void SMESHGUI_AddQuadraticElementDlg::ClickOnApply()
for ( int i = 1; i < ComboBox_GroupName->count(); i++ ) {
QString aName = ComboBox_GroupName->itemText( i );
if ( aGroupName == aName && ( i == ComboBox_GroupName->currentIndex() || idx == 0 ) )
for ( int i = 1; i < ComboBox_GroupName->count(); i++ ) {
QString aName = ComboBox_GroupName->itemText( i );
if ( aGroupName == aName && ( i == ComboBox_GroupName->currentIndex() || idx == 0 ) )
- idx = i;
+
idx = i;
}
}
- if ( idx > 0 ) {
+ if ( idx > 0
&& idx < myGroups.count()
) {
SMESH::SMESH_GroupOnGeom_var aGeomGroup = SMESH::SMESH_GroupOnGeom::_narrow( myGroups[idx-1] );
if ( !aGeomGroup->_is_nil() ) {
SMESH::SMESH_GroupOnGeom_var aGeomGroup = SMESH::SMESH_GroupOnGeom::_narrow( myGroups[idx-1] );
if ( !aGeomGroup->_is_nil() ) {
- int res = SUIT_MessageBox::question( this, tr( "SMESH_WRN_WARNING" ),
- tr( "MESH_STANDALONE_GRP_CHOSEN" ).arg( aGroupName ),
- tr( "SMESH_BUT_YES" ), tr( "SMESH_BUT_NO" ), 0, 1 );
- if ( res == 1 ) return;
+
int res = SUIT_MessageBox::question( this, tr( "SMESH_WRN_WARNING" ),
+
tr( "MESH_STANDALONE_GRP_CHOSEN" ).arg( aGroupName ),
+
tr( "SMESH_BUT_YES" ), tr( "SMESH_BUT_NO" ), 0, 1 );
+
if ( res == 1 ) return;
}
aGroup = myGroups[idx-1];
}
}
aGroup = myGroups[idx-1];
}
@@
-770,21
+771,21
@@
void SMESHGUI_AddQuadraticElementDlg::ClickOnApply()
// create new group
aGroupUsed = SMESH::AddGroup( myMesh, anElementType, aGroupName );
if ( !aGroupUsed->_is_nil() ) {
// create new group
aGroupUsed = SMESH::AddGroup( myMesh, anElementType, aGroupName );
if ( !aGroupUsed->_is_nil() ) {
- myGroups.append(SMESH::SMESH_GroupBase::_duplicate(aGroupUsed));
- ComboBox_GroupName->addItem( aGroupName );
+
myGroups.append(SMESH::SMESH_GroupBase::_duplicate(aGroupUsed));
+
ComboBox_GroupName->addItem( aGroupName );
}
}
else {
SMESH::SMESH_GroupOnGeom_var aGeomGroup = SMESH::SMESH_GroupOnGeom::_narrow( aGroup );
if ( !aGeomGroup->_is_nil() ) {
}
}
else {
SMESH::SMESH_GroupOnGeom_var aGeomGroup = SMESH::SMESH_GroupOnGeom::_narrow( aGroup );
if ( !aGeomGroup->_is_nil() ) {
- aGroupUsed = myMesh->ConvertToStandalone( aGeomGroup );
- if ( !aGroupUsed->_is_nil() && idx > 0 ) {
- myGroups[idx-1] = SMESH::SMESH_GroupBase::_duplicate(aGroupUsed);
- SMESHGUI::GetSMESHGUI()->getApp()->updateObjectBrowser();
- }
+
aGroupUsed = myMesh->ConvertToStandalone( aGeomGroup );
+
if ( !aGroupUsed->_is_nil() && idx > 0 ) {
+
myGroups[idx-1] = SMESH::SMESH_GroupBase::_duplicate(aGroupUsed);
+
SMESHGUI::GetSMESHGUI()->getApp()->updateObjectBrowser();
+
}
}
else
}
else
- aGroupUsed = SMESH::SMESH_Group::_narrow( aGroup );
+
aGroupUsed = SMESH::SMESH_Group::_narrow( aGroup );
}
if ( !aGroupUsed->_is_nil() ) {
}
if ( !aGroupUsed->_is_nil() ) {
@@
-806,6
+807,8
@@
void SMESHGUI_AddQuadraticElementDlg::ClickOnApply()
SetEditCorners();
updateButtons();
SetEditCorners();
updateButtons();
+
+ SMESHGUI::Modified();
}
//=================================================================================
}
//=================================================================================
@@
-971,11
+974,11
@@
void SMESHGUI_AddQuadraticElementDlg::SelectionIntoArgument()
for ( int i = 0, n = aListOfGroups.length(); i < n; i++ ) {
SMESH::SMESH_GroupBase_var aGroup = aListOfGroups[i];
if ( !aGroup->_is_nil() && aGroup->GetType() == anElementType ) {
for ( int i = 0, n = aListOfGroups.length(); i < n; i++ ) {
SMESH::SMESH_GroupBase_var aGroup = aListOfGroups[i];
if ( !aGroup->_is_nil() && aGroup->GetType() == anElementType ) {
- QString aGroupName( aGroup->GetName() );
- if ( !aGroupName.isEmpty() ) {
- myGroups.append(SMESH::SMESH_GroupBase::_duplicate(aGroup));
- ComboBox_GroupName->addItem( aGroupName );
- }
+
QString aGroupName( aGroup->GetName() );
+
if ( !aGroupName.isEmpty() ) {
+
myGroups.append(SMESH::SMESH_GroupBase::_duplicate(aGroup));
+
ComboBox_GroupName->addItem( aGroupName );
+
}
}
}
}
}
}
}