Salome HOME
projects
/
modules
/
smesh.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
fc526c4
)
SMESHGUI fix warnings
author
Viktor UZLOV
<vuzlov@debian10-01.nnov.opencascade.com>
Tue, 9 Feb 2021 09:10:49 +0000
(12:10 +0300)
committer
Viktor UZLOV
<vuzlov@debian10-01.nnov.opencascade.com>
Tue, 9 Feb 2021 09:10:49 +0000
(12:10 +0300)
18 files changed:
src/SMESHGUI/SMESHGUI_Add0DElemsOnAllNodesDlg.cxx
patch
|
blob
|
history
src/SMESHGUI/SMESHGUI_AddQuadraticElementDlg.cxx
patch
|
blob
|
history
src/SMESHGUI/SMESHGUI_CopyMeshDlg.cxx
patch
|
blob
|
history
src/SMESHGUI/SMESHGUI_CreatePolyhedralVolumeDlg.cxx
patch
|
blob
|
history
src/SMESHGUI/SMESHGUI_DisplayEntitiesDlg.cxx
patch
|
blob
|
history
src/SMESHGUI/SMESHGUI_ExtrusionAlongPathDlg.cxx
patch
|
blob
|
history
src/SMESHGUI/SMESHGUI_FilterDlg.cxx
patch
|
blob
|
history
src/SMESHGUI/SMESHGUI_MakeNodeAtPointDlg.cxx
patch
|
blob
|
history
src/SMESHGUI/SMESHGUI_MultiEditDlg.cxx
patch
|
blob
|
history
src/SMESHGUI/SMESHGUI_OffsetDlg.cxx
patch
|
blob
|
history
src/SMESHGUI/SMESHGUI_RotationDlg.cxx
patch
|
blob
|
history
src/SMESHGUI/SMESHGUI_ScaleDlg.cxx
patch
|
blob
|
history
src/SMESHGUI/SMESHGUI_SelectionOp.cxx
patch
|
blob
|
history
src/SMESHGUI/SMESHGUI_SewingDlg.cxx
patch
|
blob
|
history
src/SMESHGUI/SMESHGUI_ShapeByMeshDlg.cxx
patch
|
blob
|
history
src/SMESHGUI/SMESHGUI_SingleEditDlg.cxx
patch
|
blob
|
history
src/SMESHGUI/SMESHGUI_SymmetryDlg.cxx
patch
|
blob
|
history
src/SMESHGUI/SMESHGUI_TranslationDlg.cxx
patch
|
blob
|
history
diff --git
a/src/SMESHGUI/SMESHGUI_Add0DElemsOnAllNodesDlg.cxx
b/src/SMESHGUI/SMESHGUI_Add0DElemsOnAllNodesDlg.cxx
index 3c24081ccb3ae5b01fc54d3e21170645383972e9..82902c13132fe44569d01ef2833f098255869298 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_Add0DElemsOnAllNodesDlg.cxx
+++ b/
src/SMESHGUI/SMESHGUI_Add0DElemsOnAllNodesDlg.cxx
@@
-40,6
+40,7
@@
#include <SUIT_MessageBox.h>
#include <SVTK_Selector.h>
#include <SalomeApp_Tools.h>
#include <SUIT_MessageBox.h>
#include <SVTK_Selector.h>
#include <SalomeApp_Tools.h>
+#include <smIdType.hxx>
// Qt includes
#include <QButtonGroup>
// Qt includes
#include <QButtonGroup>
@@
-438,14
+439,14
@@
bool SMESHGUI_Add0DElemsOnAllNodesOp::onApply()
// Create 0D elements
// Create 0D elements
-
int
prevNb0D = mesh->Nb0DElements();
+
smIdType
prevNb0D = mesh->Nb0DElements();
QString groupName = myDlg->myGroupListCmBox->currentText();
SMESH::SMESH_IDSource_var newObj =
editor->Create0DElementsOnAllNodes( meshObject, groupName.toUtf8().data(),
myDlg->myDuplicateElemsChkBox->isChecked() );
QString groupName = myDlg->myGroupListCmBox->currentText();
SMESH::SMESH_IDSource_var newObj =
editor->Create0DElementsOnAllNodes( meshObject, groupName.toUtf8().data(),
myDlg->myDuplicateElemsChkBox->isChecked() );
-
int
newNb0D = mesh->Nb0DElements() - prevNb0D;
+
smIdType
newNb0D = mesh->Nb0DElements() - prevNb0D;
SUIT_MessageBox::information( myDlg, tr( "SMESH_INFORMATION" ),
tr( "NB_NEW_0D" ).arg( newNb0D ),
SUIT_MessageBox::Ok, SUIT_MessageBox::Ok);
SUIT_MessageBox::information( myDlg, tr( "SMESH_INFORMATION" ),
tr( "NB_NEW_0D" ).arg( newNb0D ),
SUIT_MessageBox::Ok, SUIT_MessageBox::Ok);
diff --git
a/src/SMESHGUI/SMESHGUI_AddQuadraticElementDlg.cxx
b/src/SMESHGUI/SMESHGUI_AddQuadraticElementDlg.cxx
index 1cf0a384f0f5f1e3766807c4be92d2d4fee6aa78..880316aa52e2e3a3646e2461dc0304f035339ee9 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_AddQuadraticElementDlg.cxx
+++ b/
src/SMESHGUI/SMESHGUI_AddQuadraticElementDlg.cxx
@@
-996,7
+996,7
@@
void SMESHGUI_AddQuadraticElementDlg::onTextChange (const QString& theNewText)
for (int i = 0; i < aListId.count(); i++) {
if ( const SMDS_MeshNode * n = aMesh->FindNode( aListId[ i ].toInt() ) )
{
for (int i = 0; i < aListId.count(); i++) {
if ( const SMDS_MeshNode * n = aMesh->FindNode( aListId[ i ].toInt() ) )
{
- newIndices.Add(
n->GetID(
) );
+ newIndices.Add(
FromIdType<int>(n->GetID()
) );
}
else
{
}
else
{
diff --git
a/src/SMESHGUI/SMESHGUI_CopyMeshDlg.cxx
b/src/SMESHGUI/SMESHGUI_CopyMeshDlg.cxx
index 5f6a2b2f03c13d913cd3f716e88edfdffbe4ec07..59c1aceec0eb4ff6acd661b89bb6aec08561626a 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_CopyMeshDlg.cxx
+++ b/
src/SMESHGUI/SMESHGUI_CopyMeshDlg.cxx
@@
-619,7
+619,7
@@
void SMESHGUI_CopyMeshDlg::onTextChange (const QString& theNewText)
for (int i = 0; i < aListId.count(); i++)
if ( const SMDS_MeshElement * e = aMesh->FindElement(aListId[ i ].toInt()))
{
for (int i = 0; i < aListId.count(); i++)
if ( const SMDS_MeshElement * e = aMesh->FindElement(aListId[ i ].toInt()))
{
- newIndices.Add(
e->GetID(
));
+ newIndices.Add(
FromIdType<int>(e->GetID()
));
}
}
myNbOkElements = newIndices.Extent();
}
}
myNbOkElements = newIndices.Extent();
diff --git
a/src/SMESHGUI/SMESHGUI_CreatePolyhedralVolumeDlg.cxx
b/src/SMESHGUI/SMESHGUI_CreatePolyhedralVolumeDlg.cxx
index d89acb46a461b54bd2e3417050224fbedb83a8e6..bdfff5b5b397d86f693708e12d3eb83bbfb29bd1 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_CreatePolyhedralVolumeDlg.cxx
+++ b/
src/SMESHGUI/SMESHGUI_CreatePolyhedralVolumeDlg.cxx
@@
-694,7
+694,7
@@
void SMESHGUI_CreatePolyhedralVolumeDlg::onTextChange(const QString& theNewText)
for ( int i = 0; i < aListId.count(); i++ ) {
const SMDS_MeshNode * n = aMesh->FindNode( aListId[ i ].toInt() );
if ( n ) {
for ( int i = 0; i < aListId.count(); i++ ) {
const SMDS_MeshNode * n = aMesh->FindNode( aListId[ i ].toInt() );
if ( n ) {
- newIndices.Add(
n->GetID(
));
+ newIndices.Add(
FromIdType<int>(n->GetID()
));
myNbOkElements++;
}
}
myNbOkElements++;
}
}
@@
-727,7
+727,7
@@
void SMESHGUI_CreatePolyhedralVolumeDlg::onTextChange(const QString& theNewText)
for ( int i = 0; i < aListId.count(); i++ ) {
const SMDS_MeshElement * e = aMesh->FindElement( aListId[ i ].toInt() );
if ( e ) {
for ( int i = 0; i < aListId.count(); i++ ) {
const SMDS_MeshElement * e = aMesh->FindElement( aListId[ i ].toInt() );
if ( e ) {
- newIndices.Add(
e->GetID(
));
+ newIndices.Add(
FromIdType<int>(e->GetID()
));
myNbOkElements++;
}
}
myNbOkElements++;
}
}
@@
-992,7
+992,7
@@
void SMESHGUI_CreatePolyhedralVolumeDlg::displaySimulation()
SMESH::TPolySimulation::TVTKIds aVTKIds_faces;
while( anIter->more() )
if ( const SMDS_MeshNode* aNode = (SMDS_MeshNode*)anIter->next() ){
SMESH::TPolySimulation::TVTKIds aVTKIds_faces;
while( anIter->more() )
if ( const SMDS_MeshNode* aNode = (SMDS_MeshNode*)anIter->next() ){
- vtkIdType aId = myActor->GetObject()->GetNodeVTKId(
aNode->GetID(
) );
+ vtkIdType aId = myActor->GetObject()->GetNodeVTKId(
FromIdType<int>(aNode->GetID()
) );
aVTKIds.push_back(aId);
aVTKIds_faces.push_back(aId);
}
aVTKIds.push_back(aId);
aVTKIds_faces.push_back(aId);
}
diff --git
a/src/SMESHGUI/SMESHGUI_DisplayEntitiesDlg.cxx
b/src/SMESHGUI/SMESHGUI_DisplayEntitiesDlg.cxx
index 378e2ae0d23beda1b9e283da253142d40594a042..2bebd14bb554c20562331050be9b4b3522be4e5a 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_DisplayEntitiesDlg.cxx
+++ b/
src/SMESHGUI/SMESHGUI_DisplayEntitiesDlg.cxx
@@
-33,6
+33,7
@@
#include <SUIT_OverrideCursor.h>
#include <SUIT_ResourceMgr.h>
#include <SUIT_Session.h>
#include <SUIT_OverrideCursor.h>
#include <SUIT_ResourceMgr.h>
#include <SUIT_Session.h>
+#include <smIdType.hxx>
#include <QCheckBox>
#include <QGridLayout>
#include <QCheckBox>
#include <QGridLayout>
@@
-81,7
+82,7
@@
SMESHGUI_DisplayEntitiesDlg::SMESHGUI_DisplayEntitiesDlg( QWidget* parent )
QGridLayout* hl = new QGridLayout( anEntitiesGrp );
hl->setMargin( MARGIN );
hl->setSpacing( SPACING );
QGridLayout* hl = new QGridLayout( anEntitiesGrp );
hl->setMargin( MARGIN );
hl->setSpacing( SPACING );
-
int
nbElements;
+
smIdType
nbElements;
// 0DElements
nbElements = myActor ? myActor->GetObject()->GetNbEntities( SMDSAbs_0DElement ) : aMesh->Nb0DElements();
// 0DElements
nbElements = myActor ? myActor->GetObject()->GetNbEntities( SMDSAbs_0DElement ) : aMesh->Nb0DElements();
diff --git
a/src/SMESHGUI/SMESHGUI_ExtrusionAlongPathDlg.cxx
b/src/SMESHGUI/SMESHGUI_ExtrusionAlongPathDlg.cxx
index 189f49ab6fac3d50b4b32d992b966466c6a72fae..72bb84ef3b375da4cdd648b77899d9dab5bed58d 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_ExtrusionAlongPathDlg.cxx
+++ b/
src/SMESHGUI/SMESHGUI_ExtrusionAlongPathDlg.cxx
@@
-689,7
+689,7
@@
void SMESHGUI_ExtrusionAlongPathDlg::onTextChange (const QString& theNewText)
const SMDS_MeshNode* n = aMesh->FindNode(ind);
if (n) {
TColStd_MapOfInteger newIndices;
const SMDS_MeshNode* n = aMesh->FindNode(ind);
if (n) {
TColStd_MapOfInteger newIndices;
- newIndices.Add(
n->GetID(
));
+ newIndices.Add(
FromIdType<int>(n->GetID()
));
mySelector->AddOrRemoveIndex( aPathActor->getIO(), newIndices, false );
if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
aViewWindow->highlight( aPathActor->getIO(), true, true );
mySelector->AddOrRemoveIndex( aPathActor->getIO(), newIndices, false );
if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
aViewWindow->highlight( aPathActor->getIO(), true, true );
diff --git
a/src/SMESHGUI/SMESHGUI_FilterDlg.cxx
b/src/SMESHGUI/SMESHGUI_FilterDlg.cxx
index 26038cb8c1ae374c40f66eaae1cefed9e8e9e892..4cc80141979f27761f23565cbce64f93bd91d9cd 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_FilterDlg.cxx
+++ b/
src/SMESHGUI/SMESHGUI_FilterDlg.cxx
@@
-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>
@@
-3538,7
+3539,7
@@
void SMESHGUI_FilterDlg::filterSource (const int theType,
return;
SMESH::smIdType_array_var anIds = myFilter[ theType ]->GetElementsId(myMesh);
for (int i = 0, n = anIds->length(); i < n; i++)
return;
SMESH::smIdType_array_var anIds = myFilter[ theType ]->GetElementsId(myMesh);
for (int i = 0, n = anIds->length(); i < n; i++)
- theResIds.append(
anIds[ i ]
);
+ theResIds.append(
FromIdType<int>(anIds[ i ])
);
}
else if (aSourceId == Selection)
{
}
else if (aSourceId == Selection)
{
@@
-3592,7
+3593,7
@@
void SMESHGUI_FilterDlg::filterSelectionSource (const int theType,
SMESH::smIdType_array_var anIds =
theType == SMESH::NODE ? aSubMesh->GetNodesId() : aSubMesh->GetElementsId();
for (int i = 0, n = anIds->length(); i < n; i++)
SMESH::smIdType_array_var anIds =
theType == SMESH::NODE ? aSubMesh->GetNodesId() : aSubMesh->GetElementsId();
for (int i = 0, n = anIds->length(); i < n; i++)
- aToBeFiltered.Add(
anIds[ i ]
);
+ aToBeFiltered.Add(
FromIdType<int>(anIds[ i ])
);
}
}
}
}
@@
-3605,7
+3606,7
@@
void SMESHGUI_FilterDlg::filterSelectionSource (const int theType,
{
SMESH::smIdType_array_var anIds = aGroup->GetListOfID();
for (int i = 0, n = anIds->length(); i < n; i++)
{
SMESH::smIdType_array_var anIds = aGroup->GetListOfID();
for (int i = 0, n = anIds->length(); i < n; i++)
- aToBeFiltered.Add(
anIds[ i ]
);
+ aToBeFiltered.Add(
FromIdType<int>(anIds[ i ])
);
}
}
}
}
diff --git
a/src/SMESHGUI/SMESHGUI_MakeNodeAtPointDlg.cxx
b/src/SMESHGUI/SMESHGUI_MakeNodeAtPointDlg.cxx
index 5c06fe86fed9469c0ce96262bedc3558de69d141..e3cf69feb6d198471968ca04f65d578e45155e7c 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_MakeNodeAtPointDlg.cxx
+++ b/
src/SMESHGUI/SMESHGUI_MakeNodeAtPointDlg.cxx
@@
-533,9
+533,9
@@
bool SMESHGUI_MakeNodeAtPointOp::onApply()
bool ok;
int anId = myDlg->myId->text().toInt( &ok );
if( !ok || anId < 1 )
bool ok;
int anId = myDlg->myId->text().toInt( &ok );
if( !ok || anId < 1 )
- anId = aMeshEditor->FindNodeClosestTo(myDlg->myDestinationX->GetValue(),
- myDlg->myDestinationY->GetValue(),
-
myDlg->myDestinationZ->GetValue(
));
+ anId =
FromIdType<int>(
aMeshEditor->FindNodeClosestTo(myDlg->myDestinationX->GetValue(),
+
myDlg->myDestinationY->GetValue(),
+
myDlg->myDestinationZ->GetValue()
));
int aResult = aMeshEditor->MoveNode(anId,
myDlg->myDestinationX->GetValue(),
int aResult = aMeshEditor->MoveNode(anId,
myDlg->myDestinationX->GetValue(),
@@
-770,9
+770,9
@@
void SMESHGUI_MakeNodeAtPointOp::redisplayPreview()
myDlg->myDestDZ->setReadOnly(true);
}
if ( isPreview && isMoveNode && anId == 0 )
myDlg->myDestDZ->setReadOnly(true);
}
if ( isPreview && isMoveNode && anId == 0 )
- anId = aPreviewer->FindNodeClosestTo(myDlg->myDestinationX->GetValue(),
- myDlg->myDestinationY->GetValue(),
-
myDlg->myDestinationZ->GetValue(
));
+ anId =
FromIdType<int>(
aPreviewer->FindNodeClosestTo(myDlg->myDestinationX->GetValue(),
+
myDlg->myDestinationY->GetValue(),
+
myDlg->myDestinationZ->GetValue()
));
// find id and/or just compute preview
aPreviewer->MoveNode(anId,
myDlg->myDestinationX->GetValue(),
// find id and/or just compute preview
aPreviewer->MoveNode(anId,
myDlg->myDestinationX->GetValue(),
@@
-870,7
+870,7
@@
void SMESHGUI_MakeNodeAtPointOp::onTextChange( const QString& theText )
if( const SMDS_MeshNode* aNode = aMesh->FindNode( theText.toInt() ) )
{
TColStd_MapOfInteger aListInd;
if( const SMDS_MeshNode* aNode = aMesh->FindNode( theText.toInt() ) )
{
TColStd_MapOfInteger aListInd;
- aListInd.Add(
aNode->GetID(
) );
+ aListInd.Add(
FromIdType<int>(aNode->GetID()
) );
selector()->AddOrRemoveIndex( anIO, aListInd, false );
if( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( SMESHGUI::GetSMESHGUI() ) )
aViewWindow->highlight( anIO, true, true );
selector()->AddOrRemoveIndex( anIO, aListInd, false );
if( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( SMESHGUI::GetSMESHGUI() ) )
aViewWindow->highlight( anIO, true, true );
diff --git
a/src/SMESHGUI/SMESHGUI_MultiEditDlg.cxx
b/src/SMESHGUI/SMESHGUI_MultiEditDlg.cxx
index c9c8df0e956d5daa0d5e1dece6cc95cedf796d87..d1256cf0ea94098e0b71f7088da049f61d11ce8d 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_MultiEditDlg.cxx
+++ b/
src/SMESHGUI/SMESHGUI_MultiEditDlg.cxx
@@
-711,8
+711,8
@@
void SMESHGUI_MultiEditDlg::onAddBtn()
if (aSubMesh->GetFather()->GetId() == myMesh->GetId()) {
SMESH::smIdType_array_var anIds = aSubMesh->GetElementsId();
for (int i = 0, n = anIds->length(); i < n; i++) {
if (aSubMesh->GetFather()->GetId() == myMesh->GetId()) {
SMESH::smIdType_array_var anIds = aSubMesh->GetElementsId();
for (int i = 0, n = anIds->length(); i < n; i++) {
- if (isIdValid(
anIds[ i ]
))
- toBeAdded.Add(
anIds[ i ]
);
+ if (isIdValid(
FromIdType<int>(anIds[ i ])
))
+ toBeAdded.Add(
FromIdType<int>(anIds[ i ])
);
}
}
}
}
}
}
@@
-727,8
+727,8
@@
void SMESHGUI_MultiEditDlg::onAddBtn()
if (aGroup->GetMesh()->GetId() == myMesh->GetId()) {
SMESH::smIdType_array_var anIds = aGroup->GetListOfID();
for (int i = 0, n = anIds->length(); i < n; i++) {
if (aGroup->GetMesh()->GetId() == myMesh->GetId()) {
SMESH::smIdType_array_var anIds = aGroup->GetListOfID();
for (int i = 0, n = anIds->length(); i < n; i++) {
- if (isIdValid(
anIds[ i ]
))
- toBeAdded.Add(
anIds[ i ]
);
+ if (isIdValid(
FromIdType<int>(anIds[ i ])
))
+ toBeAdded.Add(
FromIdType<int>(anIds[ i ])
);
}
}
}
}
}
}
@@
-1111,7
+1111,7
@@
bool SMESHGUI_ChangeOrientationDlg::process (SMESH::SMESH_MeshEditor_ptr theEdi
int SMESHGUI_ChangeOrientationDlg::nbElemsInMesh()
{
int SMESHGUI_ChangeOrientationDlg::nbElemsInMesh()
{
- return ( myFilterType == SMESH::FaceFilter ) ?
myMesh->NbFaces() : myMesh->NbVolumes(
);
+ return ( myFilterType == SMESH::FaceFilter ) ?
FromIdType<int>(myMesh->NbFaces()) : FromIdType<int>(myMesh->NbVolumes()
);
}
/*!
}
/*!
@@
-1209,7
+1209,7
@@
bool SMESHGUI_UnionOfTrianglesDlg::process (SMESH::SMESH_MeshEditor_ptr theEdito
int SMESHGUI_UnionOfTrianglesDlg::nbElemsInMesh()
{
int SMESHGUI_UnionOfTrianglesDlg::nbElemsInMesh()
{
- return
myMesh->NbTriangles(
);
+ return
FromIdType<int>(myMesh->NbTriangles()
);
}
void SMESHGUI_UnionOfTrianglesDlg::onDisplaySimulation( bool toDisplayPreview )
}
void SMESHGUI_UnionOfTrianglesDlg::onDisplaySimulation( bool toDisplayPreview )
@@
-1329,7
+1329,7
@@
bool SMESHGUI_CuttingOfQuadsDlg::process (SMESH::SMESH_MeshEditor_ptr theEditor,
int SMESHGUI_CuttingOfQuadsDlg::nbElemsInMesh()
{
int SMESHGUI_CuttingOfQuadsDlg::nbElemsInMesh()
{
- return
myMesh->NbQuadrangles(
);
+ return
FromIdType<int>(myMesh->NbQuadrangles()
);
}
}
@@
-1439,13
+1439,13
@@
void SMESHGUI_CuttingOfQuadsDlg::displayPreview()
const SMDS_MeshNode* aNode = static_cast<const SMDS_MeshNode*>(anIter->next());
if (aNode)
{
const SMDS_MeshNode* aNode = static_cast<const SMDS_MeshNode*>(anIter->next());
if (aNode)
{
- if (!anIdToVtk.IsBound(
aNode->GetID(
)))
+ if (!anIdToVtk.IsBound(
FromIdType<int>(aNode->GetID()
)))
{
aPoints->SetPoint(++nbPoints, aNode->X(), aNode->Y(), aNode->Z());
{
aPoints->SetPoint(++nbPoints, aNode->X(), aNode->Y(), aNode->Z());
- anIdToVtk.Bind(
aNode->GetID(
), nbPoints);
+ anIdToVtk.Bind(
FromIdType<int>(aNode->GetID()
), nbPoints);
}
}
- aNodes[ k++ ] =
aNode->GetID(
);
+ aNodes[ k++ ] =
FromIdType<int>(aNode->GetID()
);
}
}
}
}
@@
-1698,7
+1698,7
@@
bool SMESHGUI_SplitVolumesDlg::process (SMESH::SMESH_MeshEditor_ptr theEditor,
int SMESHGUI_SplitVolumesDlg::nbElemsInMesh()
{
int SMESHGUI_SplitVolumesDlg::nbElemsInMesh()
{
- return isIntoPrisms() ?
myMesh->NbHexas() : myMesh->NbVolumes() - myMesh->NbTetras(
);
+ return isIntoPrisms() ?
FromIdType<int>(myMesh->NbHexas()) : FromIdType<int>(myMesh->NbVolumes() - myMesh->NbTetras()
);
}
bool SMESHGUI_SplitVolumesDlg::isIntoPrisms()
}
bool SMESHGUI_SplitVolumesDlg::isIntoPrisms()
diff --git
a/src/SMESHGUI/SMESHGUI_OffsetDlg.cxx
b/src/SMESHGUI/SMESHGUI_OffsetDlg.cxx
index 856eff488c17e9bf9c9f3a3791003b5296003351..ec681f8eb680f1515b92f2f9d372f4de1986b67e 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_OffsetDlg.cxx
+++ b/
src/SMESHGUI/SMESHGUI_OffsetDlg.cxx
@@
-558,7
+558,7
@@
void SMESHGUI_OffsetDlg::onTextChange (const QString& theNewText)
for (int i = 0; i < aListId.count(); i++)
{
if ( const SMDS_MeshElement * e = aMesh->FindElement(aListId[ i ].toInt()))
for (int i = 0; i < aListId.count(); i++)
{
if ( const SMDS_MeshElement * e = aMesh->FindElement(aListId[ i ].toInt()))
- newIndices.Add(
e->GetID(
) );
+ newIndices.Add(
FromIdType<int>(e->GetID()
) );
myNbOkElements++;
}
myNbOkElements++;
}
diff --git
a/src/SMESHGUI/SMESHGUI_RotationDlg.cxx
b/src/SMESHGUI/SMESHGUI_RotationDlg.cxx
index 357159383b839d6ed5c8d6fd4f83ae4e1473b79c..42667c09ca469e5b352612363e306cd9fff52576 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_RotationDlg.cxx
+++ b/
src/SMESHGUI/SMESHGUI_RotationDlg.cxx
@@
-650,7
+650,7
@@
void SMESHGUI_RotationDlg::onTextChange (const QString& theNewText)
for (int i = 0; i < aListId.count(); i++) {
const SMDS_MeshElement * e = aMesh->FindElement(aListId[ i ].toInt());
if (e)
for (int i = 0; i < aListId.count(); i++) {
const SMDS_MeshElement * e = aMesh->FindElement(aListId[ i ].toInt());
if (e)
- newIndices.Add(
e->GetID(
));
+ newIndices.Add(
FromIdType<int>(e->GetID()
));
myNbOkElements++;
}
myNbOkElements++;
}
diff --git
a/src/SMESHGUI/SMESHGUI_ScaleDlg.cxx
b/src/SMESHGUI/SMESHGUI_ScaleDlg.cxx
index 246b706481044d77cb864b4c5df3cf9e41d88911..19666562dd6b5339b445f7e9b196fee697aebdf9 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_ScaleDlg.cxx
+++ b/
src/SMESHGUI/SMESHGUI_ScaleDlg.cxx
@@
-690,7
+690,7
@@
void SMESHGUI_ScaleDlg::onTextChange (const QString& theNewText)
for (int i = 0; i < aListId.count(); i++) {
const SMDS_MeshElement * e = aMesh->FindElement(aListId[ i ].toInt());
if (e)
for (int i = 0; i < aListId.count(); i++) {
const SMDS_MeshElement * e = aMesh->FindElement(aListId[ i ].toInt());
if (e)
- newIndices.Add(
e->GetID(
));
+ newIndices.Add(
FromIdType<int>(e->GetID()
));
myNbOkElements++;
}
}
myNbOkElements++;
}
}
diff --git
a/src/SMESHGUI/SMESHGUI_SelectionOp.cxx
b/src/SMESHGUI/SMESHGUI_SelectionOp.cxx
index c84dd447eb79f928b31009bdc638139c21eaacdc..1a16815ffbf94ce0c3f55cf782cee55d5f9345d9 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_SelectionOp.cxx
+++ b/
src/SMESHGUI/SMESHGUI_SelectionOp.cxx
@@
-483,12
+483,12
@@
void SMESHGUI_SelectionOp::onTextChanged( int, const QStringList& list )
if ( selectionMode() == NodeSelection )
for( ; anIt!=aLast; anIt++ ) {
if( const SMDS_MeshNode * n = aMesh->FindNode( *anIt ) )
if ( selectionMode() == NodeSelection )
for( ; anIt!=aLast; anIt++ ) {
if( const SMDS_MeshNode * n = aMesh->FindNode( *anIt ) )
- newIndices.Add(
n->GetID(
) );
+ newIndices.Add(
FromIdType<int>(n->GetID()
) );
}
else
for( ; anIt!=aLast; anIt++ ) {
if( const SMDS_MeshElement* e = aMesh->FindElement( *anIt ) )
}
else
for( ; anIt!=aLast; anIt++ ) {
if( const SMDS_MeshElement* e = aMesh->FindElement( *anIt ) )
- newIndices.Add(
e->GetID(
) );
+ newIndices.Add(
FromIdType<int>(e->GetID()
) );
}
selector()->AddOrRemoveIndex( sel.First(), newIndices, false );
}
selector()->AddOrRemoveIndex( sel.First(), newIndices, false );
diff --git
a/src/SMESHGUI/SMESHGUI_SewingDlg.cxx
b/src/SMESHGUI/SMESHGUI_SewingDlg.cxx
index 9af9a4f2ee948785a03614557da3855aac1f8c59..df05b65e2c1c5dd35819df89efbc8dd6c8ee65a9 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_SewingDlg.cxx
+++ b/
src/SMESHGUI/SMESHGUI_SewingDlg.cxx
@@
-1551,7
+1551,7
@@
void SMESHGUI_SewingDlg::onTextChange (const QString& theNewText)
const SMDS_MeshNode * n = aMesh->FindNode(theNewText.toInt());
if (n) {
const SMDS_MeshNode * n = aMesh->FindNode(theNewText.toInt());
if (n) {
- newIndices.Add(
n->GetID(
));
+ newIndices.Add(
FromIdType<int>(n->GetID()
));
mySelector->AddOrRemoveIndex(myActor->getIO(), newIndices, false);
if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
aViewWindow->highlight( myActor->getIO(), true, true );
mySelector->AddOrRemoveIndex(myActor->getIO(), newIndices, false);
if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
aViewWindow->highlight( myActor->getIO(), true, true );
@@
-1583,7
+1583,7
@@
void SMESHGUI_SewingDlg::onTextChange (const QString& theNewText)
const SMDS_MeshElement * e = aMesh->FindElement(aListId[ i ].toInt());
if (e)
{
const SMDS_MeshElement * e = aMesh->FindElement(aListId[ i ].toInt());
if (e)
{
- newIndices.Add(
e->GetID(
));
+ newIndices.Add(
FromIdType<int>(e->GetID()
));
atLeastOneExists = true;
}
}
atLeastOneExists = true;
}
}
diff --git
a/src/SMESHGUI/SMESHGUI_ShapeByMeshDlg.cxx
b/src/SMESHGUI/SMESHGUI_ShapeByMeshDlg.cxx
index f761912cc21f08d0812252aca82d69752697b5e3..14438224661befe81c61505e247fc29bda9fa2fd 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_ShapeByMeshDlg.cxx
+++ b/
src/SMESHGUI/SMESHGUI_ShapeByMeshDlg.cxx
@@
-503,7
+503,7
@@
void SMESHGUI_ShapeByMeshOp::onElemIdChanged(const QString& theNewText)
for ( int i = 0; i < aListId.count(); i++ ) {
if ( const SMDS_MeshElement * e = aMesh->FindElement( aListId[ i ].toInt() ))
if ( e->GetType() == type )
for ( int i = 0; i < aListId.count(); i++ ) {
if ( const SMDS_MeshElement * e = aMesh->FindElement( aListId[ i ].toInt() ))
if ( e->GetType() == type )
- newIndices.Add(
e->GetID(
) );
+ newIndices.Add(
FromIdType<int>(e->GetID()
) );
}
if ( !newIndices.IsEmpty() )
}
if ( !newIndices.IsEmpty() )
diff --git
a/src/SMESHGUI/SMESHGUI_SingleEditDlg.cxx
b/src/SMESHGUI/SMESHGUI_SingleEditDlg.cxx
index ee532a7e004f5855f8f8bfaefb61950b08711a1e..adb7793436cb76366c5bb5434abe63b640b493b5 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_SingleEditDlg.cxx
+++ b/
src/SMESHGUI/SMESHGUI_SingleEditDlg.cxx
@@
-369,8
+369,8
@@
void SMESHGUI_SingleEditDlg::onTextChange (const QString& /*theNewText*/)
if ( findTriangles(aNode1,aNode2,tria1,tria2) )
{
if ( findTriangles(aNode1,aNode2,tria1,tria2) )
{
- newIndices.push_back(
aNode1->GetID(
) );
- newIndices.push_back(
aNode2->GetID(
) );
+ newIndices.push_back(
FromIdType<int>(aNode1->GetID()
) );
+ newIndices.push_back(
FromIdType<int>(aNode2->GetID()
) );
myOkBtn->setEnabled(true);
myApplyBtn->setEnabled(true);
myOkBtn->setEnabled(true);
myApplyBtn->setEnabled(true);
diff --git
a/src/SMESHGUI/SMESHGUI_SymmetryDlg.cxx
b/src/SMESHGUI/SMESHGUI_SymmetryDlg.cxx
index eb97069634df24510b8ffb5de28af4402054a96b..80054ebbfa5d469febb7fba746bc89fab283f9e7 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_SymmetryDlg.cxx
+++ b/
src/SMESHGUI/SMESHGUI_SymmetryDlg.cxx
@@
-709,7
+709,7
@@
void SMESHGUI_SymmetryDlg::onTextChange (const QString& theNewText)
for (int i = 0; i < aListId.count(); i++) {
const SMDS_MeshElement * e = aMesh->FindElement(aListId[ i ].toInt());
if (e)
for (int i = 0; i < aListId.count(); i++) {
const SMDS_MeshElement * e = aMesh->FindElement(aListId[ i ].toInt());
if (e)
- newIndices.Add(
e->GetID(
));
+ newIndices.Add(
FromIdType<int>(e->GetID()
));
myNbOkElements++;
}
myNbOkElements++;
}
diff --git
a/src/SMESHGUI/SMESHGUI_TranslationDlg.cxx
b/src/SMESHGUI/SMESHGUI_TranslationDlg.cxx
index 653ba519e65f1fc920cc48ffca5889e5792f0139..4486dfbe9d2aacf8587d512c3394acfa160e639a 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_TranslationDlg.cxx
+++ b/
src/SMESHGUI/SMESHGUI_TranslationDlg.cxx
@@
-721,7
+721,7
@@
void SMESHGUI_TranslationDlg::onTextChange (const QString& theNewText)
for (int i = 0; i < aListId.count(); i++) {
const SMDS_MeshElement * e = aMesh->FindElement(aListId[ i ].toInt());
if (e)
for (int i = 0; i < aListId.count(); i++) {
const SMDS_MeshElement * e = aMesh->FindElement(aListId[ i ].toInt());
if (e)
- newIndices.Add(
e->GetID(
));
+ newIndices.Add(
FromIdType<int>(e->GetID()
));
myNbOkElements++;
}
}
myNbOkElements++;
}
}