X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_CalculationOp.cxx;h=f8311d5a4f90c45bb0ef1dfa8626dd9995559e35;hb=d6e19029f8b41f295db878e9aecf451c2edda4af;hp=d0fc53d5cfb4893c5bb72e50102292adcdd3570f;hpb=638239beb0beda1150641cca0da0f72a4e688fca;p=modules%2Fhydro.git

diff --git a/src/HYDROGUI/HYDROGUI_CalculationOp.cxx b/src/HYDROGUI/HYDROGUI_CalculationOp.cxx
index d0fc53d5..f8311d5a 100644
--- a/src/HYDROGUI/HYDROGUI_CalculationOp.cxx
+++ b/src/HYDROGUI/HYDROGUI_CalculationOp.cxx
@@ -149,25 +149,7 @@ void HYDROGUI_CalculationOp::startOperation()
       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++ )
-      {
-        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;
-        }
-        else
-          break;
-      }
-      aPanel->setRules( aRules );
+      setRules( HYDROData_CalculationCase::DataTag_CustomRules );      
     }
   }
   else
@@ -224,14 +206,19 @@ 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( changeLandCoverMode( int ) ), SLOT( onChangeLandCoverMode( 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( changeLandCoverMode( int ) ), SLOT( onChangeLandCoverMode( int ) ) );
+  connect( aPanel, SIGNAL( addLandCovers() ), SLOT( onAddLandCovers() ) );
+  connect( aPanel, SIGNAL( removeLandCovers() ), SLOT( onRemoveLandCovers() ) );
+  
   connect( aPanel, SIGNAL( orderChanged( bool& ) ), SLOT( onOrderChanged( bool& ) ) );
   connect( aPanel, SIGNAL( orderLandCoverChanged( bool& ) ), SLOT( onOrderLandCoverChanged( bool& ) ) );
+    
   connect( aPanel, SIGNAL( Next( const int ) ), SLOT( onNext( const int ) ) );
   connect( aPanel, SIGNAL( Back( const int ) ), SLOT( onHideZones() ) );
   //connect( aPanel, SIGNAL( clicked( SUIT_DataObject* ) ), SLOT( onSelected( SUIT_DataObject* ) ) );
@@ -244,6 +231,8 @@ HYDROGUI_InputPanel* HYDROGUI_CalculationOp::createInputPanel() const
     SLOT( onClickedInZonesBrowser( SUIT_DataObject* ) ) );
   connect( aPanel, SIGNAL( objectsSelected() ), 
            SLOT( onObjectsSelected() ) );
+  connect( aPanel, SIGNAL( landCoversSelected() ), 
+           SLOT( onLandCoversSelected() ) );
   connect( aPanel, SIGNAL( boundarySelected( const QString & ) ), 
     SLOT( onBoundarySelected( const QString & ) ) );
   connect( aPanel, SIGNAL( StricklerTableSelected( const QString & ) ), 
@@ -395,6 +384,47 @@ void HYDROGUI_CalculationOp::onObjectsSelected()
     aLastShape->update( true, false );
 }
 
+void HYDROGUI_CalculationOp::onLandCoversSelected()
+{
+  HYDROGUI_CalculationDlg* aPanel = 
+    ::qobject_cast<HYDROGUI_CalculationDlg*>( inputPanel() );
+
+  QStringList aSelectedObjs = aPanel->getSelectedLandCovers();
+  QMap<QString, bool> aSelectedObjsMap;
+  foreach( QString aName, aSelectedObjs )
+    aSelectedObjsMap[aName] = true;
+
+
+  // Select the appropriate land cover shape in the viewer
+  selectionMgr()->clearSelected();
+
+  // Unhighlight all land covers except selected
+  HYDROGUI_Shape* aShape = 0, *aLastShape = 0;
+  Handle(HYDROData_Entity) anEntity;
+  HYDROData_SequenceOfObjects aSeq = myEditedObject->GetLandCovers();
+  HYDROData_SequenceOfObjects::Iterator anIter( aSeq );
+  bool isSelected;
+  QString aName;
+  for ( ; anIter.More(); anIter.Next() )
+  {
+    anEntity = anIter.Value();
+    if ( !anEntity.IsNull() )
+    {
+      aShape = module()->getObjectShape( HYDROGUI_Module::VMR_PreviewCaseZones, anEntity );
+      if ( aShape )
+      {
+        aName = anEntity->GetName();
+        isSelected = aSelectedObjsMap.contains( aName );
+        aShape->highlight( isSelected, false );
+        aShape->update( false, false );
+        aLastShape = aShape;
+      }
+    }
+  }
+  if( aLastShape )
+    aLastShape->update( true, false );
+}
+
 void HYDROGUI_CalculationOp::onClickedInZonesBrowser( SUIT_DataObject* theItem )
 {
   HYDROGUI_Region* aRegionItem = dynamic_cast<HYDROGUI_Region*>(theItem);
@@ -692,6 +722,32 @@ bool HYDROGUI_CalculationOp::confirmLandCoverModeChange() const
   return isConfirmed;
 }
 
+bool HYDROGUI_CalculationOp::confirmLandCoverOrderChange() 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 ( 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_LAND_COVER_PARTITION_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::processApply( int&     theUpdateFlags,
                                            QString& theErrorMsg,
                                            QStringList& theBrowseObjectsEntries )
@@ -709,10 +765,10 @@ bool HYDROGUI_CalculationOp::processApply( int&     theUpdateFlags,
 
   // For manual mode priority rules are redundant
   if ( aPanel->getMode() == HYDROData_CalculationCase::MANUAL ) {
-    myEditedObject->ClearRules( false );
+    myEditedObject->ClearRules( HYDROData_CalculationCase::DataTag_CustomRules, false );
   }
   if ( aPanel->getLandCoverMode() == HYDROData_CalculationCase::MANUAL ) {
-    myEditedObject->ClearLandCoverRules( false );
+    myEditedObject->ClearRules( HYDROData_CalculationCase::DataTag_CustomLandCoverRules, false );
   }
  
   theUpdateFlags = UF_Model | UF_OCCViewer | UF_OCC_Forced | UF_VTKViewer | UF_VTK_Forced | UF_VTK_Init;
@@ -795,13 +851,15 @@ void HYDROGUI_CalculationOp::onNext( const int theIndex )
 
     QStringList aList;
     QStringList anEntryList;
+    HYDROData_SequenceOfObjects aSeq;
+
+    Handle(HYDROData_StricklerTable) aStricklerTableObj;
+    QString aStricklerTableName;
 
     // Get all Strickler table objects to fill in combo-box
     aList.clear();
     anEntryList.clear();
-    HYDROData_Iterator anIter( doc(), KIND_STRICKLER_TABLE );
-    Handle(HYDROData_StricklerTable) aStricklerTableObj;
-    QString aStricklerTableName;
+    HYDROData_Iterator anIter( doc(), KIND_STRICKLER_TABLE );      
     for ( ; anIter.More(); anIter.Next() )
     {
       aStricklerTableObj = Handle(HYDROData_StricklerTable)::DownCast( anIter.Current() );
@@ -817,11 +875,19 @@ void HYDROGUI_CalculationOp::onNext( const int theIndex )
       }
     }
     aPanel->setStricklerTableNames( aList, anEntryList );
-
-    //HYDROData_SequenceOfObjects aSeq = HYDROGUI_Tool::GetGeometryObjects( module() );
-    //getNamesAndEntries( aSeq, aList, anEntryList );
-    //aPanel->setAllGeomObjects( aList, anEntryList );
-
+    if ( !aList.isEmpty() )
+      aPanel->setStricklerTable( aList.at( 0 ), false );
+
+    // Fill in list widget with all available land covers
+    aSeq = HYDROGUI_Tool::GetLandCovers( module() );
+    getNamesAndEntries( aSeq, aList, anEntryList );
+    aPanel->setAllLandCovers( aList, anEntryList );
+
+    // Set list of included land covers
+    aSeq = myEditedObject->GetLandCovers();
+    getNamesAndEntries( aSeq, aList, anEntryList );
+    aPanel->includeLandCovers( aList, true );
+    
     if ( !myEditedObject.IsNull() )
     {
       if ( myIsEdit )
@@ -840,6 +906,9 @@ void HYDROGUI_CalculationOp::onNext( const int theIndex )
 
         // Set mode (Auto or Manual) to defined priority of land covers
         aPanel->setLandCoverMode( myEditedObject->GetAssignmentLandCoverMode() );
+
+        // Set rules defined on land covers
+        setRules( HYDROData_CalculationCase::DataTag_CustomLandCoverRules );
       }
       else
       {
@@ -887,12 +956,13 @@ void HYDROGUI_CalculationOp::onNext( const int theIndex )
 
         // Clear priority rules
         //@ASL if ( myEditedObject->GetRulesCount() > 0 ) {
-          myEditedObject->ClearRules( true );
+          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 );
+                                  aRule.Object2, aRule.MergeType,
+                                  HYDROData_CalculationCase::DataTag_CustomRules );
         }
       }
     }
@@ -912,6 +982,8 @@ void HYDROGUI_CalculationOp::onNext( const int theIndex )
       createPreview();
 
       anIsToUpdateOb = true;
+
+      myEditedObject->SetToUpdate( true );
     }
     else
     {
@@ -922,6 +994,7 @@ void HYDROGUI_CalculationOp::onNext( const int theIndex )
       }
     }
 
+    // Move this code to processing od the last panel (see below)
     if ( anIsToUpdateOb ) {
       SUIT_DataBrowser* anObjBrowser = ((LightApp_Application*)module()->application())->objectBrowser();
       if ( anObjBrowser ) {
@@ -941,8 +1014,6 @@ void HYDROGUI_CalculationOp::onNext( const int theIndex )
 
     QApplication::setOverrideCursor( Qt::WaitCursor );
 
-    //...
-
     // Set parameters for automatic mode
     int aMode = aPanel->getLandCoverMode();
     if ( aMode == HYDROData_CalculationCase::AUTOMATIC )
@@ -950,7 +1021,26 @@ void HYDROGUI_CalculationOp::onNext( const int theIndex )
       // 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->setEditLandCoversEnabled( aMode == HYDROData_CalculationCase::MANUAL );
@@ -1069,6 +1159,39 @@ QColor HYDROGUI_CalculationOp::GenerateDefaultZonesColor( int theIndex,
   return ( aColor.isValid() ? aColor : HYDROData_ImmersibleZone::DefaultFillingColor() );
 }
 
+void HYDROGUI_CalculationOp::setRules( HYDROData_CalculationCase::DataTag theDataTag )
+{
+  HYDROGUI_CalculationDlg* aPanel = 
+    ::qobject_cast<HYDROGUI_CalculationDlg*>( inputPanel() );
+  if ( !aPanel )
+    return;
+
+  HYDROData_ListOfRules aRules;
+  Handle(HYDROData_Entity) anObject1, anObject2;
+  HYDROData_PriorityType aPriority;
+  HYDROData_Zone::MergeAltitudesType 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 );
+  else if ( theDataTag == HYDROData_CalculationCase::DataTag_CustomLandCoverRules )
+    aPanel->setLandCoverRules( aRules );
+}
+
 void HYDROGUI_CalculationOp::createPreview()
 {
   LightApp_Application* anApp = module()->getApp();
@@ -1303,36 +1426,95 @@ void HYDROGUI_CalculationOp::onRemoveGroups()
   aPanel->excludeGroups( aSelectedList );
 }
 
-void HYDROGUI_CalculationOp::onChangeMode( int theMode )
+void HYDROGUI_CalculationOp::onChangeLandCoverMode( int theMode )
 {
   HYDROGUI_CalculationDlg* aPanel = 
     ::qobject_cast<HYDROGUI_CalculationDlg*>( inputPanel() );
   if ( !aPanel )
     return;
 
-  if ( !confirmModeChange() ) {
-    aPanel->setMode( myEditedObject->GetAssignmentMode() );
+  if ( !confirmLandCoverModeChange() ) {
+    aPanel->setLandCoverMode( myEditedObject->GetAssignmentLandCoverMode() );
     return;
   }
 
-  myEditedObject->SetAssignmentMode( (HYDROData_CalculationCase::AssignmentMode)theMode );
-  aPanel->setMode( theMode );
+  myEditedObject->SetAssignmentLandCoverMode( (HYDROData_CalculationCase::AssignmentMode)theMode );
+  aPanel->setLandCoverMode( theMode );
 }
 
-void HYDROGUI_CalculationOp::onChangeLandCoverMode( int theMode )
+void HYDROGUI_CalculationOp::onAddLandCovers()
 {
   HYDROGUI_CalculationDlg* aPanel = 
     ::qobject_cast<HYDROGUI_CalculationDlg*>( inputPanel() );
   if ( !aPanel )
     return;
 
-  if ( !confirmLandCoverModeChange() ) {
-    aPanel->setLandCoverMode( myEditedObject->GetAssignmentLandCoverMode() );
+  // Add land covers selected in the module browser to the calculation case
+  QStringList aSelectedList = aPanel->getSelectedAvailableLandCovers();
+  if ( aSelectedList.isEmpty() || !confirmRegionsChange() )
     return;
+
+  QStringList anAddedList;
+  for (int i = 0; i < aSelectedList.length(); i++)
+  {
+    Handle(HYDROData_LandCover) anObject = Handle(HYDROData_LandCover)::DownCast( 
+      HYDROGUI_Tool::FindObjectByName( module(), aSelectedList.at( i ) ) );
+    if ( anObject.IsNull() )
+      continue;
+
+    if ( myEditedObject->AddLandCover( anObject ) )
+      anAddedList.append( anObject->GetName() );
   }
 
-  myEditedObject->SetAssignmentLandCoverMode( (HYDROData_CalculationCase::AssignmentMode)theMode );
-  aPanel->setLandCoverMode( theMode );
+  if ( !anAddedList.isEmpty() )
+  {
+    aPanel->includeLandCovers( anAddedList, false );
+    // TODO: create preview of included land covers
+    //createPreview();
+  }
+}
+
+void HYDROGUI_CalculationOp::onRemoveLandCovers()
+{
+  // Remove selected objects from the calculation case
+  HYDROGUI_CalculationDlg* aPanel = 
+    ::qobject_cast<HYDROGUI_CalculationDlg*>( inputPanel() );
+  if ( !aPanel )
+    return;
+
+  QStringList aSelectedList = aPanel->getSelectedLandCovers();
+  if ( aSelectedList.isEmpty() || !confirmRegionsChange() )
+    return;
+
+  for (int i = 0; i < aSelectedList.length(); i++)
+  {
+    Handle(HYDROData_LandCover) anObject = Handle(HYDROData_LandCover)::DownCast( 
+      HYDROGUI_Tool::FindObjectByName( module(), aSelectedList.at(i) ) );
+    if ( anObject.IsNull() )
+      continue;
+
+    setObjectVisibility( anObject, false );
+    myEditedObject->RemoveLandCover( anObject );
+  }
+
+  module()->update( UF_OCCViewer );
+  aPanel->excludeLandCovers( 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 );
 }
 
 void HYDROGUI_CalculationOp::onOrderChanged( bool& isConfirmed )
@@ -1349,12 +1531,12 @@ void HYDROGUI_CalculationOp::onOrderChanged( bool& isConfirmed )
 
 void HYDROGUI_CalculationOp::onOrderLandCoverChanged( bool& isConfirmed )
 {
-  /*HYDROGUI_CalculationDlg* aPanel = 
+  HYDROGUI_CalculationDlg* aPanel = 
     ::qobject_cast<HYDROGUI_CalculationDlg*>( inputPanel() );
   if ( !aPanel )
     return;
 
-  isConfirmed = confirmOrderChange();
+  isConfirmed = confirmLandCoverOrderChange();
   if( isConfirmed )
-    myEditedObject->SetToUpdate( true );*/
+    myEditedObject->SetToUpdate( true );
 }