-// GEOM GEOMGUI : GUI for Geometry component
+// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
-// 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
+// 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
+//
+// GEOM GEOMGUI : GUI for Geometry component
// File : PrimitiveGUI_CylinderDlg.cxx
// Author : Lucien PIGNOLONI
// Module : GEOM
// $Header$
-
-using namespace std;
+//
#include "PrimitiveGUI_CylinderDlg.h"
-#include <gp_Lin.hxx>
-#include <BRepPrimAPI_MakeCylinder.hxx>
-#include <BRepAdaptor_Curve.hxx>
-#include <Precision.hxx>
-#include "QAD_Config.h"
+#include "SUIT_Desktop.h"
+#include "SUIT_Session.h"
+#include "SalomeApp_Application.h"
+#include "LightApp_SelectionMgr.h"
+
+#include <TopoDS_Shape.hxx>
+#include <TopoDS_Edge.hxx>
+#include <TopoDS.hxx>
+#include <TopExp.hxx>
+#include <TColStd_IndexedMapOfInteger.hxx>
+#include <TopTools_IndexedMapOfShape.hxx>
+
+#include <qlabel.h>
+
+#include "GEOMImpl_Types.hxx"
+
+#include "utilities.h"
+
+using namespace std;
//=================================================================================
// class : PrimitiveGUI_CylinderDlg()
// The dialog will by default be modeless, unless you set 'modal' to
// TRUE to construct a modal dialog.
//=================================================================================
-PrimitiveGUI_CylinderDlg::PrimitiveGUI_CylinderDlg(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_CylinderDlg::PrimitiveGUI_CylinderDlg(GeometryGUI* theGeometryGUI, QWidget* parent,
+ const char* name, bool modal, WFlags fl)
+ :GEOMBase_Skeleton(theGeometryGUI, parent, name, modal, WStyle_Customize |
+ WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu)
{
- QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap("GEOM",tr("ICON_DLG_CYLINDER_PV")));
- QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap("GEOM",tr("ICON_DLG_CYLINDER_DXYZ")));
- QPixmap image2(QAD_Desktop::getResourceManager()->loadPixmap("GEOM",tr("ICON_SELECT")));
+ QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_CYLINDER_PV")));
+ QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_CYLINDER_DXYZ")));
+ QPixmap image2(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT")));
setCaption(tr("GEOM_CYLINDER_TITLE"));
GroupDimensions->TextLabel1->setText(tr("GEOM_RADIUS"));
GroupDimensions->TextLabel2->setText(tr("GEOM_HEIGHT"));
- Layout1->addWidget(GroupPoints, 1, 0);
- Layout1->addWidget(GroupDimensions, 1, 0);
+ Layout1->addWidget(GroupPoints, 2, 0);
+ Layout1->addWidget(GroupDimensions, 2, 0);
/***************************************************************/
- /* Initialisations */
- myPrimitiveGUI = thePrimitiveGUI;
+ setHelpFileName("create_cylinder_page.html");
+
Init();
}
void PrimitiveGUI_CylinderDlg::Init()
{
/* init variables */
- myConstructorId = 0;
myEditCurrentArgument = GroupPoints->LineEdit1;
+ GroupPoints->LineEdit1->setReadOnly( true );
+ GroupPoints->LineEdit2->setReadOnly( true );
- myRadius = 100.0;
- myHeight = 300.0;
- myOkRadius = myOkHeight = true;
- myOkPoint1 = myOkDir = false;
-
- myEdgeFilter = new GEOM_EdgeFilter(StdSelect_Line, myGeom);
- myVertexFilter = new GEOM_ShapeTypeFilter(TopAbs_VERTEX, myGeom);
- mySelection->AddFilter(myVertexFilter);
-
+ myPoint = myDir = GEOM::GEOM_Object::_nil();
+
/* Get setting of step value from file configuration */
- QString St = QAD_CONFIG->getSetting("Geometry:SettingsGeomStep");
- step = St.toDouble();
+ SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr();
+ double step = resMgr->doubleValue( "Geometry", "SettingsGeomStep", 100);
/* min, max, step and decimals for spin boxes & initial values */
/* First constructor : radius */
- GroupPoints->SpinBox_DX->RangeStepAndValidator(0.001, 999.999, step, 3);
+ GroupPoints->SpinBox_DX->RangeStepAndValidator(0.001, COORD_MAX, step, DBL_DIGITS_DISPLAY);
/* First constructor : algebric height */
- GroupPoints->SpinBox_DY->RangeStepAndValidator(-999.999, 999.999, step, 3);
+ GroupPoints->SpinBox_DY->RangeStepAndValidator(0.001, COORD_MAX, step, DBL_DIGITS_DISPLAY);
/* Second constructor : radius */
- GroupDimensions->SpinBox_DX->RangeStepAndValidator(0.001, 999.999, step, 3);
+ GroupDimensions->SpinBox_DX->RangeStepAndValidator(0.001, COORD_MAX, step, DBL_DIGITS_DISPLAY);
/* Second constructor : algebric height */
- GroupDimensions->SpinBox_DY->RangeStepAndValidator(-999.999, 999.999, step, 3);
+ GroupDimensions->SpinBox_DY->RangeStepAndValidator(0.001, COORD_MAX, step, DBL_DIGITS_DISPLAY);
- GroupPoints->SpinBox_DX->SetValue(myRadius);
- GroupPoints->SpinBox_DY->SetValue(myHeight);
- GroupDimensions->SpinBox_DX->SetValue(myRadius);
- GroupDimensions->SpinBox_DY->SetValue(myHeight);
+ GroupPoints->SpinBox_DX->SetValue(100.0);
+ GroupPoints->SpinBox_DY->SetValue(300.0);
+ GroupDimensions->SpinBox_DX->SetValue(100.0);
+ GroupDimensions->SpinBox_DY->SetValue(300.0);
/* signals and slots connections */
connect(buttonOk, SIGNAL(clicked()), this, SLOT(ClickOnOk()));
connect(GroupPoints->LineEdit1, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
connect(GroupPoints->LineEdit2, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
- connect(GroupPoints->SpinBox_DX, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double)));
- connect(GroupPoints->SpinBox_DY, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double)));
- connect(GroupDimensions->SpinBox_DX, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double)));
- connect(GroupDimensions->SpinBox_DY, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double)));
+ connect(GroupPoints->SpinBox_DX, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox()));
+ connect(GroupPoints->SpinBox_DY, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox()));
+ connect(GroupDimensions->SpinBox_DX, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox()));
+ connect(GroupDimensions->SpinBox_DY, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox()));
connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupPoints->SpinBox_DX, SLOT(SetStep(double)));
connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupPoints->SpinBox_DY, SLOT(SetStep(double)));
connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupDimensions->SpinBox_DX, SLOT(SetStep(double)));
connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupDimensions->SpinBox_DY, SLOT(SetStep(double)));
- connect(mySelection, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ;
-
- /* displays Dialog */
- GroupDimensions->hide();
- GroupPoints->show();
- this->show();
-
- return ;
+ connect(myGeomGUI->getApp()->selectionMgr(),
+ SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ;
+
+ initName( tr( "GEOM_CYLINDER" ) );
+ ConstructorsClicked(0);
}
//=================================================================================
void PrimitiveGUI_CylinderDlg::ConstructorsClicked(int constructorId)
{
- myConstructorId = constructorId;
- mySelection->ClearFilters();
- myGeomBase->EraseSimulationShape();
- disconnect(mySelection, 0, this, 0);
- myOkHeight = myOkRadius = true;
- myRadius = 100.0;
- myHeight = 300.0;
-
- switch(myConstructorId)
+ disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
+
+ switch (constructorId)
{
case 0 :
{
+ globalSelection( GEOM_POINT ); // to break previous local selection
+ localSelection( GEOM::GEOM_Object::_nil(), TopAbs_VERTEX );
+
GroupDimensions->hide();
resize(0, 0);
GroupPoints->show();
- myOkPoint1 = myOkDir = false;
-
+
myEditCurrentArgument = GroupPoints->LineEdit1;
GroupPoints->LineEdit1->setText(tr(""));
GroupPoints->LineEdit2->setText(tr(""));
-
- GroupPoints->SpinBox_DX->SetValue(myRadius);
- GroupPoints->SpinBox_DY->SetValue(myHeight);
+ myPoint = myDir = GEOM::GEOM_Object::_nil();
- /* filter for next selection */
- mySelection->AddFilter(myVertexFilter);
- connect(mySelection, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
+ connect(myGeomGUI->getApp()->selectionMgr(),
+ SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
break;
}
case 1 :
{
GroupPoints->hide();
+ globalSelection(); // close local contexts, if any
resize( 0, 0 );
GroupDimensions->show();
- myOkPoint1 = myOkDir = true;
-
- GroupDimensions->SpinBox_DX->SetValue(myRadius);
- GroupDimensions->SpinBox_DY->SetValue(myHeight);
- myPoint1.SetCoord(0.0, 0.0, 0.0);
- myDir.SetCoord(0.0, 0.0, 1.0);
-
- MakeCylinderSimulationAndDisplay();
+
break;
}
}
- return ;
+ displayPreview();
}
//=================================================================================
void PrimitiveGUI_CylinderDlg::ClickOnOk()
{
- this->ClickOnApply();
- ClickOnCancel();
- return;
+ if ( ClickOnApply() )
+ ClickOnCancel();
}
// function : ClickOnApply()
// purpose :
//=================================================================================
-void PrimitiveGUI_CylinderDlg::ClickOnApply()
+bool PrimitiveGUI_CylinderDlg::ClickOnApply()
{
- QAD_Application::getDesktop()->putInfo(tr(""));
- if (mySimulationTopoDs.IsNull())
- return;
- myGeomBase->EraseSimulationShape();
- mySimulationTopoDs.Nullify();
-
- if(myOkPoint1 && myOkDir && myOkRadius && myOkHeight) {
- gp_Dir aDir = myDir;
- /* allows user to reverse direction of construction with a negative height */
- if(this->myHeight < -Precision::Confusion())
- aDir.Reverse();
- myPrimitiveGUI->MakeCylinderAndDisplay(myPoint1, aDir, myRadius, fabs(myHeight));
- }
- return;
+ if ( !onAccept() )
+ return false;
+
+ initName();
+ ConstructorsClicked( getConstructorId() );
+ return true;
+}
+
+
+//=======================================================================
+// function : ClickOnCancel()
+// purpose :
+//=======================================================================
+void PrimitiveGUI_CylinderDlg::ClickOnCancel()
+{
+ GEOMBase_Skeleton::ClickOnCancel();
}
//=================================================================================
void PrimitiveGUI_CylinderDlg::SelectionIntoArgument()
{
- myGeomBase->EraseSimulationShape();
+ if (getConstructorId() != 0)
+ return;
+
myEditCurrentArgument->setText("");
- QString aString = ""; /* name of selection */
- int nbSel = myGeomBase->GetNameOfSelectedIObjects(mySelection, aString);
- if(nbSel != 1) {
- if(myEditCurrentArgument == GroupPoints->LineEdit1)
- myOkPoint1 = false;
+ if (IObjectCount() != 1)
+ {
+ if (myEditCurrentArgument == GroupPoints->LineEdit1)
+ myPoint = GEOM::GEOM_Object::_nil();
else if (myEditCurrentArgument == GroupPoints->LineEdit2)
- myOkDir = false;
+ myDir = 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(firstIObject(), testResult);
+
+ if (!testResult || CORBA::is_nil(aSelectedObject))
return;
-
- /* gp_Pnt : not used */
- if (myEditCurrentArgument == GroupPoints->LineEdit1 && myGeomBase->VertexToPoint(S, myPoint1)) {
- GroupPoints->LineEdit1->setText(aString);
- myOkPoint1 = true;
- }
- else if (myEditCurrentArgument == GroupPoints->LineEdit2) {
- BRepAdaptor_Curve curv(TopoDS::Edge(S));
- myDir = curv.Line().Direction();
- GroupPoints->LineEdit2->setText(aString);
- myOkDir = true;
+
+ QString aName = GEOMBase::GetName(aSelectedObject);
+ TopoDS_Shape aShape;
+ if (GEOMBase::GetShape(aSelectedObject, aShape, TopAbs_SHAPE) && !aShape.IsNull())
+ {
+ TopAbs_ShapeEnum aNeedType = TopAbs_VERTEX;
+ if (myEditCurrentArgument == GroupPoints->LineEdit2)
+ aNeedType = TopAbs_EDGE;
+
+ LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
+ TColStd_IndexedMapOfInteger aMap;
+ aSelMgr->GetIndexes(firstIObject(), aMap);
+ if (aMap.Extent() == 1) // Local Selection
+ {
+ int anIndex = aMap(1);
+ if (aNeedType == TopAbs_EDGE)
+ aName.append(":edge_" + QString::number(anIndex));
+ else
+ 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() != aNeedType) {
+ aSelectedObject = GEOM::GEOM_Object::_nil();
+ aName = "";
+ }
+ }
}
-
- if(myOkPoint1 && myOkDir && myOkRadius && myOkHeight)
- MakeCylinderSimulationAndDisplay();
- return;
-}
+ myEditCurrentArgument->setText(aName);
+
+ if (myEditCurrentArgument == GroupPoints->LineEdit1)
+ myPoint = aSelectedObject;
+ else if (myEditCurrentArgument == GroupPoints->LineEdit2)
+ myDir = aSelectedObject;
+ displayPreview();
+}
//=================================================================================
// function : SetEditCurrentArgument()
//=================================================================================
void PrimitiveGUI_CylinderDlg::SetEditCurrentArgument()
{
- if(myConstructorId != 0)
- return;
-
QPushButton* send = (QPushButton*)sender();
- mySelection->ClearFilters();
-
- if(send == GroupPoints->PushButton1) {
- GroupPoints->LineEdit1->setFocus();
+
+ if (send == GroupPoints->PushButton1) {
myEditCurrentArgument = GroupPoints->LineEdit1;
- mySelection->AddFilter(myVertexFilter);
+ globalSelection( GEOM_POINT ); // to break previous local selection
+ localSelection( GEOM::GEOM_Object::_nil(), TopAbs_VERTEX );
}
- else if(send == GroupPoints->PushButton2) {
- GroupPoints->LineEdit2->setFocus();
+ else if (send == GroupPoints->PushButton2) {
myEditCurrentArgument = GroupPoints->LineEdit2;
- mySelection->AddFilter(myEdgeFilter);
+ globalSelection( GEOM_LINE ); // to break previous local selection
+ localSelection( GEOM::GEOM_Object::_nil(), TopAbs_EDGE );
}
- this->SelectionIntoArgument();
-
- return;
+
+ myEditCurrentArgument->setFocus();
+ SelectionIntoArgument();
}
void PrimitiveGUI_CylinderDlg::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_CylinderDlg::ActivateThisDialog()
{
GEOMBase_Skeleton::ActivateThisDialog();
- connect(mySelection, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
- if(myConstructorId == 0) {
- GroupPoints->LineEdit1->setFocus();
- myEditCurrentArgument = GroupPoints->LineEdit1;
- mySelection->AddFilter(myVertexFilter);
- }
- if(!mySimulationTopoDs.IsNull())
- myGeomBase->DisplaySimulationShape(mySimulationTopoDs);
- return;
-}
+ connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
+ this, SLOT(SelectionIntoArgument()));
+ ConstructorsClicked(getConstructorId());
+}
//=================================================================================
// function : enterEvent()
//=================================================================================
void PrimitiveGUI_CylinderDlg::enterEvent(QEvent* e)
{
- if (GroupConstructors->isEnabled())
- return;
- this->ActivateThisDialog();
- return;
+ if ( !GroupConstructors->isEnabled() )
+ ActivateThisDialog();
+}
+
+
+//=================================================================================
+// function : DeactivateActiveDialog()
+// purpose : public slot to deactivate if active
+//=================================================================================
+void PrimitiveGUI_CylinderDlg::DeactivateActiveDialog()
+{
+ GEOMBase_Skeleton::DeactivateActiveDialog();
}
// function : ValueChangedInSpinBox
// purpose :
//=================================================================================
-void PrimitiveGUI_CylinderDlg::ValueChangedInSpinBox( double newValue )
+void PrimitiveGUI_CylinderDlg::ValueChangedInSpinBox( )
{
- myGeomBase->EraseSimulationShape();
- mySimulationTopoDs.Nullify();
- QObject* send = (QObject*)sender();
-
- /* radius */
- if(send == GroupPoints->SpinBox_DX || send == GroupDimensions->SpinBox_DX) {
- myRadius = newValue;
- myOkRadius = true;
- } /* algebric height */
- else if(send == GroupPoints->SpinBox_DY || send == GroupDimensions->SpinBox_DY) {
- myHeight = newValue;
- myOkHeight = true;
- }
+ displayPreview();
+}
- if (myOkPoint1 && myOkDir && myOkRadius && myOkHeight)
- MakeCylinderSimulationAndDisplay();
- return;
+
+//=================================================================================
+// function : createOperation
+// purpose :
+//=================================================================================
+GEOM::GEOM_IOperations_ptr PrimitiveGUI_CylinderDlg::createOperation()
+{
+ return getGeomEngine()->GetI3DPrimOperations( getStudyId() );
}
//=================================================================================
-// function : MakeCylinderSimulationAndDisplay()
+// function : isValid
+// purpose :
+//=================================================================================
+bool PrimitiveGUI_CylinderDlg::isValid( QString& msg )
+{
+ return getConstructorId() == 0 ? !(myPoint->_is_nil() || myDir->_is_nil() ) : true;
+}
+
+//=================================================================================
+// function : execute
// purpose :
//=================================================================================
-void PrimitiveGUI_CylinderDlg::MakeCylinderSimulationAndDisplay()
+bool PrimitiveGUI_CylinderDlg::execute( ObjectList& objects )
{
- myGeomBase->EraseSimulationShape();
- mySimulationTopoDs.Nullify();
- gp_Dir aDir = this->myDir;
+ bool res = false;
+
+ GEOM::GEOM_Object_var anObj;
+
+ switch ( getConstructorId() )
+ {
+ case 0 :
+ {
+ if ( !CORBA::is_nil( myPoint ) && !CORBA::is_nil( myDir )) {
+ anObj = GEOM::GEOM_I3DPrimOperations::_narrow( getOperation() )->MakeCylinderPntVecRH(myPoint, myDir, getRadius(), getHeight());
+ res = true;
+ }
+ break;
+ }
+ case 1 :
+ {
+ anObj = GEOM::GEOM_I3DPrimOperations::_narrow( getOperation() )->MakeCylinderRH(getRadius(), getHeight());
+ res = true;
+
+ break;
+ }
+ }
+
+ if ( !anObj->_is_nil() )
+ objects.push_back( anObj._retn() );
- try {
- /* allows user to reverse direction of construction with a negative height */
- if(this->myHeight < -Precision::Confusion())
- aDir.Reverse();
+ return res;
+}
- gp_Ax2 anAxis(this->myPoint1, aDir);
+//=================================================================================
+// function : closeEvent
+// purpose :
+//=================================================================================
+void PrimitiveGUI_CylinderDlg::closeEvent( QCloseEvent* e )
+{
+ GEOMBase_Skeleton::closeEvent( e );
+}
- mySimulationTopoDs = BRepPrimAPI_MakeCylinder(anAxis, this->myRadius, fabs(myHeight)).Shape();
- myGeomBase->DisplaySimulationShape(mySimulationTopoDs);
- }
- catch(Standard_Failure) {
- MESSAGE("Exception catched in MakeCylinderSimulationAndDisplay");
+
+//=================================================================================
+// function : getRadius()
+// purpose :
+//=================================================================================
+double PrimitiveGUI_CylinderDlg::getRadius() const
+{
+ int aConstructorId = getConstructorId();
+ if (aConstructorId == 0)
+ return GroupPoints->SpinBox_DX->GetValue();
+ else if (aConstructorId == 1)
+ return GroupDimensions->SpinBox_DX->GetValue();
+ return 0;
+}
+
+//=================================================================================
+// function : getHeight()
+// purpose :
+//=================================================================================
+double PrimitiveGUI_CylinderDlg::getHeight() const
+{
+ int aConstructorId = getConstructorId();
+ if (aConstructorId == 0)
+ return GroupPoints->SpinBox_DY->GetValue();
+ else if (aConstructorId == 1)
+ return GroupDimensions->SpinBox_DY->GetValue();
+ return 0;
+}
+
+//=================================================================================
+// function : addSubshapeToStudy
+// purpose : virtual method to add new SubObjects if local selection
+//=================================================================================
+void PrimitiveGUI_CylinderDlg::addSubshapesToStudy()
+{
+ QMap<QString, GEOM::GEOM_Object_var> objMap;
+
+switch (getConstructorId())
+ {
+ case 0:
+ objMap[GroupPoints->LineEdit1->text()] = myPoint;
+ objMap[GroupPoints->LineEdit2->text()] = myDir;
+ break;
+ case 1:
+ return;
}
- return;
+ addSubshapesToFather( objMap );
}
