merge trunk on BR_quadtree 20140820

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

diff --git a/src/HYDROData/HYDROData_Obstacle.cxx b/src/HYDROData/HYDROData_Obstacle.cxx
index bde8f4fceef74eb78226e47e30e7035b7a4553b0..b7c8eb54c8eb67c8bcd3b8e14ce4e3228773e869 100644 (file)
--- a/src/HYDROData/HYDROData_Obstacle.cxx
+++ b/src/HYDROData/HYDROData_Obstacle.cxx
@@ -66,7 +66,7 @@ QStringList HYDROData_Obstacle::DumpToPython( MapOfTreatedObjects& theTreatedObj
   if ( !aGeomObjectEntry.IsEmpty() )
   {
     QString aSalomeObjName = HYDROData_Tool::GenerateNameForPython( theTreatedObjects, "obstacle_sobj" );
-    aResList << QString( "%1 = salome.myStudy.FindObjectID( \"%2\" );" )
+    aResList << QString( "%1 = theStudy.FindObjectID( \"%2\" );" )
                 .arg( aSalomeObjName ).arg( aGeomObjectEntry.ToCString() );
 
     aResList << QString( "%1.ImportFromGeomIOR( %2.GetIOR() );" )
@@ -107,6 +107,11 @@ void HYDROData_Obstacle::Update()
   HYDROData_Entity::Update();
 }
 
+bool HYDROData_Obstacle::IsHas2dPrs() const
+{
+  return true;
+}
+
 TopoDS_Shape HYDROData_Obstacle::GetTopShape() const
 {
   return getTopShape();
@@ -477,3 +482,8 @@ bool HYDROData_Obstacle::getTranslation( double& theDx, double& theDy, double& t
   return true;
 }
 
+void HYDROData_Obstacle::UpdateLocalCS( double theDx, double theDy )
+{
+  Translate( theDx, theDy, 0 );
+}
+