From 82eebc8aee95a51d7c4c8ba8afa1ba3f60a7cf53 Mon Sep 17 00:00:00 2001 From: skv Date: Tue, 19 Nov 2013 11:55:25 +0000 Subject: [PATCH] 0022354: EDF GEOM: Create edge by getting iso-line of surface --- doc/salome/examples/basic_geom_objs_ex06.py | 12 + doc/salome/gui/GEOM/images/isoline1.png | Bin 0 -> 20104 bytes doc/salome/gui/GEOM/images/isoline2.png | Bin 0 -> 1142 bytes .../gui/GEOM/input/creating_basic_go.doc | 1 + .../gui/GEOM/input/creating_isoline.doc | 24 ++ idl/GEOM_Gen.idl | 14 + resources/CMakeLists.txt | 2 + resources/isoline.png | Bin 0 -> 742 bytes resources/isoline_v.png | Bin 0 -> 717 bytes src/EntityGUI/CMakeLists.txt | 3 + src/EntityGUI/EntityGUI.cxx | 4 + src/EntityGUI/EntityGUI_IsolineDlg.cxx | 283 +++++++++++++ src/EntityGUI/EntityGUI_IsolineDlg.h | 83 ++++ src/GEOMGUI/GEOM_images.ts | 8 + src/GEOMGUI/GEOM_msg_en.ts | 31 ++ src/GEOMGUI/GeometryGUI.cxx | 5 + src/GEOMGUI/GeometryGUI_Operations.h | 1 + src/GEOMImpl/CMakeLists.txt | 1 + src/GEOMImpl/GEOMImpl_ICurvesOperations.cxx | 70 +++ src/GEOMImpl/GEOMImpl_ICurvesOperations.hxx | 6 + src/GEOMImpl/GEOMImpl_IIsoline.hxx | 54 +++ src/GEOMImpl/GEOMImpl_ShapeDriver.cxx | 135 ++++++ src/GEOMImpl/GEOMImpl_ShapeDriver.hxx | 6 + src/GEOMImpl/GEOMImpl_Types.hxx | 3 + src/GEOMUtils/CMakeLists.txt | 2 + src/GEOMUtils/GEOMUtils_Hatcher.cxx | 398 ++++++++++++++++++ src/GEOMUtils/GEOMUtils_Hatcher.hxx | 208 +++++++++ src/GEOM_I/GEOM_ICurvesOperations_i.cc | 26 ++ src/GEOM_I/GEOM_ICurvesOperations_i.hh | 4 + src/GEOM_SWIG/GEOM_TestAll.py | 5 + src/GEOM_SWIG/geomBuilder.py | 41 ++ src/OBJECT/CMakeLists.txt | 2 + src/OBJECT/GEOM_OCCReader.cxx | 310 ++++---------- src/OBJECT/GEOM_OCCReader.h | 14 +- src/OCC2VTK/CMakeLists.txt | 4 +- src/OCC2VTK/GEOM_WireframeFace.cxx | 270 +++--------- src/OCC2VTK/GEOM_WireframeFace.h | 11 +- 37 files changed, 1598 insertions(+), 443 deletions(-) create mode 100644 doc/salome/gui/GEOM/images/isoline1.png create mode 100644 doc/salome/gui/GEOM/images/isoline2.png create mode 100644 doc/salome/gui/GEOM/input/creating_isoline.doc create mode 100644 resources/isoline.png create mode 100644 resources/isoline_v.png create mode 100755 src/EntityGUI/EntityGUI_IsolineDlg.cxx create mode 100755 src/EntityGUI/EntityGUI_IsolineDlg.h create mode 100755 src/GEOMImpl/GEOMImpl_IIsoline.hxx create mode 100755 src/GEOMUtils/GEOMUtils_Hatcher.cxx create mode 100755 src/GEOMUtils/GEOMUtils_Hatcher.hxx diff --git a/doc/salome/examples/basic_geom_objs_ex06.py b/doc/salome/examples/basic_geom_objs_ex06.py index 661b0edef..ecaec0ed5 100644 --- a/doc/salome/examples/basic_geom_objs_ex06.py +++ b/doc/salome/examples/basic_geom_objs_ex06.py @@ -19,6 +19,7 @@ v2 = geompy.MakeVectorDXDYDZ(1, 0, 0) # create a polyline from a list of points polyline = geompy.MakePolyline([p0, p1, p2, p3, p4]) +closed_polyline = geompy.MakePolyline([p0, p1, p2, p0]) # create a bezier curve from a list of points bezier = geompy.MakeBezier([p0, p1, p2, p3, p4]) @@ -38,6 +39,11 @@ param_bezier = geompy.MakeCurveParametric("t", "sin(t)", "cos(t)", 0., 100., 20, #create a b-spline curve using parametric definition of the basic points param_interpol = geompy.MakeCurveParametric("t", "sin(t)", "cos(t)", 0., 100., 100, GEOM.Interpolation, theNewMethod=True) +#create a face from closed polyline +face = geompy.MakeFace(closed_polyline, True) + +#create an U-isoline curve +isoline = geompy.MakeIsoline(face, True, 0.6) # add objects in the study id_p0 = geompy.addToStudy(p0, "Point1") @@ -48,12 +54,15 @@ id_p4 = geompy.addToStudy(p4, "Point5") id_v1 = geompy.addToStudy(v1, "Vector1") id_v2 = geompy.addToStudy(v2, "Vector2") id_polyline = geompy.addToStudy(polyline, "Polyline") +id_closed_polyline = geompy.addToStudy(closed_polyline, "Closed Polyline") id_bezier = geompy.addToStudy(bezier, "Bezier") id_interpol = geompy.addToStudy(interpol, "Interpol") id_interpol_tangents = geompy.addToStudy(interpol_tangents, "Interpol Tangents") id_param_polyline = geompy.addToStudy(param_polyline, "Polyline Parametric") id_param_bezier = geompy.addToStudy(param_bezier, "Bezier Parametric") id_param_interpol = geompy.addToStudy(param_interpol, "Interpol Parametric") +id_face = geompy.addToStudy(face, "Face") +id_isoline = geompy.addToStudy(isoline, "Isoline") # display the points and the curves @@ -63,9 +72,12 @@ gg.createAndDisplayGO(id_p2) gg.createAndDisplayGO(id_p3) gg.createAndDisplayGO(id_p4) gg.createAndDisplayGO(id_polyline) +gg.createAndDisplayGO(id_closed_polyline) gg.createAndDisplayGO(id_bezier) gg.createAndDisplayGO(id_interpol) gg.createAndDisplayGO(id_interpol_tangents) gg.createAndDisplayGO(id_param_polyline) gg.createAndDisplayGO(id_param_bezier) gg.createAndDisplayGO(id_param_interpol) +gg.createAndDisplayGO(id_face) +gg.createAndDisplayGO(id_isoline) diff --git a/doc/salome/gui/GEOM/images/isoline1.png b/doc/salome/gui/GEOM/images/isoline1.png new file mode 100644 index 0000000000000000000000000000000000000000..8bc86314151f964a69518727925f9f2ca6db2faa GIT binary patch literal 20104 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 Bd*uKC literal 0 HcmV?d00001 diff --git a/doc/salome/gui/GEOM/images/isoline2.png b/doc/salome/gui/GEOM/images/isoline2.png new file mode 100644 index 0000000000000000000000000000000000000000..3a41807dfcc331e07218e3c67d70cb6796fcca6c GIT binary patch literal 1142 zcma)+Z%9*77{>1sX1O_%%FUaKekkYE3A;-bME$~4;7r3{hk9m&z|=^XFWQt zIyQ!kAqXN?ldmcv2wp1G;oZAn=V9yE7JTrUO4JHsbS`ln#GZ!y(k6lsy+p;kdrWi? zHlxj&qP*y3!M^C@nM$*_3$_x>dFRZ^`no#fWiz3?VyrS7FQ#0pF`H7x%oFQ((K8q4N-%Ka1dJCnDKWlKa~ zLffu@#3V!|`Ph z2E`ySVKI_4+jwI#ga5VeeSDnfPGc$H$G)|<7vdo3&e6xiZ#+1JgOwY|nRP4>afvJt z2PF!J01*y>Dbhg*5kxt(ka`!#zy$N>Mucy|teZVif#RTp2OS_VaU;ThZuD!g zA13bRg>OQRXx_Q4pux;5V6u=oCJ-xd3y>%\subpage create_ellipse_page
  • \subpage create_arc_page
  • \subpage create_curve_page
    • +
  • \subpage create_isoline_page
  • \subpage create_sketcher_page
  • \subpage create_3dsketcher_page
  • \subpage create_vector_page
    • diff --git a/doc/salome/gui/GEOM/input/creating_isoline.doc b/doc/salome/gui/GEOM/input/creating_isoline.doc new file mode 100644 index 000000000..2aac337f1 --- /dev/null +++ b/doc/salome/gui/GEOM/input/creating_isoline.doc @@ -0,0 +1,24 @@ +/*! + +\page create_isoline_page Isoline + +To create an \b Isoline in the Main Menu select New Entity - > +Basic - > Isoline + +\n The \b Result of this operation will be a GEOM_Object. +It may be either an edge or a compound of several edges. + +\n You can define an Isoline by a \b Face, \b Type and \b Parameter. +\n TUI Command: geompy.MakeIsoline(theFace, IsUIsoline, theParameter) +\n Arguments: Name + Face + Type (True for U-Isoline; False for V-Isoline) + Parameter. + +\image html isoline1.png + +Example: + +\image html isoline2.png "Isoline on face" + +Our TUI Scripts provide you with useful examples of creation of +\ref tui_creation_curve "Basic Geometric Objects". + +*/ diff --git a/idl/GEOM_Gen.idl b/idl/GEOM_Gen.idl index ad612446c..a9ad919b6 100644 --- a/idl/GEOM_Gen.idl +++ b/idl/GEOM_Gen.idl @@ -3192,6 +3192,20 @@ module GEOM in long theParamNbStep, in curve_type theCurveType); + /*! + * \brief Creates an isoline curve on a face. + * \param theFace the face for which an isoline is created. + * \param IsUIsoline True for U-isoline creation; False for V-isoline + * creation. + * \param theParameter the U parameter for U-isoline or V parameter + * for V-isoline. + * \return New GEOM_Object, containing the created isoline edge or a + * compound of edges. + */ + GEOM_Object MakeIsoline(in GEOM_Object theFace, + in boolean IsUIsoline, + in double theParameter); + /*! * \brief Create a sketcher (wire or face), following the textual description, * passed through \a theCommand argument. diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt index 72f3188d6..7e9c9aa48 100755 --- a/resources/CMakeLists.txt +++ b/resources/CMakeLists.txt @@ -31,6 +31,8 @@ SET( _res_files ImportExport ShHealing 3dsketch.png + isoline.png + isoline_v.png angle.png arc.png arccenter.png diff --git a/resources/isoline.png b/resources/isoline.png new file mode 100644 index 0000000000000000000000000000000000000000..dc625738165549174c592bafd70a74f61d520b01 GIT binary patch literal 742 zcmVPx#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FZT01FZU(%pXi00007bV*G`2i*$~ z2rw={MDCIR00L%7L_t(I%f-~sOB7)o$MLuB)`HTdQ=X#QL#P{`f=E&jY!MInqms^b z5u}S$hfql^NDz-*f+8Z2ihe;t2^}mC64=j^e?T6BXq}yBo_W5{(_v?((bm;l1H%I| z^StIW&-Xh|opX-=c64=h?fCZWZn56pUf0q;hP79nQi|o}<+^Im)$JBLHaLzEi#C>y z`RmEOzQx5&M*U7$Pfw3442)I9?sr_Hp`pQLG8wmP&^d>(4s9$!D9QD^?N=!In&ZO{ zIXUtOzyYr28WxL1*D^4H4lCH{XX60eIWbC5R*3cy?PIM;rql$jwHT>jUXV;el|4*Q zu7IIp<=$n0S2e+6vFMunCoob$`(IB2FxNIr=$9~ohiIRV4@LprMbkF61w{lSmU3Y5 z)ZcUxlo4G{z!(BnfrY9?>F(}!t%ElR#S$3Hxi`}Q%oZ*oMq`b}h5?`E$K!NAfF)q{ zpM;&Ao$hGg1YTh9wIrVkV3dbZB|_z4jZUXqi%u^KP$(2!He0dtXKwJz(*&U~^!6qI zd+O_%J~D(+C5-a0q2lwC$#lBaXe8Uz)a05k%;8+6=YEy~bSPYWKa(VzI&>D}|4u4v zC9Ik*{`DGjx!i_`aBB29BP+A)&1BFb_#(_59z?>p=M+{#zP-2|r&|LaN9*SSWPtr5 z^3__aW^?PU0OB0C4)*b3Umg>bE6GBI70vgTGcgudb_rNdZw`$>8_*8qfdfD9A zBnF14^~+t+q5Q584RJ+~FBwI6PUNwr3ddetWW Y0ijrG?B9xiGXMYp07*qoM6N<$fPx#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FZT01FZU(%pXi00007bV*G`2i*$~ z2?qoUI_*aQ00K=(L_t(I%f-~sOO!zv!13>E3m*If%DX`%TS5>)5rQC_EQDzk9_mzq z5Opv*Rf-)%BJAR&OCZrDjD8#gsCL>Az^N*pcyjSm)8!qm1Lj z;#HC)VPj(>`X_K?WF#CtKaKODg{8_-OEuoZyScL{rEtzg0A0I*Ap~p=OO&OSYP9jx zQ_bVpkXM$7kEdZ>}wJ z>-!Q`39J&$;TTv0-gb;|cz8JUkIf*BBbJspHC(FBbzFF~QmF##z;j@wEyBUU!Ek7F z8lfz)Y$PF04G)V~m_Int$&52_9S{*fu~-a+LL=eFE(^rNCyrGm@F# zAKRh>M4`90HyoZ=AcRKE{i-XpaY*B^TH&3>B(?0!8kzOZFj}d!Mc2G3J>A{iv2%{o zQ!nw(vae8RVXF2MXJl4$67LLOU(Gi&yCu3NxF0BG-$j5E*B;}I!ds0q3TGtVYP>Ui zd;K6^CMy~EBY&5BfC1nX&<7j<$^ZiwW^qRGW%+(S3Dta=WWCt_IP_#tUxsgiGo-EN zwqu=Mo4>&Tn;Ev5ZM6;C>G|3YlL2{Dbei}Fb +#include +#include + +#include +#include +#include +#include + + +//================================================================================= +// class : EntityGUI_IsolineDlg +// purpose : +//================================================================================= +EntityGUI_IsolineDlg::EntityGUI_IsolineDlg (GeometryGUI *theGeometryGUI, + QWidget *parent, + bool modal, + Qt::WindowFlags fl) + : GEOMBase_Skeleton (theGeometryGUI, parent, modal, fl), + myRBGroup (0) +{ + QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM", tr("ICO_ISOLINE"))); + QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM", tr("ICON_SELECT"))); + QPixmap image2(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM", tr("ICO_ISOLINE_V"))); + + setWindowTitle(tr("GEOM_ISOLINE_TITLE")); + + /***************************************************************/ + + mainFrame()->GroupConstructors->setTitle(tr("GEOM_ISOLINE")); + mainFrame()->RadioButton1->setIcon(image0); + mainFrame()->RadioButton2->close(); + mainFrame()->RadioButton3->close(); + + // Construct a group. + myGroup = new DlgRef_3Radio1Sel1Spin(centralWidget()); + myGroup->GroupBox1->setTitle(tr("GEOM_ARGUMENTS")); + myGroup->TextLabel1->setText(tr("GEOM_FACE")); + myGroup->PushButton1->setIcon(image1); + myGroup->LineEdit1->setReadOnly(true); + myGroup->RadioButton1->setIcon(image0); + myGroup->RadioButton2->setIcon(image2); + myGroup->RadioButton1->setText(tr("GEOM_ISOLINE_U")); + myGroup->RadioButton2->setText(tr("GEOM_ISOLINE_V")); + myGroup->RadioButton3->hide(); + myGroup->TextLabel2->setText(tr("GEOM_PARAMETER")); + + QVBoxLayout* layout = new QVBoxLayout(centralWidget()); + layout->setMargin(0); layout->setSpacing(6); + layout->addWidget(myGroup); + + myRBGroup = new QButtonGroup( this ); + myRBGroup->addButton( myGroup->RadioButton1, 0 ); + myRBGroup->addButton( myGroup->RadioButton2, 1 ); + + setHelpFileName("create_isoline_page.html"); + + Init(); +} + +//================================================================================= +// function : ~EntityGUI_IsolineDlg() +// purpose : +//================================================================================= +EntityGUI_IsolineDlg::~EntityGUI_IsolineDlg() +{ +} + +//================================================================================= +// function : Init() +// purpose : +//================================================================================= +void EntityGUI_IsolineDlg::Init() +{ + /* min, max, step and decimals for spin box */ + initSpinBox(myGroup->SpinBox_DX, 0., 1., 0.1, "parametric_precision"); + myGroup->SpinBox_DX->setValue(0.5); + myGroup->RadioButton1->setChecked(true); + + initName(mainFrame()->GroupConstructors->title()); + + connect(myGroup->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditFace())); + connect(myGroup->SpinBox_DX, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double))); + + connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), this, SLOT(SetDoubleSpinBoxStep(double))); + connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()), + this, SLOT(SelectionIntoArgument())); + + /* 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(myRBGroup, SIGNAL(buttonClicked(int)), this, SLOT(TypeChanged(int))); + + myGroup->PushButton1->click(); + SelectionIntoArgument(); + resize(100,100); +} + +//================================================================================= +// function : SelectionIntoArgument +// purpose : Called when selection is changed +//================================================================================= +void EntityGUI_IsolineDlg::SelectionIntoArgument() +{ + myGroup->LineEdit1->setText(""); + myFace.nullify(); + + GEOM::GeomObjPtr aSelectedObject = getSelected( TopAbs_SHAPE ); + TopoDS_Shape aShape; + + if ( aSelectedObject && GEOMBase::GetShape( aSelectedObject.get(), aShape ) && !aShape.IsNull() ) { + if (aShape.ShapeType() == TopAbs_FACE) { + QString aName = GEOMBase::GetName( aSelectedObject.get() ); + myGroup->LineEdit1->setText( aName ); + + // clear selection + disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0); + myGeomGUI->getApp()->selectionMgr()->clearSelected(); + connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()), + this, SLOT(SelectionIntoArgument())); + + myFace = aSelectedObject; + } + } + + displayPreview(true); +} + +//================================================================================= +// function : ActivateThisDialog +// purpose : +//================================================================================= +void EntityGUI_IsolineDlg::ActivateThisDialog() +{ + GEOMBase_Skeleton::ActivateThisDialog(); + + connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ), + this, SLOT( SelectionIntoArgument() ) ); + SetEditFace(); + SelectionIntoArgument(); +} + +//================================================================================= +// function : enterEvent() +// purpose : +//================================================================================= +void EntityGUI_IsolineDlg::enterEvent (QEvent*) +{ + if (!mainFrame()->GroupConstructors->isEnabled()) + ActivateThisDialog(); +} + +//================================================================================= +// function : TypeChanged +// purpose : +//================================================================================= +void EntityGUI_IsolineDlg::TypeChanged(int) +{ + displayPreview(true); +} + +//================================================================================= +// function : createOperation +// purpose : +//================================================================================= +GEOM::GEOM_IOperations_ptr EntityGUI_IsolineDlg::createOperation() +{ + return myGeomGUI->GetGeomGen()->GetICurvesOperations( getStudyId() ); +} + +//================================================================================= +// function : isValid +// purpose : +//================================================================================= +bool EntityGUI_IsolineDlg::isValid (QString& msg) +{ + return myFace; +} + +//================================================================================= +// function : execute +// purpose : +//================================================================================= +bool EntityGUI_IsolineDlg::execute (ObjectList& objects) +{ + GEOM::GEOM_ICurvesOperations_var anOper = GEOM::GEOM_ICurvesOperations::_narrow(getOperation()); + GEOM::GEOM_Object_var anObj = anOper->MakeIsoline + (myFace.get(), myGroup->RadioButton1->isChecked(), myGroup->SpinBox_DX->value()); + + if (!anObj->_is_nil()) + objects.push_back(anObj._retn()); + + return true; +} + +//================================================================================= +// function : addSubshapesToStudy() +// purpose : Double spin box management +//================================================================================= +void EntityGUI_IsolineDlg::addSubshapesToStudy() +{ + GEOMBase::PublishSubObject(myFace.get()); +} + +//================================================================================= +// function : SetDoubleSpinBoxStep() +// purpose : Double spin box management +//================================================================================= +void EntityGUI_IsolineDlg::SetDoubleSpinBoxStep (double step) +{ + myGroup->SpinBox_DX->setSingleStep(step); +} + +//================================================================================= +// function : ClickOnOk() +// purpose : +//================================================================================= +void EntityGUI_IsolineDlg::ClickOnOk() +{ + setIsApplyAndClose( true ); + + if (ClickOnApply()) + ClickOnCancel(); +} + +//================================================================================= +// function : ClickOnApply() +// purpose : +//================================================================================= +bool EntityGUI_IsolineDlg::ClickOnApply() +{ + if (!onAccept()) + return false; + + initName(); + // activate selection and connect selection manager + myGroup->PushButton1->click(); + return true; +} + +//================================================================================= +// function : SetEditFace +// purpose : +//================================================================================= +void EntityGUI_IsolineDlg::SetEditFace() +{ + myGroup->LineEdit1->setFocus(); + myGroup->PushButton1->setDown(true); +} + +//================================================================================= +// function : ValueChangedInSpinBox +// purpose : +//================================================================================= +void EntityGUI_IsolineDlg::ValueChangedInSpinBox(double newValue) +{ + displayPreview(true); +} diff --git a/src/EntityGUI/EntityGUI_IsolineDlg.h b/src/EntityGUI/EntityGUI_IsolineDlg.h new file mode 100755 index 000000000..50194ff16 --- /dev/null +++ b/src/EntityGUI/EntityGUI_IsolineDlg.h @@ -0,0 +1,83 @@ +// Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE +// +// 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 : EntityGUI_IsolineDlg.h + +#ifndef ENTITYGUI_ISOLINEDLG_H +#define ENTITYGUI_ISOLINEDLG_H + + +#include + +class DlgRef_3Radio1Sel1Spin; + +//================================================================================= +// class : EntityGUI_IsolineDlg +// purpose : +//================================================================================= +class EntityGUI_IsolineDlg : public GEOMBase_Skeleton +{ + Q_OBJECT + +public: + + EntityGUI_IsolineDlg (GeometryGUI *theGeometryGUI, + QWidget *parent = 0, + bool modal = false, + Qt::WindowFlags fl = 0); + + ~EntityGUI_IsolineDlg(); + +protected: + + // redefined from GEOMBase_Helper + virtual GEOM::GEOM_IOperations_ptr createOperation(); + + virtual bool isValid( QString& ); + + virtual bool execute( ObjectList& ); + + virtual void addSubshapesToStudy(); + +private: + + void Init(); + void enterEvent( QEvent* ); + +private: + + DlgRef_3Radio1Sel1Spin *myGroup; + QButtonGroup *myRBGroup; + GEOM::GeomObjPtr myFace; + + +private slots: + void ClickOnOk(); + bool ClickOnApply(); + + void SetEditFace(); + void ValueChangedInSpinBox( double ); + void SelectionIntoArgument(); + void ActivateThisDialog(); + void SetDoubleSpinBoxStep( double ); + void TypeChanged(int); +}; + +#endif // ENTITYGUI_ISOLINEDLG_H diff --git a/src/GEOMGUI/GEOM_images.ts b/src/GEOMGUI/GEOM_images.ts index 409484017..1e27166a6 100644 --- a/src/GEOMGUI/GEOM_images.ts +++ b/src/GEOMGUI/GEOM_images.ts @@ -1219,6 +1219,14 @@ ICO_3DSKETCH 3dsketch.png + + ICO_ISOLINE + isoline.png + + + ICO_ISOLINE_V + isoline_v.png + ICO_SOLID build_solid.png diff --git a/src/GEOMGUI/GEOM_msg_en.ts b/src/GEOMGUI/GEOM_msg_en.ts index b861fe2d9..a56f0efd8 100644 --- a/src/GEOMGUI/GEOM_msg_en.ts +++ b/src/GEOMGUI/GEOM_msg_en.ts @@ -2960,6 +2960,10 @@ Please, select face, shell or solid and try again MEN_3DSKETCH 3D Sketch + + MEN_ISOLINE + Isoline + MEN_SOLID Solid @@ -3785,6 +3789,10 @@ Please, select face, shell or solid and try again STB_3DSKETCH Create 3D sketch + + STB_ISOLINE + Create U- or V-Isoline + STB_SOLID Build a solid @@ -4401,6 +4409,10 @@ Please, select face, shell or solid and try again TOP_3DSKETCH 3D sketch + + TOP_ISOLINE + Isoline + TOP_SOLID Build solid @@ -6497,4 +6509,23 @@ Do you want to create new material? Step + + EntityGUI_IsolineDlg + + GEOM_ISOLINE_TITLE + Isoline Construction + + + GEOM_ISOLINE + Isoline + + + GEOM_ISOLINE_U + U-Isoline + + + GEOM_ISOLINE_V + V-Isoline + + diff --git a/src/GEOMGUI/GeometryGUI.cxx b/src/GEOMGUI/GeometryGUI.cxx index 6ba66d776..25b53507c 100644 --- a/src/GEOMGUI/GeometryGUI.cxx +++ b/src/GEOMGUI/GeometryGUI.cxx @@ -545,6 +545,7 @@ void GeometryGUI::OnGUIEvent( int id, const QVariant& theParam ) break; case GEOMOp::Op2dSketcher: // MENU ENTITY - SKETCHER case GEOMOp::Op3dSketcher: // MENU ENTITY - 3D SKETCHER + case GEOMOp::OpIsoline: // MENU BASIC - ISOLINE case GEOMOp::OpExplode: // MENU ENTITY - EXPLODE #ifdef WITH_OPENCV case GEOMOp::OpFeatureDetect: // MENU ENTITY - FEATURE DETECTION @@ -890,6 +891,7 @@ void GeometryGUI::initialize( CAM_Application* app ) createGeomAction( GEOMOp::OpEllipse, "ELLIPSE" ); createGeomAction( GEOMOp::OpArc, "ARC" ); createGeomAction( GEOMOp::OpCurve, "CURVE" ); + createGeomAction( GEOMOp::OpIsoline, "ISOLINE" ); createGeomAction( GEOMOp::OpVector, "VECTOR" ); createGeomAction( GEOMOp::OpPlane, "PLANE" ); createGeomAction( GEOMOp::OpLCS, "LOCAL_CS" ); @@ -925,6 +927,7 @@ void GeometryGUI::initialize( CAM_Application* app ) createGeomAction( GEOMOp::Op2dSketcher, "SKETCH" ); createGeomAction( GEOMOp::Op3dSketcher, "3DSKETCH" ); + createGeomAction( GEOMOp::OpIsoline, "ISOLINE" ); createGeomAction( GEOMOp::OpExplode, "EXPLODE" ); #ifdef WITH_OPENCV createGeomAction( GEOMOp::OpFeatureDetect,"FEATURE_DETECTION" ); @@ -1106,6 +1109,7 @@ void GeometryGUI::initialize( CAM_Application* app ) createMenu( GEOMOp::OpCurve, basicId, -1 ); createMenu( GEOMOp::Op2dSketcher, basicId, -1 ); createMenu( GEOMOp::Op3dSketcher, basicId, -1 ); + createMenu( GEOMOp::OpIsoline, basicId, -1 ); createMenu( separator(), basicId, -1 ); createMenu( GEOMOp::OpVector, basicId, -1 ); createMenu( GEOMOp::OpPlane, basicId, -1 ); @@ -1318,6 +1322,7 @@ void GeometryGUI::initialize( CAM_Application* app ) createTool( GEOMOp::OpVector, basicTbId ); createTool( GEOMOp::Op2dSketcher, basicTbId ); //rnc createTool( GEOMOp::Op3dSketcher, basicTbId ); //rnc + createTool( GEOMOp::OpIsoline, basicTbId ); createTool( GEOMOp::OpPlane, basicTbId ); createTool( GEOMOp::OpLCS, basicTbId ); createTool( GEOMOp::OpOriginAndVectors, basicTbId ); diff --git a/src/GEOMGUI/GeometryGUI_Operations.h b/src/GEOMGUI/GeometryGUI_Operations.h index 40c0e38cd..965e9e445 100644 --- a/src/GEOMGUI/GeometryGUI_Operations.h +++ b/src/GEOMGUI/GeometryGUI_Operations.h @@ -90,6 +90,7 @@ namespace GEOMOp { OpCurve = 3007, // MENU NEW ENTITY - BASIC - CURVE OpLCS = 3008, // MENU NEW ENTITY - BASIC - LOCAL COORDINATE SYSTEM OpOriginAndVectors = 3009, // MENU NEW ENTITY - BASIC - ORIGIN AND BASE VECTORS + OpIsoline = 3010, // MENU NEW ENTITY - BASIC - ISOLINE // PrimitiveGUI ----------------//-------------------------------- OpBox = 3100, // MENU NEW ENTITY - PRIMITIVES - BOX OpCylinder = 3101, // MENU NEW ENTITY - PRIMITIVES - CYLINDER diff --git a/src/GEOMImpl/CMakeLists.txt b/src/GEOMImpl/CMakeLists.txt index cbdc2708d..49123eb2a 100755 --- a/src/GEOMImpl/CMakeLists.txt +++ b/src/GEOMImpl/CMakeLists.txt @@ -120,6 +120,7 @@ SET(GEOMImpl_HEADERS GEOMImpl_IPipeShellSect.hxx GEOMImpl_IPipeBiNormal.hxx GEOMImpl_ICurveParametric.hxx + GEOMImpl_IIsoline.hxx GEOMImpl_VectorDriver.hxx GEOMImpl_LineDriver.hxx GEOMImpl_DiskDriver.hxx diff --git a/src/GEOMImpl/GEOMImpl_ICurvesOperations.cxx b/src/GEOMImpl/GEOMImpl_ICurvesOperations.cxx index c679b048a..977a76297 100644 --- a/src/GEOMImpl/GEOMImpl_ICurvesOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_ICurvesOperations.cxx @@ -46,6 +46,7 @@ #include "GEOMImpl_SplineDriver.hxx" #include "GEOMImpl_EllipseDriver.hxx" #include "GEOMImpl_ArcDriver.hxx" +#include "GEOMImpl_ShapeDriver.hxx" #include "GEOMImpl_SketcherDriver.hxx" #include "GEOMImpl_3DSketcherDriver.hxx" @@ -57,6 +58,7 @@ #include "GEOMImpl_ISketcher.hxx" #include "GEOMImpl_I3DSketcher.hxx" #include "GEOMImpl_ICurveParametric.hxx" +#include "GEOMImpl_IIsoline.hxx" #include @@ -1429,3 +1431,71 @@ Handle(GEOM_Object) GEOMImpl_ICurvesOperations::Make3DSketcher (std::listAddObject(GetDocID(), GEOM_ISOLINE); + + //Add a new Spline function for interpolation type + Handle(GEOM_Function) aFunction = + anIsoline->AddFunction(GEOMImpl_ShapeDriver::GetID(), SHAPE_ISOLINE); + + if (aFunction.IsNull()) { + return NULL; + } + + //Check if the function is set correctly + if (aFunction->GetDriverGUID() != GEOMImpl_ShapeDriver::GetID()) { + return NULL; + } + + GEOMImpl_IIsoline aCI (aFunction); + Handle(GEOM_Function) aRefFace = theFace->GetLastFunction(); + + if (aRefFace.IsNull()) { + return NULL; + } + + aCI.SetFace(aRefFace); + aCI.SetIsUIso(IsUIso); + aCI.SetParameter(theParameter); + + //Compute the isoline curve + try { +#if OCC_VERSION_LARGE > 0x06010000 + OCC_CATCH_SIGNALS; +#endif + if (!GetSolver()->ComputeFunction(aFunction)) { + SetErrorCode("Shape driver failed"); + return NULL; + } + } + catch (Standard_Failure) { + Handle(Standard_Failure) aFail = Standard_Failure::Caught(); + SetErrorCode(aFail->GetMessageString()); + return NULL; + } + + //Make a Python command + GEOM::TPythonDump (aFunction) << anIsoline << " = geompy.MakeIsoline( " + << theFace << ", " << IsUIso << ", " << theParameter << " )"; + + SetErrorCode(OK); + return anIsoline; +} diff --git a/src/GEOMImpl/GEOMImpl_ICurvesOperations.hxx b/src/GEOMImpl/GEOMImpl_ICurvesOperations.hxx index 8bdd6c239..dbad87e06 100644 --- a/src/GEOMImpl/GEOMImpl_ICurvesOperations.hxx +++ b/src/GEOMImpl/GEOMImpl_ICurvesOperations.hxx @@ -94,6 +94,12 @@ class GEOMImpl_ICurvesOperations : public GEOM_IOperations { Handle(GEOM_Object) theWorkingPlane); Standard_EXPORT Handle(GEOM_Object) Make3DSketcherCommand (const char* theCommand); Standard_EXPORT Handle(GEOM_Object) Make3DSketcher (std::list theCoordinates); + + Standard_EXPORT Handle(GEOM_Object) MakeIsoline + (const Handle(GEOM_Object) &theFace, + const bool IsUIso, + const double theParameter); + }; #endif diff --git a/src/GEOMImpl/GEOMImpl_IIsoline.hxx b/src/GEOMImpl/GEOMImpl_IIsoline.hxx new file mode 100755 index 000000000..b1417b16b --- /dev/null +++ b/src/GEOMImpl/GEOMImpl_IIsoline.hxx @@ -0,0 +1,54 @@ +// Copyright (C) 2007-2013 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 +// +// 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 +// + +//NOTE: This is an interface to a function for the isoline creation algorithm. + +#include "GEOM_Function.hxx" + +#define ISOLINE_ARG_FACE 1 +#define ISOLINE_ARG_U_OR_V 2 +#define ISOLINE_ARG_PARAMETER 3 + +class GEOMImpl_IIsoline +{ + public: + + GEOMImpl_IIsoline(Handle(GEOM_Function) theFunction): _func(theFunction) {} + + void SetFace (Handle(GEOM_Function) theFace) + { _func->SetReference(ISOLINE_ARG_FACE, theFace); } + void SetIsUIso (bool IsUIso) + { _func->SetInteger(ISOLINE_ARG_U_OR_V, IsUIso ? 1 : 0); } + void SetParameter (double theParameter) + { _func->SetReal(ISOLINE_ARG_PARAMETER, theParameter); } + + + Handle(GEOM_Function) GetFace() + { return _func->GetReference(ISOLINE_ARG_FACE); } + bool GetIsUIso() + { return (_func->GetInteger(ISOLINE_ARG_U_OR_V) != 0); } + double GetParameter() { return _func->GetReal(ISOLINE_ARG_PARAMETER ); } + + private: + + Handle(GEOM_Function) _func; +}; diff --git a/src/GEOMImpl/GEOMImpl_ShapeDriver.cxx b/src/GEOMImpl/GEOMImpl_ShapeDriver.cxx index 0ec4b35e6..13df35af1 100644 --- a/src/GEOMImpl/GEOMImpl_ShapeDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_ShapeDriver.cxx @@ -22,12 +22,14 @@ #include +#include #include #include #include #include #include +#include // OCCT Includes #include @@ -50,6 +52,7 @@ #include #include +#include #include #include @@ -72,6 +75,7 @@ #include #include +#include #include #include #include @@ -531,6 +535,32 @@ Standard_Integer GEOMImpl_ShapeDriver::Execute(TFunction_Logbook& log) const BRepBuilderAPI_MakeEdge aME (ReOrientedCurve, UFirst, aParam); if (aME.IsDone()) aShape = aME.Shape(); + } else if (aType == SHAPE_ISOLINE) { + GEOMImpl_IIsoline aII (aFunction); + Handle(GEOM_Function) aRefFace = aII.GetFace(); + TopoDS_Shape aShapeFace = aRefFace->GetValue(); + + if (aShapeFace.ShapeType() == TopAbs_FACE) { + TopoDS_Face aFace = TopoDS::Face(aShapeFace); + bool isUIso = aII.GetIsUIso(); + Standard_Real aParam = aII.GetParameter(); + Standard_Real U1,U2,V1,V2; + + // Construct a real geometric parameter. + aFace.Orientation(TopAbs_FORWARD); + ShapeAnalysis::GetFaceUVBounds(aFace,U1,U2,V1,V2); + + if (isUIso) { + aParam = U1 + (U2 - U1)*aParam; + } else { + aParam = V1 + (V2 - V1)*aParam; + } + + aShape = MakeIsoline(aFace, isUIso, aParam); + } else { + Standard_NullObject::Raise + ("Shape for isoline construction is not a face"); + } } else { } @@ -974,6 +1004,101 @@ TopoDS_Edge GEOMImpl_ShapeDriver::MakeEdgeFromWire(const TopoDS_Shape& aWire, return ResEdge; } +//============================================================================= +/*! + * \brief Returns an isoline for a face. + */ +//============================================================================= + +TopoDS_Shape GEOMImpl_ShapeDriver::MakeIsoline + (const TopoDS_Face &theFace, + const bool IsUIso, + const double theParameter) const +{ + TopoDS_Shape aResult; + GEOMUtils_Hatcher aHatcher(theFace); + const GeomAbs_IsoType aType = (IsUIso ? GeomAbs_IsoU : GeomAbs_IsoV); + + aHatcher.Init(aType, theParameter); + aHatcher.Perform(); + + if (!aHatcher.IsDone()) { + Standard_ConstructionError::Raise("MakeIsoline : Hatcher failure"); + } + + const Handle(TColStd_HArray1OfInteger) &anIndices = + (IsUIso ? aHatcher.GetUIndices() : aHatcher.GetVIndices()); + + if (anIndices.IsNull()) { + Standard_ConstructionError::Raise("MakeIsoline : Null hatching indices"); + } + + const Standard_Integer anIsoInd = anIndices->Lower(); + const Standard_Integer aHatchingIndex = anIndices->Value(anIsoInd); + + if (aHatchingIndex == 0) { + Standard_ConstructionError::Raise("MakeIsoline : Invalid hatching index"); + } + + const Standard_Integer aNbDomains = + aHatcher.GetNbDomains(aHatchingIndex); + + if (aNbDomains < 0) { + Standard_ConstructionError::Raise("MakeIsoline : Invalid number of domains"); + } + + // The hatching is performed successfully. Create the 3d Curve. + Handle(Geom_Surface) aSurface = BRep_Tool::Surface(theFace); + Handle(Geom_Curve) anIsoCurve = (IsUIso ? + aSurface->UIso(theParameter) : aSurface->VIso(theParameter)); + Handle(Geom2d_Curve) aPIsoCurve = + aHatcher.GetHatching(aHatchingIndex); + const Standard_Real aTol = Precision::Confusion(); + Standard_Integer anIDom = 1; + Standard_Real aV1; + Standard_Real aV2; + BRep_Builder aBuilder; + Standard_Integer aNbEdges = 0; + + for (; anIDom <= aNbDomains; anIDom++) { + if (aHatcher.GetDomain(aHatchingIndex, anIDom, aV1, aV2)) { + // Check first and last parameters. + if (!aHatcher.IsDomainInfinite(aHatchingIndex, anIDom)) { + // Create an edge. + TopoDS_Edge anEdge = BRepBuilderAPI_MakeEdge(anIsoCurve, aV1, aV2); + + // Update it with a parametric curve on face. + aBuilder.UpdateEdge(anEdge, aPIsoCurve, theFace, aTol); + aNbEdges++; + + if (aNbEdges > 1) { + // Result is a compond. + if (aNbEdges == 2) { + // Create a new compound. + TopoDS_Compound aCompound; + + aBuilder.MakeCompound(aCompound); + aBuilder.Add(aCompound, aResult); + aResult = aCompound; + } + + // Add an edge to the compound. + aBuilder.Add(aResult, anEdge); + } else { + // Result is the edge. + aResult = anEdge; + } + } + } + } + + if (aNbEdges == 0) { + Standard_ConstructionError::Raise("MakeIsoline : Empty result"); + } + + return aResult; +} + //================================================================================ /*! * \brief Returns a name of creation operation and names and values of creation parameters @@ -1046,6 +1171,16 @@ GetCreationInformation(std::string& theOperationName, AddParam( theParams, "State", TopAbs_State((int) aCI.GetTolerance() )); break; } + case SHAPE_ISOLINE: + { + GEOMImpl_IIsoline aII (function); + + theOperationName = "ISOLINE"; + AddParam(theParams, "Face", aII.GetFace()); + AddParam(theParams, "Isoline type", (aII.GetIsUIso() ? "U" : "V")); + AddParam(theParams, "Parameter", aII.GetParameter()); + break; + } default: return false; } diff --git a/src/GEOMImpl/GEOMImpl_ShapeDriver.hxx b/src/GEOMImpl/GEOMImpl_ShapeDriver.hxx index 650a16948..e139eadd6 100644 --- a/src/GEOMImpl/GEOMImpl_ShapeDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_ShapeDriver.hxx @@ -63,6 +63,7 @@ #include class TColStd_SequenceOfExtendedString; +class TopoDS_Face; #include "GEOM_BaseDriver.hxx" @@ -98,6 +99,11 @@ public: // DEFINE_STANDARD_RTTI( GEOMImpl_ShapeDriver ) +private: + + TopoDS_Shape MakeIsoline(const TopoDS_Face &theFace, + const bool IsUIso, + const double theParameter) const; }; diff --git a/src/GEOMImpl/GEOMImpl_Types.hxx b/src/GEOMImpl/GEOMImpl_Types.hxx index 0f092ff3b..5e81208f1 100755 --- a/src/GEOMImpl/GEOMImpl_Types.hxx +++ b/src/GEOMImpl/GEOMImpl_Types.hxx @@ -111,6 +111,8 @@ #define GEOM_EXPORTXAO 54 +#define GEOM_ISOLINE 55 + //GEOM_Function types #define COPY_WITH_REF 1 @@ -296,6 +298,7 @@ #define EDGE_WIRE 11 #define EDGE_CURVE_LENGTH 12 #define SHAPES_ON_SHAPE 13 +#define SHAPE_ISOLINE 14 #define ARCHIMEDE_TYPE 1 diff --git a/src/GEOMUtils/CMakeLists.txt b/src/GEOMUtils/CMakeLists.txt index 9993ff947..0ad8f6724 100755 --- a/src/GEOMUtils/CMakeLists.txt +++ b/src/GEOMUtils/CMakeLists.txt @@ -47,11 +47,13 @@ SET(_link_LIBRARIES SET(GEOMUtils_HEADERS GEOMUtils.hxx + GEOMUtils_Hatcher.hxx ) # --- sources --- SET(GEOMUtils_SOURCES GEOMUtils.cxx + GEOMUtils_Hatcher.cxx ) # --- rules --- diff --git a/src/GEOMUtils/GEOMUtils_Hatcher.cxx b/src/GEOMUtils/GEOMUtils_Hatcher.cxx new file mode 100755 index 000000000..ee5c3af26 --- /dev/null +++ b/src/GEOMUtils/GEOMUtils_Hatcher.cxx @@ -0,0 +1,398 @@ +// Copyright (C) 2007-2013 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 +// +// 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 +// + + +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include + + +static Standard_Real IntersectorConfusion = 1.e-10; // -8; +static Standard_Real IntersectorTangency = 1.e-10; // -8; +static Standard_Real HatcherConfusion2d = 1.e-8; +static Standard_Real HatcherConfusion3d = 1.e-8; +// VTK uses float numbers - Precision::Infinite() is double and +// can not be accepted. +static float InfiniteValue = 1e38; + +//======================================================================= +//function : GEOMUtils_Hatcher +//purpose : +//======================================================================= +GEOMUtils_Hatcher::GEOMUtils_Hatcher(const TopoDS_Face &theFace) +: myHatcher(Geom2dHatch_Intersector (IntersectorConfusion, IntersectorTangency), + HatcherConfusion2d, HatcherConfusion3d, + Standard_True, Standard_False), + myFace (theFace), + myIsDone (Standard_False), + myUMin (0.), + myUMax (0.), + myVMin (0.), + myVMax (0.) +{ + // Get bounds. + BRepTools::UVBounds (theFace, myUMin, myUMax, myVMin, myVMax); + + Standard_Boolean InfiniteUMin = Precision::IsNegativeInfinite (myUMin); + Standard_Boolean InfiniteUMax = Precision::IsPositiveInfinite (myUMax); + Standard_Boolean InfiniteVMin = Precision::IsNegativeInfinite (myVMin); + Standard_Boolean InfiniteVMax = Precision::IsPositiveInfinite (myVMax); + + if (InfiniteUMin && InfiniteUMax) { + myUMin = - InfiniteValue; + myUMax = InfiniteValue; + } else if (InfiniteUMin) { + myUMin = myUMax - InfiniteValue; + } else if (InfiniteUMax) { + myUMax = myUMin + InfiniteValue; + } + + if (InfiniteVMin && InfiniteVMax) { + myVMin = - InfiniteValue; + myVMax = InfiniteValue; + } else if (InfiniteVMin) { + myVMin = myVMax - InfiniteValue; + } else if (InfiniteVMax) { + myVMax = myVMin + InfiniteValue; + } + + // Add edges + TopExp_Explorer anExpEdges(theFace, TopAbs_EDGE); + const Standard_Real aParamTol = Precision::PConfusion(); + + for (; anExpEdges.More(); anExpEdges.Next()) { + const TopoDS_Edge& anEdge = TopoDS::Edge (anExpEdges.Current()); + Standard_Real U1, U2; + const Handle(Geom2d_Curve) PCurve = + BRep_Tool::CurveOnSurface (anEdge, theFace, U1, U2); + + if (PCurve.IsNull()) { + continue; + } + + if (U1 == U2) { + continue; + } + + //-- Test if a TrimmedCurve is necessary + if(Abs(PCurve->FirstParameter() - U1) <= aParamTol && + Abs(PCurve->LastParameter() - U2) <= aParamTol) { + myHatcher.AddElement(PCurve, anEdge.Orientation()); + } else { + if (!PCurve->IsPeriodic()) { + Handle(Geom2d_TrimmedCurve) TrimPCurve = + Handle(Geom2d_TrimmedCurve)::DownCast(PCurve); + + if (!TrimPCurve.IsNull()) { + Handle(Geom2d_Curve) aBasisCurve = TrimPCurve->BasisCurve(); + + if (aBasisCurve->FirstParameter() - U1 > aParamTol || + U2 - aBasisCurve->LastParameter() > aParamTol) { + myHatcher.AddElement (PCurve, anEdge.Orientation()); + return; + } + } else { + if (PCurve->FirstParameter() - U1 > aParamTol) { + U1 = PCurve->FirstParameter(); + } + if (U2 - PCurve->LastParameter() > aParamTol) { + U2=PCurve->LastParameter(); + } + } + } + + Handle (Geom2d_TrimmedCurve) TrimPCurve = + new Geom2d_TrimmedCurve (PCurve, U1, U2); + + myHatcher.AddElement (TrimPCurve, anEdge.Orientation()); + } + } +} + +//======================================================================= +//function : Init +//purpose : +//======================================================================= +void GEOMUtils_Hatcher::Init(const Standard_Integer theNbIsos) +{ + Init(theNbIsos, theNbIsos); +} + +//======================================================================= +//function : Init +//purpose : +//======================================================================= +void GEOMUtils_Hatcher::Init(const Standard_Integer theNbIsoU, + const Standard_Integer theNbIsoV) +{ + // Initialize data. + Clear(); + + if (theNbIsoU > 0 || theNbIsoV > 0) { + Standard_Integer IIso; + Standard_Real DeltaU = Abs (myUMax - myUMin); + Standard_Real DeltaV = Abs (myVMax - myVMin); + Standard_Real confusion = Min (DeltaU, DeltaV) * myHatcher.Confusion3d(); + + myHatcher.Confusion3d (confusion); + + if (theNbIsoU > 0) { + myUPrm = new TColStd_HArray1OfReal (1, theNbIsoU); + myUInd = new TColStd_HArray1OfInteger(1, theNbIsoU, 0); + + Standard_Real StepU = DeltaU / (Standard_Real) theNbIsoU; + + if (StepU > confusion) { + Standard_Real UPrm = myUMin + StepU / 2.; + gp_Dir2d Dir (0., 1.); + + for (IIso = 1; IIso <= theNbIsoU; IIso++) { + myUPrm->SetValue(IIso, UPrm); + gp_Pnt2d Ori (UPrm, 0.); + Geom2dAdaptor_Curve HCur (new Geom2d_Line (Ori, Dir)); + myUInd->SetValue(IIso, myHatcher.AddHatching(HCur)); + UPrm += StepU; + } + } + } + + if (theNbIsoV > 0) { + myVPrm = new TColStd_HArray1OfReal (1, theNbIsoV); + myVInd = new TColStd_HArray1OfInteger(1, theNbIsoV, 0); + + Standard_Real StepV = DeltaV / (Standard_Real) theNbIsoV; + + if (StepV > confusion) { + Standard_Real VPrm = myVMin + StepV / 2.; + gp_Dir2d Dir (1., 0.); + + for (IIso = 1; IIso <= theNbIsoV; IIso++) { + myVPrm->SetValue(IIso, VPrm); + gp_Pnt2d Ori (0., VPrm); + Geom2dAdaptor_Curve HCur (new Geom2d_Line (Ori, Dir)); + myVInd->SetValue(IIso, myHatcher.AddHatching(HCur)); + VPrm += StepV; + } + } + } + } +} + +//======================================================================= +//function : Init +//purpose : +//======================================================================= +void GEOMUtils_Hatcher::Init(const GeomAbs_IsoType theIsoType, + const Standard_Real theParameter) +{ + // Initialize data. + Clear(); + + if (theIsoType == GeomAbs_IsoU || theIsoType == GeomAbs_IsoV) { + const Standard_Boolean isIsoU = (theIsoType == GeomAbs_IsoU); + Handle(TColStd_HArray1OfReal) &aPrm = (isIsoU ? myUPrm : myVPrm); + Handle(TColStd_HArray1OfInteger) &anInd = (isIsoU ? myUInd : myVInd); + Handle(Geom2d_Line) aLine; + + aPrm = new TColStd_HArray1OfReal (1, 1); + anInd = new TColStd_HArray1OfInteger(1, 1); + aPrm->SetValue(1, theParameter); + + if (isIsoU) { + // U-isoline + gp_Dir2d aDir (0., 1.); + gp_Pnt2d anOri(theParameter, 0.); + + aLine = new Geom2d_Line(anOri, aDir); + } else { + // V-isoline + gp_Dir2d aDir (1., 0.); + gp_Pnt2d anOri(0., theParameter); + + aLine = new Geom2d_Line(anOri, aDir); + } + + Geom2dAdaptor_Curve aGACurve (aLine); + + anInd->SetValue(1, myHatcher.AddHatching(aGACurve)); + } +} + +//======================================================================= +//function : Perform +//purpose : +//======================================================================= +void GEOMUtils_Hatcher::Perform() +{ + myHatcher.Trim(); + + // Compute domains. + Standard_Integer i; + Standard_Integer anIndex; + + if (myUInd.IsNull() == Standard_False) { + for (i = myUInd->Lower() ; i <= myUInd->Upper() ; i++) { + anIndex = myUInd->Value(i); + + if (anIndex != 0) { + if (myHatcher.TrimDone(anIndex) && !myHatcher.TrimFailed(anIndex)) { + myHatcher.ComputeDomains(anIndex); + + if (!myIsDone) { + myIsDone = (myHatcher.NbDomains(anIndex) > 0); + } + } + } + } + } + + if (myVInd.IsNull() == Standard_False) { + for (i = myVInd->Lower() ; i <= myVInd->Upper() ; i++) { + anIndex = myVInd->Value(i); + + if (anIndex != 0) { + if (myHatcher.TrimDone(anIndex) && !myHatcher.TrimFailed(anIndex)) { + myHatcher.ComputeDomains(anIndex); + + if (!myIsDone) { + myIsDone = (myHatcher.NbDomains(anIndex) > 0); + } + } + } + } + } +} + +//======================================================================= +//function : GetNbDomains +//purpose : +//======================================================================= +Standard_Integer GEOMUtils_Hatcher::GetNbDomains + (const Standard_Integer theHatchingIndex) const +{ + Standard_Integer aResult = -1; + + if (myIsDone && myHatcher.IsDone(theHatchingIndex)) { + aResult = myHatcher.NbDomains(theHatchingIndex); + } + + return aResult; +} + +//======================================================================= +//function : GetDomain +//purpose : +//======================================================================= +Standard_Boolean GEOMUtils_Hatcher::GetDomain + (const Standard_Integer theHatchingIndex, + const Standard_Integer theDomainIndex, + Standard_Real &theParam1, + Standard_Real &theParam2) const +{ + Standard_Boolean isOK = Standard_False; + + if (theDomainIndex > 0) { + const Standard_Integer aNbDomains = GetNbDomains(theHatchingIndex); + + if (theDomainIndex <= aNbDomains) { + const HatchGen_Domain& aDomain = + myHatcher.Domain (theHatchingIndex, theDomainIndex); + + if (aDomain.HasFirstPoint()) { + theParam1 = aDomain.FirstPoint().Parameter(); + } else { + theParam1 = myVMin - InfiniteValue; + } + + if (aDomain.HasSecondPoint()) { + theParam2 = aDomain.SecondPoint().Parameter(); + } else { + theParam2 = myVMax + InfiniteValue; + } + + isOK = Standard_True; + } + } + + return isOK; +} + +//======================================================================= +//function : IsDomainInfinite +//purpose : +//======================================================================= +Standard_Boolean GEOMUtils_Hatcher::IsDomainInfinite + (const Standard_Integer theHatchingIndex, + const Standard_Integer theDomainIndex) const +{ + Standard_Boolean isInfinite = Standard_False; + + if (theDomainIndex > 0) { + const Standard_Integer aNbDomains = GetNbDomains(theHatchingIndex); + + if (theDomainIndex <= aNbDomains) { + const HatchGen_Domain& aDomain = + myHatcher.Domain (theHatchingIndex, theDomainIndex); + + if (!aDomain.HasFirstPoint() || !aDomain.HasSecondPoint()) { + isInfinite = Standard_True; + } + } + } + + return isInfinite; +} + +//======================================================================= +//function : GetHatching +//purpose : +//======================================================================= +const Handle(Geom2d_Curve) &GEOMUtils_Hatcher::GetHatching + (const Standard_Integer theHatchingIndex) const +{ + const Geom2dAdaptor_Curve &aGACurve = + myHatcher.HatchingCurve(theHatchingIndex); + + return aGACurve.Curve(); +} + +//======================================================================= +//function : Clear +//purpose : +//======================================================================= +void GEOMUtils_Hatcher::Clear() +{ + myIsDone = Standard_False; + myUPrm.Nullify(); + myVPrm.Nullify(); + myUInd.Nullify(); + myVInd.Nullify(); + myHatcher.ClrHatchings(); +} diff --git a/src/GEOMUtils/GEOMUtils_Hatcher.hxx b/src/GEOMUtils/GEOMUtils_Hatcher.hxx new file mode 100755 index 000000000..2d3c13697 --- /dev/null +++ b/src/GEOMUtils/GEOMUtils_Hatcher.hxx @@ -0,0 +1,208 @@ +// Copyright (C) 2007-2013 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 +// +// 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 +// + +#ifndef _GEOMUtils_Hatcher_HXX_ +#define _GEOMUtils_Hatcher_HXX_ + + +#include +#include +#include +#include +#include + + +/*! + * This class represents a hatcher for topological faces. + */ +class GEOMUtils_Hatcher { + +public: + + /** + * Constructor. Initializes the object with the face. + */ + Standard_EXPORT GEOMUtils_Hatcher(const TopoDS_Face &theFace); + + /** + * This method initializes the hatcher with hatchings. + * + * \param theNbIsos the number of U- and V-isolines. + */ + Standard_EXPORT void Init(const Standard_Integer theNbIsos); + + /** + * This method initializes the hatcher with hatchings. + * + * \param theNbIsoU the number of U-isolines. + * \param theNbIsoV the number of V-isolines. + */ + Standard_EXPORT void Init(const Standard_Integer theNbIsoU, + const Standard_Integer theNbIsoV); + + /** + * This method initializes the hatcher with a hatching. + * + * \param theIsoType the isoline type. + * \param theParameter the isoline parameter. + */ + Standard_EXPORT void Init(const GeomAbs_IsoType theIsoType, + const Standard_Real theParameter); + + /** + * Compute hatching domatins. + */ + Standard_EXPORT void Perform(); + + /** + * This method returns true if at least one hatching's domains + * are computed successfully. + * + * \return Standard_True is case of success. + */ + Standard_Boolean IsDone() const + { return myIsDone; } + + /** + * This method returns the initial face. + * + * \return the initial face. + */ + const TopoDS_Face &GetFace() const + { return myFace; } + + /** + * This method returns the number of domains for a particular hatching. + * If the operation is not done or there is no real hatching for + * a particular index a negative value is returned. + * + * \param theHatchingIndex the hatching index. + * \return the number of domains computed for the hatching. + */ + Standard_EXPORT Standard_Integer GetNbDomains + (const Standard_Integer theHatchingIndex) const; + + /** + * This method returns the domputed domain range computed for a particular + * hatching. theDomainIndex should be in the range [1..GetNbDomains]. + * + * \param theHatchingIndex the hatching index. + * \param theDomainIndex the domain index for the particular hatching. + * \param theParam1 (output) the first parameter of the domain. + * \param theParam2 (output) the last parameter of the domain. + * \return Standard_True in case of success; Standard_False otherwise. + */ + Standard_EXPORT Standard_Boolean GetDomain + (const Standard_Integer theHatchingIndex, + const Standard_Integer theDomainIndex, + Standard_Real &theParam1, + Standard_Real &theParam2) const; + + /** + * This method returns Standard_True if a domain has infinite first + * or last parameter. + * + * \param theHatchingIndex the hatching index. + * \param theDomainIndex the domain index for the particular hatching. + * \return Standard_True if a domain is infinite; Standard_False otherwise. + */ + Standard_EXPORT Standard_Boolean IsDomainInfinite + (const Standard_Integer theHatchingIndex, + const Standard_Integer theDomainIndex) const; + + /** + * This method returns the reference to OCCT hatcher. + * + * \return the reference to OCCT hatcher. + */ + const Geom2dHatch_Hatcher &GetHatcher() const + { return myHatcher; } + + /** + * This method returns the array of indices of U-isoline hatchings. + * Can be null if the object is initialized by 0 U-isolines. + * + * \return the array of U-isoline hatching indices. + */ + const Handle(TColStd_HArray1OfInteger) &GetUIndices() const + { return myUInd; } + + /** + * This method returns the array of indices of V-isoline hatchings. + * Can be null if the object is initialized by 0 V-isolines. + * + * \return the array of V-isoline hatching indices. + */ + const Handle(TColStd_HArray1OfInteger) &GetVIndices() const + { return myVInd; } + + /** + * This method returns the array of parameters of U-isoline hatchings. + * Can be null if the object is initialized by 0 U-isolines. + * + * \return the array of U-isoline hatching parameters. + */ + const Handle(TColStd_HArray1OfReal) &GetUParams() const + { return myUPrm; } + + /** + * This method returns the array of parameters of V-isoline hatchings. + * Can be null if the object is initialized by 0 V-isolines. + * + * \return the array of V-isoline hatching parameters. + */ + const Handle(TColStd_HArray1OfReal) &GetVParams() const + { return myVPrm; } + + /** + * This method returns a hatching curve by its index. + * If the curve is not found null handle is returned. + * + * \param theHatchingIndex the hatching curve index. + */ + const Handle(Geom2d_Curve) &GetHatching + (const Standard_Integer theHatchingIndex) const; + +protected: + + /** + * This method clears all hatchings data. + */ + void Clear(); + +private: + + Geom2dHatch_Hatcher myHatcher; + TopoDS_Face myFace; + Standard_Boolean myIsDone; + Standard_Real myUMin; + Standard_Real myUMax; + Standard_Real myVMin; + Standard_Real myVMax; + Handle(TColStd_HArray1OfReal) myUPrm; + Handle(TColStd_HArray1OfReal) myVPrm; + Handle(TColStd_HArray1OfInteger) myUInd; + Handle(TColStd_HArray1OfInteger) myVInd; + +}; + +#endif diff --git a/src/GEOM_I/GEOM_ICurvesOperations_i.cc b/src/GEOM_I/GEOM_ICurvesOperations_i.cc index 1a802dc52..26423df74 100644 --- a/src/GEOM_I/GEOM_ICurvesOperations_i.cc +++ b/src/GEOM_I/GEOM_ICurvesOperations_i.cc @@ -550,6 +550,32 @@ GEOM::GEOM_Object_ptr GEOM_ICurvesOperations_i::MakeCurveParametricNew return GetObject(anObject); } +//============================================================================= +/*! + * MakeIsoline + */ +//============================================================================= +GEOM::GEOM_Object_ptr GEOM_ICurvesOperations_i::MakeIsoline + (GEOM::GEOM_Object_ptr theFace, + CORBA::Boolean IsUIsoline, + double theParameter) +{ + GEOM::GEOM_Object_var aGEOMObject; + + //Set a not done flag + GetOperations()->SetNotDone(); + + Handle(GEOM_Object) aFace = GetObjectImpl(theFace); + + // Make isoline + Handle(GEOM_Object) anObject = + GetOperations()->MakeIsoline(aFace, IsUIsoline, theParameter); + if (!GetOperations()->IsDone() || anObject.IsNull()) + return aGEOMObject._retn(); + + return GetObject(anObject); +} + //============================================================================= /*! * MakeSketcher diff --git a/src/GEOM_I/GEOM_ICurvesOperations_i.hh b/src/GEOM_I/GEOM_ICurvesOperations_i.hh index f91e7c41c..cae0cbecf 100644 --- a/src/GEOM_I/GEOM_ICurvesOperations_i.hh +++ b/src/GEOM_I/GEOM_ICurvesOperations_i.hh @@ -100,6 +100,10 @@ class GEOM_I_EXPORT GEOM_ICurvesOperations_i : double theParamMin, double theParamMax, CORBA::Long theParamNbStep, GEOM::curve_type theCurveType); + GEOM::GEOM_Object_ptr MakeIsoline (GEOM::GEOM_Object_ptr theFace, + CORBA::Boolean IsUIsoline, + double theParameter); + GEOM::GEOM_Object_ptr MakeSketcher (const char* theCommand, const GEOM::ListOfDouble& theWorkingPlane); GEOM::GEOM_Object_ptr MakeSketcherOnPlane (const char* theCommand, GEOM::GEOM_Object_ptr theWorkingPlane); diff --git a/src/GEOM_SWIG/GEOM_TestAll.py b/src/GEOM_SWIG/GEOM_TestAll.py index 36e6e0aa7..e5caf3d32 100644 --- a/src/GEOM_SWIG/GEOM_TestAll.py +++ b/src/GEOM_SWIG/GEOM_TestAll.py @@ -188,6 +188,9 @@ def TestAll (geompy, math): prism1_faces[5], prism1_faces[2]]) Solid = geompy.MakeSolid([Shell1]) #(List of GEOM_Object)->GEOM_Object + # Create Isoline + Isoline = geompy.MakeIsoline(Face1, True, 0.5) #(1 GEOM_Object, Boolean, Double)->GEOM_Object + ShapeListCompound = [] i = 0 while i <= 3 : @@ -395,6 +398,8 @@ def TestAll (geompy, math): id_Disk3 = geompy.addToStudy(Disk3, "Disk OXY Radius") id_Shell = geompy.addToStudy(Shell, "Shell") + id_Isoline = geompy.addToStudy(Isoline, "Isoline") + id_p_on_face = geompy.addToStudy(p_on_face, "Vertex on Face (0.1, 0.8)") id_p_on_face2 = geompy.addToStudy(p_on_face2, "Vertex on Face at(0., 0., 0.)") id_p_on_face3 = geompy.addToStudy(p_on_face3, "Vertex inside Face") diff --git a/src/GEOM_SWIG/geomBuilder.py b/src/GEOM_SWIG/geomBuilder.py index d26f3c665..a0d60cb5f 100644 --- a/src/GEOM_SWIG/geomBuilder.py +++ b/src/GEOM_SWIG/geomBuilder.py @@ -2300,6 +2300,47 @@ class geomBuilder(object, GEOM._objref_GEOM_Gen): self._autoPublish(anObj, theName, "curve") return anObj + ## Create an isoline curve on a face. + # @param theFace the face for which an isoline is created. + # @param IsUIsoline True for U-isoline creation; False for V-isoline + # creation. + # @param theParameter the U parameter for U-isoline or V parameter + # for V-isoline. + # @param theName Object name; when specified, this parameter is used + # for result publication in the study. Otherwise, if automatic + # publication is switched on, default value is used for result name. + # + # @return New GEOM.GEOM_Object, containing the created isoline edge or + # a compound of edges. + # + # @ref tui_creation_curve "Example" + def MakeIsoline(self, theFace, IsUIsoline, theParameter, theName=None): + """ + Create an isoline curve on a face. + + Parameters: + theFace the face for which an isoline is created. + IsUIsoline True for U-isoline creation; False for V-isoline + creation. + theParameter the U parameter for U-isoline or V parameter + for V-isoline. + theName Object name; when specified, this parameter is used + for result publication in the study. Otherwise, if automatic + publication is switched on, default value is used for result name. + + Returns: + New GEOM.GEOM_Object, containing the created isoline edge or a + compound of edges. + """ + # Example: see GEOM_TestAll.py + anObj = self.CurvesOp.MakeIsoline(theFace, IsUIsoline, theParameter) + RaiseIfFailed("MakeIsoline", self.CurvesOp) + if IsUIsoline: + self._autoPublish(anObj, theName, "U-Isoline") + else: + self._autoPublish(anObj, theName, "V-Isoline") + return anObj + # end of l4_curves ## @} diff --git a/src/OBJECT/CMakeLists.txt b/src/OBJECT/CMakeLists.txt index fb595ae69..7f8ac53dd 100755 --- a/src/OBJECT/CMakeLists.txt +++ b/src/OBJECT/CMakeLists.txt @@ -34,6 +34,7 @@ INCLUDE_DIRECTORIES( ${PROJECT_BINARY_DIR}/idl ${PROJECT_BINARY_DIR} ${PROJECT_SOURCE_DIR}/src/OCC2VTK + ${PROJECT_SOURCE_DIR}/src/GEOMUtils ${CMAKE_CURRENT_SOURCE_DIR} ) @@ -55,6 +56,7 @@ SET(_link_LIBRARIES ${QT_QTCORE_LIBRARY} vtkRenderingMatplotlib vtkInteractionStyle + GEOMUtils #${VTK_LIBRARIES} ) diff --git a/src/OBJECT/GEOM_OCCReader.cxx b/src/OBJECT/GEOM_OCCReader.cxx index 334275ef6..84dbf3c9c 100644 --- a/src/OBJECT/GEOM_OCCReader.cxx +++ b/src/OBJECT/GEOM_OCCReader.cxx @@ -27,6 +27,8 @@ #include "GEOM_OCCReader.h" +#include + // VTK Includes #include #include @@ -37,42 +39,21 @@ #include // OpenCASCADE Includes -#include +#include #include #include #include +#include #include #include -#include #include -#include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include #include -#include #include "utilities.h" -#define MAX2(X, Y) ( Abs(X) > Abs(Y)? Abs(X) : Abs(Y) ) -#define MAX3(X, Y, Z) ( MAX2 ( MAX2(X,Y) , Z) ) - -// Constante for iso building -static Standard_Real IntersectorConfusion = 1.e-10 ; // -8 ; -static Standard_Real IntersectorTangency = 1.e-10 ; // -8 ; -static Standard_Real HatcherConfusion2d = 1.e-8 ; -static Standard_Real HatcherConfusion3d = 1.e-8 ; - static Standard_Integer lastVTKpoint = 0; static Standard_Integer PlotCount = 0; static Standard_Real IsoRatio = 1.001; @@ -219,7 +200,7 @@ void GEOM_OCCReader::TransferFaceWData(const TopoDS_Face& aFace, { TopoDS_Face aCopyFace = aFace; aCopyFace.Orientation (TopAbs_FORWARD); - createISO(aCopyFace,Precision::Infinite(),1,Pts,Cells); + createISO(aCopyFace,1,Pts,Cells); } //======================================================================= @@ -227,225 +208,100 @@ void GEOM_OCCReader::TransferFaceWData(const TopoDS_Face& aFace, // Purpose : Create ISO for Face Wireframe representation //======================================================================= -void GEOM_OCCReader::createISO (const TopoDS_Face& TopologicalFace, - const Standard_Real Infinite, - const Standard_Integer NbIsos, - vtkPoints* Pts, - vtkCellArray* Cell) +void GEOM_OCCReader::createISO (const TopoDS_Face &TopologicalFace, + const Standard_Integer NbIsos, + vtkPoints *Pts, + vtkCellArray *Cell) { - Geom2dHatch_Hatcher aHatcher (Geom2dHatch_Intersector (IntersectorConfusion, - IntersectorTangency), - HatcherConfusion2d, - HatcherConfusion3d, - Standard_True, - Standard_False); - - Standard_Real myInfinite,myUMin,myUMax,myVMin,myVMax; - //myInfinite = Precision::Infinite(); - myInfinite = 1e38; // VTK uses float numbers - Precision::Infinite() is double and can not be accepted. - - Standard_Integer myNbDom; - TColStd_Array1OfReal myUPrm(1, NbIsos),myVPrm(1, NbIsos); - TColStd_Array1OfInteger myUInd(1, NbIsos),myVInd(1, NbIsos); - - myUInd.Init(0); - myVInd.Init(0); - - //----------------------------------------------------------------------- - // If the Min Max bounds are infinite, there are bounded to Infinite - // value. - //----------------------------------------------------------------------- - - BRepTools::UVBounds (TopologicalFace, myUMin, myUMax, myVMin, myVMax) ; - Standard_Boolean InfiniteUMin = Precision::IsNegativeInfinite (myUMin) ; - Standard_Boolean InfiniteUMax = Precision::IsPositiveInfinite (myUMax) ; - Standard_Boolean InfiniteVMin = Precision::IsNegativeInfinite (myVMin) ; - Standard_Boolean InfiniteVMax = Precision::IsPositiveInfinite (myVMax) ; - if (InfiniteUMin && InfiniteUMax) { - myUMin = - myInfinite ; - myUMax = myInfinite ; - } else if (InfiniteUMin) { - myUMin = myUMax - myInfinite ; - } else if (InfiniteUMax) { - myUMax = myUMin + myInfinite ; - } - if (InfiniteVMin && InfiniteVMax) { - myVMin = - myInfinite ; - myVMax = myInfinite ; - } else if (InfiniteVMin) { - myVMin = myVMax - myInfinite ; - } else if (InfiniteVMax) { - myVMax = myVMin + myInfinite ; - } - - //----------------------------------------------------------------------- - // Retreiving the edges and loading them into the hatcher. - //----------------------------------------------------------------------- + GEOMUtils_Hatcher aHatcher(TopologicalFace); - TopExp_Explorer ExpEdges ; - for (ExpEdges.Init (TopologicalFace, TopAbs_EDGE) ; ExpEdges.More() ; ExpEdges.Next()) { - const TopoDS_Edge& TopologicalEdge = TopoDS::Edge (ExpEdges.Current()) ; - Standard_Real U1, U2 ; - const Handle(Geom2d_Curve) PCurve = BRep_Tool::CurveOnSurface (TopologicalEdge, TopologicalFace, U1, U2) ; + aHatcher.Init(NbIsos); + aHatcher.Perform(); - if ( PCurve.IsNull() ) { - return; - } + if (aHatcher.IsDone()) { + // Push iso lines in vtk kernel + Standard_Integer pt_start_idx = 0; - if ( U1==U2) { - return; - } - - //-- Test if a TrimmedCurve is necessary - if( Abs(PCurve->FirstParameter()-U1)<= Precision::PConfusion() - && Abs(PCurve->LastParameter()-U2)<= Precision::PConfusion()) { - aHatcher.AddElement (PCurve, TopologicalEdge.Orientation()) ; - } - else { - if (!PCurve->IsPeriodic()) { - Handle (Geom2d_TrimmedCurve) TrimPCurve =Handle(Geom2d_TrimmedCurve)::DownCast(PCurve); - if (!TrimPCurve.IsNull()) { - if (TrimPCurve->BasisCurve()->FirstParameter()-U1 > Precision::PConfusion() || - U2-TrimPCurve->BasisCurve()->LastParameter() > Precision::PConfusion()) { - aHatcher.AddElement (PCurve, TopologicalEdge.Orientation()) ; - return; - } - } - else { - if (PCurve->FirstParameter()-U1 > Precision::PConfusion()){ - U1=PCurve->FirstParameter(); - } - if (U2-PCurve->LastParameter() > Precision::PConfusion()){ - U2=PCurve->LastParameter(); - } - } - } - Handle (Geom2d_TrimmedCurve) TrimPCurve = new Geom2d_TrimmedCurve (PCurve, U1, U2) ; - aHatcher.AddElement (TrimPCurve, TopologicalEdge.Orientation()) ; - } + createIsos(aHatcher, Standard_True, pt_start_idx, Pts, Cell); + createIsos(aHatcher, Standard_False, pt_start_idx, Pts, Cell); } +} +//======================================================================= +// Function : createIsos +// Purpose : Create isolines obtained from hatcher. +//======================================================================= +void GEOM_OCCReader::createIsos(const GEOMUtils_Hatcher &theHatcher, + const Standard_Boolean IsUIso, + Standard_Integer &pt_start_idx, + vtkPoints *Pts, + vtkCellArray *Cell) +{ + // Push iso lines in vtk kernel + Handle(TColStd_HArray1OfInteger) anIndices; + Handle(TColStd_HArray1OfReal) aParams; - //----------------------------------------------------------------------- - // Loading and trimming the hatchings. - //----------------------------------------------------------------------- - - Standard_Integer IIso ; - Standard_Real DeltaU = Abs (myUMax - myUMin) ; - Standard_Real DeltaV = Abs (myVMax - myVMin) ; - Standard_Real confusion = Min (DeltaU, DeltaV) * HatcherConfusion3d ; - aHatcher.Confusion3d (confusion) ; - - Standard_Real StepU = DeltaU / (Standard_Real) NbIsos ; - if (StepU > confusion) { - Standard_Real UPrm = myUMin + StepU / 2. ; - gp_Dir2d Dir (0., 1.) ; - for (IIso = 1 ; IIso <= NbIsos ; IIso++) { - myUPrm(IIso) = UPrm ; - gp_Pnt2d Ori (UPrm, 0.) ; - Geom2dAdaptor_Curve HCur (new Geom2d_Line (Ori, Dir)) ; - myUInd(IIso) = aHatcher.AddHatching (HCur) ; - UPrm += StepU ; - } - } - - Standard_Real StepV = DeltaV / (Standard_Real) NbIsos ; - if (StepV > confusion) { - Standard_Real VPrm = myVMin + StepV / 2. ; - gp_Dir2d Dir (1., 0.) ; - for (IIso = 1 ; IIso <= NbIsos ; IIso++) { - myVPrm(IIso) = VPrm ; - gp_Pnt2d Ori (0., VPrm) ; - Geom2dAdaptor_Curve HCur (new Geom2d_Line (Ori, Dir)) ; - myVInd(IIso) = aHatcher.AddHatching (HCur) ; - VPrm += StepV ; - } + if (IsUIso) { + // U-isolines + anIndices = theHatcher.GetUIndices(); + aParams = theHatcher.GetUParams(); + } else { + // V-isolines + anIndices = theHatcher.GetVIndices(); + aParams = theHatcher.GetVParams(); } - //----------------------------------------------------------------------- - // Computation. - //----------------------------------------------------------------------- - - aHatcher.Trim() ; - - myNbDom = 0 ; - for (IIso = 1 ; IIso <= NbIsos ; IIso++) { - Standard_Integer Index ; - - Index = myUInd(IIso) ; - if (Index != 0) { - if (aHatcher.TrimDone (Index) && !aHatcher.TrimFailed (Index)) { - aHatcher.ComputeDomains (Index); - if (aHatcher.IsDone (Index)) myNbDom = myNbDom + aHatcher.NbDomains (Index) ; - } - } - - Index = myVInd(IIso) ; - if (Index != 0) { - if (aHatcher.TrimDone (Index) && !aHatcher.TrimFailed (Index)) { - aHatcher.ComputeDomains (Index); - if (aHatcher.IsDone (Index)) myNbDom = myNbDom + aHatcher.NbDomains (Index) ; - } + if (anIndices.IsNull() || aParams.IsNull()) { + if (IsUIso) { + MESSAGE("GEOMUtils_Hatcher: null U-isoline indices") + } else { + MESSAGE("GEOMUtils_Hatcher: null V-isoline indices") } - } + } else { + const GeomAbs_IsoType aType = (IsUIso ? GeomAbs_IsoU : GeomAbs_IsoV); + Standard_Integer anIsoInd = anIndices->Lower(); + + for (; anIsoInd <= anIndices->Upper(); anIsoInd++) { + const Standard_Integer aHatchingIndex = anIndices->Value(anIsoInd); + + if (aHatchingIndex != 0) { + const Standard_Real aParam = aParams->Value(anIsoInd); + const Standard_Integer aNbDomains = + theHatcher.GetNbDomains(aHatchingIndex); + + if (aNbDomains < 0) { + if (IsUIso) { + MESSAGE("GEOMUtils_Hatcher: U iso of parameter: "< #include -#include +#include #include #include @@ -94,10 +96,16 @@ class GEOM_OBJECT_EXPORT GEOM_OCCReader : public vtkAlgorithm { vtkCellArray* Cells); void createISO(const TopoDS_Face &, - double, int, + int, vtkPoints* Pts, vtkCellArray* Cells); - + + void createIsos(const GEOMUtils_Hatcher &theHatcher, + const Standard_Boolean IsUIso, + Standard_Integer &pt_start_idx, + vtkPoints *Pts, + vtkCellArray *Cell); + void DrawIso(GeomAbs_IsoType aType, Standard_Real PParm, Standard_Real p1, diff --git a/src/OCC2VTK/CMakeLists.txt b/src/OCC2VTK/CMakeLists.txt index 67ae3bf9d..3c477f574 100755 --- a/src/OCC2VTK/CMakeLists.txt +++ b/src/OCC2VTK/CMakeLists.txt @@ -25,6 +25,7 @@ INCLUDE_DIRECTORIES( ${KERNEL_INCLUDE_DIRS} ${VTK_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR} + ${PROJECT_SOURCE_DIR}/src/GEOMUtils ) # additional preprocessor / compiler flags @@ -38,7 +39,8 @@ SET(_link_LIBRARIES ${CAS_KERNEL} ${CAS_TKMesh} ${CAS_TKTopAlgo} ${CAS_MODELER} - ${KERNEL_SALOMELocalTrace} + ${KERNEL_SALOMELocalTrace} + GEOMUtils ) # --- headers --- diff --git a/src/OCC2VTK/GEOM_WireframeFace.cxx b/src/OCC2VTK/GEOM_WireframeFace.cxx index 981bc24e0..f91c0ef78 100755 --- a/src/OCC2VTK/GEOM_WireframeFace.cxx +++ b/src/OCC2VTK/GEOM_WireframeFace.cxx @@ -17,7 +17,9 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -#include "GEOM_WireframeFace.h" +#include "GEOM_WireframeFace.h" + +#include #include @@ -29,26 +31,9 @@ #include #include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include - -#include -#include - #include +#include +#include vtkStandardNewMacro(GEOM_WireframeFace); @@ -116,217 +101,80 @@ OCC2VTK(const TopoDS_Face& theFace, CreateIso(aFace,theNbIso,theDiscret,thePolyData,thePts); } -void -GEOM_WireframeFace:: +void +GEOM_WireframeFace:: CreateIso(const TopoDS_Face& theFace, - const int theNbIso[2], - const int theDiscret, + const int theNbIso[2], + const int theDiscret, vtkPolyData* thePolyData, vtkPoints* thePts) { - // Constants for iso building - static Standard_Real INTERSECTOR_CONFUSION = 1.e-10 ; // -8 ; - static Standard_Real INTERSECTOR_TANGENCY = 1.e-10 ; // -8 ; - - static Standard_Real HATHCER_CONFUSION_2D = 1.e-8 ; - static Standard_Real HATHCER_CONFUSION_3D = 1.e-8 ; - - Geom2dHatch_Hatcher - aHatcher(Geom2dHatch_Intersector(INTERSECTOR_CONFUSION, - INTERSECTOR_TANGENCY), - HATHCER_CONFUSION_2D, - HATHCER_CONFUSION_3D, - Standard_True, - Standard_False); - - Standard_Real anUMin, anUMax, aVMin, aVMax; - TColStd_Array1OfReal anUPrm(0, theNbIso[0]), aVPrm(0, theNbIso[1]); - TColStd_Array1OfInteger anUInd(0, theNbIso[0]), aVInd(0, theNbIso[1]); - - anUInd.Init(0); - aVInd.Init(0); - - //----------------------------------------------------------------------- - // If the Min Max bounds are infinite, there are bounded to Infinite - // value. - //----------------------------------------------------------------------- - BRepTools::UVBounds(theFace, anUMin, anUMax, aVMin, aVMax) ; - Standard_Boolean InfiniteUMin = Precision::IsNegativeInfinite (anUMin) ; - Standard_Boolean InfiniteUMax = Precision::IsPositiveInfinite (anUMax) ; - Standard_Boolean InfiniteVMin = Precision::IsNegativeInfinite (aVMin) ; - Standard_Boolean InfiniteVMax = Precision::IsPositiveInfinite (aVMax) ; - - static float VTKINFINITE = 1.0E38; - if(InfiniteUMin && InfiniteUMax){ - anUMin = - VTKINFINITE ; - anUMax = VTKINFINITE ; - }else if(InfiniteUMin){ - anUMin = anUMax - VTKINFINITE ; - }else if(InfiniteUMax){ - anUMax = anUMin + VTKINFINITE ; - } + GEOMUtils_Hatcher aHatcher(theFace); - if(InfiniteVMin && InfiniteVMax){ - aVMin = - VTKINFINITE ; - aVMax = VTKINFINITE ; - }else if(InfiniteVMin){ - aVMin = aVMax - VTKINFINITE ; - }else if(InfiniteVMax){ - aVMax = aVMin + VTKINFINITE ; - } + aHatcher.Init(theNbIso[0], theNbIso[1]); + aHatcher.Perform(); - //----------------------------------------------------------------------- - // Retreiving the edges and loading them into the hatcher. - //----------------------------------------------------------------------- - TopExp_Explorer ExpEdges(theFace, TopAbs_EDGE); - for(; ExpEdges.More(); ExpEdges.Next()){ - const TopoDS_Edge& anEdge = TopoDS::Edge(ExpEdges.Current()); - Standard_Real U1, U2 ; - const Handle(Geom2d_Curve) PCurve = - BRep_Tool::CurveOnSurface(anEdge, theFace, U1, U2) ; - - if(PCurve.IsNull() || U1 == U2) - return; - - //-- Test if a TrimmedCurve is necessary - if(Abs(PCurve->FirstParameter()-U1) <= Precision::PConfusion() && - Abs(PCurve->LastParameter()-U2) <= Precision::PConfusion()) - { - aHatcher.AddElement(PCurve, anEdge.Orientation()) ; - }else{ - if(!PCurve->IsPeriodic()){ - Handle(Geom2d_TrimmedCurve) TrimPCurve = - Handle(Geom2d_TrimmedCurve)::DownCast(PCurve); - if(!TrimPCurve.IsNull()){ - Handle_Geom2d_Curve aBasisCurve = TrimPCurve->BasisCurve(); - if(aBasisCurve->FirstParameter()-U1 > Precision::PConfusion() || - U2-aBasisCurve->LastParameter() > Precision::PConfusion()) - { - aHatcher.AddElement(PCurve, anEdge.Orientation()) ; - return; - } - }else{ - if(PCurve->FirstParameter()-U1 > Precision::PConfusion()){ - U1=PCurve->FirstParameter(); - } - if(U2-PCurve->LastParameter() > Precision::PConfusion()){ - U2=PCurve->LastParameter(); - } - } - } - Handle(Geom2d_TrimmedCurve) TrimPCurve = - new Geom2d_TrimmedCurve(PCurve, U1, U2); - aHatcher.AddElement(TrimPCurve, anEdge.Orientation()); - } + if (aHatcher.IsDone()) { + // Push iso lines in vtk kernel + CreateIso(aHatcher, Standard_True, theDiscret, thePolyData, thePts); + CreateIso(aHatcher, Standard_False, theDiscret, thePolyData, thePts); } +} - //----------------------------------------------------------------------- - // Loading and trimming the hatchings. - //----------------------------------------------------------------------- - Standard_Integer IIso; - Standard_Real DeltaU = Abs(anUMax - anUMin) ; - Standard_Real DeltaV = Abs(aVMax - aVMin) ; - Standard_Real confusion = Min(DeltaU, DeltaV) * HATHCER_CONFUSION_3D ; - aHatcher.Confusion3d (confusion) ; - - if ( theNbIso[0] ) { - Standard_Real StepU = DeltaU / (Standard_Real)theNbIso[0]; - if(StepU > confusion){ - Standard_Real UPrm = anUMin + StepU / 2.; - gp_Dir2d Dir(0., 1.) ; - for(IIso = 1 ; IIso <= theNbIso[0] ; IIso++) { - anUPrm(IIso) = UPrm ; - gp_Pnt2d Ori (UPrm, 0.) ; - Geom2dAdaptor_Curve HCur (new Geom2d_Line (Ori, Dir)) ; - anUInd(IIso) = aHatcher.AddHatching (HCur) ; - UPrm += StepU ; - } - } - } - if ( theNbIso[1] ) { - Standard_Real StepV = DeltaV / (Standard_Real) theNbIso[1] ; - if(StepV > confusion){ - Standard_Real VPrm = aVMin + StepV / 2.; - gp_Dir2d Dir(1., 0.); - for(IIso = 1 ; IIso <= theNbIso[1] ; IIso++){ - aVPrm(IIso) = VPrm; - gp_Pnt2d Ori (0., VPrm); - Geom2dAdaptor_Curve HCur(new Geom2d_Line (Ori, Dir)); - aVInd(IIso) = aHatcher.AddHatching (HCur) ; - VPrm += StepV ; - } - } - } +void +GEOM_WireframeFace:: +CreateIso(const GEOMUtils_Hatcher &theHatcher, + const Standard_Boolean IsUIso, + const int theDiscret, + vtkPolyData *thePolyData, + vtkPoints *thePts) +{ + Handle(TColStd_HArray1OfInteger) anIndices; + Handle(TColStd_HArray1OfReal) aParams; - //----------------------------------------------------------------------- - // Computation. - //----------------------------------------------------------------------- - aHatcher.Trim() ; - - Standard_Integer aNbDom = 0 ; // for debug purpose - Standard_Integer Index ; - - for(IIso = 1 ; IIso <= theNbIso[0] ; IIso++){ - Index = anUInd(IIso) ; - if(Index != 0){ - if(aHatcher.TrimDone(Index) && !aHatcher.TrimFailed(Index)){ - aHatcher.ComputeDomains(Index); - if(aHatcher.IsDone (Index)) - aNbDom = aHatcher.NbDomains (Index); - } - } + if (IsUIso) { + // U-isolines + anIndices = theHatcher.GetUIndices(); + aParams = theHatcher.GetUParams(); + } else { + // V-isolines + anIndices = theHatcher.GetVIndices(); + aParams = theHatcher.GetVParams(); } - for(IIso = 1 ; IIso <= theNbIso[1] ; IIso++){ - Index = aVInd(IIso); - if(Index != 0){ - if(aHatcher.TrimDone (Index) && !aHatcher.TrimFailed(Index)){ - aHatcher.ComputeDomains (Index); - if(aHatcher.IsDone (Index)) - aNbDom = aHatcher.NbDomains (Index); - } - } - } + if (anIndices.IsNull() == Standard_False && + aParams.IsNull() == Standard_False) { + const GeomAbs_IsoType aType = (IsUIso ? GeomAbs_IsoU : GeomAbs_IsoV); + Standard_Integer anIsoInd = anIndices->Lower(); - //----------------------------------------------------------------------- - // Push iso lines in vtk kernel - //----------------------------------------------------------------------- - for(Standard_Integer UIso = anUPrm.Lower() ; UIso <= anUPrm.Upper(); UIso++){ - Standard_Integer UInd = anUInd.Value(UIso); - if(UInd != 0){ - Standard_Real UPrm = anUPrm.Value(UIso); - if(aHatcher.IsDone(UInd)){ - Standard_Integer NbDom = aHatcher.NbDomains(UInd); - for(Standard_Integer IDom = 1 ; IDom <= NbDom ; IDom++){ - const HatchGen_Domain& Dom = aHatcher.Domain(UInd, IDom) ; - Standard_Real V1 = Dom.HasFirstPoint()? Dom.FirstPoint().Parameter(): aVMin - VTKINFINITE; - Standard_Real V2 = Dom.HasSecondPoint()? Dom.SecondPoint().Parameter(): aVMax + VTKINFINITE; - CreateIso_(theFace, GeomAbs_IsoU, UPrm, V1, V2, theDiscret, thePolyData, thePts); - } - } - } - } + for (; anIsoInd <= anIndices->Upper(); anIsoInd++) { + const Standard_Integer aHatchingIndex = anIndices->Value(anIsoInd); - for(Standard_Integer VIso = aVPrm.Lower() ; VIso <= aVPrm.Upper(); VIso++){ - Standard_Integer VInd = aVInd.Value(VIso); - if(VInd != 0){ - Standard_Real VPrm = aVPrm.Value(VIso); - if(aHatcher.IsDone (VInd)){ - Standard_Integer NbDom = aHatcher.NbDomains(VInd); - for (Standard_Integer IDom = 1 ; IDom <= NbDom ; IDom++){ - const HatchGen_Domain& Dom = aHatcher.Domain(VInd, IDom); - Standard_Real U1 = Dom.HasFirstPoint()? Dom.FirstPoint().Parameter(): aVMin - VTKINFINITE; - Standard_Real U2 = Dom.HasSecondPoint()? Dom.SecondPoint().Parameter(): aVMax + VTKINFINITE; - CreateIso_(theFace, GeomAbs_IsoV, VPrm, U1, U2, theDiscret, thePolyData, thePts); - } + if (aHatchingIndex != 0) { + const Standard_Real aParam = aParams->Value(anIsoInd); + const Standard_Integer aNbDomains = + theHatcher.GetNbDomains(aHatchingIndex); + + if (aNbDomains >= 0) { + Standard_Integer anIDom = 1; + Standard_Real aV1; + Standard_Real aV2; + + for (; anIDom <= aNbDomains; anIDom++) { + if (theHatcher.GetDomain(aHatchingIndex, anIDom, aV1, aV2)) { + CreateIso_(theHatcher.GetFace(), aType, aParam, aV1, aV2, + theDiscret, thePolyData, thePts); + } + } + } } } } } - + void GEOM_WireframeFace:: diff --git a/src/OCC2VTK/GEOM_WireframeFace.h b/src/OCC2VTK/GEOM_WireframeFace.h index b6953143b..d89325c09 100755 --- a/src/OCC2VTK/GEOM_WireframeFace.h +++ b/src/OCC2VTK/GEOM_WireframeFace.h @@ -27,6 +27,7 @@ #include class vtkPolyData; +class GEOMUtils_Hatcher; class OCC2VTK_EXPORT GEOM_WireframeFace: public GEOM_FaceSource { @@ -63,7 +64,15 @@ protected: const int theDiscret, vtkPolyData* thePolyData, vtkPoints* thePts); - + + static + void + CreateIso(const GEOMUtils_Hatcher &theHatcher, + const Standard_Boolean IsUIso, + const int theDiscret, + vtkPolyData *thePolyData, + vtkPoints *thePts); + static void CreateIso_(const TopoDS_Face& theFace, -- 2.30.2