#include "HYDROData_ShapesGroup.h"
#include "HYDROData_ShapesTool.h"
#include "HYDROData_Tool.h"
+#include "HYDROData_GeomTool.h"
#include <Basics_Utils.hxx>
#include <BRepTools.hxx>
#include <BRep_Builder.hxx>
-#include <GEOMBase.h>
-
#include <IGESControl_Reader.hxx>
#include <IGESData_IGESModel.hxx>
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.ImportFromGeomIOR( %2.GetIOR() );" )
- .arg( anObstacleName ).arg( aSalomeObjName );
-
- aResList << QString( "%1.SetGeomObjectEntry( \"%2\" );" )
- .arg( anObstacleName ).arg( aGeomObjectEntry.ToCString() );
+ // 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() );" )
+ .arg( anObstacleName ).arg( aSalomeObjName );
+
+ aResList << QString( "%1.SetGeomObjectEntry( %2.GetID() );" )
+ .arg( anObstacleName ).arg( aSalomeObjName );
+ }
aResList << QString( "" );
}
else if ( !aFilePath.isEmpty() )
bool HYDROData_Obstacle::ImportFromGeomIOR( const TCollection_AsciiString& theIOR )
{
- if ( theIOR.IsEmpty() )
- return false;
+ bool aRes = false;
- TopoDS_Shape aShape = GEOMBase::GetShapeFromIOR( theIOR.ToCString() );
- if ( aShape.IsNull() )
- return false;
+ if ( theIOR.IsEmpty() ) {
+ return aRes;
+ }
+
+ int aDocId = -1;
+ if ( !HYDROData_Document::DocumentId( HYDROData_Document::Document( myLab ), aDocId ) || aDocId < 0 ) {
+ return aRes;
+ }
- SetShape3D( aShape );
+ // TopoDS_Shape aShape = GEOMBase::GetShapeFromIOR( theIOR.ToCString() );
+ TopoDS_Shape aShape = HYDROData_GeomTool::GetShapeFromIOR( aDocId, theIOR.ToCString() );
+
+ if ( !aShape.IsNull() ) {
+ SetShape3D( aShape );
+ aRes = true;
+ }
- return true;
+ return aRes;
}
void HYDROData_Obstacle::SetGeomObjectEntry( const TCollection_AsciiString& theEntry )
return aRes;
}
+TCollection_AsciiString HYDROData_Obstacle::GetGeomObjectName() const
+{
+ TCollection_AsciiString aRes;
+
+ int aDocId = -1;
+ if ( !HYDROData_Document::DocumentId( HYDROData_Document::Document( myLab ), aDocId ) || aDocId < 0 ) {
+ return aRes;
+ }
+
+ SALOMEDS::Study_var aDSStudy = HYDROData_GeomTool::GetStudyByID( aDocId );
+
+ if ( !aDSStudy->_is_nil() ) {
+ TCollection_AsciiString anEntry = GetGeomObjectEntry();
+ SALOMEDS::SObject_var aSObject = aDSStudy->FindObjectID( anEntry.ToCString() );
+ if ( !aSObject->_is_nil() ) {
+ aRes = TCollection_AsciiString( aSObject->GetName() );
+ }
+ }
+
+ return aRes;
+}
+
void HYDROData_Obstacle::Translate( const double theDx,
const double theDy,
const double theDz )
return true;
}
+void HYDROData_Obstacle::UpdateLocalCS( double theDx, double theDy )
+{
+ Translate( theDx, theDy, 0 );
+}
+