test Strickler

[modules/hydro.git] / src / HYDROData / HYDROData_Obstacle.cxx

diff --git a/src/HYDROData/HYDROData_Obstacle.cxx b/src/HYDROData/HYDROData_Obstacle.cxx
index 1eeb8a8371a7b0701eea90e1f899a15d39f090fd..29b0a64c4a9e8505f6fe2acce5a707be77d6ee8e 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"
 
+#ifdef WIN32
+  #pragma warning ( disable: 4251 )
+#endif
+
 #ifndef LIGHT_MODE
 #include <Basics_Utils.hxx>
 #endif
 
+#ifdef WIN32
+  #pragma warning ( default: 4251 )
+#endif
+
 #include <BRepTools.hxx>
 #include <BRep_Builder.hxx>
 
@@ -50,21 +58,31 @@
 
 #include <TopExp_Explorer.hxx>
 
+#ifdef WIN32
+  #pragma warning ( disable: 4251 )
+#endif
+
 #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>
 
-IMPLEMENT_STANDARD_HANDLE(HYDROData_Obstacle,HYDROData_ArtificialObject)
+#define _DEVDEBUG_
+#include "HYDRO_trace.hxx"
+
 IMPLEMENT_STANDARD_RTTIEXT(HYDROData_Obstacle,HYDROData_ArtificialObject)
 
 
 HYDROData_Obstacle::HYDROData_Obstacle()
-: HYDROData_ArtificialObject()
+: HYDROData_ArtificialObject( Geom_3d )
 {
 }
 
@@ -72,7 +90,8 @@ HYDROData_Obstacle::~HYDROData_Obstacle()
 {
 }
 
-QStringList HYDROData_Obstacle::DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const
+QStringList HYDROData_Obstacle::DumpToPython( const QString&       thePyScriptPath,
+                                              MapOfTreatedObjects& theTreatedObjects ) const
 {
   QStringList aResList = dumpObjectCreation( theTreatedObjects );
   
@@ -84,24 +103,24 @@ QStringList HYDROData_Obstacle::DumpToPython( MapOfTreatedObjects& theTreatedObj
   if ( !aGeomObjectEntry.IsEmpty() )
   {
     QString aSalomeObjName = HYDROData_Tool::GenerateNameForPython( theTreatedObjects, "obstacle_sobj" );
-    // aResList << QString( "%1 = theStudy.FindObjectID( \"%2\" );" )
+    // aResList << QString( "%1 = theStudy.FindObjectID( \"%2\" )" )
     //            .arg( aSalomeObjName ).arg( aGeomObjectEntry.ToCString() );
     QString aGeomObjectName( GetGeomObjectName().ToCString() );
     if ( !aGeomObjectName.isEmpty() ) {
       aResList << QString( "%1 = theStudy.FindObjectByName( \"%2\", \"GEOM\" )[0];" )
                   .arg( aSalomeObjName ).arg( aGeomObjectName );
 
-      aResList << QString( "%1.ImportFromGeomIOR( %2.GetIOR() );" )
+      aResList << QString( "%1.ImportFromGeomIOR( %2.GetIOR() )" )
                   .arg( anObstacleName ).arg( aSalomeObjName );
 
-      aResList << QString( "%1.SetGeomObjectEntry( %2.GetID() );" )
+      aResList << QString( "%1.SetGeomObjectEntry( %2.GetID() )" )
                   .arg( anObstacleName ).arg( aSalomeObjName );
     }
     aResList << QString( "" );
   }
   else if ( !aFilePath.isEmpty() )
   {
-    aResList << QString( "%1.ImportFromFile( \"%2\" );" )
+    aResList << QString( "%1.ImportFromFile( \"%2\" )" )
                 .arg( anObstacleName ).arg( aFilePath );
     aResList << QString( "" );
   }
@@ -110,12 +129,12 @@ QStringList HYDROData_Obstacle::DumpToPython( MapOfTreatedObjects& theTreatedObj
   double aDx, aDy, aDz;
   if ( getTranslation( aDx, aDy, aDz ) )
   {
-    aResList << QString( "%1.Translate( %2, %3, %4 );" )
+    aResList << QString( "%1.Translate( %2, %3, %4 )" )
                 .arg( anObstacleName ).arg( aDx ).arg( aDy ).arg( aDz );
     aResList << QString( "" );
   }
 
-  aResList << QString( "%1.Update();" ).arg( anObstacleName );
+  aResList << QString( "%1.Update()" ).arg( anObstacleName );
   aResList << QString( "" );
 
   return aResList;
@@ -123,7 +142,7 @@ QStringList HYDROData_Obstacle::DumpToPython( MapOfTreatedObjects& theTreatedObj
 
 void HYDROData_Obstacle::Update()
 {
-  removeGroupObjects();
+  RemoveGroupObjects();
   createGroupObjects();
   checkAndSetAltitudeObject();
 
@@ -135,16 +154,6 @@ bool HYDROData_Obstacle::IsHas2dPrs() const
   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 );
@@ -152,12 +161,12 @@ void HYDROData_Obstacle::SetShape3D( const TopoDS_Shape& theShape )
   HYDROData_ArtificialObject::SetTopShape( aShape2d );
 }
 
-QColor HYDROData_Obstacle::DefaultFillingColor()
+QColor HYDROData_Obstacle::DefaultFillingColor() const
 {
   return QColor( Qt::yellow );
 }
 
-QColor HYDROData_Obstacle::DefaultBorderColor()
+QColor HYDROData_Obstacle::DefaultBorderColor() const
 {
   return QColor( Qt::transparent );
 }
@@ -467,18 +476,9 @@ TopoDS_Shape HYDROData_Obstacle::ImportSTEP( const QString& theFilePath ) const
   return aResShape;
 }
 
-QColor HYDROData_Obstacle::getDefaultFillingColor() const
-{
-  return DefaultFillingColor();
-}
-
-QColor HYDROData_Obstacle::getDefaultBorderColor() const
-{
-  return DefaultBorderColor();
-}
-
 ObjectKind HYDROData_Obstacle::getAltitudeObjectType() const
 {
+  DEBTRACE("HYDROData_Obstacle::getAltitudeObjectType");
   return KIND_OBSTACLE_ALTITUDE;
 }