From 5f4c43d53a17d4262672136ab21dc0c355a7b93e Mon Sep 17 00:00:00 2001 From: jfa Date: Mon, 10 Jun 2013 08:28:09 +0000 Subject: [PATCH] Mantis issue 0022227: Integration request: Building a surface from a cloud of points --- .../gui/GEOM/input/creating_adv_obj.doc | 1 + .../GEOM/input/creating_smoothingsurface.doc | 26 ++ .../gui/GEOM/input/tui_advanced_geom_objs.doc | 18 ++ idl/GEOM_Gen.idl | 8 + idl/GEOM_Superv.idl | 2 + resources/GEOMCatalog.xml.in | 22 ++ resources/Makefile.am | 1 + resources/smoothingsurface.png | Bin 0 -> 1233 bytes resources/smoothingsurface_lpoints.png | Bin 0 -> 22215 bytes resources/tree_smoothingsurface.png | Bin 0 -> 1233 bytes src/AdvancedGUI/AdvancedGUI.cxx | 4 + .../AdvancedGUI_SmoothingSurfaceDlg.cxx | 264 ++++++++++++++++++ .../AdvancedGUI_SmoothingSurfaceDlg.h | 73 +++++ src/AdvancedGUI/Makefile.am | 8 +- src/GEOMGUI/GEOM_images.ts | 12 + src/GEOMGUI/GeometryGUI.cxx | 12 +- src/GEOMGUI/GeometryGUI_Operations.h | 1 + src/GEOMImpl/GEOMImpl_Gen.cxx | 2 + src/GEOMImpl/GEOMImpl_IAdvancedOperations.cxx | 69 +++++ src/GEOMImpl/GEOMImpl_IAdvancedOperations.hxx | 2 + src/GEOMImpl/GEOMImpl_ISmoothingSurface.hxx | 45 +++ .../GEOMImpl_SmoothingSurfaceDriver.cxx | 233 ++++++++++++++++ .../GEOMImpl_SmoothingSurfaceDriver.hxx | 133 +++++++++ src/GEOMImpl/GEOMImpl_Types.hxx | 2 + src/GEOMImpl/GUID.txt | 1 + src/GEOMImpl/Makefile.am | 2 + src/GEOM_I/GEOM_IAdvancedOperations_i.cc | 31 ++ src/GEOM_I/GEOM_IAdvancedOperations_i.hh | 1 + src/GEOM_I_Superv/GEOM_Superv_i.cc | 19 ++ src/GEOM_I_Superv/GEOM_Superv_i.hh | 1 + src/GEOM_SWIG/geomBuilder.py | 12 + 31 files changed, 999 insertions(+), 6 deletions(-) create mode 100644 doc/salome/gui/GEOM/input/creating_adv_obj.doc create mode 100644 doc/salome/gui/GEOM/input/creating_smoothingsurface.doc create mode 100644 resources/smoothingsurface.png create mode 100644 resources/smoothingsurface_lpoints.png create mode 100644 resources/tree_smoothingsurface.png create mode 100644 src/AdvancedGUI/AdvancedGUI_SmoothingSurfaceDlg.cxx create mode 100644 src/AdvancedGUI/AdvancedGUI_SmoothingSurfaceDlg.h create mode 100644 src/GEOMImpl/GEOMImpl_ISmoothingSurface.hxx create mode 100644 src/GEOMImpl/GEOMImpl_SmoothingSurfaceDriver.cxx create mode 100644 src/GEOMImpl/GEOMImpl_SmoothingSurfaceDriver.hxx diff --git a/doc/salome/gui/GEOM/input/creating_adv_obj.doc b/doc/salome/gui/GEOM/input/creating_adv_obj.doc new file mode 100644 index 000000000..5b5b91306 --- /dev/null +++ b/doc/salome/gui/GEOM/input/creating_adv_obj.doc @@ -0,0 +1 @@ +
  • \subpage create_smoothingsurface_page
    • diff --git a/doc/salome/gui/GEOM/input/creating_smoothingsurface.doc b/doc/salome/gui/GEOM/input/creating_smoothingsurface.doc new file mode 100644 index 000000000..9f2263ec6 --- /dev/null +++ b/doc/salome/gui/GEOM/input/creating_smoothingsurface.doc @@ -0,0 +1,26 @@ +/*! + +\page create_smoothingsurface_page SmoothingSurface + +To create a \b SmoothingSurface in the Main Menu select New Entity - > +Advanced - > SmoothingSurface + +Specify the parameters of the SmoothingSurface object creation in the opened dialog +box and press "Apply" or "Apply & Close" button. +Result of each operation will be a GEOM_Object. + +TUI Command: geompy.MakeSmoothingSurface(lPoints) + +Arguments: +- \b lPoints - list of points + +\image html smoothingsurface_dlg.png + +Example: + +\image html smoothingsurface.png + +Our TUI Scripts provide you with useful examples of creation of +\ref tui_creation_smoothingsurface "Advanced objects". + +*/ diff --git a/doc/salome/gui/GEOM/input/tui_advanced_geom_objs.doc b/doc/salome/gui/GEOM/input/tui_advanced_geom_objs.doc index d963c28ea..d013ef013 100644 --- a/doc/salome/gui/GEOM/input/tui_advanced_geom_objs.doc +++ b/doc/salome/gui/GEOM/input/tui_advanced_geom_objs.doc @@ -14,5 +14,23 @@

    Creation of DividedCylinder

    \tui_script{advanced_geom_objs_ex03.py} +\anchor tui_creation_smoothingsurface +

    Creation of SmoothingSurface

    + +\code +import geompy +import salome +gg = salome.ImportComponentGUI("GEOM") + +# create SmoothingSurface object +smoothingsurface = geompy.MakeSmoothingSurface([value]) + +# add object in the study +id_smoothingsurface = geompy.addToStudy(smoothingsurface,"SmoothingSurface") + +# display smoothingsurface +gg.createAndDisplayGO(id_smoothingsurface) +\endcode + */ diff --git a/idl/GEOM_Gen.idl b/idl/GEOM_Gen.idl index 7a93994ac..edfbc0d77 100644 --- a/idl/GEOM_Gen.idl +++ b/idl/GEOM_Gen.idl @@ -4395,6 +4395,14 @@ module GEOM in double theH, in pattern thePattern ); + /*! + * + * Create a smoothing surface from a set of points + * \param thelPoints list of points + * \return New GEOM_Object, containing the created shape. + */ + GEOM_Object MakeSmoothingSurface (in ListOfGO thelPoints); + /*@@ insert new functions before this line @@ do not remove this line @@*/ }; diff --git a/idl/GEOM_Superv.idl b/idl/GEOM_Superv.idl index b7cf4f735..29bcea81b 100644 --- a/idl/GEOM_Superv.idl +++ b/idl/GEOM_Superv.idl @@ -623,6 +623,8 @@ module GEOM GEOM_Object MakeDividedCylinder (in double theR, in double theH, in pattern thePattern); + GEOM_Object MakeSmoothingSurface (in GEOM_List thelPoints); + /*@@ insert new functions before this line @@ do not remove this line @@*/ }; }; diff --git a/resources/GEOMCatalog.xml.in b/resources/GEOMCatalog.xml.in index 6e13a9fe4..22e8b1666 100644 --- a/resources/GEOMCatalog.xml.in +++ b/resources/GEOMCatalog.xml.in @@ -5279,6 +5279,28 @@ + + MakeSmoothingSurface + + + unknown + 0 + + + thelPoints + double + list of points + + + + + return + GEOM_Object + Result object + + + + diff --git a/resources/Makefile.am b/resources/Makefile.am index 8051b27a0..ee3fe1bff 100644 --- a/resources/Makefile.am +++ b/resources/Makefile.am @@ -258,6 +258,7 @@ ADVANCED_RESOURCES += dlg_pipetshapefilletrf.png # ADVANCED_RESOURCES += divideddisk.png divideddisk_r_ratio.png tree_divideddisk.png ADVANCED_RESOURCES += dividedcylinder.png dividedcylinder_r_h.png # tree_dividedcylinder.png +ADVANCED_RESOURCES += smoothingsurface.png smoothingsurface_lpoints.png tree_smoothingsurface.png ##@@ insert new functions before this line @@ do not remove this line @@## dist_salomeres_DATA += $(ADVANCED_RESOURCES) diff --git a/resources/smoothingsurface.png b/resources/smoothingsurface.png new file mode 100644 index 0000000000000000000000000000000000000000..38a2457bc9cc46141c46c59861868799ccc28530 GIT binary patch literal 1233 zcmV;?1TOoDP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyY( z3lbzd{ZD=X000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HM@dakSAh-}000CmNkl#%+#rEtYAYIN(6(TwxDhrT52JiU>gcm(iYnywSr0twwoxn zr8IP*sbax4#<llgXgN5>ampE)xN0A#(8FGohm$5*c& zzIW%&r6>%ugi;u#peq%qQVEXh7B_9(`r)&?c74Lu1KNM?+?MZd+!($)F>%UR>k7{U zPo=Tn`H7DX9EcW=4~~q`9}0!m@u{gJ<#PE*d2a5p zXm%E`79y8}@I3HD0*rG2KsAoRjrrrb_V%Z~Id#fk*0b$Lj~<+wo*ovCqufMdnoBtg z#)_2lq_(y#48upNVTfwEjB2FO$v`9$5K@8?0uTbNHS(Fvi9&z>r;Yj?0A4tB z=%ty-$&T?`x8AQR1;V)~3$cy5?lvkV2&=W$Dg_ViBeRa2$wiwsxn}5a~3y zlr;#Ypp=493PK1{t~+@1!iB?&ljC4)?-Q-9L~;(!IS2q_Ey5_m{K5j}XJ_FTi_k#; zPzs(*LL`$AuG=(0-KJqh2tmSet}k5=JdC1eBBdSU&+bhAyn^&&1e0J>EU#lHWooCN>N7d?(BZRXdlYuq{l^{Ub_fe`; z5XCWcJ#qlxoSTEYcV~J#J1fgzYdH&Fy?AkFq|}XUI_;S{tP}(&RVs+%7}^-1Zk2T1 znXyZkT2`t<*8=;#xA&)w+3X%`?VPRe!+LJD=&Y@+(AvB4)#}i-p7et!P81lWFIsDV zCxp}@Axna>7M#-Qb;AJQtCJ^h=aR`Cl#pQny0JH#mH-%If37y4|J#4r=f{uF19*LZ vfB!|L)Imn+o>-~JDWw}>Ez*g^s%HNHtb^8QP&nO}00000NkvXXu0mjfKN2hC literal 0 HcmV?d00001 diff --git a/resources/smoothingsurface_lpoints.png b/resources/smoothingsurface_lpoints.png new file mode 100644 index 0000000000000000000000000000000000000000..fe6dce0da335b51e2c6623a3bf9a0c035bc873fe GIT binary patch literal 22215 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 BwXOgF literal 0 HcmV?d00001 diff --git a/resources/tree_smoothingsurface.png b/resources/tree_smoothingsurface.png new file mode 100644 index 0000000000000000000000000000000000000000..38a2457bc9cc46141c46c59861868799ccc28530 GIT binary patch literal 1233 zcmV;?1TOoDP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyY( z3lbzd{ZD=X000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HM@dakSAh-}000CmNkl#%+#rEtYAYIN(6(TwxDhrT52JiU>gcm(iYnywSr0twwoxn zr8IP*sbax4#<llgXgN5>ampE)xN0A#(8FGohm$5*c& zzIW%&r6>%ugi;u#peq%qQVEXh7B_9(`r)&?c74Lu1KNM?+?MZd+!($)F>%UR>k7{U zPo=Tn`H7DX9EcW=4~~q`9}0!m@u{gJ<#PE*d2a5p zXm%E`79y8}@I3HD0*rG2KsAoRjrrrb_V%Z~Id#fk*0b$Lj~<+wo*ovCqufMdnoBtg z#)_2lq_(y#48upNVTfwEjB2FO$v`9$5K@8?0uTbNHS(Fvi9&z>r;Yj?0A4tB z=%ty-$&T?`x8AQR1;V)~3$cy5?lvkV2&=W$Dg_ViBeRa2$wiwsxn}5a~3y zlr;#Ypp=493PK1{t~+@1!iB?&ljC4)?-Q-9L~;(!IS2q_Ey5_m{K5j}XJ_FTi_k#; zPzs(*LL`$AuG=(0-KJqh2tmSet}k5=JdC1eBBdSU&+bhAyn^&&1e0J>EU#lHWooCN>N7d?(BZRXdlYuq{l^{Ub_fe`; z5XCWcJ#qlxoSTEYcV~J#J1fgzYdH&Fy?AkFq|}XUI_;S{tP}(&RVs+%7}^-1Zk2T1 znXyZkT2`t<*8=;#xA&)w+3X%`?VPRe!+LJD=&Y@+(AvB4)#}i-p7et!P81lWFIsDV zCxp}@Axna>7M#-Qb;AJQtCJ^h=aR`Cl#pQny0JH#mH-%If37y4|J#4r=f{uF19*LZ vfB!|L)Imn+o>-~JDWw}>Ez*g^s%HNHtb^8QP&nO}00000NkvXXu0mjfKN2hC literal 0 HcmV?d00001 diff --git a/src/AdvancedGUI/AdvancedGUI.cxx b/src/AdvancedGUI/AdvancedGUI.cxx index e56434e83..818f4c276 100644 --- a/src/AdvancedGUI/AdvancedGUI.cxx +++ b/src/AdvancedGUI/AdvancedGUI.cxx @@ -31,6 +31,7 @@ #include "AdvancedGUI_PipeTShapeDlg.h" #include "AdvancedGUI_DividedDiskDlg.h" #include "AdvancedGUI_DividedCylinderDlg.h" +#include "AdvancedGUI_SmoothingSurfaceDlg.h" //@@ insert new functions before this line @@ do not remove this line @@ do not remove this line @@// #include @@ -77,6 +78,9 @@ bool AdvancedGUI::OnGUIEvent( int theCommandID, SUIT_Desktop* parent ) case GEOMOp::OpDividedCylinder: aDlg = new AdvancedGUI_DividedCylinderDlg( getGeometryGUI(), parent ); break; + case GEOMOp::OpSmoothingSurface: + aDlg = new AdvancedGUI_SmoothingSurfaceDlg( getGeometryGUI(), parent ); + break; //@@ insert new functions before this line @@ do not remove this line @@ do not remove this line @@// default: app->putInfo( tr( "GEOM_PRP_COMMAND" ).arg( theCommandID ) ); diff --git a/src/AdvancedGUI/AdvancedGUI_SmoothingSurfaceDlg.cxx b/src/AdvancedGUI/AdvancedGUI_SmoothingSurfaceDlg.cxx new file mode 100644 index 000000000..2f8a5febd --- /dev/null +++ b/src/AdvancedGUI/AdvancedGUI_SmoothingSurfaceDlg.cxx @@ -0,0 +1,264 @@ +// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +// +// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +// +// 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 "AdvancedGUI_SmoothingSurfaceDlg.h" + +#include +#include +#include + +#include +#include +#include +#include + +// OCCT Includes +#include +#include +#include +#include +#include + +#include + +//================================================================================= +// Constructor +//================================================================================= +AdvancedGUI_SmoothingSurfaceDlg::AdvancedGUI_SmoothingSurfaceDlg (GeometryGUI* theGeometryGUI, QWidget* parent) + : GEOMBase_Skeleton(theGeometryGUI, parent, false) +{ + QPixmap imageOp (SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM", tr("ICON_DLG_SMOOTHINGSURFACE_LPOINTS"))); + QPixmap imageSel (SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM", tr("ICON_SELECT"))); + QPixmap image1( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_SELECT" ) ) ); + + setWindowTitle(tr("GEOM_SMOOTHINGSURFACE_TITLE")); + + /***************************************************************/ + mainFrame()->GroupConstructors->setTitle(tr("GEOM_SMOOTHINGSURFACE")); + mainFrame()->RadioButton1->setIcon(imageOp); + mainFrame()->RadioButton2->setAttribute(Qt::WA_DeleteOnClose); + mainFrame()->RadioButton2->close(); + mainFrame()->RadioButton3->setAttribute(Qt::WA_DeleteOnClose); + mainFrame()->RadioButton3->close(); + + GroupPoints = new DlgRef_1Sel( centralWidget() ); + + GroupPoints->GroupBox1->setTitle( tr( "GEOM_SMOOTHINGSURFACE_ARG" ) ); + GroupPoints->TextLabel1->setText( tr( "GEOM_SMOOTHINGSURFACE_ARG_POINTS" ) ); + GroupPoints->PushButton1->setIcon( image1 ); + GroupPoints->LineEdit1->setReadOnly( true ); + + QVBoxLayout* layout = new QVBoxLayout(centralWidget()); + layout->setMargin(0); layout->setSpacing(6); + layout->addWidget(GroupPoints); + /***************************************************************/ + + setHelpFileName("create_smoothingsurface_page.html"); + + Init(); +} + +//================================================================================= +// Destructor +//================================================================================= +AdvancedGUI_SmoothingSurfaceDlg::~AdvancedGUI_SmoothingSurfaceDlg() +{ + // no need to delete child widgets, Qt does it all for us +} + +//================================================================================= +// function : Init() +// purpose : +//================================================================================= +void AdvancedGUI_SmoothingSurfaceDlg::Init() +{ + // Get setting of step value from file configuration + SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr(); + double step = resMgr->doubleValue("Geometry", "SettingsGeomStep", 100); + + //@@ initialize dialog box widgets here @@// + + // Signal/slot connections + connect(buttonOk(), SIGNAL(clicked()), this, SLOT(ClickOnOk())); + connect(buttonApply(), SIGNAL(clicked()), this, SLOT(ClickOnApply())); + connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), + this, SLOT(SetDoubleSpinBoxStep(double))); + connect( myGeomGUI->getApp()->selectionMgr(), + SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) ); + + initName(tr("GEOM_SMOOTHINGSURFACE")); + //displayPreview(); +} + +//================================================================================= +// function : ClickOnOk() +// purpose : +//================================================================================= +void AdvancedGUI_SmoothingSurfaceDlg::ClickOnOk() +{ + if (ClickOnApply()) + ClickOnCancel(); +} + +//================================================================================= +// function : ClickOnApply() +// purpose : +//================================================================================= +bool AdvancedGUI_SmoothingSurfaceDlg::ClickOnApply() +{ + if (!onAccept()) + return false; + + initName(); + + return true; +} + +//================================================================================= +// function : ActivateThisDialog() +// purpose : +//================================================================================= +void AdvancedGUI_SmoothingSurfaceDlg::ActivateThisDialog() +{ + GEOMBase_Skeleton::ActivateThisDialog(); + //displayPreview(); +} + +//================================================================================= +// function : enterEvent [REDEFINED] +// purpose : +//================================================================================= +void AdvancedGUI_SmoothingSurfaceDlg::enterEvent (QEvent*) +{ + if (!mainFrame()->GroupConstructors->isEnabled()) + ActivateThisDialog(); +} + +//================================================================================= +// function : createOperation +// purpose : +//================================================================================= +GEOM::GEOM_IOperations_ptr AdvancedGUI_SmoothingSurfaceDlg::createOperation() +{ + return getGeomEngine()->GetIAdvancedOperations(getStudyId()); +} + +//================================================================================= +// function : isValid +// purpose : +//================================================================================= +bool AdvancedGUI_SmoothingSurfaceDlg::isValid (QString& msg) +{ + bool ok = true; + + //@@ add custom validation actions here @@// + + return ok; +} + +//================================================================================= +// function : execute +// purpose : +//================================================================================= +bool AdvancedGUI_SmoothingSurfaceDlg::execute (ObjectList& objects) +{ + bool res = false; + + GEOM::GEOM_Object_var anObj; + + GEOM::GEOM_IAdvancedOperations_var anOper = GEOM::GEOM_IAdvancedOperations::_narrow(getOperation()); + + //@@ retrieve input values from the widgets here @@// + GEOM::ListOfGO_var points = new GEOM::ListOfGO(); + points->length( myPoints.count() ); + for ( int i = 0; i < myPoints.count(); i++ ) + points[i] = myPoints[i].copy(); + + + // call engine function + anObj = anOper->MakeSmoothingSurface(points); + res = !anObj->_is_nil(); + if (res && !IsPreview()) + { + QStringList aParameters; + //@@ put stringified input parameters to the string list here to store in the data model for notebook @@// + if ( aParameters.count() > 0 ) anObj->SetParameters(aParameters.join(":").toLatin1().constData()); + } + + if (res) + objects.push_back(anObj._retn()); + + return res; +} + +//================================================================================= +// function : SelectionIntoArgument() +// purpose : Called when selection as changed or other case +//================================================================================= +void AdvancedGUI_SmoothingSurfaceDlg::SelectionIntoArgument() +{ + QList points = getSelected( TopAbs_VERTEX, -1 ); + synchronize( myPoints, points ); + if ( !myPoints.isEmpty() ) + GroupPoints->LineEdit1->setText( QString::number( myPoints.count() ) + "_" + tr( "GEOM_POINT" ) + tr( "_S_" ) ); + else + GroupPoints->LineEdit1->setText( "" ); + processPreview(); +} + +//================================================================================= +// function : SetEditCurrentArgument() +// purpose : +//================================================================================= +void AdvancedGUI_SmoothingSurfaceDlg::SetEditCurrentArgument() +{ + if ( sender() == GroupPoints->PushButton1 ) + myEditCurrentArgument = GroupPoints->LineEdit1; + myEditCurrentArgument->setFocus(); + SelectionIntoArgument(); +} + +void AdvancedGUI_SmoothingSurfaceDlg::synchronize( QList& left, QList& right ) +{ + // 1. remove items from the "left" list that are not in the "right" list + QMutableListIterator it1( left ); + while ( it1.hasNext() ) { + GEOM::GeomObjPtr o1 = it1.next(); + bool found = false; + QMutableListIterator it2( right ); + while ( it2.hasNext() && !found ) + found = o1 == it2.next(); + if ( !found ) + it1.remove(); + } + // 2. add items from the "right" list that are not in the "left" list (to keep selection order) + it1 = right; + while ( it1.hasNext() ) { + GEOM::GeomObjPtr o1 = it1.next(); + bool found = false; + QMutableListIterator it2( left ); + while ( it2.hasNext() && !found ) + found = o1 == it2.next(); + if ( !found ) + left << o1; + } +} + diff --git a/src/AdvancedGUI/AdvancedGUI_SmoothingSurfaceDlg.h b/src/AdvancedGUI/AdvancedGUI_SmoothingSurfaceDlg.h new file mode 100644 index 000000000..fde7d7a62 --- /dev/null +++ b/src/AdvancedGUI/AdvancedGUI_SmoothingSurfaceDlg.h @@ -0,0 +1,73 @@ +// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +// +// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +// +// 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 ADVANCEDGUI_SMOOTHINGSURFACEDLG_H +#define ADVANCEDGUI_SMOOTHINGSURFACEDLG_H + +#include +#include "GEOM_GenericObjPtr.h" + +#include + +class DlgRef_1Sel; + +//================================================================================= +// class : AdvancedGUI_SmoothingSurfaceDlg +// purpose : +//================================================================================= +class AdvancedGUI_SmoothingSurfaceDlg : public GEOMBase_Skeleton +{ + Q_OBJECT + +public: + AdvancedGUI_SmoothingSurfaceDlg( GeometryGUI*, QWidget* = 0 ); + ~AdvancedGUI_SmoothingSurfaceDlg(); + +protected: + // redefined from GEOMBase_Helper + virtual GEOM::GEOM_IOperations_ptr createOperation(); + virtual bool isValid( QString& ); + virtual bool execute( ObjectList& ); + +private: + void Init(); + void enterEvent( QEvent* ); + void synchronize( QList& left, QList& right ); + +private: + DlgRef_1Sel* GroupPoints; + QList myPoints; + +private slots: + void ClickOnOk(); + bool ClickOnApply(); + + void ActivateThisDialog(); + void DeactivateActiveDialog(); + + void CheckButtonToggled(); + void SelectionIntoArgument(); + void SetEditCurrentArgument(); + //void ValueChangedInSpinBox(); + //void SetDoubleSpinBoxStep( double ); +}; + +#endif // ADVANCEDGUI_SMOOTHINGSURFACEDLG_H diff --git a/src/AdvancedGUI/Makefile.am b/src/AdvancedGUI/Makefile.am index d12fece0c..ae8aca2ea 100644 --- a/src/AdvancedGUI/Makefile.am +++ b/src/AdvancedGUI/Makefile.am @@ -30,6 +30,7 @@ ADVANCED_INCLUDES = ADVANCED_INCLUDES += AdvancedGUI_PipeTShapeDlg.h ADVANCED_INCLUDES += AdvancedGUI_DividedDiskDlg.h ADVANCED_INCLUDES += AdvancedGUI_DividedCylinderDlg.h +ADVANCED_INCLUDES += AdvancedGUI_SmoothingSurfaceDlg.h ##@@ insert new functions before this line @@ do not remove this line @@ do not remove this line @@ do not remove this line @@## salomeinclude_HEADERS += $(ADVANCED_INCLUDES) @@ -45,6 +46,7 @@ ADVANCED_SOURCES = ADVANCED_SOURCES += AdvancedGUI_PipeTShapeDlg.h AdvancedGUI_PipeTShapeDlg.cxx ADVANCED_SOURCES += AdvancedGUI_DividedDiskDlg.h AdvancedGUI_DividedDiskDlg.cxx ADVANCED_SOURCES += AdvancedGUI_DividedCylinderDlg.h AdvancedGUI_DividedCylinderDlg.cxx +ADVANCED_SOURCES += AdvancedGUI_SmoothingSurfaceDlg.h AdvancedGUI_SmoothingSurfaceDlg.cxx ##@@ insert new functions before this line @@ do not remove this line @@ do not remove this line @@ do not remove this line @@## dist_libAdvancedGUI_la_SOURCES += $(ADVANCED_SOURCES) @@ -55,6 +57,7 @@ ADVANCED_MOC_FILES = ADVANCED_MOC_FILES += AdvancedGUI_PipeTShapeDlg_moc.cxx ADVANCED_MOC_FILES += AdvancedGUI_DividedDiskDlg_moc.cxx ADVANCED_MOC_FILES += AdvancedGUI_DividedCylinderDlg_moc.cxx +ADVANCED_MOC_FILES += AdvancedGUI_SmoothingSurfaceDlg_moc.cxx ##@@ insert new functions before this line @@ do not remove this line @@ do not remove this line @@ do not remove this line @@## MOC_FILES += $(ADVANCED_MOC_FILES) @@ -86,4 +89,7 @@ libAdvancedGUI_la_CPPFLAGS = \ libAdvancedGUI_la_LDFLAGS = \ ../GEOMFiltersSelection/libGEOMFiltersSelection.la \ - ../GEOMBase/libGEOMBase.la + ../GEOMBase/libGEOMBase.la \ + ../GEOMGUI/libGEOM.la \ + $(CAS_LDFLAGS) -lTKGeomBase \ + $(GUI_LDFLAGS) -lsuit diff --git a/src/GEOMGUI/GEOM_images.ts b/src/GEOMGUI/GEOM_images.ts index 20236ddfc..973909fdd 100644 --- a/src/GEOMGUI/GEOM_images.ts +++ b/src/GEOMGUI/GEOM_images.ts @@ -1352,6 +1352,18 @@ ICON_OBJBROWSER_ADVANCED_203 dividedcylinder.png + + ICON_DLG_SMOOTHINGSURFACE_LPOINTS + smoothingsurface_lpoints.png + + + ICO_SMOOTHINGSURFACE + smoothingsurface.png + + + ICON_OBJBROWSER_ADVANCED_204 + tree_smoothingsurface.png + diff --git a/src/GEOMGUI/GeometryGUI.cxx b/src/GEOMGUI/GeometryGUI.cxx index 4e4517aa7..8b8d3a872 100644 --- a/src/GEOMGUI/GeometryGUI.cxx +++ b/src/GEOMGUI/GeometryGUI.cxx @@ -583,6 +583,7 @@ void GeometryGUI::OnGUIEvent( int id, const QVariant& theParam ) // case GEOMOp::OpPipeTShapeGroups: // MENU NEW ENTITY - ADVANCED - PIPE TSHAPE GROUPS case GEOMOp::OpDividedDisk: // MENU NEW ENTITY - ADVANCED - DIVIDEDDISK case GEOMOp::OpDividedCylinder: // MENU NEW ENTITY - ADVANCED - DIVIDEDCYLINDER + case GEOMOp::OpSmoothingSurface: // MENU NEW ENTITY - ADVANCED - SMOOTHINGSURFACE //@@ insert new functions before this line @@ do not remove this line @@ do not remove this line @@ do not remove this line @@ do not remove this line @@// libName = "AdvancedGUI"; break; @@ -908,6 +909,7 @@ void GeometryGUI::initialize( CAM_Application* app ) // createGeomAction( GEOMOp::OpPipeTShapeGroups, "PIPETSHAPEGROUPS" ); createGeomAction( GEOMOp::OpDividedDisk, "DIVIDEDDISK" ); createGeomAction( GEOMOp::OpDividedCylinder, "DIVIDEDCYLINDER" ); + createGeomAction( GEOMOp::OpSmoothingSurface, "SMOOTHINGSURFACE" ); //@@ insert new functions before this line @@ do not remove this line @@ do not remove this line @@ do not remove this line @@ do not remove this line @@// // ---- create menus -------------------------- @@ -957,9 +959,9 @@ void GeometryGUI::initialize( CAM_Application* app ) createMenu( GEOMOp::OpPipePath, genId, -1 ); #endif -// int advId = createMenu( tr( "MEN_ADVANCED" ), newEntId, -1 ); - - //@@ insert new functions before this line @@ do not remove this line @@ do not remove this line @@ do not remove this line @@ do not remove this line @@// + int advId = createMenu( tr( "MEN_ADVANCED" ), newEntId, -1 ); + createMenu( GEOMOp::OpSmoothingSurface, advId, -1 ); + //@@ insert new functions before this line @@ do not remove this line @@ do not remove this line @@ do not remove this line @@ do not remove this line @@// createMenu( separator(), newEntId, -1 ); @@ -1234,8 +1236,8 @@ void GeometryGUI::initialize( CAM_Application* app ) createTool( GEOMOp::OpFeatureDetect, picturesTbId ); #endif -// int advancedTbId = createTool( tr( "TOOL_ADVANCED" ) ); - + int advancedTbId = createTool( tr( "TOOL_ADVANCED" ) ); + createTool( GEOMOp::OpSmoothingSurface, advancedTbId ); //@@ insert new functions before this line @@ do not remove this line @@ do not remove this line @@ do not remove this line @@ do not remove this line @@// // ---- create popup menus -------------------------- diff --git a/src/GEOMGUI/GeometryGUI_Operations.h b/src/GEOMGUI/GeometryGUI_Operations.h index e6af05e8b..bdfed0980 100644 --- a/src/GEOMGUI/GeometryGUI_Operations.h +++ b/src/GEOMGUI/GeometryGUI_Operations.h @@ -196,6 +196,7 @@ namespace GEOMOp { //OpPipeTShapeGroups = 10002, // MENU NEW ENTITY - ADVANCED - PIPE TSHAPE GROUPS OpDividedDisk = 10003, // MENU NEW ENTITY - ADVANCED - DIVIDEDDISK OpDividedCylinder = 10004, // MENU NEW ENTITY - ADVANCED - DIVIDEDCYLINDER + OpSmoothingSurface = 10005, // MENU NEW ENTITY - ADVANCED - SMOOTHINGSURFACE //@@ insert new functions before this line @@ do not remove this line @@// }; } diff --git a/src/GEOMImpl/GEOMImpl_Gen.cxx b/src/GEOMImpl/GEOMImpl_Gen.cxx index 131e8d451..9de130a4a 100644 --- a/src/GEOMImpl/GEOMImpl_Gen.cxx +++ b/src/GEOMImpl/GEOMImpl_Gen.cxx @@ -86,6 +86,7 @@ #include #include // #include +#include /*@@ insert new functions before this line @@ do not remove this line @@ do not remove this line @@*/ //============================================================================= @@ -172,6 +173,7 @@ GEOMImpl_Gen::GEOMImpl_Gen() TFunction_DriverTable::Get()->AddDriver(GEOMImpl_PipeTShapeDriver::GetID(), new GEOMImpl_PipeTShapeDriver()); TFunction_DriverTable::Get()->AddDriver(GEOMImpl_DividedDiskDriver::GetID(), new GEOMImpl_DividedDiskDriver()); // TFunction_DriverTable::Get()->AddDriver(GEOMImpl_DividedCylinderDriver::GetID(), new GEOMImpl_DividedCylinderDriver()); + TFunction_DriverTable::Get()->AddDriver(GEOMImpl_SmoothingSurfaceDriver::GetID(), new GEOMImpl_SmoothingSurfaceDriver()); /*@@ insert new functions before this line @@ do not remove this line @@ do not remove this line @@*/ SetEngine(this); diff --git a/src/GEOMImpl/GEOMImpl_IAdvancedOperations.cxx b/src/GEOMImpl/GEOMImpl_IAdvancedOperations.cxx index 142c6d40f..42d457fc4 100644 --- a/src/GEOMImpl/GEOMImpl_IAdvancedOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_IAdvancedOperations.cxx @@ -53,6 +53,8 @@ #include "GEOMImpl_IDividedDisk.hxx" // #include "GEOMImpl_DividedCylinderDriver.hxx" // #include "GEOMImpl_IDividedCylinder.hxx" +#include +#include /*@@ insert new functions before this line @@ do not remove this line @@ do not remove this line @@*/ #include @@ -3400,4 +3402,71 @@ Handle(GEOM_Object) GEOMImpl_IAdvancedOperations::MakeDividedCylinder (double th return aShape; } +//============================================================================= +/*! + * Create a smoothing surface from a set of points + * \param thelPoints list of points + * \return New GEOM_Object, containing the created shape. + */ +//============================================================================= +Handle(GEOM_Object) GEOMImpl_IAdvancedOperations::MakeSmoothingSurface (std::list thelPoints) +{ + SetErrorCode(KO); + + //Add a new object + Handle(GEOM_Object) aShape = GetEngine()->AddObject(GetDocID(), GEOM_SMOOTHINGSURFACE); + + //Add a new shape function with parameters + Handle(GEOM_Function) aFunction = aShape->AddFunction(GEOMImpl_SmoothingSurfaceDriver::GetID(), SMOOTHINGSURFACE_LPOINTS); + if (aFunction.IsNull()) return NULL; + + //Check if the function is set correctly + if (aFunction->GetDriverGUID() != GEOMImpl_SmoothingSurfaceDriver::GetID()) return NULL; + + GEOMImpl_ISmoothingSurface aData (aFunction); + + int aLen = thelPoints.size(); + aData.SetLength(aLen); + int ind = 1; + std::list::iterator it = thelPoints.begin(); + for (; it != thelPoints.end(); it++, ind++) { + Handle(GEOM_Function) aRefPnt = (*it)->GetLastFunction(); + if (aRefPnt.IsNull()) { + SetErrorCode("NULL point for bSplineFaceShape"); + return NULL; + } + aData.SetPoint(ind, aRefPnt); + } + + + //Compute the resulting value + try { +#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100 + OCC_CATCH_SIGNALS; +#endif + if (!GetSolver()->ComputeFunction(aFunction)) { + SetErrorCode("SmoothingSurface 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 pd (aFunction); + pd << aShape << " = geompy.MakeSmoothingSurface(["; + it = thelPoints.begin(); + pd << (*it++); + while (it != thelPoints.end()) { + pd << ", " << (*it++); + } + pd << "])"; + + SetErrorCode(OK); + + return aShape; +} /*@@ insert new functions before this line @@ do not remove this line @@ do not remove this line @@*/ diff --git a/src/GEOMImpl/GEOMImpl_IAdvancedOperations.hxx b/src/GEOMImpl/GEOMImpl_IAdvancedOperations.hxx index 88cfaa223..2ee7edb2f 100644 --- a/src/GEOMImpl/GEOMImpl_IAdvancedOperations.hxx +++ b/src/GEOMImpl/GEOMImpl_IAdvancedOperations.hxx @@ -27,6 +27,7 @@ #include "GEOM_Engine.hxx" #include "GEOM_Object.hxx" +#include #include class GEOMImpl_IBasicOperations; @@ -235,6 +236,7 @@ public: double theH, int thePattern); + Standard_EXPORT Handle(GEOM_Object) MakeSmoothingSurface (std::list thelPoints); /*@@ insert new functions before this line @@ do not remove this line @@*/ }; #endif diff --git a/src/GEOMImpl/GEOMImpl_ISmoothingSurface.hxx b/src/GEOMImpl/GEOMImpl_ISmoothingSurface.hxx new file mode 100644 index 000000000..2ca3ac1de --- /dev/null +++ b/src/GEOMImpl/GEOMImpl_ISmoothingSurface.hxx @@ -0,0 +1,45 @@ +// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +// +// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +// +// 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 _GEOMImpl_ISmoothingSurface_HXX_ +#define _GEOMImpl_ISmoothingSurface_HXX_ + +#include "GEOM_Function.hxx" + +#define SMOOTHINGSURFACE_ARG_LENG 1 +#define SMOOTHINGSURFACE_ARG_LAST 2 + +class GEOMImpl_ISmoothingSurface +{ +public: + GEOMImpl_ISmoothingSurface(Handle(GEOM_Function) theFunction): _func(theFunction) {} + + void SetLength(int theLen) { _func->SetInteger(SMOOTHINGSURFACE_ARG_LENG, theLen); } + int GetLength() { return _func->GetInteger(SMOOTHINGSURFACE_ARG_LENG); } + + void SetPoint(int theId, Handle(GEOM_Function) theP) { _func->SetReference(SMOOTHINGSURFACE_ARG_LAST + theId, theP); } + Handle(GEOM_Function) GetPoint(int theId) { return _func->GetReference(SMOOTHINGSURFACE_ARG_LAST + theId); } + +private: + Handle(GEOM_Function) _func; +}; + +#endif // _GEOMImpl_ISmoothingSurface_HXX_ diff --git a/src/GEOMImpl/GEOMImpl_SmoothingSurfaceDriver.cxx b/src/GEOMImpl/GEOMImpl_SmoothingSurfaceDriver.cxx new file mode 100644 index 000000000..02c4f5695 --- /dev/null +++ b/src/GEOMImpl/GEOMImpl_SmoothingSurfaceDriver.cxx @@ -0,0 +1,233 @@ +// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +// +// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +// +// 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 required header files here @@// +#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 + +#include +#include +#include + +#include +#include +#include +#include +#include + +#include +//======================================================================= +//function : GetID +//purpose : +//======================================================================= +const Standard_GUID& GEOMImpl_SmoothingSurfaceDriver::GetID() +{ + static Standard_GUID aGUID("1C3A0F30-729D-4E83-8232-78E74FC5637C"); + return aGUID; +} + +//======================================================================= +//function : GEOMImpl_SmoothingSurfaceDriver +//purpose : +//======================================================================= +GEOMImpl_SmoothingSurfaceDriver::GEOMImpl_SmoothingSurfaceDriver() +{ +} + +//======================================================================= +//function : MakeSmoothingSurfaceUnClosed +//purpose : +//======================================================================= +TopoDS_Shape GEOMImpl_SmoothingSurfaceDriver::MakeSmoothingSurfaceUnClosed(Handle_TColgp_HArray1OfPnt myListOfPoints) const +{ + TopoDS_Face aInitShape; + + // Create an average Plane + //Handle(TColgp_HArray1OfPnt) HAP = new TColgp_HArray1OfPnt(1,myListOfPoints.Length()) + GeomPlate_BuildAveragePlane gpbap(myListOfPoints,myListOfPoints->Length(),Precision::Confusion(),1,1); + Handle(Geom_Plane) plane(gpbap.Plane()); + Standard_Real Umin, Umax, Vmin, Vmax; + gpbap.MinMaxBox(Umin,Umax,Vmin,Vmax); + cout << "Vals : " << Umin << ", " << Umax << ", " << Vmin << ", " << Vmax << endl; + BRepBuilderAPI_MakeFace mf(plane,Umin,Umax,Vmin,Vmax,Precision::Confusion()); + aInitShape = mf.Face(); + //return aInitShape; + + GeomPlate_BuildPlateSurface aBuilder(3,10); + // ** Initialization of surface + Handle(BRepAdaptor_HSurface) HSI = new BRepAdaptor_HSurface(); + HSI->ChangeSurface().Initialize(aInitShape); + aBuilder.LoadInitSurface( BRep_Tool::Surface(HSI->ChangeSurface().Face())); + + Standard_Integer j, j1, j2; + cout << "Init surface" << endl; + j1 = myListOfPoints->Lower(); + j2 = myListOfPoints->Upper(); + for (j=j1; j<=j2 ; j++) + { + gp_Pnt aPnt = myListOfPoints->Value(j); + Handle(GeomPlate_PointConstraint) PCont = new GeomPlate_PointConstraint(aPnt,0); + aBuilder.Add(PCont); + } + cout << "avant Perform surface" << endl; + aBuilder.Perform(); + cout << "Perform surface" << endl; + + // A ce niveau : surface algo + Handle(GeomPlate_Surface) gpPlate = aBuilder.Surface(); + + Standard_Integer nbcarreau=2; + Standard_Integer degmax=8; + Standard_Real seuil; + seuil = Max(0.0001,10*aBuilder.G0Error()); + GeomPlate_MakeApprox Mapp(gpPlate,0.0001,nbcarreau,degmax,seuil); + cout << "Approx surface" << endl; + + Handle (Geom_Surface) Surf (Mapp.Surface()); + + aBuilder.Surface()->Bounds( Umin, Umax, Vmin, Vmax); + + BRepBuilderAPI_MakeFace MF(Surf,Umin, Umax, Vmin, Vmax, Precision::Confusion()); + TopoDS_Shape aShape = MF.Shape(); + + return aShape; +} + + +//======================================================================= +//function : Execute +//purpose : +//======================================================================= +Standard_Integer GEOMImpl_SmoothingSurfaceDriver::Execute(TFunction_Logbook& log) const +{ + if (Label().IsNull()) return 0; + Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); + if (aFunction.IsNull()) return 0; + + Standard_Integer aType = aFunction->GetType(); + + if (aType != SMOOTHINGSURFACE_LPOINTS) return 0; + cout << "Youhou : " << aType << endl; + + GEOMImpl_ISmoothingSurface aData (aFunction); + + Standard_Integer nbPoints = aData.GetLength(); + + Handle(TColgp_HArray1OfPnt) anArrayofPnt = new TColgp_HArray1OfPnt(1,nbPoints); + for (int ind=1;ind<=nbPoints;ind++) + { + Handle(GEOM_Function) aPoint = aData.GetPoint(ind); + TopoDS_Shape aShapePnt = aPoint->GetValue(); + TopoDS_Vertex dsPoint; + dsPoint = TopoDS::Vertex( aShapePnt ); + gp_Pnt aPnt = BRep_Tool::Pnt( dsPoint ); + anArrayofPnt->SetValue(ind,aPnt); + } + + TopoDS_Shape aShape; + aShape = GEOMImpl_SmoothingSurfaceDriver::MakeSmoothingSurfaceUnClosed(anArrayofPnt); + + if (aShape.IsNull()) return 0; + + aFunction->SetValue(aShape); + + log.SetTouched(Label()); + + return 1; +} + +//======================================================================= +//function : GEOMImpl_SmoothingSurfaceDriver_Type_ +//purpose : +//======================================================================= +Standard_EXPORT Handle_Standard_Type& GEOMImpl_SmoothingSurfaceDriver_Type_() +{ + static Handle_Standard_Type aType1 = STANDARD_TYPE(TFunction_Driver); + if ( aType1.IsNull()) aType1 = STANDARD_TYPE(TFunction_Driver); + static Handle_Standard_Type aType2 = STANDARD_TYPE(MMgt_TShared); + if ( aType2.IsNull()) aType2 = STANDARD_TYPE(MMgt_TShared); + static Handle_Standard_Type aType3 = STANDARD_TYPE(Standard_Transient); + if ( aType3.IsNull()) aType3 = STANDARD_TYPE(Standard_Transient); + + static Handle_Standard_Transient _Ancestors[]= {aType1,aType2,aType3,NULL}; + static Handle_Standard_Type _aType = new Standard_Type("GEOMImpl_SmoothingSurfaceDriver", + sizeof(GEOMImpl_SmoothingSurfaceDriver), + 1, + (Standard_Address)_Ancestors, + (Standard_Address)NULL); + return _aType; +} + +//======================================================================= +//function : DownCast +//purpose : +//======================================================================= +const Handle(GEOMImpl_SmoothingSurfaceDriver) Handle(GEOMImpl_SmoothingSurfaceDriver)::DownCast(const Handle(Standard_Transient)& AnObject) +{ + Handle(GEOMImpl_SmoothingSurfaceDriver) _anOtherObject; + + if (!AnObject.IsNull()) { + if (AnObject->IsKind(STANDARD_TYPE(GEOMImpl_SmoothingSurfaceDriver))) { + _anOtherObject = Handle(GEOMImpl_SmoothingSurfaceDriver)((Handle(GEOMImpl_SmoothingSurfaceDriver)&)AnObject); + } + } + + return _anOtherObject; +} diff --git a/src/GEOMImpl/GEOMImpl_SmoothingSurfaceDriver.hxx b/src/GEOMImpl/GEOMImpl_SmoothingSurfaceDriver.hxx new file mode 100644 index 000000000..2d8a4d4aa --- /dev/null +++ b/src/GEOMImpl/GEOMImpl_SmoothingSurfaceDriver.hxx @@ -0,0 +1,133 @@ +// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +// +// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +// +// 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 _GEOMImpl_SmoothingSurfaceDriver_HXX +#define _GEOMImpl_SmoothingSurfaceDriver_HXX + +#ifndef _TFunction_Driver_HeaderFile +#include +#endif +#ifndef _TFunction_Logbook_HeaderFile +#include +#endif +#ifndef _Standard_CString_HeaderFile +#include +#endif +#include +#include + +class Handle_Standard_Type; +class GEOMImpl_SmoothingSurfaceDriver; + +Standard_EXPORT Handle_Standard_Type& STANDARD_TYPE(GEOMImpl_SmoothingSurfaceDriver); + +class Handle(GEOMImpl_SmoothingSurfaceDriver) : public Handle(TFunction_Driver) { +public: + inline void* operator new(size_t,void* anAddress) + { + return anAddress; + } + inline void* operator new(size_t size) + { + return Standard::Allocate(size); + } + inline void operator delete(void *anAddress) + { + if (anAddress) Standard::Free((Standard_Address&)anAddress); + } + + Handle(GEOMImpl_SmoothingSurfaceDriver)():Handle(TFunction_Driver)() {} + Handle(GEOMImpl_SmoothingSurfaceDriver)(const Handle(GEOMImpl_SmoothingSurfaceDriver)& aHandle) : Handle(TFunction_Driver)(aHandle) + {} + + Handle(GEOMImpl_SmoothingSurfaceDriver)(const GEOMImpl_SmoothingSurfaceDriver* anItem) : Handle(TFunction_Driver)((TFunction_Driver *)anItem) + {} + + Handle(GEOMImpl_SmoothingSurfaceDriver)& operator=(const Handle(GEOMImpl_SmoothingSurfaceDriver)& aHandle) + { + Assign(aHandle.Access()); + return *this; + } + + Handle(GEOMImpl_SmoothingSurfaceDriver)& operator=(const GEOMImpl_SmoothingSurfaceDriver* anItem) + { + Assign((Standard_Transient *)anItem); + return *this; + } + + GEOMImpl_SmoothingSurfaceDriver* operator->() + { + return (GEOMImpl_SmoothingSurfaceDriver *)ControlAccess(); + } + + GEOMImpl_SmoothingSurfaceDriver* operator->() const + { + return (GEOMImpl_SmoothingSurfaceDriver *)ControlAccess(); + } + + Standard_EXPORT ~Handle(GEOMImpl_SmoothingSurfaceDriver)() {}; + + Standard_EXPORT static const Handle(GEOMImpl_SmoothingSurfaceDriver) DownCast(const Handle(Standard_Transient)& AnObject); +}; + +class GEOMImpl_SmoothingSurfaceDriver : public TFunction_Driver { +public: + inline void* operator new(size_t,void* anAddress) + { + return anAddress; + } + inline void* operator new(size_t size) + { + return Standard::Allocate(size); + } + inline void operator delete(void *anAddress) + { + if (anAddress) Standard::Free((Standard_Address&)anAddress); + } + + // Methods PUBLIC + // + Standard_EXPORT GEOMImpl_SmoothingSurfaceDriver(); + Standard_EXPORT virtual Standard_Integer Execute(TFunction_Logbook& log) const; + Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {} + Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const + { + return Standard_True; + } + Standard_EXPORT static const Standard_GUID& GetID(); + Standard_EXPORT ~GEOMImpl_SmoothingSurfaceDriver() {}; + + // Type management + // + Standard_EXPORT friend Handle_Standard_Type& GEOMImpl_SmoothingSurfaceDriver_Type_(); + Standard_EXPORT const Handle(Standard_Type)& DynamicType() const + { + return STANDARD_TYPE(GEOMImpl_SmoothingSurfaceDriver); + } + Standard_EXPORT Standard_Boolean IsKind(const Handle(Standard_Type)& AType) const + { + return (STANDARD_TYPE(GEOMImpl_SmoothingSurfaceDriver) == AType || TFunction_Driver::IsKind(AType)); + } +private: + TopoDS_Shape MakeSmoothingSurfaceUnClosed(Handle_TColgp_HArray1OfPnt myListOfPoints) const; +}; + +#endif // _GEOMImpl_SmoothingSurfaceDriver_HXX diff --git a/src/GEOMImpl/GEOMImpl_Types.hxx b/src/GEOMImpl/GEOMImpl_Types.hxx index 886b613a8..2a4a2e91f 100755 --- a/src/GEOMImpl/GEOMImpl_Types.hxx +++ b/src/GEOMImpl/GEOMImpl_Types.hxx @@ -355,6 +355,7 @@ #define GEOM_TSHAPE 201 #define GEOM_DIVIDEDDISK 202 #define GEOM_DIVIDEDCYLINDER 203 +#define GEOM_SMOOTHINGSURFACE 204 /*@@ insert new functions before this line @@ do not remove this line @@ do not remove this line @@*/ // Advanced functions sub-operations codes #define TSHAPE_BASIC 1 @@ -363,4 +364,5 @@ #define DIVIDEDDISK_R_RATIO 1 #define DIVIDEDDISK_R_VECTOR_PNT 2 #define DIVIDEDCYLINDER_R_H 1 +#define SMOOTHINGSURFACE_LPOINTS 1 /*@@ insert new functions before this line @@ do not remove this line @@ do not remove this line @@*/ diff --git a/src/GEOMImpl/GUID.txt b/src/GEOMImpl/GUID.txt index be669b2b6..f150f7127 100755 --- a/src/GEOMImpl/GUID.txt +++ b/src/GEOMImpl/GUID.txt @@ -72,3 +72,4 @@ FF1BBB69-5D14-4df2-980B-3A668264EA16 // Modify the Location FF1BBB70-5D14-4df2-980B-3A668264EA16 // Projection 1C3A0F3F-729D-4E83-8232-78E74FC5637C // Pipe T-Shape +1C3A0F30-729D-4E83-8232-78E74FC5637C // Smoothing Surface diff --git a/src/GEOMImpl/Makefile.am b/src/GEOMImpl/Makefile.am index 9e22ef68d..ff5e1e2d3 100644 --- a/src/GEOMImpl/Makefile.am +++ b/src/GEOMImpl/Makefile.am @@ -149,6 +149,7 @@ ADVANCED_INCLUDES = ADVANCED_INCLUDES += GEOMImpl_IPipeTShape.hxx GEOMImpl_PipeTShapeDriver.hxx ADVANCED_INCLUDES += GEOMImpl_IDividedDisk.hxx GEOMImpl_DividedDiskDriver.hxx ##ADVANCED_INCLUDES += GEOMImpl_IDividedCylinder.hxx GEOMImpl_DividedCylinderDriver.hxx +ADVANCED_INCLUDES += GEOMImpl_ISmoothingSurface.hxx GEOMImpl_SmoothingSurfaceDriver.hxx ##@@ insert new functions before this line @@ do not remove this line @@ do not remove this line @@## salomeinclude_HEADERS += $(ADVANCED_INCLUDES) @@ -222,6 +223,7 @@ ADVANCED_SOURCES = ADVANCED_SOURCES += GEOMImpl_PipeTShapeDriver.cxx ADVANCED_SOURCES += GEOMImpl_DividedDiskDriver.cxx ##ADVANCED_SOURCES += GEOMImpl_DividedCylinderDriver.cxx +ADVANCED_SOURCES += GEOMImpl_SmoothingSurfaceDriver.cxx ##@@ insert new functions before this line @@ do not remove this line @@ do not remove this line @@## dist_libGEOMimpl_la_SOURCES += $(ADVANCED_SOURCES) diff --git a/src/GEOM_I/GEOM_IAdvancedOperations_i.cc b/src/GEOM_I/GEOM_IAdvancedOperations_i.cc index 3c39480c8..1fe516222 100644 --- a/src/GEOM_I/GEOM_IAdvancedOperations_i.cc +++ b/src/GEOM_I/GEOM_IAdvancedOperations_i.cc @@ -751,4 +751,35 @@ GEOM::GEOM_Object_ptr GEOM_IAdvancedOperations_i::MakeDividedCylinder (CORBA::Do return GetObject(anObject); } +//============================================================================= +/*! + * + * \param thelPoints list of points + * \return New GEOM_Object, containing the created shape. + */ +//============================================================================= +GEOM::GEOM_Object_ptr GEOM_IAdvancedOperations_i::MakeSmoothingSurface (const GEOM::ListOfGO& thelPoints) +{ + GEOM::GEOM_Object_var aGEOMObject; + + //Set a not done flag + GetOperations()->SetNotDone(); + + //Get the reference point + int ind = 0; + int aLen = thelPoints.length(); + std::list aPoints; + for (; ind < aLen; ind++) { + Handle(GEOM_Object) aPnt = GetObjectImpl(thelPoints[ind]); + if (aPnt.IsNull()) return aGEOMObject._retn(); + aPoints.push_back(aPnt); + } + //Create the SmoothingSurface + Handle(GEOM_Object) anObject = GetOperations()->MakeSmoothingSurface(aPoints); + if (!GetOperations()->IsDone() || anObject.IsNull()) + return aGEOMObject._retn(); + + return GetObject(anObject); +} + /*@@ insert new functions before this line @@ do not remove this line @@*/ diff --git a/src/GEOM_I/GEOM_IAdvancedOperations_i.hh b/src/GEOM_I/GEOM_IAdvancedOperations_i.hh index 2077bfb23..151049e8c 100644 --- a/src/GEOM_I/GEOM_IAdvancedOperations_i.hh +++ b/src/GEOM_I/GEOM_IAdvancedOperations_i.hh @@ -126,6 +126,7 @@ class GEOM_I_EXPORT GEOM_IAdvancedOperations_i : GEOM::GEOM_Object_ptr MakeDividedCylinder (CORBA::Double theR, CORBA::Double theH, GEOM::pattern thePattern); + GEOM::GEOM_Object_ptr MakeSmoothingSurface (const GEOM::ListOfGO& thelPoints); /*@@ insert new functions before this line @@ do not remove this line @@*/ ::GEOMImpl_IAdvancedOperations* GetOperations() diff --git a/src/GEOM_I_Superv/GEOM_Superv_i.cc b/src/GEOM_I_Superv/GEOM_Superv_i.cc index 38e2011fa..ab8c5798e 100644 --- a/src/GEOM_I_Superv/GEOM_Superv_i.cc +++ b/src/GEOM_I_Superv/GEOM_Superv_i.cc @@ -3433,6 +3433,25 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeDividedCylinder (CORBA::Double theR, return anObj; } +//============================================================================= +// MakeSmoothingSurface +//============================================================================= +GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeSmoothingSurface (GEOM::GEOM_List_ptr thelPoints) +{ + beginService( " GEOM_Superv_i::MakeSmoothingSurface" ); + MESSAGE("GEOM_Superv_i::MakeSmoothingSurface"); + getAdvancedOp(); + if (GEOM_List_i* aListImplP = + dynamic_cast*>(GetServant(thelPoints, myPOA).in())) { + getCurvesOp(); + GEOM::GEOM_Object_ptr anObj = myAdvancedOp->MakeSmoothingSurface(aListImplP->GetList()); + endService( " GEOM_Superv_i::MakeSmoothingSurface" ); + return anObj; + } + endService( " GEOM_Superv_i::MakeSmoothingSurface" ); + return NULL; +} + /*@@ insert new functions before this line @@ do not remove this line @@*/ //===================================================================================== diff --git a/src/GEOM_I_Superv/GEOM_Superv_i.hh b/src/GEOM_I_Superv/GEOM_Superv_i.hh index a0ac0cc30..32ab561ce 100644 --- a/src/GEOM_I_Superv/GEOM_Superv_i.hh +++ b/src/GEOM_I_Superv/GEOM_Superv_i.hh @@ -711,6 +711,7 @@ public: GEOM::GEOM_Object_ptr MakeDividedCylinder (CORBA::Double theR, CORBA::Double theH, GEOM::pattern thePattern); + GEOM::GEOM_Object_ptr MakeSmoothingSurface (GEOM::GEOM_List_ptr thelPoints); /*@@ insert new functions before this line @@ do not remove this line @@*/ private: diff --git a/src/GEOM_SWIG/geomBuilder.py b/src/GEOM_SWIG/geomBuilder.py index eba62b74c..b60b70532 100644 --- a/src/GEOM_SWIG/geomBuilder.py +++ b/src/GEOM_SWIG/geomBuilder.py @@ -12190,6 +12190,18 @@ class geomBuilder(object, GEOM._objref_GEOM_Gen): self._autoPublish(anObj, theName, "dividedCylinder") return anObj + ## + # @param thelPoints list of points + # @return New GEOM_Object, containing the created shape. + # + # @ref tui_creation_smoothingsurface "Example" + def MakeSmoothingSurface(self, thelPoints): + thelPoints, Parameters = ParseParameters(thelPoints) + anObj = self.AdvOp.MakeSmoothingSurface(thelPoints) + RaiseIfFailed("MakeSmoothingSurface", self.AdvOp) + if Parameters: anObj.SetParameters(Parameters) + return anObj + #@@ insert new functions before this line @@ do not remove this line @@# # end of l4_advanced -- 2.39.2