X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_Obstacle.cxx;h=6af8456d008e19bf3a123b20383251cb705bc66e;hb=545854182f0363f61284d5abe34c3627d4f3b088;hp=1218bbc4ed6ae14e24c8b08e8b6bca2439eca375;hpb=2cf9e838e652ae811d9b3931914771ad1836c6b8;p=modules%2Fhydro.git

diff --git a/src/HYDROData/HYDROData_Obstacle.cxx b/src/HYDROData/HYDROData_Obstacle.cxx
index 1218bbc4..6af8456d 100644
--- a/src/HYDROData/HYDROData_Obstacle.cxx
+++ b/src/HYDROData/HYDROData_Obstacle.cxx
@@ -24,7 +24,17 @@
 #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>
@@ -48,11 +58,19 @@
 
 #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>
@@ -62,7 +80,7 @@ IMPLEMENT_STANDARD_RTTIEXT(HYDROData_Obstacle,HYDROData_ArtificialObject)
 
 
 HYDROData_Obstacle::HYDROData_Obstacle()
-: HYDROData_ArtificialObject()
+: HYDROData_ArtificialObject( Geom_3d )
 {
 }
 
@@ -121,7 +139,7 @@ QStringList HYDROData_Obstacle::DumpToPython( MapOfTreatedObjects& theTreatedObj
 
 void HYDROData_Obstacle::Update()
 {
-  removeGroupObjects();
+  RemoveGroupObjects();
   createGroupObjects();
   checkAndSetAltitudeObject();
 
@@ -133,16 +151,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 );
@@ -150,12 +158,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 );
 }
@@ -218,6 +226,7 @@ bool HYDROData_Obstacle::ImportFromGeomIOR( const TCollection_AsciiString& theIO
 {
   bool aRes = false;
 
+#ifndef LIGHT_MODE
   if ( theIOR.IsEmpty() ) {
     return aRes;
   }
@@ -234,7 +243,8 @@ bool HYDROData_Obstacle::ImportFromGeomIOR( const TCollection_AsciiString& theIO
     SetShape3D( aShape );
     aRes = true;
   }
-  
+#endif
+
   return aRes;
 }
 
@@ -267,6 +277,7 @@ TCollection_AsciiString HYDROData_Obstacle::GetGeomObjectName() const
     return aRes;
   }
 
+#ifndef LIGHT_MODE
   SALOMEDS::Study_var aDSStudy = HYDROData_GeomTool::GetStudyByID( aDocId );
 
   if ( !aDSStudy->_is_nil() ) {
@@ -276,7 +287,7 @@ TCollection_AsciiString HYDROData_Obstacle::GetGeomObjectName() const
       aRes = TCollection_AsciiString( aSObject->GetName() );
     }
   }
-
+#endif
   return aRes;
 }
 
@@ -309,6 +320,7 @@ TopoDS_Shape HYDROData_Obstacle::ImportIGES( const QString& theFilePath ) const
 {
   TopoDS_Shape aResShape;
 
+#ifndef LIGHT_MODE
   // Set "C" numeric locale to save numbers correctly
   Kernel_Utils::Localizer loc;
 
@@ -343,6 +355,7 @@ TopoDS_Shape HYDROData_Obstacle::ImportIGES( const QString& theFilePath ) const
   catch(Standard_Failure) {
     aResShape.Nullify();
   }
+#endif
 
   return aResShape;
 }
@@ -351,6 +364,7 @@ TopoDS_Shape HYDROData_Obstacle::ImportSTEP( const QString& theFilePath ) const
 {
   TopoDS_Shape aResShape;
 
+#ifndef LIGHT_MODE
   // Set "C" numeric locale to save numbers correctly
   Kernel_Utils::Localizer loc;
 
@@ -454,20 +468,11 @@ TopoDS_Shape HYDROData_Obstacle::ImportSTEP( const QString& theFilePath ) const
   catch (Standard_Failure) {
     aResShape.Nullify();
   }
+#endif
 
   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;