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_main (04/10/2012)
[modules/smesh.git]
/
src
/
StdMeshersGUI
/
StdMeshersGUI_SubShapeSelectorWdg.cxx
diff --git
a/src/StdMeshersGUI/StdMeshersGUI_SubShapeSelectorWdg.cxx
b/src/StdMeshersGUI/StdMeshersGUI_SubShapeSelectorWdg.cxx
index 8c2240803cd2f493ca37e0d90c9524a86efa4bd6..637163f66e0b37f0e00db5c66144bc68d06f10bf 100644
(file)
--- a/
src/StdMeshersGUI/StdMeshersGUI_SubShapeSelectorWdg.cxx
+++ b/
src/StdMeshersGUI/StdMeshersGUI_SubShapeSelectorWdg.cxx
@@
-249,7
+249,7
@@
void StdMeshersGUI_SubShapeSelectorWdg::SelectionIntoArgument()
for ( ; anIt.More(); anIt.Next()) { // Loop on selected objects
Handle(SALOME_InteractiveObject) IO = anIt.Value();
for ( ; anIt.More(); anIt.Next()) { // Loop on selected objects
Handle(SALOME_InteractiveObject) IO = anIt.Value();
- GEOM::GEOM_Object_var aGeomObj = GetGeomObjectByEntry( IO->getEntry() );
+ GEOM::GEOM_Object_var aGeomObj = GetGeomObjectByEntry( IO->getEntry() );
if ( !CORBA::is_nil( aGeomObj ) ) { // Selected Object From Study
GEOM::GEOM_Object_ptr aGeomFatherObj = aGeomObj->GetMainShape();
QString aFatherEntry = "";
if ( !CORBA::is_nil( aGeomObj ) ) { // Selected Object From Study
GEOM::GEOM_Object_ptr aGeomFatherObj = aGeomObj->GetMainShape();
QString aFatherEntry = "";
@@
-303,7
+303,9
@@
void StdMeshersGUI_SubShapeSelectorWdg::SelectionIntoArgument()
}
}
// update add button
}
}
// update add button
- myAddButton->setEnabled( ( myListWidget->count() < myMaxSize || myMaxSize == -1 ) && mySelectedIDs.size() > 0 && ( mySelectedIDs.size() <= myMaxSize || myMaxSize == -1 ) );
+ myAddButton->setEnabled( ( myListWidget->count() < myMaxSize || myMaxSize == -1 ) &&
+ mySelectedIDs.size() > 0 &&
+ ( mySelectedIDs.size() <= myMaxSize || myMaxSize == -1 ) );
//Connect Selected Ids in viewer and dialog's Ids list
bool signalsBlocked = myListWidget->blockSignals( true );
//Connect Selected Ids in viewer and dialog's Ids list
bool signalsBlocked = myListWidget->blockSignals( true );