myActiveViewManager( NULL ),
myPreviewViewManager( NULL ),
myShowGeomObjects( true ),
- myShowZones( false )
+ myShowLandCovers( false ),
+ myShowZones( false ),
+ myUpdateLandCoverZonesPrs( false )
{
setName( myIsEdit ? tr( "EDIT_CALCULATION" ) : tr( "CREATE_CALCULATION" ) );
}
aPanel->setObjectName( anObjectName );
aPanel->setEditedObject( myEditedObject );
- createPreview();
+ createPreview( false );
}
void HYDROGUI_CalculationOp::getNamesAndEntries( const HYDROData_SequenceOfObjects& theSeq,
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( onBack( 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( moveZones( SUIT_DataObject*, const QList<SUIT_DataObject*>& ) ),
- SLOT( onMoveZones( SUIT_DataObject*, const QList<SUIT_DataObject*>& ) ) );
+ connect( aPanel, SIGNAL( setMergeStricklerType( int, QString& ) ), SLOT( onSetMergeStricklerType( int, QString& ) ) );
+ connect( aPanel, SIGNAL( moveZones( SUIT_DataObject*, const QList<SUIT_DataObject*>&, bool ) ),
+ SLOT( onMoveZones( SUIT_DataObject*, const QList<SUIT_DataObject*>&, bool ) ) );
connect( aPanel, SIGNAL( createRegion( const QList<SUIT_DataObject*>& ) ),
SLOT( onCreateRegion( const QList<SUIT_DataObject*>& ) ) );
connect( aPanel, SIGNAL( clickedInZonesBrowser( SUIT_DataObject* ) ),
SLOT( onObjectsSelected() ) );
connect( aPanel, SIGNAL( landCoversSelected() ),
SLOT( onLandCoversSelected() ) );
+ connect( aPanel, SIGNAL( createLandCoverRegion( const QList<SUIT_DataObject*>& ) ),
+ SLOT( onCreateLandCoverRegion( const QList<SUIT_DataObject*>& ) ) );
connect( aPanel, SIGNAL( boundarySelected( const QString & ) ),
SLOT( onBoundarySelected( const QString & ) ) );
connect( aPanel, SIGNAL( StricklerTableSelected( const QString & ) ),
}
}
-void HYDROGUI_CalculationOp::onMoveZones( SUIT_DataObject* theRegionItem, const QList<SUIT_DataObject*>& theZonesList )
+void HYDROGUI_CalculationOp::onMoveZones( SUIT_DataObject* theRegionItem,
+ const QList<SUIT_DataObject*>& theZonesList,
+ bool theLandCover )
{
HYDROGUI_Region* aRegion = dynamic_cast<HYDROGUI_Region*>(theRegionItem);
if ( aRegion )
::qobject_cast<HYDROGUI_CalculationDlg*>( inputPanel() );
if ( aPanel )
{
- aPanel->refreshZonesBrowser();
+ theLandCover ? aPanel->refreshLandCoverZonesBrowser(): aPanel->refreshZonesBrowser();
}
- createPreview();
+ createPreview( theLandCover );
}
}
}
void HYDROGUI_CalculationOp::onCreateRegion( const QList<SUIT_DataObject*>& theZonesList )
{
- QList<HYDROGUI_Zone*> aZonesList;
- HYDROGUI_Zone* aZone;
- // Get a list of dropped zones
- for ( int i = 0; i < theZonesList.length(); i++ )
+ if ( createRegion( theZonesList, false ) )
{
- aZone = dynamic_cast<HYDROGUI_Zone*>( theZonesList.at( i ) );
- if ( aZone )
+ HYDROGUI_CalculationDlg* aPanel =
+ ::qobject_cast<HYDROGUI_CalculationDlg*>( inputPanel() );
+ if ( aPanel )
{
- aZonesList.append( aZone );
+ aPanel->refreshZonesBrowser();
}
+ createPreview( false );
}
- if ( aZonesList.length() > 0 )
+}
+
+void HYDROGUI_CalculationOp::onCreateLandCoverRegion( const QList<SUIT_DataObject*>& theZonesList )
+{
+ if ( createRegion( theZonesList, true ) )
{
- module()->getDataModel()->createNewRegion( myEditedObject, aZonesList );
HYDROGUI_CalculationDlg* aPanel =
::qobject_cast<HYDROGUI_CalculationDlg*>( inputPanel() );
if ( aPanel )
{
- aPanel->refreshZonesBrowser();
+ aPanel->refreshLandCoverZonesBrowser();
}
- createPreview();
+ createPreview( true );
}
}
-void HYDROGUI_CalculationOp::onSetMergeType( int theMergeType, QString& theAltitudeName )
+void HYDROGUI_CalculationOp::onSetMergeType( int theMergeType, QString& theMergeObjectName )
{
HYDROGUI_CalculationDlg* aPanel =
::qobject_cast<HYDROGUI_CalculationDlg*>( inputPanel() );
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 )
{
}
}
+void HYDROGUI_CalculationOp::onSetMergeStricklerType( int theMergeType, QString& theStricklerTypeName )
+{
+ HYDROGUI_CalculationDlg* aPanel =
+ ::qobject_cast<HYDROGUI_CalculationDlg*>( 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 =
if ( !anAddedList.isEmpty() )
{
aPanel->includeGeomObjects( anAddedList );
- createPreview();
+ createPreview( false );
}
}
if ( !isConfirmed )
{
// If not modified check if the case has already defined regions with zones
- HYDROData_SequenceOfObjects aSeq = myEditedObject->GetRegions();
+ HYDROData_SequenceOfObjects aSeq = myEditedObject->GetRegions( false );
if ( aSeq.Length() > 0 )
{
// If there are already defined zones then ask a user to confirm zones recalculation
if ( !isConfirmed )
{
// If not modified check if the case has already defined regions with zones
- HYDROData_SequenceOfObjects aSeq = myEditedObject->GetRegions();
+ HYDROData_SequenceOfObjects aSeq = myEditedObject->GetRegions( false );
if ( aSeq.Length() > 0 )
{
// If there are already defined zones then ask a user to confirm zones recalculation
return isConfirmed;
}
+bool HYDROGUI_CalculationOp::confirmRuleChange() 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 zones
+ HYDROData_SequenceOfObjects aSeq = myEditedObject->GetRegions( false );
+ 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
if ( !isConfirmed )
{
// If not modified check if the case has already defined regions with zones
- HYDROData_SequenceOfObjects aSeq = myEditedObject->GetRegions();
+ HYDROData_SequenceOfObjects aSeq = myEditedObject->GetRegions( false );
if ( aSeq.Length() > 0 )
{
// If there are already defined zones then ask a user to confirm zones recalculation
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 zones
- // TODO: adapt HYDROData_CalculationCase class to process regions constructed for land covers
- /*HYDROData_SequenceOfObjects aSeq = myEditedObject->GetLandCoverRegions();
+ // 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 zones then ask a user to confirm zones recalculation
+ {
+ // 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 zones - nothing to recalculate
- }*/
+ isConfirmed = true; // No regions - no land cover zones - nothing to recalculate
+ }
}
return isConfirmed;
}
bool isConfirmed = myEditedObject->IsMustBeUpdated();
if ( !isConfirmed )
{
- // If not modified check if the case has already defined regions with zones
- // TODO: adapt HYDROData_CalculationCase class to process regions constructed for land covers
- /*HYDROData_SequenceOfObjects aSeq = myEditedObject->GetLandCoverRegions();
+ // 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 zones then ask a user to confirm zones recalculation
+ {
+ // 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 zones - nothing to recalculate
- }*/
+ 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;
}
if ( !aPanel )
return;
+ setLandCoversVisible( true );
+
QStringList aList;
QStringList anEntryList;
HYDROData_SequenceOfObjects aSeq;
}
}
aPanel->setStricklerTableNames( aList, anEntryList );
+ 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() );
myEditedObject->SetAssignmentLandCoverMode( (HYDROData_CalculationCase::AssignmentMode)aPanel->getLandCoverMode() );
}
}
+
+ closePreview( false );
+ createPreview( true );
}
else if( theIndex==3 )
{
QApplication::setOverrideCursor( Qt::WaitCursor );
setGeomObjectsVisible( false );
-
+ setLandCoversVisible( false );
+
QString aNewCaseName = aPanel->getObjectName();
QString anOldCaseName = myEditedObject->GetName();
bool isNameChanged = anOldCaseName != aNewCaseName;
// 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 )
{
}
}
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() )
{
myShowZones = true;
myEditedObject->Update();
- AssignDefaultZonesColors();
+ AssignDefaultZonesColors( false );
//aPanel->setEditedObject( myEditedObject );
aPanel->refreshZonesBrowser();
- closePreview();
- createPreview();
+ closePreview( false );
+ createPreview( false );
anIsToUpdateOb = true;
- myEditedObject->SetToUpdate( true );
+ myUpdateLandCoverZonesPrs = true;
}
else
{
- setZonesVisible( true );
+ // Show zones
+ setZonesVisible( true, false );
if ( isNameChanged ) {
module()->getDataModel()->updateObjectTree( myEditedObject );
}
}
- // Move this code to processing od the last panel (see below)
- if ( anIsToUpdateOb ) {
- SUIT_DataBrowser* anObjBrowser = ((LightApp_Application*)module()->application())->objectBrowser();
- if ( anObjBrowser ) {
- anObjBrowser->updateTree( module()->getDataModel()->getDataObject( myEditedObject ), false );
- }
- }
-
QApplication::restoreOverrideCursor();
}
else if( theIndex==4 )
QApplication::setOverrideCursor( Qt::WaitCursor );
- // Set parameters for automatic mode
- int aMode = aPanel->getLandCoverMode();
- if ( aMode == HYDROData_CalculationCase::AUTOMATIC )
+ bool anIsToUpdateOb = false;
+ if ( myUpdateLandCoverZonesPrs )
{
- // 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 );
- }
+ myShowZones = true;
+
+ AssignDefaultZonesColors( true );
- // 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->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 );
}
}
- aPanel->setEditLandCoversEnabled( aMode == HYDROData_CalculationCase::MANUAL );
QApplication::restoreOverrideCursor();
}
}
-void HYDROGUI_CalculationOp::onBack( const int theIndex )
+void HYDROGUI_CalculationOp::onHideZones( const int theIndex )
{
- setGeomObjectsVisible( theIndex != 2 );
- setZonesVisible( false );
+ if( theIndex==1 )
+ {
+ setGeomObjectsVisible( true );
+
+ closePreview( false );
+ createPreview( false );
+ }
+ if( theIndex==2 )
+ {
+ setLandCoversVisible( true );
+
+ closePreview( false );
+ createPreview( true );
+
+ // Hide zones
+ setZonesVisible( false, false );
+ // Hide land covers
+ setZonesVisible( false, true );
+ }
+ else if( theIndex==3 )
+ {
+ AssignDefaultZonesColors( false );
+
+ closePreview( false );
+ createPreview( false );
+
+ // Hide land cover zones
+ setZonesVisible( false, true );
+ // Show zones
+ setZonesVisible( true, false );
+ }
}
-void HYDROGUI_CalculationOp::setZonesVisible( bool theIsVisible )
+void HYDROGUI_CalculationOp::setZonesVisible( bool theIsVisible, const bool theLandCover )
{
myShowZones = theIsVisible;
- HYDROData_SequenceOfObjects aRegions = myEditedObject->GetRegions();
+ HYDROData_SequenceOfObjects aRegions = myEditedObject->GetRegions( theLandCover );
HYDROData_SequenceOfObjects::Iterator aRegionsIter( aRegions );
HYDROData_SequenceOfObjects aZones;
Handle(HYDROData_Region) aRegion;
}
}
-void HYDROGUI_CalculationOp::AssignDefaultZonesColors()
+void HYDROGUI_CalculationOp::setLandCoversVisible( bool theIsVisible )
+{
+ myShowLandCovers = theIsVisible;
+
+ HYDROData_SequenceOfObjects aSeq = myEditedObject->GetLandCovers();
+
+ HYDROData_SequenceOfObjects::Iterator anIter( aSeq );
+ for ( ; anIter.More(); anIter.Next() ) {
+ setObjectVisibility( anIter.Value(), theIsVisible );
+ }
+}
+
+void HYDROGUI_CalculationOp::AssignDefaultZonesColors( const bool theLandCover )
{
- HYDROData_SequenceOfObjects aRegions = myEditedObject->GetRegions();
+ HYDROData_SequenceOfObjects aRegions = myEditedObject->GetRegions( theLandCover );
HYDROData_SequenceOfObjects::Iterator aRegionsIter( aRegions );
HYDROData_SequenceOfObjects aZones;
Handle(HYDROData_Region) aRegion;
float theValue/* = 0.95*/ ) const
{
float aGoldenRatioConjugate = (float)(360./582.);
- float aHue = (float)rand();
+ float aHue = (float)(rand()%100);
aHue += aGoldenRatioConjugate*theIndex;
aHue -= floor(aHue);
HYDROData_ListOfRules aRules;
Handle(HYDROData_Entity) anObject1, anObject2;
HYDROData_PriorityType aPriority;
- HYDROData_Zone::MergeAltitudesType aMergeType;
+ HYDROData_Zone::MergeType aMergeType;
HYDROData_CalculationCase::DataTag aDataTag = HYDROData_CalculationCase::DataTag_CustomRules;
for ( int anIndex = 0; ; anIndex++ )
{
aPanel->setLandCoverRules( aRules );
}
-void HYDROGUI_CalculationOp::createPreview()
+bool HYDROGUI_CalculationOp::createRegion( const QList<SUIT_DataObject*>& theZonesList,
+ const bool theLandCover )
+{
+ bool aRetValue = false;
+
+ QList<HYDROGUI_Zone*> aZonesList;
+ HYDROGUI_Zone* aZone;
+ // Get a list of dropped zones
+ for ( int i = 0; i < theZonesList.length(); i++ )
+ {
+ aZone = dynamic_cast<HYDROGUI_Zone*>( theZonesList.at( i ) );
+ if ( aZone )
+ {
+ aZonesList.append( aZone );
+ }
+ }
+ if ( aZonesList.length() > 0 )
+ {
+ module()->getDataModel()->createNewRegion( myEditedObject, aZonesList, theLandCover );
+ aRetValue = true;
+ }
+
+ return aRetValue;
+}
+
+void HYDROGUI_CalculationOp::createPreview( const bool theLandCover )
{
LightApp_Application* anApp = module()->getApp();
HYDROData_SequenceOfObjects aSeq;
- if ( myShowGeomObjects )
+ if ( theLandCover && myShowLandCovers )
{
- HYDROData_SequenceOfObjects aGeomObj = myEditedObject->GetGeometryObjects();
- aSeq.Append( aGeomObj );
+ HYDROData_SequenceOfObjects aSeqLC = myEditedObject->GetLandCovers();
+ aSeq.Append( aSeqLC );
}
+ else if ( !theLandCover && myShowGeomObjects )
+ {
+ HYDROData_SequenceOfObjects aSeqGO = myEditedObject->GetGeometryObjects();
+ aSeq.Append( aSeqGO );
+ }
+
Handle(HYDROData_Entity) anEntity;
if ( myShowZones )
{
// Gather zones for displaying
- HYDROData_SequenceOfObjects aRegions = myEditedObject->GetRegions();
+ HYDROData_SequenceOfObjects aRegions = myEditedObject->GetRegions( theLandCover );
HYDROData_SequenceOfObjects::Iterator aRegionsIter( aRegions );
HYDROData_SequenceOfObjects aZones;
Handle(HYDROData_Region) aRegion;
closePreview();
}
-void HYDROGUI_CalculationOp::closePreview()
+void HYDROGUI_CalculationOp::closePreview( bool theRemoveViewManager )
{
SUIT_DataBrowser* aOb = ((LightApp_Application*)module()->application())->objectBrowser();
QList<QShortcut*> aShortcuts = aOb->findChildren<QShortcut*>();
}
}
- 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;
// Add land covers selected in the module browser to the calculation case
QStringList aSelectedList = aPanel->getSelectedAvailableLandCovers();
- if ( aSelectedList.isEmpty() || !confirmRegionsChange() )
+ if ( aSelectedList.isEmpty() || !confirmLandCoverRegionsChange() )
return;
QStringList anAddedList;
if ( !anAddedList.isEmpty() )
{
aPanel->includeLandCovers( anAddedList, false );
- // TODO: create preview of included land covers
- //createPreview();
+ createPreview( true );
}
}
return;
QStringList aSelectedList = aPanel->getSelectedLandCovers();
- if ( aSelectedList.isEmpty() || !confirmRegionsChange() )
+ if ( aSelectedList.isEmpty() || !confirmLandCoverRegionsChange() )
return;
for (int i = 0; i < aSelectedList.length(); i++)
if( isConfirmed )
myEditedObject->SetToUpdate( true );
}
+
+void HYDROGUI_CalculationOp::onRuleChanged( bool& isConfirmed )
+{
+ HYDROGUI_CalculationDlg* aPanel =
+ ::qobject_cast<HYDROGUI_CalculationDlg*>( inputPanel() );
+ if ( !aPanel )
+ return;
+
+ isConfirmed = confirmRuleChange();
+ if( isConfirmed )
+ myEditedObject->SetToUpdate( true );
+}
+
+void HYDROGUI_CalculationOp::onRuleLandCoverChanged( bool& isConfirmed )
+{
+ HYDROGUI_CalculationDlg* aPanel =
+ ::qobject_cast<HYDROGUI_CalculationDlg*>( inputPanel() );
+ if ( !aPanel )
+ return;
+
+ isConfirmed = confirmLandCoverRuleChange();
+ if( isConfirmed )
+ myEditedObject->SetToUpdate( true );
+}
