X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESHGUI%2FSMESHGUI_AddMeshElementDlg.cxx;h=37b401f79e97534ac6f5df1c4cfac679b56f4184;hb=8f903d5ee57f0e646cf05d68d85418c68d497053;hp=e4654aa620cc1ab8b8104f30185e55b89ba0805f;hpb=0fc0831670e27a5611b941c52dc152fd63964515;p=modules%2Fsmesh.git diff --git a/src/SMESHGUI/SMESHGUI_AddMeshElementDlg.cxx b/src/SMESHGUI/SMESHGUI_AddMeshElementDlg.cxx index e4654aa62..37b401f79 100644 --- a/src/SMESHGUI/SMESHGUI_AddMeshElementDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_AddMeshElementDlg.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2020 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 @@ -217,6 +217,7 @@ namespace SMESH void SetBallPosition(SMESH_Actor* theActor,TVTKIds& theIds, double theDiameter) { vtkUnstructuredGrid *aGrid = theActor->GetUnstructuredGrid(); + myBallPolyData->SetPoints(NULL); myBallPolyData->Reset(); myBallPolyData->DeleteCells(); myBallPolyData->SetPoints(aGrid->GetPoints()); @@ -552,7 +553,7 @@ void SMESHGUI_AddMeshElementDlg::ClickOnApply() if (myNbOkNodes && !SMESHGUI::isStudyLocked()) { myBusy = true; QStringList aListId = myEditCurrentArgument->text().split(" ", QString::SkipEmptyParts); - SMESH::long_array_var anArrayOfIndices = new SMESH::long_array; + SMESH::smIdType_array_var anArrayOfIndices = new SMESH::smIdType_array; anArrayOfIndices->length(aListId.count()); const std::vector& revIndex = SMDS_MeshCell::reverseSmdsOrder( myGeomType ); if ( ReverseOrDulicate && ReverseOrDulicate->isChecked() && (int)revIndex.size() == aListId.count() ) @@ -597,10 +598,10 @@ void SMESHGUI_AddMeshElementDlg::ClickOnApply() } SMESH::SMESH_MeshEditor_var aMeshEditor = myMesh->GetMeshEditor(); - SMESH::long_array_var anIdList = new SMESH::long_array; + SMESH::smIdType_array_var anIdList = new SMESH::smIdType_array; anIdList->length( 1 ); anIdList[0] = -1; - int nbElemsBefore = 0; + smIdType nbElemsBefore = 0; switch (myElementType) { case SMDSAbs_0DElement: { @@ -610,7 +611,7 @@ void SMESHGUI_AddMeshElementDlg::ClickOnApply() for ( size_t i = 0; i < anArrayOfIndices->length(); ++i ) anIdList[i] = aMeshEditor->Add0DElement(anArrayOfIndices[i], duplicateElements); - CORBA::ULong nbAdded = myMesh->Nb0DElements() - nbElemsBefore; + SMESH::smIdType nbAdded = myMesh->Nb0DElements() - nbElemsBefore; if ( !duplicateElements && nbAdded < anArrayOfIndices->length() ) SUIT_MessageBox::information(SMESHGUI::desktop(), tr("SMESH_INFORMATION"), @@ -783,7 +784,7 @@ void SMESHGUI_AddMeshElementDlg::onTextChange (const QString& theNewText) aMesh = myActor->GetObject()->GetMesh(); if (aMesh) { - TColStd_MapOfInteger newIndices; + SVTK_TVtkIDsMap newIndices; QStringList aListId = theNewText.split(" ", QString::SkipEmptyParts); bool allOk = true;