#include <TopTools_ListOfShape.hxx>
#include <TopTools_ListIteratorOfListOfShape.hxx>
-
+//#define DEB_CALCULATION 1
+#ifdef DEB_CALCULATION
+#include <BRepTools.hxx>
+#include <TopLoc_Location.hxx>
+#endif
#define CALCULATION_REGIONS_PREF GetName() + "_Reg"
#define CALCULATION_ZONES_PREF GetName() + "_Zone"
#define CALCULATION_GROUPS_PREF GetName() + "_"
-#define PYTHON_CALCULATION_ID "KIND_CALCULATION"
-
#define EXPORT_NAME "HYDRO_" + GetName()
IMPLEMENT_STANDARD_HANDLE(HYDROData_CalculationCase, HYDROData_Entity)
QStringList HYDROData_CalculationCase::DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const
{
- QStringList aResList;
-
- Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( myLab );
- if ( aDocument.IsNull() )
- return aResList;
-
- QString aDocName = aDocument->GetDocPyName();
+ QStringList aResList = dumpObjectCreation( theTreatedObjects );
QString aCalculName = GetName();
- aResList << QString( "%1 = %2.CreateObject( %3 );" )
- .arg( aCalculName ).arg( aDocName ).arg( PYTHON_CALCULATION_ID );
- aResList << QString( "%1.SetName( \"%2\" );" )
- .arg( aCalculName ).arg( aCalculName );
- aResList << QString( "" );
-
HYDROData_SequenceOfObjects aGeomObjects = GetGeometryObjects();
HYDROData_SequenceOfObjects::Iterator anIter( aGeomObjects );
for ( ; anIter.More(); anIter.Next() )
return aNewGroup;
}
-bool HYDROData_CalculationCase::Export( GEOM::GEOM_Gen_var theGeomEngine,
- SALOMEDS::Study_ptr theStudy )
+bool HYDROData_CalculationCase::Export( GEOM::GEOM_Gen_var theGeomEngine,
+ SALOMEDS::Study_ptr theStudy ) const
{
+ HYDROData_ShapesGroup::SeqOfGroupsDefs aSeqOfGroupsDefs;
+
+ // Get groups definitions
+ HYDROData_SequenceOfObjects aSplittedGroups = GetSplittedGroups();
+
+ HYDROData_SequenceOfObjects::Iterator anIter( aSplittedGroups );
+ for ( ; anIter.More(); anIter.Next() )
+ {
+ // Get shapes group
+ Handle(HYDROData_ShapesGroup) aGroup =
+ Handle(HYDROData_ShapesGroup)::DownCast( anIter.Value() );
+ if ( aGroup.IsNull() )
+ continue;
+
+ HYDROData_ShapesGroup::GroupDefinition aGroupDef;
+
+ aGroupDef.Name = aGroup->GetName().toLatin1().constData();
+ aGroup->GetShapes( aGroupDef.Shapes );
+
+ aSeqOfGroupsDefs.Append( aGroupDef );
+ }
+
// Get faces
TopTools_ListOfShape aFaces;
HYDROData_SequenceOfObjects aCaseRegions = GetRegions();
HYDROData_SequenceOfObjects::Iterator aRegionIter( aCaseRegions );
- for ( ; aRegionIter.More(); aRegionIter.Next() ) {
+ for ( ; aRegionIter.More(); aRegionIter.Next() )
+ {
Handle(HYDROData_Region) aRegion =
Handle(HYDROData_Region)::DownCast( aRegionIter.Value() );
- if( aRegion.IsNull() ) {
+ if( aRegion.IsNull() )
continue;
- }
- TopoDS_Shape aRegionShape = aRegion->GetShape();
+ TopoDS_Shape aRegionShape = aRegion->GetShape( &aSeqOfGroupsDefs );
aFaces.Append( aRegionShape );
}
- // Get groups
- HYDROData_SequenceOfObjects aSplittedGroups = GetSplittedGroups();
-
- return Export( theGeomEngine, theStudy, aFaces, aSplittedGroups );
+ return Export( theGeomEngine, theStudy, aFaces, aSeqOfGroupsDefs );
}
-bool HYDROData_CalculationCase::Export( GEOM::GEOM_Gen_var theGeomEngine,
- SALOMEDS::Study_ptr theStudy,
- const TopTools_ListOfShape& theFaces,
- const HYDROData_SequenceOfObjects& theSplittedGroups )
+bool HYDROData_CalculationCase::Export( GEOM::GEOM_Gen_var theGeomEngine,
+ SALOMEDS::Study_ptr theStudy,
+ const TopTools_ListOfShape& theFaces,
+ const HYDROData_ShapesGroup::SeqOfGroupsDefs& theGroupsDefs ) const
{
// Sew faces
- BRepBuilderAPI_Sewing aSewing( Precision::Confusion()*10.0 );
- aSewing.SetNonManifoldMode( Standard_True );
-
+ BRepBuilderAPI_Sewing aSewing( Precision::Confusion() * 10.0 );
+ aSewing.SetNonManifoldMode( Standard_False );
+#ifdef DEB_CALCULATION
+ TCollection_AsciiString aNam("Sh_");
+ int i=1;
+#endif
TopTools_ListIteratorOfListOfShape aFaceIter( theFaces );
- for ( ; aFaceIter.More(); aFaceIter.Next() ) {
+ for ( ; aFaceIter.More(); aFaceIter.Next() )
+ {
TopoDS_Shape aShape = aFaceIter.Value();
- if ( !aShape.IsNull() && (aShape.ShapeType() == TopAbs_FACE) ) {
- TopoDS_Face aFace = TopoDS::Face( aShape );
- if ( !aFace.IsNull() ) {
- aSewing.Add( aFace );
- }
- } else {
+ if ( aShape.IsNull() )
+ continue;
+
+ if ( aShape.ShapeType() == TopAbs_FACE )
+ {
+ aSewing.Add( aShape );
+#ifdef DEB_CALCULATION
+ TCollection_AsciiString aName = aNam + ++i + ".brep";
+ BRepTools::Write(aShape ,aName.ToCString());
+#endif
+ }
+ else
+ {
+#ifdef DEB_CALCULATION
+ int j = 1;
+#endif
TopExp_Explorer anExp( aShape, TopAbs_FACE );
- for ( ; anExp.More(); anExp.Next() ) {
- TopoDS_Face aFace = TopoDS::Face( anExp.Current() );
- if ( !aFace.IsNull() ) {
- aSewing.Add( aFace );
- }
- }
+ for (; anExp.More(); anExp.Next() ) {
+ aSewing.Add( anExp.Current() );
+#ifdef DEB_CALCULATION
+
+ TCollection_AsciiString aName = aNam + i + "_" + ++j + ".brep";
+ BRepTools::Write(anExp.Current() ,aName.ToCString());
+#endif
+ }
}
} // faces iterator
TopoDS_Shape aSewedShape = aSewing.SewedShape();
// If the sewed shape is empty - return false
- if ( aSewedShape.IsNull() || !TopoDS_Iterator(aSewedShape).More() ) {
+ if ( aSewedShape.IsNull() || !TopoDS_Iterator( aSewedShape ).More() )
return false;
- }
+#ifdef DEB_CALCULATION
+ BRepTools::Write(aSewedShape ,"Sew.brep");
+#endif
// Publish the sewed shape
QString aName = EXPORT_NAME;
GEOM::GEOM_Object_ptr aMainShape =
publishShapeInGEOM( theGeomEngine, theStudy, aSewedShape, aName );
- if ( aMainShape->_is_nil() ) {
+ if ( aMainShape->_is_nil() )
return false;
- }
+
+ if ( theGroupsDefs.IsEmpty() )
+ return true;
// Create groups
TopTools_IndexedMapOfShape aMapOfSubShapes;
TopExp::MapShapes( aSewedShape, aMapOfSubShapes );
- QHash<QString, QSet<int> > aGroupsData;
+ NCollection_DataMap< TCollection_AsciiString, NCollection_Sequence<int> > aGroupsData;
- HYDROData_SequenceOfObjects::Iterator anIter( theSplittedGroups );
- for ( ; anIter.More(); anIter.Next() ) {
- // Get shapes group
- Handle(HYDROData_ShapesGroup) aGroup =
- Handle(HYDROData_ShapesGroup)::DownCast( anIter.Value() );
- if ( aGroup.IsNull() ) {
- continue;
- }
+ for ( int aGrId = 1, nbGroups = theGroupsDefs.Length(); aGrId <= nbGroups; ++aGrId )
+ {
+ const HYDROData_ShapesGroup::GroupDefinition& aGroupDef = theGroupsDefs.Value( aGrId );
+
+ NCollection_Sequence<int> aGroupIndexes;
+ for( int i = 1, n = aGroupDef.Shapes.Length(); i <= n; i++ )
+ {
+ const TopoDS_Shape& aShape = aGroupDef.Shapes.Value( i );
+#ifdef DEB_CALCULATION
+ cout << "\nOld shape(" << i << ") = " << aShape.TShape() <<endl;
+#endif
+ const TopoDS_Shape& aModifiedShape = aSewing.Modified( aShape );
+ if ( aModifiedShape.IsNull() )
+ continue;
+
+#ifdef DEB_CALCULATION
+ const TopLoc_Location& aL1 = aShape.Location();
+ const TopLoc_Location& aL2 = aModifiedShape.Location();
+ cout << "\nNew shape(" << i << ") = " << aModifiedShape.TShape() << " Location is Equal = " << aL1.IsEqual(aL2)<<endl;
+#endif
- QSet<int> anIndexes;
-
- // Get shapes of the group
- TopTools_SequenceOfShape aShapes;
- aGroup->GetShapes( aShapes );
- for( int i = 1, aNbShapes = aShapes.Length(); i <= aNbShapes; i++ ) {
- const TopoDS_Shape& aShape = aShapes.Value( i );
- const TopoDS_Shape ModifiedShape = aSewing.Modified( aShape );
- if ( !ModifiedShape.IsNull() ) {
- int anIndex = aMapOfSubShapes.FindIndex( ModifiedShape );
- if ( anIndex > 0 ) {
- anIndexes << anIndex;
+ // Workaround for TopTools_IndexedMapOfShape::FindIndex()
+ /*for ( int anIndex = 1; anIndex <= aMapOfSubShapes.Extent(); anIndex++ )
+ {
+ if ( aModifiedShape.IsPartner( aMapOfSubShapes.FindKey( anIndex ) ) )
+ {
+ aGroupIndexes.Append( anIndex );
+ break;
}
}
- }
-
- if ( anIndexes.count() > 0 ) {
- aGroupsData.insert( aGroup->GetName(), anIndexes );
- }
+ */
+ int anIndex = aMapOfSubShapes.FindIndex(aModifiedShape);
+ if(anIndex > 0) {
+ aGroupIndexes.Append( anIndex );
+ //break;
+ } else {
+#ifdef DEB_CALCULATION
+ TCollection_AsciiString aNam("Lost_");
+ if(!aMapOfSubShapes.Contains(aModifiedShape)) {
+ for ( int anIndex = 1; anIndex <= aMapOfSubShapes.Extent(); anIndex++ )
+ {
+ const TopoDS_Shape& aS = aMapOfSubShapes.FindKey( anIndex );
+ if ( aModifiedShape.IsPartner( aS ) )
+ {
+ cout <<"\nIndex in Map = " << anIndex << "TShape = " << aS.TShape() <<endl;
+ TCollection_AsciiString aName = aNam + i + "_" + anIndex + ".brep";
+ BRepTools::Write(aS ,aName.ToCString());
+ break;
+ }
+ }
+ }
+#endif
+ }
+ }
+ if ( !aGroupIndexes.IsEmpty() )
+ aGroupsData.Bind( aGroupDef.Name, aGroupIndexes );
}
-
- if ( !aGroupsData.isEmpty() ) {
+
+ if ( !aGroupsData.IsEmpty() )
+ {
GEOM::GEOM_IGroupOperations_var aGroupOp =
theGeomEngine->GetIGroupOperations( theStudy->StudyId() );
- foreach ( const QString& aGroupName, aGroupsData.keys() ) {
- QSet<int> aGroupIndexes = aGroupsData.value( aGroupName );
+ NCollection_DataMap< TCollection_AsciiString, NCollection_Sequence<int> >::Iterator aMapIt( aGroupsData );
+ for ( ; aMapIt.More(); aMapIt.Next() )
+ {
+ const TCollection_AsciiString& aGroupName = aMapIt.Key();
+ const NCollection_Sequence<int>& aGroupIndexes = aMapIt.Value();
- GEOM::GEOM_Object_var aGroup = aGroupOp->CreateGroup( aMainShape, TopAbs_EDGE );
- if ( !CORBA::is_nil(aGroup) && aGroupOp->IsDone() ) {
- GEOM::ListOfLong_var anIndexes = new GEOM::ListOfLong;
- anIndexes->length( aGroupIndexes.count() );
- int aListIndex = 0;
- foreach ( const int anIndex, aGroupIndexes ) {
- anIndexes[aListIndex++] = anIndex;
- }
+ GEOM::GEOM_Object_var aGeomGroup = aGroupOp->CreateGroup( aMainShape, TopAbs_EDGE );
+ if ( CORBA::is_nil( aGeomGroup ) || !aGroupOp->IsDone() )
+ continue;
- aGroupOp->UnionIDs( aGroup, anIndexes );
- if ( aGroupOp->IsDone() ) {
- SALOMEDS::SObject_var aGroupSO =
- theGeomEngine->AddInStudy( theStudy, aGroup, qPrintable( aGroupName ), aMainShape );
- }
+ GEOM::ListOfLong_var aGeomIndexes = new GEOM::ListOfLong;
+ aGeomIndexes->length( aGroupIndexes.Length() );
+
+ for( int i = 1, n = aGroupIndexes.Length(); i <= n; i++ )
+ aGeomIndexes[ i - 1 ] = aGroupIndexes.Value( i );
+
+ aGroupOp->UnionIDs( aGeomGroup, aGeomIndexes );
+ if ( aGroupOp->IsDone() )
+ {
+ SALOMEDS::SObject_var aGroupSO =
+ theGeomEngine->AddInStudy( theStudy, aGeomGroup, aGroupName.ToCString(), aMainShape );
}
}
}
GEOM::GEOM_Object_ptr HYDROData_CalculationCase::publishShapeInGEOM(
GEOM::GEOM_Gen_var theGeomEngine, SALOMEDS::Study_ptr theStudy,
- const TopoDS_Shape& theShape, const QString& theName )
+ const TopoDS_Shape& theShape, const QString& theName ) const
{
GEOM::GEOM_Object_var aGeomObj;
