#571 - Land Cover: calculation of Strickler coefficient

[modules/hydro.git] / src / HYDROGUI / HYDROGUI_CalculationOp.cxx

diff --git a/src/HYDROGUI/HYDROGUI_CalculationOp.cxx b/src/HYDROGUI/HYDROGUI_CalculationOp.cxx
index e6b9ea7248c52770ed199955b3765dd8e553c3e7..82a21857c12505f3c47ecfe19f151277d1d9f98c 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_CalculationOp.cxx
+++ b/src/HYDROGUI/HYDROGUI_CalculationOp.cxx
@@ -521,7 +521,7 @@ void HYDROGUI_CalculationOp::onCreateLandCoverRegion( const QList<SUIT_DataObjec
   }
 }
 
-void HYDROGUI_CalculationOp::onSetMergeType( int theMergeType, QString& theAltitudeName )
+void HYDROGUI_CalculationOp::onSetMergeType( int theMergeType, QString& theMergeObjectName )
 {
   HYDROGUI_CalculationDlg* aPanel = 
     ::qobject_cast<HYDROGUI_CalculationDlg*>( inputPanel() );
@@ -530,7 +530,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 )
       {
@@ -550,7 +550,7 @@ void HYDROGUI_CalculationOp::onSetMergeStricklerType( int theMergeType, QString&
     HYDROGUI_Zone* aZone = aPanel->getCurrentZone();
     if ( aZone )
     {
-      aZone->setMergeStricklerType( theMergeType, theStricklerTypeName );
+      aZone->setMergeType( theMergeType, theStricklerTypeName );
       HYDROGUI_Shape* aShape = module()->getObjectShape( HYDROGUI_Module::VMR_PreviewCaseZones, aZone->modelObject() );
       if ( aShape )
       {
@@ -942,6 +942,9 @@ void HYDROGUI_CalculationOp::onNext( const int theIndex )
         myEditedObject->SetAssignmentLandCoverMode( (HYDROData_CalculationCase::AssignmentMode)aPanel->getLandCoverMode() );
       }
     }
+
+    closePreview( false );
+    createPreview( true );
   }
   else if( theIndex==3 )
   {
@@ -1005,7 +1008,7 @@ void HYDROGUI_CalculationOp::onNext( const int theIndex )
       //aPanel->setEditedObject( myEditedObject );
       aPanel->refreshZonesBrowser();
     
-      closePreview();
+      closePreview( false );
       createPreview( false );
 
       anIsToUpdateOb = true;
@@ -1066,7 +1069,8 @@ void HYDROGUI_CalculationOp::onNext( const int theIndex )
     aPanel->setEditLandCoverZonesEnabled( aMode == HYDROData_CalculationCase::MANUAL );
 
     bool anIsToUpdateOb = false;
-    if ( myEditedObject->IsMustBeUpdated() )
+    bool anIsToUpdate = myEditedObject->IsMustBeUpdated();
+    if ( anIsToUpdate )
     {
       myShowZones = true;
       myEditedObject->Update();
@@ -1074,15 +1078,14 @@ void HYDROGUI_CalculationOp::onNext( const int theIndex )
       AssignDefaultZonesColors( true );
 
       aPanel->refreshLandCoverZonesBrowser();
-    
-      closePreview();
-      createPreview( true );
 
       anIsToUpdateOb = true;
-
-      myEditedObject->SetToUpdate( true );
     }
-    else
+
+    closePreview( false );
+    createPreview( true );
+    
+    if ( !anIsToUpdate )
     {
       // Hide zones
       setZonesVisible( false, false );
@@ -1103,15 +1106,32 @@ void HYDROGUI_CalculationOp::onNext( const int theIndex )
 
 void HYDROGUI_CalculationOp::onHideZones( const int theIndex )
 {
-  if( theIndex==3 )
+  if( theIndex==1 )
+  {
+    closePreview( false );
+    createPreview( false );
+  }
+  if( theIndex==2 )
   {
+    closePreview( false );
+    createPreview( true );
+
     // Hide zones
     setZonesVisible( false, false );
+    // Hide land covers
+    setZonesVisible( false, true );
   }
-  else if( theIndex==4 )
+  else if( theIndex==3 )
   {
+    AssignDefaultZonesColors( false );
+
+    closePreview( false );
+    createPreview( false );
+
     // Hide land cover zones
     setZonesVisible( false, true );
+    // Show zones
+    setZonesVisible( true, false );
   }
 }
 
@@ -1230,7 +1250,7 @@ void HYDROGUI_CalculationOp::setRules( HYDROData_CalculationCase::DataTag theDat
   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++ )
   {
@@ -1378,7 +1398,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<QShortcut*> aShortcuts = aOb->findChildren<QShortcut*>();
@@ -1409,14 +1429,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;