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
copyrights are updated
[modules/hydro.git]
/
src
/
HYDROData
/
HYDROData_Profile.cxx
diff --git
a/src/HYDROData/HYDROData_Profile.cxx
b/src/HYDROData/HYDROData_Profile.cxx
index 2649e2b04a26c032477e1ae1af2d364c4f337b7b..217c49c9981db2e5471b2412470258b21bfb8ca8 100755
(executable)
--- a/
src/HYDROData/HYDROData_Profile.cxx
+++ b/
src/HYDROData/HYDROData_Profile.cxx
@@
-56,7
+56,7
@@
IMPLEMENT_STANDARD_HANDLE(HYDROData_Profile, HYDROData_Object)
IMPLEMENT_STANDARD_RTTIEXT(HYDROData_Profile, HYDROData_Object)
HYDROData_Profile::HYDROData_Profile()
IMPLEMENT_STANDARD_RTTIEXT(HYDROData_Profile, HYDROData_Object)
HYDROData_Profile::HYDROData_Profile()
-: HYDROData_Object()
+: HYDROData_Object(
Geom_3d
)
{
}
{
}
@@
-163,7
+163,7
@@
TopoDS_Shape HYDROData_Profile::GetTopShape() const
TopoDS_Shape HYDROData_Profile::GetShape3D() const
{
TopoDS_Shape HYDROData_Profile::GetShape3D() const
{
- TopoDS_Shape aShape =
g
etShape3D();
+ TopoDS_Shape aShape =
HYDROData_Object::G
etShape3D();
if( aShape.IsNull() )
aShape = CreateProfileWire( true );
return aShape;
if( aShape.IsNull() )
aShape = CreateProfileWire( true );
return aShape;
@@
-191,26
+191,16
@@
void HYDROData_Profile::Update()
SetShape3D( aShape );
}
SetShape3D( aShape );
}
-QColor HYDROData_Profile::DefaultFillingColor()
+QColor HYDROData_Profile::DefaultFillingColor()
const
{
return QColor( Qt::transparent );
}
{
return QColor( Qt::transparent );
}
-QColor HYDROData_Profile::DefaultBorderColor()
+QColor HYDROData_Profile::DefaultBorderColor()
const
{
return QColor( Qt::black );
}
{
return QColor( Qt::black );
}
-QColor HYDROData_Profile::getDefaultFillingColor() const
-{
- return DefaultFillingColor();
-}
-
-QColor HYDROData_Profile::getDefaultBorderColor() const
-{
- return DefaultBorderColor();
-}
-
bool HYDROData_Profile::IsValid() const
{
gp_XY aFirstPoint, aLastPoint;
bool HYDROData_Profile::IsValid() const
{
gp_XY aFirstPoint, aLastPoint;
@@
-239,7
+229,7
@@
void HYDROData_Profile::SetLeftPoint( const gp_XY& theGPoint, bool IsConvertFrom
anArray->SetValue( 0, aLPoint.X() );
anArray->SetValue( 1, aLPoint.Y() );
anArray->SetValue( 0, aLPoint.X() );
anArray->SetValue( 1, aLPoint.Y() );
-
SetToUpdate( true
);
+
Changed( Geom_3d
);
}
bool HYDROData_Profile::GetLeftPoint( gp_XY& thePoint, bool IsConvertToGlobal,
}
bool HYDROData_Profile::GetLeftPoint( gp_XY& thePoint, bool IsConvertToGlobal,
@@
-291,7
+281,7
@@
void HYDROData_Profile::SetRightPoint( const gp_XY& theGPoint, bool IsConvertFro
anArray->SetValue( 0, aLPoint.X() );
anArray->SetValue( 1, aLPoint.Y() );
anArray->SetValue( 0, aLPoint.X() );
anArray->SetValue( 1, aLPoint.Y() );
-
SetToUpdate( true
);
+
Changed( Geom_3d
);
}
bool HYDROData_Profile::GetRightPoint( gp_XY& thePoint, bool IsConvertToGlobal,
}
bool HYDROData_Profile::GetRightPoint( gp_XY& thePoint, bool IsConvertToGlobal,
@@
-336,7
+326,7
@@
void HYDROData_Profile::Invalidate()
if ( !aLastLabel.IsNull() )
aLastLabel.ForgetAllAttributes();
if ( !aLastLabel.IsNull() )
aLastLabel.ForgetAllAttributes();
-
SetToUpdate( true
);
+
Changed( Geom_3d
);
}
Handle(HYDROData_ProfileUZ) HYDROData_Profile::GetProfileUZ( const bool theIsCreate ) const
}
Handle(HYDROData_ProfileUZ) HYDROData_Profile::GetProfileUZ( const bool theIsCreate ) const
@@
-369,7
+359,7
@@
void HYDROData_Profile::RemovePoints()
if ( !aProfileUZ.IsNull() )
{
aProfileUZ->RemoveSections();
if ( !aProfileUZ.IsNull() )
{
aProfileUZ->RemoveSections();
-
SetToUpdate( true
);
+
Changed( Geom_3d
);
}
}
}
}
@@
-384,7
+374,7
@@
void HYDROData_Profile::SetParametricPoints( const HYDROData_ProfileUZ::PointsLi
aProfileUZ->AddPoint( 0, aPoint );
}
aProfileUZ->AddPoint( 0, aPoint );
}
-
SetToUpdate( true
);
+
Changed( Geom_3d
);
}
HYDROData_ProfileUZ::PointsList HYDROData_Profile::GetParametricPoints() const
}
HYDROData_ProfileUZ::PointsList HYDROData_Profile::GetParametricPoints() const
@@
-537,7
+527,7
@@
int HYDROData_Profile::ImportFromFile( const Handle(HYDROData_Document)& theDoc,
aProfile->SetFilePath( theFileName );
aProfile->SetFilePath( theFileName );
- aProfile->SetBorderColor(
HYDROData_Profile::
DefaultBorderColor() );
+ aProfile->SetBorderColor(
aProfile->
DefaultBorderColor() );
}
return aCreatedProfiles.Length();
}
return aCreatedProfiles.Length();