refs #497: redesign of HYDRO main menu.

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

diff --git a/src/HYDROGUI/HYDROGUI_CalculationOp.cxx b/src/HYDROGUI/HYDROGUI_CalculationOp.cxx
index 5cac3dc1f0ebd96dae6c8f429025816a807aa596..0e9967790d033461efd7ca603991ec99c7879af3 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_CalculationOp.cxx
+++ b/src/HYDROGUI/HYDROGUI_CalculationOp.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2015  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
@@ -6,7 +6,7 @@
 // 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
@@ -155,7 +155,8 @@ void HYDROGUI_CalculationOp::startOperation()
       Handle(HYDROData_Object) anObject1, anObject2;
       HYDROData_PriorityType aPriority;
       HYDROData_Zone::MergeAltitudesType aMergeType;
-      for ( int anIndex = 0; anIndex < myEditedObject->GetRulesCount(); anIndex++ ) {
+      for ( int anIndex = 0; ; anIndex++ )
+      {
         if ( myEditedObject->GetRule( anIndex, anObject1, aPriority, anObject2, aMergeType ) ) {
           HYDROData_CustomRule aRule;
           aRule.Object1 = anObject1;
@@ -165,6 +166,8 @@ void HYDROGUI_CalculationOp::startOperation()
 
           aRules << aRule;
         }
+        else
+          break;
       }
       aPanel->setRules( aRules );
     }
@@ -587,6 +590,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( false );
+  }
+ 
   theUpdateFlags = UF_Model | UF_OCCViewer | UF_OCC_Forced | UF_VTKViewer | UF_VTK_Forced | UF_VTK_Init;
 
   return true;
@@ -668,16 +676,14 @@ void HYDROGUI_CalculationOp::onNext( const int theIndex )
   
     QString aNewCaseName = aPanel->getObjectName();
     QString anOldCaseName = myEditedObject->GetName();
+    bool isNameChanged = anOldCaseName != aNewCaseName;
   
-    bool anIsToUpdateOb = false;
+    bool anIsToUpdateOb = isNameChanged;
 
     // At first we must to update the case name because of 
     // automatic names generation for regions and zones
     myEditedObject->SetName( aNewCaseName );
-
-    // Clear rules
-    myEditedObject->ClearRules();
-
+    
     // Set parameters for automatic mode
     int aMode = aPanel->getMode();
     if ( aMode == HYDROData_CalculationCase::AUTOMATIC ) {
@@ -693,6 +699,10 @@ void HYDROGUI_CalculationOp::onNext( const int theIndex )
         myEditedObject->AddGeometryObject( anObject );
       }
 
+      // Clear priority rules
+      //@ASL if ( myEditedObject->GetRulesCount() > 0 ) {
+        myEditedObject->ClearRules( true );
+      //@ASL }
       // Set priority rules
       foreach ( const HYDROData_CustomRule& aRule, aPanel->getRules() ) {
         myEditedObject->AddRule( aRule.Object1, aRule.Priority,
@@ -717,6 +727,10 @@ void HYDROGUI_CalculationOp::onNext( const int theIndex )
     else
     {
       setZonesVisible( true );
+
+      if ( isNameChanged ) {
+        module()->getDataModel()->updateObjectTree( myEditedObject );
+      }
     }
 
     if ( anIsToUpdateOb ) {