mirror of
https://git.salome-platform.org/gitpub/modules/geom.git
synced 2024-12-29 10:50:35 +05:00
Bugs 16640, 19050: Improve selection mechanism in GEOM dialog boxes.
This commit is contained in:
jfa
parent
b21305abc8
commit
ab22b2dd47
@ -246,8 +246,7 @@ void BlocksGUI_BlockDlg::SelectionIntoArgument()
|
||||
|
||||
// nbSel == 1
|
||||
Standard_Boolean testResult = Standard_False;
|
||||
GEOM::GEOM_Object_var aSelectedObject =
|
||||
GEOMBase::ConvertIOinGEOMObject(aSelList.First(), testResult);
|
||||
GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject(aSelList.First(), testResult);
|
||||
|
||||
if (!testResult || CORBA::is_nil(aSelectedObject))
|
||||
return;
|
||||
|
||||
@ -27,21 +27,27 @@
|
||||
#include <DlgRef.h>
|
||||
#include <GeometryGUI.h>
|
||||
#include <GEOMBase.h>
|
||||
#include <GEOMImpl_Types.hxx>
|
||||
|
||||
#include <SUIT_Session.h>
|
||||
#include <SUIT_ResourceMgr.h>
|
||||
#include <SalomeApp_Application.h>
|
||||
#include <LightApp_SelectionMgr.h>
|
||||
|
||||
#include <GEOMImpl_Types.hxx>
|
||||
|
||||
#include <qlabel.h>
|
||||
|
||||
// OCCT Includes
|
||||
#include <TColStd_IndexedMapOfInteger.hxx>
|
||||
#include <TopAbs.hxx>
|
||||
|
||||
//=================================================================================
|
||||
// class : BlocksGUI_QuadFaceDlg()
|
||||
// purpose : Constructs a BlocksGUI_QuadFaceDlg which is a child of 'parent'.
|
||||
//=================================================================================
|
||||
BlocksGUI_QuadFaceDlg::BlocksGUI_QuadFaceDlg (GeometryGUI* theGeometryGUI, QWidget* parent)
|
||||
: GEOMBase_Skeleton( theGeometryGUI, parent )
|
||||
: GEOMBase_Skeleton(theGeometryGUI, parent),
|
||||
myInitial(true)
|
||||
{
|
||||
SUIT_ResourceMgr* aResMgr = myGeomGUI->getApp()->resourceMgr();
|
||||
QPixmap image1 (aResMgr->loadPixmap("GEOM", tr("ICON_DLG_QUAD_FACE_4_VERT")));
|
||||
@ -86,7 +92,6 @@ BlocksGUI_QuadFaceDlg::BlocksGUI_QuadFaceDlg( GeometryGUI* theGeometryGUI, QWidg
|
||||
layout->addWidget(myGrp1);
|
||||
layout->addWidget(myGrp2);
|
||||
layout->addWidget(myGrp3);
|
||||
|
||||
/***************************************************************/
|
||||
|
||||
setHelpFileName("build_by_blocks_page.html#quad_face_anchor");
|
||||
@ -113,16 +118,12 @@ void BlocksGUI_QuadFaceDlg::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)));
|
||||
|
||||
QMap<int, QPushButton*>::iterator anIterBtn;
|
||||
for (anIterBtn = mySelBtn.begin(); anIterBtn != mySelBtn.end(); ++anIterBtn)
|
||||
connect(anIterBtn.value(), 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_QUAD_FACE"));
|
||||
|
||||
@ -141,43 +142,44 @@ void BlocksGUI_QuadFaceDlg::ConstructorsClicked( int constructorId )
|
||||
|
||||
myConstructorId = constructorId;
|
||||
|
||||
switch ( constructorId ) {
|
||||
case 0:
|
||||
myGrp2->hide();
|
||||
myGrp3->hide();
|
||||
myGrp1->show();
|
||||
myEditCurrentArgument = mySelName[Vertex1];
|
||||
break;
|
||||
case 1:
|
||||
myGrp1->hide();
|
||||
myGrp3->hide();
|
||||
myGrp2->show();
|
||||
myEditCurrentArgument = mySelName[Edge12];
|
||||
break;
|
||||
case 2:
|
||||
myGrp1->hide();
|
||||
myGrp2->hide();
|
||||
myGrp3->show();
|
||||
myEditCurrentArgument = mySelName[Edge14];
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
// init fields
|
||||
myShape1 = myShape2 = GEOM::GEOM_Object::_nil();
|
||||
myShape3 = myShape4 = myShape1;
|
||||
|
||||
// clear line edits
|
||||
QMap<int, QLineEdit*>::iterator anIterLE;
|
||||
for (anIterLE = mySelName.begin(); anIterLE != mySelName.end(); ++anIterLE)
|
||||
anIterLE.value()->setText("");
|
||||
|
||||
// init fields
|
||||
myShape1 = myShape2 = GEOM::GEOM_Object::_nil();
|
||||
myShape3 = myShape4 = myShape1;
|
||||
switch (constructorId) {
|
||||
case 0:
|
||||
myGrp2->hide();
|
||||
myGrp3->hide();
|
||||
myGrp1->show();
|
||||
mySelBtn[Vertex1]->click();
|
||||
break;
|
||||
case 1:
|
||||
myGrp1->hide();
|
||||
myGrp3->hide();
|
||||
myGrp2->show();
|
||||
mySelBtn[Edge12]->click();
|
||||
break;
|
||||
case 2:
|
||||
myGrp1->hide();
|
||||
myGrp2->hide();
|
||||
myGrp3->show();
|
||||
mySelBtn[Edge14]->click();
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
qApp->processEvents();
|
||||
updateGeometry();
|
||||
resize(minimumSize());
|
||||
|
||||
activateSelection();
|
||||
// on dialog initialization we init the first field with a selected object (if any)
|
||||
SelectionIntoArgument();
|
||||
}
|
||||
|
||||
//=================================================================================
|
||||
@ -205,12 +207,11 @@ bool BlocksGUI_QuadFaceDlg::ClickOnApply()
|
||||
|
||||
//=================================================================================
|
||||
// function : SelectionIntoArgument()
|
||||
// purpose : Called when selection has changed
|
||||
// purpose : Called when selection is changed or on dialog initialization or activation
|
||||
//=================================================================================
|
||||
void BlocksGUI_QuadFaceDlg::SelectionIntoArgument()
|
||||
{
|
||||
erasePreview();
|
||||
myEditCurrentArgument->setText( "" );
|
||||
|
||||
// Get index of current selection focus
|
||||
int aCurrFocus = -1;
|
||||
@ -226,41 +227,118 @@ void BlocksGUI_QuadFaceDlg::SelectionIntoArgument()
|
||||
SALOME_ListIO aSelList;
|
||||
aSelMgr->selectedObjects(aSelList);
|
||||
|
||||
GEOM::GEOM_Object_var anObj;
|
||||
TopAbs_ShapeEnum aType = TopAbs_EDGE;
|
||||
if (aCurrFocus == Vertex1 || aCurrFocus == Vertex2 ||
|
||||
aCurrFocus == Vertex3 || aCurrFocus == Vertex4)
|
||||
aType = TopAbs_VERTEX;
|
||||
|
||||
QString aName;
|
||||
GEOM::GEOM_Object_var anObj = GEOM::GEOM_Object::_nil();
|
||||
|
||||
if (aSelList.Extent() == 1) {
|
||||
Standard_Boolean aResult = Standard_False;
|
||||
anObj = GEOMBase::ConvertIOinGEOMObject(aSelList.First(), aResult);
|
||||
if ( aResult ) {
|
||||
if (anObj->_is_nil()) {
|
||||
aResult = Standard_False;
|
||||
if (aResult && !anObj->_is_nil()) {
|
||||
aName = GEOMBase::GetName(anObj);
|
||||
|
||||
// Get Selected object if selected subshape
|
||||
TopoDS_Shape aShape;
|
||||
if (GEOMBase::GetShape(anObj, aShape, TopAbs_SHAPE) && !aShape.IsNull())
|
||||
{
|
||||
TColStd_IndexedMapOfInteger aMap;
|
||||
aSelMgr->GetIndexes(aSelList.First(), aMap);
|
||||
if (aMap.Extent() == 1) // Local Selection
|
||||
{
|
||||
int anIndex = aMap(1);
|
||||
if (aType == TopAbs_VERTEX)
|
||||
aName += QString(":vertex_%1").arg(anIndex);
|
||||
else
|
||||
aName += QString(":edge_%1").arg(anIndex);
|
||||
|
||||
//Find SubShape Object in Father
|
||||
GEOM::GEOM_Object_var aFindedObject = GEOMBase_Helper::findObjectInFather(anObj, aName);
|
||||
|
||||
if (aFindedObject == GEOM::GEOM_Object::_nil()) { // Object not found in study
|
||||
GEOM::GEOM_IShapesOperations_var aShapesOp = getGeomEngine()->GetIShapesOperations(getStudyId());
|
||||
anObj = aShapesOp->GetSubShape(anObj, anIndex);
|
||||
}
|
||||
else {
|
||||
mySelName[aCurrFocus]->setText( GEOMBase::GetName( anObj ) );
|
||||
else
|
||||
anObj = aFindedObject; // get Object from study
|
||||
}
|
||||
}
|
||||
else {
|
||||
else // Global Selection
|
||||
{
|
||||
if (aShape.ShapeType() != aType) {
|
||||
anObj = GEOM::GEOM_Object::_nil();
|
||||
aName = "";
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
myEditCurrentArgument->setText(aName);
|
||||
|
||||
switch (aCurrFocus) {
|
||||
// four vertices
|
||||
case Vertex1:
|
||||
case Edge12:
|
||||
case Edge14:
|
||||
myShape1 = anObj; break;
|
||||
myShape1 = anObj;
|
||||
if (!myShape1->_is_nil() && myShape2->_is_nil())
|
||||
mySelBtn[Vertex2]->click();
|
||||
break;
|
||||
case Vertex2:
|
||||
case Edge22:
|
||||
case Edge24:
|
||||
myShape2 = anObj; break;
|
||||
myShape2 = anObj;
|
||||
if (!myShape2->_is_nil() && myShape3->_is_nil())
|
||||
mySelBtn[Vertex3]->click();
|
||||
break;
|
||||
case Vertex3:
|
||||
case Edge34:
|
||||
myShape3 = anObj; break;
|
||||
myShape3 = anObj;
|
||||
if (!myShape3->_is_nil() && myShape4->_is_nil())
|
||||
mySelBtn[Vertex4]->click();
|
||||
break;
|
||||
case Vertex4:
|
||||
myShape4 = anObj;
|
||||
if (!myShape4->_is_nil() && myShape1->_is_nil())
|
||||
mySelBtn[Vertex1]->click();
|
||||
break;
|
||||
|
||||
// two edges
|
||||
case Edge12:
|
||||
myShape1 = anObj;
|
||||
if (!myShape1->_is_nil() && myShape2->_is_nil())
|
||||
mySelBtn[Edge22]->click();
|
||||
break;
|
||||
case Edge22:
|
||||
myShape2 = anObj;
|
||||
if (!myShape2->_is_nil() && myShape1->_is_nil())
|
||||
mySelBtn[Edge12]->click();
|
||||
break;
|
||||
|
||||
// four edges
|
||||
case Edge14:
|
||||
myShape1 = anObj;
|
||||
if (!myShape1->_is_nil() && myShape2->_is_nil())
|
||||
mySelBtn[Edge24]->click();
|
||||
break;
|
||||
case Edge24:
|
||||
myShape2 = anObj;
|
||||
if (!myShape2->_is_nil() && myShape3->_is_nil())
|
||||
mySelBtn[Edge34]->click();
|
||||
break;
|
||||
case Edge34:
|
||||
myShape3 = anObj;
|
||||
if (!myShape3->_is_nil() && myShape4->_is_nil())
|
||||
mySelBtn[Edge44]->click();
|
||||
break;
|
||||
case Edge44:
|
||||
myShape4 = anObj; break;
|
||||
myShape4 = anObj;
|
||||
if (!myShape4->_is_nil() && myShape1->_is_nil())
|
||||
mySelBtn[Edge14]->click();
|
||||
break;
|
||||
|
||||
default:
|
||||
return;
|
||||
break;
|
||||
}
|
||||
|
||||
displayPreview();
|
||||
}
|
||||
|
||||
@ -272,14 +350,64 @@ void BlocksGUI_QuadFaceDlg::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:
|
||||
mySelBtn[Vertex1]->setDown(false);
|
||||
mySelBtn[Vertex2]->setDown(false);
|
||||
mySelBtn[Vertex3]->setDown(false);
|
||||
mySelBtn[Vertex4]->setDown(false);
|
||||
|
||||
mySelName[Vertex1]->setEnabled(false);
|
||||
mySelName[Vertex2]->setEnabled(false);
|
||||
mySelName[Vertex3]->setEnabled(false);
|
||||
mySelName[Vertex4]->setEnabled(false);
|
||||
break;
|
||||
case 1:
|
||||
mySelBtn[Edge12]->setDown(false);
|
||||
mySelBtn[Edge22]->setDown(false);
|
||||
|
||||
mySelName[Edge12]->setEnabled(false);
|
||||
mySelName[Edge22]->setEnabled(false);
|
||||
break;
|
||||
case 2:
|
||||
mySelBtn[Edge14]->setDown(false);
|
||||
mySelBtn[Edge24]->setDown(false);
|
||||
mySelBtn[Edge34]->setDown(false);
|
||||
mySelBtn[Edge44]->setDown(false);
|
||||
|
||||
mySelName[Edge14]->setEnabled(false);
|
||||
mySelName[Edge24]->setEnabled(false);
|
||||
mySelName[Edge34]->setEnabled(false);
|
||||
mySelName[Edge44]->setEnabled(false);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
// enable push button
|
||||
aSender->setDown(true);
|
||||
|
||||
// set line edit as current argument
|
||||
QMap<int, QPushButton*>::iterator anIter;
|
||||
for (anIter = mySelBtn.begin(); anIter != mySelBtn.end(); ++anIter) {
|
||||
if (anIter.value() == aSender) {
|
||||
mySelName[anIter.key()]->setFocus();
|
||||
myEditCurrentArgument = mySelName[anIter.key()];
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
// enable line edit
|
||||
myEditCurrentArgument->setEnabled(true);
|
||||
myEditCurrentArgument->setFocus();
|
||||
|
||||
activateSelection();
|
||||
}
|
||||
|
||||
@ -290,10 +418,9 @@ void BlocksGUI_QuadFaceDlg::SetEditCurrentArgument()
|
||||
void BlocksGUI_QuadFaceDlg::ActivateThisDialog()
|
||||
{
|
||||
GEOMBase_Skeleton::ActivateThisDialog();
|
||||
connect( ( (SalomeApp_Application*)( SUIT_Session::session()->activeApplication() ) )->selectionMgr(),
|
||||
SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) );
|
||||
|
||||
activateSelection();
|
||||
|
||||
// ??
|
||||
displayPreview();
|
||||
}
|
||||
|
||||
@ -304,19 +431,9 @@ void BlocksGUI_QuadFaceDlg::ActivateThisDialog()
|
||||
void BlocksGUI_QuadFaceDlg::enterEvent (QEvent*)
|
||||
{
|
||||
if (!mainFrame()->GroupConstructors->isEnabled())
|
||||
this->ActivateThisDialog();
|
||||
ActivateThisDialog();
|
||||
}
|
||||
|
||||
//=================================================================================
|
||||
// function : DeactivateActiveDialog()
|
||||
// purpose :
|
||||
//=================================================================================
|
||||
//void BlocksGUI_QuadFaceDlg::DeactivateActiveDialog()
|
||||
//{
|
||||
// // disconnect selection
|
||||
// GEOMBase_Skeleton::DeactivateActiveDialog();
|
||||
//}
|
||||
|
||||
//=================================================================================
|
||||
// function : createSelWg()
|
||||
// purpose :
|
||||
@ -352,17 +469,20 @@ void BlocksGUI_QuadFaceDlg::createSelWg( const QString& theLbl,
|
||||
//=================================================================================
|
||||
void BlocksGUI_QuadFaceDlg::activateSelection()
|
||||
{
|
||||
globalSelection(); // close local contexts, if any
|
||||
if (myEditCurrentArgument == mySelName[Vertex1] ||
|
||||
myEditCurrentArgument == mySelName[Vertex2] ||
|
||||
myEditCurrentArgument == mySelName[Vertex3] ||
|
||||
myEditCurrentArgument == mySelName[Vertex4] ) {
|
||||
globalSelection( GEOM_POINT );
|
||||
myEditCurrentArgument == mySelName[Vertex4])
|
||||
{
|
||||
localSelection(GEOM::GEOM_Object::_nil(), TopAbs_VERTEX); //Select Vertices on All Shapes
|
||||
}
|
||||
else {
|
||||
globalSelection( GEOM_EDGE );
|
||||
else
|
||||
{
|
||||
localSelection(GEOM::GEOM_Object::_nil(), TopAbs_EDGE); //Select Edges on All Shapes
|
||||
}
|
||||
|
||||
SelectionIntoArgument();
|
||||
connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
|
||||
this, SLOT(SelectionIntoArgument()));
|
||||
}
|
||||
|
||||
//=================================================================================
|
||||
@ -411,18 +531,18 @@ bool BlocksGUI_QuadFaceDlg::execute( ObjectList& objects )
|
||||
|
||||
switch (getConstructorId()) {
|
||||
case 0:
|
||||
anObj = GEOM::GEOM_IBlocksOperations::_narrow( getOperation() )->MakeQuad4Vertices
|
||||
( myShape1, myShape2, myShape3, myShape4 );
|
||||
anObj = GEOM::GEOM_IBlocksOperations::_narrow(getOperation())->
|
||||
MakeQuad4Vertices(myShape1, myShape2, myShape3, myShape4);
|
||||
res = true;
|
||||
break;
|
||||
case 1:
|
||||
anObj = GEOM::GEOM_IBlocksOperations::_narrow( getOperation() )->MakeQuad2Edges
|
||||
( myShape1, myShape2 );
|
||||
anObj = GEOM::GEOM_IBlocksOperations::_narrow(getOperation())->
|
||||
MakeQuad2Edges(myShape1, myShape2);
|
||||
res = true;
|
||||
break;
|
||||
case 2:
|
||||
anObj = GEOM::GEOM_IBlocksOperations::_narrow( getOperation() )->MakeQuad
|
||||
( myShape1, myShape2, myShape3, myShape4 );
|
||||
anObj = GEOM::GEOM_IBlocksOperations::_narrow(getOperation())->
|
||||
MakeQuad(myShape1, myShape2, myShape3, myShape4);
|
||||
res = true;
|
||||
break;
|
||||
default:
|
||||
@ -434,3 +554,32 @@ bool BlocksGUI_QuadFaceDlg::execute( ObjectList& objects )
|
||||
|
||||
return res;
|
||||
}
|
||||
|
||||
//=================================================================================
|
||||
// function : addSubshapeToStudy
|
||||
// purpose : virtual method to add new SubObjects if local selection
|
||||
//=================================================================================
|
||||
void BlocksGUI_QuadFaceDlg::addSubshapesToStudy()
|
||||
{
|
||||
QMap<QString, GEOM::GEOM_Object_var> objMap;
|
||||
|
||||
switch (getConstructorId()) {
|
||||
case 0:
|
||||
objMap[mySelName[Vertex1]->text()] = myShape1;
|
||||
objMap[mySelName[Vertex2]->text()] = myShape2;
|
||||
objMap[mySelName[Vertex3]->text()] = myShape3;
|
||||
objMap[mySelName[Vertex4]->text()] = myShape4;
|
||||
break;
|
||||
case 1:
|
||||
objMap[mySelName[Edge12]->text()] = myShape1;
|
||||
objMap[mySelName[Edge22]->text()] = myShape2;
|
||||
break;
|
||||
case 2:
|
||||
objMap[mySelName[Edge14]->text()] = myShape1;
|
||||
objMap[mySelName[Edge24]->text()] = myShape2;
|
||||
objMap[mySelName[Edge34]->text()] = myShape3;
|
||||
objMap[mySelName[Edge44]->text()] = myShape4;
|
||||
break;
|
||||
}
|
||||
addSubshapesToFather(objMap);
|
||||
}
|
||||
|
||||
@ -54,6 +54,7 @@ protected:
|
||||
virtual GEOM::GEOM_IOperations_ptr createOperation();
|
||||
virtual bool isValid (QString&);
|
||||
virtual bool execute (ObjectList&);
|
||||
virtual void addSubshapesToStudy();
|
||||
|
||||
private:
|
||||
void Init();
|
||||
@ -71,6 +72,9 @@ private:
|
||||
GEOM::GEOM_Object_var myShape3;
|
||||
GEOM::GEOM_Object_var myShape4;
|
||||
|
||||
// to initialize the first selection field with a selected object on the dialog creation
|
||||
bool myInitial;
|
||||
|
||||
QGroupBox* myGrp1;
|
||||
QGroupBox* myGrp2;
|
||||
QGroupBox* myGrp3;
|
||||
|
||||
@ -37,6 +37,7 @@
|
||||
#include <LightApp_SelectionMgr.h>
|
||||
#include <OCCViewer_ViewModel.h>
|
||||
|
||||
// OCCT Includes
|
||||
#include <TColStd_IndexedMapOfInteger.hxx>
|
||||
|
||||
//=================================================================================
|
||||
@ -44,7 +45,8 @@
|
||||
// purpose : Constructs a BlocksGUI_TrsfDlg which is a child of 'parent'.
|
||||
//=================================================================================
|
||||
BlocksGUI_TrsfDlg::BlocksGUI_TrsfDlg (GeometryGUI* theGeometryGUI, QWidget* parent)
|
||||
: GEOMBase_Skeleton( theGeometryGUI, parent )
|
||||
: GEOMBase_Skeleton(theGeometryGUI, parent),
|
||||
myInitial(true)
|
||||
{
|
||||
SUIT_ResourceMgr* aResMgr = myGeomGUI->getApp()->resourceMgr();
|
||||
QPixmap image1 (aResMgr->loadPixmap("GEOM", tr("ICON_DLG_BLOCK_MULTITRSF_SIMPLE")));
|
||||
@ -119,8 +121,7 @@ void BlocksGUI_TrsfDlg::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)));
|
||||
|
||||
QMap<int, QPushButton*>::iterator anIterBtn;
|
||||
for (anIterBtn = mySelBtn.begin(); anIterBtn != mySelBtn.end(); ++anIterBtn)
|
||||
@ -130,9 +131,6 @@ void BlocksGUI_TrsfDlg::Init()
|
||||
for (anIterSpin = mySpinBox.begin(); anIterSpin != mySpinBox.end(); ++anIterSpin)
|
||||
connect(anIterSpin.value(), SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double)));
|
||||
|
||||
connect( ( (SalomeApp_Application*)( SUIT_Session::session()->activeApplication() ) )->selectionMgr(),
|
||||
SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) ) ;
|
||||
|
||||
// init controls and fields
|
||||
initName(tr("GEOM_BLOCK_MULTITRSF"));
|
||||
|
||||
@ -151,45 +149,41 @@ void BlocksGUI_TrsfDlg::ConstructorsClicked( int constructorId )
|
||||
|
||||
myConstructorId = constructorId;
|
||||
|
||||
switch ( constructorId ) {
|
||||
case 0:
|
||||
myGrp2->hide();
|
||||
myGrp1->show();
|
||||
mySpinBox[SpinBox1]->setValue( 2.0 );
|
||||
myEditCurrentArgument = mySelName[MainObj1];
|
||||
myFaces[Face1] = -1;
|
||||
myFaces[Face2] = -1;
|
||||
break;
|
||||
case 1:
|
||||
myGrp1->hide();
|
||||
myGrp2->show();
|
||||
mySpinBox[SpinBox2U]->setValue( 2.0 );
|
||||
mySpinBox[SpinBox2V]->setValue( 2.0 );
|
||||
myEditCurrentArgument = mySelName[MainObj2];
|
||||
myFaces[Face1U] = -1;
|
||||
myFaces[Face2U] = -1;
|
||||
myFaces[Face1V] = -1;
|
||||
myFaces[Face2V] = -1;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
// init fields
|
||||
myShape = GEOM::GEOM_Object::_nil();
|
||||
myFaces[Face1] = myFaces[Face2] = -1;
|
||||
myFaces[Face1U] = myFaces[Face2U] = -1;
|
||||
myFaces[Face1V] = myFaces[Face2V] = -1;
|
||||
|
||||
// clear line edits
|
||||
QMap<int, QLineEdit*>::iterator anIterLE;
|
||||
for (anIterLE = mySelName.begin(); anIterLE != mySelName.end(); ++anIterLE)
|
||||
anIterLE.value()->setText("");
|
||||
|
||||
// init fields
|
||||
myShape = GEOM::GEOM_Object::_nil();
|
||||
switch (constructorId) {
|
||||
case 0:
|
||||
myGrp2->hide();
|
||||
myGrp1->show();
|
||||
mySpinBox[SpinBox1]->setValue(2.0);
|
||||
mySelBtn[MainObj1]->click();
|
||||
break;
|
||||
case 1:
|
||||
myGrp1->hide();
|
||||
myGrp2->show();
|
||||
mySpinBox[SpinBox2U]->setValue(2.0);
|
||||
mySpinBox[SpinBox2V]->setValue(2.0);
|
||||
mySelBtn[MainObj2]->click();
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
qApp->processEvents();
|
||||
updateGeometry();
|
||||
resize(minimumSize());
|
||||
|
||||
activateSelection();
|
||||
// enableWidgets();
|
||||
// displayPreview();
|
||||
// on dialog initialization we init the first field with a selected object (if any)
|
||||
SelectionIntoArgument();
|
||||
}
|
||||
|
||||
//=================================================================================
|
||||
@ -217,7 +211,7 @@ bool BlocksGUI_TrsfDlg::ClickOnApply()
|
||||
|
||||
//=================================================================================
|
||||
// function : SelectionIntoArgument()
|
||||
// purpose : Called when selection has changed
|
||||
// purpose : Called when selection is changed or on dialog initialization or activation
|
||||
//=================================================================================
|
||||
void BlocksGUI_TrsfDlg::SelectionIntoArgument()
|
||||
{
|
||||
@ -238,49 +232,87 @@ void BlocksGUI_TrsfDlg::SelectionIntoArgument()
|
||||
SALOME_ListIO aSelList;
|
||||
aSelMgr->selectedObjects(aSelList);
|
||||
|
||||
QString aName;
|
||||
GEOM::GEOM_Object_var anObj = GEOM::GEOM_Object::_nil();
|
||||
|
||||
if (aCurrFocus == MainObj1 || aCurrFocus == MainObj2)
|
||||
{
|
||||
// If selection of main object is activated
|
||||
if ( aCurrFocus == MainObj1 || aCurrFocus == MainObj2 ) {
|
||||
if (aSelList.Extent() == 1) {
|
||||
Standard_Boolean aResult = Standard_False;
|
||||
GEOM::GEOM_Object_var anObj =
|
||||
GEOMBase::ConvertIOinGEOMObject(aSelList.First(), aResult);
|
||||
anObj = GEOMBase::ConvertIOinGEOMObject(aSelList.First(), aResult);
|
||||
|
||||
if (aResult && !anObj->_is_nil() && GEOMBase::IsShape(anObj)) {
|
||||
aName = GEOMBase::GetName(anObj);
|
||||
}
|
||||
}
|
||||
myEditCurrentArgument->setText(aName);
|
||||
myShape = anObj;
|
||||
mySelName[aCurrFocus]->setText( GEOMBase::GetName( anObj ) );
|
||||
enableWidgets();
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
myShape = GEOM::GEOM_Object::_nil();
|
||||
enableWidgets();
|
||||
}
|
||||
// If face selection is activated
|
||||
else if (aCurrFocus == Face1 || aCurrFocus == Face2 ||
|
||||
aCurrFocus == Face1U || aCurrFocus == Face2U ||
|
||||
aCurrFocus == Face1V || aCurrFocus == Face2V) {
|
||||
// If face selection is activated
|
||||
int anIndex = -1;
|
||||
if (aSelList.Extent() == 1) {
|
||||
Standard_Boolean aResult = Standard_False;
|
||||
GEOM::GEOM_Object_var anObj =
|
||||
GEOMBase::ConvertIOinGEOMObject(aSelList.First(), aResult);
|
||||
|
||||
anObj = GEOMBase::ConvertIOinGEOMObject(aSelList.First(), aResult);
|
||||
if (aResult && !anObj->_is_nil() && GEOMBase::IsShape(anObj)) {
|
||||
aName = GEOMBase::GetName(anObj);
|
||||
TColStd_IndexedMapOfInteger anIndexes;
|
||||
myGeomGUI->getApp()->selectionMgr()->GetIndexes(aSelList.First(), anIndexes);
|
||||
aSelMgr->GetIndexes(aSelList.First(), anIndexes);
|
||||
|
||||
if (anIndexes.Extent() == 1) {
|
||||
int anIndex = anIndexes( 1 );
|
||||
QString aFaceName = QString( GEOMBase::GetName( anObj ) ) + ":%1";
|
||||
myEditCurrentArgument->setText( aFaceName.arg( anIndex ) );
|
||||
anIndex = anIndexes(1);
|
||||
aName += QString(":face_%1").arg(anIndex);
|
||||
}
|
||||
}
|
||||
}
|
||||
myEditCurrentArgument->setText(aName);
|
||||
myFaces[aCurrFocus] = anIndex;
|
||||
displayPreview();
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
myFaces[aCurrFocus] = -1;
|
||||
switch (aCurrFocus) {
|
||||
// 1D
|
||||
case MainObj1:
|
||||
if (!myShape->_is_nil() && myFaces[Face1] == -1)
|
||||
mySelBtn[Face1]->click();
|
||||
break;
|
||||
case Face1:
|
||||
if (myFaces[Face1] != -1 && myFaces[Face2] == -1)
|
||||
mySelBtn[Face2]->click();
|
||||
break;
|
||||
case Face2:
|
||||
if (myFaces[Face2] != -1 && myShape->_is_nil())
|
||||
mySelBtn[MainObj1]->click();
|
||||
break;
|
||||
|
||||
// 2D
|
||||
case MainObj2:
|
||||
if (!myShape->_is_nil() && myFaces[Face1U] == -1)
|
||||
mySelBtn[Face1U]->click();
|
||||
break;
|
||||
case Face1U:
|
||||
if (myFaces[Face1U] != -1 && myFaces[Face2U] == -1)
|
||||
mySelBtn[Face2U]->click();
|
||||
break;
|
||||
case Face2U:
|
||||
if (myFaces[Face2U] != -1 && myFaces[Face1V] == -1)
|
||||
mySelBtn[Face1V]->click();
|
||||
break;
|
||||
case Face1V:
|
||||
if (myFaces[Face1V] != -1 && myFaces[Face2V] == -1)
|
||||
mySelBtn[Face2V]->click();
|
||||
break;
|
||||
case Face2V:
|
||||
if (myFaces[Face2V] != -1 && myShape->_is_nil())
|
||||
mySelBtn[MainObj1]->click();
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
@ -292,15 +324,57 @@ void BlocksGUI_TrsfDlg::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:
|
||||
mySelBtn[MainObj1]->setDown(false);
|
||||
mySelBtn[Face1]->setDown(false);
|
||||
mySelBtn[Face2]->setDown(false);
|
||||
|
||||
mySelName[MainObj1]->setEnabled(false);
|
||||
mySelName[Face1]->setEnabled(false);
|
||||
mySelName[Face2]->setEnabled(false);
|
||||
break;
|
||||
case 1:
|
||||
mySelBtn[MainObj2]->setDown(false);
|
||||
mySelBtn[Face1U]->setDown(false);
|
||||
mySelBtn[Face2U]->setDown(false);
|
||||
mySelBtn[Face1V]->setDown(false);
|
||||
mySelBtn[Face2V]->setDown(false);
|
||||
|
||||
mySelName[MainObj2]->setEnabled(false);
|
||||
mySelName[Face1U]->setEnabled(false);
|
||||
mySelName[Face2U]->setEnabled(false);
|
||||
mySelName[Face1V]->setEnabled(false);
|
||||
mySelName[Face2V]->setEnabled(false);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
// enable push button
|
||||
aSender->setDown(true);
|
||||
|
||||
// set line edit as current argument
|
||||
QMap<int, QPushButton*>::iterator anIter;
|
||||
for (anIter = mySelBtn.begin(); anIter != mySelBtn.end(); ++anIter) {
|
||||
if (anIter.value() == aSender) {
|
||||
mySelName[anIter.key()]->setFocus();
|
||||
myEditCurrentArgument = mySelName[anIter.key()];
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
// enable line edit
|
||||
myEditCurrentArgument->setEnabled(true);
|
||||
myEditCurrentArgument->setFocus();
|
||||
|
||||
activateSelection();
|
||||
}
|
||||
|
||||
@ -311,10 +385,9 @@ void BlocksGUI_TrsfDlg::SetEditCurrentArgument()
|
||||
void BlocksGUI_TrsfDlg::ActivateThisDialog()
|
||||
{
|
||||
GEOMBase_Skeleton::ActivateThisDialog();
|
||||
connect( ( (SalomeApp_Application*)( SUIT_Session::session()->activeApplication() ) )->selectionMgr(),
|
||||
SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) );
|
||||
|
||||
activateSelection();
|
||||
|
||||
// ??
|
||||
displayPreview();
|
||||
}
|
||||
|
||||
@ -325,7 +398,7 @@ void BlocksGUI_TrsfDlg::ActivateThisDialog()
|
||||
void BlocksGUI_TrsfDlg::enterEvent (QEvent*)
|
||||
{
|
||||
if (!mainFrame()->GroupConstructors->isEnabled())
|
||||
this->ActivateThisDialog();
|
||||
ActivateThisDialog();
|
||||
}
|
||||
|
||||
//=================================================================================
|
||||
@ -395,28 +468,22 @@ void BlocksGUI_TrsfDlg::createSpinWg( const QString& theLbl,
|
||||
//=================================================================================
|
||||
void BlocksGUI_TrsfDlg::activateSelection()
|
||||
{
|
||||
globalSelection(GEOM_ALLSHAPES);
|
||||
if (!myShape->_is_nil() &&
|
||||
(myEditCurrentArgument == mySelName[Face1 ] ||
|
||||
myEditCurrentArgument == mySelName[Face2 ] ||
|
||||
myEditCurrentArgument == mySelName[Face1U] ||
|
||||
myEditCurrentArgument == mySelName[Face2U] ||
|
||||
myEditCurrentArgument == mySelName[Face1V] ||
|
||||
myEditCurrentArgument == mySelName[ Face2V ] ) ) {
|
||||
|
||||
myEditCurrentArgument == mySelName[Face2V]))
|
||||
{
|
||||
// Local selection is available only in the OCC Viewer
|
||||
if ( SUIT_Session::session()->activeApplication()->desktop()->activeWindow()->getViewManager()->getType()
|
||||
== OCCViewer_Viewer::Type() ) {
|
||||
if (getDesktop()->activeWindow()->getViewManager()->getType() == OCCViewer_Viewer::Type()) {
|
||||
localSelection(myShape, TopAbs_FACE);
|
||||
}
|
||||
else {
|
||||
return;
|
||||
}
|
||||
}
|
||||
else {
|
||||
globalSelection( GEOM_ALLSHAPES );
|
||||
}
|
||||
|
||||
SelectionIntoArgument();
|
||||
connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
|
||||
this, SLOT(SelectionIntoArgument()));
|
||||
}
|
||||
|
||||
//=================================================================================
|
||||
@ -430,10 +497,10 @@ void BlocksGUI_TrsfDlg::enableWidgets()
|
||||
bool toEnable = !myShape->_is_nil();
|
||||
|
||||
if (anId == 0) {
|
||||
mySelName[Face1]->setEnabled( toEnable );
|
||||
mySelName[Face2]->setEnabled( toEnable );
|
||||
mySelBtn[Face1]->setEnabled( toEnable );
|
||||
mySelBtn[Face2]->setEnabled( toEnable );
|
||||
//mySelName[Face1]->setEnabled(toEnable);
|
||||
//mySelName[Face2]->setEnabled(toEnable);
|
||||
//mySelBtn[Face1]->setEnabled(toEnable);
|
||||
//mySelBtn[Face2]->setEnabled(toEnable);
|
||||
|
||||
if (!toEnable) {
|
||||
mySelName[Face1]->setText("");
|
||||
@ -443,14 +510,14 @@ void BlocksGUI_TrsfDlg::enableWidgets()
|
||||
}
|
||||
}
|
||||
else if (anId == 1) {
|
||||
mySelName[Face1U]->setEnabled( toEnable );
|
||||
mySelName[Face2U]->setEnabled( toEnable );
|
||||
mySelName[Face1V]->setEnabled( toEnable );
|
||||
mySelName[Face2V]->setEnabled( toEnable );
|
||||
mySelBtn[Face1U]->setEnabled( toEnable );
|
||||
mySelBtn[Face2U]->setEnabled( toEnable );
|
||||
mySelBtn[Face1V]->setEnabled( toEnable );
|
||||
mySelBtn[Face2V]->setEnabled( toEnable );
|
||||
//mySelName[Face1U]->setEnabled(toEnable);
|
||||
//mySelName[Face2U]->setEnabled(toEnable);
|
||||
//mySelName[Face1V]->setEnabled(toEnable);
|
||||
//mySelName[Face2V]->setEnabled(toEnable);
|
||||
//mySelBtn[Face1U]->setEnabled(toEnable);
|
||||
//mySelBtn[Face2U]->setEnabled(toEnable);
|
||||
//mySelBtn[Face1V]->setEnabled(toEnable);
|
||||
//mySelBtn[Face2V]->setEnabled(toEnable);
|
||||
|
||||
if (!toEnable) {
|
||||
mySelName[Face1U]->setText("");
|
||||
@ -475,7 +542,7 @@ GEOM::GEOM_IOperations_ptr BlocksGUI_TrsfDlg::createOperation()
|
||||
}
|
||||
|
||||
//=================================================================================
|
||||
// function : ClickOnApply()
|
||||
// function : isValid
|
||||
// purpose : Verify validity of input data
|
||||
//=================================================================================
|
||||
bool BlocksGUI_TrsfDlg::isValid (QString&)
|
||||
@ -506,24 +573,23 @@ bool BlocksGUI_TrsfDlg::execute( ObjectList& objects )
|
||||
|
||||
switch (getConstructorId()) {
|
||||
case 0:
|
||||
anObj = GEOM::GEOM_IBlocksOperations::_narrow( getOperation() )->MakeMultiTransformation1D
|
||||
( myShape,
|
||||
myFaces[Face1],
|
||||
myFaces[Face2],
|
||||
anObj = GEOM::GEOM_IBlocksOperations::_narrow(getOperation())->
|
||||
MakeMultiTransformation1D(myShape,
|
||||
myFaces[Face1], myFaces[Face2],
|
||||
(int)mySpinBox[SpinBox1]->value());
|
||||
res = true;
|
||||
break;
|
||||
case 1:
|
||||
anObj = GEOM::GEOM_IBlocksOperations::_narrow( getOperation() )->MakeMultiTransformation2D
|
||||
( myShape,
|
||||
myFaces[Face1U],
|
||||
myFaces[Face2U],
|
||||
anObj = GEOM::GEOM_IBlocksOperations::_narrow(getOperation())->
|
||||
MakeMultiTransformation2D (myShape,
|
||||
myFaces[Face1U], myFaces[Face2U],
|
||||
(int)mySpinBox[SpinBox2U]->value(),
|
||||
myFaces[Face1V],
|
||||
myFaces[Face2V],
|
||||
myFaces[Face1V], myFaces[Face2V],
|
||||
(int)mySpinBox[SpinBox2V]->value());
|
||||
res = true;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
if (!anObj->_is_nil())
|
||||
|
||||
@ -59,10 +59,8 @@ private:
|
||||
void Init();
|
||||
void enterEvent(QEvent*);
|
||||
|
||||
void createSelWg( const QString&, QPixmap&,
|
||||
QWidget*, const int );
|
||||
void createSpinWg( const QString&, QWidget*,
|
||||
const int );
|
||||
void createSelWg (const QString&, QPixmap&, QWidget*, const int);
|
||||
void createSpinWg (const QString&, QWidget*, const int);
|
||||
void activateSelection();
|
||||
void enableWidgets();
|
||||
|
||||
@ -72,6 +70,9 @@ private:
|
||||
GEOM::GEOM_Object_var myShape;
|
||||
QMap<int, int> myFaces;
|
||||
|
||||
// to initialize the first selection field with a selected object on the dialog creation
|
||||
bool myInitial;
|
||||
|
||||
QGroupBox* myGrp1;
|
||||
QGroupBox* myGrp2;
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user