Salome HOME
projects
/
modules
/
hydro.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/master' into BR_LAND_COVER_MAP
[modules/hydro.git]
/
src
/
HYDROData
/
HYDROData_Stream.cxx
diff --git
a/src/HYDROData/HYDROData_Stream.cxx
b/src/HYDROData/HYDROData_Stream.cxx
index 6f77d56dd3db5fac21714cc564b3e83180134a5f..c2def15f030fcaccf22861a997e6d5de74748f99 100644
(file)
--- a/
src/HYDROData/HYDROData_Stream.cxx
+++ b/
src/HYDROData/HYDROData_Stream.cxx
@@
-95,7
+95,7
@@
IMPLEMENT_STANDARD_RTTIEXT(HYDROData_Stream,HYDROData_NaturalObject)
HYDROData_Stream::HYDROData_Stream()
HYDROData_Stream::HYDROData_Stream()
-: HYDROData_NaturalObject()
+: HYDROData_NaturalObject(
Geom_3d
)
{
}
{
}
@@
-145,16
+145,6
@@
HYDROData_SequenceOfObjects HYDROData_Stream::GetAllReferenceObjects() const
return aResSeq;
}
return aResSeq;
}
-TopoDS_Shape HYDROData_Stream::GetTopShape() const
-{
- return getTopShape();
-}
-
-TopoDS_Shape HYDROData_Stream::GetShape3D() const
-{
- return getShape3D();
-}
-
Handle(Geom_BSplineCurve) HYDROData_Stream::buildInterpolationCurve(
const Handle(TColgp_HArray1OfPnt)& theArrayOfPnt )
{
Handle(Geom_BSplineCurve) HYDROData_Stream::buildInterpolationCurve(
const Handle(TColgp_HArray1OfPnt)& theArrayOfPnt )
{
@@
-279,12
+269,12
@@
void HYDROData_Stream::UpdatePrs()
anOutGroup->AddShape( aResultPrs.myOutlet );
}
anOutGroup->AddShape( aResultPrs.myOutlet );
}
-QColor HYDROData_Stream::DefaultFillingColor()
+QColor HYDROData_Stream::DefaultFillingColor()
const
{
return QColor( Qt::green );
}
{
return QColor( Qt::green );
}
-QColor HYDROData_Stream::DefaultBorderColor()
+QColor HYDROData_Stream::DefaultBorderColor()
const
{
return QColor( Qt::transparent );
}
{
return QColor( Qt::transparent );
}
@@
-327,16
+317,6
@@
TopoDS_Shape HYDROData_Stream::GetOutletShape() const
return HYDROData_Tool::getFirstShapeFromGroup( aGroups, 4);
}
return HYDROData_Tool::getFirstShapeFromGroup( aGroups, 4);
}
-QColor HYDROData_Stream::getDefaultFillingColor() const
-{
- return DefaultFillingColor();
-}
-
-QColor HYDROData_Stream::getDefaultBorderColor() const
-{
- return DefaultBorderColor();
-}
-
bool HYDROData_Stream::SetHydraulicAxis( const Handle(HYDROData_PolylineXY)& theAxis )
{
if ( !IsValidAsAxis( theAxis ) )
bool HYDROData_Stream::SetHydraulicAxis( const Handle(HYDROData_PolylineXY)& theAxis )
{
if ( !IsValidAsAxis( theAxis ) )
@@
-352,7
+332,7
@@
bool HYDROData_Stream::SetHydraulicAxis( const Handle(HYDROData_PolylineXY)& the
updateProfilesOrder();
// Indicate model of the need to update the stream presentation
updateProfilesOrder();
// Indicate model of the need to update the stream presentation
-
SetToUpdate( true
);
+
Changed( Geom_3d
);
return true;
}
return true;
}
@@
-375,7
+355,7
@@
void HYDROData_Stream::RemoveHydraulicAxis()
RemoveProfiles();
// Indicate model of the need to update the stream presentation
RemoveProfiles();
// Indicate model of the need to update the stream presentation
-
SetToUpdate( true
);
+
Changed( Geom_3d
);
}
bool HYDROData_Stream::HasIntersection( const Handle(HYDROData_Profile)& theProfile,
}
bool HYDROData_Stream::HasIntersection( const Handle(HYDROData_Profile)& theProfile,
@@
-509,7
+489,7
@@
bool HYDROData_Stream::AddProfile( const Handle(HYDROData_Profile)& theProfile )
insertProfileInToOrder( theProfile, aProfileIndex );
// Indicate model of the need to update the stream presentation
insertProfileInToOrder( theProfile, aProfileIndex );
// Indicate model of the need to update the stream presentation
-
SetToUpdate( true
);
+
Changed( Geom_3d
);
return true;
}
return true;
}
@@
-554,7
+534,7
@@
bool HYDROData_Stream::SetProfiles( const HYDROData_SequenceOfObjects& theProfil
SetReferenceObjects( theProfiles, DataTag_Profile );
if ( anIsToUpdate )
SetReferenceObjects( theProfiles, DataTag_Profile );
if ( anIsToUpdate )
-
SetToUpdate( true
);
+
Changed( Geom_3d
);
}
return true;
}
return true;
@@
-597,22
+577,20
@@
bool HYDROData_Stream::RemoveProfile( const Handle(HYDROData_Profile)& theProfil
removeParameter( aProfileIndex );
// Indicate model of the need to update the stream presentation
removeParameter( aProfileIndex );
// Indicate model of the need to update the stream presentation
-
SetToUpdate( true
);
+
Changed( Geom_3d
);
return true;
}
void HYDROData_Stream::RemoveProfiles()
{
return true;
}
void HYDROData_Stream::RemoveProfiles()
{
- bool anIsToUpdate = IsMustBeUpdated() || NbReferenceObjects( DataTag_Profile ) > 0;
-
ClearReferenceObjects( DataTag_Profile );
// Remove the parameters array
removeParametersArray();
// Indicate model of the need to update the stream presentation
ClearReferenceObjects( DataTag_Profile );
// Remove the parameters array
removeParametersArray();
// Indicate model of the need to update the stream presentation
-
SetToUpdate( anIsToUpdate
);
+
Changed( Geom_3d
);
}
void HYDROData_Stream::insertProfileInToOrder( const Handle(HYDROData_Profile)& theProfile,
}
void HYDROData_Stream::insertProfileInToOrder( const Handle(HYDROData_Profile)& theProfile,
@@
-1007,7
+985,8
@@
bool HYDROData_Stream::Interpolate( HYDROData_IProfilesInterpolator* theInterpol
return isOK;
}
return isOK;
}
-void HYDROData_Stream::CopyTo( const Handle(HYDROData_Entity)& theDestination ) const
+void HYDROData_Stream::CopyTo( const Handle(HYDROData_Entity)& theDestination,
+ bool isGenerateNewName ) const
{
// Get the document
Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( myLab );
{
// Get the document
Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( myLab );
@@
-1016,7
+995,7
@@
void HYDROData_Stream::CopyTo( const Handle(HYDROData_Entity)& theDestination )
}
// Call base method
}
// Call base method
- HYDROData_Entity::CopyTo( theDestination );
+ HYDROData_Entity::CopyTo( theDestination
, isGenerateNewName
);
Handle(HYDROData_Stream) aStreamCopy =
Handle(HYDROData_Stream)::DownCast( theDestination );
Handle(HYDROData_Stream) aStreamCopy =
Handle(HYDROData_Stream)::DownCast( theDestination );