Salome HOME
projects
/
modules
/
smesh.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
86b8303
)
0021436: EDF 1810 SMESH: Create a segment and adding it to a group causes Salome...
author
eap
<eap@opencascade.com>
Wed, 30 Nov 2011 14:08:25 +0000
(14:08 +0000)
committer
eap
<eap@opencascade.com>
Wed, 30 Nov 2011 14:08:25 +0000
(14:08 +0000)
src/SMESHGUI/SMESHGUI_AddMeshElementDlg.cxx
patch
|
blob
|
history
src/SMESHGUI/SMESHGUI_AddQuadraticElementDlg.cxx
patch
|
blob
|
history
src/SMESHGUI/SMESHGUI_CreatePolyhedralVolumeDlg.cxx
patch
|
blob
|
history
src/SMESHGUI/SMESHGUI_NodesDlg.cxx
patch
|
blob
|
history
diff --git
a/src/SMESHGUI/SMESHGUI_AddMeshElementDlg.cxx
b/src/SMESHGUI/SMESHGUI_AddMeshElementDlg.cxx
index 6e25fd08fb1b22c8a8078c26bdafbc69d9648d0d..0de69046ad5285ebdf416e6208cbbdd9b1d9888e 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_AddMeshElementDlg.cxx
+++ b/
src/SMESHGUI/SMESHGUI_AddMeshElementDlg.cxx
@@
-243,7
+243,8
@@
SMESHGUI_AddMeshElementDlg::SMESHGUI_AddMeshElementDlg( SMESHGUI* theModule,
int nbNodes )
: QDialog( SMESH::GetDesktop( theModule ) ),
mySMESHGUI( theModule ),
int nbNodes )
: QDialog( SMESH::GetDesktop( theModule ) ),
mySMESHGUI( theModule ),
- mySelectionMgr( SMESH::GetSelectionMgr( theModule ) )
+ mySelectionMgr( SMESH::GetSelectionMgr( theModule ) ),
+ myBusy ( false )
{
setModal( false );
setAttribute( Qt::WA_DeleteOnClose, true );
{
setModal( false );
setAttribute( Qt::WA_DeleteOnClose, true );
@@
-371,6
+372,7
@@
SMESHGUI_AddMeshElementDlg::SMESHGUI_AddMeshElementDlg( SMESHGUI* theModule,
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 );
@@
-496,7
+498,7
@@
void SMESHGUI_AddMeshElementDlg::ClickOnApply()
if ( aGroupName == aName && ( i == ComboBox_GroupName->currentIndex() || idx == 0 ) )
idx = i;
}
if ( aGroupName == aName && ( i == ComboBox_GroupName->currentIndex() || idx == 0 ) )
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() ) {
int res = SUIT_MessageBox::question( this, tr( "SMESH_WRN_WARNING" ),
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" ),
diff --git
a/src/SMESHGUI/SMESHGUI_AddQuadraticElementDlg.cxx
b/src/SMESHGUI/SMESHGUI_AddQuadraticElementDlg.cxx
index daa119db5590a1597597afda75ac8672638a1fdb..4f7459785ee2c533d26f864faf4328b83fcb2b60 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_AddQuadraticElementDlg.cxx
+++ b/
src/SMESHGUI/SMESHGUI_AddQuadraticElementDlg.cxx
@@
-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 );
@@
-733,7
+733,7
@@
void SMESHGUI_AddQuadraticElementDlg::ClickOnApply()
if ( aGroupName == aName && ( i == ComboBox_GroupName->currentIndex() || idx == 0 ) )
idx = i;
}
if ( aGroupName == aName && ( i == ComboBox_GroupName->currentIndex() || idx == 0 ) )
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() ) {
int res = SUIT_MessageBox::question( this, tr( "SMESH_WRN_WARNING" ),
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" ),
diff --git
a/src/SMESHGUI/SMESHGUI_CreatePolyhedralVolumeDlg.cxx
b/src/SMESHGUI/SMESHGUI_CreatePolyhedralVolumeDlg.cxx
index aef376bc9764e0c01e8802698a3137af99933a0b..835d24066d637bd1fdd0d79728ef45f3520a5c8b 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_CreatePolyhedralVolumeDlg.cxx
+++ b/
src/SMESHGUI/SMESHGUI_CreatePolyhedralVolumeDlg.cxx
@@
-259,6
+259,7
@@
SMESHGUI_CreatePolyhedralVolumeDlg::SMESHGUI_CreatePolyhedralVolumeDlg( SMESHGUI
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 );
@@
-462,7
+463,7
@@
void SMESHGUI_CreatePolyhedralVolumeDlg::ClickOnApply()
if ( aGroupName == aName && ( i == ComboBox_GroupName->currentIndex() || idx == 0 ) )
idx = i;
}
if ( aGroupName == aName && ( i == ComboBox_GroupName->currentIndex() || idx == 0 ) )
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() ) {
int res = SUIT_MessageBox::question( this, tr( "SMESH_WRN_WARNING" ),
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" ),
diff --git
a/src/SMESHGUI/SMESHGUI_NodesDlg.cxx
b/src/SMESHGUI/SMESHGUI_NodesDlg.cxx
index 460e532d3be36cb89d3f64396c529ea4d5e9c542..286d0012eba43858f8dbb42696f46dfb51d41451 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_NodesDlg.cxx
+++ b/
src/SMESHGUI/SMESHGUI_NodesDlg.cxx
@@
-297,6
+297,7
@@
SMESHGUI_NodesDlg::SMESHGUI_NodesDlg( SMESHGUI* theModule ):
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 );
@@
-456,7
+457,7
@@
bool SMESHGUI_NodesDlg::ClickOnApply()
if ( aGroupName == aName && ( i == ComboBox_GroupName->currentIndex() || idx == 0 ) )
idx = i;
}
if ( aGroupName == aName && ( i == ComboBox_GroupName->currentIndex() || idx == 0 ) )
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() ) {
int res = SUIT_MessageBox::question( this, tr( "SMESH_WRN_WARNING" ),
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" ),