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
23368: [CEA 1865] Possibility to define faces to mesh as a single one: transpatch...
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_MergeDlg.cxx
diff --git
a/src/SMESHGUI/SMESHGUI_MergeDlg.cxx
b/src/SMESHGUI/SMESHGUI_MergeDlg.cxx
index f594f650d623db168922ce2979574f6915b265db..e5dcf5d12652d2c30cedecc2a71f252ebe94d4f5 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_MergeDlg.cxx
+++ b/
src/SMESHGUI/SMESHGUI_MergeDlg.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
5
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
6
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
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-54,7
+54,6
@@
#include <SALOME_ListIO.hxx>
// OCCT includes
#include <SALOME_ListIO.hxx>
// OCCT includes
-#include <TColStd_MapOfInteger.hxx>
#include <TColStd_MapIteratorOfMapOfInteger.hxx>
// IDL includes
#include <TColStd_MapIteratorOfMapOfInteger.hxx>
// IDL includes
@@
-102,7
+101,7
@@
QPixmap SMESHGUI_MergeDlg::IconFirst()
" .. ... ... ",
" .. .. .. ",
" . . "};
" .. ... ... ",
" .. .. .. ",
" . . "};
- return
iconFirst
;
+ return
QPixmap( iconFirst )
;
}
//=================================================================================
}
//=================================================================================
@@
-797,11
+796,11
@@
void SMESHGUI_MergeDlg::onDetect()
break;
}
break;
}
- for (int i = 0; i < aGroupsArray->length(); i++) {
+ for (int i = 0; i <
(int)
aGroupsArray->length(); i++) {
SMESH::long_array& aGroup = aGroupsArray[i];
QStringList anIDs;
SMESH::long_array& aGroup = aGroupsArray[i];
QStringList anIDs;
- for (int j = 0; j < aGroup.length(); j++)
+ for (int j = 0; j <
(int)
aGroup.length(); j++)
anIDs.append(QString::number(aGroup[j]));
ListCoincident->addItem(anIDs.join(" "));
anIDs.append(QString::number(aGroup[j]));
ListCoincident->addItem(anIDs.join(" "));