X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESHGUI%2FSMESHGUI_SewingDlg.cxx;h=01f5c58af553f08ee4ecde4ff6e3be79eb130346;hp=5c30044e8a5dbb85bfa01602b1ab718baee4882a;hb=b09372829929f8f561495d6c16527134971a1909;hpb=6d32f944a0a115b6419184c50b57bf7c4eef5786 diff --git a/src/SMESHGUI/SMESHGUI_SewingDlg.cxx b/src/SMESHGUI/SMESHGUI_SewingDlg.cxx index 5c30044e8..01f5c58af 100644 --- a/src/SMESHGUI/SMESHGUI_SewingDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_SewingDlg.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2019 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2021 CEA/DEN, EDF R&D, OPEN CASCADE // // Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS @@ -1243,16 +1243,16 @@ void SMESHGUI_SewingDlg::onMoveBorderEnd(int button) { aPRT.node1 = ( aPRT.node1 + size + dn ) % size; aPRT.node2 = ( aPRT.node2 + size + dn ) % size; - break; } + break; case MOVE_LEFT_2: case MOVE_RIGHT_2: if (( isClosed ) || ( 0 <= aPRT.nodeLast+dn && aPRT.nodeLast+dn < size )) { aPRT.nodeLast = ( aPRT.nodeLast + size + dn ) % size; - break; } + break; default: return; // impossible to move } @@ -1368,8 +1368,8 @@ bool SMESHGUI_SewingDlg::ClickOnApply() QStringList aListElementsId1 = LineEdit1->text().split(" ", QString::SkipEmptyParts); QStringList aListElementsId2 = LineEdit4->text().split(" ", QString::SkipEmptyParts); - SMESH::long_array_var anElementsId1 = new SMESH::long_array; - SMESH::long_array_var anElementsId2 = new SMESH::long_array; + SMESH::smIdType_array_var anElementsId1 = new SMESH::smIdType_array; + SMESH::smIdType_array_var anElementsId2 = new SMESH::smIdType_array; anElementsId1->length(aListElementsId1.count()); anElementsId2->length(aListElementsId2.count()); @@ -1541,7 +1541,7 @@ void SMESHGUI_SewingDlg::onTextChange (const QString& theNewText) send->clear(); if (aMesh) { - TColStd_MapOfInteger newIndices; + SVTK_TVtkIDsMap newIndices; if (GetConstructorId() != 3 || (send != LineEdit1 && send != LineEdit4)) { SMESH::SetPointRepresentation(true); @@ -1555,7 +1555,7 @@ void SMESHGUI_SewingDlg::onTextChange (const QString& theNewText) mySelector->AddOrRemoveIndex(myActor->getIO(), newIndices, false); if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI )) aViewWindow->highlight( myActor->getIO(), true, true ); - + if (send == LineEdit1) myOk1 = true; else if (send == LineEdit2) @@ -1577,22 +1577,22 @@ void SMESHGUI_SewingDlg::onTextChange (const QString& theNewText) QStringList aListId = theNewText.split(" ", QString::SkipEmptyParts); - bool isEvenOneExists = false; + bool atLeastOneExists = false; for (int i = 0; i < aListId.count(); i++) { const SMDS_MeshElement * e = aMesh->FindElement(aListId[ i ].toInt()); - if (e) + if (e) + { newIndices.Add(e->GetID()); - - if (!isEvenOneExists) - isEvenOneExists = true; + atLeastOneExists = true; + } } - + mySelector->AddOrRemoveIndex(myActor->getIO(), newIndices, false); if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI )) aViewWindow->highlight( myActor->getIO(), true, true ); - - if (isEvenOneExists) { + + if (atLeastOneExists) { if (send == LineEdit1) myOk1 = true; else if(send == LineEdit4) @@ -1798,7 +1798,7 @@ void SMESHGUI_SewingDlg::ActivateThisDialog() // function : enterEvent() // purpose : //================================================================================= -void SMESHGUI_SewingDlg::enterEvent (QEvent* e) +void SMESHGUI_SewingDlg::enterEvent (QEvent* /*e*/) { if (!ConstructorsBox->isEnabled()) { SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI );