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
[bos #41122][EDF] Quadrangle radial for face which curved edges didn't discretize...
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_MergeDlg.cxx
diff --git
a/src/SMESHGUI/SMESHGUI_MergeDlg.cxx
b/src/SMESHGUI/SMESHGUI_MergeDlg.cxx
index 63d4b9d306308f296bbd0193adcf28e6f1f66307..48aeb4eb49e9b062aa1d9f644a4363d82fef6c9f 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_MergeDlg.cxx
+++ b/
src/SMESHGUI/SMESHGUI_MergeDlg.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-202
0 CEA/DEN, EDF R&D
, OPEN CASCADE
+// Copyright (C) 2007-202
4 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
@@
-469,7
+469,7
@@
void SMESHGUI_MergeDlg::Init()
// function : FindGravityCenter()
// purpose :
//=================================================================================
// function : FindGravityCenter()
// purpose :
//=================================================================================
-void SMESHGUI_MergeDlg::FindGravityCenter(
TColStd_MapOfInteger &
theElemsIdMap,
+void SMESHGUI_MergeDlg::FindGravityCenter(
SVTK_TVtkIDsMap &
theElemsIdMap,
std::vector<int>& theIDs,
std::list< gp_XYZ > & theGrCentersXYZ)
{
std::vector<int>& theIDs,
std::list< gp_XYZ > & theGrCentersXYZ)
{
@@
-484,7
+484,7
@@
void SMESHGUI_MergeDlg::FindGravityCenter(TColStd_MapOfInteger & theElemsIdMap,
int nbNodes;
theIDs.reserve( theElemsIdMap.Extent() );
int nbNodes;
theIDs.reserve( theElemsIdMap.Extent() );
-
TColStd_MapIteratorOfMapOfIntege
r idIter( theElemsIdMap );
+
SVTK_TVtkIDsMapIterato
r idIter( theElemsIdMap );
for( ; idIter.More(); idIter.Next() ) {
const SMDS_MeshElement* anElem = aMesh->FindElement(idIter.Key());
if ( !anElem )
for( ; idIter.More(); idIter.Next() ) {
const SMDS_MeshElement* anElem = aMesh->FindElement(idIter.Key());
if ( !anElem )
@@
-556,7
+556,7
@@
bool SMESHGUI_MergeDlg::ClickOnApply()
int i, nb = KeepList->count();
if ( isKeepIDsSelection() )
{
int i, nb = KeepList->count();
if ( isKeepIDsSelection() )
{
- SMESH::
long_array_var anIdList = new SMESH::long
_array();
+ SMESH::
smIdType_array_var anIdList = new SMESH::smIdType
_array();
anIdList->length(nb);
for (i = 0; i < nb; i++)
anIdList[i] = KeepList->item(i)->text().toInt();
anIdList->length(nb);
for (i = 0; i < nb; i++)
anIdList[i] = KeepList->item(i)->text().toInt();
@@
-845,7
+845,7
@@
void SMESHGUI_MergeDlg::onSelectGroup()
myIsBusy = true;
ListEdit->clear();
myIsBusy = true;
ListEdit->clear();
-
TColStd_MapOfInteger
anIndices;
+
SVTK_TVtkIDsMap
anIndices;
QList<QListWidgetItem*> selItems = ListCoincident->selectedItems();
QListWidgetItem* anItem;
QStringList aListIds;
QList<QListWidgetItem*> selItems = ListCoincident->selectedItems();
QListWidgetItem* anItem;
QStringList aListIds;
@@
-908,7
+908,7
@@
void SMESHGUI_MergeDlg::onSelectElementFromGroup()
if (myIsBusy || !myActor)
return;
if (myIsBusy || !myActor)
return;
-
TColStd_MapOfInteger
anIndices;
+
SVTK_TVtkIDsMap
anIndices;
QList<QListWidgetItem*> selItems = ListEdit->selectedItems();
QListWidgetItem* anItem;
QList<QListWidgetItem*> selItems = ListEdit->selectedItems();
QListWidgetItem* anItem;
@@
-1595,7
+1595,7
@@
void SMESHGUI_MergeDlg::onSelectKeep()
if ( myActor )
{
mySelectionMgr->clearSelected();
if ( myActor )
{
mySelectionMgr->clearSelected();
-
TColStd_MapOfInteger
aIndexes;
+
SVTK_TVtkIDsMap
aIndexes;
QList<QListWidgetItem*> selItems = KeepList->selectedItems();
QListWidgetItem* anItem;
foreach(anItem, selItems) aIndexes.Add(anItem->text().toInt());
QList<QListWidgetItem*> selItems = KeepList->selectedItems();
QListWidgetItem* anItem;
foreach(anItem, selItems) aIndexes.Add(anItem->text().toInt());