From: Paul RASCLE <paul.rascle@edf.fr>
Date: Thu, 17 Jan 2019 16:41:39 +0000 (+0100)
Subject: Merge branch 'BR_H2018_3' into BR_2018_V8_5
X-Git-Tag: SH_V2_2_0~99^2~39
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=623289b07d25fd778bf23829d0f4d45e69440268;p=modules%2Fhydro.git

Merge branch 'BR_H2018_3' into BR_2018_V8_5

Conflicts:
	src/HYDROData/HYDROData_CompleteCalcCase.cxx
	src/HYDROData/HYDROData_CompleteCalcCase.h
	src/HYDROGUI/HYDROGUI_CalculationOp.cxx
	src/HYDROGUI/HYDROGUI_CalculationOp.h
---

623289b07d25fd778bf23829d0f4d45e69440268
diff --cc src/HYDROGUI/HYDROGUI_CalculationOp.cxx
index fca5ae8d,551a991f..fce39e29
--- a/src/HYDROGUI/HYDROGUI_CalculationOp.cxx
+++ b/src/HYDROGUI/HYDROGUI_CalculationOp.cxx
@@@ -182,10 -201,7 +201,7 @@@ void HYDROGUI_CalculationOp::startOpera
  
    aPanel->setObjectName( anObjectName );
    aPanel->setEditedObject( myEditedObject );
 -  
 +
-   myIncObjAtStart.clear();
-   myIncObjAtStart = aPanel->getGeometryObjects(false);
- 
    setGeomObjectsVisible( true );
  
    createPreview( false );
@@@ -581,16 -597,10 +597,9 @@@ void HYDROGUI_CalculationOp::onRemoveOb
  
    QStringList aSelectedList = aPanel->getSelectedGeomObjects();
  
-   if (myDenyIncExcl)
+   if (myIsComplete)
    {
      QSet<QString> selMap = aSelectedList.toSet();
-     myIncObjAtStart.toVector();
-     for (int i=0;i<myIncObjAtStart.size();i++)
-     {
-       QString str = myIncObjAtStart[i]->GetName();
-       if (selMap.contains(str))
-         return;
-     }
 -
    }
  
  
@@@ -846,10 -856,10 +855,10 @@@ void HYDROGUI_CalculationOp::onApply(
                                 aMsg ); 
    }
  }
 -
 +#include <HYDROData_CompleteCalcCase.h>
  void HYDROGUI_CalculationOp::onNext( const int theIndex )
  {
-   if( theIndex==1 )
+   if( theIndex==1 && !myIsComplete)
    {
      setAvailableGroups();
    }