ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2024-12-28 02:10:35 +05:00
Code Issues Packages Projects Releases Wiki Activity

SMESHGUI fix warnings

Browse Source
This commit is contained in:
Viktor UZLOV 2021-02-09 12:10:49 +03:00
parent fc526c4dbf
commit 72a751fef5
18 changed files with 45 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/SMESHGUI/SMESHGUI_Add0DElemsOnAllNodesDlg.cxx
View File

@ -40,6 +40,7 @@
#include <SUIT_MessageBox.h>
#include <SVTK_Selector.h>
#include <SalomeApp_Tools.h>
#include <smIdType.hxx>
// Qt includes
#include <QButtonGroup>
@ -438,14 +439,14 @@ bool SMESHGUI_Add0DElemsOnAllNodesOp::onApply()
// 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() );
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);

2
src/SMESHGUI/SMESHGUI_AddQuadraticElementDlg.cxx
View File

@ -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() ) )
{
newIndices.Add( n->GetID() );
newIndices.Add( FromIdType<int>(n->GetID()) );
}
else
{

2
src/SMESHGUI/SMESHGUI_CopyMeshDlg.cxx
View File

@ -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()))
{
newIndices.Add(e->GetID());
newIndices.Add(FromIdType<int>(e->GetID()));
}
}
myNbOkElements = newIndices.Extent();

6
src/SMESHGUI/SMESHGUI_CreatePolyhedralVolumeDlg.cxx
View File

@ -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 ) {
newIndices.Add(n->GetID());
newIndices.Add(FromIdType<int>(n->GetID()));
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 ) {
newIndices.Add(e->GetID());
newIndices.Add(FromIdType<int>(e->GetID()));
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() ){
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);
}

3
src/SMESHGUI/SMESHGUI_DisplayEntitiesDlg.cxx
View File

@ -33,6 +33,7 @@
#include <SUIT_OverrideCursor.h>
#include <SUIT_ResourceMgr.h>
#include <SUIT_Session.h>
#include <smIdType.hxx>
#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 );
int nbElements;
smIdType nbElements;
// 0DElements
nbElements = myActor ? myActor->GetObject()->GetNbEntities( SMDSAbs_0DElement ) : aMesh->Nb0DElements();

2
src/SMESHGUI/SMESHGUI_ExtrusionAlongPathDlg.cxx
View File

@ -689,7 +689,7 @@ void SMESHGUI_ExtrusionAlongPathDlg::onTextChange (const QString& theNewText)
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 );

7
src/SMESHGUI/SMESHGUI_FilterDlg.cxx
View File

@ -69,6 +69,7 @@
// SALOME KERNEL includes
#include <SALOMEDSClient_Study.hxx>
#include <Basics_Utils.hxx>
#include <smIdType.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++)
theResIds.append(anIds[ i ]);
theResIds.append(FromIdType<int>(anIds[ i ]));
}
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++)
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++)
aToBeFiltered.Add(anIds[ i ]);
aToBeFiltered.Add(FromIdType<int>(anIds[ i ]));
}
}

14
src/SMESHGUI/SMESHGUI_MakeNodeAtPointDlg.cxx
View File

@ -533,9 +533,9 @@ bool SMESHGUI_MakeNodeAtPointOp::onApply()
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(),
@ -770,9 +770,9 @@ void SMESHGUI_MakeNodeAtPointOp::redisplayPreview()
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(),
@ -870,7 +870,7 @@ void SMESHGUI_MakeNodeAtPointOp::onTextChange( const QString& theText )
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 );

22
src/SMESHGUI/SMESHGUI_MultiEditDlg.cxx
View File

@ -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 (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 (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()
{
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()
{
return myMesh->NbTriangles();
return FromIdType<int>(myMesh->NbTriangles());
}
void SMESHGUI_UnionOfTrianglesDlg::onDisplaySimulation( bool toDisplayPreview )
@ -1329,7 +1329,7 @@ bool SMESHGUI_CuttingOfQuadsDlg::process (SMESH::SMESH_MeshEditor_ptr theEditor,
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)
{
if (!anIdToVtk.IsBound(aNode->GetID()))
if (!anIdToVtk.IsBound(FromIdType<int>(aNode->GetID())))
{
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()
{
return isIntoPrisms() ? myMesh->NbHexas() : myMesh->NbVolumes() - myMesh->NbTetras();
return isIntoPrisms() ? FromIdType<int>(myMesh->NbHexas()) : FromIdType<int>(myMesh->NbVolumes() - myMesh->NbTetras());
}
bool SMESHGUI_SplitVolumesDlg::isIntoPrisms()

2
src/SMESHGUI/SMESHGUI_OffsetDlg.cxx
View File

@ -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()))
newIndices.Add( e->GetID() );
newIndices.Add( FromIdType<int>(e->GetID()) );
myNbOkElements++;
}

2
src/SMESHGUI/SMESHGUI_RotationDlg.cxx
View File

@ -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)
newIndices.Add(e->GetID());
newIndices.Add(FromIdType<int>(e->GetID()));
myNbOkElements++;
}

2
src/SMESHGUI/SMESHGUI_ScaleDlg.cxx
View File

@ -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)
newIndices.Add(e->GetID());
newIndices.Add(FromIdType<int>(e->GetID()));
myNbOkElements++;
}
}

4
src/SMESHGUI/SMESHGUI_SelectionOp.cxx
View File

@ -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 ) )
newIndices.Add( n->GetID() );
newIndices.Add( FromIdType<int>(n->GetID()) );
}
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 );

4
src/SMESHGUI/SMESHGUI_SewingDlg.cxx
View File

@ -1551,7 +1551,7 @@ void SMESHGUI_SewingDlg::onTextChange (const QString& theNewText)
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 );
@ -1583,7 +1583,7 @@ void SMESHGUI_SewingDlg::onTextChange (const QString& theNewText)
const SMDS_MeshElement * e = aMesh->FindElement(aListId[ i ].toInt());
if (e)
{
newIndices.Add(e->GetID());
newIndices.Add(FromIdType<int>(e->GetID()));
atLeastOneExists = true;
}
}

2
src/SMESHGUI/SMESHGUI_ShapeByMeshDlg.cxx
View File

@ -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 )
newIndices.Add( e->GetID() );
newIndices.Add( FromIdType<int>(e->GetID()) );
}
if ( !newIndices.IsEmpty() )

4
src/SMESHGUI/SMESHGUI_SingleEditDlg.cxx
View File

@ -369,8 +369,8 @@ void SMESHGUI_SingleEditDlg::onTextChange (const QString& /*theNewText*/)
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);

2
src/SMESHGUI/SMESHGUI_SymmetryDlg.cxx
View File

@ -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)
newIndices.Add(e->GetID());
newIndices.Add(FromIdType<int>(e->GetID()));
myNbOkElements++;
}

2
src/SMESHGUI/SMESHGUI_TranslationDlg.cxx
View File

@ -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)
newIndices.Add(e->GetID());
newIndices.Add(FromIdType<int>(e->GetID()));
myNbOkElements++;
}
}