Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'OCCT780'
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_TranslationDlg.cxx
diff --git
a/src/SMESHGUI/SMESHGUI_TranslationDlg.cxx
b/src/SMESHGUI/SMESHGUI_TranslationDlg.cxx
index 58e53131c1276a6fa686ef4475c674352dcdb95f..0838ae88b85adba6cc3fa2a7e7da27c0e06e98c4 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_TranslationDlg.cxx
+++ b/
src/SMESHGUI/SMESHGUI_TranslationDlg.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
19 CEA/DEN, EDF R&D
, OPEN CASCADE
+// Copyright (C) 2007-20
24 CEA, EDF
, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-484,7
+484,7
@@
bool SMESHGUI_TranslationDlg::ClickOnApply()
if (myNbOkElements) {
QStringList aListElementsId = myElementsId.split(" ", QString::SkipEmptyParts);
if (myNbOkElements) {
QStringList aListElementsId = myElementsId.split(" ", QString::SkipEmptyParts);
- SMESH::
long_array_var anElementsId = new SMESH::long
_array;
+ SMESH::
smIdType_array_var anElementsId = new SMESH::smIdType
_array;
anElementsId->length(aListElementsId.count());
for (int i = 0; i < aListElementsId.count(); i++)
anElementsId->length(aListElementsId.count());
for (int i = 0; i < aListElementsId.count(); i++)
@@
-713,7
+713,7
@@
void SMESHGUI_TranslationDlg::onTextChange (const QString& theNewText)
if (aMesh) {
Handle(SALOME_InteractiveObject) anIO = myActor->getIO();
if (aMesh) {
Handle(SALOME_InteractiveObject) anIO = myActor->getIO();
-
TColStd_MapOfInteger
newIndices;
+
SVTK_TVtkIDsMap
newIndices;
QStringList aListId = theNewText.split(" ", QString::SkipEmptyParts);
QStringList aListId = theNewText.split(" ", QString::SkipEmptyParts);
@@
-1182,7
+1182,7
@@
void SMESHGUI_TranslationDlg::onDisplaySimulation( bool toDisplayPreview )
{
QStringList aListElementsId = myElementsId.split(" ", QString::SkipEmptyParts);
{
QStringList aListElementsId = myElementsId.split(" ", QString::SkipEmptyParts);
- SMESH::
long_array_var anElementsId = new SMESH::long
_array;
+ SMESH::
smIdType_array_var anElementsId = new SMESH::smIdType
_array;
anElementsId->length(aListElementsId.count());
for (int i = 0; i < aListElementsId.count(); i++)
anElementsId->length(aListElementsId.count());
for (int i = 0; i < aListElementsId.count(); i++)