X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_CalculationOp.cxx;h=134c3bd0b2996beb4d13914db545b34c115e382b;hb=58bb6b7459bebeeb089c9ed486c4683a8bae7288;hp=79a9611092b81d4b3a1fe2d5c9ebce17470ffc74;hpb=bae3f70c4e95c5bff78d7994d04b1cc4dddbc407;p=modules%2Fhydro.git diff --git a/src/HYDROGUI/HYDROGUI_CalculationOp.cxx b/src/HYDROGUI/HYDROGUI_CalculationOp.cxx index 79a96110..134c3bd0 100644 --- a/src/HYDROGUI/HYDROGUI_CalculationOp.cxx +++ b/src/HYDROGUI/HYDROGUI_CalculationOp.cxx @@ -1,12 +1,8 @@ -// Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE -// -// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -// +// 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. +// 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 @@ -25,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" @@ -33,8 +29,10 @@ #include #include #include +#include #include #include +#include #include #include @@ -57,7 +55,10 @@ HYDROGUI_CalculationOp::HYDROGUI_CalculationOp( HYDROGUI_Module* theModule, bool : HYDROGUI_Operation( theModule ), myIsEdit( theIsEdit ), myActiveViewManager( NULL ), - myPreviewViewManager( NULL ) + myPreviewViewManager( NULL ), + myShowGeomObjects( true ), + myShowLandCoverMap( false ), + myShowZones( false ) { setName( myIsEdit ? tr( "EDIT_CALCULATION" ) : tr( "CREATE_CALCULATION" ) ); } @@ -97,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 @@ -109,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 ); @@ -146,27 +154,15 @@ 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 ); // set rules - HYDROData_ListOfRules aRules; - Handle(HYDROData_Object) anObject1, anObject2; - HYDROData_PriorityType aPriority; - HYDROData_Zone::MergeAltitudesType aMergeType; - for ( int anIndex = 0; anIndex < myEditedObject->GetRulesCount(); anIndex++ ) { - if ( myEditedObject->GetRule( anIndex, anObject1, aPriority, anObject2, aMergeType ) ) { - HYDROData_CustomRule aRule; - aRule.Object1 = anObject1; - aRule.Object2 = anObject2; - aRule.Priority = aPriority; - aRule.MergeType = aMergeType; - - aRules << aRule; - } - } - aPanel->setRules( aRules ); + setRules( HYDROData_CalculationCase::DataTag_CustomRules ); } } else @@ -180,7 +176,29 @@ void HYDROGUI_CalculationOp::startOperation() aPanel->setObjectName( anObjectName ); aPanel->setEditedObject( myEditedObject ); - createPreview(); + 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, @@ -223,13 +241,18 @@ HYDROGUI_InputPanel* HYDROGUI_CalculationOp::createInputPanel() const HYDROGUI_CalculationDlg* aPanel = new HYDROGUI_CalculationDlg( module(), getName() ); // Connect signals and slots - connect( aPanel, SIGNAL( changeMode( int ) ), SLOT( onChangeMode( int ) ) ); + connect( aPanel, SIGNAL( changeMode( int ) ), SLOT( onChangeMode( int ) ) ); connect( aPanel, SIGNAL( addObjects() ), SLOT( onAddObjects() ) ); connect( aPanel, SIGNAL( removeObjects() ), SLOT( onRemoveObjects() ) ); connect( aPanel, SIGNAL( addGroups() ), SLOT( onAddGroups() ) ); connect( aPanel, SIGNAL( removeGroups() ), SLOT( onRemoveGroups() ) ); + + connect( aPanel, SIGNAL( orderChanged( bool& ) ), SLOT( onOrderChanged( bool& ) ) ); + + connect( aPanel, SIGNAL( ruleChanged( bool& ) ), SLOT( onRuleChanged( bool& ) ) ); + connect( aPanel, SIGNAL( Next( const int ) ), SLOT( onNext( const int ) ) ); - connect( aPanel, SIGNAL( Back( const int ) ), SLOT( onHideZones() ) ); + 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( moveZones( SUIT_DataObject*, const QList& ) ), @@ -240,8 +263,15 @@ HYDROGUI_InputPanel* HYDROGUI_CalculationOp::createInputPanel() const SLOT( onClickedInZonesBrowser( SUIT_DataObject* ) ) ); connect( aPanel, SIGNAL( objectsSelected() ), SLOT( onObjectsSelected() ) ); + 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 & ) ), + SLOT( onStricklerTableSelected( const QString & ) ) ); + + connect( aPanel, SIGNAL( regenerateColors() ), this, + SLOT( onRegenerateColors() ) ); return aPanel; } @@ -285,6 +315,47 @@ void HYDROGUI_CalculationOp::onBoundarySelected ( const QString & theObjName ) } } +void HYDROGUI_CalculationOp::onStricklerTableSelected ( const QString & theObjName ) +{ + bool anIsToUpdateViewer = false; + + // Remove old presentation of land cover map from the operation viewer + Handle(HYDROData_LandCoverMap) aLandCoverMap = myEditedObject->GetLandCoverMap(); + if ( !aLandCoverMap.IsNull() ) + { + setObjectVisibility( aLandCoverMap, false ); + anIsToUpdateViewer = true; + } + + // Set the selected Strickler table to the calculation case + Handle(HYDROData_StricklerTable) aNewStricklerTable = Handle(HYDROData_StricklerTable)::DownCast( + HYDROGUI_Tool::FindObjectByName( module(), theObjName, KIND_STRICKLER_TABLE ) ); + myEditedObject->SetStricklerTable( aNewStricklerTable ); + + if ( myPreviewViewManager ) + { + OCCViewer_Viewer* aViewer = myPreviewViewManager->getOCCViewer(); + if ( aViewer ) + { + if ( !aNewStricklerTable.IsNull() ) + { + Handle(AIS_InteractiveContext) aCtx = aViewer->getAISContext(); + if ( !aCtx.IsNull() ) + { + if ( !aLandCoverMap.IsNull() ) + { + setObjectVisibility( aLandCoverMap, true ); + anIsToUpdateViewer = true; + } + } + } + + if ( anIsToUpdateViewer ) + module()->update( UF_OCCViewer ); + } + } +} + void HYDROGUI_CalculationOp::onObjectsSelected() { HYDROGUI_CalculationDlg* aPanel = @@ -326,6 +397,29 @@ void HYDROGUI_CalculationOp::onObjectsSelected() aLastShape->update( true, false ); } +void HYDROGUI_CalculationOp::onLandCoverMapSelected( const QString & theObjName ) +{ + 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 map shape in the viewer + selectionMgr()->clearSelected(); + + // 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 ) { HYDROGUI_Region* aRegionItem = dynamic_cast(theItem); @@ -359,7 +453,8 @@ void HYDROGUI_CalculationOp::onClickedInZonesBrowser( SUIT_DataObject* theItem ) } } -void HYDROGUI_CalculationOp::onMoveZones( SUIT_DataObject* theRegionItem, const QList& theZonesList ) +void HYDROGUI_CalculationOp::onMoveZones( SUIT_DataObject* theRegionItem, + const QList& theZonesList ) { HYDROGUI_Region* aRegion = dynamic_cast(theRegionItem); if ( aRegion ) @@ -381,41 +476,27 @@ void HYDROGUI_CalculationOp::onMoveZones( SUIT_DataObject* theRegionItem, const HYDROGUI_CalculationDlg* aPanel = ::qobject_cast( inputPanel() ); if ( aPanel ) - { aPanel->refreshZonesBrowser(); - } - createPreview(); + createPreview( false ); } } } void HYDROGUI_CalculationOp::onCreateRegion( const QList& theZonesList ) { - QList aZonesList; - HYDROGUI_Zone* aZone; - // Get a list of dropped zones - for ( int i = 0; i < theZonesList.length(); i++ ) + if ( createRegion( theZonesList ) ) { - aZone = dynamic_cast( theZonesList.at( i ) ); - if ( aZone ) - { - aZonesList.append( aZone ); - } - } - if ( aZonesList.length() > 0 ) - { - module()->getDataModel()->createNewRegion( myEditedObject, aZonesList ); HYDROGUI_CalculationDlg* aPanel = ::qobject_cast( inputPanel() ); if ( aPanel ) { aPanel->refreshZonesBrowser(); } - createPreview(); + createPreview( false ); } } -void HYDROGUI_CalculationOp::onSetMergeType( int theMergeType, QString& theAltitudeName ) +void HYDROGUI_CalculationOp::onSetMergeType( int theMergeType, QString& theMergeObjectName ) { HYDROGUI_CalculationDlg* aPanel = ::qobject_cast( inputPanel() ); @@ -424,7 +505,7 @@ void HYDROGUI_CalculationOp::onSetMergeType( int theMergeType, QString& theAltit HYDROGUI_Zone* aZone = aPanel->getCurrentZone(); if ( aZone ) { - aZone->setMergeType( theMergeType, theAltitudeName ); + aZone->setMergeType( theMergeType, theMergeObjectName ); HYDROGUI_Shape* aShape = module()->getObjectShape( HYDROGUI_Module::VMR_PreviewCaseZones, aZone->modelObject() ); if ( aShape ) { @@ -459,10 +540,21 @@ 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 ); - createPreview(); + createPreview( false ); } } @@ -489,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 ); } @@ -496,7 +599,7 @@ 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 @@ -518,10 +621,60 @@ bool HYDROGUI_CalculationOp::confirmRegionsChange() const return isConfirmed; } +bool HYDROGUI_CalculationOp::confirmOrderChange() const +{ + // Check if the case is already modified or not + 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(); + if ( aSeq.Length() > 0 ) + { + // If there are already defined zones then ask a user to confirm zones recalculation + isConfirmed = ( SUIT_MessageBox::question( module()->getApp()->desktop(), + tr( "ORDER_CHANGED" ), + tr( "CONFIRM_SPLITTING_ZONES_RECALCULATION_REGIONS" ), + QMessageBox::Yes | QMessageBox::No, + QMessageBox::No ) == QMessageBox::Yes ); + } + else + { + isConfirmed = true; // No regions - no zones - nothing to recalculate + } + } + return isConfirmed; +} + +bool HYDROGUI_CalculationOp::confirmRuleChange() const +{ + // Check if the case is already modified or not + 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(); + if ( aSeq.Length() > 0 ) + { + // If there are already defined zones then ask a user to confirm zones recalculation + isConfirmed = ( SUIT_MessageBox::question( module()->getApp()->desktop(), + tr( "RULE_CHANGED" ), + tr( "CONFIRM_SPLITTING_ZONES_RECALCULATION_REGIONS" ), + QMessageBox::Yes | QMessageBox::No, + QMessageBox::No ) == QMessageBox::Yes ); + } + else + { + isConfirmed = true; // No regions - no zones - nothing to recalculate + } + } + return isConfirmed; +} + 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 @@ -543,6 +696,35 @@ bool HYDROGUI_CalculationOp::confirmModeChange() const return isConfirmed; } +bool HYDROGUI_CalculationOp::confirmContinueWithWarning( const HYDROData_Warning& theWarning ) const +{ + HYDROData_WarningType aType = theWarning.Type; + if ( aType == WARN_OK ) { + return true; + } + + QString aTitle; + QString aMsg; + switch ( aType ) + { + case WARN_EMPTY_REGIONS: + aTitle = tr( "EMPTY_REGIONS" ); + aMsg = tr( "CONFIRM_CONTINUE_WITH_OBJECTS_NOT_INCLUDED_TO_REGION" ).arg( theWarning.Data ); + break; + default: + aTitle = tr( "WARNING" ); + aMsg = theWarning.Data; + } + + + int anAnswer = SUIT_MessageBox::warning( module()->getApp()->desktop(), + aTitle, aMsg, + QMessageBox::Yes | QMessageBox::No, + QMessageBox::No ); + + return ( anAnswer == QMessageBox::Yes ); +} + bool HYDROGUI_CalculationOp::processApply( int& theUpdateFlags, QString& theErrorMsg, QStringList& theBrowseObjectsEntries ) @@ -558,6 +740,11 @@ bool HYDROGUI_CalculationOp::processApply( int& theUpdateFlags, theBrowseObjectsEntries.append( anEntry ); } + // For manual mode priority rules are redundant + if ( aPanel->getMode() == HYDROData_CalculationCase::MANUAL ) { + myEditedObject->ClearRules( HYDROData_CalculationCase::DataTag_CustomRules, false ); + } + theUpdateFlags = UF_Model | UF_OCCViewer | UF_OCC_Forced | UF_VTKViewer | UF_VTK_Forced | UF_VTK_Init; return true; @@ -565,6 +752,20 @@ bool HYDROGUI_CalculationOp::processApply( int& theUpdateFlags, void HYDROGUI_CalculationOp::onApply() { + // Check warnings + HYDROData_Warning aWarning = myEditedObject->GetLastWarning(); + if ( aWarning.Type != WARN_OK ) { + if ( !confirmContinueWithWarning( aWarning ) ) { + // Go back to the first page + HYDROGUI_CalculationDlg* aPanel = + ::qobject_cast( inputPanel() ); + if ( aPanel ) { + aPanel->onFirstPage(); + } + return; + } + } + QApplication::setOverrideCursor( Qt::WaitCursor ); int anUpdateFlags = 0; @@ -615,6 +816,111 @@ void HYDROGUI_CalculationOp::onNext( const int theIndex ) setAvailableGroups(); } else if( theIndex==2 ) + { + // Land cover map panel + HYDROGUI_CalculationDlg* aPanel = + ::qobject_cast( inputPanel() ); + if ( !aPanel ) + return; + + setLandCoverMapVisible( true ); + + QStringList aList; + QStringList anEntryList; + + // 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; + + aList.clear(); + anEntryList.clear(); + anIter = HYDROData_Iterator( doc(), KIND_STRICKLER_TABLE ); + for ( ; anIter.More(); anIter.Next() ) + { + aStricklerTableObj = Handle(HYDROData_StricklerTable)::DownCast( anIter.Current() ); + + if ( !aStricklerTableObj.IsNull() ) + { + aStricklerTableName = aStricklerTableObj->GetName(); + if ( !aStricklerTableName.isEmpty() ) + { + aList.append( aStricklerTableName ); + anEntryList.append( HYDROGUI_DataObject::dataObjectEntry( aStricklerTableObj ) ); + } + } + } + aPanel->setStricklerTableNames( aList, anEntryList ); + //@ASL: bool anUpdateState = myEditedObject->IsMustBeUpdated(); + if ( !aList.isEmpty() ) + aPanel->setStricklerTable( aList.at( 0 ), false ); + //@ASL: myEditedObject->SetToUpdate( anUpdateState ); + + if ( !myEditedObject.IsNull() ) + { + if ( myIsEdit ) + { + // Select the certain Strickler table object in combo-box + aStricklerTableObj = myEditedObject->GetStricklerTable(); + if ( aStricklerTableObj.IsNull() ) + { + aPanel->setStricklerTable( QString() ); + } + else + { + aStricklerTableName = aStricklerTableObj->GetName(); + aPanel->setStricklerTable( aStricklerTableName ); + } + + // Select the certain land cover map object in combo-box + if ( aLandCoverMapObj.IsNull() ) + { + aPanel->setLandCoverMap( QString() ); + } + else + { + aLandCoverMapName = aLandCoverMapObj->GetName(); + aPanel->setLandCoverMap( aLandCoverMapName ); + } + } + } + + closePreview( false ); + createPreview( true ); + } + else if( theIndex==3 ) { HYDROGUI_CalculationDlg* aPanel = ::qobject_cast( inputPanel() ); @@ -622,65 +928,111 @@ void HYDROGUI_CalculationOp::onNext( const int theIndex ) return; QApplication::setOverrideCursor( Qt::WaitCursor ); - + + setGeomObjectsVisible( false ); + setLandCoverMapVisible( false ); + QString aNewCaseName = aPanel->getObjectName(); QString anOldCaseName = myEditedObject->GetName(); + bool isNameChanged = anOldCaseName != aNewCaseName; - bool anIsToUpdateOb = myIsEdit && anOldCaseName != aNewCaseName; - + bool anIsToUpdateOb = isNameChanged; + // At first we must to update the case name because of // automatic names generation for regions and zones myEditedObject->SetName( aNewCaseName ); - - // Set parameters for automatic mode + + // Zones: set parameters for automatic mode int aMode = aPanel->getMode(); - if ( aMode == HYDROData_CalculationCase::AUTOMATIC ) { + if ( aMode == HYDROData_CalculationCase::AUTOMATIC ) + { // Set objects in the specified order - myEditedObject->RemoveGeometryObjects(); - foreach ( const QString& aName, aPanel->getAllGeomObjects() ) { - Handle(HYDROData_Object) anObject = Handle(HYDROData_Object)::DownCast( - HYDROGUI_Tool::FindObjectByName( module(), aName ) ); - if ( anObject.IsNull() ) { - continue; + if( myEditedObject->IsMustBeUpdated( HYDROData_Entity::Geom_2d ) ) + { + myEditedObject->RemoveGeometryObjects(); + foreach ( const QString& aName, aPanel->getAllGeomObjects() ) + { + Handle(HYDROData_Object) anObject = Handle(HYDROData_Object)::DownCast( + HYDROGUI_Tool::FindObjectByName( module(), aName ) ); + if ( anObject.IsNull() ) + { + continue; + } + myEditedObject->AddGeometryObject( anObject ); } - myEditedObject->AddGeometryObject( anObject ); - } - - // Set priority rules - myEditedObject->ClearRules(); - foreach ( const HYDROData_CustomRule& aRule, aPanel->getRules() ) { - myEditedObject->AddRule( aRule.Object1, aRule.Priority, - aRule.Object2, aRule.MergeType ); + // Clear priority rules + //@ASL if ( myEditedObject->GetRulesCount() > 0 ) { + myEditedObject->ClearRules( HYDROData_CalculationCase::DataTag_CustomRules, true ); + //@ASL } + // Set priority rules + foreach ( const HYDROData_CustomRule& aRule, aPanel->getRules() ) { + myEditedObject->AddRule( aRule.Object1, aRule.Priority, + aRule.Object2, aRule.MergeType, + HYDROData_CalculationCase::DataTag_CustomRules ); + } } } - aPanel->setMoveZonesEnabled( aMode == HYDROData_CalculationCase::MANUAL ); - - if ( myEditedObject->IsMustBeUpdated() ) + aPanel->setEditZonesEnabled( aMode == HYDROData_CalculationCase::MANUAL ); + + if ( myEditedObject->IsMustBeUpdated( HYDROData_Entity::Geom_All ) ) { myShowZones = true; myEditedObject->Update(); + + AssignDefaultZonesColors(); //aPanel->setEditedObject( myEditedObject ); aPanel->refreshZonesBrowser(); + + closePreview( false ); + createPreview( false ); - createPreview(); + anIsToUpdateOb = true; } else { + // Show zones setZonesVisible( true ); - } - if ( anIsToUpdateOb ) - module()->getApp()->updateObjectBrowser( false ); + if ( isNameChanged ) { + module()->getDataModel()->updateObjectTree( myEditedObject ); + } + } QApplication::restoreOverrideCursor(); - } + } } -void HYDROGUI_CalculationOp::onHideZones() +void HYDROGUI_CalculationOp::onHideZones( const int theIndex ) { - setZonesVisible( false ); + if( theIndex==1 ) + { + setGeomObjectsVisible( true ); + + closePreview( false ); + createPreview( false ); + } + if( theIndex==2 ) + { + setLandCoverMapVisible( true ); + + closePreview( false ); + createPreview( true ); + + // Hide zones + setZonesVisible( false ); + } + else if( theIndex==3 ) + { + AssignDefaultZonesColors(); + + closePreview( false ); + createPreview( false ); + + // Show zones + setZonesVisible( true ); + } } void HYDROGUI_CalculationOp::setZonesVisible( bool theIsVisible ) @@ -717,10 +1069,150 @@ void HYDROGUI_CalculationOp::setZonesVisible( bool theIsVisible ) } } -void HYDROGUI_CalculationOp::createPreview() +void HYDROGUI_CalculationOp::setGeomObjectsVisible( bool theIsVisible ) { - LightApp_Application* anApp = module()->getApp(); + myShowGeomObjects = theIsVisible; + HYDROData_SequenceOfObjects aSeq = myEditedObject->GetGeometryObjects(); + + HYDROData_SequenceOfObjects::Iterator anIter( aSeq ); + for ( ; anIter.More(); anIter.Next() ) { + setObjectVisibility( anIter.Value(), theIsVisible ); + } +} + +void HYDROGUI_CalculationOp::setLandCoverMapVisible( bool theIsVisible ) +{ + myShowLandCoverMap = theIsVisible; + setObjectVisibility( myEditedObject->GetLandCoverMap(), theIsVisible ); +} + +void HYDROGUI_CalculationOp::AssignDefaultZonesColors() +{ + HYDROData_SequenceOfObjects aRegions = myEditedObject->GetRegions(); + HYDROData_SequenceOfObjects::Iterator aRegionsIter( aRegions ); + HYDROData_SequenceOfObjects aZones; + Handle(HYDROData_Region) aRegion; + if ( myPreviewViewManager ) + { + if ( OCCViewer_Viewer* aViewer = myPreviewViewManager->getOCCViewer() ) + { + Handle(AIS_InteractiveContext) aCtx = aViewer->getAISContext(); + if ( !aCtx.IsNull() ) + { + int aCounter = 0; + for ( ; aRegionsIter.More(); aRegionsIter.Next() ) + { + aRegion = Handle(HYDROData_Region)::DownCast( aRegionsIter.Value() ); + if ( !aRegion.IsNull() ) + { + aZones = aRegion->GetZones(); + HYDROData_SequenceOfObjects::Iterator aZonesIter( aZones ); + for ( ; aZonesIter.More(); aZonesIter.Next() ) + { + // Zone + Handle(HYDROData_Zone) aZone = Handle(HYDROData_Zone)::DownCast( aZonesIter.Value() ); + if ( !aZone.IsNull() ) + { + QColor aFillingColor = GenerateDefaultZonesColor(++aCounter); + while (aFillingColor == Qt::red) + aFillingColor = GenerateDefaultZonesColor(++aCounter); + + aZone->SetColor(aFillingColor); + } + } + } + } + } + } + } +} + +QColor HYDROGUI_CalculationOp::GenerateDefaultZonesColor( int theIndex, + float theSaturation/* = 0.5*/, + float theValue/* = 0.95*/ ) const +{ + float aHue = ( rand()%1000 ) * 0.001f; + + QColor aColor; + aColor.setHsl( (int)(aHue*255.), 128, 128 ); + int r = aColor.red(); + int g = aColor.green(); + int b = aColor.blue(); + return ( aColor.isValid() ? aColor : Qt::darkBlue ); +} + +void HYDROGUI_CalculationOp::setRules( HYDROData_CalculationCase::DataTag theDataTag ) +{ + HYDROGUI_CalculationDlg* aPanel = + ::qobject_cast( inputPanel() ); + if ( !aPanel ) + return; + + HYDROData_ListOfRules aRules; + Handle(HYDROData_Entity) anObject1, anObject2; + HYDROData_PriorityType aPriority; + HYDROData_Zone::MergeType aMergeType; + HYDROData_CalculationCase::DataTag aDataTag = HYDROData_CalculationCase::DataTag_CustomRules; + for ( int anIndex = 0; ; anIndex++ ) + { + if ( myEditedObject->GetRule( anIndex, anObject1, aPriority, anObject2, aMergeType, theDataTag ) ) { + HYDROData_CustomRule aRule; + aRule.Object1 = anObject1; + aRule.Object2 = anObject2; + aRule.Priority = aPriority; + aRule.MergeType = aMergeType; + + aRules << aRule; + } + else + break; + } + + if ( theDataTag == HYDROData_CalculationCase::DataTag_CustomRules ) + aPanel->setRules( aRules ); +} + +bool HYDROGUI_CalculationOp::createRegion( const QList& theZonesList ) +{ + bool aRetValue = false; + + QList aZonesList; + HYDROGUI_Zone* aZone; + // Get a list of dropped zones + for ( int i = 0; i < theZonesList.length(); i++ ) + { + aZone = dynamic_cast( theZonesList.at( i ) ); + if ( aZone ) + { + aZonesList.append( aZone ); + } + } + if ( aZonesList.length() > 0 ) + { + module()->getDataModel()->createNewRegion( myEditedObject, aZonesList ); + aRetValue = true; + } + + return aRetValue; +} + +void HYDROGUI_CalculationOp::createPreview( const bool theLandCoverMap ) +{ + LightApp_Application* anApp = module()->getApp(); + HYDROData_SequenceOfObjects aSeq; + if ( theLandCoverMap && myShowLandCoverMap ) + { + aSeq.Append( myEditedObject->GetLandCoverMap() ); + } + else if ( !theLandCoverMap && myShowGeomObjects ) + { + HYDROData_SequenceOfObjects aSeqGO = myEditedObject->GetGeometryObjects(); + HYDROData_SequenceOfObjects aSeqP = myEditedObject->GetInterPolyObjects(); + aSeq.Append( aSeqGO ); + aSeq.Append( aSeqP ); + } + Handle(HYDROData_Entity) anEntity; if ( myShowZones ) @@ -746,7 +1238,8 @@ void HYDROGUI_CalculationOp::createPreview() } // 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 ); @@ -783,16 +1276,19 @@ void HYDROGUI_CalculationOp::createPreview() 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(); } } @@ -813,7 +1309,7 @@ void HYDROGUI_CalculationOp::onLastViewClosed( SUIT_ViewManager* theViewManager closePreview(); } -void HYDROGUI_CalculationOp::closePreview() +void HYDROGUI_CalculationOp::closePreview( bool theRemoveViewManager ) { SUIT_DataBrowser* aOb = ((LightApp_Application*)module()->application())->objectBrowser(); QList aShortcuts = aOb->findChildren(); @@ -844,14 +1340,17 @@ void HYDROGUI_CalculationOp::closePreview() } } - disconnect( myPreviewViewManager, SIGNAL( lastViewClosed( SUIT_ViewManager* ) ), - this, SLOT( onLastViewClosed( SUIT_ViewManager* ) ) ); + if ( theRemoveViewManager ) + { + disconnect( myPreviewViewManager, SIGNAL( lastViewClosed( SUIT_ViewManager* ) ), + this, SLOT( onLastViewClosed( SUIT_ViewManager* ) ) ); - module()->getApp()->removeViewManager( myPreviewViewManager ); // myPreviewViewManager is deleted here - myPreviewViewManager = NULL; + module()->getApp()->removeViewManager( myPreviewViewManager ); // myPreviewViewManager is deleted here + myPreviewViewManager = NULL; + } } - if( myActiveViewManager ) + if( myActiveViewManager && theRemoveViewManager ) { HYDROGUI_Tool::SetActiveViewManager( module(), myActiveViewManager ); myActiveViewManager = NULL; @@ -872,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 ) ); @@ -893,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() @@ -966,3 +1465,35 @@ void HYDROGUI_CalculationOp::onChangeMode( int theMode ) myEditedObject->SetAssignmentMode( (HYDROData_CalculationCase::AssignmentMode)theMode ); aPanel->setMode( theMode ); } + +void HYDROGUI_CalculationOp::onOrderChanged( bool& isConfirmed ) +{ + HYDROGUI_CalculationDlg* aPanel = + ::qobject_cast( inputPanel() ); + if ( !aPanel ) + return; + + isConfirmed = confirmOrderChange(); + if( isConfirmed ) + myEditedObject->Changed( HYDROData_Entity::Geom_2d ); +} + +void HYDROGUI_CalculationOp::onRuleChanged( bool& isConfirmed ) +{ + HYDROGUI_CalculationDlg* aPanel = + ::qobject_cast( inputPanel() ); + if ( !aPanel ) + return; + + isConfirmed = confirmRuleChange(); + if( isConfirmed ) + myEditedObject->Changed( HYDROData_Entity::Geom_2d ); +} + +void HYDROGUI_CalculationOp::onRegenerateColors() +{ + // For geometry zones + AssignDefaultZonesColors(); + setZonesVisible( false ); + setZonesVisible( true ); +}