-// GEOM GEOMGUI : GUI for Geometry component
+// Copyright (C) 2007-2011 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.com
//
-//
-//
-// File : BlocksGUI_BlockDlg.cxx
-// Author : Julia DOROVSKIKH
-// Module : GEOM
-// $Header$
+// GEOM GEOMGUI : GUI for Geometry component
+// File : BlocksGUI_BlockDlg.cxx
+// Author : Julia DOROVSKIKH, Open CASCADE S.A.S. (julia.dorovskikh@opencascade.com)
+//
#include "BlocksGUI_BlockDlg.h"
-#include "SUIT_Session.h"
-#include "SalomeApp_Application.h"
-#include "LightApp_SelectionMgr.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>
-using namespace std;
+#include <GEOMImpl_Types.hxx>
-#include <qlabel.h>
+// OCCT Includes
+#include <TColStd_IndexedMapOfInteger.hxx>
//=================================================================================
// class : BlocksGUI_BlockDlg()
// purpose : Constructs a BlocksGUI_BlockDlg which is a child of 'parent'.
//=================================================================================
-BlocksGUI_BlockDlg::BlocksGUI_BlockDlg (GeometryGUI* theGeometryGUI, QWidget* parent, bool modal)
- : GEOMBase_Skeleton(theGeometryGUI, parent, "BlockDlg", modal,
- WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu)
+BlocksGUI_BlockDlg::BlocksGUI_BlockDlg (GeometryGUI* theGeometryGUI, QWidget* parent)
+ : GEOMBase_Skeleton(theGeometryGUI, parent),
+ myInitial(true)
{
QPixmap image0 (SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM", tr("ICON_DLG_BLOCK_2F")));
QPixmap image1 (SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM", tr("ICON_DLG_BLOCK_6F")));
QPixmap imageS (SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM", tr("ICON_SELECT")));
- setCaption(tr("GEOM_BLOCK_TITLE"));
+ setWindowTitle(tr("GEOM_BLOCK_TITLE"));
/***************************************************************/
- GroupConstructors->setTitle(tr("GEOM_BLOCK"));
+ mainFrame()->GroupConstructors->setTitle(tr("GEOM_BLOCK"));
- RadioButton1->setPixmap(image0);
- RadioButton2->setPixmap(image1);
- RadioButton3->close(TRUE);
+ mainFrame()->RadioButton1->setIcon(image0);
+ mainFrame()->RadioButton2->setIcon(image1);
+ mainFrame()->RadioButton3->setAttribute(Qt::WA_DeleteOnClose);
+ mainFrame()->RadioButton3->close();
// Create first group
- Group2F = new DlgRef_2Sel_QTD(this, "Group2F");
+ Group2F = new DlgRef_2Sel (centralWidget());
Group2F->GroupBox1->setTitle(tr("GEOM_ARGUMENTS"));
Group2F->TextLabel1->setText(tr("FACE_1"));
Group2F->TextLabel2->setText(tr("FACE_2"));
- Group2F->PushButton1->setPixmap(imageS);
- Group2F->PushButton2->setPixmap(imageS);
+ Group2F->PushButton1->setIcon(imageS);
+ Group2F->PushButton2->setIcon(imageS);
// Create second group
- Group6F = new DlgRef_6Sel_QTD(this, "Group2F");
+ Group6F = new DlgRef_6Sel (centralWidget());
Group6F->GroupBox1->setTitle(tr("GEOM_ARGUMENTS"));
Group6F->TextLabel1->setText(tr("FACE_1"));
Group6F->TextLabel2->setText(tr("FACE_2"));
Group6F->TextLabel4->setText(tr("FACE_4"));
Group6F->TextLabel5->setText(tr("FACE_5"));
Group6F->TextLabel6->setText(tr("FACE_6"));
- Group6F->PushButton1->setPixmap(imageS);
- Group6F->PushButton2->setPixmap(imageS);
- Group6F->PushButton3->setPixmap(imageS);
- Group6F->PushButton4->setPixmap(imageS);
- Group6F->PushButton5->setPixmap(imageS);
- Group6F->PushButton6->setPixmap(imageS);
+ Group6F->PushButton1->setIcon(imageS);
+ Group6F->PushButton2->setIcon(imageS);
+ Group6F->PushButton3->setIcon(imageS);
+ Group6F->PushButton4->setIcon(imageS);
+ Group6F->PushButton5->setIcon(imageS);
+ Group6F->PushButton6->setIcon(imageS);
// Add groups to layout
- Layout1->addWidget(Group2F, 2, 0);
- Layout1->addWidget(Group6F, 2, 0);
+ QVBoxLayout* layout = new QVBoxLayout (centralWidget());
+ layout->setMargin(0);
+ layout->setSpacing(6);
+ layout->addWidget(Group2F);
+ layout->addWidget(Group6F);
/***************************************************************/
setHelpFileName("build_by_blocks_page.html#hexa_solid_anchor");
Group6F->LineEdit6->setReadOnly(true);
// 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)));
connect(Group2F->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
connect(Group2F->PushButton2, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
connect(Group6F->PushButton5, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
connect(Group6F->PushButton6, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
- connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(),
- SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ;
-
// init controls and fields
initName(tr("GEOM_BLOCK"));
myConstructorId = constructorId;
+ // init fields
+ myFace1.nullify();
+ myFace2.nullify();
+ myFace3.nullify();
+ myFace4.nullify();
+ myFace5.nullify();
+ myFace6.nullify();
+
switch (constructorId) {
case 0:
Group6F->hide();
- resize(0, 0);
Group2F->show();
- myEditCurrentArgument = Group2F->LineEdit1;
Group2F->LineEdit1->setText(tr(""));
Group2F->LineEdit2->setText(tr(""));
+
+ Group2F->PushButton1->click();
break;
case 1:
Group2F->hide();
- resize(0, 0);
Group6F->show();
- myEditCurrentArgument = Group6F->LineEdit1;
Group6F->LineEdit1->setText(tr(""));
Group6F->LineEdit2->setText(tr(""));
Group6F->LineEdit3->setText(tr(""));
Group6F->LineEdit4->setText(tr(""));
Group6F->LineEdit5->setText(tr(""));
Group6F->LineEdit6->setText(tr(""));
+
+ Group6F->PushButton1->click();
break;
default:
break;
}
- // init fields
- myFace1 = myFace2 = GEOM::GEOM_Object::_nil();
- myFace3 = myFace4 = myFace5 = myFace6 = myFace1;
+ qApp->processEvents();
+ updateGeometry();
+ resize(minimumSizeHint());
- globalSelection(GEOM_FACE);
+ // on dialog initialization we init the first field with a selected object (if any)
SelectionIntoArgument();
- connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(),
- SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
}
//=================================================================================
//=================================================================================
void BlocksGUI_BlockDlg::ClickOnOk()
{
+ setIsApplyAndClose( true );
if (ClickOnApply())
ClickOnCancel();
}
//=================================================================================
// function : SelectionIntoArgument()
-// purpose : Called when selection as changed or other case
+// purpose : Called when selection is changed or on dialog initialization or activation
//=================================================================================
void BlocksGUI_BlockDlg::SelectionIntoArgument()
{
erasePreview();
- myEditCurrentArgument->setText("");
-
- if (IObjectCount() != 1)
- {
- if (myEditCurrentArgument == Group2F->LineEdit1 ||
- myEditCurrentArgument == Group6F->LineEdit1)
- myFace1 = GEOM::GEOM_Object::_nil();
- else if (myEditCurrentArgument == Group2F->LineEdit2 ||
- myEditCurrentArgument == Group6F->LineEdit2)
- myFace2 = GEOM::GEOM_Object::_nil();
- else if (myEditCurrentArgument == Group6F->LineEdit3)
- myFace3 = GEOM::GEOM_Object::_nil();
- else if (myEditCurrentArgument == Group6F->LineEdit4)
- myFace4 = GEOM::GEOM_Object::_nil();
- else if (myEditCurrentArgument == Group6F->LineEdit5)
- myFace5 = GEOM::GEOM_Object::_nil();
- else if (myEditCurrentArgument == Group6F->LineEdit6)
- myFace6 = GEOM::GEOM_Object::_nil();
- return;
- }
-
- // nbSel == 1
- Standard_Boolean testResult = Standard_False;
- GEOM::GEOM_Object_var aSelectedObject =
- GEOMBase::ConvertIOinGEOMObject( firstIObject(), testResult );
- if (!testResult || CORBA::is_nil( aSelectedObject ))
- return;
+ GEOM::GeomObjPtr aSelectedObject = getSelected( TopAbs_FACE );
+ TopoDS_Shape aShape;
+ if ( aSelectedObject && GEOMBase::GetShape( aSelectedObject.get(), aShape ) && !aShape.IsNull() ) {
+ QString aName = GEOMBase::GetName( aSelectedObject.get() );
+ myEditCurrentArgument->setText( aName );
+ if ( myEditCurrentArgument == Group2F->LineEdit1 ) {
+ myFace1 = aSelectedObject;
+ if (!myFace2) Group2F->PushButton2->click();
+ }
+ else if ( myEditCurrentArgument == Group2F->LineEdit2 ) {
+ myFace2 = aSelectedObject;
+ if (!myFace1) Group2F->PushButton1->click();
+ }
+ else if ( myEditCurrentArgument == Group6F->LineEdit1 ) {
+ myFace1 = aSelectedObject;
+ if (!myFace2) Group6F->PushButton2->click();
+ else if (!myFace3) Group6F->PushButton3->click();
+ else if (!myFace4) Group6F->PushButton4->click();
+ else if (!myFace5) Group6F->PushButton5->click();
+ else if (!myFace6) Group6F->PushButton6->click();
+ }
+ else if ( myEditCurrentArgument == Group6F->LineEdit2 ) {
+ myFace2 = aSelectedObject;
+ if (!myFace3) Group6F->PushButton3->click();
+ else if (!myFace4) Group6F->PushButton4->click();
+ else if (!myFace5) Group6F->PushButton5->click();
+ else if (!myFace6) Group6F->PushButton6->click();
+ else if (!myFace1) Group6F->PushButton1->click();
+ }
+ else if ( myEditCurrentArgument == Group6F->LineEdit3 ) {
+ myFace3 = aSelectedObject;
+ if (!myFace4) Group6F->PushButton4->click();
+ else if (!myFace5) Group6F->PushButton5->click();
+ else if (!myFace6) Group6F->PushButton6->click();
+ else if (!myFace1) Group6F->PushButton1->click();
+ else if (!myFace2) Group6F->PushButton2->click();
+ }
+ else if ( myEditCurrentArgument == Group6F->LineEdit4 ) {
+ myFace4 = aSelectedObject;
+ if (!myFace5) Group6F->PushButton5->click();
+ else if (!myFace6) Group6F->PushButton6->click();
+ else if (!myFace1) Group6F->PushButton1->click();
+ else if (!myFace2) Group6F->PushButton2->click();
+ else if (!myFace3) Group6F->PushButton3->click();
+ }
+ else if ( myEditCurrentArgument == Group6F->LineEdit5 ) {
+ myFace5 = aSelectedObject;
+ if (!myFace6) Group6F->PushButton6->click();
+ else if (!myFace1) Group6F->PushButton1->click();
+ else if (!myFace2) Group6F->PushButton2->click();
+ else if (!myFace3) Group6F->PushButton3->click();
+ else if (!myFace4) Group6F->PushButton4->click();
+ }
+ else if ( myEditCurrentArgument == Group6F->LineEdit6 ) {
+ myFace6 = aSelectedObject;
+ if (!myFace1) Group6F->PushButton1->click();
+ else if (!myFace2) Group6F->PushButton2->click();
+ else if (!myFace3) Group6F->PushButton3->click();
+ else if (!myFace4) Group6F->PushButton4->click();
+ else if (!myFace5) Group6F->PushButton5->click();
+ }
+ }
+ else {
+ if (myEditCurrentArgument == Group2F->LineEdit1) myFace1.nullify();
+ else if (myEditCurrentArgument == Group2F->LineEdit2) myFace2.nullify();
+ else if (myEditCurrentArgument == Group6F->LineEdit1) myFace1.nullify();
+ else if (myEditCurrentArgument == Group6F->LineEdit2) myFace2.nullify();
+ else if (myEditCurrentArgument == Group6F->LineEdit3) myFace3.nullify();
+ else if (myEditCurrentArgument == Group6F->LineEdit4) myFace4.nullify();
+ else if (myEditCurrentArgument == Group6F->LineEdit5) myFace5.nullify();
+ else if (myEditCurrentArgument == Group6F->LineEdit6) myFace6.nullify();
+ myEditCurrentArgument->setText( "" );
+ }
- if (myEditCurrentArgument == Group2F->LineEdit1 ||
- myEditCurrentArgument == Group6F->LineEdit1)
- myFace1 = aSelectedObject;
- else if (myEditCurrentArgument == Group2F->LineEdit2 ||
- myEditCurrentArgument == Group6F->LineEdit2)
- myFace2 = aSelectedObject;
- else if (myEditCurrentArgument == Group6F->LineEdit3)
- myFace3 = aSelectedObject;
- else if (myEditCurrentArgument == Group6F->LineEdit4)
- myFace4 = aSelectedObject;
- else if (myEditCurrentArgument == Group6F->LineEdit5)
- myFace5 = aSelectedObject;
- else if (myEditCurrentArgument == Group6F->LineEdit6)
- myFace6 = aSelectedObject;
-
- myEditCurrentArgument->setText( GEOMBase::GetName( aSelectedObject ) );
-
- 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:
+ 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;
+ }
+
+ // set line edit as current argument
if (aSender == Group2F->PushButton1) {
myEditCurrentArgument = Group2F->LineEdit1;
- } else if (aSender == Group2F->PushButton2) {
+ }
+ else if (aSender == Group2F->PushButton2) {
myEditCurrentArgument = Group2F->LineEdit2;
-
- } else if (aSender == Group6F->PushButton1) {
+ }
+ else if (aSender == Group6F->PushButton1) {
myEditCurrentArgument = Group6F->LineEdit1;
- } else if (aSender == Group6F->PushButton2) {
+ }
+ else if (aSender == Group6F->PushButton2) {
myEditCurrentArgument = Group6F->LineEdit2;
- } else if (aSender == Group6F->PushButton3) {
+ }
+ else if (aSender == Group6F->PushButton3) {
myEditCurrentArgument = Group6F->LineEdit3;
- } else if (aSender == Group6F->PushButton4) {
+ }
+ else if (aSender == Group6F->PushButton4) {
myEditCurrentArgument = Group6F->LineEdit4;
- } else if (aSender == Group6F->PushButton5) {
+ }
+ else if (aSender == Group6F->PushButton5) {
myEditCurrentArgument = Group6F->LineEdit5;
- } else if (aSender == Group6F->PushButton6) {
+ }
+ else if (aSender == Group6F->PushButton6) {
myEditCurrentArgument = Group6F->LineEdit6;
}
- globalSelection(GEOM_FACE);
-
+ // enable push button and line edit
+ myEditCurrentArgument->setEnabled(true);
myEditCurrentArgument->setFocus();
- SelectionIntoArgument();
+ // after setFocus(), because it will be setDown(false) when loses focus
+ aSender->setDown(true);
+
+ 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()));
}
//=================================================================================
void BlocksGUI_BlockDlg::ActivateThisDialog()
{
GEOMBase_Skeleton::ActivateThisDialog();
- connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(),
- SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
-
- globalSelection(GEOM_FACE);
-
- SelectionIntoArgument();
+ globalSelection(); // close local contexts, if any
+ localSelection(GEOM::GEOM_Object::_nil(), TopAbs_FACE); //Select Faces on All Shapes
+ connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
+ this, SLOT(SelectionIntoArgument()));
+ displayPreview(true);
}
//=================================================================================
// function : enterEvent()
// purpose :
//=================================================================================
-void BlocksGUI_BlockDlg::enterEvent (QEvent* e)
+void BlocksGUI_BlockDlg::enterEvent (QEvent*)
{
- if (!GroupConstructors->isEnabled())
+ if (!mainFrame()->GroupConstructors->isEnabled())
ActivateThisDialog();
}
// function : isValid
// purpose :
//=================================================================================
-bool BlocksGUI_BlockDlg::isValid (QString&)
+bool BlocksGUI_BlockDlg::isValid(QString&)
{
+ bool ok = false;
switch (getConstructorId()) {
- case 0:
- return !(myFace1->_is_nil() || myFace2->_is_nil());
- case 1:
- return !(myFace1->_is_nil() || myFace2->_is_nil() ||
- myFace3->_is_nil() || myFace4->_is_nil() ||
- myFace5->_is_nil() || myFace6->_is_nil());
- default:
- return false;
+ case 0:
+ ok = myFace1 && myFace2;
+ break;
+ case 1:
+ ok = myFace1 && myFace2 && myFace3 && myFace4 && myFace5 && myFace6;
+ 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:
- if (!CORBA::is_nil(myFace1) && !CORBA::is_nil(myFace2)) {
- anObj = GEOM::GEOM_IBlocksOperations::_narrow(getOperation())->
- MakeHexa2Faces(myFace1, myFace2);
- res = true;
- }
- break;
- case 1:
- if (!CORBA::is_nil(myFace1) && !CORBA::is_nil(myFace2) &&
- !CORBA::is_nil(myFace3) && !CORBA::is_nil(myFace4) &&
- !CORBA::is_nil(myFace5) && !CORBA::is_nil(myFace6)) {
- anObj = GEOM::GEOM_IBlocksOperations::_narrow(getOperation())->
- MakeHexa(myFace1, myFace2, myFace3, myFace4, myFace5, myFace6);
- res = true;
- }
- break;
+ case 0:
+ if ( myFace1 && myFace2 ) {
+ anObj = anOper->MakeHexa2Faces(myFace1.get(), myFace2.get());
+ res = true;
+ }
+ break;
+ case 1:
+ if ( myFace1 && myFace2 && myFace3 && myFace4 && myFace5 && myFace6 ) {
+ anObj = anOper->MakeHexa(myFace1.get(), myFace2.get(), myFace3.get(), myFace4.get(), myFace5.get(), myFace6.get());
+ res = true;
+ }
+ break;
}
if (!anObj->_is_nil())
return res;
}
+
+//=================================================================================
+// function : addSubshapesToStudy
+// purpose : virtual method to add new SubObjects if local selection
+//=================================================================================
+void BlocksGUI_BlockDlg::addSubshapesToStudy()
+{
+ switch (getConstructorId()) {
+ case 0:
+ GEOMBase::PublishSubObject( myFace1.get() );
+ GEOMBase::PublishSubObject( myFace2.get() );
+ break;
+ case 1:
+ GEOMBase::PublishSubObject( myFace1.get() );
+ GEOMBase::PublishSubObject( myFace2.get() );
+ GEOMBase::PublishSubObject( myFace3.get() );
+ GEOMBase::PublishSubObject( myFace4.get() );
+ GEOMBase::PublishSubObject( myFace5.get() );
+ GEOMBase::PublishSubObject( myFace6.get() );
+ break;
+ default:
+ break;
+ }
+}
