22517: [CEA 1079] Filter Multi-connections can not be created with the graphical...

diff --git a/src/SMESHGUI/SMESHGUI_FilterDlg.cxx b/src/SMESHGUI/SMESHGUI_FilterDlg.cxx
index 76954b6fe2547f5f9666f7d2b86fd23f4536c548..4211d08bffaa52994ee96cba3463069744b36e4c 100755 (executable)
--- a/src/SMESHGUI/SMESHGUI_FilterDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_FilterDlg.cxx
@@ -1149,7 +1149,7 @@ bool SMESHGUI_FilterTable::IsValid (const bool theMess, const int theEntityType)
       if (aTable->text(i, 2).isEmpty())
         errMsg = tr( "ERROR" );
     }
       if (aTable->text(i, 2).isEmpty())
         errMsg = tr( "ERROR" );
     }

-    else
+    else // check correctness of a numeric value

     {
       bool aRes = false;
       bool isSignalsBlocked = aTable->signalsBlocked();
     {
       bool aRes = false;
       bool isSignalsBlocked = aTable->signalsBlocked();


@@ -1159,10 +1159,6 @@ bool SMESHGUI_FilterTable::IsValid (const bool theMess, const int theEntityType)
 
       if (!aRes && aTable->isEditable(i, 2))
         errMsg = tr( "ERROR" );
 
       if (!aRes && aTable->isEditable(i, 2))
         errMsg = tr( "ERROR" );

-      else if (aType == SMESH::EDGE &&
-               GetCriterionType(i, aType) == SMESH::FT_MultiConnection &&
-               aThreshold == 1)
-        errMsg = tr( "MULTIEDGES_ERROR" );

     }
 
     if (!errMsg.isEmpty()) {
     }
 
     if (!errMsg.isEmpty()) {


@@ -1814,7 +1810,7 @@ void SMESHGUI_FilterTable::onCriterionChanged (const int row, const int col, con
   case SMESH::FT_EqualVolumes: break;
 
   case SMESH::FT_MultiConnection:
   case SMESH::FT_EqualVolumes: break;
 
   case SMESH::FT_MultiConnection:

-  case SMESH::FT_MultiConnection2D: anIsIntCriterion = true; break;
+  case SMESH::FT_MultiConnection2D: anIsIntCriterion = true; nbCompareSigns = 3; break;

 
   case SMESH::FT_Length:
   case SMESH::FT_Length2D: anIsDoubleCriterion = true; break;
 
   case SMESH::FT_Length:
   case SMESH::FT_Length2D: anIsDoubleCriterion = true; break;