X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_Obstacle.cxx;h=5a108d6ed36a968f714cbce20954af2ecf0390ba;hb=13ef2433b28b41ed4d7338a31839a49c8b599ad7;hp=f75d3f1e07935cb19546263c2a50715d17f49b5d;hpb=7db4a7b97f2bc86a57b8c67da20b06b90ab0ef9b;p=modules%2Fhydro.git

diff --git a/src/HYDROData/HYDROData_Obstacle.cxx b/src/HYDROData/HYDROData_Obstacle.cxx
index f75d3f1e..5a108d6e 100644
--- a/src/HYDROData/HYDROData_Obstacle.cxx
+++ b/src/HYDROData/HYDROData_Obstacle.cxx
@@ -4,12 +4,15 @@
 #include "HYDROData_Document.h"
 #include "HYDROData_ShapesGroup.h"
 #include "HYDROData_ShapesTool.h"
+#include "HYDROData_Tool.h"
 
 #include <Basics_Utils.hxx>
 
 #include <BRepTools.hxx>
 #include <BRep_Builder.hxx>
 
+#include <GEOMBase.h>
+
 #include <IGESControl_Reader.hxx>
 #include <IGESData_IGESModel.hxx>
 
@@ -23,6 +26,7 @@
 #include <TopoDS_Edge.hxx>
 
 #include <TDataStd_AsciiString.hxx>
+#include <TDataStd_RealArray.hxx>
 
 #include <TColStd_SequenceOfAsciiString.hxx>
 
@@ -37,8 +41,6 @@
 
 #include <HYDROData_Projection.h>
 
-#define PYTHON_OBSTACLE_ID "KIND_OBSTACLE"
-
 IMPLEMENT_STANDARD_HANDLE(HYDROData_Obstacle,HYDROData_ArtificialObject)
 IMPLEMENT_STANDARD_RTTIEXT(HYDROData_Obstacle,HYDROData_ArtificialObject)
 
@@ -54,22 +56,44 @@ HYDROData_Obstacle::~HYDROData_Obstacle()
 
 QStringList HYDROData_Obstacle::DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const
 {
-  QStringList aResList;
+  QStringList aResList = dumpObjectCreation( theTreatedObjects );
+  
+  QString anObstacleName = GetObjPyName();
 
-  Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( myLab );
-  if ( aDocument.IsNull() )
-    return aResList;
+  TCollection_AsciiString aGeomObjectEntry = GetGeomObjectEntry();
+  QString aFilePath = GetFilePath();
 
-  QString aDocName = aDocument->GetDocPyName();
-  QString anObstacleName = GetName();
+  if ( !aGeomObjectEntry.IsEmpty() )
+  {
+    QString aSalomeObjName = HYDROData_Tool::GenerateNameForPython( theTreatedObjects, "obstacle_sobj" );
+    aResList << QString( "%1 = theStudy.FindObjectID( \"%2\" );" )
+                .arg( aSalomeObjName ).arg( aGeomObjectEntry.ToCString() );
 
-  aResList << QString( "%1 = %2.CreateObject( %3 );" )
-              .arg( anObstacleName ).arg( aDocName ).arg( PYTHON_OBSTACLE_ID );
-  aResList << QString( "%1.SetName( \"%2\" );" )
-              .arg( anObstacleName ).arg( anObstacleName );
-  aResList << QString( "" );
+    aResList << QString( "%1.ImportFromGeomIOR( %2.GetIOR() );" )
+                .arg( anObstacleName ).arg( aSalomeObjName );
 
-  // TODO
+    aResList << QString( "%1.SetGeomObjectEntry( \"%2\" );" )
+                .arg( anObstacleName ).arg( aGeomObjectEntry.ToCString() );
+    aResList << QString( "" );
+  }
+  else if ( !aFilePath.isEmpty() )
+  {
+    aResList << QString( "%1.ImportFromFile( \"%2\" );" )
+                .arg( anObstacleName ).arg( aFilePath );
+    aResList << QString( "" );
+  }
+
+  // Write the translation points
+  double aDx, aDy, aDz;
+  if ( getTranslation( aDx, aDy, aDz ) )
+  {
+    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( "" );
 
   return aResList;
 }
@@ -153,30 +177,66 @@ QString HYDROData_Obstacle::GetFilePath() const
 {
   QString aRes;
 
-  Handle(TDataStd_AsciiString) anAsciiStr;
-  if ( myLab.FindChild( DataTag_FilePath ).FindAttribute( TDataStd_AsciiString::GetID(), anAsciiStr ) )
-    aRes = QString( anAsciiStr->Get().ToCString() );
+  TDF_Label aLabel = myLab.FindChild( DataTag_FilePath, false );
+  if ( !aLabel.IsNull() )
+  {
+    Handle(TDataStd_AsciiString) anAsciiStr;
+    if ( aLabel.FindAttribute( TDataStd_AsciiString::GetID(), anAsciiStr ) )
+      aRes = QString( anAsciiStr->Get().ToCString() );
+  }
 
   return aRes;
 }
 
-void HYDROData_Obstacle::SetGeomObjectEntry( const QString& theEntry )
+bool HYDROData_Obstacle::ImportFromGeomIOR( const TCollection_AsciiString& theIOR )
 {
-  TCollection_AsciiString anAsciiStr( theEntry.toStdString().c_str() );
-  TDataStd_AsciiString::Set( myLab.FindChild( DataTag_GeomObjectEntry ), anAsciiStr );
+  if ( theIOR.IsEmpty() )
+    return false;
+
+  TopoDS_Shape aShape = GEOMBase::GetShapeFromIOR( theIOR.ToCString() );
+  if ( aShape.IsNull() )
+    return false;
+
+  SetShape3D( aShape );
+  
+  return true;
 }
 
-QString HYDROData_Obstacle::GetGeomObjectEntry() const
+void HYDROData_Obstacle::SetGeomObjectEntry( const TCollection_AsciiString& theEntry )
 {
-  QString aRes;
+  TDataStd_AsciiString::Set( myLab.FindChild( DataTag_GeomObjectEntry ), theEntry );
+}
+
+TCollection_AsciiString HYDROData_Obstacle::GetGeomObjectEntry() const
+{
+  TCollection_AsciiString aRes;
 
-  Handle(TDataStd_AsciiString) anAsciiStr;
-  if ( myLab.FindChild( DataTag_GeomObjectEntry ).FindAttribute( TDataStd_AsciiString::GetID(), anAsciiStr ) )
-    aRes = QString( anAsciiStr->Get().ToCString() );
+  TDF_Label aLabel = myLab.FindChild( DataTag_GeomObjectEntry, false );
+  if ( !aLabel.IsNull() )
+  {
+    Handle(TDataStd_AsciiString) anAsciiStr;
+    if ( aLabel.FindAttribute( TDataStd_AsciiString::GetID(), anAsciiStr ) )
+      aRes = anAsciiStr->Get();
+  }
 
   return aRes;
 }
 
+void HYDROData_Obstacle::Translate( const double theDx,
+                                    const double theDy,
+                                    const double theDz )
+{
+  TopoDS_Shape aShape3D = GetShape3D();
+  
+  TopoDS_Shape aTranslatedShape3D = HYDROData_ShapesTool::Translated( aShape3D, theDx, theDy, theDz );
+  if ( aTranslatedShape3D.IsNull() )
+    return;
+
+  SetShape3D( aTranslatedShape3D );
+
+  setTranslation( theDx, theDy, theDz );
+}
+
 TopoDS_Shape HYDROData_Obstacle::ImportBREP( const QString& theFilePath ) const
 {
   TopoDS_Shape aResShape;
@@ -350,6 +410,11 @@ QColor HYDROData_Obstacle::getDefaultBorderColor() const
   return DefaultBorderColor();
 }
 
+ObjectKind HYDROData_Obstacle::getAltitudeObjectType() const
+{
+  return KIND_OBSTACLE_ALTITUDE;
+}
+
 void HYDROData_Obstacle::createGroupObjects()
 {
   TopoDS_Shape anObstacleShape = GetTopShape();
@@ -369,10 +434,46 @@ void HYDROData_Obstacle::createGroupObjects()
   }
 }
 
-ObjectKind HYDROData_Obstacle::getAltitudeObjectType() const
+void HYDROData_Obstacle::setTranslation( const double theDx, 
+                                         const double theDy, 
+                                         const double theDz )
 {
-  return KIND_OBSTACLE_ALTITUDE;
+  TDF_Label aLabel = myLab.FindChild( DataTag_Translation );
+
+  double aCurDx = theDx;
+  double aCurDy = theDy;
+  double aCurDz = theDz;
+
+  double aPrevDx, aPrevDy, aPrevDz;
+  if ( getTranslation( aPrevDx, aPrevDy, aPrevDz ) )
+  {
+    aCurDx += aPrevDx;
+    aCurDy += aPrevDy;
+    aCurDz += aPrevDz;
+  }
+  
+  Handle(TDataStd_RealArray) aCoeffsArray = TDataStd_RealArray::Set( aLabel, 1, 3 );
+  aCoeffsArray->SetValue( 1, aCurDx );
+  aCoeffsArray->SetValue( 2, aCurDy );
+  aCoeffsArray->SetValue( 3, aCurDz );
 }
 
+bool HYDROData_Obstacle::getTranslation( double& theDx, double& theDy, double& theDz ) const
+{
+  theDx = theDy = theDz = 0.0;
+
+  TDF_Label aLabel = myLab.FindChild( DataTag_Translation, false );
+  if ( aLabel.IsNull() )
+    return false;
+
+  Handle(TDataStd_RealArray) aCoeffsArray;
+  if ( !aLabel.FindAttribute( TDataStd_RealArray::GetID(), aCoeffsArray ) )
+    return false;
+
+  theDx = aCoeffsArray->Value( 1 );
+  theDy = aCoeffsArray->Value( 2 );
+  theDz = aCoeffsArray->Value( 3 );
 
+  return true;
+}