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
IPAL53011: Order of sub-mesh in meshing process does't work
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_MeshDlg.cxx
diff --git
a/src/SMESHGUI/SMESHGUI_MeshDlg.cxx
b/src/SMESHGUI/SMESHGUI_MeshDlg.cxx
index 4973a5d1ebe264ae5894f53b262e7bed94c6ee21..0716cdd8e447e91ed682f1073995574f75c40203 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_MeshDlg.cxx
+++ b/
src/SMESHGUI/SMESHGUI_MeshDlg.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
5
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
6
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
@@
-338,17
+338,24
@@
void SMESHGUI_MeshTab::setCurrentHyp( const int theId, const int theIndex )
}
else // more than one additional hyp assigned
{
}
else // more than one additional hyp assigned
{
- // move a hyp from myHypCombo[ AddHyp ] to myAddHypList
- for ( int i = 1, nb = myHypCombo[ AddHyp ]->count(); i < nb; ++i )
+ if ( theIndex > 0 )
{
{
- int curIndex = myHypCombo[ AddHyp ]->itemData( i ).toInt();
-
if ( theIndex == curIndex
)
+ // move a hyp from myHypCombo[ AddHyp ] to myAddHypList
+
for ( int i = 1, nb = myHypCombo[ AddHyp ]->count(); i < nb; ++i
)
{
{
- addItem( myHypCombo[ AddHyp ]->itemText( i ), theId, theIndex );
- myHypCombo[ AddHyp ]->removeItem( i );
- break;
+ int curIndex = myHypCombo[ AddHyp ]->itemData( i ).toInt();
+ if ( theIndex == curIndex )
+ {
+ addItem( myHypCombo[ AddHyp ]->itemText( i ), theId, theIndex );
+ myHypCombo[ AddHyp ]->removeItem( i );
+ break;
+ }
}
}
}
}
+ else
+ {
+ myAddHypList->clear();
+ }
}
}
}
}