mirror of
https://git.salome-platform.org/gitpub/modules/geom.git
synced 2025-01-01 04:10:34 +05:00
Bugs 16640, 19050: Improve selection mechanism in GEOM dialog boxes.
This commit is contained in:
jfa
parent
64df74e177
commit
0f6567722e
@ -35,12 +35,16 @@
|
||||
|
||||
#include <GEOMImpl_Types.hxx>
|
||||
|
||||
// OCCT Includes
|
||||
#include <TColStd_IndexedMapOfInteger.hxx>
|
||||
|
||||
//=================================================================================
|
||||
// class : BlocksGUI_BlockDlg()
|
||||
// purpose : Constructs a BlocksGUI_BlockDlg which is a child of 'parent'.
|
||||
//=================================================================================
|
||||
BlocksGUI_BlockDlg::BlocksGUI_BlockDlg (GeometryGUI* theGeometryGUI, QWidget* parent)
|
||||
: GEOMBase_Skeleton( theGeometryGUI, parent )
|
||||
: GEOMBase_Skeleton(theGeometryGUI, parent),
|
||||
myInitial(true)
|
||||
{
|
||||
QPixmap image0 (SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM", tr("ICON_DLG_BLOCK_2F")));
|
||||
QPixmap image1 (SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM", tr("ICON_DLG_BLOCK_6F")));
|
||||
@ -82,7 +86,8 @@ BlocksGUI_BlockDlg::BlocksGUI_BlockDlg( GeometryGUI* theGeometryGUI, QWidget* pa
|
||||
|
||||
// Add groups to layout
|
||||
QVBoxLayout* layout = new QVBoxLayout (centralWidget());
|
||||
layout->setMargin( 0 ); layout->setSpacing( 6 );
|
||||
layout->setMargin(0);
|
||||
layout->setSpacing(6);
|
||||
layout->addWidget(Group2F);
|
||||
layout->addWidget(Group6F);
|
||||
/***************************************************************/
|
||||
@ -122,8 +127,7 @@ void BlocksGUI_BlockDlg::Init()
|
||||
connect(buttonOk(), SIGNAL(clicked()), this, SLOT(ClickOnOk()));
|
||||
connect(buttonApply(), SIGNAL(clicked()), this, SLOT(ClickOnApply()));
|
||||
|
||||
connect( this, SIGNAL( constructorsClicked( int ) ),
|
||||
this, SLOT( ConstructorsClicked( int ) ) );
|
||||
connect(this, SIGNAL(constructorsClicked(int)), this, SLOT(ConstructorsClicked(int)));
|
||||
|
||||
connect(Group2F->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
|
||||
connect(Group2F->PushButton2, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
|
||||
@ -135,9 +139,6 @@ void BlocksGUI_BlockDlg::Init()
|
||||
connect(Group6F->PushButton5, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
|
||||
connect(Group6F->PushButton6, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
|
||||
|
||||
connect( ( (SalomeApp_Application*)( SUIT_Session::session()->activeApplication() ) )->selectionMgr(),
|
||||
SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) );
|
||||
|
||||
// init controls and fields
|
||||
initName(tr("GEOM_BLOCK"));
|
||||
|
||||
@ -156,43 +157,43 @@ void BlocksGUI_BlockDlg::ConstructorsClicked( int constructorId )
|
||||
|
||||
myConstructorId = constructorId;
|
||||
|
||||
// init fields
|
||||
myFace1 = myFace2 = GEOM::GEOM_Object::_nil();
|
||||
myFace3 = myFace4 = myFace5 = myFace6 = myFace1;
|
||||
|
||||
switch (constructorId) {
|
||||
case 0:
|
||||
Group6F->hide();
|
||||
Group2F->show();
|
||||
|
||||
myEditCurrentArgument = Group2F->LineEdit1;
|
||||
Group2F->LineEdit1->setText(tr(""));
|
||||
Group2F->LineEdit2->setText(tr(""));
|
||||
|
||||
Group2F->PushButton1->click();
|
||||
break;
|
||||
case 1:
|
||||
Group2F->hide();
|
||||
Group6F->show();
|
||||
|
||||
myEditCurrentArgument = Group6F->LineEdit1;
|
||||
Group6F->LineEdit1->setText(tr(""));
|
||||
Group6F->LineEdit2->setText(tr(""));
|
||||
Group6F->LineEdit3->setText(tr(""));
|
||||
Group6F->LineEdit4->setText(tr(""));
|
||||
Group6F->LineEdit5->setText(tr(""));
|
||||
Group6F->LineEdit6->setText(tr(""));
|
||||
|
||||
Group6F->PushButton1->click();
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
// init fields
|
||||
myFace1 = myFace2 = GEOM::GEOM_Object::_nil();
|
||||
myFace3 = myFace4 = myFace5 = myFace6 = myFace1;
|
||||
|
||||
qApp->processEvents();
|
||||
updateGeometry();
|
||||
resize(minimumSize());
|
||||
|
||||
globalSelection( GEOM_FACE );
|
||||
// on dialog initialization we init the first field with a selected object (if any)
|
||||
SelectionIntoArgument();
|
||||
connect( ( (SalomeApp_Application*)( SUIT_Session::session()->activeApplication() ) )->selectionMgr(),
|
||||
SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) );
|
||||
}
|
||||
|
||||
//=================================================================================
|
||||
@ -220,55 +221,111 @@ bool BlocksGUI_BlockDlg::ClickOnApply()
|
||||
|
||||
//=================================================================================
|
||||
// function : SelectionIntoArgument()
|
||||
// purpose : Called when selection as changed or other case
|
||||
// purpose : Called when selection is changed or on dialog initialization or activation
|
||||
//=================================================================================
|
||||
void BlocksGUI_BlockDlg::SelectionIntoArgument()
|
||||
{
|
||||
erasePreview();
|
||||
myEditCurrentArgument->setText("");
|
||||
|
||||
if ( IObjectCount() != 1 ) {
|
||||
if ( myEditCurrentArgument == Group2F->LineEdit1 ||
|
||||
myEditCurrentArgument == Group6F->LineEdit1 )
|
||||
myFace1 = GEOM::GEOM_Object::_nil();
|
||||
else if ( myEditCurrentArgument == Group2F->LineEdit2 ||
|
||||
myEditCurrentArgument == Group6F->LineEdit2 )
|
||||
myFace2 = GEOM::GEOM_Object::_nil();
|
||||
else if ( myEditCurrentArgument == Group6F->LineEdit3 )
|
||||
myFace3 = GEOM::GEOM_Object::_nil();
|
||||
else if ( myEditCurrentArgument == Group6F->LineEdit4 )
|
||||
myFace4 = GEOM::GEOM_Object::_nil();
|
||||
else if ( myEditCurrentArgument == Group6F->LineEdit5 )
|
||||
myFace5 = GEOM::GEOM_Object::_nil();
|
||||
else if ( myEditCurrentArgument == Group6F->LineEdit6 )
|
||||
myFace6 = GEOM::GEOM_Object::_nil();
|
||||
LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
|
||||
SALOME_ListIO aSelList;
|
||||
aSelMgr->selectedObjects(aSelList);
|
||||
|
||||
if (aSelList.Extent() != 1) {
|
||||
if (myEditCurrentArgument == Group2F->LineEdit1) myFace1 = GEOM::GEOM_Object::_nil();
|
||||
else if (myEditCurrentArgument == Group2F->LineEdit2) myFace2 = GEOM::GEOM_Object::_nil();
|
||||
else if (myEditCurrentArgument == Group6F->LineEdit1) myFace1 = GEOM::GEOM_Object::_nil();
|
||||
else if (myEditCurrentArgument == Group6F->LineEdit2) myFace2 = GEOM::GEOM_Object::_nil();
|
||||
else if (myEditCurrentArgument == Group6F->LineEdit3) myFace3 = GEOM::GEOM_Object::_nil();
|
||||
else if (myEditCurrentArgument == Group6F->LineEdit4) myFace4 = GEOM::GEOM_Object::_nil();
|
||||
else if (myEditCurrentArgument == Group6F->LineEdit5) myFace5 = GEOM::GEOM_Object::_nil();
|
||||
else if (myEditCurrentArgument == Group6F->LineEdit6) myFace6 = GEOM::GEOM_Object::_nil();
|
||||
return;
|
||||
}
|
||||
|
||||
// nbSel == 1
|
||||
Standard_Boolean testResult = Standard_False;
|
||||
GEOM::GEOM_Object_var aSelectedObject =
|
||||
GEOMBase::ConvertIOinGEOMObject( firstIObject(), testResult );
|
||||
GEOMBase::ConvertIOinGEOMObject(aSelList.First(), testResult);
|
||||
|
||||
if (!testResult || CORBA::is_nil(aSelectedObject))
|
||||
return;
|
||||
|
||||
if ( myEditCurrentArgument == Group2F->LineEdit1 ||
|
||||
myEditCurrentArgument == Group6F->LineEdit1 )
|
||||
myFace1 = aSelectedObject;
|
||||
else if ( myEditCurrentArgument == Group2F->LineEdit2 ||
|
||||
myEditCurrentArgument == Group6F->LineEdit2 )
|
||||
myFace2 = aSelectedObject;
|
||||
else if ( myEditCurrentArgument == Group6F->LineEdit3 )
|
||||
myFace3 = aSelectedObject;
|
||||
else if ( myEditCurrentArgument == Group6F->LineEdit4 )
|
||||
myFace4 = aSelectedObject;
|
||||
else if ( myEditCurrentArgument == Group6F->LineEdit5 )
|
||||
myFace5 = aSelectedObject;
|
||||
else if ( myEditCurrentArgument == Group6F->LineEdit6 )
|
||||
myFace6 = aSelectedObject;
|
||||
QString aName = GEOMBase::GetName(aSelectedObject);
|
||||
|
||||
myEditCurrentArgument->setText( GEOMBase::GetName( aSelectedObject ) );
|
||||
// Get Selected object if selected subshape
|
||||
TopoDS_Shape aShape;
|
||||
if (GEOMBase::GetShape(aSelectedObject, aShape, TopAbs_SHAPE) && !aShape.IsNull())
|
||||
{
|
||||
TColStd_IndexedMapOfInteger aMap;
|
||||
aSelMgr->GetIndexes(aSelList.First(), aMap);
|
||||
if (aMap.Extent() == 1) // Local Selection
|
||||
{
|
||||
int anIndex = aMap(1);
|
||||
aName += QString(":face_%1").arg(anIndex);
|
||||
|
||||
//Find SubShape Object in Father
|
||||
GEOM::GEOM_Object_var aFindedObject = GEOMBase_Helper::findObjectInFather(aSelectedObject, aName);
|
||||
|
||||
if (aFindedObject == GEOM::GEOM_Object::_nil()) { // Object not found in study
|
||||
GEOM::GEOM_IShapesOperations_var aShapesOp = getGeomEngine()->GetIShapesOperations(getStudyId());
|
||||
aSelectedObject = aShapesOp->GetSubShape(aSelectedObject, anIndex);
|
||||
}
|
||||
else
|
||||
aSelectedObject = aFindedObject; // get Object from study
|
||||
}
|
||||
else // Global Selection
|
||||
{
|
||||
if (aShape.ShapeType() != TopAbs_FACE) {
|
||||
aSelectedObject = GEOM::GEOM_Object::_nil();
|
||||
aName = "";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
myEditCurrentArgument->setText(aName);
|
||||
|
||||
if (myEditCurrentArgument == Group2F->LineEdit1) {
|
||||
myFace1 = aSelectedObject;
|
||||
if (!myFace1->_is_nil() && myFace2->_is_nil())
|
||||
Group2F->PushButton2->click();
|
||||
}
|
||||
else if (myEditCurrentArgument == Group2F->LineEdit2) {
|
||||
myFace2 = aSelectedObject;
|
||||
if (!myFace2->_is_nil() && myFace1->_is_nil())
|
||||
Group2F->PushButton1->click();
|
||||
}
|
||||
else if (myEditCurrentArgument == Group6F->LineEdit1) {
|
||||
myFace1 = aSelectedObject;
|
||||
if (!myFace1->_is_nil() && myFace2->_is_nil())
|
||||
Group6F->PushButton2->click();
|
||||
}
|
||||
else if (myEditCurrentArgument == Group6F->LineEdit2) {
|
||||
myFace2 = aSelectedObject;
|
||||
if (!myFace2->_is_nil() && myFace3->_is_nil())
|
||||
Group6F->PushButton3->click();
|
||||
}
|
||||
else if (myEditCurrentArgument == Group6F->LineEdit3) {
|
||||
myFace3 = aSelectedObject;
|
||||
if (!myFace3->_is_nil() && myFace4->_is_nil())
|
||||
Group6F->PushButton4->click();
|
||||
}
|
||||
else if (myEditCurrentArgument == Group6F->LineEdit4) {
|
||||
myFace4 = aSelectedObject;
|
||||
if (!myFace4->_is_nil() && myFace5->_is_nil())
|
||||
Group6F->PushButton5->click();
|
||||
}
|
||||
else if (myEditCurrentArgument == Group6F->LineEdit5) {
|
||||
myFace5 = aSelectedObject;
|
||||
if (!myFace5->_is_nil() && myFace6->_is_nil())
|
||||
Group6F->PushButton6->click();
|
||||
}
|
||||
else if (myEditCurrentArgument == Group6F->LineEdit6) {
|
||||
myFace6 = aSelectedObject;
|
||||
if (!myFace6->_is_nil() && myFace1->_is_nil())
|
||||
Group6F->PushButton1->click();
|
||||
}
|
||||
|
||||
displayPreview();
|
||||
}
|
||||
@ -281,6 +338,45 @@ void BlocksGUI_BlockDlg::SetEditCurrentArgument()
|
||||
{
|
||||
QPushButton* aSender = (QPushButton*)sender();
|
||||
|
||||
// clear selection
|
||||
disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
|
||||
if (myInitial)
|
||||
myInitial = false;
|
||||
else
|
||||
myGeomGUI->getApp()->selectionMgr()->clearSelected();
|
||||
|
||||
// disable all
|
||||
switch (myConstructorId) {
|
||||
case 0:
|
||||
Group2F->PushButton1->setDown(false);
|
||||
Group2F->PushButton2->setDown(false);
|
||||
|
||||
Group2F->LineEdit1->setEnabled(false);
|
||||
Group2F->LineEdit2->setEnabled(false);
|
||||
break;
|
||||
case 1:
|
||||
Group6F->PushButton1->setDown(false);
|
||||
Group6F->PushButton2->setDown(false);
|
||||
Group6F->PushButton3->setDown(false);
|
||||
Group6F->PushButton4->setDown(false);
|
||||
Group6F->PushButton5->setDown(false);
|
||||
Group6F->PushButton6->setDown(false);
|
||||
|
||||
Group6F->LineEdit1->setEnabled(false);
|
||||
Group6F->LineEdit2->setEnabled(false);
|
||||
Group6F->LineEdit3->setEnabled(false);
|
||||
Group6F->LineEdit4->setEnabled(false);
|
||||
Group6F->LineEdit5->setEnabled(false);
|
||||
Group6F->LineEdit6->setEnabled(false);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
// enable push button
|
||||
aSender->setDown(true);
|
||||
|
||||
// set line edit as current argument
|
||||
if (aSender == Group2F->PushButton1) {
|
||||
myEditCurrentArgument = Group2F->LineEdit1;
|
||||
}
|
||||
@ -306,10 +402,14 @@ void BlocksGUI_BlockDlg::SetEditCurrentArgument()
|
||||
myEditCurrentArgument = Group6F->LineEdit6;
|
||||
}
|
||||
|
||||
globalSelection( GEOM_FACE );
|
||||
|
||||
// enable line edit
|
||||
myEditCurrentArgument->setEnabled(true);
|
||||
myEditCurrentArgument->setFocus();
|
||||
SelectionIntoArgument();
|
||||
|
||||
globalSelection(); // close local contexts, if any
|
||||
localSelection(GEOM::GEOM_Object::_nil(), TopAbs_FACE); //Select Faces on All Shapes
|
||||
connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
|
||||
this, SLOT(SelectionIntoArgument()));
|
||||
}
|
||||
|
||||
//=================================================================================
|
||||
@ -319,12 +419,10 @@ void BlocksGUI_BlockDlg::SetEditCurrentArgument()
|
||||
void BlocksGUI_BlockDlg::ActivateThisDialog()
|
||||
{
|
||||
GEOMBase_Skeleton::ActivateThisDialog();
|
||||
connect( ( (SalomeApp_Application*)( SUIT_Session::session()->activeApplication() ) )->selectionMgr(),
|
||||
SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) );
|
||||
|
||||
globalSelection( GEOM_FACE );
|
||||
|
||||
SelectionIntoArgument();
|
||||
globalSelection(); // close local contexts, if any
|
||||
localSelection(GEOM::GEOM_Object::_nil(), TopAbs_FACE); //Select Faces on All Shapes
|
||||
connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
|
||||
this, SLOT(SelectionIntoArgument()));
|
||||
}
|
||||
|
||||
//=================================================================================
|
||||
@ -402,3 +500,28 @@ bool BlocksGUI_BlockDlg::execute( ObjectList& objects )
|
||||
|
||||
return res;
|
||||
}
|
||||
|
||||
//=================================================================================
|
||||
// function : addSubshapeToStudy
|
||||
// purpose : virtual method to add new SubObjects if local selection
|
||||
//=================================================================================
|
||||
void BlocksGUI_BlockDlg::addSubshapesToStudy()
|
||||
{
|
||||
QMap<QString, GEOM::GEOM_Object_var> objMap;
|
||||
|
||||
switch (getConstructorId()) {
|
||||
case 0:
|
||||
objMap[Group2F->LineEdit1->text()] = myFace1;
|
||||
objMap[Group2F->LineEdit2->text()] = myFace2;
|
||||
break;
|
||||
case 1:
|
||||
objMap[Group6F->LineEdit1->text()] = myFace1;
|
||||
objMap[Group6F->LineEdit2->text()] = myFace2;
|
||||
objMap[Group6F->LineEdit3->text()] = myFace3;
|
||||
objMap[Group6F->LineEdit4->text()] = myFace4;
|
||||
objMap[Group6F->LineEdit5->text()] = myFace5;
|
||||
objMap[Group6F->LineEdit6->text()] = myFace6;
|
||||
break;
|
||||
}
|
||||
addSubshapesToFather(objMap);
|
||||
}
|
||||
|
||||
@ -47,6 +47,7 @@ protected:
|
||||
virtual GEOM::GEOM_IOperations_ptr createOperation();
|
||||
virtual bool isValid (QString&);
|
||||
virtual bool execute (ObjectList&);
|
||||
virtual void addSubshapesToStudy();
|
||||
|
||||
private:
|
||||
void Init();
|
||||
@ -58,6 +59,9 @@ private:
|
||||
GEOM::GEOM_Object_var myFace1, myFace2;
|
||||
GEOM::GEOM_Object_var myFace3, myFace4, myFace5, myFace6;
|
||||
|
||||
// to initialize the first selection field with a selected object on the dialog creation
|
||||
bool myInitial;
|
||||
|
||||
DlgRef_2Sel* Group2F;
|
||||
DlgRef_6Sel* Group6F;
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user