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 from V6_main 13/12/2012
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_Measurements.cxx
diff --git
a/src/SMESHGUI/SMESHGUI_Measurements.cxx
b/src/SMESHGUI/SMESHGUI_Measurements.cxx
index 4e94217ed96c33d046b0feb3c723858f019c40c4..ff9394490d5982e07b2b8f9d5bc1abd4f11a2bea 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_Measurements.cxx
+++ b/
src/SMESHGUI/SMESHGUI_Measurements.cxx
@@
-190,8
+190,8
@@
SMESHGUI_MinDistance::SMESHGUI_MinDistance( QWidget* parent )
connect( mySecondTgt, SIGNAL( textEdited( QString ) ), this, SLOT( secondEdited() ) );
QList<SUIT_SelectionFilter*> filters;
connect( mySecondTgt, SIGNAL( textEdited( QString ) ), this, SLOT( secondEdited() ) );
QList<SUIT_SelectionFilter*> filters;
- filters.append( new SMESH_TypeFilter( MESHorSUBMESH ) );
- filters.append( new SMESH_TypeFilter( GROUP ) );
+ filters.append( new SMESH_TypeFilter(
SMESH::
MESHorSUBMESH ) );
+ filters.append( new SMESH_TypeFilter(
SMESH::
GROUP ) );
myFilter = new SMESH_LogicalFilter( filters, SMESH_LogicalFilter::LO_OR );
mySecondTgt->setEnabled( mySecond->checkedId() != OriginTgt );
myFilter = new SMESH_LogicalFilter( filters, SMESH_LogicalFilter::LO_OR );
mySecondTgt->setEnabled( mySecond->checkedId() != OriginTgt );
@@
-706,8
+706,8
@@
SMESHGUI_BoundingBox::SMESHGUI_BoundingBox( QWidget* parent )
connect( mySource, SIGNAL( textEdited( QString ) ), this, SLOT( sourceEdited() ) );
QList<SUIT_SelectionFilter*> filters;
connect( mySource, SIGNAL( textEdited( QString ) ), this, SLOT( sourceEdited() ) );
QList<SUIT_SelectionFilter*> filters;
- filters.append( new SMESH_TypeFilter( MESHorSUBMESH ) );
- filters.append( new SMESH_TypeFilter( GROUP ) );
+ filters.append( new SMESH_TypeFilter(
SMESH::
MESHorSUBMESH ) );
+ filters.append( new SMESH_TypeFilter(
SMESH::
GROUP ) );
myFilter = new SMESH_LogicalFilter( filters, SMESH_LogicalFilter::LO_OR );
clear();
myFilter = new SMESH_LogicalFilter( filters, SMESH_LogicalFilter::LO_OR );
clear();