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

Bugs 16640, 19050: Improve selection mechanism in GEOM dialog boxes.

Browse Source
This commit is contained in:
jfa 2008-09-15 08:10:33 +00:00
parent 64df74e177
commit 0f6567722e
2 changed files with 302 additions and 175 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

463
src/BlocksGUI/BlocksGUI_BlockDlg.cxx
View File

@ -35,59 +35,64 @@
#include <GEOMImpl_Types.hxx> #include <GEOMImpl_Types.hxx>
// OCCT Includes
#include <TColStd_IndexedMapOfInteger.hxx>
//================================================================================= //=================================================================================
// class : BlocksGUI_BlockDlg() // class : BlocksGUI_BlockDlg()
// purpose : Constructs a BlocksGUI_BlockDlg which is a child of 'parent'. // purpose : Constructs a BlocksGUI_BlockDlg which is a child of 'parent'.
//================================================================================= //=================================================================================
BlocksGUI_BlockDlg::BlocksGUI_BlockDlg( GeometryGUI* theGeometryGUI, QWidget* 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 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" ) ) ); QPixmap image1 (SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM", tr("ICON_DLG_BLOCK_6F")));
QPixmap imageS( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_SELECT" ) ) ); QPixmap imageS (SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM", tr("ICON_SELECT")));
setWindowTitle( tr( "GEOM_BLOCK_TITLE" ) ); setWindowTitle(tr("GEOM_BLOCK_TITLE"));
/***************************************************************/ /***************************************************************/
mainFrame()->GroupConstructors->setTitle( tr( "GEOM_BLOCK" ) ); mainFrame()->GroupConstructors->setTitle(tr("GEOM_BLOCK"));
mainFrame()->RadioButton1->setIcon( image0 ); mainFrame()->RadioButton1->setIcon(image0);
mainFrame()->RadioButton2->setIcon( image1 ); mainFrame()->RadioButton2->setIcon(image1);
mainFrame()->RadioButton3->setAttribute( Qt::WA_DeleteOnClose ); mainFrame()->RadioButton3->setAttribute(Qt::WA_DeleteOnClose);
mainFrame()->RadioButton3->close(); mainFrame()->RadioButton3->close();
// Create first group // Create first group
Group2F = new DlgRef_2Sel( centralWidget() ); Group2F = new DlgRef_2Sel (centralWidget());
Group2F->GroupBox1->setTitle( tr( "GEOM_ARGUMENTS" ) ); Group2F->GroupBox1->setTitle(tr("GEOM_ARGUMENTS"));
Group2F->TextLabel1->setText( tr( "FACE_1" ) ); Group2F->TextLabel1->setText(tr("FACE_1"));
Group2F->TextLabel2->setText( tr( "FACE_2" ) ); Group2F->TextLabel2->setText(tr("FACE_2"));
Group2F->PushButton1->setIcon( imageS ); Group2F->PushButton1->setIcon(imageS);
Group2F->PushButton2->setIcon( imageS ); Group2F->PushButton2->setIcon(imageS);
// Create second group // Create second group
Group6F = new DlgRef_6Sel( centralWidget() ); Group6F = new DlgRef_6Sel (centralWidget());
Group6F->GroupBox1->setTitle( tr( "GEOM_ARGUMENTS" ) ); Group6F->GroupBox1->setTitle(tr("GEOM_ARGUMENTS"));
Group6F->TextLabel1->setText( tr( "FACE_1" ) ); Group6F->TextLabel1->setText(tr("FACE_1"));
Group6F->TextLabel2->setText( tr( "FACE_2" ) ); Group6F->TextLabel2->setText(tr("FACE_2"));
Group6F->TextLabel3->setText( tr( "FACE_3" ) ); Group6F->TextLabel3->setText(tr("FACE_3"));
Group6F->TextLabel4->setText( tr( "FACE_4" ) ); Group6F->TextLabel4->setText(tr("FACE_4"));
Group6F->TextLabel5->setText( tr( "FACE_5" ) ); Group6F->TextLabel5->setText(tr("FACE_5"));
Group6F->TextLabel6->setText( tr( "FACE_6" ) ); Group6F->TextLabel6->setText(tr("FACE_6"));
Group6F->PushButton1->setIcon( imageS ); Group6F->PushButton1->setIcon(imageS);
Group6F->PushButton2->setIcon( imageS ); Group6F->PushButton2->setIcon(imageS);
Group6F->PushButton3->setIcon( imageS ); Group6F->PushButton3->setIcon(imageS);
Group6F->PushButton4->setIcon( imageS ); Group6F->PushButton4->setIcon(imageS);
Group6F->PushButton5->setIcon( imageS ); Group6F->PushButton5->setIcon(imageS);
Group6F->PushButton6->setIcon( imageS ); Group6F->PushButton6->setIcon(imageS);
// Add groups to layout // Add groups to layout
QVBoxLayout* layout = new QVBoxLayout( centralWidget() ); QVBoxLayout* layout = new QVBoxLayout (centralWidget());
layout->setMargin( 0 ); layout->setSpacing( 6 ); layout->setMargin(0);
layout->addWidget( Group2F ); layout->setSpacing(6);
layout->addWidget( Group6F ); layout->addWidget(Group2F);
layout->addWidget(Group6F);
/***************************************************************/ /***************************************************************/
setHelpFileName( "build_by_blocks_page.html#hexa_solid_anchor" ); setHelpFileName("build_by_blocks_page.html#hexa_solid_anchor");
Init(); Init();
} }
@ -108,91 +113,87 @@ BlocksGUI_BlockDlg::~BlocksGUI_BlockDlg()
void BlocksGUI_BlockDlg::Init() void BlocksGUI_BlockDlg::Init()
{ {
// init variables // init variables
Group2F->LineEdit1->setReadOnly( true ); Group2F->LineEdit1->setReadOnly(true);
Group2F->LineEdit2->setReadOnly( true ); Group2F->LineEdit2->setReadOnly(true);
Group6F->LineEdit1->setReadOnly( true ); Group6F->LineEdit1->setReadOnly(true);
Group6F->LineEdit2->setReadOnly( true ); Group6F->LineEdit2->setReadOnly(true);
Group6F->LineEdit3->setReadOnly( true ); Group6F->LineEdit3->setReadOnly(true);
Group6F->LineEdit4->setReadOnly( true ); Group6F->LineEdit4->setReadOnly(true);
Group6F->LineEdit5->setReadOnly( true ); Group6F->LineEdit5->setReadOnly(true);
Group6F->LineEdit6->setReadOnly( true ); Group6F->LineEdit6->setReadOnly(true);
// signals and slots connections // signals and slots connections
connect( buttonOk(), SIGNAL( clicked() ), this, SLOT( ClickOnOk() ) ); connect(buttonOk(), SIGNAL(clicked()), this, SLOT(ClickOnOk()));
connect( buttonApply(), SIGNAL( clicked() ), this, SLOT( ClickOnApply() ) ); connect(buttonApply(), SIGNAL(clicked()), this, SLOT(ClickOnApply()));
connect( this, SIGNAL( constructorsClicked( int ) ), connect(this, SIGNAL(constructorsClicked(int)), this, SLOT(ConstructorsClicked(int)));
this, SLOT( ConstructorsClicked( int ) ) );
connect( Group2F->PushButton1, SIGNAL( clicked() ), this, SLOT( SetEditCurrentArgument() ) ); connect(Group2F->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
connect( Group2F->PushButton2, SIGNAL( clicked() ), this, SLOT( SetEditCurrentArgument() ) ); connect(Group2F->PushButton2, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
connect( Group6F->PushButton1, SIGNAL( clicked() ), this, SLOT( SetEditCurrentArgument() ) ); connect(Group6F->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
connect( Group6F->PushButton2, SIGNAL( clicked() ), this, SLOT( SetEditCurrentArgument() ) ); connect(Group6F->PushButton2, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
connect( Group6F->PushButton3, SIGNAL( clicked() ), this, SLOT( SetEditCurrentArgument() ) ); connect(Group6F->PushButton3, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
connect( Group6F->PushButton4, SIGNAL( clicked() ), this, SLOT( SetEditCurrentArgument() ) ); connect(Group6F->PushButton4, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
connect( Group6F->PushButton5, SIGNAL( clicked() ), this, SLOT( SetEditCurrentArgument() ) ); connect(Group6F->PushButton5, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
connect( Group6F->PushButton6, 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 // init controls and fields
initName( tr( "GEOM_BLOCK" ) ); initName(tr("GEOM_BLOCK"));
myConstructorId = -1; myConstructorId = -1;
ConstructorsClicked( 0 ); ConstructorsClicked(0);
} }
//================================================================================= //=================================================================================
// function : ConstructorsClicked() // function : ConstructorsClicked()
// purpose : Radio button management // purpose : Radio button management
//================================================================================= //=================================================================================
void BlocksGUI_BlockDlg::ConstructorsClicked( int constructorId ) void BlocksGUI_BlockDlg::ConstructorsClicked (int constructorId)
{ {
if ( myConstructorId == constructorId ) if (myConstructorId == constructorId)
return; return;
myConstructorId = constructorId; myConstructorId = constructorId;
switch ( constructorId ) {
case 0:
Group6F->hide();
Group2F->show();
myEditCurrentArgument = Group2F->LineEdit1;
Group2F->LineEdit1->setText( tr( "" ) );
Group2F->LineEdit2->setText( tr( "" ) );
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( "" ) );
break;
default:
break;
}
// init fields // init fields
myFace1 = myFace2 = GEOM::GEOM_Object::_nil(); myFace1 = myFace2 = GEOM::GEOM_Object::_nil();
myFace3 = myFace4 = myFace5 = myFace6 = myFace1; myFace3 = myFace4 = myFace5 = myFace6 = myFace1;
switch (constructorId) {
case 0:
Group6F->hide();
Group2F->show();
Group2F->LineEdit1->setText(tr(""));
Group2F->LineEdit2->setText(tr(""));
Group2F->PushButton1->click();
break;
case 1:
Group2F->hide();
Group6F->show();
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;
}
qApp->processEvents(); qApp->processEvents();
updateGeometry(); updateGeometry();
resize( minimumSize() ); resize(minimumSize());
globalSelection( GEOM_FACE ); // on dialog initialization we init the first field with a selected object (if any)
SelectionIntoArgument(); SelectionIntoArgument();
connect( ( (SalomeApp_Application*)( SUIT_Session::session()->activeApplication() ) )->selectionMgr(),
SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) );
} }
//================================================================================= //=================================================================================
@ -201,7 +202,7 @@ void BlocksGUI_BlockDlg::ConstructorsClicked( int constructorId )
//================================================================================= //=================================================================================
void BlocksGUI_BlockDlg::ClickOnOk() void BlocksGUI_BlockDlg::ClickOnOk()
{ {
if ( ClickOnApply() ) if (ClickOnApply())
ClickOnCancel(); ClickOnCancel();
} }
@ -211,7 +212,7 @@ void BlocksGUI_BlockDlg::ClickOnOk()
//================================================================================= //=================================================================================
bool BlocksGUI_BlockDlg::ClickOnApply() bool BlocksGUI_BlockDlg::ClickOnApply()
{ {
if ( !onAccept() ) if (!onAccept())
return false; return false;
initName(); initName();
@ -220,55 +221,111 @@ bool BlocksGUI_BlockDlg::ClickOnApply()
//================================================================================= //=================================================================================
// function : SelectionIntoArgument() // 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() void BlocksGUI_BlockDlg::SelectionIntoArgument()
{ {
erasePreview(); erasePreview();
myEditCurrentArgument->setText( "" ); myEditCurrentArgument->setText("");
if ( IObjectCount() != 1 ) { LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
if ( myEditCurrentArgument == Group2F->LineEdit1 || SALOME_ListIO aSelList;
myEditCurrentArgument == Group6F->LineEdit1 ) aSelMgr->selectedObjects(aSelList);
myFace1 = GEOM::GEOM_Object::_nil();
else if ( myEditCurrentArgument == Group2F->LineEdit2 || if (aSelList.Extent() != 1) {
myEditCurrentArgument == Group6F->LineEdit2 ) if (myEditCurrentArgument == Group2F->LineEdit1) myFace1 = GEOM::GEOM_Object::_nil();
myFace2 = GEOM::GEOM_Object::_nil(); else if (myEditCurrentArgument == Group2F->LineEdit2) myFace2 = GEOM::GEOM_Object::_nil();
else if ( myEditCurrentArgument == Group6F->LineEdit3 ) else if (myEditCurrentArgument == Group6F->LineEdit1) myFace1 = GEOM::GEOM_Object::_nil();
myFace3 = GEOM::GEOM_Object::_nil(); else if (myEditCurrentArgument == Group6F->LineEdit2) myFace2 = GEOM::GEOM_Object::_nil();
else if ( myEditCurrentArgument == Group6F->LineEdit4 ) else if (myEditCurrentArgument == Group6F->LineEdit3) myFace3 = GEOM::GEOM_Object::_nil();
myFace4 = GEOM::GEOM_Object::_nil(); else if (myEditCurrentArgument == Group6F->LineEdit4) myFace4 = GEOM::GEOM_Object::_nil();
else if ( myEditCurrentArgument == Group6F->LineEdit5 ) else if (myEditCurrentArgument == Group6F->LineEdit5) myFace5 = GEOM::GEOM_Object::_nil();
myFace5 = GEOM::GEOM_Object::_nil(); else if (myEditCurrentArgument == Group6F->LineEdit6) myFace6 = GEOM::GEOM_Object::_nil();
else if ( myEditCurrentArgument == Group6F->LineEdit6 )
myFace6 = GEOM::GEOM_Object::_nil();
return; return;
} }
// nbSel == 1 // nbSel == 1
Standard_Boolean testResult = Standard_False; Standard_Boolean testResult = Standard_False;
GEOM::GEOM_Object_var aSelectedObject = GEOM::GEOM_Object_var aSelectedObject =
GEOMBase::ConvertIOinGEOMObject( firstIObject(), testResult ); GEOMBase::ConvertIOinGEOMObject(aSelList.First(), testResult);
if ( !testResult || CORBA::is_nil( aSelectedObject ) ) if (!testResult || CORBA::is_nil(aSelectedObject))
return; return;
if ( myEditCurrentArgument == Group2F->LineEdit1 || QString aName = GEOMBase::GetName(aSelectedObject);
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;
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(); displayPreview();
} }
@ -281,35 +338,78 @@ void BlocksGUI_BlockDlg::SetEditCurrentArgument()
{ {
QPushButton* aSender = (QPushButton*)sender(); QPushButton* aSender = (QPushButton*)sender();
if ( aSender == Group2F->PushButton1 ) { // 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; myEditCurrentArgument = Group2F->LineEdit1;
} }
else if ( aSender == Group2F->PushButton2 ) { else if (aSender == Group2F->PushButton2) {
myEditCurrentArgument = Group2F->LineEdit2; myEditCurrentArgument = Group2F->LineEdit2;
} }
else if ( aSender == Group6F->PushButton1 ) { else if (aSender == Group6F->PushButton1) {
myEditCurrentArgument = Group6F->LineEdit1; myEditCurrentArgument = Group6F->LineEdit1;
} }
else if ( aSender == Group6F->PushButton2 ) { else if (aSender == Group6F->PushButton2) {
myEditCurrentArgument = Group6F->LineEdit2; myEditCurrentArgument = Group6F->LineEdit2;
} }
else if ( aSender == Group6F->PushButton3 ) { else if (aSender == Group6F->PushButton3) {
myEditCurrentArgument = Group6F->LineEdit3; myEditCurrentArgument = Group6F->LineEdit3;
} }
else if ( aSender == Group6F->PushButton4 ) { else if (aSender == Group6F->PushButton4) {
myEditCurrentArgument = Group6F->LineEdit4; myEditCurrentArgument = Group6F->LineEdit4;
} }
else if ( aSender == Group6F->PushButton5 ) { else if (aSender == Group6F->PushButton5) {
myEditCurrentArgument = Group6F->LineEdit5; myEditCurrentArgument = Group6F->LineEdit5;
} }
else if ( aSender == Group6F->PushButton6 ) { else if (aSender == Group6F->PushButton6) {
myEditCurrentArgument = Group6F->LineEdit6; myEditCurrentArgument = Group6F->LineEdit6;
} }
globalSelection( GEOM_FACE ); // enable line edit
myEditCurrentArgument->setEnabled(true);
myEditCurrentArgument->setFocus(); 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,21 +419,19 @@ void BlocksGUI_BlockDlg::SetEditCurrentArgument()
void BlocksGUI_BlockDlg::ActivateThisDialog() void BlocksGUI_BlockDlg::ActivateThisDialog()
{ {
GEOMBase_Skeleton::ActivateThisDialog(); GEOMBase_Skeleton::ActivateThisDialog();
connect( ( (SalomeApp_Application*)( SUIT_Session::session()->activeApplication() ) )->selectionMgr(), globalSelection(); // close local contexts, if any
SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) ); localSelection(GEOM::GEOM_Object::_nil(), TopAbs_FACE); //Select Faces on All Shapes
connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
globalSelection( GEOM_FACE ); this, SLOT(SelectionIntoArgument()));
SelectionIntoArgument();
} }
//================================================================================= //=================================================================================
// function : enterEvent() // function : enterEvent()
// purpose : // purpose :
//================================================================================= //=================================================================================
void BlocksGUI_BlockDlg::enterEvent( QEvent* ) void BlocksGUI_BlockDlg::enterEvent (QEvent*)
{ {
if ( !mainFrame()->GroupConstructors->isEnabled() ) if (!mainFrame()->GroupConstructors->isEnabled())
ActivateThisDialog(); ActivateThisDialog();
} }
@ -343,7 +441,7 @@ void BlocksGUI_BlockDlg::enterEvent( QEvent* )
//================================================================================= //=================================================================================
GEOM::GEOM_IOperations_ptr BlocksGUI_BlockDlg::createOperation() GEOM::GEOM_IOperations_ptr BlocksGUI_BlockDlg::createOperation()
{ {
return getGeomEngine()->GetIBlocksOperations( getStudyId() ); return getGeomEngine()->GetIBlocksOperations(getStudyId());
} }
//================================================================================= //=================================================================================
@ -353,14 +451,14 @@ GEOM::GEOM_IOperations_ptr BlocksGUI_BlockDlg::createOperation()
bool BlocksGUI_BlockDlg::isValid (QString&) bool BlocksGUI_BlockDlg::isValid (QString&)
{ {
bool ok = false; bool ok = false;
switch ( getConstructorId() ) { switch (getConstructorId()) {
case 0: case 0:
ok = !( myFace1->_is_nil() || myFace2->_is_nil() ); ok = !(myFace1->_is_nil() || myFace2->_is_nil());
break; break;
case 1: case 1:
ok = !( myFace1->_is_nil() || myFace2->_is_nil() || ok = !(myFace1->_is_nil() || myFace2->_is_nil() ||
myFace3->_is_nil() || myFace4->_is_nil() || myFace3->_is_nil() || myFace4->_is_nil() ||
myFace5->_is_nil() || myFace6->_is_nil() ); myFace5->_is_nil() || myFace6->_is_nil());
break; break;
default: default:
break; break;
@ -372,33 +470,58 @@ bool BlocksGUI_BlockDlg::isValid (QString&)
// function : execute // function : execute
// purpose : // purpose :
//================================================================================= //=================================================================================
bool BlocksGUI_BlockDlg::execute( ObjectList& objects ) bool BlocksGUI_BlockDlg::execute (ObjectList& objects)
{ {
bool res = false; bool res = false;
GEOM::GEOM_Object_var anObj; GEOM::GEOM_Object_var anObj;
switch ( getConstructorId() ) { switch (getConstructorId()) {
case 0: case 0:
if ( !CORBA::is_nil( myFace1 ) && !CORBA::is_nil( myFace2 ) ) { if (!CORBA::is_nil(myFace1) && !CORBA::is_nil(myFace2)) {
anObj = GEOM::GEOM_IBlocksOperations::_narrow( getOperation() )-> anObj = GEOM::GEOM_IBlocksOperations::_narrow(getOperation())->
MakeHexa2Faces( myFace1, myFace2 ); MakeHexa2Faces(myFace1, myFace2);
res = true; res = true;
} }
break; break;
case 1: case 1:
if ( !CORBA::is_nil( myFace1 ) && !CORBA::is_nil( myFace2 ) && if (!CORBA::is_nil(myFace1) && !CORBA::is_nil(myFace2) &&
!CORBA::is_nil(myFace3 ) && !CORBA::is_nil( myFace4 ) && !CORBA::is_nil(myFace3) && !CORBA::is_nil(myFace4) &&
!CORBA::is_nil( myFace5 ) && !CORBA::is_nil( myFace6 ) ) { !CORBA::is_nil(myFace5) && !CORBA::is_nil(myFace6)) {
anObj = GEOM::GEOM_IBlocksOperations::_narrow( getOperation() )-> anObj = GEOM::GEOM_IBlocksOperations::_narrow(getOperation())->
MakeHexa( myFace1, myFace2, myFace3, myFace4, myFace5, myFace6 ); MakeHexa(myFace1, myFace2, myFace3, myFace4, myFace5, myFace6);
res = true; res = true;
} }
break; break;
} }
if ( !anObj->_is_nil() ) if (!anObj->_is_nil())
objects.push_back( anObj._retn() ); objects.push_back(anObj._retn());
return res; 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);
}

14
src/BlocksGUI/BlocksGUI_BlockDlg.h
View File

@ -39,18 +39,19 @@ class BlocksGUI_BlockDlg : public GEOMBase_Skeleton
Q_OBJECT Q_OBJECT
public: public:
BlocksGUI_BlockDlg( GeometryGUI*, QWidget* ); BlocksGUI_BlockDlg (GeometryGUI*, QWidget*);
~BlocksGUI_BlockDlg(); ~BlocksGUI_BlockDlg();
protected: protected:
// redefined from GEOMBase_Helper // redefined from GEOMBase_Helper
virtual GEOM::GEOM_IOperations_ptr createOperation(); virtual GEOM::GEOM_IOperations_ptr createOperation();
virtual bool isValid( QString& ); virtual bool isValid (QString&);
virtual bool execute( ObjectList&); virtual bool execute (ObjectList&);
virtual void addSubshapesToStudy();
private: private:
void Init(); void Init();
void enterEvent( QEvent* ); void enterEvent (QEvent*);
private: private:
int myConstructorId; int myConstructorId;
@ -58,6 +59,9 @@ private:
GEOM::GEOM_Object_var myFace1, myFace2; GEOM::GEOM_Object_var myFace1, myFace2;
GEOM::GEOM_Object_var myFace3, myFace4, myFace5, myFace6; 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_2Sel* Group2F;
DlgRef_6Sel* Group6F; DlgRef_6Sel* Group6F;
@ -65,7 +69,7 @@ private slots:
void ClickOnOk(); void ClickOnOk();
bool ClickOnApply(); bool ClickOnApply();
void ActivateThisDialog(); void ActivateThisDialog();
void ConstructorsClicked( int ); void ConstructorsClicked (int);
void SelectionIntoArgument(); void SelectionIntoArgument();
void SetEditCurrentArgument(); void SetEditCurrentArgument();