mirror of
https://git.salome-platform.org/gitpub/modules/smesh.git
synced 2024-12-29 10:50:34 +05:00
SMESHGUI fix warnings
This commit is contained in:
parent
fc526c4dbf
commit
72a751fef5
@ -40,6 +40,7 @@
|
|||||||
#include <SUIT_MessageBox.h>
|
#include <SUIT_MessageBox.h>
|
||||||
#include <SVTK_Selector.h>
|
#include <SVTK_Selector.h>
|
||||||
#include <SalomeApp_Tools.h>
|
#include <SalomeApp_Tools.h>
|
||||||
|
#include <smIdType.hxx>
|
||||||
|
|
||||||
// Qt includes
|
// Qt includes
|
||||||
#include <QButtonGroup>
|
#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();
|
QString groupName = myDlg->myGroupListCmBox->currentText();
|
||||||
SMESH::SMESH_IDSource_var newObj =
|
SMESH::SMESH_IDSource_var newObj =
|
||||||
editor->Create0DElementsOnAllNodes( meshObject, groupName.toUtf8().data(),
|
editor->Create0DElementsOnAllNodes( meshObject, groupName.toUtf8().data(),
|
||||||
myDlg->myDuplicateElemsChkBox->isChecked() );
|
myDlg->myDuplicateElemsChkBox->isChecked() );
|
||||||
|
|
||||||
int newNb0D = mesh->Nb0DElements() - prevNb0D;
|
smIdType newNb0D = mesh->Nb0DElements() - prevNb0D;
|
||||||
SUIT_MessageBox::information( myDlg, tr( "SMESH_INFORMATION" ),
|
SUIT_MessageBox::information( myDlg, tr( "SMESH_INFORMATION" ),
|
||||||
tr( "NB_NEW_0D" ).arg( newNb0D ),
|
tr( "NB_NEW_0D" ).arg( newNb0D ),
|
||||||
SUIT_MessageBox::Ok, SUIT_MessageBox::Ok);
|
SUIT_MessageBox::Ok, SUIT_MessageBox::Ok);
|
||||||
|
@ -996,7 +996,7 @@ void SMESHGUI_AddQuadraticElementDlg::onTextChange (const QString& theNewText)
|
|||||||
for (int i = 0; i < aListId.count(); i++) {
|
for (int i = 0; i < aListId.count(); i++) {
|
||||||
if ( const SMDS_MeshNode * n = aMesh->FindNode( aListId[ i ].toInt() ) )
|
if ( const SMDS_MeshNode * n = aMesh->FindNode( aListId[ i ].toInt() ) )
|
||||||
{
|
{
|
||||||
newIndices.Add( n->GetID() );
|
newIndices.Add( FromIdType<int>(n->GetID()) );
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -619,7 +619,7 @@ void SMESHGUI_CopyMeshDlg::onTextChange (const QString& theNewText)
|
|||||||
for (int i = 0; i < aListId.count(); i++)
|
for (int i = 0; i < aListId.count(); i++)
|
||||||
if ( const SMDS_MeshElement * e = aMesh->FindElement(aListId[ i ].toInt()))
|
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();
|
||||||
|
@ -694,7 +694,7 @@ void SMESHGUI_CreatePolyhedralVolumeDlg::onTextChange(const QString& theNewText)
|
|||||||
for ( int i = 0; i < aListId.count(); i++ ) {
|
for ( int i = 0; i < aListId.count(); i++ ) {
|
||||||
const SMDS_MeshNode * n = aMesh->FindNode( aListId[ i ].toInt() );
|
const SMDS_MeshNode * n = aMesh->FindNode( aListId[ i ].toInt() );
|
||||||
if ( n ) {
|
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++ ) {
|
for ( int i = 0; i < aListId.count(); i++ ) {
|
||||||
const SMDS_MeshElement * e = aMesh->FindElement( aListId[ i ].toInt() );
|
const SMDS_MeshElement * e = aMesh->FindElement( aListId[ i ].toInt() );
|
||||||
if ( e ) {
|
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;
|
SMESH::TPolySimulation::TVTKIds aVTKIds_faces;
|
||||||
while( anIter->more() )
|
while( anIter->more() )
|
||||||
if ( const SMDS_MeshNode* aNode = (SMDS_MeshNode*)anIter->next() ){
|
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.push_back(aId);
|
||||||
aVTKIds_faces.push_back(aId);
|
aVTKIds_faces.push_back(aId);
|
||||||
}
|
}
|
||||||
|
@ -33,6 +33,7 @@
|
|||||||
#include <SUIT_OverrideCursor.h>
|
#include <SUIT_OverrideCursor.h>
|
||||||
#include <SUIT_ResourceMgr.h>
|
#include <SUIT_ResourceMgr.h>
|
||||||
#include <SUIT_Session.h>
|
#include <SUIT_Session.h>
|
||||||
|
#include <smIdType.hxx>
|
||||||
|
|
||||||
#include <QCheckBox>
|
#include <QCheckBox>
|
||||||
#include <QGridLayout>
|
#include <QGridLayout>
|
||||||
@ -81,7 +82,7 @@ SMESHGUI_DisplayEntitiesDlg::SMESHGUI_DisplayEntitiesDlg( QWidget* parent )
|
|||||||
QGridLayout* hl = new QGridLayout( anEntitiesGrp );
|
QGridLayout* hl = new QGridLayout( anEntitiesGrp );
|
||||||
hl->setMargin( MARGIN );
|
hl->setMargin( MARGIN );
|
||||||
hl->setSpacing( SPACING );
|
hl->setSpacing( SPACING );
|
||||||
int nbElements;
|
smIdType nbElements;
|
||||||
|
|
||||||
// 0DElements
|
// 0DElements
|
||||||
nbElements = myActor ? myActor->GetObject()->GetNbEntities( SMDSAbs_0DElement ) : aMesh->Nb0DElements();
|
nbElements = myActor ? myActor->GetObject()->GetNbEntities( SMDSAbs_0DElement ) : aMesh->Nb0DElements();
|
||||||
|
@ -689,7 +689,7 @@ void SMESHGUI_ExtrusionAlongPathDlg::onTextChange (const QString& theNewText)
|
|||||||
const SMDS_MeshNode* n = aMesh->FindNode(ind);
|
const SMDS_MeshNode* n = aMesh->FindNode(ind);
|
||||||
if (n) {
|
if (n) {
|
||||||
TColStd_MapOfInteger newIndices;
|
TColStd_MapOfInteger newIndices;
|
||||||
newIndices.Add(n->GetID());
|
newIndices.Add(FromIdType<int>(n->GetID()));
|
||||||
mySelector->AddOrRemoveIndex( aPathActor->getIO(), newIndices, false );
|
mySelector->AddOrRemoveIndex( aPathActor->getIO(), newIndices, false );
|
||||||
if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
|
if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
|
||||||
aViewWindow->highlight( aPathActor->getIO(), true, true );
|
aViewWindow->highlight( aPathActor->getIO(), true, true );
|
||||||
|
@ -69,6 +69,7 @@
|
|||||||
// SALOME KERNEL includes
|
// SALOME KERNEL includes
|
||||||
#include <SALOMEDSClient_Study.hxx>
|
#include <SALOMEDSClient_Study.hxx>
|
||||||
#include <Basics_Utils.hxx>
|
#include <Basics_Utils.hxx>
|
||||||
|
#include <smIdType.hxx>
|
||||||
|
|
||||||
// OCCT includes
|
// OCCT includes
|
||||||
#include <StdSelect_TypeOfFace.hxx>
|
#include <StdSelect_TypeOfFace.hxx>
|
||||||
@ -3538,7 +3539,7 @@ void SMESHGUI_FilterDlg::filterSource (const int theType,
|
|||||||
return;
|
return;
|
||||||
SMESH::smIdType_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(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 =
|
SMESH::smIdType_array_var anIds =
|
||||||
theType == SMESH::NODE ? aSubMesh->GetNodesId() : aSubMesh->GetElementsId();
|
theType == SMESH::NODE ? aSubMesh->GetNodesId() : aSubMesh->GetElementsId();
|
||||||
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(FromIdType<int>(anIds[ i ]));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -3605,7 +3606,7 @@ void SMESHGUI_FilterDlg::filterSelectionSource (const int theType,
|
|||||||
{
|
{
|
||||||
SMESH::smIdType_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(FromIdType<int>(anIds[ i ]));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -533,9 +533,9 @@ bool SMESHGUI_MakeNodeAtPointOp::onApply()
|
|||||||
bool ok;
|
bool ok;
|
||||||
int anId = myDlg->myId->text().toInt( &ok );
|
int anId = myDlg->myId->text().toInt( &ok );
|
||||||
if( !ok || anId < 1 )
|
if( !ok || anId < 1 )
|
||||||
anId = aMeshEditor->FindNodeClosestTo(myDlg->myDestinationX->GetValue(),
|
anId = FromIdType<int>(aMeshEditor->FindNodeClosestTo(myDlg->myDestinationX->GetValue(),
|
||||||
myDlg->myDestinationY->GetValue(),
|
myDlg->myDestinationY->GetValue(),
|
||||||
myDlg->myDestinationZ->GetValue());
|
myDlg->myDestinationZ->GetValue()));
|
||||||
|
|
||||||
int aResult = aMeshEditor->MoveNode(anId,
|
int aResult = aMeshEditor->MoveNode(anId,
|
||||||
myDlg->myDestinationX->GetValue(),
|
myDlg->myDestinationX->GetValue(),
|
||||||
@ -770,9 +770,9 @@ void SMESHGUI_MakeNodeAtPointOp::redisplayPreview()
|
|||||||
myDlg->myDestDZ->setReadOnly(true);
|
myDlg->myDestDZ->setReadOnly(true);
|
||||||
}
|
}
|
||||||
if ( isPreview && isMoveNode && anId == 0 )
|
if ( isPreview && isMoveNode && anId == 0 )
|
||||||
anId = aPreviewer->FindNodeClosestTo(myDlg->myDestinationX->GetValue(),
|
anId = FromIdType<int>(aPreviewer->FindNodeClosestTo(myDlg->myDestinationX->GetValue(),
|
||||||
myDlg->myDestinationY->GetValue(),
|
myDlg->myDestinationY->GetValue(),
|
||||||
myDlg->myDestinationZ->GetValue());
|
myDlg->myDestinationZ->GetValue()));
|
||||||
// find id and/or just compute preview
|
// find id and/or just compute preview
|
||||||
aPreviewer->MoveNode(anId,
|
aPreviewer->MoveNode(anId,
|
||||||
myDlg->myDestinationX->GetValue(),
|
myDlg->myDestinationX->GetValue(),
|
||||||
@ -870,7 +870,7 @@ void SMESHGUI_MakeNodeAtPointOp::onTextChange( const QString& theText )
|
|||||||
if( const SMDS_MeshNode* aNode = aMesh->FindNode( theText.toInt() ) )
|
if( const SMDS_MeshNode* aNode = aMesh->FindNode( theText.toInt() ) )
|
||||||
{
|
{
|
||||||
TColStd_MapOfInteger aListInd;
|
TColStd_MapOfInteger aListInd;
|
||||||
aListInd.Add( aNode->GetID() );
|
aListInd.Add( FromIdType<int>(aNode->GetID()) );
|
||||||
selector()->AddOrRemoveIndex( anIO, aListInd, false );
|
selector()->AddOrRemoveIndex( anIO, aListInd, false );
|
||||||
if( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( SMESHGUI::GetSMESHGUI() ) )
|
if( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( SMESHGUI::GetSMESHGUI() ) )
|
||||||
aViewWindow->highlight( anIO, true, true );
|
aViewWindow->highlight( anIO, true, true );
|
||||||
|
@ -711,8 +711,8 @@ void SMESHGUI_MultiEditDlg::onAddBtn()
|
|||||||
if (aSubMesh->GetFather()->GetId() == myMesh->GetId()) {
|
if (aSubMesh->GetFather()->GetId() == myMesh->GetId()) {
|
||||||
SMESH::smIdType_array_var anIds = aSubMesh->GetElementsId();
|
SMESH::smIdType_array_var anIds = aSubMesh->GetElementsId();
|
||||||
for (int i = 0, n = anIds->length(); i < n; i++) {
|
for (int i = 0, n = anIds->length(); i < n; i++) {
|
||||||
if (isIdValid(anIds[ i ]))
|
if (isIdValid(FromIdType<int>(anIds[ i ])))
|
||||||
toBeAdded.Add(anIds[ i ]);
|
toBeAdded.Add(FromIdType<int>(anIds[ i ]));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -727,8 +727,8 @@ void SMESHGUI_MultiEditDlg::onAddBtn()
|
|||||||
if (aGroup->GetMesh()->GetId() == myMesh->GetId()) {
|
if (aGroup->GetMesh()->GetId() == myMesh->GetId()) {
|
||||||
SMESH::smIdType_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++) {
|
||||||
if (isIdValid(anIds[ i ]))
|
if (isIdValid(FromIdType<int>(anIds[ i ])))
|
||||||
toBeAdded.Add(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());
|
const SMDS_MeshNode* aNode = static_cast<const SMDS_MeshNode*>(anIter->next());
|
||||||
if (aNode)
|
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()
|
||||||
|
@ -558,7 +558,7 @@ void SMESHGUI_OffsetDlg::onTextChange (const QString& theNewText)
|
|||||||
for (int i = 0; i < aListId.count(); i++)
|
for (int i = 0; i < aListId.count(); i++)
|
||||||
{
|
{
|
||||||
if ( const SMDS_MeshElement * e = aMesh->FindElement(aListId[ i ].toInt()))
|
if ( const SMDS_MeshElement * e = aMesh->FindElement(aListId[ i ].toInt()))
|
||||||
newIndices.Add( e->GetID() );
|
newIndices.Add( FromIdType<int>(e->GetID()) );
|
||||||
myNbOkElements++;
|
myNbOkElements++;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -650,7 +650,7 @@ void SMESHGUI_RotationDlg::onTextChange (const QString& theNewText)
|
|||||||
for (int i = 0; i < aListId.count(); i++) {
|
for (int i = 0; i < aListId.count(); i++) {
|
||||||
const SMDS_MeshElement * e = aMesh->FindElement(aListId[ i ].toInt());
|
const SMDS_MeshElement * e = aMesh->FindElement(aListId[ i ].toInt());
|
||||||
if (e)
|
if (e)
|
||||||
newIndices.Add(e->GetID());
|
newIndices.Add(FromIdType<int>(e->GetID()));
|
||||||
myNbOkElements++;
|
myNbOkElements++;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -690,7 +690,7 @@ void SMESHGUI_ScaleDlg::onTextChange (const QString& theNewText)
|
|||||||
for (int i = 0; i < aListId.count(); i++) {
|
for (int i = 0; i < aListId.count(); i++) {
|
||||||
const SMDS_MeshElement * e = aMesh->FindElement(aListId[ i ].toInt());
|
const SMDS_MeshElement * e = aMesh->FindElement(aListId[ i ].toInt());
|
||||||
if (e)
|
if (e)
|
||||||
newIndices.Add(e->GetID());
|
newIndices.Add(FromIdType<int>(e->GetID()));
|
||||||
myNbOkElements++;
|
myNbOkElements++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -483,12 +483,12 @@ void SMESHGUI_SelectionOp::onTextChanged( int, const QStringList& list )
|
|||||||
if ( selectionMode() == NodeSelection )
|
if ( selectionMode() == NodeSelection )
|
||||||
for( ; anIt!=aLast; anIt++ ) {
|
for( ; anIt!=aLast; anIt++ ) {
|
||||||
if( const SMDS_MeshNode * n = aMesh->FindNode( *anIt ) )
|
if( const SMDS_MeshNode * n = aMesh->FindNode( *anIt ) )
|
||||||
newIndices.Add( n->GetID() );
|
newIndices.Add( FromIdType<int>(n->GetID()) );
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
for( ; anIt!=aLast; anIt++ ) {
|
for( ; anIt!=aLast; anIt++ ) {
|
||||||
if( const SMDS_MeshElement* e = aMesh->FindElement( *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 );
|
||||||
|
@ -1551,7 +1551,7 @@ void SMESHGUI_SewingDlg::onTextChange (const QString& theNewText)
|
|||||||
|
|
||||||
const SMDS_MeshNode * n = aMesh->FindNode(theNewText.toInt());
|
const SMDS_MeshNode * n = aMesh->FindNode(theNewText.toInt());
|
||||||
if (n) {
|
if (n) {
|
||||||
newIndices.Add(n->GetID());
|
newIndices.Add(FromIdType<int>(n->GetID()));
|
||||||
mySelector->AddOrRemoveIndex(myActor->getIO(), newIndices, false);
|
mySelector->AddOrRemoveIndex(myActor->getIO(), newIndices, false);
|
||||||
if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
|
if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
|
||||||
aViewWindow->highlight( myActor->getIO(), true, true );
|
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());
|
const SMDS_MeshElement * e = aMesh->FindElement(aListId[ i ].toInt());
|
||||||
if (e)
|
if (e)
|
||||||
{
|
{
|
||||||
newIndices.Add(e->GetID());
|
newIndices.Add(FromIdType<int>(e->GetID()));
|
||||||
atLeastOneExists = true;
|
atLeastOneExists = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -503,7 +503,7 @@ void SMESHGUI_ShapeByMeshOp::onElemIdChanged(const QString& theNewText)
|
|||||||
for ( int i = 0; i < aListId.count(); i++ ) {
|
for ( int i = 0; i < aListId.count(); i++ ) {
|
||||||
if ( const SMDS_MeshElement * e = aMesh->FindElement( aListId[ i ].toInt() ))
|
if ( const SMDS_MeshElement * e = aMesh->FindElement( aListId[ i ].toInt() ))
|
||||||
if ( e->GetType() == type )
|
if ( e->GetType() == type )
|
||||||
newIndices.Add( e->GetID() );
|
newIndices.Add( FromIdType<int>(e->GetID()) );
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( !newIndices.IsEmpty() )
|
if ( !newIndices.IsEmpty() )
|
||||||
|
@ -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( FromIdType<int>(aNode1->GetID()) );
|
||||||
newIndices.push_back( aNode2->GetID() );
|
newIndices.push_back( FromIdType<int>(aNode2->GetID()) );
|
||||||
|
|
||||||
myOkBtn->setEnabled(true);
|
myOkBtn->setEnabled(true);
|
||||||
myApplyBtn->setEnabled(true);
|
myApplyBtn->setEnabled(true);
|
||||||
|
@ -709,7 +709,7 @@ void SMESHGUI_SymmetryDlg::onTextChange (const QString& theNewText)
|
|||||||
for (int i = 0; i < aListId.count(); i++) {
|
for (int i = 0; i < aListId.count(); i++) {
|
||||||
const SMDS_MeshElement * e = aMesh->FindElement(aListId[ i ].toInt());
|
const SMDS_MeshElement * e = aMesh->FindElement(aListId[ i ].toInt());
|
||||||
if (e)
|
if (e)
|
||||||
newIndices.Add(e->GetID());
|
newIndices.Add(FromIdType<int>(e->GetID()));
|
||||||
myNbOkElements++;
|
myNbOkElements++;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -721,7 +721,7 @@ void SMESHGUI_TranslationDlg::onTextChange (const QString& theNewText)
|
|||||||
for (int i = 0; i < aListId.count(); i++) {
|
for (int i = 0; i < aListId.count(); i++) {
|
||||||
const SMDS_MeshElement * e = aMesh->FindElement(aListId[ i ].toInt());
|
const SMDS_MeshElement * e = aMesh->FindElement(aListId[ i ].toInt());
|
||||||
if (e)
|
if (e)
|
||||||
newIndices.Add(e->GetID());
|
newIndices.Add(FromIdType<int>(e->GetID()));
|
||||||
myNbOkElements++;
|
myNbOkElements++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user