#include <SALOME_LifeCycleCORBA.hxx>
#endif
-#define _DEVDEBUG_
+//#define _DEVDEBUG_
#include "HYDRO_trace.hxx"
-IMPLEMENT_STANDARD_HANDLE(HYDROData_CalculationCase, HYDROData_Entity)
IMPLEMENT_STANDARD_RTTIEXT(HYDROData_CalculationCase, HYDROData_Entity)
HYDROData_CalculationCase::HYDROData_CalculationCase()
Handle(HYDROData_PolylineXY) aBoundaryPolyline = GetBoundaryPolyline();
setPythonReferenceObject( thePyScriptPath, theTreatedObjects, aResList, aBoundaryPolyline, "SetBoundaryPolyline" );
+ Handle(HYDROData_StricklerTable) aStricklerTable = GetStricklerTable();
+ setPythonReferenceObject( thePyScriptPath, theTreatedObjects, aResList, aStricklerTable, "SetStricklerTable" );
+
+ Handle(HYDROData_LandCoverMap) aLandCoverMap = GetLandCoverMap();
+ setPythonReferenceObject( thePyScriptPath, theTreatedObjects, aResList, aLandCoverMap, "SetLandCoverMap" );
+
if( aMode==AUTOMATIC )
DumpRulesToPython( aCalculName, aResList );
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 )
+ else if ( aSplitData.Type == HYDROData_SplitToZonesTool::SplitData::Data_Edge ||
+ aSplitData.Type == HYDROData_SplitToZonesTool::SplitData::Data_IntEdge)
anEdgesList.append( aSplitData );
}
}
continue;
aSplitGroup->AddShape( aSplitData.Shape );
+
+ TopTools_SequenceOfShape theShapes;
+ aSplitGroup->GetShapes(theShapes);
+
+ if (aSplitData.Type == HYDROData_SplitToZonesTool::SplitData::Data_IntEdge)
+ aSplitGroup->SetInternal(true);
}
}
{
Handle(HYDROData_LandCoverMap) aMap = Handle(HYDROData_LandCoverMap)::DownCast(
GetReferenceObject( DataTag_LandCoverMap ) );
+ DEBTRACE("GetLandCoverMap " << aMap.IsNull());
return aMap;
}
if ( aDocument.IsNull() )
return;
+ QString aRegsPref = CALCULATION_REGIONS_PREF;
+ std::map<int, Handle(HYDROData_Region)> IndToRegion; //index in the name of region to region itself
HYDROData_SequenceOfObjects aRegions = GetRegions();
HYDROData_SequenceOfObjects::Iterator anIter( aRegions );
+ QString aName;
+ int aVal;
for ( ; anIter.More(); anIter.Next() )
{
- Handle(HYDROData_Region) aRegion =
- Handle(HYDROData_Region)::DownCast( anIter.Value() );
+ Handle(HYDROData_Region) aRegion = Handle(HYDROData_Region)::DownCast( anIter.Value() );
if ( aRegion.IsNull() )
continue;
- aRegion->SetName( "" );
+ if (HYDROData_Tool::ExtractGeneratedObjectName(aRegion->GetName(), aVal, aName) && aName == aRegsPref)
+ IndToRegion[aVal] = aRegion;
}
- QString aRegsPref = CALCULATION_REGIONS_PREF;
-
- anIter.Init( aRegions );
- for ( ; anIter.More(); anIter.Next() )
- {
- Handle(HYDROData_Region) aRegion =
- Handle(HYDROData_Region)::DownCast( anIter.Value() );
- if ( aRegion.IsNull() )
- continue;
-
- QString aRegionName = HYDROData_Tool::GenerateObjectName( aDocument, aRegsPref );
- aRegion->SetName( aRegionName );
- }
+ int nbR = aRegions.Length();
+ std::map<int, Handle(HYDROData_Region)>::iterator it = IndToRegion.begin();
+ for( int i = 1; it != IndToRegion.end(); ++it )
+ if (it->first <= nbR + 1)
+ {
+ QString aNewName = QString("%1_%2").arg(aRegsPref).arg(QString::number(i));
+ it->second->SetName(aNewName);
+ i++;
+ }
}
void HYDROData_CalculationCase::RemoveRegion( const Handle(HYDROData_Region)& theRegion )
Handle(HYDROData_Zone) aZone = GetZoneFromPoint( thePoint );
if ( !aZone.IsNull() )
{
- //DEBTRACE("GetAltitudeForPoint Region " << theRegion->GetName().toStdString() << " Zone " << aZone->GetName().toStdString());
+ DEBTRACE("GetAltitudeForPoint Region " << theRegion->GetName().toStdString() << " Zone " << aZone->GetName().toStdString());
Handle(HYDROData_Region) aRefRegion = Handle(HYDROData_Region)::DownCast( aZone->GetFatherObject() );
if ( IsEqual( aRefRegion, theRegion ) )
aResAltitude = GetAltitudeForPoint( thePoint, aZone, theMethod );
const Handle(HYDROData_Zone)& theZone,
int theMethod) const
{
- //DEBTRACE("GetAltitudeForPoint Zone " << theZone->GetName().toStdString());
+ DEBTRACE("GetAltitudeForPoint Zone " << theZone->GetName().toStdString());
double aResAltitude = HYDROData_IAltitudeObject::GetInvalidAltitude();
if ( theZone.IsNull() )
{
}
HYDROData_Zone::MergeType aZoneMergeType = theZone->GetMergeType();
- //DEBTRACE("aZoneMergeType " << aZoneMergeType);
+ DEBTRACE("aZoneMergeType " << aZoneMergeType);
if ( !theZone->IsMergingNeed() )
{
aZoneMergeType = HYDROData_Zone::Merge_UNKNOWN;
- //DEBTRACE("---");
+ DEBTRACE("---");
}
else if ( aZoneMergeType == HYDROData_Zone::Merge_UNKNOWN )
{
}
else
{
- //DEBTRACE("aZoneMergeType != HYDROData_Zone::Merge_Object");
+ DEBTRACE("aZoneMergeType != HYDROData_Zone::Merge_Object");
HYDROData_SequenceOfObjects aZoneObjects = theZone->GetObjects();
HYDROData_SequenceOfObjects::Iterator anIter( aZoneObjects );
for ( ; anIter.More(); anIter.Next() )
}
else
{
- //DEBTRACE("aZoneInterpolator == NULL");
+ DEBTRACE("aZoneInterpolator == NULL");
aPointAltitude = anObjAltitude->GetAltitudeForPoint( thePoint, theMethod );
}
std::vector<double> HYDROData_CalculationCase::GetStricklerCoefficientForPoints(const std::vector<gp_XY>& thePoints,
double DefValue, bool UseMax ) const
{
+ DEBTRACE("GetStricklerCoefficientForPoints");
Handle( HYDROData_LandCoverMap ) aLCM = GetLandCoverMap();
Handle( HYDROData_StricklerTable ) aTable = GetStricklerTable();
std::vector<double> theCoeffs;
+ DEBTRACE("aLCM.IsNull() " << aLCM.IsNull());
+ DEBTRACE("aTable.IsNull() "<< aTable.IsNull());
if( aLCM.IsNull() || aTable.IsNull() )
return theCoeffs;
return theCoeffs;
}
+std::vector<int> HYDROData_CalculationCase::GetStricklerTypeForPoints( const std::vector<gp_XY>& thePoints ) const
+{
+ Handle( HYDROData_LandCoverMap ) aLCM = GetLandCoverMap();
+ Handle( HYDROData_StricklerTable ) aTable = GetStricklerTable();
+ std::vector<int> types;
+ if( aLCM.IsNull() || aTable.IsNull() )
+ return types;
+
+ aLCM->ClassifyPoints(thePoints, aTable, types );
+ return types;
+}
+
Handle(HYDROData_Region) HYDROData_CalculationCase::GetRegionFromPoint( const gp_XY& thePoint ) const
{
Handle(HYDROData_Region) aResRegion;
SALOMEDS::Study_var aDSStudy = HYDROData_GeomTool::GetStudyByID( theStudyId );
QString aGeomObjEntry, anErrorMsg;
- bool isOK = Export( aGEOMEngine, aDSStudy, aGeomObjEntry, anErrorMsg );
+ QString statMess;
+ bool isOK = Export( aGEOMEngine, aDSStudy, aGeomObjEntry, anErrorMsg, statMess );
return isOK ? aGeomObjEntry : QString();
#endif
}
bool HYDROData_CalculationCase::Export( GEOM::GEOM_Gen_var theGeomEngine,
SALOMEDS::Study_ptr theStudy,
QString& theGeomObjEntry,
- QString& theErrorMsg ) const
+ QString& theErrorMsg,
+ QString& statMess) const
{
HYDROData_ShapesGroup::SeqOfGroupsDefs aSeqOfGroupsDefs;
// Get groups definitions
HYDROData_SequenceOfObjects aSplitGroups = GetSplitGroups();
+ TopTools_SequenceOfShape IntSh; //internal edges
HYDROData_SequenceOfObjects::Iterator anIter( aSplitGroups );
for ( ; anIter.More(); anIter.Next() )
{
aGroup->GetShapes( aGroupDef.Shapes );
aSeqOfGroupsDefs.Append( aGroupDef );
+
+ Handle(HYDROData_SplitShapesGroup) aSSGroup = Handle(HYDROData_SplitShapesGroup)::DownCast( anIter.Value() );
+ TopTools_SequenceOfShape dummy;
+ if (!aSSGroup.IsNull())
+ if (aSSGroup->GetInternal())
+ {
+ aSSGroup->GetShapes(dummy);
+ IntSh.Append(dummy);
+ }
+
}
// Get faces
bool isAllNotSubmersible = true;
- TopTools_ListOfShape aFaces;
HYDROData_SequenceOfObjects aCaseRegions = GetRegions();
HYDROData_SequenceOfObjects::Iterator aRegionIter( aCaseRegions );
+ NCollection_IndexedDataMap<TopoDS_Shape, QString> aShToNames;
for ( ; aRegionIter.More(); aRegionIter.Next() )
{
Handle(HYDROData_Region) aRegion =
if ( isAllNotSubmersible )
isAllNotSubmersible = false;
- TopoDS_Shape aRegionShape = aRegion->GetShape( &aSeqOfGroupsDefs );
- aFaces.Append( aRegionShape );
+ TopoDS_Shape aRegionShape = aRegion->GetShape( &aSeqOfGroupsDefs, &IntSh );
+ aShToNames.Add( aRegionShape, aRegion->GetName() );
}
bool aRes = false;
} else if ( isAllNotSubmersible ) {
theErrorMsg = QString("there are no submersible regions.");
} else {
- aRes = Export( theGeomEngine, theStudy, aFaces, aSeqOfGroupsDefs, theGeomObjEntry );;
+ aRes = Export( theGeomEngine, theStudy, aShToNames, aSeqOfGroupsDefs, theGeomObjEntry );;
}
if( aRes && !GetLandCoverMap().IsNull() && !GetStricklerTable().IsNull() )
{
QString aTelemacFileName = GetName() + ".telemac";
- aRes = GetLandCoverMap()->ExportTelemac( aTelemacFileName, 1E-2, GetStricklerTable() );
+ aRes = GetLandCoverMap()->ExportTelemac( aTelemacFileName, 1E-2, GetStricklerTable(), statMess );
+ if (!aRes)
+ theErrorMsg = QString( "The export to TELEMAC %1 failed" ).arg( aTelemacFileName );
}
return aRes;
}
bool HYDROData_CalculationCase::Export( GEOM::GEOM_Gen_var theGeomEngine,
SALOMEDS::Study_ptr theStudy,
- const TopTools_ListOfShape& theFaces,
+ const NCollection_IndexedDataMap<TopoDS_Shape, QString>& aShToName,
const HYDROData_ShapesGroup::SeqOfGroupsDefs& theGroupsDefs,
QString& theGeomObjEntry ) const
{
TCollection_AsciiString aNam("Sh_");
int i=1;
#endif
- TopTools_ListIteratorOfListOfShape aFaceIter( theFaces );
- for ( ; aFaceIter.More(); aFaceIter.Next() )
+ TopTools_DataMapOfShapeListOfShape SH2M;
+ for ( int i = 1; i <= aShToName.Extent(); i++ )
{
- TopoDS_Shape aShape = aFaceIter.Value();
+ const TopoDS_Shape& aShape = aShToName.FindKey(i);
if ( aShape.IsNull() )
continue;
- if ( aShape.ShapeType() == TopAbs_FACE )
+ SH2M.Bind(aShape, TopTools_ListOfShape());
+ TopTools_ListOfShape& LM = SH2M.ChangeFind(aShape);
+ if ( aShape.ShapeType() == TopAbs_FACE || aShape.ShapeType() == TopAbs_SHELL )
{
aSewing.Add( aShape );
-#ifdef DEB_CALCULATION
- TCollection_AsciiString aName = aNam + ++i + ".brep";
- BRepTools::Write(aShape ,aName.ToCString());
-#endif
+ LM.Append(aShape);
}
- else
+ else if (aShape.ShapeType() == TopAbs_COMPOUND)
{
-#ifdef DEB_CALCULATION
- int j = 1;
-#endif
- TopExp_Explorer anExp( aShape, TopAbs_FACE );
- for (; anExp.More(); anExp.Next() ) {
+ TopExp_Explorer anExp( aShape, TopAbs_SHELL );
+ 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
+ LM.Append(anExp.Current());
+ }
+ anExp.Init( aShape, TopAbs_FACE, TopAbs_SHELL );
+ for (; anExp.More(); anExp.Next() )
+ {
+ aSewing.Add( anExp.Current() );
+ LM.Append(anExp.Current());
}
}
} // faces iterator
aSewing.Perform();
TopoDS_Shape aSewedShape = aSewing.SewedShape();
+ NCollection_IndexedDataMap<TopoDS_Shape, QString, TopTools_ShapeMapHasher> aFacesToNameModif;
+
+ for ( int i = 1; i <= aShToName.Extent(); i++ )
+ {
+ const TopoDS_Shape& CurShape = aShToName.FindKey(i);
+ const QString& Qstr = aShToName.FindFromIndex(i);
+ const TopTools_ListOfShape& LM = SH2M(CurShape);
+ for (TopTools_ListIteratorOfListOfShape it(LM); it.More(); it.Next())
+ {
+ const TopoDS_Shape& csh = it.Value();
+ if (aSewing.IsModified(csh))
+ aFacesToNameModif.Add(aSewing.Modified(csh), Qstr);
+ else
+ aFacesToNameModif.Add(csh, Qstr);
+ }
+ }
+
+
// If the sewed shape is empty - return false
if ( aSewedShape.IsNull() || !TopoDS_Iterator( aSewedShape ).More() )
return false;
#ifdef DEB_CALCULATION
BRepTools::Write(aSewedShape ,"Sew.brep");
-#endif
- // Publish the sewed shape
+#endif // Publish the sewed shape
QString aName = EXPORT_NAME;
GEOM::GEOM_Object_ptr aMainShape =
- HYDROData_GeomTool::publishShapeInGEOM( theGeomEngine, theStudy, aSewedShape, aName, theGeomObjEntry );
+ HYDROData_GeomTool::ExplodeShapeInGEOMandPublish( theGeomEngine, theStudy, aSewedShape, aFacesToNameModif, aName, theGeomObjEntry );
if ( aMainShape->_is_nil() )
return false;
AddReferenceObject( theInterPolyline, aDataTag );
+ Changed( Geom_2d );
+
return true;
}
RemoveReferenceObject( theInterPolyline->Label(), DataTag_InterPoly );
+ Changed( Geom_2d );
}