NPAL18363: EDF635: We can now select any object in all window.

This commit is contained in:
jfa 2007-12-19 15:04:04 +00:00
parent b51d7706d2
commit add6b67d1c

View File

@ -354,22 +354,22 @@ void GenerationGUI_PrismDlg::SelectionIntoArgument()
bool myOk = true;
if ( GEOMBase::GetShape( aSelectedObject, aShape, TopAbs_SHAPE ) && !aShape.IsNull() )
{
LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
TColStd_IndexedMapOfInteger aMap;
aSelMgr->GetIndexes( firstIObject(), aMap );
if ( aMap.Extent() == 1 )
if (aMap.Extent() == 1)
{
GEOM::GEOM_IShapesOperations_var aShapesOp =
getGeomEngine()->GetIShapesOperations( getStudyId() );
int anIndex = aMap( 1 );
GEOM::GEOM_IShapesOperations_var aShapesOp = getGeomEngine()->GetIShapesOperations(getStudyId());
int anIndex = aMap(1);
aSelectedObject = aShapesOp->GetSubShape(aSelectedObject, anIndex);
aName.append( ":vertex_" + QString::number( anIndex ) );
aName.append(":vertex_" + QString::number(anIndex));
aSelMgr->clearSelected();
}
else {
if ( (aShape.ShapeType() != TopAbs_EDGE && myEditCurrentArgument == GroupPoints2->LineEdit2 ) ||
(aShape.ShapeType() != TopAbs_EDGE && myEditCurrentArgument == GroupPoints2->LineEdit3 )) {
else
{
if ((aShape.ShapeType() != TopAbs_VERTEX && myEditCurrentArgument == GroupPoints2->LineEdit2) ||
(aShape.ShapeType() != TopAbs_VERTEX && myEditCurrentArgument == GroupPoints2->LineEdit3))
{
aSelectedObject = GEOM::GEOM_Object::_nil();
aName = "";
myOk = false;
@ -377,7 +377,7 @@ void GenerationGUI_PrismDlg::SelectionIntoArgument()
}
}
myEditCurrentArgument->setText( aName );
myEditCurrentArgument->setText(aName);
if (myEditCurrentArgument == GroupPoints2->LineEdit1) {
myBase = aSelectedObject;
@ -391,13 +391,11 @@ void GenerationGUI_PrismDlg::SelectionIntoArgument()
myOkPnt2 = true;
myPoint2 = aSelectedObject;
}
}
displayPreview();
}
//=================================================================================
// function : LineEditReturnPressed()
// purpose :