From: eap <eap@opencascade.com>
Date: Fri, 23 Mar 2012 09:52:28 +0000 (+0000)
Subject: 0021517: Bad filter dumped when hdf study from previous version of Salome is loaded
X-Git-Tag: V6_5_0a1~19
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=f932a6abb6c38b379f501ceec12d90cce92d90c7;p=modules%2Fsmesh.git

0021517: Bad filter dumped when hdf study from previous version of Salome is loaded

  set "Compare" to FT_EqualTo instead of FT_Undefined
---

diff --git a/src/SMESHGUI/SMESHGUI_FilterDlg.cxx b/src/SMESHGUI/SMESHGUI_FilterDlg.cxx
index 685120057..b3f81c9d5 100755
--- a/src/SMESHGUI/SMESHGUI_FilterDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_FilterDlg.cxx
@@ -1282,7 +1282,10 @@ void SMESHGUI_FilterTable::SetCriterion (const int                       theRow,
 
   ((ComboItem*)aTable->item(theRow, 0))->setValue(theCriterion.Type);
   onCriterionChanged(theRow, 0, aType);
-  ((ComboItem*)aTable->item(theRow, 1))->setValue(theCriterion.Compare);
+  if ( theCriterion.Compare == SMESH::FT_Undefined )
+    ((ComboItem*)aTable->item(theRow, 1))->setValue( SMESH::FT_EqualTo );
+  else
+    ((ComboItem*)aTable->item(theRow, 1))->setValue(theCriterion.Compare);
   ((CheckItem*)aTable->item(theRow, 3))->setChecked(theCriterion.UnaryOp == SMESH::FT_LogicalNOT);
 
   if (theCriterion.BinaryOp != SMESH::FT_Undefined)