mirror of
https://git.salome-platform.org/gitpub/modules/geom.git
synced 2024-11-15 10:08:35 +05:00
0020479: EDF 1116 GEOM: Create a group, "Add" button is inactive but "Select all" button is active
This commit is contained in:
parent
d669f7ab48
commit
e0a2847a0a
@ -614,47 +614,49 @@ void GroupGUI_GroupDlg::selectAllSubShapes()
|
||||
return;
|
||||
|
||||
GEOM::ListOfLong_var aSubShapes;
|
||||
// if ( !myPlaceCheckBox->isChecked() )
|
||||
if ( subSelectionWay() == ALL_SUBSHAPES )
|
||||
{
|
||||
myIdList->clear();
|
||||
GEOM::GEOM_IShapesOperations_var aShOp = getGeomEngine()->GetIShapesOperations( getStudyId() );
|
||||
aSubShapes = aShOp->SubShapeAllIDs(myMainObj, getShapeType(), false);
|
||||
GEOM::GEOM_IShapesOperations_var aShOp = getGeomEngine()->GetIShapesOperations( getStudyId() );
|
||||
aSubShapes = aShOp->SubShapeAllIDs(myMainObj, getShapeType(), false);
|
||||
if ( aSubShapes->length() > 0) {
|
||||
// if ( !myPlaceCheckBox->isChecked() )
|
||||
if ( subSelectionWay() == ALL_SUBSHAPES )
|
||||
{
|
||||
myIdList->clear();
|
||||
|
||||
if ( !aShOp->IsDone() )
|
||||
return;
|
||||
}
|
||||
else
|
||||
{
|
||||
aSubShapes = new GEOM::ListOfLong();
|
||||
aSubShapes->length( myMain2InPlaceIndices.Extent() );
|
||||
TColStd_DataMapIteratorOfDataMapOfIntegerInteger m2ip( myMain2InPlaceIndices );
|
||||
for ( int i = 0; m2ip.More(); i++, m2ip.Next() )
|
||||
aSubShapes[ i ] = m2ip.Key();
|
||||
}
|
||||
bool isBlocked = myIdList->signalsBlocked();
|
||||
myIdList->blockSignals( true );
|
||||
if ( !aShOp->IsDone() )
|
||||
return;
|
||||
}
|
||||
else
|
||||
{
|
||||
aSubShapes = new GEOM::ListOfLong();
|
||||
aSubShapes->length( myMain2InPlaceIndices.Extent() );
|
||||
TColStd_DataMapIteratorOfDataMapOfIntegerInteger m2ip( myMain2InPlaceIndices );
|
||||
for ( int i = 0; m2ip.More(); i++, m2ip.Next() )
|
||||
aSubShapes[ i ] = m2ip.Key();
|
||||
}
|
||||
bool isBlocked = myIdList->signalsBlocked();
|
||||
myIdList->blockSignals( true );
|
||||
|
||||
for ( int i = 0, n = aSubShapes->length(); i < n; i++ ) {
|
||||
CORBA::Long anIndex = aSubShapes[i];
|
||||
if ( anIndex < 0 )
|
||||
continue;
|
||||
for ( int i = 0, n = aSubShapes->length(); i < n; i++ ) {
|
||||
CORBA::Long anIndex = aSubShapes[i];
|
||||
if ( anIndex < 0 )
|
||||
continue;
|
||||
|
||||
QListWidgetItem* anItem = 0;
|
||||
QString text = QString( "%1" ).arg( anIndex );
|
||||
if ( !myInPlaceObj->_is_nil() ) {
|
||||
QList<QListWidgetItem*> found = myIdList->findItems( text, Qt::MatchExactly );
|
||||
if ( found.count() ) anItem = found[0];
|
||||
QListWidgetItem* anItem = 0;
|
||||
QString text = QString( "%1" ).arg( anIndex );
|
||||
if ( !myInPlaceObj->_is_nil() ) {
|
||||
QList<QListWidgetItem*> found = myIdList->findItems( text, Qt::MatchExactly );
|
||||
if ( found.count() ) anItem = found[0];
|
||||
}
|
||||
if ( !anItem ) {
|
||||
anItem = new QListWidgetItem( text );
|
||||
myIdList->addItem( anItem );
|
||||
}
|
||||
anItem->setSelected( true );
|
||||
}
|
||||
if ( !anItem ) {
|
||||
anItem = new QListWidgetItem( text );
|
||||
myIdList->addItem( anItem );
|
||||
}
|
||||
anItem->setSelected( true );
|
||||
}
|
||||
|
||||
myIdList->blockSignals( isBlocked );
|
||||
highlightSubShapes();
|
||||
myIdList->blockSignals( isBlocked );
|
||||
highlightSubShapes();
|
||||
}
|
||||
}
|
||||
|
||||
//=================================================================================
|
||||
|
Loading…
Reference in New Issue
Block a user