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
[bos #40650][CEA 33012] Beta Law distribution: added a new type of distribution for...
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_FilterDlg.cxx
diff --git
a/src/SMESHGUI/SMESHGUI_FilterDlg.cxx
b/src/SMESHGUI/SMESHGUI_FilterDlg.cxx
old mode 100755
(executable)
new mode 100644
(file)
index
4e7f6bf
..
98439f0
--- a/
src/SMESHGUI/SMESHGUI_FilterDlg.cxx
+++ b/
src/SMESHGUI/SMESHGUI_FilterDlg.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
16 CEA/DEN, EDF R&D
, OPEN CASCADE
+// Copyright (C) 2007-20
24 CEA, EDF
, 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
@@
-69,6
+69,7
@@
// SALOME KERNEL includes
#include <SALOMEDSClient_Study.hxx>
#include <Basics_Utils.hxx>
// SALOME KERNEL includes
#include <SALOMEDSClient_Study.hxx>
#include <Basics_Utils.hxx>
+#include <smIdType.hxx>
// OCCT includes
#include <StdSelect_TypeOfFace.hxx>
// OCCT includes
#include <StdSelect_TypeOfFace.hxx>
@@
-697,7
+698,7
@@
void SMESHGUI_FilterTable::ComboDelegate::setModelData( QWidget* editor,
void SMESHGUI_FilterTable::ComboDelegate::updateEditorGeometry( QWidget* editor,
const QStyleOptionViewItem& option,
void SMESHGUI_FilterTable::ComboDelegate::updateEditorGeometry( QWidget* editor,
const QStyleOptionViewItem& option,
- const QModelIndex&
index
) const
+ const QModelIndex&
/*index*/
) const
{
editor->setGeometry( option.rect );
}
{
editor->setGeometry( option.rect );
}
@@
-798,7
+799,7
@@
void SMESHGUI_FilterTable::Table::setEditable (bool isEditable,
//=======================================================================
// name : SMESHGUI_FilterTable::Table::isEditable
//=======================================================================
// name : SMESHGUI_FilterTable::Table::isEditable
-// Purpose : Verify wheter cell is editable
+// Purpose : Verify whet
h
er cell is editable
//=======================================================================
bool SMESHGUI_FilterTable::Table::isEditable (int row, int col) const
{
//=======================================================================
bool SMESHGUI_FilterTable::Table::isEditable (int row, int col) const
{
@@
-856,7
+857,7
@@
QList<int> SMESHGUI_FilterTable::Table::selectedRows()
/*
Class : SMESHGUI_FilterTable
/*
Class : SMESHGUI_FilterTable
- Description : Frame containig
+ Description : Frame containi
n
g
- Button group for switching entity type
- Table for displaying filter criterions
- Buttons for editing table and filter libraries
- Button group for switching entity type
- Table for displaying filter criterions
- Buttons for editing table and filter libraries
@@
-1369,8
+1370,7
@@
void SMESHGUI_FilterTable::SetCriterion (const int theRow,
{
if ( strlen( theCriterion.ThresholdID ) > 0 ) // shape ID -> name
{
{
if ( strlen( theCriterion.ThresholdID ) > 0 ) // shape ID -> name
{
- _PTR(SObject) sobj =
- SMESH::GetActiveStudyDocument()->FindObjectID( theCriterion.ThresholdID.in() );
+ _PTR(SObject) sobj = SMESH::getStudy()->FindObjectID( theCriterion.ThresholdID.in() );
if ( !sobj )
aTable->item( theRow, 2 )->setText( QString( theCriterion.ThresholdID ) );
else
if ( !sobj )
aTable->item( theRow, 2 )->setText( QString( theCriterion.ThresholdID ) );
else
@@
-1403,7
+1403,7
@@
void SMESHGUI_FilterTable::SetCriterion (const int theRow,
theCriterion.Type != SMESH::FT_OverConstrainedVolume &&
theCriterion.Type != SMESH::FT_LinearOrQuadratic)
{
theCriterion.Type != SMESH::FT_OverConstrainedVolume &&
theCriterion.Type != SMESH::FT_LinearOrQuadratic)
{
- // Num
b
eric criterion
+ // Numeric criterion
aTable->item( theRow, 2 )->setText(QString("%1").arg(theCriterion.Threshold, 0, 'g', 15));
}
else
aTable->item( theRow, 2 )->setText(QString("%1").arg(theCriterion.Threshold, 0, 'g', 15));
}
else
@@
-1563,15
+1563,19
@@
void SMESHGUI_FilterTable::updateAdditionalWidget()
bool isDbl = ( aCriterion == SMESH::FT_AspectRatio ||
aCriterion == SMESH::FT_AspectRatio3D ||
aCriterion == SMESH::FT_Warping ||
bool isDbl = ( aCriterion == SMESH::FT_AspectRatio ||
aCriterion == SMESH::FT_AspectRatio3D ||
aCriterion == SMESH::FT_Warping ||
+ aCriterion == SMESH::FT_Warping3D ||
aCriterion == SMESH::FT_MinimumAngle ||
aCriterion == SMESH::FT_Taper ||
aCriterion == SMESH::FT_Skew ||
aCriterion == SMESH::FT_Area ||
aCriterion == SMESH::FT_Volume3D ||
aCriterion == SMESH::FT_MinimumAngle ||
aCriterion == SMESH::FT_Taper ||
aCriterion == SMESH::FT_Skew ||
aCriterion == SMESH::FT_Area ||
aCriterion == SMESH::FT_Volume3D ||
+ aCriterion == SMESH::FT_ScaledJacobian ||
aCriterion == SMESH::FT_MaxElementLength2D ||
aCriterion == SMESH::FT_MaxElementLength3D ||
aCriterion == SMESH::FT_Length ||
aCriterion == SMESH::FT_Length2D ||
aCriterion == SMESH::FT_MaxElementLength2D ||
aCriterion == SMESH::FT_MaxElementLength3D ||
aCriterion == SMESH::FT_Length ||
aCriterion == SMESH::FT_Length2D ||
+ aCriterion == SMESH::FT_Length3D ||
+ aCriterion == SMESH::FT_Deflection2D ||
aCriterion == SMESH::FT_BallDiameter );
bool toEnable = (( isDbl && ((ComboItem*)aTable->item(aRow, 1))->value() == SMESH::FT_EqualTo) ||
aCriterion == SMESH::FT_BallDiameter );
bool toEnable = (( isDbl && ((ComboItem*)aTable->item(aRow, 1))->value() == SMESH::FT_EqualTo) ||
@@
-1603,6
+1607,7
@@
const char* SMESHGUI_FilterTable::getPrecision( const int aType )
case SMESH::FT_Taper:
retval = "parametric_precision"; break;
case SMESH::FT_Warping:
case SMESH::FT_Taper:
retval = "parametric_precision"; break;
case SMESH::FT_Warping:
+ case SMESH::FT_Warping3D:
case SMESH::FT_MinimumAngle:
case SMESH::FT_Skew:
case SMESH::FT_CoplanarFaces:
case SMESH::FT_MinimumAngle:
case SMESH::FT_Skew:
case SMESH::FT_CoplanarFaces:
@@
-1618,6
+1623,8
@@
const char* SMESHGUI_FilterTable::getPrecision( const int aType )
retval = "len_tol_precision"; break;
case SMESH::FT_Length:
case SMESH::FT_Length2D:
retval = "len_tol_precision"; break;
case SMESH::FT_Length:
case SMESH::FT_Length2D:
+ case SMESH::FT_Length3D:
+ case SMESH::FT_Deflection2D:
case SMESH::FT_MaxElementLength2D:
case SMESH::FT_MaxElementLength3D:
case SMESH::FT_BallDiameter:
case SMESH::FT_MaxElementLength2D:
case SMESH::FT_MaxElementLength3D:
case SMESH::FT_BallDiameter:
@@
-1729,6
+1736,7
@@
static QList<int> entityTypes( const int theType )
{
case SMESH::NODE:
typeIds.append( SMDSEntity_Node );
{
case SMESH::NODE:
typeIds.append( SMDSEntity_Node );
+ break;
case SMESH::EDGE:
typeIds.append( SMDSEntity_Edge );
typeIds.append( SMDSEntity_Quad_Edge );
case SMESH::EDGE:
typeIds.append( SMDSEntity_Edge );
typeIds.append( SMDSEntity_Quad_Edge );
@@
-1753,6
+1761,7
@@
static QList<int> entityTypes( const int theType )
typeIds.append( SMDSEntity_TriQuad_Hexa );
typeIds.append( SMDSEntity_Penta );
typeIds.append( SMDSEntity_Quad_Penta );
typeIds.append( SMDSEntity_TriQuad_Hexa );
typeIds.append( SMDSEntity_Penta );
typeIds.append( SMDSEntity_Quad_Penta );
+ typeIds.append( SMDSEntity_BiQuad_Penta );
typeIds.append( SMDSEntity_Hexagonal_Prism );
typeIds.append( SMDSEntity_Polyhedra );
//typeIds.append( SMDSEntity_Quad_Polyhedra );
typeIds.append( SMDSEntity_Hexagonal_Prism );
typeIds.append( SMDSEntity_Polyhedra );
//typeIds.append( SMDSEntity_Quad_Polyhedra );
@@
-1772,7
+1781,7
@@
static QList<int> entityTypes( const int theType )
// Purpose : Provides reaction on change of criterion
//=======================================================================
// Purpose : Provides reaction on change of criterion
//=======================================================================
-void SMESHGUI_FilterTable::onCriterionChanged (const int row, const int
col
, const int entityType)
+void SMESHGUI_FilterTable::onCriterionChanged (const int row, const int
/*col*/
, const int entityType)
{
int aType = entityType == -1 ? GetType() : entityType;
Table* aTable = myTables[ aType ];
{
int aType = entityType == -1 ? GetType() : entityType;
Table* aTable = myTables[ aType ];
@@
-1792,27
+1801,28
@@
void SMESHGUI_FilterTable::onCriterionChanged (const int row, const int col, con
}
// find out a type of item required by a new criterion and other table features
}
// find out a type of item required by a new criterion and other table features
- int
aCriterionType
= GetCriterionType(row);
+ int
aCriterionType
= GetCriterionType(row);
bool anIsDoubleCriterion = false;
bool anIsIntCriterion = false;
bool anIsComboCriterion = false;
// other features:
QList<int> comboIDs; // values to show in a combo item
bool anIsDoubleCriterion = false;
bool anIsIntCriterion = false;
bool anIsComboCriterion = false;
// other features:
QList<int> comboIDs; // values to show in a combo item
- int
nbCompareSigns
= 0; // possible values are 0,1,3
+ int
nbCompareSigns
= 0; // possible values are 0,1,3
bool isThresholdEditable = false; // actual for "simple" item types
switch ( aCriterionType )
{
case SMESH::FT_AspectRatio:
case SMESH::FT_AspectRatio3D:
case SMESH::FT_Warping:
bool isThresholdEditable = false; // actual for "simple" item types
switch ( aCriterionType )
{
case SMESH::FT_AspectRatio:
case SMESH::FT_AspectRatio3D:
case SMESH::FT_Warping:
+ case SMESH::FT_Warping3D:
case SMESH::FT_MinimumAngle:
case SMESH::FT_Taper:
case SMESH::FT_Skew:
case SMESH::FT_Area:
case SMESH::FT_Volume3D:
case SMESH::FT_MinimumAngle:
case SMESH::FT_Taper:
case SMESH::FT_Skew:
case SMESH::FT_Area:
case SMESH::FT_Volume3D:
+ case SMESH::FT_ScaledJacobian:
case SMESH::FT_MaxElementLength2D:
case SMESH::FT_MaxElementLength2D:
- case SMESH::FT_MaxElementLength3D:
- anIsDoubleCriterion = true; break;
+ case SMESH::FT_MaxElementLength3D: anIsDoubleCriterion = true; break;
case SMESH::FT_FreeBorders:
case SMESH::FT_FreeEdges:
case SMESH::FT_FreeBorders:
case SMESH::FT_FreeEdges:
@@
-1828,7
+1838,9
@@
void SMESHGUI_FilterTable::onCriterionChanged (const int row, const int col, con
case SMESH::FT_MultiConnection2D: anIsIntCriterion = true; nbCompareSigns = 3; break;
case SMESH::FT_Length:
case SMESH::FT_MultiConnection2D: anIsIntCriterion = true; nbCompareSigns = 3; break;
case SMESH::FT_Length:
- case SMESH::FT_Length2D: anIsDoubleCriterion = true; break;
+ case SMESH::FT_Length2D:
+ case SMESH::FT_Length3D:
+ case SMESH::FT_Deflection2D: anIsDoubleCriterion = true; break;
case SMESH::FT_BelongToMeshGroup: break;
case SMESH::FT_BelongToMeshGroup: break;
@@
-2055,7
+2067,7
@@
void SMESHGUI_FilterTable::addRow (Table* theTable, const int theType, const boo
}
myIsLocked = false;
}
myIsLocked = false;
- // IPAL19372 - to prevent calling onCriterionChaged() slot before completion of setItem()
+ // IPAL19372 - to prevent calling onCriterionCha
n
ged() slot before completion of setItem()
bool isSignalsBlocked = theTable->signalsBlocked();
theTable->blockSignals( true );
bool isSignalsBlocked = theTable->signalsBlocked();
theTable->blockSignals( true );
@@
-2240,6
+2252,7
@@
const QMap<int, QString>& SMESHGUI_FilterTable::getCriteria (const int theType)
aCriteria[ SMESH::FT_BelongToGenSurface ] = tr("BELONG_TO_GENSURFACE");
aCriteria[ SMESH::FT_LyingOnGeom ] = tr("LYING_ON_GEOM");
aCriteria[ SMESH::FT_Length2D ] = tr("LENGTH2D");
aCriteria[ SMESH::FT_BelongToGenSurface ] = tr("BELONG_TO_GENSURFACE");
aCriteria[ SMESH::FT_LyingOnGeom ] = tr("LYING_ON_GEOM");
aCriteria[ SMESH::FT_Length2D ] = tr("LENGTH2D");
+ aCriteria[ SMESH::FT_Deflection2D ] = tr("DEFLECTION2D");
aCriteria[ SMESH::FT_MultiConnection2D ] = tr("MULTI2D_BORDERS");
aCriteria[ SMESH::FT_FreeFaces ] = tr("FREE_FACES");
aCriteria[ SMESH::FT_BareBorderFace ] = tr("BARE_BORDER_FACE");
aCriteria[ SMESH::FT_MultiConnection2D ] = tr("MULTI2D_BORDERS");
aCriteria[ SMESH::FT_FreeFaces ] = tr("FREE_FACES");
aCriteria[ SMESH::FT_BareBorderFace ] = tr("BARE_BORDER_FACE");
@@
-2260,6
+2273,7
@@
const QMap<int, QString>& SMESHGUI_FilterTable::getCriteria (const int theType)
if (aCriteria.isEmpty())
{
aCriteria[ SMESH::FT_AspectRatio3D ] = tr("ASPECT_RATIO_3D");
if (aCriteria.isEmpty())
{
aCriteria[ SMESH::FT_AspectRatio3D ] = tr("ASPECT_RATIO_3D");
+ aCriteria[ SMESH::FT_Warping3D ] = tr("WARPING_3D");
aCriteria[ SMESH::FT_RangeOfIds ] = tr("RANGE_OF_IDS");
aCriteria[ SMESH::FT_BelongToMeshGroup ] = tr("BELONG_TO_MESH_GROUP");
aCriteria[ SMESH::FT_BelongToGeom ] = tr("BELONG_TO_GEOM");
aCriteria[ SMESH::FT_RangeOfIds ] = tr("RANGE_OF_IDS");
aCriteria[ SMESH::FT_BelongToMeshGroup ] = tr("BELONG_TO_MESH_GROUP");
aCriteria[ SMESH::FT_BelongToGeom ] = tr("BELONG_TO_GEOM");
@@
-2267,6
+2281,7
@@
const QMap<int, QString>& SMESHGUI_FilterTable::getCriteria (const int theType)
aCriteria[ SMESH::FT_BadOrientedVolume ] = tr("BAD_ORIENTED_VOLUME");
aCriteria[ SMESH::FT_BareBorderVolume ] = tr("BARE_BORDER_VOLUME");
aCriteria[ SMESH::FT_OverConstrainedVolume] = tr("OVER_CONSTRAINED_VOLUME");
aCriteria[ SMESH::FT_BadOrientedVolume ] = tr("BAD_ORIENTED_VOLUME");
aCriteria[ SMESH::FT_BareBorderVolume ] = tr("BARE_BORDER_VOLUME");
aCriteria[ SMESH::FT_OverConstrainedVolume] = tr("OVER_CONSTRAINED_VOLUME");
+ aCriteria[ SMESH::FT_Length3D ] = tr("LENGTH3D");
aCriteria[ SMESH::FT_Volume3D ] = tr("VOLUME_3D");
aCriteria[ SMESH::FT_MaxElementLength3D ] = tr("MAX_ELEMENT_LENGTH_3D");
aCriteria[ SMESH::FT_LinearOrQuadratic ] = tr("LINEAR");
aCriteria[ SMESH::FT_Volume3D ] = tr("VOLUME_3D");
aCriteria[ SMESH::FT_MaxElementLength3D ] = tr("MAX_ELEMENT_LENGTH_3D");
aCriteria[ SMESH::FT_LinearOrQuadratic ] = tr("LINEAR");
@@
-2275,6
+2290,7
@@
const QMap<int, QString>& SMESHGUI_FilterTable::getCriteria (const int theType)
aCriteria[ SMESH::FT_EqualVolumes ] = tr("EQUAL_VOLUME");
aCriteria[ SMESH::FT_EntityType ] = tr("ENTITY_TYPE");
aCriteria[ SMESH::FT_ConnectedElements ] = tr("CONNECTED_ELEMS");
aCriteria[ SMESH::FT_EqualVolumes ] = tr("EQUAL_VOLUME");
aCriteria[ SMESH::FT_EntityType ] = tr("ENTITY_TYPE");
aCriteria[ SMESH::FT_ConnectedElements ] = tr("CONNECTED_ELEMS");
+ aCriteria[ SMESH::FT_ScaledJacobian ] = tr("SCALED_JACOBIAN");
}
return aCriteria;
}
}
return aCriteria;
}
@@
-2370,7
+2386,7
@@
const QMap<int, QString>& SMESHGUI_FilterTable::getCompare() const
// Purpose : Create table
//=======================================================================
SMESHGUI_FilterTable::Table* SMESHGUI_FilterTable::createTable (QWidget* theParent,
// Purpose : Create table
//=======================================================================
SMESHGUI_FilterTable::Table* SMESHGUI_FilterTable::createTable (QWidget* theParent,
- const int
theType
)
+ const int
/*theType*/
)
{
// create table
Table* aTable= new Table(0, 6, theParent);
{
// create table
Table* aTable= new Table(0, 6, theParent);
@@
-2737,7
+2753,7
@@
void SMESHGUI_FilterDlg::construct (const QList<int>& theTypes)
aDlgLay->setStretchFactor(myMainFrame, 1);
aDlgLay->setStretchFactor(myMainFrame, 1);
- myHelpFileName = "selection_filter_library
_page
.html";
+ myHelpFileName = "selection_filter_library.html";
Init(myTypes);
}
Init(myTypes);
}
@@
-2997,13
+3013,13
@@
void SMESHGUI_FilterDlg::reject()
SALOME_ListIO aList;
mySelectionMgr->clearFilters();
mySelectionMgr->clearSelected();
SALOME_ListIO aList;
mySelectionMgr->clearFilters();
mySelectionMgr->clearSelected();
- SALOME_DataMapIteratorOf
DataMapOfIOMapOfInteger
anIter (myIObjects);
+ SALOME_DataMapIteratorOf
IOMapOfVtk
anIter (myIObjects);
for ( ; anIter.More(); anIter.Next())
{
aList.Append(anIter.Key());
for ( ; anIter.More(); anIter.Next())
{
aList.Append(anIter.Key());
-
TColStd_MapOfInteger
aResMap;
- const
TColStd_IndexedMapOfInteger
& anIndMap = anIter.Value();
+
SVTK_TVtkIDsMap
aResMap;
+ const
SVTK_TIndexedMapOfVtkId
& anIndMap = anIter.Value();
for (int i = 1, n = anIndMap.Extent(); i <= n; i++)
aResMap.Add(anIndMap(i));
for (int i = 1, n = anIndMap.Extent(); i <= n; i++)
aResMap.Add(anIndMap(i));
@@
-3069,7
+3085,7
@@
void SMESHGUI_FilterDlg::onHelp()
//=======================================================================
// name : SMESHGUI_FilterDlg::onDeactivate
//=======================================================================
// name : SMESHGUI_FilterDlg::onDeactivate
-// Purpose : SLOT called when dialog must be deativated
+// Purpose : SLOT called when dialog must be dea
c
tivated
//=======================================================================
void SMESHGUI_FilterDlg::onDeactivate()
{
//=======================================================================
void SMESHGUI_FilterDlg::onDeactivate()
{
@@
-3195,8
+3211,9
@@
bool SMESHGUI_FilterDlg::isValid() const
QString aName;
myTable->GetThreshold(i, aName);
QString aName;
myTable->GetThreshold(i, aName);
- std::vector<_PTR(SObject)> aList =
- SMESH::GetActiveStudyDocument()->FindObjectByName(aName.toLatin1().constData(), "GEOM");
+ std::vector<_PTR(SObject)> aList = SMESH::getStudy()->FindObjectByName(aName.toUtf8().constData(), "GEOM");
+ if (aList.size() == 0)
+ aList = SMESH::getStudy()->FindObjectByName(aName.toUtf8().constData(), "SHAPERSTUDY");
if (aList.size() == 0) {
SUIT_MessageBox::information(SMESHGUI::desktop(), tr("SMESH_INSUFFICIENT_DATA"),
tr("BAD_SHAPE_NAME").arg(aName));
if (aList.size() == 0) {
SUIT_MessageBox::information(SMESHGUI::desktop(), tr("SMESH_INSUFFICIENT_DATA"),
tr("BAD_SHAPE_NAME").arg(aName));
@@
-3333,7
+3350,7
@@
void SMESHGUI_FilterDlg::SetSelection()
const SALOME_ListIO& anObjs = mySelector->StoredIObjects();
SALOME_ListIteratorOfListIO anIter (anObjs);
for ( ; anIter.More(); anIter.Next()) {
const SALOME_ListIO& anObjs = mySelector->StoredIObjects();
SALOME_ListIteratorOfListIO anIter (anObjs);
for ( ; anIter.More(); anIter.Next()) {
-
TColStd_IndexedMapOfInteger
aMap;
+
SVTK_TIndexedMapOfVtkId
aMap;
mySelector->GetIndex(anIter.Value(), aMap);
myIObjects.Bind(anIter.Value(), aMap);
}
mySelector->GetIndex(anIter.Value(), aMap);
myIObjects.Bind(anIter.Value(), aMap);
}
@@
-3527,9
+3544,9
@@
void SMESHGUI_FilterDlg::filterSource (const int theType,
{
if (myMesh->_is_nil())
return;
{
if (myMesh->_is_nil())
return;
- SMESH::
long
_array_var anIds = myFilter[ theType ]->GetElementsId(myMesh);
+ SMESH::
smIdType
_array_var anIds = myFilter[ theType ]->GetElementsId(myMesh);
for (int i = 0, n = anIds->length(); i < n; i++)
for (int i = 0, n = anIds->length(); i < n; i++)
- theResIds.append(
anIds[ i ]
);
+ theResIds.append(
FromSmIdType<int>(anIds[ i ])
);
}
else if (aSourceId == Selection)
{
}
else if (aSourceId == Selection)
{
@@
-3570,7
+3587,7
@@
void SMESHGUI_FilterDlg::filterSelectionSource (const int theType,
// Create map of entities to be filtered
TColStd_MapOfInteger aToBeFiltered;
// Create map of entities to be filtered
TColStd_MapOfInteger aToBeFiltered;
- SALOME_DataMapIteratorOf
DataMapOfIOMapOfInteger
anIter(myIObjects);
+ SALOME_DataMapIteratorOf
IOMapOfVtk
anIter(myIObjects);
for ( ; anIter.More(); anIter.Next())
{
for ( ; anIter.More(); anIter.Next())
{
@@
-3580,10
+3597,10
@@
void SMESHGUI_FilterDlg::filterSelectionSource (const int theType,
{
if (aSubMesh->GetFather()->GetId() == myMesh->GetId())
{
{
if (aSubMesh->GetFather()->GetId() == myMesh->GetId())
{
- SMESH::
long
_array_var anIds =
+ SMESH::
smIdType
_array_var anIds =
theType == SMESH::NODE ? aSubMesh->GetNodesId() : aSubMesh->GetElementsId();
for (int i = 0, n = anIds->length(); i < n; i++)
theType == SMESH::NODE ? aSubMesh->GetNodesId() : aSubMesh->GetElementsId();
for (int i = 0, n = anIds->length(); i < n; i++)
- aToBeFiltered.Add(
anIds[ i ]
);
+ aToBeFiltered.Add(
FromSmIdType<int>(anIds[ i ])
);
}
}
}
}
@@
-3594,9
+3611,9
@@
void SMESHGUI_FilterDlg::filterSelectionSource (const int theType,
{
if (aGroup->GetType() == theType && aGroup->GetMesh()->GetId() == myMesh->GetId())
{
{
if (aGroup->GetType() == theType && aGroup->GetMesh()->GetId() == myMesh->GetId())
{
- SMESH::
long
_array_var anIds = aGroup->GetListOfID();
+ SMESH::
smIdType
_array_var anIds = aGroup->GetListOfID();
for (int i = 0, n = anIds->length(); i < n; i++)
for (int i = 0, n = anIds->length(); i < n; i++)
- aToBeFiltered.Add(
anIds[ i ]
);
+ aToBeFiltered.Add(
FromSmIdType<int>(anIds[ i ])
);
}
}
}
}
@@
-3604,7
+3621,7
@@
void SMESHGUI_FilterDlg::filterSelectionSource (const int theType,
SMESH::SMESH_Mesh_var aMeshPtr = SMESH::IObjectToInterface<SMESH::SMESH_Mesh>(anIter.Key());
if (!aMeshPtr->_is_nil() && aMeshPtr->GetId() == myMesh->GetId())
{
SMESH::SMESH_Mesh_var aMeshPtr = SMESH::IObjectToInterface<SMESH::SMESH_Mesh>(anIter.Key());
if (!aMeshPtr->_is_nil() && aMeshPtr->GetId() == myMesh->GetId())
{
- const
TColStd_IndexedMapOfInteger
& aSelMap = anIter.Value();
+ const
SVTK_TIndexedMapOfVtkId
& aSelMap = anIter.Value();
if (aSelMap.Extent() > 0)
{
if (aSelMap.Extent() > 0)
{
@@
-3637,7
+3654,7
@@
SMESH_Actor* SMESHGUI_FilterDlg::getActor()
if ( meshActor && meshActor->GetVisibility() )
return meshActor;
if ( meshActor && meshActor->GetVisibility() )
return meshActor;
- SALOME_DataMapIteratorOf
DataMapOfIOMapOfInteger
anIter(myIObjects);
+ SALOME_DataMapIteratorOf
IOMapOfVtk
anIter(myIObjects);
for ( ; anIter.More(); anIter.Next())
{
Handle(SALOME_InteractiveObject) io = anIter.Key();
for ( ; anIter.More(); anIter.Next())
{
Handle(SALOME_InteractiveObject) io = anIter.Key();
@@
-3697,7
+3714,7
@@
void SMESHGUI_FilterDlg::selectInViewer (const int theType, const QList<int>& th
SMESH::RemoveFilter(aFilterId);
// get vtk ids
SMESH::RemoveFilter(aFilterId);
// get vtk ids
-
TColStd_MapOfInteger
aMap;
+
SVTK_TVtkIDsMap
aMap;
QList<int>::const_iterator anIter;
for (anIter = theIds.begin(); anIter != theIds.end(); ++anIter) {
aMap.Add(*anIter);
QList<int>::const_iterator anIter;
for (anIter = theIds.begin(); anIter != theIds.end(); ++anIter) {
aMap.Add(*anIter);
@@
-3719,7
+3736,7
@@
void SMESHGUI_FilterDlg::selectInViewer (const int theType, const QList<int>& th
//=======================================================================
SMESH::Filter::Criterion SMESHGUI_FilterDlg::createCriterion()
{
//=======================================================================
SMESH::Filter::Criterion SMESHGUI_FilterDlg::createCriterion()
{
-
SMESH::Filter::Criterion aCriterion;
+ SMESH::Filter::Criterion aCriterion;
aCriterion.Type = SMESH::FT_Undefined;
aCriterion.Compare = SMESH::FT_Undefined;
aCriterion.Type = SMESH::FT_Undefined;
aCriterion.Compare = SMESH::FT_Undefined;
@@
-3742,7
+3759,7
@@
SMESH::Filter::Criterion SMESHGUI_FilterDlg::createCriterion()
void SMESHGUI_FilterDlg::onSelectionDone()
{
const SALOME_ListIO& aList = mySelector->StoredIObjects();
void SMESHGUI_FilterDlg::onSelectionDone()
{
const SALOME_ListIO& aList = mySelector->StoredIObjects();
- if ( myMesh->_is_nil() && aList.Extent()
>
0 )
+ if ( myMesh->_is_nil() && aList.Extent()
>
0 )
{
myMesh = SMESH::IObjectToInterface<SMESH::SMESH_Mesh>(aList.First());
if ( !(myMesh->_is_nil()) ) {
{
myMesh = SMESH::IObjectToInterface<SMESH::SMESH_Mesh>(aList.First());
if ( !(myMesh->_is_nil()) ) {
@@
-3808,6
+3825,7
@@
void SMESHGUI_FilterDlg::onSelectionDone()
myTable->SetThreshold(aRow, SMESH::toQStr( grp->GetName() ));
myTable->SetID (aRow, anIO->getEntry() );
}
myTable->SetThreshold(aRow, SMESH::toQStr( grp->GetName() ));
myTable->SetID (aRow, anIO->getEntry() );
}
+ break;
}
default: // get a GEOM object
{
}
default: // get a GEOM object
{