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
Merge branch V7_3_1_BR
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_FilterDlg.cxx
diff --git
a/src/SMESHGUI/SMESHGUI_FilterDlg.cxx
b/src/SMESHGUI/SMESHGUI_FilterDlg.cxx
index 1a2eab82e38827bf6eb5ca7323c20ef135714183..4211d08bffaa52994ee96cba3463069744b36e4c 100755
(executable)
--- a/
src/SMESHGUI/SMESHGUI_FilterDlg.cxx
+++ b/
src/SMESHGUI/SMESHGUI_FilterDlg.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
3
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
4
CEA/DEN, EDF R&D, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-6,7
+6,7
@@
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License
, or (at your option) any later version
.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-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>
@@
-1148,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();
@@
-1158,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()) {
@@
-1609,6
+1606,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;
@@
-1800,7
+1798,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:
@@
-1812,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;
@@
-1942,6
+1940,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 ) {
@@
-3268,6
+3268,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();