#include "HYDROData_Iterator.h"
#include "HYDROData_NaturalObject.h"
#include "HYDROData_PolylineXY.h"
-#include "HYDROData_SplitToZonesTool.h"
#include "HYDROData_SplittedShapesGroup.h"
#include "HYDROData_Region.h"
#include "HYDROData_Tool.h"
-#include "HYDROData_Zone.h"
+#include "HYDROData_GeomTool.h"
#include <GEOMBase.h>
#include <TopExp.hxx>
#include <TopTools_ListOfShape.hxx>
#include <TopTools_ListIteratorOfListOfShape.hxx>
+#include <TDataStd_Integer.hxx>
//#define DEB_CALCULATION 1
#ifdef DEB_CALCULATION
#define CALCULATION_REGIONS_PREF GetName() + "_Reg"
#define CALCULATION_ZONES_PREF GetName() + "_Zone"
#define CALCULATION_GROUPS_PREF GetName() + "_"
+//#define DEB_CLASS2D 1
+#ifdef DEB_CLASS2D
+#include <BRepBuilderAPI_MakeVertex.hxx>
+#endif
#define EXPORT_NAME "HYDRO_" + GetName()
+#include <SALOME_NamingService.hxx>
+#include <SALOME_LifeCycleCORBA.hxx>
+
+
+
+
+
IMPLEMENT_STANDARD_HANDLE(HYDROData_CalculationCase, HYDROData_Entity)
IMPLEMENT_STANDARD_RTTIEXT(HYDROData_CalculationCase, HYDROData_Entity)
}
}
- HYDROData_SequenceOfObjects aGroups = GetGeometryGroups();
+ HYDROData_SequenceOfObjects aGroups = GetSplittedGroups();
anIter.Init( aGroups );
for ( ; anIter.More(); anIter.Next() )
QStringList HYDROData_CalculationCase::DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const
{
QStringList aResList = dumpObjectCreation( theTreatedObjects );
+ aResList.prepend( "# Calculation case" );
QString aCalculName = GetObjPyName();
+ AssignmentMode aMode = GetAssignmentMode();
+ QString aModeStr = aMode==MANUAL ? "HYDROData_CalculationCase.MANUAL" : "HYDROData_CalculationCase.AUTOMATIC";
+ aResList << QString( "%0.SetAssignmentMode( %1 )" ).arg( aCalculName ).arg( aModeStr );
+
HYDROData_SequenceOfObjects aGeomObjects = GetGeometryObjects();
HYDROData_SequenceOfObjects::Iterator anIter( aGeomObjects );
for ( ; anIter.More(); anIter.Next() )
aResList << QString( "%1.AddGeometryGroup( %2 );" ).arg( aCalculName ).arg( aGroupName );
}
- aResList << QString( "" );
Handle(HYDROData_PolylineXY) aBoundaryPolyline = GetBoundaryPolyline();
setPythonReferenceObject( theTreatedObjects, aResList, aBoundaryPolyline, "SetBoundaryPolyline" );
- aResList << QString( "" );
- aResList << QString( "%1.Update();" ).arg( aCalculName );
+ if( aMode==AUTOMATIC )
+ DumpRulesToPython( aCalculName, aResList );
+
aResList << QString( "" );
+ aResList << "# Start the algorithm of the partition and assignment";
+ aResList << QString( "%1.Update();" ).arg( aCalculName );
- // Now we restore the regions and zones order
- HYDROData_SequenceOfObjects aRegions = GetRegions();
- anIter.Init( aRegions );
- for ( ; anIter.More(); anIter.Next() )
+ if( aMode==MANUAL )
{
- Handle(HYDROData_Region) aRegion =
- Handle(HYDROData_Region)::DownCast( anIter.Value() );
- if ( aRegion.IsNull() )
- continue;
-
- QString aRegionName = aRegion->GetName();
-
- HYDROData_SequenceOfObjects aZones = aRegion->GetZones();
- HYDROData_SequenceOfObjects::Iterator aZonesIter( aZones );
- for ( ; aZonesIter.More(); aZonesIter.Next() )
+ // Now we restore the regions and zones order
+ HYDROData_SequenceOfObjects aRegions = GetRegions();
+ anIter.Init( aRegions );
+ for ( ; anIter.More(); anIter.Next() )
{
- Handle(HYDROData_Zone) aRegZone =
- Handle(HYDROData_Zone)::DownCast( aZonesIter.Value() );
- if ( aRegZone.IsNull() )
+ Handle(HYDROData_Region) aRegion =
+ Handle(HYDROData_Region)::DownCast( anIter.Value() );
+ if ( aRegion.IsNull() )
continue;
- // TODO
+ theTreatedObjects.insert( aRegion->GetName(), aRegion );
+ QStringList aRegDump = aRegion->DumpToPython( theTreatedObjects );
+ aResList << aRegDump;
}
}
+
+ // Export calculation case
aResList << QString( "" );
+ aResList << "# Export of the calculation case";
+ QString aStudyName = "theStudy";
+ QString anEntryVar = aCalculName + "_entry";
+ aResList << QString( "%1 = %2.Export( %3._get_StudyId() )" ).arg( anEntryVar ).arg( aCalculName ).arg( aStudyName );
+
+ // Get geometry object and print debug information
+ aResList << "";
+ aResList << "# Get geometry shape and print debug information";
+ aResList << "import GEOM";
+ aResList << QString( "print \"Entry:\", %1" ).arg( anEntryVar );
+ QString aGeomShapeName = aCalculName + "_geom";
+ aResList << QString( "%1 = salome.IDToObject( str( %2 ) )" ).arg( aGeomShapeName ).arg( anEntryVar );
+ aResList << QString( "print \"Geom shape:\", %1" ).arg( aGeomShapeName );
+ aResList << QString( "print \"Geom shape name:\", %1.GetName()" ).arg( aGeomShapeName );
+
+ DumpSampleMeshing( aResList, aStudyName, aGeomShapeName, aCalculName+"_mesh" );
+ aResList << QString( "" );
return aResList;
}
+void HYDROData_CalculationCase::DumpSampleMeshing( QStringList& theResList,
+ const QString& theStudyName,
+ const QString& theGeomShapeName,
+ const QString& theMeshName ) const
+{
+ theResList << "";
+ theResList << "# Meshing";
+ theResList << "import SMESH, SALOMEDS";
+ theResList << "from salome.smesh import smeshBuilder";
+ theResList << "from salome.geom import geomBuilder";
+
+ theResList << QString( "smesh = smeshBuilder.New( %1 )" ).arg( theStudyName );
+ theResList << QString( "%1 = smesh.Mesh( %2 )" ).arg( theMeshName ).arg( theGeomShapeName );
+ theResList << QString( "MEFISTO_2D = %1.Triangle( algo=smeshBuilder.MEFISTO )" ).arg( theMeshName );
+ theResList << "Max_Element_Area_1 = MEFISTO_2D.MaxElementArea( 10 )";
+ theResList << QString( "Regular_1D = %1.Segment()" ).arg( theMeshName );
+ theResList << "Max_Size_1 = Regular_1D.MaxSize(10)";
+ theResList << QString( "isDone = %1.Compute()" ).arg( theMeshName );
+
+ theResList << "";
+ theResList << "# Set names of Mesh objects";
+ theResList << "smesh.SetName( MEFISTO_2D.GetAlgorithm(), 'MEFISTO_2D' )";
+ theResList << "smesh.SetName( Regular_1D.GetAlgorithm(), 'Regular_1D' )";
+ theResList << "smesh.SetName( Max_Size_1, 'Max Size_1' )";
+ theResList << "smesh.SetName( Max_Element_Area_1, 'Max. Element Area_1' )";
+ theResList << QString( "smesh.SetName( %1.GetMesh(), '%1' )" ).arg( theMeshName );
+
+ theResList << "";
+ theResList << "# Greate SMESH groups";
+ theResList << QString( "geompy = geomBuilder.New( %1 )" ).arg( theStudyName );
+ theResList << QString( "geom_groups = geompy.GetGroups( %1 )" ).arg( theGeomShapeName );
+ theResList << QString( "for group in geom_groups:" );
+ theResList << QString( " smesh_group = %1.GroupOnGeom(group, group.GetName(), SMESH.EDGE)" )
+ .arg( theMeshName );
+ theResList << QString( " smesh.SetName(smesh_group, group.GetName())" );
+ theResList << QString( " print \"SMESH group '%s': %s\" % (smesh_group.GetName(), smesh_group)" );
+}
+
HYDROData_SequenceOfObjects HYDROData_CalculationCase::GetAllReferenceObjects() const
{
HYDROData_SequenceOfObjects aResSeq = HYDROData_Entity::GetAllReferenceObjects();
void HYDROData_CalculationCase::Update()
{
HYDROData_Entity::Update();
+ SetWarning();
// At first we remove previously created objects
RemoveRegions();
HYDROData_SequenceOfObjects aGeomGroups = GetGeometryGroups();
- HYDROData_SplitToZonesTool::SplitDataList aSplitedObjects =
+ HYDROData_SplitToZonesTool::SplitDataList aSplitObjects =
HYDROData_SplitToZonesTool::Split( aGeomObjects, aGeomGroups, aBoundaryPolyline );
- if ( aSplitedObjects.isEmpty() )
+ if ( aSplitObjects.isEmpty() )
return;
- QString aRegsPref = CALCULATION_REGIONS_PREF;
- QString aZonesPref = CALCULATION_ZONES_PREF;
+ HYDROData_SplitToZonesTool::SplitDataList aZonesList, anEdgesList;
- QMap<QString,Handle(HYDROData_SplittedShapesGroup)> aSplittedEdgesGroupsMap;
+ HYDROData_SplitToZonesTool::SplitDataListIterator anIter( aSplitObjects );
+ while( anIter.hasNext() )
+ {
+ const HYDROData_SplitToZonesTool::SplitData& aSplitData = anIter.next();
+ if ( aSplitData.Type == HYDROData_SplitToZonesTool::SplitData::Data_Zone )
+ aZonesList.append( aSplitData );
+ else if ( aSplitData.Type == HYDROData_SplitToZonesTool::SplitData::Data_Edge )
+ anEdgesList.append( aSplitData );
+ }
+
+ switch( GetAssignmentMode() )
+ {
+ case MANUAL:
+ CreateRegionsDef( aDocument, aZonesList );
+ break;
+ case AUTOMATIC:
+ CreateRegionsAuto( aDocument, aZonesList );
+ break;
+ }
+ CreateEdgeGroupsDef( aDocument, anEdgesList );
+}
+void HYDROData_CalculationCase::CreateRegionsDef( const Handle(HYDROData_Document)& theDoc,
+ const HYDROData_SplitToZonesTool::SplitDataList& theZones )
+{
// Create result regions for case, by default one zone for one region
- HYDROData_SplitToZonesTool::SplitDataListIterator anIter( aSplitedObjects );
+ QString aRegsPref = CALCULATION_REGIONS_PREF;
+ QString aZonesPref = CALCULATION_ZONES_PREF;
+
+ HYDROData_SplitToZonesTool::SplitDataListIterator anIter( theZones );
while( anIter.hasNext() )
{
const HYDROData_SplitToZonesTool::SplitData& aSplitData = anIter.next();
+ // Create new region
+ Handle(HYDROData_Region) aRegion = addNewRegion( theDoc, aRegsPref );
- if ( aSplitData.Type == HYDROData_SplitToZonesTool::SplitData::Data_Zone )
- {
- // Create new region
- Handle(HYDROData_Region) aRegion = addNewRegion();
-
- QString aRegionName = HYDROData_Tool::GenerateObjectName( aDocument, aRegsPref );
- aRegion->SetName( aRegionName );
+ // Add the zone for region
+ Handle(HYDROData_Zone) aRegionZone = aRegion->addNewZone( theDoc, aZonesPref, aSplitData.Face(), aSplitData.ObjectNames );
+ }
+}
- // Add the zone for region
- Handle(HYDROData_Zone) aRegionZone = aRegion->addNewZone();
+void HYDROData_CalculationCase::CreateRegionsAuto( const Handle(HYDROData_Document)& theDoc,
+ const HYDROData_SplitToZonesTool::SplitDataList& theZones )
+{
+ QMap<QString, Handle(HYDROData_Region)> aRegionsMap; //object name to region
+ QMap<QString, QString> aRegionNameToObjNameMap;
+ QString aZonesPref = CALCULATION_ZONES_PREF;
+ HYDROData_PriorityQueue aPr( this );
- QString aZoneName = HYDROData_Tool::GenerateObjectName( aDocument, aZonesPref );
- aRegionZone->SetName( aZoneName );
+ // 1. First we create a default region for each object included into the calculation case
+ HYDROData_SequenceOfObjects aGeomObjects = GetGeometryObjects();
+ for( int i=aGeomObjects.Lower(), n=aGeomObjects.Upper(); i<=n; i++ )
+ {
+ Handle(HYDROData_Object) anObj = Handle(HYDROData_Object)::DownCast( aGeomObjects.Value( i ) );
+ if( anObj.IsNull() )
+ continue;
+ QString anObjName = anObj->GetName();
+ QString aRegName = anObjName + "_reg";
+ Handle(HYDROData_Region) aRegion = addNewRegion( theDoc, aRegName, false );
+ aRegionsMap.insert( anObjName, aRegion );
+ aRegionNameToObjNameMap.insert( aRegName, anObjName );
+ }
- aRegionZone->SetShape( aSplitData.Face() );
+ // 2. Now for each zone it is necessary to determine the most priority object
+ // and assign to zone to corresponding region
+ HYDROData_SplitToZonesTool::SplitDataListIterator anIter( theZones );
+ while( anIter.hasNext() )
+ {
+ const HYDROData_SplitToZonesTool::SplitData& aSplitData = anIter.next();
+ HYDROData_Zone::MergeAltitudesType aMergeType;
+ Handle(HYDROData_Object) aRegObj = aPr.GetMostPriorityObject( aSplitData.ObjectNames, aMergeType );
+ if( aRegObj.IsNull() )
+ continue;
+ Handle(HYDROData_Region) aRegion = aRegionsMap[aRegObj->GetName()];
+ if( aRegion.IsNull() )
+ continue;
+ Handle(HYDROData_Zone) aRegionZone = aRegion->addNewZone( theDoc, aZonesPref, aSplitData.Face(), aSplitData.ObjectNames );
- // Add the reference object for zone
- for ( int i = 0, n = aSplitData.ObjectNames.length(); i < n; ++i )
- {
- const QString& anObjName = aSplitData.ObjectNames.at( i );
-
- Handle(HYDROData_Object) aRefObject =
- Handle(HYDROData_Object)::DownCast( aDocument->FindObjectByName( anObjName ) );
- if ( aRefObject.IsNull() )
- continue;
+ if( aSplitData.ObjectNames.count() > 1 && aMergeType==HYDROData_Zone::Merge_UNKNOWN )
+ {
+ qDebug( "Error in algorithm: unresolved conflicts" );
+ }
- aRegionZone->AddGeometryObject( aRefObject );
- }
+ switch( aMergeType )
+ {
+ case HYDROData_Zone::Merge_ZMIN:
+ case HYDROData_Zone::Merge_ZMAX:
+ aRegionZone->SetMergeType( aMergeType );
+ break;
+ case HYDROData_Zone::Merge_Object:
+ aRegionZone->SetMergeType( aMergeType );
+ aRegionZone->RemoveMergeAltitude();
+ aRegionZone->SetMergeAltitude( aRegObj->GetAltitudeObject() );
+ break;
}
- else if ( aSplitData.Type == HYDROData_SplitToZonesTool::SplitData::Data_Edge )
+ }
+
+ QStringList anObjectsWithEmptyRegions;
+ QMap<QString, Handle(HYDROData_Region)>::const_iterator
+ anIt = aRegionsMap.begin(), aLast = aRegionsMap.end();
+ for( ; anIt!=aLast; anIt++ )
+ {
+ Handle(HYDROData_Region) aRegion = anIt.value();
+ if( aRegion->GetZones().IsEmpty() )
{
- // Create new edges group
- if ( aSplitData.ObjectNames.isEmpty() || aSplitData.Shape.IsNull() )
- continue;
+ QString aRegName = aRegion->GetName();
+ QString anObjName = aRegionNameToObjNameMap[aRegName];
+ anObjectsWithEmptyRegions.append( anObjName );
+ }
+ }
+
+ if( !anObjectsWithEmptyRegions.empty() )
+ {
+ QString aData = anObjectsWithEmptyRegions.join( ", " );
+ SetWarning( WARN_EMPTY_REGIONS, aData );
+ }
+}
- QString anObjName = aSplitData.ObjectNames.first();
- if ( anObjName.isEmpty() )
- continue;
+void HYDROData_CalculationCase::CreateEdgeGroupsDef( const Handle(HYDROData_Document)& theDoc,
+ const HYDROData_SplitToZonesTool::SplitDataList& theEdges )
+{
+ QMap<QString,Handle(HYDROData_SplittedShapesGroup)> aSplittedEdgesGroupsMap;
+
+ HYDROData_SplitToZonesTool::SplitDataListIterator anIter( theEdges );
+ while( anIter.hasNext() )
+ {
+ const HYDROData_SplitToZonesTool::SplitData& aSplitData = anIter.next();
+ // Create new edges group
+ if ( aSplitData.ObjectNames.isEmpty() || aSplitData.Shape.IsNull() )
+ continue;
+
+ QString anObjName = aSplitData.ObjectNames.first();
+ if ( anObjName.isEmpty() )
+ continue;
#ifdef DEB_CALCULATION
- QString aStr = aSplitData.ObjectNames.join(" ");
+ QString aStr = aSplitData.ObjectNames.join(" ");
cout << " CCase: Names = "<<aStr.toStdString() << " size = " <<aSplitData.ObjectNames.size() <<endl;
#endif
- Handle(HYDROData_SplittedShapesGroup) aSplittedGroup;
- if ( !aSplittedEdgesGroupsMap.contains( anObjName ) )
- {
- aSplittedGroup = addNewSplittedGroup();
-
- QString aCalcGroupName = CALCULATION_GROUPS_PREF + anObjName;
- aSplittedGroup->SetName( aCalcGroupName );
-
- aSplittedEdgesGroupsMap.insert( anObjName, aSplittedGroup );
- }
- else
- {
- aSplittedGroup = aSplittedEdgesGroupsMap[ anObjName ];
- }
-
- if ( aSplittedGroup.IsNull() )
- continue;
-
- aSplittedGroup->AddShape( aSplitData.Shape );
+ Handle(HYDROData_SplittedShapesGroup) aSplittedGroup;
+ if ( !aSplittedEdgesGroupsMap.contains( anObjName ) )
+ {
+ aSplittedGroup = addNewSplittedGroup( CALCULATION_GROUPS_PREF + anObjName );
+ aSplittedEdgesGroupsMap.insert( anObjName, aSplittedGroup );
+ }
+ else
+ {
+ aSplittedGroup = aSplittedEdgesGroupsMap[ anObjName ];
}
+ if ( aSplittedGroup.IsNull() )
+ continue;
+
+ aSplittedGroup->AddShape( aSplitData.Shape );
}
}
Handle(HYDROData_Region) HYDROData_CalculationCase::AddNewRegion( const Handle(HYDROData_Zone)& theZone )
{
- Handle(HYDROData_Region) aNewRegion = addNewRegion();
+ Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( myLab );
+ Handle(HYDROData_Region) aNewRegion = addNewRegion( aDocument, CALCULATION_REGIONS_PREF );
if ( aNewRegion.IsNull() )
return aNewRegion;
- // Generate new name for new region
- Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( myLab );
- if ( !aDocument.IsNull() )
- {
- QString aRegsPref = CALCULATION_REGIONS_PREF;
-
- QString aNewRegionName = HYDROData_Tool::GenerateObjectName( aDocument, aRegsPref );
- aNewRegion->SetName( aNewRegionName );
- }
-
aNewRegion->AddZone( theZone );
return aNewRegion;
bool HYDROData_CalculationCase::AddRegion( const Handle(HYDROData_Region)& theRegion )
{
+ Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( myLab );
+
if ( theRegion.IsNull() )
return false;
Handle(HYDROData_CalculationCase)::DownCast( theRegion->GetFatherObject() );
if ( !aFatherCalc.IsNull() && aFatherCalc->Label() != myLab )
{
- Handle(HYDROData_Region) aNewRegion = addNewRegion();
+ Handle(HYDROData_Region) aNewRegion = addNewRegion( aDocument, CALCULATION_REGIONS_PREF );
theRegion->CopyTo( aNewRegion );
aFatherCalc->RemoveRegion( theRegion );
return GetAltitudeForPoint( thePoint, aZone );
}
+double HYDROData_CalculationCase::GetAltitudeForPoint( const gp_XY& thePoint,
+ const Handle(HYDROData_Region)& theRegion ) const
+{
+ double aResAltitude = HYDROData_IAltitudeObject::GetInvalidAltitude();
+
+ Handle(HYDROData_Zone) aZone = GetZoneFromPoint( thePoint );
+ if ( !aZone.IsNull() )
+ {
+ Handle(HYDROData_Region) aRefRegion = Handle(HYDROData_Region)::DownCast( aZone->GetFatherObject() );
+ if ( IsEqual( aRefRegion, theRegion ) )
+ aResAltitude = GetAltitudeForPoint( thePoint, aZone );
+ }
+
+ return aResAltitude;
+}
+
double HYDROData_CalculationCase::GetAltitudeForPoint( const gp_XY& thePoint,
const Handle(HYDROData_Zone)& theZone ) const
{
return aResAltitude;
}
+NCollection_Sequence<double> HYDROData_CalculationCase::GetAltitudesForPoints(
+ const NCollection_Sequence<gp_XY>& thePoints,
+ const Handle(HYDROData_Region)& theRegion ) const
+{
+ NCollection_Sequence<double> aResSeq;
+
+ for ( int i = 1, n = thePoints.Length(); i <= n; ++i )
+ {
+ const gp_XY& thePnt = thePoints.Value( i );
+
+ double anAltitude = GetAltitudeForPoint( thePnt, theRegion );
+ aResSeq.Append( anAltitude );
+ }
+
+ return aResSeq;
+}
+
NCollection_Sequence<double> HYDROData_CalculationCase::GetAltitudesForPoints(
const NCollection_Sequence<gp_XY>& thePoints,
const Handle(HYDROData_Zone)& theZone ) const
return aResSeq;
}
+Handle(HYDROData_Region) HYDROData_CalculationCase::GetRegionFromPoint( const gp_XY& thePoint ) const
+{
+ Handle(HYDROData_Region) aResRegion;
+
+ Handle(HYDROData_Zone) aZone = GetZoneFromPoint( thePoint );
+ if ( !aZone.IsNull() )
+ aResRegion = Handle(HYDROData_Region)::DownCast( aZone->GetFatherObject() );
+
+ return aResRegion;
+}
+
Handle(HYDROData_Zone) HYDROData_CalculationCase::GetZoneFromPoint( const gp_XY& thePoint ) const
{
Handle(HYDROData_Zone) aResZone;
TopoDS_Face aZoneFace = TopoDS::Face( theZone->GetShape() );
if ( aZoneFace.IsNull() )
return aRes;
-
+#ifdef DEB_CLASS2D
+ TopoDS_Compound aCmp;
+ BRep_Builder aBB;
+ aBB.MakeCompound(aCmp);
+ aBB.Add(aCmp, aZoneFace);
+ gp_Pnt aPnt (thePoint.X(), thePoint.Y(), 0.);
+ BRepBuilderAPI_MakeVertex aMk(aPnt);
+ aBB.Add(aCmp, aMk.Vertex());
+ BRepTools::Write(aCmp, "FCL2d.brep");
+#endif
TopAbs_State State = HYDROData_Tool::ComputePointState(thePoint, aZoneFace);
if (State == TopAbs_OUT)
aRes = POINT_OUT;
return aRes;
}
-Handle(HYDROData_Region) HYDROData_CalculationCase::addNewRegion()
+Handle(HYDROData_Region) HYDROData_CalculationCase::addNewRegion( const Handle(HYDROData_Document)& theDoc,
+ const QString& thePrefixOrName,
+ bool isPrefix )
{
TDF_Label aNewLab = myLab.FindChild( DataTag_ChildRegion ).NewChild();
+ int aTag = aNewLab.Tag();
Handle(HYDROData_Region) aNewRegion =
Handle(HYDROData_Region)::DownCast( HYDROData_Iterator::CreateObject( aNewLab, KIND_REGION ) );
AddRegion( aNewRegion );
+ QString aRegionName = isPrefix ? HYDROData_Tool::GenerateObjectName( theDoc, thePrefixOrName ) : thePrefixOrName;
+ aNewRegion->SetName( aRegionName );
+
return aNewRegion;
}
-Handle(HYDROData_SplittedShapesGroup) HYDROData_CalculationCase::addNewSplittedGroup()
+Handle(HYDROData_SplittedShapesGroup) HYDROData_CalculationCase::addNewSplittedGroup( const QString& theName )
{
TDF_Label aNewLab = myLab.FindChild( DataTag_SplittedGroups ).NewChild();
HYDROData_Iterator::CreateObject( aNewLab, KIND_SPLITTED_GROUP ) );
AddReferenceObject( aNewGroup, DataTag_SplittedGroups );
+ aNewGroup->SetName( theName );
+
return aNewGroup;
}
+QString HYDROData_CalculationCase::Export( int theStudyId ) const
+{
+ GEOM::GEOM_Gen_var aGEOMEngine = HYDROData_GeomTool::GetGeomGen();
+ SALOMEDS::Study_var aDSStudy = HYDROData_GeomTool::GetStudyByID( theStudyId );
+
+ QString aGeomObjEntry;
+ bool isOK = Export( aGEOMEngine, aDSStudy, aGeomObjEntry );
+ return isOK ? aGeomObjEntry : QString();
+}
+
bool HYDROData_CalculationCase::Export( GEOM::GEOM_Gen_var theGeomEngine,
- SALOMEDS::Study_ptr theStudy ) const
+ SALOMEDS::Study_ptr theStudy,
+ QString& theGeomObjEntry ) const
{
HYDROData_ShapesGroup::SeqOfGroupsDefs aSeqOfGroupsDefs;
aFaces.Append( aRegionShape );
}
- return Export( theGeomEngine, theStudy, aFaces, aSeqOfGroupsDefs );
+ return Export( theGeomEngine, theStudy, aFaces, aSeqOfGroupsDefs, theGeomObjEntry );
}
bool HYDROData_CalculationCase::Export( GEOM::GEOM_Gen_var theGeomEngine,
SALOMEDS::Study_ptr theStudy,
const TopTools_ListOfShape& theFaces,
- const HYDROData_ShapesGroup::SeqOfGroupsDefs& theGroupsDefs ) const
+ const HYDROData_ShapesGroup::SeqOfGroupsDefs& theGroupsDefs,
+ QString& theGeomObjEntry ) const
{
// Sew faces
BRepBuilderAPI_Sewing aSewing( Precision::Confusion() * 10.0 );
// Publish the sewed shape
QString aName = EXPORT_NAME;
GEOM::GEOM_Object_ptr aMainShape =
- publishShapeInGEOM( theGeomEngine, theStudy, aSewedShape, aName );
+ publishShapeInGEOM( theGeomEngine, theStudy, aSewedShape, aName, theGeomObjEntry );
if ( aMainShape->_is_nil() )
return false;
#ifdef DEB_CALCULATION
cout << "\nOld shape(" << i << ") = " << aShape.TShape() <<endl;
#endif
- const TopoDS_Shape& aModifiedShape = aSewing.Modified( aShape );
- if ( aModifiedShape.IsNull() )
- continue;
+
+ TopoDS_Shape aModifiedShape = aShape;
+ if ( aSewing.IsModified( aShape ) )
+ aModifiedShape = aSewing.Modified( aShape );
+ else if ( aSewing.IsModifiedSubShape( aShape ) )
+ aModifiedShape = aSewing.ModifiedSubShape( aShape );
#ifdef DEB_CALCULATION
const TopLoc_Location& aL1 = aShape.Location();
GEOM::GEOM_Object_ptr HYDROData_CalculationCase::publishShapeInGEOM(
GEOM::GEOM_Gen_var theGeomEngine, SALOMEDS::Study_ptr theStudy,
- const TopoDS_Shape& theShape, const QString& theName ) const
+ const TopoDS_Shape& theShape, const QString& theName,
+ QString& theGeomObjEntry ) const
{
+ theGeomObjEntry = "";
GEOM::GEOM_Object_var aGeomObj;
if ( theGeomEngine->_is_nil() || theStudy->_is_nil() ||
// Puplish the GEOM object
if ( !aGeomObj->_is_nil() ) {
- QString aName = GEOMBase::GetDefaultName( theName );
+ QString aName = HYDROData_GeomTool::GetFreeName( theStudy, theName );
SALOMEDS::SObject_var aResultSO =
theGeomEngine->PublishInStudy( theStudy, SALOMEDS::SObject::_nil(),
if ( aResultSO->_is_nil() ) {
aGeomObj = GEOM::GEOM_Object::_nil();
}
+ else
+ theGeomObjEntry = aResultSO->GetID();
}
return aGeomObj._retn();
- }
+}
+
+void HYDROData_CalculationCase::ClearRules( const bool theIsSetToUpdate )
+{
+ TDF_Label aRulesLab = myLab.FindChild( DataTag_CustomRules );
+ HYDROData_PriorityQueue::ClearRules( aRulesLab );
+
+ // Indicate model of the need to update splitting
+ if ( theIsSetToUpdate ) {
+ SetToUpdate( true );
+ }
+}
+
+void HYDROData_CalculationCase::AddRule( const Handle(HYDROData_Object)& theObject1,
+ HYDROData_PriorityType thePriority,
+ const Handle(HYDROData_Object)& theObject2,
+ HYDROData_Zone::MergeAltitudesType theMergeType )
+{
+ TDF_Label aRulesLab = myLab.FindChild( DataTag_CustomRules );
+ HYDROData_PriorityQueue::AddRule( aRulesLab, theObject1, thePriority, theObject2, theMergeType );
+
+ // Indicate model of the need to update splitting
+ SetToUpdate( true );
+}
+
+QString HYDROData_CalculationCase::DumpRules() const
+{
+ TDF_Label aRulesLab = myLab.FindChild( DataTag_CustomRules );
+ return HYDROData_PriorityQueue::DumpRules( aRulesLab );
+}
+
+void HYDROData_CalculationCase::SetAssignmentMode( AssignmentMode theMode )
+{
+ TDF_Label aModeLab = myLab.FindChild( DataTag_AssignmentMode );
+ TDataStd_Integer::Set( aModeLab, ( int ) theMode );
+
+ // Indicate model of the need to update splitting
+ SetToUpdate( true );
+}
+
+HYDROData_CalculationCase::AssignmentMode HYDROData_CalculationCase::GetAssignmentMode() const
+{
+ Handle(TDataStd_Integer) aModeAttr;
+ bool isOK = myLab.FindChild( DataTag_AssignmentMode ).FindAttribute( TDataStd_Integer::GetID(), aModeAttr );
+ if( isOK )
+ return ( AssignmentMode ) aModeAttr->Get();
+ else
+ return MANUAL;
+}
+
+void HYDROData_CalculationCase::DumpRulesToPython( const QString& theCalcCaseName,
+ QStringList& theScript ) const
+{
+ TDF_Label aRulesLab = myLab.FindChild( DataTag_CustomRules );
+ HYDROData_PriorityQueue::DumpRulesToPython( aRulesLab, theCalcCaseName, theScript );
+}
+
+HYDROData_Warning HYDROData_CalculationCase::GetLastWarning() const
+{
+ return myLastWarning;
+}
+
+void HYDROData_CalculationCase::SetWarning( HYDROData_WarningType theType, const QString& theData )
+{
+ myLastWarning.Type = theType;
+ myLastWarning.Data = theData;
+}
+
+bool HYDROData_CalculationCase::GetRule( int theIndex,
+ Handle(HYDROData_Object)& theObject1,
+ HYDROData_PriorityType& thePriority,
+ Handle(HYDROData_Object)& theObject2,
+ HYDROData_Zone::MergeAltitudesType& theMergeType ) const
+{
+ TDF_Label aRulesLab = myLab.FindChild( DataTag_CustomRules );
+ return HYDROData_PriorityQueue::GetRule( aRulesLab, theIndex,
+ theObject1, thePriority, theObject2, theMergeType );
+}