-// GEOM GEOMGUI : GUI for Geometry component
+// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE
//
-// Copyright (C) 2003 CEA
+// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// Lesser General Public License for more details.
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
-// See http://www.salome-platform.org or email : webmaster.salome@opencascade.org
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
-//
-//
-// File : BlocksGUI_QuadFaceDlg.cxx
-// Author : Julia DOROVSKIKH
-// Module : GEOM
-// $Header$
+// GEOM GEOMGUI : GUI for Geometry component
+// File : BlocksGUI_QuadFaceDlg.cxx
+// Author : Julia DOROVSKIKH, Open CASCADE S.A.S. (julia.dorovskikh@opencascade.com)
+//
#include "BlocksGUI_QuadFaceDlg.h"
-#include "QAD_Desktop.h"
+#include <DlgRef.h>
+#include <GeometryGUI.h>
+#include <GEOMBase.h>
+
+#include <SUIT_Session.h>
+#include <SUIT_ResourceMgr.h>
+#include <SalomeApp_Application.h>
+#include <LightApp_SelectionMgr.h>
-#include "GEOMImpl_Types.hxx"
+// QT Includes
+#include <qlabel.h>
-//using namespace std;
+// OCCT Includes
+#include <TopAbs.hxx>
+#include <TColStd_IndexedMapOfInteger.hxx>
+
+#include <GEOMImpl_Types.hxx>
//=================================================================================
// class : BlocksGUI_QuadFaceDlg()
// purpose : Constructs a BlocksGUI_QuadFaceDlg which is a child of 'parent'.
//=================================================================================
-BlocksGUI_QuadFaceDlg::BlocksGUI_QuadFaceDlg (QWidget* parent,
- SALOME_Selection* Sel,
- bool modal)
- : GEOMBase_Skeleton(parent, "QuadFaceDlg", Sel, modal,
- WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu)
+BlocksGUI_QuadFaceDlg::BlocksGUI_QuadFaceDlg (GeometryGUI* theGeometryGUI, QWidget* parent)
+ : GEOMBase_Skeleton(theGeometryGUI, parent),
+ myInitial(true)
{
- QPixmap image1 (QAD_Desktop::getResourceManager()->loadPixmap("GEOM",tr("ICON_DLG_QUAD_FACE_4_VERT")));
- QPixmap image2 (QAD_Desktop::getResourceManager()->loadPixmap("GEOM",tr("ICON_DLG_QUAD_FACE_2_EDGE")));
- QPixmap image3 (QAD_Desktop::getResourceManager()->loadPixmap("GEOM",tr("ICON_DLG_QUAD_FACE_4_EDGE")));
- QPixmap imageS (QAD_Desktop::getResourceManager()->loadPixmap("GEOM",tr("ICON_SELECT")));
+ 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")));
- setCaption(tr("GEOM_QUAD_FACE_TITLE"));
+ setWindowTitle(tr("GEOM_QUAD_FACE_TITLE"));
/***************************************************************/
- GroupConstructors->setTitle(tr("GEOM_QUAD_FACE"));
+ mainFrame()->GroupConstructors->setTitle(tr("GEOM_QUAD_FACE"));
- RadioButton1->setPixmap(image1);
- RadioButton2->setPixmap(image2);
- RadioButton3->setPixmap(image3);
+ mainFrame()->RadioButton1->setIcon(image1);
+ mainFrame()->RadioButton2->setIcon(image2);
+ mainFrame()->RadioButton3->setIcon(image3);
// Create first group
- myGrp1 = new QGroupBox(1, Qt::Horizontal, tr("GEOM_ARGUMENTS"), this);
-
- QGroupBox* aSelGrp1 = new QGroupBox(3, Qt::Horizontal, myGrp1);
- aSelGrp1->setFrameStyle(QFrame::NoFrame);
- aSelGrp1->setInsideMargin(0);
+ myGrp1 = new QGroupBox(tr("GEOM_ARGUMENTS"), centralWidget());
- createSelWg(tr("VERTEX_1"), imageS, aSelGrp1, Vertex1);
- createSelWg(tr("VERTEX_2"), imageS, aSelGrp1, Vertex2);
- createSelWg(tr("VERTEX_3"), imageS, aSelGrp1, Vertex3);
- createSelWg(tr("VERTEX_4"), imageS, aSelGrp1, 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(1, Qt::Horizontal, tr("GEOM_ARGUMENTS"), this);
+ myGrp2 = new QGroupBox(tr("GEOM_ARGUMENTS"), centralWidget());
- QGroupBox* aSelGrp2 = new QGroupBox(3, Qt::Horizontal, myGrp2);
- aSelGrp2->setFrameStyle(QFrame::NoFrame);
- aSelGrp2->setInsideMargin(0);
-
- createSelWg(tr("EDGE_1"), imageS, aSelGrp2, Edge12);
- createSelWg(tr("EDGE_2"), imageS, aSelGrp2, Edge22);
+ createSelWg(tr("EDGE_1"), imageS, myGrp2, Edge12);
+ createSelWg(tr("EDGE_2"), imageS, myGrp2, Edge22);
// Create fird group
- myGrp3 = new QGroupBox(1, Qt::Horizontal, tr("GEOM_ARGUMENTS"), this);
-
- QGroupBox* aSelGrp3 = new QGroupBox(3, Qt::Horizontal, myGrp3);
- aSelGrp3->setFrameStyle(QFrame::NoFrame);
- aSelGrp3->setInsideMargin(0);
+ myGrp3 = new QGroupBox(tr("GEOM_ARGUMENTS"), centralWidget());
- createSelWg(tr("EDGE_1"), imageS, aSelGrp3, Edge14);
- createSelWg(tr("EDGE_2"), imageS, aSelGrp3, Edge24);
- createSelWg(tr("EDGE_3"), imageS, aSelGrp3, Edge34);
- createSelWg(tr("EDGE_4"), imageS, aSelGrp3, Edge44);
-
- (new QLabel(myGrp3))->setSizePolicy(
- QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding));
+ 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
- Layout1->addWidget(myGrp1, 2, 0);
- Layout1->addWidget(myGrp2, 2, 0);
- Layout1->addWidget(myGrp3, 2, 0);
+ QVBoxLayout* layout = new QVBoxLayout(centralWidget());
+ layout->setMargin(0); layout->setSpacing(6);
+ layout->addWidget(myGrp1);
+ layout->addWidget(myGrp2);
+ layout->addWidget(myGrp3);
/***************************************************************/
+ 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(GroupConstructors, SIGNAL(clicked(int)), this, SLOT(ConstructorsClicked(int)));
+ connect(buttonOk(), SIGNAL(clicked()), this, SLOT(ClickOnOk()));
+ connect(buttonApply(), SIGNAL(clicked()), this, SLOT(ClickOnApply()));
+
+ connect(this, SIGNAL(constructorsClicked(int)), this, SLOT(ConstructorsClicked(int)));
QMap<int, QPushButton*>::iterator anIterBtn;
for (anIterBtn = mySelBtn.begin(); anIterBtn != mySelBtn.end(); ++anIterBtn)
- connect(anIterBtn.data(), SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
-
- connect(mySelection, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
+ connect(anIterBtn.value(), SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
// init controls and fields
initName(tr("GEOM_QUAD_FACE"));
myConstructorId = constructorId;
+ // init fields
+ myShape1.nullify();
+ myShape2.nullify();
+ myShape3.nullify();
+ myShape4.nullify();
+
+ // 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.data()->setText("");
-
- // init fields
- myShape1 = myShape2 = GEOM::GEOM_Object::_nil();
- myShape3 = myShape4 = myShape1;
+ qApp->processEvents();
+ updateGeometry();
+ resize(minimumSizeHint());
- activateSelection();
+ // on dialog initialization we init the first field with a selected object (if any)
+ SelectionIntoArgument();
}
//=================================================================================
//=================================================================================
void BlocksGUI_QuadFaceDlg::ClickOnOk()
{
+ setIsApplyAndClose( true );
if (ClickOnApply())
ClickOnCancel();
}
//=================================================================================
// 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.data()) {
+ if (myEditCurrentArgument == anIter.value()) {
aCurrFocus = anIter.key();
break;
}
}
- GEOM::GEOM_Object_var anObj;
- Standard_Boolean aResult = Standard_False;
- if (mySelection->IObjectCount() == 1) {
- anObj = GEOMBase::ConvertIOinGEOMObject(mySelection->firstIObject(), aResult);
- if (aResult) {
- if (anObj->_is_nil()) {
- aResult = Standard_False;
- } else {
- mySelName[aCurrFocus]->setText(GEOMBase::GetName(anObj));
- }
- } else {
- anObj = GEOM::GEOM_Object::_nil();
+ TopAbs_ShapeEnum aType = TopAbs_EDGE;
+ if (aCurrFocus == Vertex1 || aCurrFocus == Vertex2 ||
+ aCurrFocus == Vertex3 || aCurrFocus == Vertex4)
+ aType = TopAbs_VERTEX;
+
+ GEOM::GeomObjPtr aSelectedObject = getSelected( aType );
+ TopoDS_Shape aShape;
+ if ( aSelectedObject && GEOMBase::GetShape( aSelectedObject.get(), aShape ) && !aShape.IsNull() ) {
+ QString aName = GEOMBase::GetName( aSelectedObject.get() );
+ myEditCurrentArgument->setText( aName );
+ switch (aCurrFocus) {
+ // four vertices
+ case Vertex1:
+ myShape1 = aSelectedObject;
+ if (!myShape2) mySelBtn[Vertex2]->click();
+ else if (!myShape3) mySelBtn[Vertex3]->click();
+ else if (!myShape4) mySelBtn[Vertex4]->click();
+ break;
+ case Vertex2:
+ myShape2 = aSelectedObject;
+ if (!myShape3) mySelBtn[Vertex3]->click();
+ else if (!myShape4) mySelBtn[Vertex4]->click();
+ else if (!myShape1) mySelBtn[Vertex1]->click();
+ break;
+ case Vertex3:
+ myShape3 = aSelectedObject;
+ if (!myShape4) mySelBtn[Vertex4]->click();
+ else if (!myShape1) mySelBtn[Vertex1]->click();
+ else if (!myShape2) mySelBtn[Vertex2]->click();
+ break;
+ case Vertex4:
+ myShape4 = aSelectedObject;
+ if (!myShape1) mySelBtn[Vertex1]->click();
+ else if (!myShape2) mySelBtn[Vertex2]->click();
+ else if (!myShape3) mySelBtn[Vertex3]->click();
+ break;
+ // two edges
+ case Edge12:
+ myShape1 = aSelectedObject;
+ if (!myShape2) mySelBtn[Edge22]->click();
+ break;
+ case Edge22:
+ myShape2 = aSelectedObject;
+ if (!myShape1) mySelBtn[Edge12]->click();
+ break;
+ // four edges
+ case Edge14:
+ myShape1 = aSelectedObject;
+ if (!myShape2) mySelBtn[Edge24]->click();
+ else if (!myShape3) mySelBtn[Edge34]->click();
+ else if (!myShape4) mySelBtn[Edge44]->click();
+ break;
+ case Edge24:
+ myShape2 = aSelectedObject;
+ if (!myShape3) mySelBtn[Edge34]->click();
+ else if (!myShape4) mySelBtn[Edge44]->click();
+ else if (!myShape1) mySelBtn[Edge14]->click();
+ break;
+ case Edge34:
+ myShape3 = aSelectedObject;
+ if (!myShape4) mySelBtn[Edge44]->click();
+ else if (!myShape1) mySelBtn[Edge14]->click();
+ else if (!myShape2) mySelBtn[Edge24]->click();
+ break;
+ case Edge44:
+ myShape4 = aSelectedObject;
+ if (!myShape1) mySelBtn[Edge14]->click();
+ else if (!myShape2) mySelBtn[Edge24]->click();
+ else if (!myShape3) mySelBtn[Edge34]->click();
+ break;
+ default:
+ break;
}
}
-
- if (aCurrFocus == Vertex1 || aCurrFocus == Edge12 || aCurrFocus == Edge14) {
- myShape1 = anObj;
- } else if (aCurrFocus == Vertex2 || aCurrFocus == Edge22 || aCurrFocus == Edge24) {
- myShape2 = anObj;
- } else if (aCurrFocus == Vertex3 || aCurrFocus == Edge34) {
- myShape3 = anObj;
- } else if (aCurrFocus == Vertex4 || aCurrFocus == Edge44) {
- myShape4 = anObj;
- } else {
- return;
+ else {
+ switch (aCurrFocus) {
+ case Vertex1:
+ case Edge12:
+ case Edge14:
+ myShape1.nullify();
+ break;
+ case Vertex2:
+ case Edge22:
+ case Edge24:
+ myShape2.nullify();
+ break;
+ case Vertex3:
+ case Edge34:
+ myShape3.nullify();
+ break;
+ case Vertex4:
+ case Edge44:
+ myShape4.nullify();
+ break;
+ default:
+ break;
+ }
+ myEditCurrentArgument->setText( "" );
}
- displayPreview();
+ displayPreview(true);
}
//=================================================================================
{
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;
+ }
+
+ // set line edit as current argument
QMap<int, QPushButton*>::iterator anIter;
for (anIter = mySelBtn.begin(); anIter != mySelBtn.end(); ++anIter) {
- if (anIter.data() == aSender) {
- mySelName[anIter.key()]->setFocus();
+ if (anIter.value() == aSender) {
myEditCurrentArgument = mySelName[anIter.key()];
+ break;
}
}
+ // enable line edit
+ myEditCurrentArgument->setEnabled(true);
+ myEditCurrentArgument->setFocus();
+
+ // enable push button
+ // after setFocus(), because it will be setDown(false) when loses focus
+ aSender->setDown(true);
+
activateSelection();
}
void BlocksGUI_QuadFaceDlg::ActivateThisDialog()
{
GEOMBase_Skeleton::ActivateThisDialog();
- connect(mySelection, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
-
activateSelection();
- displayPreview();
+
+ // ??
+ displayPreview(true);
}
//=================================================================================
// function : enterEvent()
// purpose :
//=================================================================================
-void BlocksGUI_QuadFaceDlg::enterEvent (QEvent* e)
+void BlocksGUI_QuadFaceDlg::enterEvent (QEvent*)
{
- if (!GroupConstructors->isEnabled())
- this->ActivateThisDialog();
+ if (!mainFrame()->GroupConstructors->isEnabled())
+ ActivateThisDialog();
}
-//=================================================================================
-// function : DeactivateActiveDialog()
-// purpose :
-//=================================================================================
-//void BlocksGUI_QuadFaceDlg::DeactivateActiveDialog()
-//{
-// // disconnect selection
-// GEOMBase_Skeleton::DeactivateActiveDialog();
-//}
-
//=================================================================================
// function : createSelWg()
// purpose :
QWidget* theParent,
const int theId)
{
- new QLabel(theLbl, theParent);
+ QLabel* lab = new QLabel(theLbl, theParent);
mySelBtn[theId] = new QPushButton(theParent);
- mySelBtn[theId]->setPixmap(thePix);
+ 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);
+ }
+ else {
+ 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);
}
//=================================================================================
//=================================================================================
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);
-
- } else {
- globalSelection(GEOM_EDGE);
+ 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()));
}
//=================================================================================
//=================================================================================
bool BlocksGUI_QuadFaceDlg::isValid (QString&)
{
+ bool ok = false;
switch (getConstructorId()) {
- case 0:
- return (!myShape1->_is_nil() && !myShape2->_is_nil() &&
- !myShape3->_is_nil() && !myShape4->_is_nil());
- case 1:
- return (!myShape1->_is_nil() && !myShape2->_is_nil());
- case 2:
- return (!myShape1->_is_nil() && !myShape2->_is_nil() &&
- !myShape3->_is_nil() && !myShape4->_is_nil());
- default:
- return false;
+ case 0:
+ ok = myShape1 && myShape2 && myShape3 && myShape4;
+ break;
+ case 1:
+ ok = myShape1 && myShape2;
+ break;
+ case 2:
+ ok = myShape1 && myShape2 && myShape3 && myShape4;
+ break;
+ default:
+ break;
}
- return false;
+ return ok;
}
//=================================================================================
GEOM::GEOM_Object_var anObj;
+ GEOM::GEOM_IBlocksOperations_var anOper = GEOM::GEOM_IBlocksOperations::_narrow(getOperation());
+
switch (getConstructorId()) {
- case 0:
- 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);
- res = true;
- break;
- case 2:
- anObj = GEOM::GEOM_IBlocksOperations::_narrow(getOperation())->MakeQuad
- (myShape1, myShape2, myShape3, myShape4);
- res = true;
- break;
- default:
- break;
+ case 0:
+ anObj = anOper->MakeQuad4Vertices(myShape1.get(), myShape2.get(), myShape3.get(), myShape4.get());
+ res = true;
+ break;
+ case 1:
+ anObj = anOper->MakeQuad2Edges(myShape1.get(), myShape2.get());
+ res = true;
+ break;
+ case 2:
+ anObj = anOper->MakeQuad(myShape1.get(), myShape2.get(), myShape3.get(), myShape4.get());
+ res = true;
+ break;
+ default:
+ break;
}
if (!anObj->_is_nil())
return res;
}
+
+//=================================================================================
+// function : addSubshapeToStudy
+// purpose : virtual method to add new SubObjects if local selection
+//=================================================================================
+void BlocksGUI_QuadFaceDlg::addSubshapesToStudy()
+{
+ switch (getConstructorId()) {
+ case 0:
+ GEOMBase::PublishSubObject( myShape1.get() );
+ GEOMBase::PublishSubObject( myShape2.get() );
+ GEOMBase::PublishSubObject( myShape3.get() );
+ GEOMBase::PublishSubObject( myShape4.get() );
+ break;
+ case 1:
+ GEOMBase::PublishSubObject( myShape1.get() );
+ GEOMBase::PublishSubObject( myShape2.get() );
+ break;
+ case 2:
+ GEOMBase::PublishSubObject( myShape1.get() );
+ GEOMBase::PublishSubObject( myShape2.get() );
+ GEOMBase::PublishSubObject( myShape3.get() );
+ GEOMBase::PublishSubObject( myShape4.get() );
+ break;
+ default:
+ break;
+ }
+}