From c9420958bfe7ffa96bcc94e556d49bd379daac6f Mon Sep 17 00:00:00 2001 From: Paul RASCLE Date: Thu, 13 Aug 2015 17:35:11 +0200 Subject: [PATCH] some housekeeping --- src/HYDROData/HYDROData_Channel.h | 2 +- src/HYDROData/HYDROData_Object.cxx | 23 -------------------- src/HYDROData/HYDROData_Object.h | 11 ---------- src/HYDROData/HYDROData_ObstacleAltitude.cxx | 16 +++++++------- src/HYDROData/HYDROData_Polyline3D.cxx | 10 --------- src/HYDROData/HYDROData_StreamAltitude.cxx | 10 ++++----- src/HYDROData/HYDROData_Zone.cxx | 2 +- 7 files changed, 15 insertions(+), 59 deletions(-) diff --git a/src/HYDROData/HYDROData_Channel.h b/src/HYDROData/HYDROData_Channel.h index 8e958764..a53db842 100644 --- a/src/HYDROData/HYDROData_Channel.h +++ b/src/HYDROData/HYDROData_Channel.h @@ -100,7 +100,7 @@ public: */ HYDRODATA_EXPORT virtual TopoDS_Shape GetShape3D() const; - /** + /** * Update the shape presentations of stream. * Call this method whenever you made changes for channel data. */ diff --git a/src/HYDROData/HYDROData_Object.cxx b/src/HYDROData/HYDROData_Object.cxx index fdd7e8fd..6a8ee297 100644 --- a/src/HYDROData/HYDROData_Object.cxx +++ b/src/HYDROData/HYDROData_Object.cxx @@ -121,29 +121,6 @@ void HYDROData_Object::SetShape3D( const TopoDS_Shape& theShape ) checkAndSetObject3D(); } -Standard_Boolean HYDROData_Object::GetMiddleZ( Standard_Real& theMiddleZ ) const -{ - theMiddleZ = -9999; - TDF_Label aLabel = myLab.FindChild( DataTag_MiddleZ, false ); - if ( !aLabel.IsNull() ) - { - Handle(TDataStd_Real) aRealVal; - if ( aLabel.FindAttribute( TDataStd_Real::GetID(), aRealVal ) ) - { - theMiddleZ = aRealVal->Get(); - return Standard_True; - } - } - - return Standard_False; - -} - -void HYDROData_Object::SetMiddleZ( const Standard_Real& theMiddleZ ) -{ - TDataStd_Real::Set( myLab.FindChild( DataTag_MiddleZ ), theMiddleZ ); -} - Handle(HYDROData_DummyObject3D) HYDROData_Object::GetObject3D() const { Handle(HYDROData_DummyObject3D) anObject; diff --git a/src/HYDROData/HYDROData_Object.h b/src/HYDROData/HYDROData_Object.h index cd4cf20a..56e1c4a0 100644 --- a/src/HYDROData/HYDROData_Object.h +++ b/src/HYDROData/HYDROData_Object.h @@ -50,7 +50,6 @@ protected: DataTag_EdgesGroup, ///< child group objects DataTag_ChildAltitudeObject, ///< child altitude object DataTag_IsSubmersible, ///< the attribute "is submersible" - DataTag_MiddleZ, ///< middle Z value of Shape3D }; public: @@ -100,16 +99,6 @@ public: */ HYDRODATA_EXPORT virtual TopoDS_Shape GetShape3D() const = 0; - /** - * Returns the middle z value of 3D object representation or -9999 if no value. - */ - HYDRODATA_EXPORT virtual Standard_Boolean GetMiddleZ( Standard_Real& theMiddleZ ) const; - - /** - * Set the middle z value of 3D object representation. - */ - HYDRODATA_EXPORT virtual void SetMiddleZ( const Standard_Real& theMiddleZ ); - /** * Returns reference object which represent the 3D shape of object. */ diff --git a/src/HYDROData/HYDROData_ObstacleAltitude.cxx b/src/HYDROData/HYDROData_ObstacleAltitude.cxx index 92cd9016..a91e8359 100644 --- a/src/HYDROData/HYDROData_ObstacleAltitude.cxx +++ b/src/HYDROData/HYDROData_ObstacleAltitude.cxx @@ -52,22 +52,22 @@ double HYDROData_ObstacleAltitude::GetAltitudeForPoint( const gp_XY& thePoint ) Handle(HYDROData_Object)::DownCast( GetFatherObject() ); if ( anObject.IsNull() ) { - DEBTRACE("---"); + DEBTRACE("anObject.IsNull()"); return aResAltitude; } +// DEBTRACE("object: " << anObject->GetName().toStdString()); TopoDS_Shape anObjectShape3D = anObject->GetShape3D(); - DEBTRACE("object: " << anObject->GetName().toStdString()); if ( anObjectShape3D.IsNull() ) { - DEBTRACE("---"); + DEBTRACE("anObjectShape3D.IsNull()"); return aResAltitude; } - else - { - DEBTRACE("anObjectShape3D type " << anObjectShape3D.ShapeType()); - BRepTools::Write(anObjectShape3D, "digue3D.brep"); - } +// else +// { +// DEBTRACE("anObjectShape3D type " << anObjectShape3D.ShapeType()); +// BRepTools::Write(anObjectShape3D, "digue3D.brep"); +// } HYDROData_Make3dMesh aMesher3D( anObjectShape3D, Precision::Intersection() ); diff --git a/src/HYDROData/HYDROData_Polyline3D.cxx b/src/HYDROData/HYDROData_Polyline3D.cxx index 44ce9a2a..50822459 100644 --- a/src/HYDROData/HYDROData_Polyline3D.cxx +++ b/src/HYDROData/HYDROData_Polyline3D.cxx @@ -28,9 +28,6 @@ #include -#include -#include - #include #include @@ -213,13 +210,6 @@ void HYDROData_Polyline3D::Update() TopoDS_Wire aResWire = HYDROData_PolylineXY::BuildWire( aSectionType, anIsSectionClosed, aResPoints ); SetTopShape( aResWire ); SetShape3D( aResWire ); - - double Xmin=0, Xmax=0, Ymin=0, Ymax=0, Zmin=-9999, Zmax=-9999; - Bnd_Box B; - BRepBndLib::Add(aResWire, B); - B.Get(Xmin, Ymin, Zmin, Xmax, Ymax, Zmax); - DEBTRACE("Bounding Box xyz min:" << Xmin << " " << Ymin << " " << Zmin << " xyz max:" << Xmax << " " << Ymax << " " << Zmax); - SetMiddleZ((Zmin+Zmax)/2.); } QColor HYDROData_Polyline3D::DefaultFillingColor() diff --git a/src/HYDROData/HYDROData_StreamAltitude.cxx b/src/HYDROData/HYDROData_StreamAltitude.cxx index 30270ee9..893be442 100644 --- a/src/HYDROData/HYDROData_StreamAltitude.cxx +++ b/src/HYDROData/HYDROData_StreamAltitude.cxx @@ -224,21 +224,21 @@ double HYDROData_StreamAltitude::GetAltitudeForPoint( const gp_XY& thePoint ) co Handle(HYDROData_Stream)::DownCast( GetFatherObject() ); if ( aStream.IsNull() ) { - DEBTRACE("---"); + DEBTRACE("aStream.IsNull()"); return aResAltitude; } TopoDS_Shape aStreamShape = aStream->GetTopShape(); if ( aStreamShape.IsNull() ) { - DEBTRACE("---"); + DEBTRACE("aStreamShape.IsNull()"); return aResAltitude; } TopExp_Explorer aStreamFaceExp( aStreamShape, TopAbs_FACE ); if ( !aStreamFaceExp.More() ) { - DEBTRACE("---"); + DEBTRACE("!aStreamFaceExp.More()"); return aResAltitude; } @@ -261,7 +261,7 @@ double HYDROData_StreamAltitude::GetAltitudeForPoint( const gp_XY& thePoint ) co #endif if ( aPointState == TopAbs_OUT ) { - DEBTRACE("---"); + DEBTRACE("aPointState == TopAbs_OUT"); return aResAltitude; } @@ -269,7 +269,7 @@ double HYDROData_StreamAltitude::GetAltitudeForPoint( const gp_XY& thePoint ) co Handle(HYDROData_Profile) aLeftProfile, aRightProfile; if ( !getBoundaryProfilesForPoint( thePoint, aLeftProfile, aRightProfile ) ) { - DEBTRACE("---"); + DEBTRACE("!getBoundaryProfilesForPoint( thePoint, aLeftProfile, aRightProfile )"); return aResAltitude; } diff --git a/src/HYDROData/HYDROData_Zone.cxx b/src/HYDROData/HYDROData_Zone.cxx index 69751927..97e1da6c 100644 --- a/src/HYDROData/HYDROData_Zone.cxx +++ b/src/HYDROData/HYDROData_Zone.cxx @@ -181,7 +181,7 @@ HYDROData_Zone::MergeType HYDROData_Zone::GetMergeType() const void HYDROData_Zone::SetMergeObject( const Handle(HYDROData_Entity)& theObject ) { - DEBTRACE("HYDROData_Zone::SetMergeObject"); + //DEBTRACE("HYDROData_Zone::SetMergeObject"); SetReferenceObject( theObject, DataTag_MergeObject ); } -- 2.39.2