ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2025-04-03 11:44:31 +05:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
jfa 2007-12-18 13:40:49 +00:00
parent 19a2c21851
commit 6e6c01bd45
1 changed files with 127 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

213
src/BasicGUI/BasicGUI_CircleDlg.cxx
View File

@ -17,7 +17,7 @@
// License along with this library; if not, write to the Free Software // License along with this library; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
// //
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
// //
// //
// //
@ -177,10 +177,11 @@ void BasicGUI_CircleDlg::Init()
connect(GroupPntVecR->LineEdit2, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed())); connect(GroupPntVecR->LineEdit2, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
connect(GroupPntVecR->SpinBox_DX, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox())); connect(GroupPntVecR->SpinBox_DX, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox()));
connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupPntVecR->SpinBox_DX, SLOT(SetStep(double))); connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)),
GroupPntVecR->SpinBox_DX, SLOT(SetStep(double)));
connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ; this, SLOT(SelectionIntoArgument())) ;
initName( tr( "GEOM_CIRCLE" ) ); initName( tr( "GEOM_CIRCLE" ) );
@ -195,45 +196,47 @@ void BasicGUI_CircleDlg::Init()
//================================================================================= //=================================================================================
void BasicGUI_CircleDlg::ConstructorsClicked( int constructorId ) void BasicGUI_CircleDlg::ConstructorsClicked( int constructorId )
{ {
disconnect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), 0, this, 0 ); LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
disconnect(aSelMgr, 0, this, 0);
myPoint = myDir = myPoint1 = myPoint2 = myPoint3 = GEOM::GEOM_Object::_nil(); myPoint = myDir = myPoint1 = myPoint2 = myPoint3 = GEOM::GEOM_Object::_nil();
switch ( constructorId ) switch (constructorId)
{ {
case 0: case 0:
{ {
Group3Pnts->hide(); Group3Pnts->hide();
GroupCenter2Pnts->hide(); GroupCenter2Pnts->hide();
resize(0, 0); resize(0, 0);
GroupPntVecR->show(); GroupPntVecR->show();
myEditCurrentArgument = GroupPntVecR->LineEdit1; myEditCurrentArgument = GroupPntVecR->LineEdit1;
GroupPntVecR->LineEdit1->setText(""); GroupPntVecR->LineEdit1->setText("");
GroupPntVecR->LineEdit2->setText(""); GroupPntVecR->LineEdit2->setText("");
break; break;
} }
case 1: case 1:
{
GroupPntVecR->hide();
GroupCenter2Pnts->hide();
resize( 0, 0 );
Group3Pnts->show();
myEditCurrentArgument = Group3Pnts->LineEdit1;
Group3Pnts->LineEdit1->setText("");
Group3Pnts->LineEdit2->setText("");
Group3Pnts->LineEdit3->setText("");
break;
}
case 2:
{ {
GroupPntVecR->hide(); GroupPntVecR->hide();
GroupCenter2Pnts->hide();
resize(0, 0);
Group3Pnts->show();
myEditCurrentArgument = Group3Pnts->LineEdit1;
Group3Pnts->LineEdit1->setText("");
Group3Pnts->LineEdit2->setText("");
Group3Pnts->LineEdit3->setText("");
break;
}
case 2:
{
GroupPntVecR->hide();
Group3Pnts->hide(); Group3Pnts->hide();
resize( 0, 0 ); resize( 0, 0 );
GroupCenter2Pnts->show(); GroupCenter2Pnts->show();
myEditCurrentArgument = GroupCenter2Pnts->LineEdit1; myEditCurrentArgument = GroupCenter2Pnts->LineEdit1;
GroupCenter2Pnts->LineEdit1->setText(""); GroupCenter2Pnts->LineEdit1->setText("");
GroupCenter2Pnts->LineEdit2->setText(""); GroupCenter2Pnts->LineEdit2->setText("");
GroupCenter2Pnts->LineEdit3->setText(""); GroupCenter2Pnts->LineEdit3->setText("");
break; break;
@ -241,11 +244,9 @@ void BasicGUI_CircleDlg::ConstructorsClicked( int constructorId )
} }
myEditCurrentArgument->setFocus(); myEditCurrentArgument->setFocus();
// globalSelection( GEOM_POINT ); globalSelection(); // close local contexts, if any
GEOM::GEOM_Object_var anObj; localSelection(GEOM::GEOM_Object::_nil(), TopAbs_VERTEX);
localSelection( anObj, TopAbs_VERTEX ); connect(aSelMgr, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(),
SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
} }
//================================================================================= //=================================================================================
@ -268,7 +269,7 @@ bool BasicGUI_CircleDlg::ClickOnApply()
return false; return false;
initName(); initName();
ConstructorsClicked( getConstructorId() ); ConstructorsClicked(getConstructorId());
return true; return true;
} }
@ -289,54 +290,63 @@ void BasicGUI_CircleDlg::SelectionIntoArgument()
{ {
myEditCurrentArgument->setText(""); myEditCurrentArgument->setText("");
if ( IObjectCount() != 1 ) LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
SALOME_ListIO aList;
aSelMgr->selectedObjects(aList);
if (aList.Extent() != 1)
{ {
if ( myEditCurrentArgument == GroupPntVecR->LineEdit1 ) myPoint = GEOM::GEOM_Object::_nil(); if (myEditCurrentArgument == GroupPntVecR->LineEdit1) myPoint = GEOM::GEOM_Object::_nil();
else if ( myEditCurrentArgument == GroupPntVecR->LineEdit2 ) myDir = GEOM::GEOM_Object::_nil(); else if (myEditCurrentArgument == GroupPntVecR->LineEdit2) myDir = GEOM::GEOM_Object::_nil();
else if ( myEditCurrentArgument == Group3Pnts->LineEdit1 ) myPoint1 = GEOM::GEOM_Object::_nil(); else if (myEditCurrentArgument == Group3Pnts->LineEdit1) myPoint1 = GEOM::GEOM_Object::_nil();
else if ( myEditCurrentArgument == Group3Pnts->LineEdit2 ) myPoint2 = GEOM::GEOM_Object::_nil(); else if (myEditCurrentArgument == Group3Pnts->LineEdit2) myPoint2 = GEOM::GEOM_Object::_nil();
else if ( myEditCurrentArgument == Group3Pnts->LineEdit3 ) myPoint3 = GEOM::GEOM_Object::_nil(); else if (myEditCurrentArgument == Group3Pnts->LineEdit3) myPoint3 = GEOM::GEOM_Object::_nil();
else if ( myEditCurrentArgument == GroupCenter2Pnts->LineEdit1 ) myPoint4 = GEOM::GEOM_Object::_nil(); else if (myEditCurrentArgument == GroupCenter2Pnts->LineEdit1) myPoint4 = GEOM::GEOM_Object::_nil();
else if ( myEditCurrentArgument == GroupCenter2Pnts->LineEdit2 ) myPoint5 = GEOM::GEOM_Object::_nil(); else if (myEditCurrentArgument == GroupCenter2Pnts->LineEdit2) myPoint5 = GEOM::GEOM_Object::_nil();
else if ( myEditCurrentArgument == GroupCenter2Pnts->LineEdit3 ) myPoint6 = GEOM::GEOM_Object::_nil(); else if (myEditCurrentArgument == GroupCenter2Pnts->LineEdit3) myPoint6 = GEOM::GEOM_Object::_nil();
return; return;
} }
// nbSel == 1 // nbSel == 1
Handle(SALOME_InteractiveObject) anIO = aList.First();
Standard_Boolean aRes = Standard_False; Standard_Boolean aRes = Standard_False;
Handle(SALOME_InteractiveObject) anIO = firstIObject(); GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject(anIO, aRes);
GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject( anIO, aRes ); if (!CORBA::is_nil(aSelectedObject) && aRes)
if ( !CORBA::is_nil( aSelectedObject ) && aRes )
{ {
myEditCurrentArgument->setText( GEOMBase::GetName( aSelectedObject ) ); QString aName = GEOMBase::GetName(aSelectedObject);
// If selected Vertex or Edge on the some Shape Get selection Subshape // If selected Vertex or Edge on the some Shape Get selection Subshape
TopoDS_Shape aShape; TopoDS_Shape aShape;
if ( GEOMBase::GetShape( aSelectedObject, aShape, TopAbs_SHAPE ) && !aShape.IsNull() ) if (GEOMBase::GetShape(aSelectedObject, aShape, TopAbs_SHAPE) && !aShape.IsNull())
{
TColStd_IndexedMapOfInteger aMap;
aSelMgr->GetIndexes(anIO, aMap);
if (aMap.Extent() == 1)
{ {
LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr(); GEOM::GEOM_IShapesOperations_var aShapesOp = getGeomEngine()->GetIShapesOperations(getStudyId());
TColStd_IndexedMapOfInteger aMap; int anIndex = aMap(1);
aSelMgr->GetIndexes( anIO, aMap ); TopTools_IndexedMapOfShape aShapes;
if ( aMap.Extent() == 1 ) TopExp::MapShapes(aShape, aShapes);
{ aShape = aShapes.FindKey(anIndex);
GEOM::GEOM_IShapesOperations_var aShapesOp = aSelectedObject = aShapesOp->GetSubShape(aSelectedObject, anIndex);
getGeomEngine()->GetIShapesOperations( getStudyId() ); aSelMgr->clearSelected(); // ???
int anIndex = aMap( 1 );
TopTools_IndexedMapOfShape aShapes; aName += QString("_subshape_%1").arg(anIndex);
TopExp::MapShapes( aShape, aShapes );
aShape = aShapes.FindKey( anIndex );
aSelectedObject = aShapesOp->GetSubShape(aSelectedObject, anIndex);
aSelMgr->clearSelected();
}
} }
if ( myEditCurrentArgument == GroupPntVecR->LineEdit1 ) myPoint = aSelectedObject; }
else if ( myEditCurrentArgument == GroupPntVecR->LineEdit2 ) myDir = aSelectedObject; myEditCurrentArgument->setText(aName);
else if ( myEditCurrentArgument == Group3Pnts->LineEdit1 ) myPoint1 = aSelectedObject;
else if ( myEditCurrentArgument == Group3Pnts->LineEdit2 ) myPoint2 = aSelectedObject; if (myEditCurrentArgument == GroupPntVecR->LineEdit1) myPoint = aSelectedObject;
else if ( myEditCurrentArgument == Group3Pnts->LineEdit3 ) myPoint3 = aSelectedObject; else if (myEditCurrentArgument == GroupPntVecR->LineEdit2) myDir = aSelectedObject;
else if ( myEditCurrentArgument == GroupCenter2Pnts->LineEdit1 ) myPoint4 = aSelectedObject; else if (myEditCurrentArgument == Group3Pnts->LineEdit1) myPoint1 = aSelectedObject;
else if ( myEditCurrentArgument == GroupCenter2Pnts->LineEdit2 ) myPoint5 = aSelectedObject; else if (myEditCurrentArgument == Group3Pnts->LineEdit2) myPoint2 = aSelectedObject;
else if ( myEditCurrentArgument == GroupCenter2Pnts->LineEdit3 ) myPoint6 = aSelectedObject; else if (myEditCurrentArgument == Group3Pnts->LineEdit3) myPoint3 = aSelectedObject;
else if (myEditCurrentArgument == GroupCenter2Pnts->LineEdit1) myPoint4 = aSelectedObject;
else if (myEditCurrentArgument == GroupCenter2Pnts->LineEdit2) myPoint5 = aSelectedObject;
else if (myEditCurrentArgument == GroupCenter2Pnts->LineEdit3) myPoint6 = aSelectedObject;
} }
displayPreview(); displayPreview();
} }
@ -360,14 +370,13 @@ void BasicGUI_CircleDlg::SetEditCurrentArgument()
myEditCurrentArgument->setFocus(); myEditCurrentArgument->setFocus();
if ( myEditCurrentArgument == GroupPntVecR->LineEdit2 ) if (myEditCurrentArgument == GroupPntVecR->LineEdit2) {
{ globalSelection(); // close local contexts, if any
GEOM::GEOM_Object_var anObj; localSelection(GEOM::GEOM_Object::_nil(), TopAbs_EDGE);
localSelection( anObj, TopAbs_EDGE ); }
}
else { else {
GEOM::GEOM_Object_var anObj; globalSelection(); // close local contexts, if any
localSelection( anObj, TopAbs_EDGE ); localSelection(GEOM::GEOM_Object::_nil(), TopAbs_VERTEX);
} }
SelectionIntoArgument(); SelectionIntoArgument();
} }
@ -402,10 +411,8 @@ void BasicGUI_CircleDlg::ActivateThisDialog()
{ {
GEOMBase_Skeleton::ActivateThisDialog(); GEOMBase_Skeleton::ActivateThisDialog();
globalSelection( GEOM_POINT ); globalSelection( GEOM_POINT );
connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())); this, SLOT(SelectionIntoArgument()));
// myGeomGUI->SetState( 0 );
ConstructorsClicked( getConstructorId() ); ConstructorsClicked( getConstructorId() );
} }
@ -446,11 +453,12 @@ void BasicGUI_CircleDlg::ValueChangedInSpinBox()
//================================================================================= //=================================================================================
double BasicGUI_CircleDlg::getRadius() const double BasicGUI_CircleDlg::getRadius() const
{ {
switch ( getConstructorId() ) switch (getConstructorId())
{ {
case 0 : case 0:
return GroupPntVecR->SpinBox_DX->GetValue(); return GroupPntVecR->SpinBox_DX->GetValue();
} }
return 0.;
} }
//================================================================================= //=================================================================================
@ -499,26 +507,30 @@ bool BasicGUI_CircleDlg::execute( ObjectList& objects )
GEOM::GEOM_Object_var anObj; GEOM::GEOM_Object_var anObj;
switch ( getConstructorId() ) switch (getConstructorId())
{ {
cout << "constructior ID = " << getConstructorId() << endl; case 0:
case 0 : anObj = GEOM::GEOM_ICurvesOperations::_narrow(getOperation())->
anObj = GEOM::GEOM_ICurvesOperations::_narrow( getOperation() )->MakeCirclePntVecR( myPoint, myDir, getRadius() ); MakeCirclePntVecR(myPoint, myDir, getRadius());
res = true; res = true;
break; break;
case 1 : case 1:
anObj = GEOM::GEOM_ICurvesOperations::_narrow( getOperation() )->MakeCircleThreePnt( myPoint1, myPoint2, myPoint3 ); anObj = GEOM::GEOM_ICurvesOperations::_narrow(getOperation())->
MakeCircleThreePnt(myPoint1, myPoint2, myPoint3);
res = true; res = true;
break; break;
case 2 : case 2:
anObj = GEOM::GEOM_ICurvesOperations::_narrow( getOperation() )->MakeCircleCenter2Pnt( myPoint4, myPoint5, myPoint6 ); anObj = GEOM::GEOM_ICurvesOperations::_narrow(getOperation())->
MakeCircleCenter2Pnt(myPoint4, myPoint5, myPoint6);
res = true; res = true;
break; break;
} }
if ( !anObj->_is_nil() ) if (!anObj->_is_nil())
objects.push_back( anObj._retn() ); objects.push_back(anObj._retn());
else cout << "Execute Object is NULL!" << endl; else {
MESSAGE("Execute Object is NULL!");
}
return res; return res;
} }
@ -531,4 +543,3 @@ void BasicGUI_CircleDlg::closeEvent( QCloseEvent* e )
{ {
GEOMBase_Skeleton::closeEvent( e ); GEOMBase_Skeleton::closeEvent( e );
} }