\n <b>Arguments:</b> Name + 1 vertex (for the center) + 1 edge (for
the direction) + Radius.
+\note Passing None as <b>Center Point</b> means Origin of global
+coordinate system, passing None as \b Vector means OZ axis of global
+coordinate system.
+
\image html circle1.png
\n Secondly, you can define a \b Circle by three \b Points that lie on it.
\n <b>Arguments:</b> Name + 1 vertex (for the center) + 1 edge (for
the direction) + 1 X Radius + 1 Y Radius.
+\note Passing None as <b>Center Point</b> means Origin of global
+coordinate system, passing None as \b Vector means OZ axis of global
+coordinate system.
+
\image html ellipse.png
<b>Example:</b>
Our <b>TUI Scripts</b> provide you with useful examples of creation of
\ref tui_creation_ellipse "Basic Geometric Objects".
-*/
\ No newline at end of file
+*/
GroupPntVecR = new DlgRef_2Sel1Spin( centralWidget() );
GroupPntVecR->GroupBox1->setTitle( tr( "GEOM_ARGUMENTS" ) );
- GroupPntVecR->TextLabel1->setText( tr( "GEOM_CENTER_POINT" ) );
- GroupPntVecR->TextLabel2->setText( tr( "GEOM_VECTOR" ) );
+ GroupPntVecR->TextLabel1->setText( tr( "GEOM_CENTER_POINT" ) + " (Origin by default)" );
+ GroupPntVecR->TextLabel2->setText( tr( "GEOM_VECTOR" ) + " (Z axis by default)" );
GroupPntVecR->TextLabel3->setText( tr( "GEOM_RADIUS" ) );
GroupPntVecR->PushButton1->setIcon( image1 );
GroupPntVecR->PushButton2->setIcon( image1 );
connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged() ),
this, SLOT( SelectionIntoArgument() ) );
+
+ displayPreview();
}
//=================================================================================
{
const int id = getConstructorId();
if ( id == 0 )
- return !myPoint->_is_nil() && !myDir->_is_nil() && getRadius() > 0;
+ //return !myPoint->_is_nil() && !myDir->_is_nil() && getRadius() > 0;
+ //nil point means origin of global CS
+ //nil vector means Z axis
+ return getRadius() > 0;
else if ( id == 1 )
return !myPoint1->_is_nil() && !myPoint2->_is_nil() && !myPoint3->_is_nil() &&
!isEqual( myPoint1, myPoint2 ) && !isEqual( myPoint1, myPoint3 ) && !isEqual( myPoint2, myPoint3 );
else if ( id == 2 )
- return !myPoint4->_is_nil() && !myPoint5->_is_nil() && !myPoint6->_is_nil() &&
+ return !myPoint4->_is_nil() && !myPoint5->_is_nil() && !myPoint6->_is_nil() &&
!isEqual( myPoint4, myPoint5 ) && !isEqual( myPoint5, myPoint6 ) && !isEqual( myPoint4, myPoint6 );
return false;
}
switch ( getConstructorId() ) {
case 0:
- objMap[GroupPntVecR->LineEdit1->text()] = myPoint;
- objMap[GroupPntVecR->LineEdit2->text()] = myDir;
+ if (!CORBA::is_nil(myPoint))
+ objMap[GroupPntVecR->LineEdit1->text()] = myPoint;
+ if (!CORBA::is_nil(myDir))
+ objMap[GroupPntVecR->LineEdit2->text()] = myDir;
break;
case 1:
objMap[Group3Pnts->LineEdit1->text()] = myPoint1;
GroupPoints = new DlgRef_2Sel2Spin( centralWidget() );
GroupPoints->GroupBox1->setTitle( tr( "GEOM_ARGUMENTS" ) );
- GroupPoints->TextLabel1->setText( tr( "GEOM_CENTER" ) );
- GroupPoints->TextLabel2->setText( tr( "GEOM_VECTOR" ) );
+ GroupPoints->TextLabel1->setText( tr( "GEOM_CENTER" ) + " (Origin by default)" );
+ GroupPoints->TextLabel2->setText( tr( "GEOM_VECTOR" ) + " (Z axis by default)" );
GroupPoints->TextLabel3->setText( tr( "GEOM_RADIUS_MAJOR" ) );
GroupPoints->TextLabel4->setText( tr( "GEOM_RADIUS_MINOR" ) );
GroupPoints->PushButton1->setIcon( image1 );
SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) );
initName( tr( "GEOM_ELLIPSE" ) );
+
+ displayPreview();
}
//=================================================================================
//globalSelection(GEOM_POINT);
globalSelection(); // close local contexts, if any
localSelection( GEOM::GEOM_Object::_nil(), TopAbs_VERTEX );
+ displayPreview();
return true;
}
msg = tr( "GEOM_ELLIPSE_ERROR_1" );
return false;
}
- return !myPoint->_is_nil() && !myDir->_is_nil();
+ //return !myPoint->_is_nil() && !myDir->_is_nil();
+ //nil point means origin of global CS
+ //nil vector means Z axis
+ return true;
}
//=================================================================================
{
QMap<QString, GEOM::GEOM_Object_var> objMap;
- objMap[GroupPoints->LineEdit1->text()] = myPoint;
- objMap[GroupPoints->LineEdit2->text()] = myDir;
+ if (!CORBA::is_nil(myPoint))
+ objMap[GroupPoints->LineEdit1->text()] = myPoint;
+ if (!CORBA::is_nil(myDir))
+ objMap[GroupPoints->LineEdit2->text()] = myDir;
addSubshapesToFather( objMap );
}
//=================================================================================
// class : BasicGUI_VectorDlg()
-// purpose : Constructs a BasicGUI_VectorDlg which is a child of 'parent', with the
+// purpose : Constructs a BasicGUI_VectorDlg 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.
/***************************************************************/
setHelpFileName( "create_vector_page.html" );
-
+
/* Initialisations */
Init();
}
// purpose : Destroys the object and frees any allocated resources
//=================================================================================
BasicGUI_VectorDlg::~BasicGUI_VectorDlg()
-{
+{
}
/* Get setting of step value from file configuration */
SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr();
double step = resMgr->doubleValue( "Geometry", "SettingsGeomStep", 100 );
-
+
/* 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
/* signals and slots connections */
connect( myGeomGUI, SIGNAL( SignalDeactivateActiveDialog() ), this, SLOT( DeactivateActiveDialog() ) );
connect( myGeomGUI, SIGNAL( SignalCloseAllDialogs() ), this, SLOT( ClickOnCancel() ) );
-
+
connect( buttonOk(), SIGNAL( clicked() ), this, SLOT( ClickOnOk() ) );
connect( buttonApply(), SIGNAL( clicked() ), this, SLOT( ClickOnApply() ) );
connect( GroupDimensions->CheckButton1, SIGNAL( stateChanged( int ) ), this, SLOT( ReverseVector( int ) ) );
- connect( myGeomGUI->getApp()->selectionMgr(),
+ connect( myGeomGUI->getApp()->selectionMgr(),
SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) );
initName( tr("GEOM_VECTOR") );
- ConstructorsClicked( 0 );
+ setConstructorId( 1 ); // simplest constructor
+ ConstructorsClicked( 1 );
}
//=================================================================================
{
GroupDimensions->hide();
GroupPoints->show();
-
+
myEditCurrentArgument = GroupPoints->LineEdit1;
GroupPoints->LineEdit1->setText( "" );
GroupPoints->LineEdit2->setText( "" );
-
+
globalSelection(); // close local contexts, if any
localSelection( GEOM::GEOM_Object::_nil(), TopAbs_VERTEX );
- connect( myGeomGUI->getApp()->selectionMgr(),
+ connect( myGeomGUI->getApp()->selectionMgr(),
SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) );
break;
}
GroupPoints->hide();
GroupDimensions->show();
globalSelection(); // close local contexts, if any
-
- double dx( 0. ), dy( 0. ), dz( 0. );
+
+ double dx( 0. ), dy( 0. ), dz( 0. );
GroupDimensions->SpinBox_DX->setValue( dx );
GroupDimensions->SpinBox_DY->setValue( dy );
GroupDimensions->SpinBox_DZ->setValue( dz );
-
+
GroupDimensions->CheckButton1->setChecked( false );
break;
}
return;
}
- // nbSel == 1
+ // nbSel == 1
Standard_Boolean aRes = Standard_False;
GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject( firstIObject(), aRes );
if ( !CORBA::is_nil( aSelectedObject ) && aRes ) {
// purpose :
//=================================================================================
void BasicGUI_VectorDlg::LineEditReturnPressed()
-{
+{
QLineEdit* send = (QLineEdit*)sender();
if ( send == GroupPoints->LineEdit1 ) myEditCurrentArgument = GroupPoints->LineEdit1;
else if ( send == GroupPoints->LineEdit2 ) myEditCurrentArgument = GroupPoints->LineEdit2;
GroupDimensions->SpinBox_DX->setValue( dx );
GroupDimensions->SpinBox_DY->setValue( dy );
GroupDimensions->SpinBox_DZ->setValue( dz );
-
+
displayPreview();
}
bool BasicGUI_VectorDlg::execute( ObjectList& objects )
{
bool res = false;
-
+
GEOM::GEOM_Object_var anObj;
switch ( getConstructorId() ) {
/***************************************************************/
QGroupBox* aReverseGroupBox = new QGroupBox( centralWidget() );
QHBoxLayout* aReverseGroupBoxLayout = new QHBoxLayout( aReverseGroupBox );
- aReverseGroupBoxLayout->setMargin( 9 );
+ aReverseGroupBoxLayout->setMargin( 9 );
aReverseGroupBoxLayout->setSpacing( 6 );
-
+
myReverseCB = new QCheckBox( aReverseGroupBox );
myReverseCB->setText( tr( "GEOM_REVERSE_PLANE" ) );
aReverseGroupBoxLayout->addWidget( myReverseCB );
-
+
QVBoxLayout* layout = new QVBoxLayout( centralWidget() );
layout->setMargin( 0 ); layout->setSpacing( 6 );
layout->addWidget( Group1 );
layout->addWidget( Group2 );
layout->addWidget( Group3 );
layout->addWidget( aReverseGroupBox );
-
+
setHelpFileName( "create_wplane_page.html" );
Init();
initName( tr( "GEOM_WPLANE" ) );
- ConstructorsClicked( 0 );
+ setConstructorId( 2 ); // simplest constructor
+ ConstructorsClicked( 2 );
}
//=================================================================================
aMap.Add( GEOM_PLANE );
aMap.Add( GEOM_MARKER );
globalSelection( aMap );
-
+
Group2->hide();
Group3->hide();
Group1->show();
-
+
myEditCurrentArgument = Group1->LineEdit1;
Group1->LineEdit1->setText( "" );
myFace = GEOM::GEOM_Object::_nil();
-
+
connect( aSelMgr, SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) );
break;
}
//globalSelection( GEOM_LINE );
GEOM::GEOM_Object_var anObj;
localSelection( anObj, TopAbs_EDGE );
-
+
Group1->hide();
Group3->hide();
Group2->show();
-
+
myEditCurrentArgument = Group2->LineEdit1;
Group2->LineEdit1->setText( "" );
Group2->LineEdit2->setText( "" );
myVectX = GEOM::GEOM_Object::_nil();
myVectZ = GEOM::GEOM_Object::_nil();
-
+
connect( aSelMgr, SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) );
break;
}
Group1->hide();
Group2->hide();
Group3->show();
-
+
Group3->RadioButton1->setChecked( true );
aOriginType = 1;
break;
}
}
-
+
qApp->processEvents();
updateGeometry();
resize( minimumSize() );
{
buttonApply()->setFocus();
myGeomGUI->application()->putInfo( "" );
-
+
if ( updateWPlane( false ) ) {
myGeomGUI->SetWorkingPlane( myWPlane );
myGeomGUI->ActiveWorkingPlane();
}
-
+
return true;
}
if ( myEditCurrentArgument == Group1->LineEdit1 )
myFace = aSelectedObject;
- else if ( myEditCurrentArgument == Group2->LineEdit1 ||
+ else if ( myEditCurrentArgument == Group2->LineEdit1 ||
myEditCurrentArgument == Group2->LineEdit2 ) {
if ( aRes && !aSelectedObject->_is_nil() ) {
TopoDS_Shape aShape;
}
myEditCurrentArgument->setText( aName );
-
+
updateWPlane();
}
bool BasicGUI_WorkingPlaneDlg::updateWPlane( const bool showPreview )
{
erasePreview();
-
+
const int id = getConstructorId();
if ( id == 0 ) { // by planar face selection
gp_Dir aDirN ( Zx, Zy, Zz );
gp_Dir aDirX ( Xx, Xy, Xz );
myWPlane = gp_Ax3( aPnt, aDirN, aDirX );
- }
+ }
else {
if ( !showPreview )
showError( "Wrong shape selected (has to be a planar face)" );
return false;
}
- }
+ }
else if ( id == 1 ) { // by two vectors (Ox & Oz)
if ( CORBA::is_nil( myVectX ) || CORBA::is_nil( myVectZ ) ) {
if ( !showPreview )
showError( "Two vectors have to be selected" );
return false;
}
-
+
TopoDS_Edge aVectX, aVectZ;
TopoDS_Vertex VX1, VX2, VZ1, VZ2;
gp_Vec aVX, aVZ;
myWPlane = gp_Ax3( BRep_Tool::Pnt( VX1 ), aDirZ, aDirX );
- }
+ }
else if ( id == 2 ) { // by selection from standard (OXY or OYZ, or OZX)
gp_Ax2 anAx2;
myWPlane = gp_Ax3( anAx2 );
- }
+ }
else {
return false;
}
-
+
if ( myReverseCB->isChecked() ) {
myWPlane.YReverse();
myWPlane.ZReverse();
}
-
+
if ( showPreview ) {
GEOM::GEOM_IBasicOperations_var aBasicOp = getGeomEngine()->GetIBasicOperations( getStudyId() );
- GEOM::GEOM_Object_var anObj = aBasicOp->MakeMarker( myWPlane.Location().X(), myWPlane.Location().Y(), myWPlane.Location().Z(),
- myWPlane.XDirection().X(), myWPlane.XDirection().Y(), myWPlane.XDirection().Z(),
- myWPlane.YDirection().X(), myWPlane.YDirection().Y(), myWPlane.YDirection().Z() );
+ GEOM::GEOM_Object_var anObj = aBasicOp->MakeMarker
+ ( myWPlane.Location().X(), myWPlane.Location().Y(), myWPlane.Location().Z(),
+ myWPlane.XDirection().X(), myWPlane.XDirection().Y(), myWPlane.XDirection().Z(),
+ myWPlane.YDirection().X(), myWPlane.YDirection().Y(), myWPlane.YDirection().Z() );
displayPreview( anObj );
}
-
+
return true;
}
TopoDS_Shape aShape;
if (aType == CIRCLE_PNT_VEC_R) {
- Handle(GEOM_Function) aRefPoint = aCI.GetCenter();
+ // Center
+ gp_Pnt aP = gp::Origin();
+ Handle(GEOM_Function) aRefPoint = aCI.GetCenter();
+ if (!aRefPoint.IsNull()) {
+ TopoDS_Shape aShapePnt = aRefPoint->GetValue();
+ if (aShapePnt.ShapeType() != TopAbs_VERTEX) {
+ Standard_ConstructionError::Raise
+ ("Circle creation aborted: invalid center argument, must be a point");
+ }
+ aP = BRep_Tool::Pnt(TopoDS::Vertex(aShapePnt));
+ }
+ // Normal
+ gp_Vec aV = gp::DZ();
Handle(GEOM_Function) aRefVector = aCI.GetVector();
- TopoDS_Shape aShapePnt = aRefPoint->GetValue();
- TopoDS_Shape aShapeVec = aRefVector->GetValue();
- if (aShapePnt.ShapeType() == TopAbs_VERTEX &&
- aShapeVec.ShapeType() == TopAbs_EDGE) {
- gp_Pnt aP = BRep_Tool::Pnt(TopoDS::Vertex(aShapePnt));
+ if (!aRefVector.IsNull()) {
+ TopoDS_Shape aShapeVec = aRefVector->GetValue();
+ if (aShapeVec.ShapeType() != TopAbs_EDGE) {
+ Standard_ConstructionError::Raise
+ ("Circle creation aborted: invalid vector argument, must be a vector or an edge");
+ }
TopoDS_Edge anE = TopoDS::Edge(aShapeVec);
TopoDS_Vertex V1, V2;
TopExp::Vertices(anE, V1, V2, Standard_True);
if (!V1.IsNull() && !V2.IsNull()) {
- gp_Vec aV (BRep_Tool::Pnt(V1), BRep_Tool::Pnt(V2));
- gp_Ax2 anAxes (aP, aV);
- gp_Circ aCirc (anAxes, aCI.GetRadius());
- aShape = BRepBuilderAPI_MakeEdge(aCirc).Edge();
+ aV = gp_Vec(BRep_Tool::Pnt(V1), BRep_Tool::Pnt(V2));
+ if (aV.Magnitude() < gp::Resolution()) {
+ Standard_ConstructionError::Raise
+ ("Circle creation aborted: vector of zero length is given");
+ }
}
}
+ // Axes
+ gp_Ax2 anAxes (aP, aV);
+ // Circle
+ gp_Circ aCirc (anAxes, aCI.GetRadius());
+ aShape = BRepBuilderAPI_MakeEdge(aCirc).Edge();
}
- else if (aType == CIRCLE_CENTER_TWO_PNT) {
- Handle(GEOM_Function) aRefPoint1 = aCI.GetPoint1();
- Handle(GEOM_Function) aRefPoint2 = aCI.GetPoint2();
- Handle(GEOM_Function) aRefPoint3 = aCI.GetPoint3();
- TopoDS_Shape aShapePnt1 = aRefPoint1->GetValue();
- TopoDS_Shape aShapePnt2 = aRefPoint2->GetValue();
- TopoDS_Shape aShapePnt3 = aRefPoint3->GetValue();
- if (aShapePnt1.ShapeType() == TopAbs_VERTEX && aShapePnt2.ShapeType() == TopAbs_VERTEX &&
- aShapePnt3.ShapeType() == TopAbs_VERTEX)
- {
- gp_Pnt aP1 = BRep_Tool::Pnt(TopoDS::Vertex(aShapePnt1));
- gp_Pnt aP2 = BRep_Tool::Pnt(TopoDS::Vertex(aShapePnt2));
- gp_Pnt aP3 = BRep_Tool::Pnt(TopoDS::Vertex(aShapePnt3));
-
- if (aP1.Distance(aP2) < gp::Resolution() ||
- aP1.Distance(aP3) < gp::Resolution() ||
- aP2.Distance(aP3) < gp::Resolution())
- Standard_ConstructionError::Raise("Circle creation aborted: coincident points given");
- if (gp_Vec(aP1, aP2).IsParallel(gp_Vec(aP1, aP3), Precision::Angular()))
- Standard_ConstructionError::Raise("Circle creation aborted: points lay on one line");
- double x, y, z, x1, y1, z1, x2, y2, z2, dx, dy, dz, dx2, dy2, dz2, dx3, dy3, dz3, aRadius;
- //Calculations for Radius
- x = aP1.X(); y = aP1.Y(); z = aP1.Z();
- x1 = aP2.X(); y1 = aP2.Y(); z1 = aP2.Z();
- dx = x1 - x;
- dy = y1 - y;
- dz = z1 - z;
- aRadius = sqrt(dx*dx + dy*dy + dz*dz);
- //Calculations for Plane Vector
- x2 = aP3.X(); y2 = aP3.Y(); z2 = aP3.Z();
- dx2 = x2 - x; dy2 = y2 - y; dz2 = z2 - z;
- dx3 = ((dy*dz2) - (dy2*dz))/100;
- dy3 = ((dx2*dz) - (dx*dz2))/100;
- dz3 = ((dx*dy2) - (dx2*dy))/100;
- //Make Plane Vector
- gp_Dir aDir ( dx3, dy3, dz3 );
- //Make Circle
- gp_Ax2 anAxes (aP1, aDir);
- gp_Circ aCirc (anAxes, aRadius);
- aShape = BRepBuilderAPI_MakeEdge(aCirc).Edge();
- }
+ else if (aType == CIRCLE_CENTER_TWO_PNT) {
+ Handle(GEOM_Function) aRefPoint1 = aCI.GetPoint1();
+ Handle(GEOM_Function) aRefPoint2 = aCI.GetPoint2();
+ Handle(GEOM_Function) aRefPoint3 = aCI.GetPoint3();
+ TopoDS_Shape aShapePnt1 = aRefPoint1->GetValue();
+ TopoDS_Shape aShapePnt2 = aRefPoint2->GetValue();
+ TopoDS_Shape aShapePnt3 = aRefPoint3->GetValue();
+ if (aShapePnt1.ShapeType() == TopAbs_VERTEX &&
+ aShapePnt2.ShapeType() == TopAbs_VERTEX &&
+ aShapePnt3.ShapeType() == TopAbs_VERTEX)
+ {
+ gp_Pnt aP1 = BRep_Tool::Pnt(TopoDS::Vertex(aShapePnt1));
+ gp_Pnt aP2 = BRep_Tool::Pnt(TopoDS::Vertex(aShapePnt2));
+ gp_Pnt aP3 = BRep_Tool::Pnt(TopoDS::Vertex(aShapePnt3));
+
+ if (aP1.Distance(aP2) < gp::Resolution() ||
+ aP1.Distance(aP3) < gp::Resolution() ||
+ aP2.Distance(aP3) < gp::Resolution())
+ Standard_ConstructionError::Raise("Circle creation aborted: coincident points given");
+
+ if (gp_Vec(aP1, aP2).IsParallel(gp_Vec(aP1, aP3), Precision::Angular()))
+ Standard_ConstructionError::Raise("Circle creation aborted: points lay on one line");
+
+ double x, y, z, x1, y1, z1, x2, y2, z2, dx, dy, dz, dx2, dy2, dz2, dx3, dy3, dz3, aRadius;
+ //Calculations for Radius
+ x = aP1.X(); y = aP1.Y(); z = aP1.Z();
+ x1 = aP2.X(); y1 = aP2.Y(); z1 = aP2.Z();
+ dx = x1 - x;
+ dy = y1 - y;
+ dz = z1 - z;
+ aRadius = sqrt(dx*dx + dy*dy + dz*dz);
+ //Calculations for Plane Vector
+ x2 = aP3.X(); y2 = aP3.Y(); z2 = aP3.Z();
+ dx2 = x2 - x; dy2 = y2 - y; dz2 = z2 - z;
+ dx3 = ((dy*dz2) - (dy2*dz))/100;
+ dy3 = ((dx2*dz) - (dx*dz2))/100;
+ dz3 = ((dx*dy2) - (dx2*dy))/100;
+ //Make Plane Vector
+ gp_Dir aDir ( dx3, dy3, dz3 );
+ //Make Circle
+ gp_Ax2 anAxes (aP1, aDir);
+ gp_Circ aCirc (anAxes, aRadius);
+ aShape = BRepBuilderAPI_MakeEdge(aCirc).Edge();
+ }
}
else if (aType == CIRCLE_THREE_PNT) {
Handle(GEOM_Function) aRefPoint1 = aCI.GetPoint1();
aShape = BRepBuilderAPI_MakeEdge(aCirc).Edge();
}
}
- else {
+ else {
}
if (aShape.IsNull()) return 0;
TopoDS_Shape aShape;
if (aType == ELLIPSE_PNT_VEC_RR) {
- Handle(GEOM_Function) aRefPoint = aCI.GetCenter();
+ // Center
+ gp_Pnt aP = gp::Origin();
+ Handle(GEOM_Function) aRefPoint = aCI.GetCenter();
+ if (!aRefPoint.IsNull()) {
+ TopoDS_Shape aShapePnt = aRefPoint->GetValue();
+ if (aShapePnt.ShapeType() != TopAbs_VERTEX) {
+ Standard_ConstructionError::Raise
+ ("Circle creation aborted: invalid center argument, must be a point");
+ }
+ aP = BRep_Tool::Pnt(TopoDS::Vertex(aShapePnt));
+ }
+ // Normal
+ gp_Vec aV = gp::DZ();
Handle(GEOM_Function) aRefVector = aCI.GetVector();
- TopoDS_Shape aShapePnt = aRefPoint->GetValue();
- TopoDS_Shape aShapeVec = aRefVector->GetValue();
- if (aShapePnt.ShapeType() == TopAbs_VERTEX &&
- aShapeVec.ShapeType() == TopAbs_EDGE) {
- gp_Pnt aP = BRep_Tool::Pnt(TopoDS::Vertex(aShapePnt));
+ if (!aRefVector.IsNull()) {
+ TopoDS_Shape aShapeVec = aRefVector->GetValue();
+ if (aShapeVec.ShapeType() != TopAbs_EDGE) {
+ Standard_ConstructionError::Raise
+ ("Circle creation aborted: invalid vector argument, must be a vector or an edge");
+ }
TopoDS_Edge anE = TopoDS::Edge(aShapeVec);
TopoDS_Vertex V1, V2;
TopExp::Vertices(anE, V1, V2, Standard_True);
if (!V1.IsNull() && !V2.IsNull()) {
- gp_Vec aV (BRep_Tool::Pnt(V1), BRep_Tool::Pnt(V2));
- gp_Ax2 anAxes (aP, aV);
- gp_Elips anEll (anAxes, aCI.GetRMajor(), aCI.GetRMinor());
- aShape = BRepBuilderAPI_MakeEdge(anEll).Edge();
+ aV = gp_Vec(BRep_Tool::Pnt(V1), BRep_Tool::Pnt(V2));
+ if (aV.Magnitude() < gp::Resolution()) {
+ Standard_ConstructionError::Raise
+ ("Circle creation aborted: vector of zero length is given");
+ }
}
}
- } else {
+ // Axes
+ gp_Ax2 anAxes (aP, aV);
+ // Ellipse
+ gp_Elips anEll (anAxes, aCI.GetRMajor(), aCI.GetRMinor());
+ aShape = BRepBuilderAPI_MakeEdge(anEll).Edge();
+ }
+ else {
}
if (aShape.IsNull()) return 0;
{
SetErrorCode(KO);
- if (thePnt.IsNull() || theVec.IsNull()) return NULL;
+ // Not set thePnt means origin of global CS,
+ // Not set theVec means Z axis of global CS
+ //if (thePnt.IsNull() || theVec.IsNull()) return NULL;
//Add a new Circle object
Handle(GEOM_Object) aCircle = GetEngine()->AddObject(GetDocID(), GEOM_CIRCLE);
GEOMImpl_ICircle aCI (aFunction);
- Handle(GEOM_Function) aRefPnt = thePnt->GetLastFunction();
- Handle(GEOM_Function) aRefVec = theVec->GetLastFunction();
+ if (!thePnt.IsNull()) {
+ Handle(GEOM_Function) aRefPnt = thePnt->GetLastFunction();
+ if (aRefPnt.IsNull()) return NULL;
+ aCI.SetCenter(aRefPnt);
+ }
- if (aRefPnt.IsNull() || aRefVec.IsNull()) return NULL;
+ if (!theVec.IsNull()) {
+ Handle(GEOM_Function) aRefVec = theVec->GetLastFunction();
+ if (aRefVec.IsNull()) return NULL;
+ aCI.SetVector(aRefVec);
+ }
- aCI.SetCenter(aRefPnt);
- aCI.SetVector(aRefVec);
aCI.SetRadius(theR);
//Compute the Circle value
{
SetErrorCode(KO);
- if (thePnt.IsNull() || theVec.IsNull()) return NULL;
+ // Not set thePnt means origin of global CS,
+ // Not set theVec means Z axis of global CS
+ //if (thePnt.IsNull() || theVec.IsNull()) return NULL;
//Add a new Ellipse object
Handle(GEOM_Object) anEll = GetEngine()->AddObject(GetDocID(), GEOM_ELLIPSE);
GEOMImpl_IEllipse aCI (aFunction);
- Handle(GEOM_Function) aRefPnt = thePnt->GetLastFunction();
- Handle(GEOM_Function) aRefVec = theVec->GetLastFunction();
+ if (!thePnt.IsNull()) {
+ Handle(GEOM_Function) aRefPnt = thePnt->GetLastFunction();
+ if (aRefPnt.IsNull()) return NULL;
+ aCI.SetCenter(aRefPnt);
+ }
- if (aRefPnt.IsNull() || aRefVec.IsNull()) return NULL;
+ if (!theVec.IsNull()) {
+ Handle(GEOM_Function) aRefVec = theVec->GetLastFunction();
+ if (aRefVec.IsNull()) return NULL;
+ aCI.SetVector(aRefVec);
+ }
- aCI.SetCenter(aRefPnt);
- aCI.SetVector(aRefVec);
aCI.SetRMajor(theRMajor);
aCI.SetRMinor(theRMinor);
//Set a not done flag
GetOperations()->SetNotDone();
- if (thePnt == NULL || theVec == NULL) return aGEOMObject._retn();
-
- //Get the reference points
- Handle(GEOM_Object) aPnt = GetOperations()->GetEngine()->GetObject
- (thePnt->GetStudyID(), thePnt->GetEntry());
- Handle(GEOM_Object) aVec = GetOperations()->GetEngine()->GetObject
- (theVec->GetStudyID(), theVec->GetEntry());
-
- if (aPnt.IsNull() || aVec.IsNull()) return aGEOMObject._retn();
+ // Not set thePnt means origin of global CS,
+ // Not set theVec means Z axis of global CS
+ //if (thePnt == NULL || theVec == NULL) return aGEOMObject._retn();
+
+ //Get the arguments
+ Handle(GEOM_Object) aPnt, aVec;
+ if (!CORBA::is_nil(thePnt)) {
+ aPnt = GetOperations()->GetEngine()->GetObject
+ (thePnt->GetStudyID(), thePnt->GetEntry());
+ if (aPnt.IsNull()) return aGEOMObject._retn();
+ }
+ if (!CORBA::is_nil(theVec)) {
+ aVec = GetOperations()->GetEngine()->GetObject
+ (theVec->GetStudyID(), theVec->GetEntry());
+ if (aVec.IsNull()) return aGEOMObject._retn();
+ }
// Make Circle
Handle(GEOM_Object) anObject =
//Set a not done flag
GetOperations()->SetNotDone();
- if (thePnt == NULL || theVec == NULL) return aGEOMObject._retn();
+ // Not set thePnt means origin of global CS,
+ // Not set theVec means Z axis of global CS
+ //if (thePnt == NULL || theVec == NULL) return aGEOMObject._retn();
- //Get the reference points
- Handle(GEOM_Object) aPnt = GetOperations()->GetEngine()->GetObject
- (thePnt->GetStudyID(), thePnt->GetEntry());
- Handle(GEOM_Object) aVec = GetOperations()->GetEngine()->GetObject
- (theVec->GetStudyID(), theVec->GetEntry());
-
- if (aPnt.IsNull() || aVec.IsNull()) return aGEOMObject._retn();
+ //Get the arguments
+ Handle(GEOM_Object) aPnt, aVec;
+ if (!CORBA::is_nil(thePnt)) {
+ aPnt = GetOperations()->GetEngine()->GetObject
+ (thePnt->GetStudyID(), thePnt->GetEntry());
+ if (aPnt.IsNull()) return aGEOMObject._retn();
+ }
+ if (!CORBA::is_nil(theVec)) {
+ aVec = GetOperations()->GetEngine()->GetObject
+ (theVec->GetStudyID(), theVec->GetEntry());
+ if (aVec.IsNull()) return aGEOMObject._retn();
+ }
// Make Ellipse
Handle(GEOM_Object) anObject =
# @return New GEOM_Object, containing the created circle.
#
# @ref tui_creation_circle "Example"
- def MakeCircle(self,thePnt, theVec, theR):
+ def MakeCircle(self, thePnt, theVec, theR):
# Example: see GEOM_TestAll.py
anObj = self.CurvesOp.MakeCirclePntVecR(thePnt, theVec, theR)
RaiseIfFailed("MakeCirclePntVecR", self.CurvesOp)
return anObj
+ ## Create a circle with given radius.
+ # Center of the circle will be in the origin of global
+ # coordinate system and normal vector will be codirected with Z axis
+ # @param theR Circle radius.
+ # @return New GEOM_Object, containing the created circle.
+ def MakeCircleR(self, theR):
+ anObj = self.CurvesOp.MakeCirclePntVecR(None, None, theR)
+ RaiseIfFailed("MakeCirclePntVecR", self.CurvesOp)
+ return anObj
+
## Create a circle, passing through three given points
# @param thePnt1,thePnt2,thePnt3 Points, defining the circle.
# @return New GEOM_Object, containing the created circle.
# @return New GEOM_Object, containing the created ellipse.
#
# @ref tui_creation_ellipse "Example"
- def MakeEllipse(self,thePnt, theVec, theRMajor, theRMinor):
+ def MakeEllipse(self, thePnt, theVec, theRMajor, theRMinor):
# Example: see GEOM_TestAll.py
anObj = self.CurvesOp.MakeEllipse(thePnt, theVec, theRMajor, theRMinor)
RaiseIfFailed("MakeEllipse", self.CurvesOp)
return anObj
+ ## Create an ellipse with given radiuses.
+ # Center of the ellipse will be in the origin of global
+ # coordinate system and normal vector will be codirected with Z axis
+ # @param theRMajor Major ellipse radius.
+ # @param theRMinor Minor ellipse radius.
+ # @return New GEOM_Object, containing the created ellipse.
+ def MakeEllipseRR(self, theRMajor, theRMinor):
+ anObj = self.CurvesOp.MakeEllipse(None, None, theRMajor, theRMinor)
+ RaiseIfFailed("MakeEllipse", self.CurvesOp)
+ return anObj
+
## Create a polyline on the set of points.
# @param thePoints Sequence of points for the polyline.
# @return New GEOM_Object, containing the created polyline.
initName( tr( "GEOM_BOX" ) );
- ConstructorsClicked( 0 );
+ setConstructorId( 1 ); // simplest constructor
+ ConstructorsClicked( 1 );
}
//=================================================================================
initName( tr( "GEOM_CONE" ) );
- ConstructorsClicked( 0 );
+ setConstructorId( 1 ); // simplest constructor
+ ConstructorsClicked( 1 );
}
SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) );
initName( tr( "GEOM_CYLINDER" ) );
- ConstructorsClicked( 0 );
+
+ setConstructorId( 1 ); // simplest constructor
+ ConstructorsClicked( 1 );
}
initName( tr( "GEOM_SPHERE" ) );
- ConstructorsClicked( 0 );
+ setConstructorId( 1 ); // simplest constructor
+ ConstructorsClicked( 1 );
}
//=================================================================================
initName( tr( "GEOM_TORUS" ) );
- ConstructorsClicked( 0 );
+ setConstructorId( 1 ); // simplest constructor
+ ConstructorsClicked( 1 );
}
//=================================================================================
