X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_CalculationCase.cxx;h=2dd84bef4672b2a3a2f18bf2c900456278ebb7f7;hb=f9bd5128a1aed8c1974b1d1cfb87aff32191fa60;hp=b9c17a895048e8d78dcd6ff0f56b8d03f421540f;hpb=4b4f8231de194f5830fe198d00b9c687de081a4a;p=modules%2Fhydro.git diff --git a/src/HYDROData/HYDROData_CalculationCase.cxx b/src/HYDROData/HYDROData_CalculationCase.cxx index b9c17a89..2dd84bef 100644 --- a/src/HYDROData/HYDROData_CalculationCase.cxx +++ b/src/HYDROData/HYDROData_CalculationCase.cxx @@ -1,3 +1,20 @@ +// Copyright (C) 2014-2015 EDF-R&D +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #include "HYDROData_CalculationCase.h" @@ -8,9 +25,12 @@ #include "HYDROData_Iterator.h" #include "HYDROData_NaturalObject.h" #include "HYDROData_PolylineXY.h" +#include "HYDROData_StricklerTable.h" +#include "HYDROData_LandCover.h" #include "HYDROData_SplittedShapesGroup.h" #include "HYDROData_Region.h" #include "HYDROData_Tool.h" +#include "HYDROData_GeomTool.h" #include @@ -51,9 +71,8 @@ #include #include - - - +#define _DEVDEBUG_ +#include "HYDRO_trace.hxx" IMPLEMENT_STANDARD_HANDLE(HYDROData_CalculationCase, HYDROData_Entity) IMPLEMENT_STANDARD_RTTIEXT(HYDROData_CalculationCase, HYDROData_Entity) @@ -180,19 +199,9 @@ QStringList HYDROData_CalculationCase::DumpToPython( MapOfTreatedObjects& theTre if ( aRegion.IsNull() ) continue; - QString aRegionName = aRegion->GetName(); - - HYDROData_SequenceOfObjects aZones = aRegion->GetZones(); - HYDROData_SequenceOfObjects::Iterator aZonesIter( aZones ); - for ( ; aZonesIter.More(); aZonesIter.Next() ) - { - Handle(HYDROData_Zone) aRegZone = - Handle(HYDROData_Zone)::DownCast( aZonesIter.Value() ); - if ( aRegZone.IsNull() ) - continue; - - // TODO - } + theTreatedObjects.insert( aRegion->GetName(), aRegion ); + QStringList aRegDump = aRegion->DumpToPython( theTreatedObjects ); + aResList << aRegDump; } } @@ -228,6 +237,7 @@ void HYDROData_CalculationCase::DumpSampleMeshing( QStringList& 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 ); @@ -244,6 +254,16 @@ void HYDROData_CalculationCase::DumpSampleMeshing( QStringList& theResList, 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 @@ -334,7 +354,7 @@ void HYDROData_CalculationCase::CreateRegionsAuto( const Handle(HYDROData_Docume QMap aRegionsMap; //object name to region QMap aRegionNameToObjNameMap; QString aZonesPref = CALCULATION_ZONES_PREF; - HYDROData_PriorityQueue aPr( this ); + HYDROData_PriorityQueue aPr( this, DataTag_CustomRules ); // 1. First we create a default region for each object included into the calculation case HYDROData_SequenceOfObjects aGeomObjects = GetGeometryObjects(); @@ -357,7 +377,8 @@ void HYDROData_CalculationCase::CreateRegionsAuto( const Handle(HYDROData_Docume { const HYDROData_SplitToZonesTool::SplitData& aSplitData = anIter.next(); HYDROData_Zone::MergeAltitudesType aMergeType; - Handle(HYDROData_Object) aRegObj = aPr.GetMostPriorityObject( aSplitData.ObjectNames, aMergeType ); + Handle(HYDROData_Object) aRegObj = + Handle(HYDROData_Object)::DownCast( aPr.GetMostPriorityObject( aSplitData.ObjectNames, aMergeType ) ); if( aRegObj.IsNull() ) continue; Handle(HYDROData_Region) aRegion = aRegionsMap[aRegObj->GetName()]; @@ -548,6 +569,69 @@ void HYDROData_CalculationCase::RemoveBoundaryPolyline() SetToUpdate( !aPrevPolyline.IsNull() || IsMustBeUpdated() ); } +void HYDROData_CalculationCase::SetStricklerTable( const Handle(HYDROData_StricklerTable)& theStricklerTable ) +{ + Handle(HYDROData_StricklerTable) aPrevStricklerTable = GetStricklerTable(); + + SetReferenceObject( theStricklerTable, DataTag_StricklerTable ); + + // Indicate model of the need to update land covers partition + SetToUpdate( !IsEqual( aPrevStricklerTable, theStricklerTable ) || IsMustBeUpdated() ); +} + +Handle(HYDROData_StricklerTable) HYDROData_CalculationCase::GetStricklerTable() const +{ + return Handle(HYDROData_StricklerTable)::DownCast( + GetReferenceObject( DataTag_StricklerTable ) ); +} + +void HYDROData_CalculationCase::RemoveStricklerTable() +{ + Handle(HYDROData_StricklerTable) aPrevStricklerTable = GetStricklerTable(); + + ClearReferenceObjects( DataTag_StricklerTable ); + + // Indicate model of the need to update land covers partition + SetToUpdate( !aPrevStricklerTable.IsNull() || IsMustBeUpdated() ); +} + +bool HYDROData_CalculationCase::AddLandCover( const Handle(HYDROData_LandCover)& theLandCover ) +{ + if ( HasReference( theLandCover, DataTag_LandCover ) ) + return false; // Land cover is already in reference list + + AddReferenceObject( theLandCover, DataTag_LandCover ); + + // Indicate model of the need to update land covers partition + SetToUpdate( true ); + + return true; +} + +HYDROData_SequenceOfObjects HYDROData_CalculationCase::GetLandCovers() const +{ + return GetReferenceObjects( DataTag_LandCover ); +} + +void HYDROData_CalculationCase::RemoveLandCover( const Handle(HYDROData_LandCover)& theLandCover ) +{ + if ( theLandCover.IsNull() ) + return; + + RemoveReferenceObject( theLandCover->Label(), DataTag_LandCover ); + + // Indicate model of the need to update land cover partition + SetToUpdate( true ); +} + +void HYDROData_CalculationCase::RemoveLandCovers() +{ + ClearReferenceObjects( DataTag_LandCover ); + + // Indicate model of the need to update land cover partition + SetToUpdate( true ); +} + Handle(HYDROData_Region) HYDROData_CalculationCase::AddNewRegion( const Handle(HYDROData_Zone)& theZone ) { Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( myLab ); @@ -672,10 +756,20 @@ double HYDROData_CalculationCase::GetAltitudeForPoint( const gp_XY& 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 ); + else + { + DEBTRACE("GetAltitudeForPoint Region " << aRefRegion->GetName().toStdString() << " Zone " << aZone->GetName().toStdString() << " ---------------------------"); + aResAltitude = GetAltitudeForPoint( thePoint, aZone ); + } } + else + { + DEBTRACE(" --- GetAltitudeForPoint No Zone ---"); + } return aResAltitude; } @@ -683,6 +777,7 @@ double HYDROData_CalculationCase::GetAltitudeForPoint( const gp_XY& 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() ) return aResAltitude; @@ -770,6 +865,7 @@ NCollection_Sequence HYDROData_CalculationCase::GetAltitudesForPoints( const NCollection_Sequence& thePoints, const Handle(HYDROData_Region)& theRegion ) const { + //DEBTRACE("HYDROData_CalculationCase::GetAltitudesForPoints " << theRegion->GetName().toStdString()); NCollection_Sequence aResSeq; for ( int i = 1, n = thePoints.Length(); i <= n; ++i ) @@ -879,6 +975,7 @@ Handle(HYDROData_Region) HYDROData_CalculationCase::addNewRegion( const Handle(H 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 ) ); @@ -906,18 +1003,9 @@ Handle(HYDROData_SplittedShapesGroup) HYDROData_CalculationCase::addNewSplittedG QString HYDROData_CalculationCase::Export( int theStudyId ) const { - int argc = 0; - char** argv = 0; - CORBA::ORB_var anORB = CORBA::ORB_init( argc, argv, "omniORB4"/*CORBA::ORB_ID*/ ); - SALOME_NamingService aNameService( anORB ); - SALOME_LifeCycleCORBA aLCC( &aNameService ); - Engines::EngineComponent_var aComponent = aLCC.FindOrLoad_Component( "FactoryServer", "GEOM" ); - GEOM::GEOM_Gen_var aGEOMEngine = GEOM::GEOM_Gen::_narrow( aComponent ); + GEOM::GEOM_Gen_var aGEOMEngine = HYDROData_GeomTool::GetGeomGen(); + SALOMEDS::Study_var aDSStudy = HYDROData_GeomTool::GetStudyByID( theStudyId ); - CORBA::Object_var aSMObject = aNameService.Resolve("/myStudyManager"); - SALOMEDS::StudyManager_var aStudyManager = SALOMEDS::StudyManager::_narrow(aSMObject); - SALOMEDS::Study_var aDSStudy = aStudyManager->GetStudyByID( theStudyId ); - QString aGeomObjEntry; bool isOK = Export( aGEOMEngine, aDSStudy, aGeomObjEntry ); return isOK ? aGeomObjEntry : QString(); @@ -957,7 +1045,7 @@ bool HYDROData_CalculationCase::Export( GEOM::GEOM_Gen_var theGeomEngine, { Handle(HYDROData_Region) aRegion = Handle(HYDROData_Region)::DownCast( aRegionIter.Value() ); - if( aRegion.IsNull() ) + if( aRegion.IsNull() || !aRegion->IsSubmersible() ) continue; TopoDS_Shape aRegionShape = aRegion->GetShape( &aSeqOfGroupsDefs ); @@ -1025,7 +1113,7 @@ bool HYDROData_CalculationCase::Export( GEOM::GEOM_Gen_var // Publish the sewed shape QString aName = EXPORT_NAME; GEOM::GEOM_Object_ptr aMainShape = - publishShapeInGEOM( theGeomEngine, theStudy, aSewedShape, aName, theGeomObjEntry ); + HYDROData_GeomTool::publishShapeInGEOM( theGeomEngine, theStudy, aSewedShape, aName, theGeomObjEntry ); if ( aMainShape->_is_nil() ) return false; @@ -1122,55 +1210,10 @@ bool HYDROData_CalculationCase::Export( GEOM::GEOM_Gen_var return true; } -GEOM::GEOM_Object_ptr HYDROData_CalculationCase::publishShapeInGEOM( - GEOM::GEOM_Gen_var theGeomEngine, SALOMEDS::Study_ptr theStudy, - const TopoDS_Shape& theShape, const QString& theName, - QString& theGeomObjEntry ) const -{ - theGeomObjEntry = ""; - GEOM::GEOM_Object_var aGeomObj; - - if ( theGeomEngine->_is_nil() || theStudy->_is_nil() || - theShape.IsNull() ) { - return aGeomObj._retn(); - } - - std::ostringstream aStreamShape; - // Write TopoDS_Shape in ASCII format to the stream - BRepTools::Write( theShape, aStreamShape ); - // Returns the number of bytes that have been stored in the stream's buffer. - int aSize = aStreamShape.str().size(); - // Allocate octect buffer of required size - CORBA::Octet* anOctetBuf = SALOMEDS::TMPFile::allocbuf( aSize ); - // Copy ostrstream content to the octect buffer - memcpy( anOctetBuf, aStreamShape.str().c_str(), aSize ); - // Create TMPFile - SALOMEDS::TMPFile_var aSeqFile = new SALOMEDS::TMPFile( aSize, aSize, anOctetBuf, 1 ); - - // Restore shape from the stream and get the GEOM object - GEOM::GEOM_IInsertOperations_var anInsOp = theGeomEngine->GetIInsertOperations( theStudy->StudyId() ); - aGeomObj = anInsOp->RestoreShape( aSeqFile ); - - // Puplish the GEOM object - if ( !aGeomObj->_is_nil() ) { - QString aName = GEOMBase::GetDefaultName( theName ); - - SALOMEDS::SObject_var aResultSO = - theGeomEngine->PublishInStudy( theStudy, SALOMEDS::SObject::_nil(), - aGeomObj, qPrintable( aName ) ); - if ( aResultSO->_is_nil() ) { - aGeomObj = GEOM::GEOM_Object::_nil(); - } - else - theGeomObjEntry = aResultSO->GetID(); - } - - return aGeomObj._retn(); -} - -void HYDROData_CalculationCase::ClearRules( const bool theIsSetToUpdate ) +void HYDROData_CalculationCase::ClearRules( HYDROData_CalculationCase::DataTag theDataTag, + const bool theIsSetToUpdate ) { - TDF_Label aRulesLab = myLab.FindChild( DataTag_CustomRules ); + TDF_Label aRulesLab = myLab.FindChild( theDataTag ); HYDROData_PriorityQueue::ClearRules( aRulesLab ); // Indicate model of the need to update splitting @@ -1179,12 +1222,13 @@ void HYDROData_CalculationCase::ClearRules( const bool theIsSetToUpdate ) } } -void HYDROData_CalculationCase::AddRule( const Handle(HYDROData_Object)& theObject1, +void HYDROData_CalculationCase::AddRule( const Handle(HYDROData_Entity)& theObject1, HYDROData_PriorityType thePriority, - const Handle(HYDROData_Object)& theObject2, - HYDROData_Zone::MergeAltitudesType theMergeType ) + const Handle(HYDROData_Entity)& theObject2, + HYDROData_Zone::MergeAltitudesType theMergeType, + HYDROData_CalculationCase::DataTag theDataTag ) { - TDF_Label aRulesLab = myLab.FindChild( DataTag_CustomRules ); + TDF_Label aRulesLab = myLab.FindChild( theDataTag ); HYDROData_PriorityQueue::AddRule( aRulesLab, theObject1, thePriority, theObject2, theMergeType ); // Indicate model of the need to update splitting @@ -1235,12 +1279,32 @@ void HYDROData_CalculationCase::SetWarning( HYDROData_WarningType theType, const } bool HYDROData_CalculationCase::GetRule( int theIndex, - Handle(HYDROData_Object)& theObject1, + Handle(HYDROData_Entity)& theObject1, HYDROData_PriorityType& thePriority, - Handle(HYDROData_Object)& theObject2, - HYDROData_Zone::MergeAltitudesType& theMergeType ) const + Handle(HYDROData_Entity)& theObject2, + HYDROData_Zone::MergeAltitudesType& theMergeType, + HYDROData_CalculationCase::DataTag& theDataTag) const { - TDF_Label aRulesLab = myLab.FindChild( DataTag_CustomRules ); + TDF_Label aRulesLab = myLab.FindChild( theDataTag ); return HYDROData_PriorityQueue::GetRule( aRulesLab, theIndex, theObject1, thePriority, theObject2, theMergeType ); } + +void HYDROData_CalculationCase::SetAssignmentLandCoverMode( AssignmentMode theMode ) +{ + TDF_Label aModeLab = myLab.FindChild( DataTag_AssignmentLandCoverMode ); + TDataStd_Integer::Set( aModeLab, ( int ) theMode ); + + // Indicate model of the need to update land covers partition + SetToUpdate( true ); +} + +HYDROData_CalculationCase::AssignmentMode HYDROData_CalculationCase::GetAssignmentLandCoverMode() const +{ + Handle(TDataStd_Integer) aModeAttr; + bool isOK = myLab.FindChild( DataTag_AssignmentLandCoverMode ).FindAttribute( TDataStd_Integer::GetID(), aModeAttr ); + if( isOK ) + return ( AssignmentMode ) aModeAttr->Get(); + else + return MANUAL; +}