X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_CalculationOp.cxx;h=f43261a3465ae8571b594e530a3129d0d5d12264;hb=6d592627e88a395398a02d7b884796e85331c1c1;hp=9ebcae43c9d47725d0ba35ac81e05eef135e21cc;hpb=13699bfe68e78d61c7174247d7219c3383b5d5c1;p=modules%2Fhydro.git

diff --git a/src/HYDROGUI/HYDROGUI_CalculationOp.cxx b/src/HYDROGUI/HYDROGUI_CalculationOp.cxx
index 9ebcae43..f43261a3 100644
--- a/src/HYDROGUI/HYDROGUI_CalculationOp.cxx
+++ b/src/HYDROGUI/HYDROGUI_CalculationOp.cxx
@@ -92,7 +92,6 @@ void HYDROGUI_CalculationOp::startOperation()
     }
   }
 
-
   aPanel->reset();
   QStringList aList;
   QStringList anEntryList;
@@ -134,6 +133,7 @@ void HYDROGUI_CalculationOp::startOperation()
     myEditedObject = Handle(HYDROData_CalculationCase)::DownCast( HYDROGUI_Tool::GetSelectedObject( module() ) );
     if ( !myEditedObject.IsNull() )
     {
+      aPanel->setMode( myEditedObject->GetAssignmentMode() );
       anObjectName = myEditedObject->GetName();
       aPolylineObj = myEditedObject->GetBoundaryPolyline();
       if ( aPolylineObj.IsNull() )
@@ -149,13 +149,32 @@ void HYDROGUI_CalculationOp::startOperation()
       aSeq = myEditedObject->GetGeometryObjects();
       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 );
     }
   }
   else
   {
     myEditedObject =
       Handle(HYDROData_CalculationCase)::DownCast( doc()->CreateObject( KIND_CALCULATION ) );
-    myEditedObject->SetName(anObjectName);
+    myEditedObject->SetName( anObjectName );
+    myEditedObject->SetAssignmentMode( (HYDROData_CalculationCase::AssignmentMode)aPanel->getMode() );
   }
 
   aPanel->setObjectName( anObjectName );
@@ -204,6 +223,7 @@ 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( addObjects() ), SLOT( onAddObjects() ) );
   connect( aPanel, SIGNAL( removeObjects() ), SLOT( onRemoveObjects() ) );
   connect( aPanel, SIGNAL( addGroups() ), SLOT( onAddGroups() ) );
@@ -235,7 +255,7 @@ void HYDROGUI_CalculationOp::onBoundarySelected ( const QString & theObjName )
     myEditedObject->GetBoundaryPolyline();
   if ( !aPrevPolyline.IsNull() )
   {
-    module()->removeObjectShape( HYDROGUI_Module::VMR_PreviewCaseZones, aPrevPolyline );
+    setObjectVisibility( aPrevPolyline, false );
     anIsToUpdateViewer = true;
   }
 
@@ -254,13 +274,13 @@ void HYDROGUI_CalculationOp::onBoundarySelected ( const QString & theObjName )
         Handle(AIS_InteractiveContext) aCtx = aViewer->getAISContext();
         if ( !aCtx.IsNull() )
         {
-          showObject( aNewPolyline, aCtx );
+          setObjectVisibility( aNewPolyline, true );
           anIsToUpdateViewer = true;
         }
       }
 
       if ( anIsToUpdateViewer )
-        aViewer->update();
+        module()->update( UF_OCCViewer );
     }
   }
 }
@@ -297,13 +317,13 @@ void HYDROGUI_CalculationOp::onObjectsSelected()
         aName = anEntity->GetName();
         isSelected = aSelectedObjsMap.contains( aName );
         aShape->highlight( isSelected, false );
-        aShape->update( false );
+        aShape->update( false, false );
         aLastShape = aShape;
       }
     }
   }
   if( aLastShape )
-    aLastShape->update( true );
+    aLastShape->update( true, false );
 }
 
 void HYDROGUI_CalculationOp::onClickedInZonesBrowser( SUIT_DataObject* theItem )
@@ -408,7 +428,7 @@ void HYDROGUI_CalculationOp::onSetMergeType( int theMergeType, QString& theAltit
       HYDROGUI_Shape* aShape = module()->getObjectShape( HYDROGUI_Module::VMR_PreviewCaseZones, aZone->modelObject() );
       if ( aShape )
       {
-        aShape->update();
+        aShape->update( true, false );
       }
     }
     aPanel->refreshZonesBrowser();
@@ -465,10 +485,11 @@ void HYDROGUI_CalculationOp::onRemoveObjects()
     if ( anObject.IsNull() )
       continue;
 
-    module()->removeObjectShape( HYDROGUI_Module::VMR_PreviewCaseZones, anObject );
+    setObjectVisibility( anObject, false );
     myEditedObject->RemoveGeometryObject( anObject );
   }
 
+  module()->update( UF_OCCViewer );
   aPanel->excludeGeomObjects( aSelectedList );
 }
 
@@ -485,7 +506,32 @@ bool HYDROGUI_CalculationOp::confirmRegionsChange() const
       // If there are already defined zones then ask a user to confirm zones recalculation
       isConfirmed = ( SUIT_MessageBox::question( module()->getApp()->desktop(),
                                tr( "REGIONS_CHANGED" ),
-                               tr( "CONFIRM_SPLITTING_ZONES_RECALCULATION" ),
+                               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();
+  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( "MODE_CHANGED" ),
+                               tr( "CONFIRM_SPLITTING_ZONES_RECALCULATION_MODE" ),
                                QMessageBox::Yes | QMessageBox::No,
                                QMessageBox::No ) == QMessageBox::Yes );
     }
@@ -497,31 +543,82 @@ bool HYDROGUI_CalculationOp::confirmRegionsChange() 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 )
+                                           QString& theErrorMsg,
+                                           QStringList& theBrowseObjectsEntries )
 {
   HYDROGUI_CalculationDlg* aPanel = 
     ::qobject_cast<HYDROGUI_CalculationDlg*>( inputPanel() );
   if ( !aPanel )
     return false;
 
-  theUpdateFlags = UF_Model | UF_OCCViewer | UF_OCC_Forced;
+  if( !myIsEdit )
+  {
+    QString anEntry = HYDROGUI_DataObject::dataObjectEntry( myEditedObject );
+    theBrowseObjectsEntries.append( anEntry );
+  }
+
+  theUpdateFlags = UF_Model | UF_OCCViewer | UF_OCC_Forced | UF_VTKViewer | UF_VTK_Forced | UF_VTK_Init;
 
   return true;
 }
 
 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<HYDROGUI_CalculationDlg*>( inputPanel() );
+      if ( aPanel ) {
+        aPanel->onFirstPage();
+      }
+      return;
+    }
+  }
+
   QApplication::setOverrideCursor( Qt::WaitCursor );
 
   int anUpdateFlags = 0;
   QString anErrorMsg;
+  QStringList aBrowseObjectsEntries;
 
   bool aResult = false;
   
   try
   {
-    aResult = processApply( anUpdateFlags, anErrorMsg );
+    aResult = processApply( anUpdateFlags, anErrorMsg, aBrowseObjectsEntries );
   }
   catch ( Standard_Failure )
   {
@@ -540,6 +637,7 @@ void HYDROGUI_CalculationOp::onApply()
   {
     module()->update( anUpdateFlags );
     commit();
+    browseObjects( aBrowseObjectsEntries );
   }
   else
   {
@@ -576,7 +674,33 @@ void HYDROGUI_CalculationOp::onNext( const int theIndex )
     // 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 ) {
+      // 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;
+        }
+
+        myEditedObject->AddGeometryObject( anObject );
+      }
+
+      // Set priority rules
+      foreach ( const HYDROData_CustomRule& aRule, aPanel->getRules() ) {
+        myEditedObject->AddRule( aRule.Object1, aRule.Priority,
+                                 aRule.Object2, aRule.MergeType );
+      }
+    }
+    aPanel->setMoveZonesEnabled( aMode == HYDROData_CalculationCase::MANUAL );
+         
     if ( myEditedObject->IsMustBeUpdated() )
     {
       myShowZones = true;
@@ -627,20 +751,13 @@ void HYDROGUI_CalculationOp::setZonesVisible( bool theIsVisible )
             HYDROData_SequenceOfObjects::Iterator aZonesIter( aZones );
             for ( ; aZonesIter.More(); aZonesIter.Next() )
             {
-              if ( theIsVisible )
-              {
-                showObject( aZonesIter.Value(), aCtx );
-              }
-              else
-              {
-                module()->removeObjectShape( HYDROGUI_Module::VMR_PreviewCaseZones, aZonesIter.Value() );
-              }
+              setObjectVisibility( aZonesIter.Value(), theIsVisible );
             }
           }
         }
       }
 
-      aViewer->update();
+      module()->update( UF_OCCViewer );
     }
   }
 }
@@ -711,30 +828,28 @@ void HYDROGUI_CalculationOp::createPreview()
       HYDROData_SequenceOfObjects::Iterator anIter( aSeq );
       for ( ; anIter.More(); anIter.Next() )
       {
-        showObject( anIter.Value(), aCtx );
+        setObjectVisibility( anIter.Value(), true );
       }
 
       //Process the draw events for viewer
-      QApplication::processEvents();
+      QApplication::processEvents( QEventLoop::ExcludeUserInputEvents );
       if ( OCCViewer_ViewWindow* vw = (OCCViewer_ViewWindow*)myPreviewViewManager->getActiveView() )
         vw->onTopView();
     }
 
-    aViewer->update();
+    module()->update( UF_OCCViewer | UF_FitAll );
   }
 }
 
-void HYDROGUI_CalculationOp::showObject( Handle(HYDROData_Entity) theEntity, Handle(AIS_InteractiveContext) theCtx )
+void HYDROGUI_CalculationOp::setObjectVisibility( Handle(HYDROData_Entity) theEntity, const bool theIsVisible )
 {
-  if ( !theEntity.IsNull() )
-  {
-    HYDROGUI_Shape* aShape = module()->getObjectShape( HYDROGUI_Module::VMR_PreviewCaseZones, theEntity );
-    if ( !aShape )
-    {
-      aShape = new HYDROGUI_Shape( theCtx, theEntity );
-      module()->setObjectShape( HYDROGUI_Module::VMR_PreviewCaseZones, theEntity, aShape );
-    }
-    aShape->update( false );
+  if ( theEntity.IsNull() || !myPreviewViewManager ) {
+    return;
+  }
+
+  OCCViewer_Viewer* aViewer = myPreviewViewManager->getOCCViewer();
+  if ( aViewer ) {
+    module()->setObjectVisible( (size_t)aViewer, theEntity, theIsVisible );
   }
 }
 
@@ -761,6 +876,19 @@ void HYDROGUI_CalculationOp::closePreview()
 
   if( myPreviewViewManager )
   {
+    // Hide all the displayed objects in the preview view
+    OCCViewer_Viewer* aViewer = myPreviewViewManager->getOCCViewer();
+    if ( aViewer ) {
+      size_t aViewId = (size_t)aViewer;
+      HYDROData_Iterator anIterator( doc() );
+      for( ; anIterator.More(); anIterator.Next() ) {
+        Handle(HYDROData_Entity) anObject = anIterator.Current();
+        if( !anObject.IsNull() ) {
+          module()->setObjectVisible( aViewId, anObject, false );
+        }
+      }
+    }
+
     disconnect( myPreviewViewManager, SIGNAL( lastViewClosed( SUIT_ViewManager* ) ),
                 this, SLOT( onLastViewClosed( SUIT_ViewManager* ) ) );
 
@@ -797,8 +925,15 @@ void HYDROGUI_CalculationOp::setAvailableGroups()
       aGroupsNames.append( aGroup->GetName() );
     }
   }
-  if( myEditedObject->IsMustBeUpdated() )
-    myEditedObject->RemoveGeometryGroups();
+  if( myEditedObject->IsMustBeUpdated() ) {
+    for( int anIndex = 1, aLength = aSeq.Length(); anIndex <= aLength; anIndex++ ) {
+      Handle(HYDROData_ShapesGroup) aGeomGroup =
+        Handle(HYDROData_ShapesGroup)::DownCast( aSeq.Value( anIndex ) );
+      if ( !aGeomGroup.IsNull() && !aGroupsNames.contains( aGeomGroup->GetName() ) ) {
+        myEditedObject->RemoveGeometryGroup( aGeomGroup );
+      }
+    }
+  }
 
   aPanel->setAvailableGroups( aGroupsNames );
   aPanel->includeGroups( aList );
@@ -860,3 +995,19 @@ void HYDROGUI_CalculationOp::onRemoveGroups()
 
   aPanel->excludeGroups( aSelectedList );
 }
+
+void HYDROGUI_CalculationOp::onChangeMode( int theMode )
+{
+  HYDROGUI_CalculationDlg* aPanel = 
+    ::qobject_cast<HYDROGUI_CalculationDlg*>( inputPanel() );
+  if ( !aPanel )
+    return;
+
+  if ( !confirmModeChange() ) {
+    aPanel->setMode( myEditedObject->GetAssignmentMode() );
+    return;
+  }
+
+  myEditedObject->SetAssignmentMode( (HYDROData_CalculationCase::AssignmentMode)theMode );
+  aPanel->setMode( theMode );
+}