Salome HOME
projects
/
modules
/
hydro.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
merge master
[modules/hydro.git]
/
src
/
HYDROData
/
HYDROData_CalculationCase.cxx
diff --git
a/src/HYDROData/HYDROData_CalculationCase.cxx
b/src/HYDROData/HYDROData_CalculationCase.cxx
index 5cb82351aa3abe54cef4759c09368d1671546f9c..58d15770f88c2b5172aaafee04b51771aede958e 100644
(file)
--- a/
src/HYDROData/HYDROData_CalculationCase.cxx
+++ b/
src/HYDROData/HYDROData_CalculationCase.cxx
@@
-77,6
+77,12
@@
#define EXPORT_NAME "HYDRO_" + GetName()
#define EXPORT_NAME "HYDRO_" + GetName()
+#include <SALOME_NamingService.hxx>
+#include <SALOME_LifeCycleCORBA.hxx>
+
+#define _DEVDEBUG_
+#include "HYDRO_trace.hxx"
+
IMPLEMENT_STANDARD_HANDLE(HYDROData_CalculationCase, HYDROData_Entity)
IMPLEMENT_STANDARD_RTTIEXT(HYDROData_CalculationCase, HYDROData_Entity)
IMPLEMENT_STANDARD_HANDLE(HYDROData_CalculationCase, HYDROData_Entity)
IMPLEMENT_STANDARD_RTTIEXT(HYDROData_CalculationCase, HYDROData_Entity)
@@
-326,6
+332,7
@@
void HYDROData_CalculationCase::CreateRegionsDef( const Handle(HYDROData_Documen
void HYDROData_CalculationCase::CreateRegionsAuto( const Handle(HYDROData_Document)& theDoc,
const HYDROData_SplitToZonesTool::SplitDataList& theZones )
{
void HYDROData_CalculationCase::CreateRegionsAuto( const Handle(HYDROData_Document)& theDoc,
const HYDROData_SplitToZonesTool::SplitDataList& theZones )
{
+ DEBTRACE("HYDROData_CalculationCase::CreateRegionsAuto");
QMap<QString, Handle(HYDROData_Region)> aRegionsMap; //object name to region
QMap<QString, QString> aRegionNameToObjNameMap;
QString aZonesPref = CALCULATION_ZONES_PREF;
QMap<QString, Handle(HYDROData_Region)> aRegionsMap; //object name to region
QMap<QString, QString> aRegionNameToObjNameMap;
QString aZonesPref = CALCULATION_ZONES_PREF;
@@
-368,6
+375,7
@@
void HYDROData_CalculationCase::CreateRegionsAuto( const Handle(HYDROData_Docume
Handle(HYDROData_Entity) aMergeEntity = aRegObj;
Handle(HYDROData_Object) aMergeObject = Handle(HYDROData_Object)::DownCast( aMergeEntity );
if ( !aMergeObject.IsNull() ) {
Handle(HYDROData_Entity) aMergeEntity = aRegObj;
Handle(HYDROData_Object) aMergeObject = Handle(HYDROData_Object)::DownCast( aMergeEntity );
if ( !aMergeObject.IsNull() ) {
+ DEBTRACE("aMergeEntity " << aMergeEntity->GetName().toStdString());
aMergeEntity = aMergeObject->GetAltitudeObject();
}
aMergeEntity = aMergeObject->GetAltitudeObject();
}
@@
-718,10
+726,20
@@
double HYDROData_CalculationCase::GetAltitudeForPoint( const gp_XY&
Handle(HYDROData_Zone) aZone = GetZoneFromPoint( thePoint );
if ( !aZone.IsNull() )
{
Handle(HYDROData_Zone) aZone = GetZoneFromPoint( thePoint );
if ( !aZone.IsNull() )
{
+ //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 );
Handle(HYDROData_Region) aRefRegion = Handle(HYDROData_Region)::DownCast( aZone->GetFatherObject() );
if ( IsEqual( aRefRegion, theRegion ) )
aResAltitude = GetAltitudeForPoint( thePoint, aZone );
+ else
+ {
+ DEBTRACE("GetAltitudeForPoint Region " << aRefRegion->GetName().toStdString() << " Zone " << aZone->GetName().toStdString() << " ---------------------------");
+ aResAltitude = GetAltitudeForPoint( thePoint, aZone );
+ }
}
}
+ else
+ {
+ DEBTRACE(" --- GetAltitudeForPoint No Zone ---");
+ }
return aResAltitude;
}
return aResAltitude;
}
@@
-729,17
+747,24
@@
double HYDROData_CalculationCase::GetAltitudeForPoint( const gp_XY&
double HYDROData_CalculationCase::GetAltitudeForPoint( const gp_XY& thePoint,
const Handle(HYDROData_Zone)& theZone ) const
{
double HYDROData_CalculationCase::GetAltitudeForPoint( const gp_XY& thePoint,
const Handle(HYDROData_Zone)& theZone ) const
{
+ //DEBTRACE("GetAltitudeForPoint Zone " << theZone->GetName().toStdString());
double aResAltitude = HYDROData_IAltitudeObject::GetInvalidAltitude();
if ( theZone.IsNull() )
double aResAltitude = HYDROData_IAltitudeObject::GetInvalidAltitude();
if ( theZone.IsNull() )
+ {
+ DEBTRACE("Zone nulle");
return aResAltitude;
return aResAltitude;
+ }
HYDROData_Zone::MergeType aZoneMergeType = theZone->GetMergeType();
HYDROData_Zone::MergeType aZoneMergeType = theZone->GetMergeType();
+ //DEBTRACE("aZoneMergeType " << aZoneMergeType);
if ( !theZone->IsMergingNeed() )
{
aZoneMergeType = HYDROData_Zone::Merge_UNKNOWN;
if ( !theZone->IsMergingNeed() )
{
aZoneMergeType = HYDROData_Zone::Merge_UNKNOWN;
+ //DEBTRACE("---");
}
else if ( aZoneMergeType == HYDROData_Zone::Merge_UNKNOWN )
{
}
else if ( aZoneMergeType == HYDROData_Zone::Merge_UNKNOWN )
{
+ DEBTRACE("GetAltitudeForPoint Zone " << theZone->GetName().toStdString() << " Merge_UNKNOWN");
return aResAltitude;
}
return aResAltitude;
}
@@
-752,15
+777,20
@@
double HYDROData_CalculationCase::GetAltitudeForPoint( const gp_XY&
{
if ( aZoneInterpolator != NULL )
{
{
if ( aZoneInterpolator != NULL )
{
+ DEBTRACE("aZoneInterpolator != NULL");
aZoneInterpolator->SetAltitudeObject( aMergeAltitude );
aResAltitude = aZoneInterpolator->GetAltitudeForPoint( thePoint );
}
else
aZoneInterpolator->SetAltitudeObject( aMergeAltitude );
aResAltitude = aZoneInterpolator->GetAltitudeForPoint( thePoint );
}
else
+ {
+ DEBTRACE("aZoneInterpolator == NULL");
aResAltitude = aMergeAltitude->GetAltitudeForPoint( thePoint );
aResAltitude = aMergeAltitude->GetAltitudeForPoint( thePoint );
+ }
}
}
else
{
}
}
else
{
+ //DEBTRACE("aZoneMergeType != HYDROData_Zone::Merge_Object");
HYDROData_SequenceOfObjects aZoneObjects = theZone->GetObjects();
HYDROData_SequenceOfObjects::Iterator anIter( aZoneObjects );
for ( ; anIter.More(); anIter.Next() )
HYDROData_SequenceOfObjects aZoneObjects = theZone->GetObjects();
HYDROData_SequenceOfObjects::Iterator anIter( aZoneObjects );
for ( ; anIter.More(); anIter.Next() )
@@
-777,11
+807,15
@@
double HYDROData_CalculationCase::GetAltitudeForPoint( const gp_XY&
double aPointAltitude = 0.0;
if ( aZoneInterpolator != NULL )
{
double aPointAltitude = 0.0;
if ( aZoneInterpolator != NULL )
{
+ DEBTRACE("aZoneInterpolator != NULL");
aZoneInterpolator->SetAltitudeObject( anObjAltitude );
aPointAltitude = aZoneInterpolator->GetAltitudeForPoint( thePoint );
}
else
aZoneInterpolator->SetAltitudeObject( anObjAltitude );
aPointAltitude = aZoneInterpolator->GetAltitudeForPoint( thePoint );
}
else
+ {
+ //DEBTRACE("aZoneInterpolator == NULL");
aPointAltitude = anObjAltitude->GetAltitudeForPoint( thePoint );
aPointAltitude = anObjAltitude->GetAltitudeForPoint( thePoint );
+ }
if ( ValuesEquals( aPointAltitude, HYDROData_IAltitudeObject::GetInvalidAltitude() ) )
continue;
if ( ValuesEquals( aPointAltitude, HYDROData_IAltitudeObject::GetInvalidAltitude() ) )
continue;
@@
-817,6
+851,7
@@
NCollection_Sequence<double> HYDROData_CalculationCase::GetAltitudesForPoints(
const NCollection_Sequence<gp_XY>& thePoints,
const Handle(HYDROData_Region)& theRegion ) const
{
const NCollection_Sequence<gp_XY>& thePoints,
const Handle(HYDROData_Region)& theRegion ) const
{
+ //DEBTRACE("HYDROData_CalculationCase::GetAltitudesForPoints " << theRegion->GetName().toStdString());
NCollection_Sequence<double> aResSeq;
for ( int i = 1, n = thePoints.Length(); i <= n; ++i )
NCollection_Sequence<double> aResSeq;
for ( int i = 1, n = thePoints.Length(); i <= n; ++i )
@@
-975,13
+1010,6
@@
QString HYDROData_CalculationCase::Export( int theStudyId ) const
QString aGeomObjEntry, anErrorMsg;
bool isOK = Export( aGEOMEngine, aDSStudy, aGeomObjEntry, anErrorMsg );
QString aGeomObjEntry, anErrorMsg;
bool isOK = Export( aGEOMEngine, aDSStudy, aGeomObjEntry, anErrorMsg );
- if( isOK && !GetLandCoverMap().IsNull() && !GetStricklerTable().IsNull() )
- {
- QString aTelemacFileName = GetName() + ".telemac";
- isOK = GetLandCoverMap()->ExportTelemac( aTelemacFileName, 1E-2, GetStricklerTable() );
- }
-
-
return isOK ? aGeomObjEntry : QString();
#endif
}
return isOK ? aGeomObjEntry : QString();
#endif
}
@@
-1043,6
+1071,11
@@
bool HYDROData_CalculationCase::Export( GEOM::GEOM_Gen_var theGeomEngine,
aRes = Export( theGeomEngine, theStudy, aFaces, aSeqOfGroupsDefs, theGeomObjEntry );;
}
aRes = Export( theGeomEngine, theStudy, aFaces, aSeqOfGroupsDefs, theGeomObjEntry );;
}
+ if( aRes && !GetLandCoverMap().IsNull() && !GetStricklerTable().IsNull() )
+ {
+ QString aTelemacFileName = GetName() + ".telemac";
+ aRes = GetLandCoverMap()->ExportTelemac( aTelemacFileName, 1E-2, GetStricklerTable() );
+ }
return aRes;
}
return aRes;
}