X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_Channel.cxx;h=526589c534ddbc005c9bf3c861e65cd29b350adf;hb=8d4dba4a45855249f5eb022e9cc7dcff202bce3c;hp=841359413c29366c227a79411a3c3c5d674b853e;hpb=0c7423168f664beda3f61e840fce672e674782cc;p=modules%2Fhydro.git diff --git a/src/HYDROData/HYDROData_Channel.cxx b/src/HYDROData/HYDROData_Channel.cxx index 84135941..526589c5 100644 --- a/src/HYDROData/HYDROData_Channel.cxx +++ b/src/HYDROData/HYDROData_Channel.cxx @@ -25,8 +25,8 @@ #include "HYDROData_Projection.h" #include "HYDROData_ShapesGroup.h" #include "HYDROData_ShapesTool.h" -#include "HYDROData_Pipes.h" #include "HYDROData_Stream.h" +#include "HYDROData_Tool.h" #include @@ -54,6 +54,7 @@ #include #include +#include #include #include @@ -70,12 +71,11 @@ #define _DEVDEBUG_ #include "HYDRO_trace.hxx" -IMPLEMENT_STANDARD_HANDLE(HYDROData_Channel,HYDROData_ArtificialObject) IMPLEMENT_STANDARD_RTTIEXT(HYDROData_Channel,HYDROData_ArtificialObject) HYDROData_Channel::HYDROData_Channel() -: HYDROData_ArtificialObject() +: HYDROData_ArtificialObject( Geom_3d ) { } @@ -83,19 +83,22 @@ HYDROData_Channel::~HYDROData_Channel() { } -QStringList HYDROData_Channel::DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const +QStringList HYDROData_Channel::DumpToPython( const QString& thePyScriptPath, + MapOfTreatedObjects& theTreatedObjects ) const { QStringList aResList = dumpObjectCreation( theTreatedObjects ); QString aName = GetObjPyName(); Handle(HYDROData_Polyline3D) aRefGideLine = GetGuideLine(); - setPythonReferenceObject( theTreatedObjects, aResList, aRefGideLine, "SetGuideLine" ); + setPythonReferenceObject( thePyScriptPath, theTreatedObjects, aResList, aRefGideLine, "SetGuideLine" ); Handle(HYDROData_Profile) aRefProfile = GetProfile(); - setPythonReferenceObject( theTreatedObjects, aResList, aRefProfile, "SetProfile" ); + setPythonReferenceObject( thePyScriptPath, theTreatedObjects, aResList, aRefProfile, "SetProfile" ); + + aResList << QString( "%1.SetEquiDistance( %2 )" ).arg( aName ).arg( GetEquiDistance() ); aResList << QString( "" ); - aResList << QString( "%1.Update();" ).arg( aName ); + aResList << QString( "%1.Update()" ).arg( aName ); aResList << QString( "" ); return aResList; @@ -116,19 +119,10 @@ HYDROData_SequenceOfObjects HYDROData_Channel::GetAllReferenceObjects() const return aResSeq; } -TopoDS_Shape HYDROData_Channel::GetTopShape() const -{ - return getTopShape(); -} - -TopoDS_Shape HYDROData_Channel::GetShape3D() const -{ - return getShape3D(); -} - bool HYDROData_Channel::CreatePresentations( const Handle(HYDROData_Polyline3D)& theGuideLine, const Handle(HYDROData_Profile)& theProfile, - PrsDefinition& thePrs ) + PrsDefinition& thePrs, + double theEquiDistance ) { // Check input parameters if ( theGuideLine.IsNull() || theProfile.IsNull() ) { @@ -164,18 +158,18 @@ bool HYDROData_Channel::CreatePresentations( const Handle(HYDROData_Polyline3D)& int aNbPoints = aPolylinePoints.Length(); */ - HYDROData_Polyline3D::Polyline3DPoints aPolylinePoints3D = theGuideLine->GetPoints(); + HYDROData_Polyline3D::Polyline3DPoints aPolylinePoints3D = theGuideLine->GetPoints( theEquiDistance ); int aNbPoints = aPolylinePoints3D.Length(); - if ( aNbPoints < 2 ) { + if ( aNbPoints < 2 ) return false; - } // Get tangent in each point of the guide line ( 2D ) TColgp_Array1OfDir aTangents( 1, aNbPoints ); HYDROData_IPolyline::SectionType aSectionType = aPolylineXY->GetSectionType( 0 ); - if ( aSectionType == HYDROData_IPolyline::SECTION_POLYLINE ) { + if( aSectionType == HYDROData_IPolyline::SECTION_POLYLINE ) + { for ( int i = 1; i <= aNbPoints; ++i ) { gp_XYZ aPnt = aPolylinePoints3D.Value( i ); aPnt.SetZ( 0. ); @@ -286,22 +280,26 @@ bool HYDROData_Channel::CreatePresentations( const Handle(HYDROData_Polyline3D)& // Create presentation HYDROData_Stream::PrsDefinition aPrs; Handle(TopTools_HArray1OfShape) anArrOf2DProfiles; // we don't need 2D profiles for channel/digue presentation - bool aRes = HYDROData_Stream::CreatePresentations( anArrayOfFPnt, anArrayOfLPnt, - anArrOfProfiles, anArrOf2DProfiles, aPrs ); - if ( aRes ) { - thePrs.myPrs3D = aPrs.myPrs3D; - thePrs.myPrs2D = TopoDS::Face( aPrs.myPrs2D ); - BRepBuilderAPI_MakeWire aMakeWire( aPrs.myLeftBank ) ; - thePrs.myLeftBank = aMakeWire.Wire(); - aMakeWire = BRepBuilderAPI_MakeWire( aPrs.myRightBank ); - thePrs.myRightBank = aMakeWire.Wire(); - aMakeWire = BRepBuilderAPI_MakeWire( aPrs.myInlet ); - thePrs.myInlet = aMakeWire.Wire(); - aMakeWire = BRepBuilderAPI_MakeWire( aPrs.myOutlet ); - thePrs.myOutlet = aMakeWire.Wire(); - } - return aRes; + HYDROData_Stream::CreatePresentations( anArrayOfFPnt, anArrayOfLPnt, anArrOfProfiles, aPrs ); + thePrs.myInlet = aPrs.myInlet; + thePrs.myOutlet = aPrs.myOutlet; + thePrs.myLeftBank = aPrs.myLeftBank; + thePrs.myRightBank = aPrs.myRightBank; + thePrs.myPrs2D = TopoDS::Face(aPrs.myPrs2D); + thePrs.myPrs3D = aPrs.myPrs3D; + + //thePrs.myPrs2D = TopoDS::Face( aPrs.myPrs2D ); + //BRepBuilderAPI_MakeWire aMakeWire( aPrs.myLeftBank ) ; + //thePrs.myLeftBank = aMakeWire.Wire(); + //aMakeWire = BRepBuilderAPI_MakeWire( aPrs.myRightBank ); + //thePrs.myRightBank = aMakeWire.Wire(); + //aMakeWire = BRepBuilderAPI_MakeWire( aPrs.myInlet ); + //thePrs.myInlet = aMakeWire.Wire(); + //aMakeWire = BRepBuilderAPI_MakeWire( aPrs.myOutlet ); + //thePrs.myOutlet = aMakeWire.Wire(); + + return true; } void HYDROData_Channel::Update() @@ -312,7 +310,8 @@ void HYDROData_Channel::Update() Handle(HYDROData_Profile) aProfile = GetProfile(); PrsDefinition aResultPrs; - if ( !CreatePresentations( aGuideLine, aProfile, aResultPrs ) ) + double anEquiDistance = GetEquiDistance(); + if ( !CreatePresentations( aGuideLine, aProfile, aResultPrs, anEquiDistance ) ) return; SetShape3D( aResultPrs.myPrs3D ); @@ -330,9 +329,9 @@ void HYDROData_Channel::Update() TopTools_SequenceOfShape anOutletEdges; HYDROData_ShapesTool::ExploreShapeToShapes( aResultPrs.myOutlet, TopAbs_EDGE, anOutletEdges ); - + + RemoveGroupObjects(); QString aLeftGroupName = GetName() + "_Left_Bank"; - Handle(HYDROData_ShapesGroup) aLeftGroup = createGroupObject(); aLeftGroup->SetName( aLeftGroupName ); aLeftGroup->SetShapes( aLeftBankEdges ); @@ -361,26 +360,16 @@ bool HYDROData_Channel::IsHas2dPrs() const return true; } -QColor HYDROData_Channel::DefaultFillingColor() +QColor HYDROData_Channel::DefaultFillingColor() const { return QColor( Qt::blue ); } -QColor HYDROData_Channel::DefaultBorderColor() +QColor HYDROData_Channel::DefaultBorderColor() const { return QColor( Qt::transparent ); } -QColor HYDROData_Channel::getDefaultFillingColor() const -{ - return DefaultFillingColor(); -} - -QColor HYDROData_Channel::getDefaultBorderColor() const -{ - return DefaultBorderColor(); -} - bool HYDROData_Channel::SetGuideLine( const Handle(HYDROData_Polyline3D)& theGuideLine ) { Handle(HYDROData_Polyline3D) aPrevGuideLine = GetGuideLine(); @@ -401,7 +390,7 @@ bool HYDROData_Channel::SetGuideLine( const Handle(HYDROData_Polyline3D)& theGui SetReferenceObject( theGuideLine, DataTag_GuideLine ); // Indicate model of the need to update the chanel presentation - SetToUpdate( true ); + Changed( Geom_3d ); return true; } @@ -421,7 +410,7 @@ void HYDROData_Channel::RemoveGuideLine() ClearReferenceObjects( DataTag_GuideLine ); // Indicate model of the need to update the chanel presentation - SetToUpdate( true ); + Changed( Geom_3d ); } bool HYDROData_Channel::SetProfile( const Handle(HYDROData_Profile)& theProfile ) @@ -440,7 +429,7 @@ bool HYDROData_Channel::SetProfile( const Handle(HYDROData_Profile)& theProfile SetReferenceObject( theProfile, DataTag_Profile ); // Indicate model of the need to update the chanel presentation - SetToUpdate( true ); + Changed( Geom_3d ); return true; } @@ -460,12 +449,35 @@ void HYDROData_Channel::RemoveProfile() ClearReferenceObjects( DataTag_Profile ); // Indicate model of the need to update the chanel presentation - SetToUpdate( true ); + Changed( Geom_3d ); } ObjectKind HYDROData_Channel::getAltitudeObjectType() const { - DEBTRACE("HYDROData_Channel::getAltitudeObjectType"); + //DEBTRACE("HYDROData_Channel::getAltitudeObjectType"); return KIND_CHANNEL_ALTITUDE; + //return KIND_STREAM_ALTITUDE; } +TopoDS_Shape HYDROData_Channel::GetLeftShape() const +{ + HYDROData_SequenceOfObjects aGroups = GetGroups(); + return HYDROData_Tool::getFirstShapeFromGroup( aGroups, 1); +} + +TopoDS_Shape HYDROData_Channel::GetRightShape() const +{ + HYDROData_SequenceOfObjects aGroups = GetGroups(); + return HYDROData_Tool::getFirstShapeFromGroup( aGroups, 2); +} + +void HYDROData_Channel::SetEquiDistance( double theEquiDistance ) +{ + double anEquiDistance = theEquiDistance > 0 ? theEquiDistance : 1E-3; + SetDouble( DataTag_EquiDistance, theEquiDistance ); +} + +double HYDROData_Channel::GetEquiDistance() const +{ + return GetDouble( DataTag_EquiDistance, 1.0 ); +}