#include "BlocksGUI_QuadFaceDlg.h"
-#include <GEOM_DlgRef.h>
+#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 )
+BlocksGUI_QuadFaceDlg::BlocksGUI_QuadFaceDlg (GeometryGUI* theGeometryGUI, QWidget* 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" ) ) );
- QPixmap image2( aResMgr->loadPixmap( "GEOM", tr( "ICON_DLG_QUAD_FACE_2_EDGE" ) ) );
- QPixmap image3( aResMgr->loadPixmap( "GEOM", tr( "ICON_DLG_QUAD_FACE_4_EDGE" ) ) );
- QPixmap imageS( aResMgr->loadPixmap( "GEOM", tr( "ICON_SELECT" ) ) );
+ QPixmap image1 (aResMgr->loadPixmap("GEOM", tr("ICON_DLG_QUAD_FACE_4_VERT")));
+ QPixmap image2 (aResMgr->loadPixmap("GEOM", tr("ICON_DLG_QUAD_FACE_2_EDGE")));
+ QPixmap image3 (aResMgr->loadPixmap("GEOM", tr("ICON_DLG_QUAD_FACE_4_EDGE")));
+ QPixmap imageS (aResMgr->loadPixmap("GEOM", tr("ICON_SELECT")));
- setWindowTitle( tr( "GEOM_QUAD_FACE_TITLE" ) );
+ setWindowTitle(tr("GEOM_QUAD_FACE_TITLE"));
/***************************************************************/
- mainFrame()->GroupConstructors->setTitle( tr( "GEOM_QUAD_FACE" ) );
+ mainFrame()->GroupConstructors->setTitle(tr("GEOM_QUAD_FACE"));
- mainFrame()->RadioButton1->setIcon( image1 );
- mainFrame()->RadioButton2->setIcon( image2 );
- mainFrame()->RadioButton3->setIcon( image3 );
+ mainFrame()->RadioButton1->setIcon(image1);
+ mainFrame()->RadioButton2->setIcon(image2);
+ mainFrame()->RadioButton3->setIcon(image3);
// Create first group
- myGrp1 = new QGroupBox( tr( "GEOM_ARGUMENTS" ), centralWidget() );
+ myGrp1 = new QGroupBox(tr("GEOM_ARGUMENTS"), centralWidget());
- createSelWg( tr( "VERTEX_1" ), imageS, myGrp1, Vertex1 );
- createSelWg( tr( "VERTEX_2" ), imageS, myGrp1, Vertex2 );
- createSelWg( tr( "VERTEX_3" ), imageS, myGrp1, Vertex3 );
- createSelWg( tr( "VERTEX_4" ), imageS, myGrp1, Vertex4 );
+ createSelWg(tr("VERTEX_1"), imageS, myGrp1, Vertex1);
+ createSelWg(tr("VERTEX_2"), imageS, myGrp1, Vertex2);
+ createSelWg(tr("VERTEX_3"), imageS, myGrp1, Vertex3);
+ createSelWg(tr("VERTEX_4"), imageS, myGrp1, Vertex4);
// Create second group
- myGrp2 = new QGroupBox( tr( "GEOM_ARGUMENTS" ), centralWidget() );
+ myGrp2 = new QGroupBox(tr("GEOM_ARGUMENTS"), centralWidget());
- createSelWg( tr( "EDGE_1" ), imageS, myGrp2, Edge12 );
- createSelWg( tr( "EDGE_2" ), imageS, myGrp2, Edge22 );
+ createSelWg(tr("EDGE_1"), imageS, myGrp2, Edge12);
+ createSelWg(tr("EDGE_2"), imageS, myGrp2, Edge22);
// Create fird group
- myGrp3 = new QGroupBox( tr( "GEOM_ARGUMENTS" ), centralWidget() );
+ myGrp3 = new QGroupBox(tr("GEOM_ARGUMENTS"), centralWidget());
- createSelWg( tr( "EDGE_1" ), imageS, myGrp3, Edge14 );
- createSelWg( tr( "EDGE_2" ), imageS, myGrp3, Edge24 );
- createSelWg( tr( "EDGE_3" ), imageS, myGrp3, Edge34 );
- createSelWg( tr( "EDGE_4" ), imageS, myGrp3, Edge44 );
+ createSelWg(tr("EDGE_1"), imageS, myGrp3, Edge14);
+ createSelWg(tr("EDGE_2"), imageS, myGrp3, Edge24);
+ createSelWg(tr("EDGE_3"), imageS, myGrp3, Edge34);
+ createSelWg(tr("EDGE_4"), imageS, myGrp3, Edge44);
// Add groups to layout
- QVBoxLayout* layout = new QVBoxLayout( centralWidget() );
- layout->setMargin( 0 ); layout->setSpacing( 6 );
- layout->addWidget( myGrp1 );
- layout->addWidget( myGrp2 );
- layout->addWidget( myGrp3 );
-
+ QVBoxLayout* layout = new QVBoxLayout(centralWidget());
+ layout->setMargin(0); layout->setSpacing(6);
+ layout->addWidget(myGrp1);
+ layout->addWidget(myGrp2);
+ layout->addWidget(myGrp3);
/***************************************************************/
- setHelpFileName( "newentity_blocks.htm#QuadrangleFace" );
+ setHelpFileName("build_by_blocks_page.html#quad_face_anchor");
Init();
}
void BlocksGUI_QuadFaceDlg::Init()
{
// signals and slots connections
- connect( buttonOk(), SIGNAL( clicked() ), this, SLOT( ClickOnOk() ) );
- connect( buttonApply(), SIGNAL( clicked() ), this, SLOT( ClickOnApply() ) );
+ 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() ) );
+ for (anIterBtn = mySelBtn.begin(); anIterBtn != mySelBtn.end(); ++anIterBtn)
+ connect(anIterBtn.value(), SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
// init controls and fields
- initName( tr( "GEOM_QUAD_FACE" ) );
+ initName(tr("GEOM_QUAD_FACE"));
myConstructorId = -1;
- ConstructorsClicked( 0 );
+ ConstructorsClicked(0);
}
//=================================================================================
// function : ConstructorsClicked()
// purpose : Radio button management
//=================================================================================
-void BlocksGUI_QuadFaceDlg::ConstructorsClicked( int constructorId )
+void BlocksGUI_QuadFaceDlg::ConstructorsClicked (int constructorId)
{
- if ( myConstructorId == constructorId )
+ if (myConstructorId == constructorId)
return;
myConstructorId = constructorId;
- switch ( constructorId ) {
+ // 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("");
+
+ switch (constructorId) {
case 0:
myGrp2->hide();
myGrp3->hide();
myGrp1->show();
- myEditCurrentArgument = mySelName[Vertex1];
+ mySelBtn[Vertex1]->click();
break;
case 1:
myGrp1->hide();
myGrp3->hide();
myGrp2->show();
- myEditCurrentArgument = mySelName[Edge12];
+ mySelBtn[Edge12]->click();
break;
case 2:
myGrp1->hide();
myGrp2->hide();
myGrp3->show();
- myEditCurrentArgument = mySelName[Edge14];
+ mySelBtn[Edge14]->click();
break;
default:
break;
}
- // 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;
-
qApp->processEvents();
updateGeometry();
- resize( minimumSize() );
+ resize(minimumSize());
- activateSelection();
+ // on dialog initialization we init the first field with a selected object (if any)
+ SelectionIntoArgument();
}
//=================================================================================
//=================================================================================
void BlocksGUI_QuadFaceDlg::ClickOnOk()
{
- if ( ClickOnApply() )
+ if (ClickOnApply())
ClickOnCancel();
}
//=================================================================================
bool BlocksGUI_QuadFaceDlg::ClickOnApply()
{
- if ( !onAccept() )
+ if (!onAccept())
return false;
initName();
//=================================================================================
// 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;
QMap<int, QLineEdit*>::iterator anIter;
- for ( anIter = mySelName.begin(); anIter != mySelName.end(); ++anIter ) {
- if ( myEditCurrentArgument == anIter.value() ) {
+ for (anIter = mySelName.begin(); anIter != mySelName.end(); ++anIter) {
+ if (myEditCurrentArgument == anIter.value()) {
aCurrFocus = anIter.key();
break;
}
}
- GEOM::GEOM_Object_var anObj;
- Standard_Boolean aResult = Standard_False;
- if ( IObjectCount() == 1 ) {
- anObj = GEOMBase::ConvertIOinGEOMObject( firstIObject(), aResult );
- if ( aResult ) {
- if (anObj->_is_nil()) {
- aResult = Standard_False;
- }
- else {
- mySelName[aCurrFocus]->setText( GEOMBase::GetName( anObj ) );
+ LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
+ SALOME_ListIO aSelList;
+ aSelMgr->selectedObjects(aSelList);
+
+ 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 && !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
+ anObj = aFindedObject; // get Object from study
+ }
+ else // Global Selection
+ {
+ if (aShape.ShapeType() != aType) {
+ anObj = GEOM::GEOM_Object::_nil();
+ aName = "";
+ }
+ }
}
- }
- else {
- anObj = GEOM::GEOM_Object::_nil();
}
}
- switch ( aCurrFocus ) {
+ 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:
+ myShape2 = anObj;
+ if (!myShape2->_is_nil() && myShape3->_is_nil())
+ mySelBtn[Vertex3]->click();
+ break;
+ case Vertex3:
+ 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; break;
- case Vertex3:
+ myShape2 = anObj;
+ if (!myShape2->_is_nil() && myShape3->_is_nil())
+ mySelBtn[Edge34]->click();
+ break;
case Edge34:
- myShape3 = anObj; break;
- case Vertex4:
+ 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();
}
{
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();
+ for (anIter = mySelBtn.begin(); anIter != mySelBtn.end(); ++anIter) {
+ if (anIter.value() == aSender) {
myEditCurrentArgument = mySelName[anIter.key()];
+ break;
}
}
+ // enable line edit
+ myEditCurrentArgument->setEnabled(true);
+ myEditCurrentArgument->setFocus();
+
activateSelection();
}
void BlocksGUI_QuadFaceDlg::ActivateThisDialog()
{
GEOMBase_Skeleton::ActivateThisDialog();
- connect( ( (SalomeApp_Application*)( SUIT_Session::session()->activeApplication() ) )->selectionMgr(),
- SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) );
-
activateSelection();
+
+ // ??
displayPreview();
}
// function : enterEvent()
// purpose :
//=================================================================================
-void BlocksGUI_QuadFaceDlg::enterEvent( QEvent* )
+void BlocksGUI_QuadFaceDlg::enterEvent (QEvent*)
{
- if ( !mainFrame()->GroupConstructors->isEnabled() )
- this->ActivateThisDialog();
+ if (!mainFrame()->GroupConstructors->isEnabled())
+ ActivateThisDialog();
}
-//=================================================================================
-// function : DeactivateActiveDialog()
-// purpose :
-//=================================================================================
-//void BlocksGUI_QuadFaceDlg::DeactivateActiveDialog()
-//{
-// // disconnect selection
-// GEOMBase_Skeleton::DeactivateActiveDialog();
-//}
-
//=================================================================================
// function : createSelWg()
// purpose :
//=================================================================================
-void BlocksGUI_QuadFaceDlg::createSelWg( const QString& theLbl,
+void BlocksGUI_QuadFaceDlg::createSelWg (const QString& theLbl,
QPixmap& thePix,
QWidget* theParent,
- const int theId )
+ const int theId)
{
- QLabel* lab = new QLabel( theLbl, theParent );
- mySelBtn[theId] = new QPushButton( theParent );
- mySelBtn[theId]->setIcon( thePix );
- mySelBtn[theId]->setSizePolicy( QSizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed ) );
- mySelName[theId] = new QLineEdit( theParent );
- mySelName[theId]->setReadOnly( true );
+ QLabel* lab = new QLabel(theLbl, theParent);
+ mySelBtn[theId] = new QPushButton(theParent);
+ mySelBtn[theId]->setIcon(thePix);
+ mySelBtn[theId]->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed));
+ mySelName[theId] = new QLineEdit(theParent);
+ mySelName[theId]->setReadOnly(true);
QGridLayout* l = 0;
- if ( !theParent->layout() ) {
- l = new QGridLayout( theParent );
- l->setMargin( 9 ); l->setSpacing( 6 );
+ if (!theParent->layout()) {
+ l = new QGridLayout(theParent);
+ l->setMargin(9); l->setSpacing(6);
}
else {
- l = qobject_cast<QGridLayout*>( theParent->layout() );
+ l = qobject_cast<QGridLayout*>(theParent->layout());
}
int row = l->rowCount();
- l->addWidget( lab, row, 0 );
- l->addWidget( mySelBtn[theId], row, 1 );
- l->addWidget( mySelName[theId], row, 2 );
+ l->addWidget(lab, row, 0);
+ l->addWidget(mySelBtn[theId], row, 1);
+ l->addWidget(mySelName[theId], row, 2);
}
//=================================================================================
//=================================================================================
void BlocksGUI_QuadFaceDlg::activateSelection()
{
- if ( myEditCurrentArgument == mySelName[Vertex1] ||
- myEditCurrentArgument == mySelName[Vertex2] ||
- myEditCurrentArgument == mySelName[Vertex3] ||
- myEditCurrentArgument == mySelName[Vertex4] ) {
- globalSelection( GEOM_POINT );
- }
- else {
- globalSelection( GEOM_EDGE );
+ globalSelection(); // close local contexts, if any
+ if (myEditCurrentArgument == mySelName[Vertex1] ||
+ myEditCurrentArgument == mySelName[Vertex2] ||
+ myEditCurrentArgument == mySelName[Vertex3] ||
+ myEditCurrentArgument == mySelName[Vertex4])
+ {
+ localSelection(GEOM::GEOM_Object::_nil(), TopAbs_VERTEX); //Select Vertices on All Shapes
}
-
- SelectionIntoArgument();
+ else
+ {
+ localSelection(GEOM::GEOM_Object::_nil(), TopAbs_EDGE); //Select Edges on All Shapes
+ }
+ connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
+ this, SLOT(SelectionIntoArgument()));
}
//=================================================================================
//=================================================================================
GEOM::GEOM_IOperations_ptr BlocksGUI_QuadFaceDlg::createOperation()
{
- return getGeomEngine()->GetIBlocksOperations( getStudyId() );
+ return getGeomEngine()->GetIBlocksOperations(getStudyId());
}
//=================================================================================
// function : isValid
// purpose : Verify validity of input data
//=================================================================================
-bool BlocksGUI_QuadFaceDlg::isValid( QString& )
+bool BlocksGUI_QuadFaceDlg::isValid (QString&)
{
bool ok = false;
- switch ( getConstructorId() ) {
+ switch (getConstructorId()) {
case 0:
- ok = ( !myShape1->_is_nil() && !myShape2->_is_nil() &&
- !myShape3->_is_nil() && !myShape4->_is_nil() );
+ ok = (!myShape1->_is_nil() && !myShape2->_is_nil() &&
+ !myShape3->_is_nil() && !myShape4->_is_nil());
break;
case 1:
- ok = ( !myShape1->_is_nil() && !myShape2->_is_nil() );
+ ok = (!myShape1->_is_nil() && !myShape2->_is_nil());
break;
case 2:
- ok = ( !myShape1->_is_nil() && !myShape2->_is_nil() &&
- !myShape3->_is_nil() && !myShape4->_is_nil() );
+ ok = (!myShape1->_is_nil() && !myShape2->_is_nil() &&
+ !myShape3->_is_nil() && !myShape4->_is_nil());
break;
default:
break;
// function : execute
// purpose :
//=================================================================================
-bool BlocksGUI_QuadFaceDlg::execute( ObjectList& objects )
+bool BlocksGUI_QuadFaceDlg::execute (ObjectList& objects)
{
bool res = false;
GEOM::GEOM_Object_var anObj;
- switch ( getConstructorId() ) {
+ 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:
break;
}
- if ( !anObj->_is_nil() )
- objects.push_back( anObj._retn() );
-
+ if (!anObj->_is_nil())
+ objects.push_back(anObj._retn());
+
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);
+}