Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update documentation
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_FilterDlg.cxx
diff --git
a/src/SMESHGUI/SMESHGUI_FilterDlg.cxx
b/src/SMESHGUI/SMESHGUI_FilterDlg.cxx
index 76e4b703bebfa256f7a7a0300be6a4d51d20d65e..3ffd0419bf4d0c124edf92abc76d61980ead5c5e 100755
(executable)
--- a/
src/SMESHGUI/SMESHGUI_FilterDlg.cxx
+++ b/
src/SMESHGUI/SMESHGUI_FilterDlg.cxx
@@
-51,6
+51,7
@@
#include <SUIT_ResourceMgr.h>
#include <SUIT_Session.h>
#include <SUIT_MessageBox.h>
#include <SUIT_ResourceMgr.h>
#include <SUIT_Session.h>
#include <SUIT_MessageBox.h>
+#include <SUIT_OverrideCursor.h>
#include <QtxColorButton.h>
#include <LightApp_Application.h>
#include <QtxColorButton.h>
#include <LightApp_Application.h>
@@
-1569,7
+1570,8
@@
void SMESHGUI_FilterTable::updateAdditionalWidget()
aCriterion != SMESH::FT_OverConstrainedFace &&
aCriterion != SMESH::FT_OverConstrainedVolume)
||
aCriterion != SMESH::FT_OverConstrainedFace &&
aCriterion != SMESH::FT_OverConstrainedVolume)
||
- aCriterion == SMESH::FT_CoplanarFaces);
+ aCriterion == SMESH::FT_CoplanarFaces ||
+ aCriterion == SMESH::FT_EqualNodes);
if (!myAddWidgets.contains(anItem))
{
if (!myAddWidgets.contains(anItem))
{
@@
-1608,6
+1610,7
@@
const char* SMESHGUI_FilterTable::getPrecision( const int aType )
case SMESH::FT_Length2D:
case SMESH::FT_MaxElementLength2D:
case SMESH::FT_MaxElementLength3D:
case SMESH::FT_Length2D:
case SMESH::FT_MaxElementLength2D:
case SMESH::FT_MaxElementLength3D:
+ case SMESH::FT_BallDiameter:
retval = "length_precision"; break;
case SMESH::FT_Volume3D:
retval = "vol_precision"; break;
retval = "length_precision"; break;
case SMESH::FT_Volume3D:
retval = "vol_precision"; break;
@@
-1799,7
+1802,7
@@
void SMESHGUI_FilterTable::onCriterionChanged (const int row, const int col, con
case SMESH::FT_Volume3D:
case SMESH::FT_MaxElementLength2D:
case SMESH::FT_MaxElementLength3D:
case SMESH::FT_Volume3D:
case SMESH::FT_MaxElementLength2D:
case SMESH::FT_MaxElementLength3D:
- anIsDoubleCriterion = true;
nbCompareSigns = 3;
break;
+ anIsDoubleCriterion = true; break;
case SMESH::FT_FreeBorders:
case SMESH::FT_FreeEdges:
case SMESH::FT_FreeBorders:
case SMESH::FT_FreeEdges:
@@
-1941,6
+1944,8
@@
void SMESHGUI_FilterTable::onCriterionChanged (const int row, const int col, con
}
// set Compare
}
// set Compare
+ if ( anIsDoubleCriterion )
+ nbCompareSigns = 3;
if ( aCompareItem->count() != nbCompareSigns )
{
switch ( nbCompareSigns ) {
if ( aCompareItem->count() != nbCompareSigns )
{
switch ( nbCompareSigns ) {
@@
-3267,6
+3272,7
@@
bool SMESHGUI_FilterDlg::onApply()
if (!isValid())
return false;
if (!isValid())
return false;
+ SUIT_OverrideCursor wc;
try {
int aCurrType = myTable->GetType();
try {
int aCurrType = myTable->GetType();