X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_CalculationOp.cxx;h=134c3bd0b2996beb4d13914db545b34c115e382b;hb=58bb6b7459bebeeb089c9ed486c4683a8bae7288;hp=edce573b2294e7e2bd3bc4afe9f68df1566c1e42;hpb=0c7423168f664beda3f61e840fce672e674782cc;p=modules%2Fhydro.git diff --git a/src/HYDROGUI/HYDROGUI_CalculationOp.cxx b/src/HYDROGUI/HYDROGUI_CalculationOp.cxx index edce573b..134c3bd0 100644 --- a/src/HYDROGUI/HYDROGUI_CalculationOp.cxx +++ b/src/HYDROGUI/HYDROGUI_CalculationOp.cxx @@ -21,7 +21,7 @@ #include "HYDROGUI_DataModel.h" #include "HYDROGUI_CalculationDlg.h" #include "HYDROGUI_Module.h" -#include "HYDROGUI_Tool.h" +#include "HYDROGUI_Tool2.h" #include "HYDROGUI_UpdateFlags.h" #include "HYDROGUI_Zone.h" #include "HYDROGUI_Region.h" @@ -57,9 +57,8 @@ HYDROGUI_CalculationOp::HYDROGUI_CalculationOp( HYDROGUI_Module* theModule, bool myActiveViewManager( NULL ), myPreviewViewManager( NULL ), myShowGeomObjects( true ), - myShowLandCovers( false ), - myShowZones( false ), - myUpdateLandCoverZonesPrs( false ) + myShowLandCoverMap( false ), + myShowZones( false ) { setName( myIsEdit ? tr( "EDIT_CALCULATION" ) : tr( "CREATE_CALCULATION" ) ); } @@ -99,6 +98,13 @@ void HYDROGUI_CalculationOp::startOperation() QStringList anEntryList; HYDROData_SequenceOfObjects aSeq = HYDROGUI_Tool::GetGeometryObjects( module() ); getNamesAndEntries( aSeq, aList, anEntryList ); + + QStringList List1; + QStringList EList1; + + //add intersection polylines + AddInterPolylinesToList(aList, anEntryList); + aPanel->setAllGeomObjects( aList, anEntryList ); // Get all polylines @@ -111,18 +117,18 @@ void HYDROGUI_CalculationOp::startOperation() { aPolylineObj = Handle(HYDROData_PolylineXY)::DownCast( anIter.Current() ); - if ( !aPolylineObj.IsNull() && aPolylineObj->IsClosed() ) + if ( !aPolylineObj.IsNull() && aPolylineObj->IsClosed(false) ) { - // Check the polyline shape - TopoDS_Shape aPolylineShape = aPolylineObj->GetShape(); - if ( !aPolylineShape.IsNull() && aPolylineShape.ShapeType() == TopAbs_WIRE ) { +// // Check the polyline shape +// TopoDS_Shape aPolylineShape = aPolylineObj->GetShape(); +// if ( !aPolylineShape.IsNull() && aPolylineShape.ShapeType() == TopAbs_WIRE ) { aPolylineName = aPolylineObj->GetName(); if ( !aPolylineName.isEmpty() ) { aList.append( aPolylineName ); anEntryList.append( HYDROGUI_DataObject::dataObjectEntry( aPolylineObj ) ); } - } +// } } } aPanel->setPolylineNames( aList, anEntryList ); @@ -148,7 +154,10 @@ void HYDROGUI_CalculationOp::startOperation() aPanel->setBoundary( aPolylineName ); } - aSeq = myEditedObject->GetGeometryObjects(); + aSeq = myEditedObject->GetGeometryObjects(); + HYDROData_SequenceOfObjects anInterPolyList = myEditedObject->GetInterPolyObjects(); + aSeq.Append(anInterPolyList); + getNamesAndEntries( aSeq, aList, anEntryList ); aPanel->includeGeomObjects( aList ); @@ -167,9 +176,31 @@ void HYDROGUI_CalculationOp::startOperation() aPanel->setObjectName( anObjectName ); aPanel->setEditedObject( myEditedObject ); + setGeomObjectsVisible( true ); + createPreview( false ); } +void HYDROGUI_CalculationOp::AddInterPolylinesToList(QStringList& theList, QStringList& theEntryList) +{ + HYDROData_Iterator anIter( doc(), KIND_POLYLINEXY ); + Handle(HYDROData_PolylineXY) aPolylineObj; + QString aPolylineName; + for ( ; anIter.More(); anIter.Next() ) + { + aPolylineObj = Handle(HYDROData_PolylineXY)::DownCast( anIter.Current() ); + if ( !aPolylineObj.IsNull()) + { + aPolylineName = aPolylineObj->GetName(); + if ( !aPolylineName.isEmpty() && !theList.contains(aPolylineName) ) + { + theList.append( aPolylineName ); + theEntryList.append(HYDROGUI_DataObject::dataObjectEntry( aPolylineObj )); + } + } + } +} + void HYDROGUI_CalculationOp::getNamesAndEntries( const HYDROData_SequenceOfObjects& theSeq, QStringList& theNames, QStringList& theEntries ) const { @@ -216,33 +247,24 @@ HYDROGUI_InputPanel* HYDROGUI_CalculationOp::createInputPanel() const connect( aPanel, SIGNAL( addGroups() ), SLOT( onAddGroups() ) ); connect( aPanel, SIGNAL( removeGroups() ), SLOT( onRemoveGroups() ) ); - connect( aPanel, SIGNAL( changeLandCoverMode( int ) ), SLOT( onChangeLandCoverMode( int ) ) ); - connect( aPanel, SIGNAL( addLandCovers() ), SLOT( onAddLandCovers() ) ); - connect( aPanel, SIGNAL( removeLandCovers() ), SLOT( onRemoveLandCovers() ) ); - connect( aPanel, SIGNAL( orderChanged( bool& ) ), SLOT( onOrderChanged( bool& ) ) ); - connect( aPanel, SIGNAL( orderLandCoverChanged( bool& ) ), SLOT( onOrderLandCoverChanged( bool& ) ) ); connect( aPanel, SIGNAL( ruleChanged( bool& ) ), SLOT( onRuleChanged( bool& ) ) ); - connect( aPanel, SIGNAL( ruleLandCoverChanged( bool& ) ), SLOT( onRuleLandCoverChanged( bool& ) ) ); connect( aPanel, SIGNAL( Next( const int ) ), SLOT( onNext( const int ) ) ); connect( aPanel, SIGNAL( Back( const int ) ), SLOT( onHideZones( const int ) ) ); //connect( aPanel, SIGNAL( clicked( SUIT_DataObject* ) ), SLOT( onSelected( SUIT_DataObject* ) ) ); connect( aPanel, SIGNAL( setMergeType( int, QString& ) ), SLOT( onSetMergeType( int, QString& ) ) ); - connect( aPanel, SIGNAL( setMergeStricklerType( int, QString& ) ), SLOT( onSetMergeStricklerType( int, QString& ) ) ); - connect( aPanel, SIGNAL( moveZones( SUIT_DataObject*, const QList&, bool ) ), - SLOT( onMoveZones( SUIT_DataObject*, const QList&, bool ) ) ); + connect( aPanel, SIGNAL( moveZones( SUIT_DataObject*, const QList& ) ), + SLOT( onMoveZones( SUIT_DataObject*, const QList& ) ) ); connect( aPanel, SIGNAL( createRegion( const QList& ) ), SLOT( onCreateRegion( const QList& ) ) ); connect( aPanel, SIGNAL( clickedInZonesBrowser( SUIT_DataObject* ) ), SLOT( onClickedInZonesBrowser( SUIT_DataObject* ) ) ); connect( aPanel, SIGNAL( objectsSelected() ), SLOT( onObjectsSelected() ) ); - connect( aPanel, SIGNAL( landCoversSelected() ), - SLOT( onLandCoversSelected() ) ); - connect( aPanel, SIGNAL( createLandCoverRegion( const QList& ) ), - SLOT( onCreateLandCoverRegion( const QList& ) ) ); + connect( aPanel, SIGNAL( landCoverMapSelected( const QString & ) ), + SLOT( onLandCoverMapSelected( const QString & ) ) ); connect( aPanel, SIGNAL( boundarySelected( const QString & ) ), SLOT( onBoundarySelected( const QString & ) ) ); connect( aPanel, SIGNAL( StricklerTableSelected( const QString & ) ), @@ -297,25 +319,12 @@ void HYDROGUI_CalculationOp::onStricklerTableSelected ( const QString & theObjNa { bool anIsToUpdateViewer = false; - // Remove old presentations of land covers from the operation viewer - Handle(HYDROData_Entity) anEntity; - Handle(HYDROData_LandCover) aLandCover; - HYDROData_SequenceOfObjects aLandCovers; - HYDROData_SequenceOfObjects aSeq = myEditedObject->GetLandCovers(); - HYDROData_SequenceOfObjects::Iterator anIter( aSeq ); - for ( ; anIter.More(); anIter.Next() ) + // Remove old presentation of land cover map from the operation viewer + Handle(HYDROData_LandCoverMap) aLandCoverMap = myEditedObject->GetLandCoverMap(); + if ( !aLandCoverMap.IsNull() ) { - anEntity = anIter.Value(); - if ( !anEntity.IsNull() ) - { - aLandCover = Handle(HYDROData_LandCover)::DownCast( anEntity ); - if ( !aLandCover.IsNull() ) - { - aLandCovers.Append( aLandCover ); - setObjectVisibility( aLandCover, false ); - anIsToUpdateViewer = true; - } - } + setObjectVisibility( aLandCoverMap, false ); + anIsToUpdateViewer = true; } // Set the selected Strickler table to the calculation case @@ -333,19 +342,10 @@ void HYDROGUI_CalculationOp::onStricklerTableSelected ( const QString & theObjNa Handle(AIS_InteractiveContext) aCtx = aViewer->getAISContext(); if ( !aCtx.IsNull() ) { - HYDROData_SequenceOfObjects::Iterator anIter( aLandCovers ); - for ( ; anIter.More(); anIter.Next() ) + if ( !aLandCoverMap.IsNull() ) { - anEntity = anIter.Value(); - if ( !anEntity.IsNull() ) - { - aLandCover = Handle(HYDROData_LandCover)::DownCast( anEntity ); - if ( !aLandCover.IsNull() ) - { - setObjectVisibility( aLandCover, true ); - anIsToUpdateViewer = true; - } - } + setObjectVisibility( aLandCoverMap, true ); + anIsToUpdateViewer = true; } } } @@ -397,45 +397,27 @@ void HYDROGUI_CalculationOp::onObjectsSelected() aLastShape->update( true, false ); } -void HYDROGUI_CalculationOp::onLandCoversSelected() +void HYDROGUI_CalculationOp::onLandCoverMapSelected( const QString & theObjName ) { - HYDROGUI_CalculationDlg* aPanel = - ::qobject_cast( inputPanel() ); - - QStringList aSelectedObjs = aPanel->getSelectedLandCovers(); - QMap aSelectedObjsMap; - foreach( QString aName, aSelectedObjs ) - aSelectedObjsMap[aName] = true; - + bool anIsToUpdateViewer = false; + + // Remove old presentation of land cover map from the operation viewer + Handle(HYDROData_LandCoverMap) aPrevLandCoverMap = myEditedObject->GetLandCoverMap(); + if ( !aPrevLandCoverMap.IsNull() ) + { + setObjectVisibility( aPrevLandCoverMap, false ); + anIsToUpdateViewer = true; + } - // Select the appropriate land cover shape in the viewer + // Select the appropriate land cover map shape in the viewer selectionMgr()->clearSelected(); - // Unhighlight all land covers except selected - HYDROGUI_Shape* aShape = 0, *aLastShape = 0; - Handle(HYDROData_Entity) anEntity; - HYDROData_SequenceOfObjects aSeq = myEditedObject->GetLandCovers(); - HYDROData_SequenceOfObjects::Iterator anIter( aSeq ); - bool isSelected; - QString aName; - for ( ; anIter.More(); anIter.Next() ) - { - anEntity = anIter.Value(); - if ( !anEntity.IsNull() ) - { - aShape = module()->getObjectShape( HYDROGUI_Module::VMR_PreviewCaseZones, anEntity ); - if ( aShape ) - { - aName = anEntity->GetName(); - isSelected = aSelectedObjsMap.contains( aName ); - aShape->highlight( isSelected, false ); - aShape->update( false, false ); - aLastShape = aShape; - } - } - } - if( aLastShape ) - aLastShape->update( true, false ); + // Set the selected land cover map to the calculation case + Handle(HYDROData_LandCoverMap) aNewLandCoverMap = Handle(HYDROData_LandCoverMap)::DownCast( + HYDROGUI_Tool::FindObjectByName( module(), theObjName, KIND_LAND_COVER_MAP ) ); + myEditedObject->SetLandCoverMap( aNewLandCoverMap ); + + createPreview( true ); } void HYDROGUI_CalculationOp::onClickedInZonesBrowser( SUIT_DataObject* theItem ) @@ -472,8 +454,7 @@ void HYDROGUI_CalculationOp::onClickedInZonesBrowser( SUIT_DataObject* theItem ) } void HYDROGUI_CalculationOp::onMoveZones( SUIT_DataObject* theRegionItem, - const QList& theZonesList, - bool theLandCover ) + const QList& theZonesList ) { HYDROGUI_Region* aRegion = dynamic_cast(theRegionItem); if ( aRegion ) @@ -495,17 +476,15 @@ void HYDROGUI_CalculationOp::onMoveZones( SUIT_DataObject* theRegionItem, HYDROGUI_CalculationDlg* aPanel = ::qobject_cast( inputPanel() ); if ( aPanel ) - { - theLandCover ? aPanel->refreshLandCoverZonesBrowser(): aPanel->refreshZonesBrowser(); - } - createPreview( theLandCover ); + aPanel->refreshZonesBrowser(); + createPreview( false ); } } } void HYDROGUI_CalculationOp::onCreateRegion( const QList& theZonesList ) { - if ( createRegion( theZonesList, false ) ) + if ( createRegion( theZonesList ) ) { HYDROGUI_CalculationDlg* aPanel = ::qobject_cast( inputPanel() ); @@ -517,20 +496,6 @@ void HYDROGUI_CalculationOp::onCreateRegion( const QList& theZ } } -void HYDROGUI_CalculationOp::onCreateLandCoverRegion( const QList& theZonesList ) -{ - if ( createRegion( theZonesList, true ) ) - { - HYDROGUI_CalculationDlg* aPanel = - ::qobject_cast( inputPanel() ); - if ( aPanel ) - { - aPanel->refreshLandCoverZonesBrowser(); - } - createPreview( true ); - } -} - void HYDROGUI_CalculationOp::onSetMergeType( int theMergeType, QString& theMergeObjectName ) { HYDROGUI_CalculationDlg* aPanel = @@ -551,26 +516,6 @@ void HYDROGUI_CalculationOp::onSetMergeType( int theMergeType, QString& theMerge } } -void HYDROGUI_CalculationOp::onSetMergeStricklerType( int theMergeType, QString& theStricklerTypeName ) -{ - HYDROGUI_CalculationDlg* aPanel = - ::qobject_cast( inputPanel() ); - if ( aPanel ) - { - HYDROGUI_Zone* aZone = aPanel->getCurrentZone(); - if ( aZone ) - { - aZone->setMergeType( theMergeType, theStricklerTypeName ); - HYDROGUI_Shape* aShape = module()->getObjectShape( HYDROGUI_Module::VMR_PreviewCaseZones, aZone->modelObject() ); - if ( aShape ) - { - aShape->update( true, false ); - } - } - aPanel->refreshLandCoverZonesBrowser(); - } -} - void HYDROGUI_CalculationOp::onAddObjects() { HYDROGUI_CalculationDlg* aPanel = @@ -595,6 +540,17 @@ void HYDROGUI_CalculationOp::onAddObjects() anAddedList.append( anObject->GetName() ); } + for (int i = 0; i < aSelectedList.length(); i++) + { + Handle(HYDROData_PolylineXY) aPoly = Handle(HYDROData_PolylineXY)::DownCast( + HYDROGUI_Tool::FindObjectByName( module(), aSelectedList.at( i ) ) ); + if ( aPoly.IsNull() ) + continue; + + if ( myEditedObject->AddInterPoly( aPoly ) ) + anAddedList.append( aPoly->GetName() ); + } + if ( !anAddedList.isEmpty() ) { aPanel->includeGeomObjects( anAddedList ); @@ -625,6 +581,17 @@ void HYDROGUI_CalculationOp::onRemoveObjects() myEditedObject->RemoveGeometryObject( anObject ); } + for (int i = 0; i < aSelectedList.length(); i++) + { + Handle(HYDROData_PolylineXY) aPoly = Handle(HYDROData_PolylineXY)::DownCast( + HYDROGUI_Tool::FindObjectByName( module(), aSelectedList.at(i) ) ); + if ( aPoly.IsNull() ) + continue; + + setObjectVisibility( aPoly, false ); + myEditedObject->RemoveInterPolyObject ( aPoly ); + } + module()->update( UF_OCCViewer ); aPanel->excludeGeomObjects( aSelectedList ); } @@ -632,11 +599,11 @@ void HYDROGUI_CalculationOp::onRemoveObjects() bool HYDROGUI_CalculationOp::confirmRegionsChange() const { // Check if the case is already modified or not - bool isConfirmed = myEditedObject->IsMustBeUpdated(); + bool isConfirmed = myEditedObject->IsMustBeUpdated( HYDROData_Entity::Geom_2d ); if ( !isConfirmed ) { // If not modified check if the case has already defined regions with zones - HYDROData_SequenceOfObjects aSeq = myEditedObject->GetRegions( false ); + HYDROData_SequenceOfObjects aSeq = myEditedObject->GetRegions(); if ( aSeq.Length() > 0 ) { // If there are already defined zones then ask a user to confirm zones recalculation @@ -657,11 +624,11 @@ bool HYDROGUI_CalculationOp::confirmRegionsChange() const bool HYDROGUI_CalculationOp::confirmOrderChange() const { // Check if the case is already modified or not - bool isConfirmed = myEditedObject->IsMustBeUpdated(); + bool isConfirmed = myEditedObject->IsMustBeUpdated( HYDROData_Entity::Geom_2d ); if ( !isConfirmed ) { // If not modified check if the case has already defined regions with zones - HYDROData_SequenceOfObjects aSeq = myEditedObject->GetRegions( false ); + HYDROData_SequenceOfObjects aSeq = myEditedObject->GetRegions(); if ( aSeq.Length() > 0 ) { // If there are already defined zones then ask a user to confirm zones recalculation @@ -682,11 +649,11 @@ bool HYDROGUI_CalculationOp::confirmOrderChange() const bool HYDROGUI_CalculationOp::confirmRuleChange() const { // Check if the case is already modified or not - bool isConfirmed = myEditedObject->IsMustBeUpdated(); + bool isConfirmed = myEditedObject->IsMustBeUpdated( HYDROData_Entity::Geom_2d ); if ( !isConfirmed ) { // If not modified check if the case has already defined regions with zones - HYDROData_SequenceOfObjects aSeq = myEditedObject->GetRegions( false ); + HYDROData_SequenceOfObjects aSeq = myEditedObject->GetRegions(); if ( aSeq.Length() > 0 ) { // If there are already defined zones then ask a user to confirm zones recalculation @@ -707,11 +674,11 @@ bool HYDROGUI_CalculationOp::confirmRuleChange() const bool HYDROGUI_CalculationOp::confirmModeChange() const { // Check if the case is already modified or not - bool isConfirmed = myEditedObject->IsMustBeUpdated(); + bool isConfirmed = myEditedObject->IsMustBeUpdated( HYDROData_Entity::Geom_2d ); if ( !isConfirmed ) { // If not modified check if the case has already defined regions with zones - HYDROData_SequenceOfObjects aSeq = myEditedObject->GetRegions( false ); + HYDROData_SequenceOfObjects aSeq = myEditedObject->GetRegions(); if ( aSeq.Length() > 0 ) { // If there are already defined zones then ask a user to confirm zones recalculation @@ -758,106 +725,6 @@ bool HYDROGUI_CalculationOp::confirmContinueWithWarning( const HYDROData_Warning return ( anAnswer == QMessageBox::Yes ); } -bool HYDROGUI_CalculationOp::confirmLandCoverRegionsChange() const -{ - // Check if the case is already modified or not - bool isConfirmed = myEditedObject->IsMustBeUpdated(); - if ( !isConfirmed ) - { - // If not modified check if the case has already defined regions with land cover zones - HYDROData_SequenceOfObjects aSeq = myEditedObject->GetRegions( true ); - if ( aSeq.Length() > 0 ) - { - // If there are already defined land cover zones then ask a user to confirm land cover zones recalculation - isConfirmed = ( SUIT_MessageBox::question( module()->getApp()->desktop(), - tr( "REGIONS_CHANGED" ), - tr( "CONFIRM_LAND_COVER_PARTITION_RECALCULATION_REGIONS" ), - QMessageBox::Yes | QMessageBox::No, - QMessageBox::No ) == QMessageBox::Yes ); - } - else - { - isConfirmed = true; // No regions - no land cover zones - nothing to recalculate - } - } - return isConfirmed; -} - -bool HYDROGUI_CalculationOp::confirmLandCoverModeChange() const -{ - // Check if the case is already modified or not - bool isConfirmed = myEditedObject->IsMustBeUpdated(); - if ( !isConfirmed ) - { - // If not modified check if the case has already defined regions with land cover zones - HYDROData_SequenceOfObjects aSeq = myEditedObject->GetRegions( true ); - if ( aSeq.Length() > 0 ) - { - // If there are already defined land cover zones then ask a user to confirm land cover zones recalculation - isConfirmed = ( SUIT_MessageBox::question( module()->getApp()->desktop(), - tr( "MODE_CHANGED" ), - tr( "CONFIRM_LAND_COVER_PARTITION_RECALCULATION_MODE" ), - QMessageBox::Yes | QMessageBox::No, - QMessageBox::No ) == QMessageBox::Yes ); - } - else - { - isConfirmed = true; // No regions - no land cover zones - nothing to recalculate - } - } - return isConfirmed; -} - -bool HYDROGUI_CalculationOp::confirmLandCoverOrderChange() const -{ - // Check if the case is already modified or not - bool isConfirmed = myEditedObject->IsMustBeUpdated(); - if ( !isConfirmed ) - { - // If not modified check if the case has already defined regions with land cover zones - HYDROData_SequenceOfObjects aSeq = myEditedObject->GetRegions( true ); - if ( aSeq.Length() > 0 ) - { - // If there are already defined land cover zones then ask a user to confirm land cover zones recalculation - isConfirmed = ( SUIT_MessageBox::question( module()->getApp()->desktop(), - tr( "ORDER_CHANGED" ), - tr( "CONFIRM_LAND_COVER_PARTITION_RECALCULATION_REGIONS" ), - QMessageBox::Yes | QMessageBox::No, - QMessageBox::No ) == QMessageBox::Yes ); - } - else - { - isConfirmed = true; // No regions - no land cover zones - nothing to recalculate - } - } - return isConfirmed; -} - -bool HYDROGUI_CalculationOp::confirmLandCoverRuleChange() const -{ - // Check if the case is already modified or not - bool isConfirmed = myEditedObject->IsMustBeUpdated(); - if ( !isConfirmed ) - { - // If not modified check if the case has already defined regions with land cover zones - HYDROData_SequenceOfObjects aSeq = myEditedObject->GetRegions( true ); - if ( aSeq.Length() > 0 ) - { - // If there are already defined land cover zones then ask a user to confirm land cover zones recalculation - isConfirmed = ( SUIT_MessageBox::question( module()->getApp()->desktop(), - tr( "RULE_CHANGED" ), - tr( "CONFIRM_LAND_COVER_PARTITION_RECALCULATION_REGIONS" ), - QMessageBox::Yes | QMessageBox::No, - QMessageBox::No ) == QMessageBox::Yes ); - } - else - { - isConfirmed = true; // No regions - no land cover zones - nothing to recalculate - } - } - return isConfirmed; -} - bool HYDROGUI_CalculationOp::processApply( int& theUpdateFlags, QString& theErrorMsg, QStringList& theBrowseObjectsEntries ) @@ -877,9 +744,6 @@ bool HYDROGUI_CalculationOp::processApply( int& theUpdateFlags, if ( aPanel->getMode() == HYDROData_CalculationCase::MANUAL ) { myEditedObject->ClearRules( HYDROData_CalculationCase::DataTag_CustomRules, false ); } - if ( aPanel->getLandCoverMode() == HYDROData_CalculationCase::MANUAL ) { - myEditedObject->ClearRules( HYDROData_CalculationCase::DataTag_CustomLandCoverRules, false ); - } theUpdateFlags = UF_Model | UF_OCCViewer | UF_OCC_Forced | UF_VTKViewer | UF_VTK_Forced | UF_VTK_Init; @@ -953,25 +817,57 @@ void HYDROGUI_CalculationOp::onNext( const int theIndex ) } else if( theIndex==2 ) { - // Land covers panel + // Land cover map panel HYDROGUI_CalculationDlg* aPanel = ::qobject_cast( inputPanel() ); if ( !aPanel ) return; - setLandCoversVisible( true ); + setLandCoverMapVisible( true ); QStringList aList; QStringList anEntryList; - HYDROData_SequenceOfObjects aSeq; + // Get all land cover map objects to fill in combo-box + Handle(HYDROData_LandCoverMap) aLandCoverMapObj; + QString aLandCoverMapName; + + aList.clear(); + anEntryList.clear(); + HYDROData_Iterator anIter( doc(), KIND_LAND_COVER_MAP ); + for ( ; anIter.More(); anIter.Next() ) + { + aLandCoverMapObj = Handle(HYDROData_LandCoverMap)::DownCast( anIter.Current() ); + + if ( !aLandCoverMapObj.IsNull() ) + { + aLandCoverMapName = aLandCoverMapObj->GetName(); + if ( !aLandCoverMapName.isEmpty() ) + { + aList.append( aLandCoverMapName ); + anEntryList.append( HYDROGUI_DataObject::dataObjectEntry( aLandCoverMapObj ) ); + } + } + } + aPanel->setLandCoverMapsNames( aList, anEntryList ); + aLandCoverMapObj = myEditedObject->GetLandCoverMap(); + if ( !aList.isEmpty() ) + { + if ( aLandCoverMapObj.IsNull() ) + aPanel->setLandCoverMap( aList.at( 0 ), false ); + else if ( myIsEdit ) + aPanel->setLandCoverMap( aList.at( 0 ), true ); + else + aPanel->setLandCoverMap( aList.at( aList.indexOf( aLandCoverMapObj->GetName() ) ), true ); + } + + // Get all Strickler table objects to fill in combo-box Handle(HYDROData_StricklerTable) aStricklerTableObj; QString aStricklerTableName; - // Get all Strickler table objects to fill in combo-box aList.clear(); anEntryList.clear(); - HYDROData_Iterator anIter( doc(), KIND_STRICKLER_TABLE ); + anIter = HYDROData_Iterator( doc(), KIND_STRICKLER_TABLE ); for ( ; anIter.More(); anIter.Next() ) { aStricklerTableObj = Handle(HYDROData_StricklerTable)::DownCast( anIter.Current() ); @@ -987,21 +883,11 @@ void HYDROGUI_CalculationOp::onNext( const int theIndex ) } } aPanel->setStricklerTableNames( aList, anEntryList ); - bool anUpdateState = myEditedObject->IsMustBeUpdated(); + //@ASL: bool anUpdateState = myEditedObject->IsMustBeUpdated(); if ( !aList.isEmpty() ) aPanel->setStricklerTable( aList.at( 0 ), false ); - myEditedObject->SetToUpdate( anUpdateState ); - - // Fill in list widget with all available land covers - aSeq = HYDROGUI_Tool::GetLandCovers( module() ); - getNamesAndEntries( aSeq, aList, anEntryList ); - aPanel->setAllLandCovers( aList, anEntryList ); + //@ASL: myEditedObject->SetToUpdate( anUpdateState ); - // Set list of included land covers - aSeq = myEditedObject->GetLandCovers(); - getNamesAndEntries( aSeq, aList, anEntryList ); - aPanel->includeLandCovers( aList, true ); - if ( !myEditedObject.IsNull() ) { if ( myIsEdit ) @@ -1018,15 +904,16 @@ void HYDROGUI_CalculationOp::onNext( const int theIndex ) aPanel->setStricklerTable( aStricklerTableName ); } - // Set mode (Auto or Manual) to defined priority of land covers - aPanel->setLandCoverMode( myEditedObject->GetAssignmentLandCoverMode() ); - - // Set rules defined on land covers - setRules( HYDROData_CalculationCase::DataTag_CustomLandCoverRules ); - } - else - { - myEditedObject->SetAssignmentLandCoverMode( (HYDROData_CalculationCase::AssignmentMode)aPanel->getLandCoverMode() ); + // Select the certain land cover map object in combo-box + if ( aLandCoverMapObj.IsNull() ) + { + aPanel->setLandCoverMap( QString() ); + } + else + { + aLandCoverMapName = aLandCoverMapObj->GetName(); + aPanel->setLandCoverMap( aLandCoverMapName ); + } } } @@ -1043,7 +930,7 @@ void HYDROGUI_CalculationOp::onNext( const int theIndex ) QApplication::setOverrideCursor( Qt::WaitCursor ); setGeomObjectsVisible( false ); - setLandCoversVisible( false ); + setLandCoverMapVisible( false ); QString aNewCaseName = aPanel->getObjectName(); QString anOldCaseName = myEditedObject->GetName(); @@ -1060,7 +947,7 @@ void HYDROGUI_CalculationOp::onNext( const int theIndex ) if ( aMode == HYDROData_CalculationCase::AUTOMATIC ) { // Set objects in the specified order - if( myEditedObject->IsMustBeUpdated() ) + if( myEditedObject->IsMustBeUpdated( HYDROData_Entity::Geom_2d ) ) { myEditedObject->RemoveGeometryObjects(); foreach ( const QString& aName, aPanel->getAllGeomObjects() ) @@ -1088,43 +975,12 @@ void HYDROGUI_CalculationOp::onNext( const int theIndex ) } aPanel->setEditZonesEnabled( aMode == HYDROData_CalculationCase::MANUAL ); - // Land cover zones: set parameters for automatic mode - aMode = aPanel->getLandCoverMode(); - if ( aMode == HYDROData_CalculationCase::AUTOMATIC ) - { - // Set objects in the specified order - if( myEditedObject->IsMustBeUpdated() ) - { - myEditedObject->RemoveLandCovers(); - foreach ( const QString& aName, aPanel->getAllLandCovers() ) - { - Handle(HYDROData_LandCover) aLandCover = Handle(HYDROData_LandCover)::DownCast( - HYDROGUI_Tool::FindObjectByName( module(), aName ) ); - if ( aLandCover.IsNull() ) - { - continue; - } - myEditedObject->AddLandCover( aLandCover ); - } - - // Clear priority rules - myEditedObject->ClearRules( HYDROData_CalculationCase::DataTag_CustomLandCoverRules, true ); - // Set priority rules - foreach ( const HYDROData_CustomRule& aRule, aPanel->getLandCoverRules() ) { - myEditedObject->AddRule( aRule.Object1, aRule.Priority, - aRule.Object2, HYDROData_Zone::Merge_Object, - HYDROData_CalculationCase::DataTag_CustomLandCoverRules ); - } - } - } - aPanel->setEditLandCoverZonesEnabled( aMode == HYDROData_CalculationCase::MANUAL ); - - if ( myEditedObject->IsMustBeUpdated() ) + if ( myEditedObject->IsMustBeUpdated( HYDROData_Entity::Geom_All ) ) { myShowZones = true; myEditedObject->Update(); - AssignDefaultZonesColors( false ); + AssignDefaultZonesColors(); //aPanel->setEditedObject( myEditedObject ); aPanel->refreshZonesBrowser(); @@ -1133,13 +989,11 @@ void HYDROGUI_CalculationOp::onNext( const int theIndex ) createPreview( false ); anIsToUpdateOb = true; - - myUpdateLandCoverZonesPrs = true; } else { // Show zones - setZonesVisible( true, false ); + setZonesVisible( true ); if ( isNameChanged ) { module()->getDataModel()->updateObjectTree( myEditedObject ); @@ -1147,51 +1001,7 @@ void HYDROGUI_CalculationOp::onNext( const int theIndex ) } QApplication::restoreOverrideCursor(); - } - else if( theIndex==4 ) - { - // Partition of Land covers panel - HYDROGUI_CalculationDlg* aPanel = - ::qobject_cast( inputPanel() ); - if ( !aPanel ) - return; - - QApplication::setOverrideCursor( Qt::WaitCursor ); - - bool anIsToUpdateOb = false; - if ( myUpdateLandCoverZonesPrs ) - { - myShowZones = true; - - AssignDefaultZonesColors( true ); - - aPanel->refreshLandCoverZonesBrowser(); - - anIsToUpdateOb = true; - } - - closePreview( false ); - createPreview( true ); - - if ( myUpdateLandCoverZonesPrs ) - myUpdateLandCoverZonesPrs = false; - else - { - // Hide zones - setZonesVisible( false, false ); - // Show land cover zones - setZonesVisible( true, true ); - } - - if ( anIsToUpdateOb ) { - SUIT_DataBrowser* anObjBrowser = ((LightApp_Application*)module()->application())->objectBrowser(); - if ( anObjBrowser ) { - anObjBrowser->updateTree( module()->getDataModel()->getDataObject( myEditedObject ), false ); - } - } - - QApplication::restoreOverrideCursor(); - } + } } void HYDROGUI_CalculationOp::onHideZones( const int theIndex ) @@ -1205,34 +1015,30 @@ void HYDROGUI_CalculationOp::onHideZones( const int theIndex ) } if( theIndex==2 ) { - setLandCoversVisible( true ); + setLandCoverMapVisible( true ); closePreview( false ); createPreview( true ); // Hide zones - setZonesVisible( false, false ); - // Hide land covers - setZonesVisible( false, true ); + setZonesVisible( false ); } else if( theIndex==3 ) { - AssignDefaultZonesColors( false ); + AssignDefaultZonesColors(); closePreview( false ); createPreview( false ); - // Hide land cover zones - setZonesVisible( false, true ); // Show zones - setZonesVisible( true, false ); + setZonesVisible( true ); } } -void HYDROGUI_CalculationOp::setZonesVisible( bool theIsVisible, const bool theLandCover ) +void HYDROGUI_CalculationOp::setZonesVisible( bool theIsVisible ) { myShowZones = theIsVisible; - HYDROData_SequenceOfObjects aRegions = myEditedObject->GetRegions( theLandCover ); + HYDROData_SequenceOfObjects aRegions = myEditedObject->GetRegions(); HYDROData_SequenceOfObjects::Iterator aRegionsIter( aRegions ); HYDROData_SequenceOfObjects aZones; Handle(HYDROData_Region) aRegion; @@ -1275,21 +1081,15 @@ void HYDROGUI_CalculationOp::setGeomObjectsVisible( bool theIsVisible ) } } -void HYDROGUI_CalculationOp::setLandCoversVisible( bool theIsVisible ) +void HYDROGUI_CalculationOp::setLandCoverMapVisible( bool theIsVisible ) { - myShowLandCovers = theIsVisible; - - HYDROData_SequenceOfObjects aSeq = myEditedObject->GetLandCovers(); - - HYDROData_SequenceOfObjects::Iterator anIter( aSeq ); - for ( ; anIter.More(); anIter.Next() ) { - setObjectVisibility( anIter.Value(), theIsVisible ); - } + myShowLandCoverMap = theIsVisible; + setObjectVisibility( myEditedObject->GetLandCoverMap(), theIsVisible ); } -void HYDROGUI_CalculationOp::AssignDefaultZonesColors( const bool theLandCover ) +void HYDROGUI_CalculationOp::AssignDefaultZonesColors() { - HYDROData_SequenceOfObjects aRegions = myEditedObject->GetRegions( theLandCover ); + HYDROData_SequenceOfObjects aRegions = myEditedObject->GetRegions(); HYDROData_SequenceOfObjects::Iterator aRegionsIter( aRegions ); HYDROData_SequenceOfObjects aZones; Handle(HYDROData_Region) aRegion; @@ -1339,7 +1139,7 @@ QColor HYDROGUI_CalculationOp::GenerateDefaultZonesColor( int theIndex, int r = aColor.red(); int g = aColor.green(); int b = aColor.blue(); - return ( aColor.isValid() ? aColor : HYDROData_ImmersibleZone::DefaultFillingColor() ); + return ( aColor.isValid() ? aColor : Qt::darkBlue ); } void HYDROGUI_CalculationOp::setRules( HYDROData_CalculationCase::DataTag theDataTag ) @@ -1370,13 +1170,10 @@ void HYDROGUI_CalculationOp::setRules( HYDROData_CalculationCase::DataTag theDat } if ( theDataTag == HYDROData_CalculationCase::DataTag_CustomRules ) - aPanel->setRules( aRules ); - else if ( theDataTag == HYDROData_CalculationCase::DataTag_CustomLandCoverRules ) - aPanel->setLandCoverRules( aRules ); + aPanel->setRules( aRules ); } -bool HYDROGUI_CalculationOp::createRegion( const QList& theZonesList, - const bool theLandCover ) +bool HYDROGUI_CalculationOp::createRegion( const QList& theZonesList ) { bool aRetValue = false; @@ -1393,26 +1190,27 @@ bool HYDROGUI_CalculationOp::createRegion( const QList& theZon } if ( aZonesList.length() > 0 ) { - module()->getDataModel()->createNewRegion( myEditedObject, aZonesList, theLandCover ); + module()->getDataModel()->createNewRegion( myEditedObject, aZonesList ); aRetValue = true; } return aRetValue; } -void HYDROGUI_CalculationOp::createPreview( const bool theLandCover ) +void HYDROGUI_CalculationOp::createPreview( const bool theLandCoverMap ) { LightApp_Application* anApp = module()->getApp(); HYDROData_SequenceOfObjects aSeq; - if ( theLandCover && myShowLandCovers ) + if ( theLandCoverMap && myShowLandCoverMap ) { - HYDROData_SequenceOfObjects aSeqLC = myEditedObject->GetLandCovers(); - aSeq.Append( aSeqLC ); + aSeq.Append( myEditedObject->GetLandCoverMap() ); } - else if ( !theLandCover && myShowGeomObjects ) + else if ( !theLandCoverMap && myShowGeomObjects ) { HYDROData_SequenceOfObjects aSeqGO = myEditedObject->GetGeometryObjects(); + HYDROData_SequenceOfObjects aSeqP = myEditedObject->GetInterPolyObjects(); aSeq.Append( aSeqGO ); + aSeq.Append( aSeqP ); } Handle(HYDROData_Entity) anEntity; @@ -1420,7 +1218,7 @@ void HYDROGUI_CalculationOp::createPreview( const bool theLandCover ) if ( myShowZones ) { // Gather zones for displaying - HYDROData_SequenceOfObjects aRegions = myEditedObject->GetRegions( theLandCover ); + HYDROData_SequenceOfObjects aRegions = myEditedObject->GetRegions(); HYDROData_SequenceOfObjects::Iterator aRegionsIter( aRegions ); HYDROData_SequenceOfObjects aZones; Handle(HYDROData_Region) aRegion; @@ -1440,7 +1238,8 @@ void HYDROGUI_CalculationOp::createPreview( const bool theLandCover ) } // Get a boundary polyline if any - aSeq.Append( myEditedObject->GetBoundaryPolyline() ); + if (Handle(HYDROData_PolylineXY) aBPoly = myEditedObject->GetBoundaryPolyline()) + aSeq.Append( aBPoly ); module()->removeViewShapes( HYDROGUI_Module::VMR_PreviewCaseZones ); @@ -1477,16 +1276,19 @@ void HYDROGUI_CalculationOp::createPreview( const bool theLandCover ) HYDROData_SequenceOfObjects::Iterator anIter( aSeq ); for ( ; anIter.More(); anIter.Next() ) { - setObjectVisibility( anIter.Value(), true ); + const Handle(HYDROData_Entity)& ent = anIter.Value(); + if (!ent.IsNull()) + setObjectVisibility( ent, true ); } //Process the draw events for viewer QApplication::processEvents( QEventLoop::ExcludeUserInputEvents ); - if ( OCCViewer_ViewWindow* vw = (OCCViewer_ViewWindow*)myPreviewViewManager->getActiveView() ) - vw->onTopView(); } module()->update( UF_OCCViewer | UF_FitAll ); + + if ( OCCViewer_ViewWindow* vw = (OCCViewer_ViewWindow*)myPreviewViewManager->getActiveView() ) + vw->onTopView(); } } @@ -1569,15 +1371,15 @@ void HYDROGUI_CalculationOp::setAvailableGroups() HYDROData_SequenceOfObjects anObjs = myEditedObject->GetGeometryObjects(); for( int anIndex = 1, aLength = anObjs.Length(); anIndex <= aLength; anIndex++ ) { - Handle_HYDROData_Object anObj = Handle_HYDROData_Object::DownCast( anObjs.Value( anIndex ) ); + Handle(HYDROData_Object) anObj = Handle(HYDROData_Object)::DownCast( anObjs.Value( anIndex ) ); HYDROData_SequenceOfObjects aGroups = anObj->GetGroups(); for( int aGIndex = 1, aGLength = aGroups.Length(); aGIndex <= aGLength; aGIndex++ ) { - Handle_HYDROData_ShapesGroup aGroup = Handle_HYDROData_ShapesGroup::DownCast( aGroups.Value( aGIndex ) ); + Handle(HYDROData_ShapesGroup) aGroup = Handle(HYDROData_ShapesGroup)::DownCast( aGroups.Value( aGIndex ) ); aGroupsNames.append( aGroup->GetName() ); } } - if( myEditedObject->IsMustBeUpdated() ) { + if( myEditedObject->IsMustBeUpdated( HYDROData_Entity::Geom_2d ) ) { for( int anIndex = 1, aLength = aSeq.Length(); anIndex <= aLength; anIndex++ ) { Handle(HYDROData_ShapesGroup) aGeomGroup = Handle(HYDROData_ShapesGroup)::DownCast( aSeq.Value( anIndex ) ); @@ -1590,7 +1392,7 @@ void HYDROGUI_CalculationOp::setAvailableGroups() aPanel->setAvailableGroups( aGroupsNames ); aPanel->includeGroups( aList ); - bool isUpdated = myEditedObject->IsMustBeUpdated(); + //@ASL: bool isUpdated = myEditedObject->IsMustBeUpdated(); } void HYDROGUI_CalculationOp::onAddGroups() @@ -1648,80 +1450,6 @@ void HYDROGUI_CalculationOp::onRemoveGroups() aPanel->excludeGroups( aSelectedList ); } -void HYDROGUI_CalculationOp::onChangeLandCoverMode( int theMode ) -{ - HYDROGUI_CalculationDlg* aPanel = - ::qobject_cast( inputPanel() ); - if ( !aPanel ) - return; - - if ( !confirmLandCoverModeChange() ) { - aPanel->setLandCoverMode( myEditedObject->GetAssignmentLandCoverMode() ); - return; - } - - myEditedObject->SetAssignmentLandCoverMode( (HYDROData_CalculationCase::AssignmentMode)theMode ); - aPanel->setLandCoverMode( theMode ); -} - -void HYDROGUI_CalculationOp::onAddLandCovers() -{ - HYDROGUI_CalculationDlg* aPanel = - ::qobject_cast( inputPanel() ); - if ( !aPanel ) - return; - - // Add land covers selected in the module browser to the calculation case - QStringList aSelectedList = aPanel->getSelectedAvailableLandCovers(); - if ( aSelectedList.isEmpty() || !confirmLandCoverRegionsChange() ) - return; - - QStringList anAddedList; - for (int i = 0; i < aSelectedList.length(); i++) - { - Handle(HYDROData_LandCover) anObject = Handle(HYDROData_LandCover)::DownCast( - HYDROGUI_Tool::FindObjectByName( module(), aSelectedList.at( i ) ) ); - if ( anObject.IsNull() ) - continue; - - if ( myEditedObject->AddLandCover( anObject ) ) - anAddedList.append( anObject->GetName() ); - } - - if ( !anAddedList.isEmpty() ) - { - aPanel->includeLandCovers( anAddedList, false ); - createPreview( true ); - } -} - -void HYDROGUI_CalculationOp::onRemoveLandCovers() -{ - // Remove selected objects from the calculation case - HYDROGUI_CalculationDlg* aPanel = - ::qobject_cast( inputPanel() ); - if ( !aPanel ) - return; - - QStringList aSelectedList = aPanel->getSelectedLandCovers(); - if ( aSelectedList.isEmpty() || !confirmLandCoverRegionsChange() ) - return; - - for (int i = 0; i < aSelectedList.length(); i++) - { - Handle(HYDROData_LandCover) anObject = Handle(HYDROData_LandCover)::DownCast( - HYDROGUI_Tool::FindObjectByName( module(), aSelectedList.at(i) ) ); - if ( anObject.IsNull() ) - continue; - - setObjectVisibility( anObject, false ); - myEditedObject->RemoveLandCover( anObject ); - } - - module()->update( UF_OCCViewer ); - aPanel->excludeLandCovers( aSelectedList ); -} - void HYDROGUI_CalculationOp::onChangeMode( int theMode ) { HYDROGUI_CalculationDlg* aPanel = @@ -1747,19 +1475,7 @@ void HYDROGUI_CalculationOp::onOrderChanged( bool& isConfirmed ) isConfirmed = confirmOrderChange(); if( isConfirmed ) - myEditedObject->SetToUpdate( true ); -} - -void HYDROGUI_CalculationOp::onOrderLandCoverChanged( bool& isConfirmed ) -{ - HYDROGUI_CalculationDlg* aPanel = - ::qobject_cast( inputPanel() ); - if ( !aPanel ) - return; - - isConfirmed = confirmLandCoverOrderChange(); - if( isConfirmed ) - myEditedObject->SetToUpdate( true ); + myEditedObject->Changed( HYDROData_Entity::Geom_2d ); } void HYDROGUI_CalculationOp::onRuleChanged( bool& isConfirmed ) @@ -1771,25 +1487,13 @@ void HYDROGUI_CalculationOp::onRuleChanged( bool& isConfirmed ) isConfirmed = confirmRuleChange(); if( isConfirmed ) - myEditedObject->SetToUpdate( true ); -} - -void HYDROGUI_CalculationOp::onRuleLandCoverChanged( bool& isConfirmed ) -{ - HYDROGUI_CalculationDlg* aPanel = - ::qobject_cast( inputPanel() ); - if ( !aPanel ) - return; - - isConfirmed = confirmLandCoverRuleChange(); - if( isConfirmed ) - myEditedObject->SetToUpdate( true ); + myEditedObject->Changed( HYDROData_Entity::Geom_2d ); } void HYDROGUI_CalculationOp::onRegenerateColors() { // For geometry zones - AssignDefaultZonesColors( false ); - setZonesVisible( false, false ); - setZonesVisible( true, false ); + AssignDefaultZonesColors(); + setZonesVisible( false ); + setZonesVisible( true ); }