-// GEOM GEOMGUI : GUI for Geometry component
+// GEOM GEOMGUI : GUI for Geometry component
//
-// Copyright (C) 2003 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 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
-//
-// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+// Copyright (C) 2003 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 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
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+// File : PrimitiveGUI_BoxDlg.cxx
+// Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
//
-// File : PrimitiveGUI_BoxDlg.cxx
-// Author : Lucien PIGNOLONI
-// Module : GEOM
-// $Header$
-using namespace std;
#include "PrimitiveGUI_BoxDlg.h"
-#include <BRepPrimAPI_MakeBox.hxx>
-#include <Precision.hxx>
-#include "QAD_Config.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>
+
+// OCCT Includes
+#include <TopoDS_Shape.hxx>
+#include <TopoDS.hxx>
+#include <TopExp.hxx>
+#include <TColStd_IndexedMapOfInteger.hxx>
+#include <TopTools_IndexedMapOfShape.hxx>
+
+#include <GEOMImpl_Types.hxx>
+//#include <ostream>
//=================================================================================
// class : PrimitiveGUI_BoxDlg()
-// purpose : Constructs a PrimitiveGUI_BoxDlg which is a child of 'parent', with the
+// purpose : Constructs a PrimitiveGUI_BoxDlg which is a child of 'parent', with the
// name 'name' and widget flags set to 'f'.
// The dialog will by default be modeless, unless you set 'modal' to
// TRUE to construct a modal dialog.
//=================================================================================
-PrimitiveGUI_BoxDlg::PrimitiveGUI_BoxDlg(QWidget* parent, const char* name, PrimitiveGUI* thePrimitiveGUI, SALOME_Selection* Sel, bool modal, WFlags fl)
- :GEOMBase_Skeleton(parent, name, Sel, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu)
+PrimitiveGUI_BoxDlg::PrimitiveGUI_BoxDlg (GeometryGUI* theGeometryGUI, QWidget* parent,
+ bool modal, Qt::WindowFlags fl)
+ : GEOMBase_Skeleton(theGeometryGUI, parent, modal, fl),
+ myInitial(true)
{
- QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap("GEOM", tr("ICON_DLG_BOX_2P")));
- QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap("GEOM", tr("ICON_DLG_BOX_DXYZ")));
- QPixmap image2(QAD_Desktop::getResourceManager()->loadPixmap("GEOM", tr("ICON_SELECT")));
+ QPixmap image0 (SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM", tr("ICON_DLG_BOX_2P")));
+ QPixmap image1 (SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM", tr("ICON_DLG_BOX_DXYZ")));
+ QPixmap image2 (SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM", tr("ICON_SELECT")));
- setCaption(tr("GEOM_BOX_TITLE"));
+ setWindowTitle(tr("GEOM_BOX_TITLE"));
/***************************************************************/
- GroupConstructors->setTitle(tr("GEOM_BOX"));
- RadioButton1->setPixmap(image0);
- RadioButton2->setPixmap(image1);
- RadioButton3->close(TRUE);
+ mainFrame()->GroupConstructors->setTitle(tr("GEOM_BOX"));
+ mainFrame()->RadioButton1->setIcon(image0);
+ mainFrame()->RadioButton2->setIcon(image1);
+ mainFrame()->RadioButton3->setAttribute(Qt::WA_DeleteOnClose);
+ mainFrame()->RadioButton3->close();
- GroupPoints = new DlgRef_2Sel_QTD(this, "GroupPoints");
+ GroupPoints = new DlgRef_2Sel(centralWidget());
GroupPoints->GroupBox1->setTitle(tr("GEOM_DIAGONAL_POINTS"));
- GroupPoints->TextLabel1->setText(tr("GEOM_POINT_I").arg("1"));
- GroupPoints->TextLabel2->setText(tr("GEOM_POINT_I").arg("2"));
- GroupPoints->PushButton1->setPixmap(image2);
- GroupPoints->PushButton2->setPixmap(image2);
+ GroupPoints->TextLabel1->setText(tr("GEOM_POINT_I").arg(1));
+ GroupPoints->TextLabel2->setText(tr("GEOM_POINT_I").arg(2));
+ GroupPoints->PushButton1->setIcon(image2);
+ GroupPoints->PushButton2->setIcon(image2);
- GroupDimensions = new DlgRef_3Spin(this, "GroupDimensions");
+ GroupDimensions = new DlgRef_3Spin(centralWidget());
GroupDimensions->GroupBox1->setTitle(tr("GEOM_BOX_OBJ"));
GroupDimensions->TextLabel1->setText(tr("GEOM_DX"));
GroupDimensions->TextLabel2->setText(tr("GEOM_DY"));
GroupDimensions->TextLabel3->setText(tr("GEOM_DZ"));
- Layout1->addWidget(GroupPoints, 1, 0);
- Layout1->addWidget(GroupDimensions, 1, 0);
+ QVBoxLayout* layout = new QVBoxLayout(centralWidget());
+ layout->setMargin(0); layout->setSpacing(6);
+ layout->addWidget(GroupPoints);
+ layout->addWidget(GroupDimensions);
/***************************************************************/
- /* Initialisations */
- myPrimitiveGUI = thePrimitiveGUI;
+ setHelpFileName("create_box_page.html");
+
Init();
}
-
//=================================================================================
// function : ~DialogBox_Box()
// purpose : Destroys the object and frees any allocated resources
// no need to delete child widgets, Qt does it all for us
}
-
//=================================================================================
// function : Init()
// purpose :
//=================================================================================
void PrimitiveGUI_BoxDlg::Init()
{
- /* init variables */
- myConstructorId = 0;
- myEditCurrentArgument = GroupPoints->LineEdit1;
-
- myPoint1.SetCoord(0.0, 0.0, 0.0);
- myPoint2.SetCoord(0.0, 0.0, 0.0);
- myOkPoint1 = myOkPoint2 = false;
+ // Get setting of step value from file configuration
+ SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr();
+ double step = resMgr->doubleValue("Geometry", "SettingsGeomStep", 100);
- /* Vertices Filter for all arguments */
- myVertexFilter = new GEOM_ShapeTypeFilter(TopAbs_VERTEX, myGeom);
- mySelection->AddFilter(myVertexFilter);
+ // min, max, step and decimals for spin boxes
+ initSpinBox(GroupDimensions->SpinBox_DX, COORD_MIN, COORD_MAX, step, 3); // VSR: TODO: DBL_DIGITS_DISPLAY
+ initSpinBox(GroupDimensions->SpinBox_DY, COORD_MIN, COORD_MAX, step, 3); // VSR: TODO: DBL_DIGITS_DISPLAY
+ initSpinBox(GroupDimensions->SpinBox_DZ, COORD_MIN, COORD_MAX, step, 3); // VSR: TODO: DBL_DIGITS_DISPLAY
- /* Get setting of step value from file configuration */
- QString St = QAD_CONFIG->getSetting("Geometry:SettingsGeomStep");
- step = St.toDouble();
+ // init variables
+ GroupPoints->LineEdit1->setReadOnly(true);
+ GroupPoints->LineEdit2->setReadOnly(true);
- /* min, max, step and decimals for spin boxes */
- GroupDimensions->SpinBox_DX->RangeStepAndValidator(-999.999, 999.999, step, 3);
- GroupDimensions->SpinBox_DY->RangeStepAndValidator(-999.999, 999.999, step, 3);
- GroupDimensions->SpinBox_DZ->RangeStepAndValidator(-999.999, 999.999, step, 3);
+ GroupPoints->LineEdit1->setText("");
+ GroupPoints->LineEdit2->setText("");
+ myPoint1 = myPoint2 = GEOM::GEOM_Object::_nil();
double initValue = 200.0;
- GroupDimensions->SpinBox_DX->SetValue(initValue);
- GroupDimensions->SpinBox_DY->SetValue(initValue);
- GroupDimensions->SpinBox_DZ->SetValue(initValue);
+ GroupDimensions->SpinBox_DX->setValue(initValue);
+ GroupDimensions->SpinBox_DY->setValue(initValue);
+ GroupDimensions->SpinBox_DZ->setValue(initValue);
- /* 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)));
+ // signals and slots connections
+ connect(buttonOk(), SIGNAL(clicked()), this, SLOT(ClickOnOk()));
+ connect(buttonApply(), SIGNAL(clicked()), this, SLOT(ClickOnApply()));
+
+ connect(this, SIGNAL(constructorsClicked(int)), this, SLOT(ConstructorsClicked(int)));
connect(GroupPoints->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
connect(GroupPoints->PushButton2, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
connect(GroupPoints->LineEdit1, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
connect(GroupPoints->LineEdit2, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
- connect(GroupDimensions->SpinBox_DX, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double)));
- connect(GroupDimensions->SpinBox_DY, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double)));
- connect(GroupDimensions->SpinBox_DZ, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double)));
-
- connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupDimensions->SpinBox_DX, SLOT(SetStep(double)));
- connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupDimensions->SpinBox_DY, SLOT(SetStep(double)));
- connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupDimensions->SpinBox_DZ, SLOT(SetStep(double)));
+ connect(GroupDimensions->SpinBox_DX, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox()));
+ connect(GroupDimensions->SpinBox_DY, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox()));
+ connect(GroupDimensions->SpinBox_DZ, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox()));
- connect(mySelection, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
+ connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), this, SLOT(SetDoubleSpinBoxStep(double)));
- /* displays Dialog */
- GroupDimensions->hide();
- GroupPoints->show();
- this->show();
+ initName(tr("GEOM_BOX"));
- return;
+ setConstructorId(1); // simplest constructor
+ ConstructorsClicked(1);
}
+//=================================================================================
+// function : SetDoubleSpinBoxStep()
+// purpose : Double spin box management
+//=================================================================================
+void PrimitiveGUI_BoxDlg::SetDoubleSpinBoxStep (double step)
+{
+ GroupDimensions->SpinBox_DX->setSingleStep(step);
+ GroupDimensions->SpinBox_DY->setSingleStep(step);
+ GroupDimensions->SpinBox_DZ->setSingleStep(step);
+}
//=================================================================================
// function : ConstructorsClicked()
// purpose : Radio button management
//=================================================================================
-void PrimitiveGUI_BoxDlg::ConstructorsClicked(int constructorId)
+void PrimitiveGUI_BoxDlg::ConstructorsClicked (int constructorId)
{
- myConstructorId = constructorId;
- mySelection->ClearFilters();
- myGeomBase->EraseSimulationShape();
- mySimulationTopoDs.Nullify();
- disconnect(mySelection, 0, this, 0);
- myOkPoint1 = myOkPoint2 = false;
-
- switch (constructorId)
+ switch (constructorId) {
+ case 0:
{
- case 0:
- {
- GroupDimensions->hide();
- resize(0, 0);
- GroupPoints->show();
-
- myEditCurrentArgument = GroupPoints->LineEdit1;
- GroupPoints->LineEdit1->setText("");
- GroupPoints->LineEdit2->setText("");
-
- /* filter for next selection */
- mySelection->AddFilter(myVertexFilter);
- connect(mySelection, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
- break;
- }
- case 1:
- {
- GroupPoints->hide();
- resize(0, 0);
- GroupDimensions->show();
-
- double initValue = 200.0;
- GroupDimensions->SpinBox_DX->SetValue(initValue);
- GroupDimensions->SpinBox_DY->SetValue(initValue);
- GroupDimensions->SpinBox_DZ->SetValue(initValue);
-
- myPoint1.SetCoord(0.0, 0.0, 0.0) ;
- myPoint2.SetCoord(initValue, initValue, initValue);
-
- mySimulationTopoDs = BRepPrimAPI_MakeBox(myPoint1, myPoint2).Shape();
- myGeomBase->DisplaySimulationShape(mySimulationTopoDs);
- break;
- }
+ GroupDimensions->hide();
+ GroupPoints->show();
+
+ GroupPoints->PushButton1->click();
+ break;
}
- return;
-}
+ case 1:
+ {
+ GroupPoints->hide();
+ GroupDimensions->show();
+ disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
+ globalSelection(); // close local contexts, if any
+ displayPreview();
+ break;
+ }
+ }
+
+ qApp->processEvents();
+ updateGeometry();
+ resize(minimumSize());
+
+ if (myInitial) {
+ // on dialog initialization we init the first field with a selected object (if any)
+ SelectionIntoArgument();
+ myInitial = false;
+ }
+ else {
+ displayPreview();
+ }
+}
//=================================================================================
// function : ClickOnOk()
//=================================================================================
void PrimitiveGUI_BoxDlg::ClickOnOk()
{
- this->ClickOnApply();
- ClickOnCancel();
- return;
+ if (ClickOnApply())
+ ClickOnCancel();
}
-
//=================================================================================
// function : ClickOnApply()
// purpose :
//=================================================================================
-void PrimitiveGUI_BoxDlg::ClickOnApply()
+bool PrimitiveGUI_BoxDlg::ClickOnApply()
{
- buttonApply->setFocus();
- QAD_Application::getDesktop()->putInfo(tr(""));
- if (mySimulationTopoDs.IsNull())
- return;
- myGeomBase->EraseSimulationShape();
- mySimulationTopoDs.Nullify();
+ if (!onAccept())
+ return false;
- switch(myConstructorId)
- {
- case 0 :
- {
- if(myOkPoint1 && myOkPoint2)
- myPrimitiveGUI->MakeBoxAndDisplay(myPoint1, myPoint2);
- break;
- }
- case 1 :
- {
- /* Recup args and call method */
- double vx = GroupDimensions->SpinBox_DX->GetValue();
- double vy = GroupDimensions->SpinBox_DY->GetValue();
- double vz = GroupDimensions->SpinBox_DZ->GetValue();
- myPoint1.SetCoord(0.0, 0.0, 0.0);
- myPoint2.SetCoord(vx, vy, vz);
- myPrimitiveGUI->MakeBoxAndDisplay(myPoint1, myPoint2);
- break;
- }
- }
- return;
+ initName();
+ // activate selection and connect selection manager
+ ConstructorsClicked(getConstructorId());
+ return true;
}
-
//=================================================================================
// function : SelectionIntoArgument()
-// purpose : Called when selection as changed
+// purpose : Called when selection is changed or on dialog initialization or activation
//=================================================================================
void PrimitiveGUI_BoxDlg::SelectionIntoArgument()
{
- myGeomBase->EraseSimulationShape();
+ if (getConstructorId() != 0)
+ return;
+
+ erasePreview();
myEditCurrentArgument->setText("");
- QString aString = ""; /* name of selection */
-
- int nbSel = myGeomBase->GetNameOfSelectedIObjects(mySelection, aString);
- if (nbSel != 1) {
- if (myEditCurrentArgument == GroupPoints->LineEdit1)
- myOkPoint1 = false;
- else if ( myEditCurrentArgument == GroupPoints->LineEdit2)
- myOkPoint2 = false;
+
+ LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
+ SALOME_ListIO aSelList;
+ aSelMgr->selectedObjects(aSelList);
+
+ if (aSelList.Extent() != 1) {
+ if (myEditCurrentArgument == GroupPoints->LineEdit1) myPoint1 = GEOM::GEOM_Object::_nil();
+ else if (myEditCurrentArgument == GroupPoints->LineEdit2) myPoint2 = GEOM::GEOM_Object::_nil();
return;
}
// nbSel == 1
- TopoDS_Shape S;
- if(!myGeomBase->GetTopoFromSelection(mySelection, S))
+ Standard_Boolean testResult = Standard_False;
+ GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject(aSelList.First(), testResult);
+
+ if (!testResult || CORBA::is_nil(aSelectedObject))
return;
- if(myEditCurrentArgument == GroupPoints->LineEdit1 && myGeomBase->VertexToPoint(S, myPoint1)) {
- myEditCurrentArgument->setText(aString);
- myOkPoint1 = true;
- }
- else if(myEditCurrentArgument == GroupPoints->LineEdit2 && myGeomBase->VertexToPoint(S, myPoint2)) {
- myEditCurrentArgument->setText(aString);
- myOkPoint2 = true;
+ QString aName = 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.append(":vertex_" + QString::number(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_VERTEX) {
+ aSelectedObject = GEOM::GEOM_Object::_nil();
+ aName = "";
+ }
+ }
}
- if(myOkPoint1 && myOkPoint2 && TestBoxDimensions(myPoint1, myPoint2)) {
- mySimulationTopoDs = BRepPrimAPI_MakeBox(myPoint1, myPoint2).Shape();
- myGeomBase->DisplaySimulationShape(mySimulationTopoDs);
+ myEditCurrentArgument->setText(aName);
+
+ // clear selection
+ disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
+ myGeomGUI->getApp()->selectionMgr()->clearSelected();
+ connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
+ this, SLOT(SelectionIntoArgument()));
+
+ if (myEditCurrentArgument == GroupPoints->LineEdit1) {
+ myPoint1 = aSelectedObject;
+ if (!myPoint1->_is_nil() && myPoint2->_is_nil())
+ GroupPoints->PushButton2->click();
+ }
+ else if (myEditCurrentArgument == GroupPoints->LineEdit2) {
+ myPoint2 = aSelectedObject;
+ if (!myPoint2->_is_nil() && myPoint1->_is_nil())
+ GroupPoints->PushButton1->click();
}
- return;
-}
+ displayPreview();
+}
//=================================================================================
// function : SetEditCurrentArgument()
//=================================================================================
void PrimitiveGUI_BoxDlg::SetEditCurrentArgument()
{
- if(myConstructorId != 0)
- return;
-
QPushButton* send = (QPushButton*)sender();
- if(send == GroupPoints->PushButton1) {
- GroupPoints->LineEdit1->setFocus();
+ // ?? Commented, because we need this flag in ConstructorsClicked, because
+ // SelectionIntoArgument must be called only on dialog creation, and must not be called on
+ // simple switch between constructors (as we need to keep old values in fields in this case)
+
+ // clear selection
+ //disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
+ //if (myInitial)
+ // myInitial = false;
+ //else
+ // myGeomGUI->getApp()->selectionMgr()->clearSelected();
+
+ if (send == GroupPoints->PushButton1) {
myEditCurrentArgument = GroupPoints->LineEdit1;
+ GroupPoints->PushButton2->setDown(false);
+ GroupPoints->LineEdit2->setEnabled(false);
}
- else if(send == GroupPoints->PushButton2) {
- GroupPoints->LineEdit2->setFocus();
+ else if (send == GroupPoints->PushButton2) {
myEditCurrentArgument = GroupPoints->LineEdit2;
+ GroupPoints->PushButton1->setDown(false);
+ GroupPoints->LineEdit1->setEnabled(false);
}
- mySelection->AddFilter(myVertexFilter);
- this->SelectionIntoArgument();
- return;
-}
+ // enable line edit
+ myEditCurrentArgument->setEnabled(true);
+ myEditCurrentArgument->setFocus();
+ // after setFocus(), because it will be setDown(false) when loses focus
+ send->setDown(true);
+
+ disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
+ globalSelection(); // close local contexts, if any
+ localSelection(GEOM::GEOM_Object::_nil(), TopAbs_VERTEX);
+ connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
+ this, SLOT(SelectionIntoArgument()));
+ // seems we need it only to avoid preview disappearing, caused by selection mode change
+ displayPreview();
+}
//=================================================================================
// function : LineEditReturnPressed()
void PrimitiveGUI_BoxDlg::LineEditReturnPressed()
{
QLineEdit* send = (QLineEdit*)sender();
- if(send == GroupPoints->LineEdit1)
- myEditCurrentArgument = GroupPoints->LineEdit1;
- else if (send == GroupPoints->LineEdit2)
- myEditCurrentArgument = GroupPoints->LineEdit2;
- else
- return;
-
- GEOMBase_Skeleton::LineEditReturnPressed();
- return;
+ if (send == GroupPoints->LineEdit1 || send == GroupPoints->LineEdit2) {
+ myEditCurrentArgument = send;
+ GEOMBase_Skeleton::LineEditReturnPressed();
+ }
}
-
//=================================================================================
// function : ActivateThisDialog()
// purpose :
void PrimitiveGUI_BoxDlg::ActivateThisDialog()
{
GEOMBase_Skeleton::ActivateThisDialog();
- connect(mySelection, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
- if(myConstructorId == 0)
- mySelection->AddFilter(myVertexFilter);
- if(!mySimulationTopoDs.IsNull())
- myGeomBase->DisplaySimulationShape(mySimulationTopoDs);
- return;
+ //if (getConstructorId() == 0) {
+ // localSelection(GEOM::GEOM_Object::_nil(), TopAbs_VERTEX);
+ // connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
+ // this, SLOT(SelectionIntoArgument()));
+ //}
+ //displayPreview();
+
+ // reinit, because some selected objects could be removed
+ Init();
}
-
//=================================================================================
// function : enterEvent [REDEFINED]
// purpose :
//=================================================================================
-void PrimitiveGUI_BoxDlg::enterEvent(QEvent* e)
+void PrimitiveGUI_BoxDlg::enterEvent (QEvent*)
{
- if(GroupConstructors->isEnabled())
- return;
- this->ActivateThisDialog();
- return;
+ if (!mainFrame()->GroupConstructors->isEnabled())
+ ActivateThisDialog();
}
-
//=================================================================================
// function : ValueChangedInSpinBox()
// purpose :
//=================================================================================
-void PrimitiveGUI_BoxDlg::ValueChangedInSpinBox(double newValue)
+void PrimitiveGUI_BoxDlg::ValueChangedInSpinBox()
{
- myGeomBase->EraseSimulationShape();
- mySimulationTopoDs.Nullify();
- QObject* send = (QObject*)sender();
- double vx, vy, vz;
-
- if(send == GroupDimensions->SpinBox_DX) {
- vx = newValue;
- vy = GroupDimensions->SpinBox_DY->GetValue();
- vz = GroupDimensions->SpinBox_DZ->GetValue();
- }
- else if(send == GroupDimensions->SpinBox_DY) {
- vx = GroupDimensions->SpinBox_DX->GetValue();
- vy = newValue;
- vz = GroupDimensions->SpinBox_DZ->GetValue();
- }
- else if(send == GroupDimensions->SpinBox_DZ) {
- vx = GroupDimensions->SpinBox_DX->GetValue();
- vy = GroupDimensions->SpinBox_DY->GetValue();
- vz = newValue;
- }
+ displayPreview();
+}
- myPoint1.SetCoord(0.0, 0.0, 0.0);
- myPoint2.SetCoord(vx, vy, vz);
+//=================================================================================
+// function : createOperation
+// purpose :
+//=================================================================================
+GEOM::GEOM_IOperations_ptr PrimitiveGUI_BoxDlg::createOperation()
+{
+ return getGeomEngine()->GetI3DPrimOperations(getStudyId());
+}
- if(TestBoxDimensions(myPoint1, myPoint2)) {
- mySimulationTopoDs = BRepPrimAPI_MakeBox(myPoint1, myPoint2).Shape();
- myGeomBase->DisplaySimulationShape(mySimulationTopoDs);
+//=================================================================================
+// function : isValid
+// purpose :
+//=================================================================================
+bool PrimitiveGUI_BoxDlg::isValid (QString& msg)
+{
+ bool ok = true;
+ if( getConstructorId() == 1 )
+ {
+ ok = GroupDimensions->SpinBox_DX->isValid( msg, !IsPreview() ) && ok;
+ ok = GroupDimensions->SpinBox_DY->isValid( msg, !IsPreview() ) && ok;
+ ok = GroupDimensions->SpinBox_DZ->isValid( msg, !IsPreview() ) && ok;
}
- return;
+ return getConstructorId() == 0 ? !(myPoint1->_is_nil() || myPoint2->_is_nil()) : ok;
}
-
//=================================================================================
-// function : TestBoxDimensions()
+// function : execute
// purpose :
//=================================================================================
-bool PrimitiveGUI_BoxDlg::TestBoxDimensions(gp_Pnt P1, gp_Pnt P2)
+bool PrimitiveGUI_BoxDlg::execute (ObjectList& objects)
{
- if ((fabs(P1.X() - P2.X()) > Precision::Confusion()) &&
- (fabs(P1.Y() - P2.Y()) > Precision::Confusion()) &&
- (fabs(P1.Z() - P2.Z()) > Precision::Confusion()))
- return true;
- return false;
+ bool res = false;
+
+ GEOM::GEOM_Object_var anObj;
+
+ switch (getConstructorId()) {
+ case 0:
+ {
+ if (!CORBA::is_nil(myPoint1) && !CORBA::is_nil(myPoint2)) {
+ anObj = GEOM::GEOM_I3DPrimOperations::_narrow(getOperation())->MakeBoxTwoPnt(myPoint1, myPoint2);
+ res = true;
+ }
+ }
+ break;
+ case 1:
+ {
+ double x = GroupDimensions->SpinBox_DX->value();
+ double y = GroupDimensions->SpinBox_DY->value();
+ double z = GroupDimensions->SpinBox_DZ->value();
+
+ QStringList aParameters;
+ aParameters << GroupDimensions->SpinBox_DX->text();
+ aParameters << GroupDimensions->SpinBox_DY->text();
+ aParameters << GroupDimensions->SpinBox_DZ->text();
+ getOperation()->SetParameters( aParameters.join( ":" ).toLatin1().constData() );
+
+ anObj = GEOM::GEOM_I3DPrimOperations::_narrow(getOperation())->MakeBoxDXDYDZ(x, y, z);
+ res = true;
+ }
+ break;
+ }
+
+ if (!anObj->_is_nil())
+ objects.push_back(anObj._retn());
+
+ return res;
+}
+
+//=================================================================================
+// function : addSubshapesToStudy
+// purpose : virtual method to add new SubObjects if local selection
+//=================================================================================
+void PrimitiveGUI_BoxDlg::addSubshapesToStudy()
+{
+ if (getConstructorId() == 0) {
+ QMap<QString, GEOM::GEOM_Object_var> objMap;
+ objMap[GroupPoints->LineEdit1->text()] = myPoint1;
+ objMap[GroupPoints->LineEdit2->text()] = myPoint2;
+ addSubshapesToFather(objMap);
+ }
}
