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_Obstacle.cxx
diff --git
a/src/HYDROData/HYDROData_Obstacle.cxx
b/src/HYDROData/HYDROData_Obstacle.cxx
index 1eeb8a8371a7b0701eea90e1f899a15d39f090fd..6af8456d008e19bf3a123b20383251cb705bc66e 100644
(file)
--- a/
src/HYDROData/HYDROData_Obstacle.cxx
+++ b/
src/HYDROData/HYDROData_Obstacle.cxx
@@
-24,10
+24,18
@@
#include "HYDROData_Tool.h"
#include "HYDROData_GeomTool.h"
#include "HYDROData_Tool.h"
#include "HYDROData_GeomTool.h"
+#ifdef WIN32
+ #pragma warning ( disable: 4251 )
+#endif
+
#ifndef LIGHT_MODE
#include <Basics_Utils.hxx>
#endif
#ifndef LIGHT_MODE
#include <Basics_Utils.hxx>
#endif
+#ifdef WIN32
+ #pragma warning ( default: 4251 )
+#endif
+
#include <BRepTools.hxx>
#include <BRep_Builder.hxx>
#include <BRepTools.hxx>
#include <BRep_Builder.hxx>
@@
-50,11
+58,19
@@
#include <TopExp_Explorer.hxx>
#include <TopExp_Explorer.hxx>
+#ifdef WIN32
+ #pragma warning ( disable: 4251 )
+#endif
+
#include <QColor>
#include <QFile>
#include <QFileInfo>
#include <QStringList>
#include <QColor>
#include <QFile>
#include <QFileInfo>
#include <QStringList>
+#ifdef WIN32
+ #pragma warning ( default: 4251 )
+#endif
+
#include <Standard_ErrorHandler.hxx> // CAREFUL ! position of this file is critic
#include <HYDROData_Projection.h>
#include <Standard_ErrorHandler.hxx> // CAREFUL ! position of this file is critic
#include <HYDROData_Projection.h>
@@
-64,7
+80,7
@@
IMPLEMENT_STANDARD_RTTIEXT(HYDROData_Obstacle,HYDROData_ArtificialObject)
HYDROData_Obstacle::HYDROData_Obstacle()
HYDROData_Obstacle::HYDROData_Obstacle()
-: HYDROData_ArtificialObject()
+: HYDROData_ArtificialObject(
Geom_3d
)
{
}
{
}
@@
-123,7
+139,7
@@
QStringList HYDROData_Obstacle::DumpToPython( MapOfTreatedObjects& theTreatedObj
void HYDROData_Obstacle::Update()
{
void HYDROData_Obstacle::Update()
{
-
r
emoveGroupObjects();
+
R
emoveGroupObjects();
createGroupObjects();
checkAndSetAltitudeObject();
createGroupObjects();
checkAndSetAltitudeObject();
@@
-135,16
+151,6
@@
bool HYDROData_Obstacle::IsHas2dPrs() const
return true;
}
return true;
}
-TopoDS_Shape HYDROData_Obstacle::GetTopShape() const
-{
- return getTopShape();
-}
-
-TopoDS_Shape HYDROData_Obstacle::GetShape3D() const
-{
- return getShape3D();
-}
-
void HYDROData_Obstacle::SetShape3D( const TopoDS_Shape& theShape )
{
TopoDS_Face aShape2d = HYDROData_Projection::MakeProjection( theShape );
void HYDROData_Obstacle::SetShape3D( const TopoDS_Shape& theShape )
{
TopoDS_Face aShape2d = HYDROData_Projection::MakeProjection( theShape );
@@
-152,12
+158,12
@@
void HYDROData_Obstacle::SetShape3D( const TopoDS_Shape& theShape )
HYDROData_ArtificialObject::SetTopShape( aShape2d );
}
HYDROData_ArtificialObject::SetTopShape( aShape2d );
}
-QColor HYDROData_Obstacle::DefaultFillingColor()
+QColor HYDROData_Obstacle::DefaultFillingColor()
const
{
return QColor( Qt::yellow );
}
{
return QColor( Qt::yellow );
}
-QColor HYDROData_Obstacle::DefaultBorderColor()
+QColor HYDROData_Obstacle::DefaultBorderColor()
const
{
return QColor( Qt::transparent );
}
{
return QColor( Qt::transparent );
}
@@
-467,16
+473,6
@@
TopoDS_Shape HYDROData_Obstacle::ImportSTEP( const QString& theFilePath ) const
return aResShape;
}
return aResShape;
}
-QColor HYDROData_Obstacle::getDefaultFillingColor() const
-{
- return DefaultFillingColor();
-}
-
-QColor HYDROData_Obstacle::getDefaultBorderColor() const
-{
- return DefaultBorderColor();
-}
-
ObjectKind HYDROData_Obstacle::getAltitudeObjectType() const
{
return KIND_OBSTACLE_ALTITUDE;
ObjectKind HYDROData_Obstacle::getAltitudeObjectType() const
{
return KIND_OBSTACLE_ALTITUDE;