From d9c7926dd66c4b54d20d2c707a00b27d128be763 Mon Sep 17 00:00:00 2001 From: eap Date: Mon, 17 Mar 2014 18:34:00 +0400 Subject: [PATCH] 22517: [CEA 1079] Filter Multi-connections can not be created with the graphical interface --- src/SMESHGUI/SMESHGUI_FilterDlg.cxx | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/SMESHGUI/SMESHGUI_FilterDlg.cxx b/src/SMESHGUI/SMESHGUI_FilterDlg.cxx index 76954b6fe..4211d08bf 100755 --- 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" ); } - else + else // check correctness of a numeric value { 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" ); - else if (aType == SMESH::EDGE && - GetCriterionType(i, aType) == SMESH::FT_MultiConnection && - aThreshold == 1) - errMsg = tr( "MULTIEDGES_ERROR" ); } 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_MultiConnection2D: anIsIntCriterion = true; break; + case SMESH::FT_MultiConnection2D: anIsIntCriterion = true; nbCompareSigns = 3; break; case SMESH::FT_Length: case SMESH::FT_Length2D: anIsDoubleCriterion = true; break; -- 2.39.2