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 #24228 [CEA 24217][Windows] cannot compile SMESH: additional fix.
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_GroupDlg.cxx
diff --git
a/src/SMESHGUI/SMESHGUI_GroupDlg.cxx
b/src/SMESHGUI/SMESHGUI_GroupDlg.cxx
index 2313c768ce438035762520a9727d1bf47be37bf1..a231ff18a9b7205a754751c10ab99b583876c255 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_GroupDlg.cxx
+++ b/
src/SMESHGUI/SMESHGUI_GroupDlg.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-202
0
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-202
1
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
@@
-668,7
+668,7
@@
void SMESHGUI_GroupDlg::init (SMESH::SMESH_GroupBase_ptr theGroup,
myIdList.clear();
if (!theGroup->IsEmpty()) {
myIdList.clear();
if (!theGroup->IsEmpty()) {
- SMESH::
long
_array_var anElements = theGroup->GetListOfID();
+ SMESH::
smIdType
_array_var anElements = theGroup->GetListOfID();
int k = anElements->length();
for (int i = 0; i < k; i++) {
myIdList.append(anElements[i]);
int k = anElements->length();
for (int i = 0; i < k; i++) {
myIdList.append(anElements[i]);
@@
-767,7
+767,7
@@
void SMESHGUI_GroupDlg::updateButtons()
// function : onNameChanged()
// purpose :
//=================================================================================
// function : onNameChanged()
// purpose :
//=================================================================================
-void SMESHGUI_GroupDlg::onNameChanged (const QString&
text
)
+void SMESHGUI_GroupDlg::onNameChanged (const QString&
/*text*/
)
{
myOldName = myName->text();
updateButtons();
{
myOldName = myName->text();
updateButtons();
@@
-814,7
+814,7
@@
void SMESHGUI_GroupDlg::onGrpTypeChanged (int id)
// function : onColorChanged()
// purpose : Color button management
//=================================================================================
// function : onColorChanged()
// purpose : Color button management
//=================================================================================
-void SMESHGUI_GroupDlg::onColorChanged(QColor
theColor
)
+void SMESHGUI_GroupDlg::onColorChanged(QColor
/*theColor*/
)
{
updateButtons();
}
{
updateButtons();
}
@@
-1003,7
+1003,7
@@
bool SMESHGUI_GroupDlg::onApply()
}
else
{
}
else
{
- SMESH::
long_array_var anIdList = new SMESH::long
_array;
+ SMESH::
smIdType_array_var anIdList = new SMESH::smIdType
_array;
int i, k = myElements->count();
anIdList->length(k);
for (i = 0; i < k; i++) {
int i, k = myElements->count();
anIdList->length(k);
for (i = 0; i < k; i++) {
@@
-1037,7
+1037,7
@@
bool SMESHGUI_GroupDlg::onApply()
myIdList.removeAt(idx);
}
if (!aAddList.empty()) {
myIdList.removeAt(idx);
}
if (!aAddList.empty()) {
- SMESH::
long_array_var anIdList = new SMESH::long
_array;
+ SMESH::
smIdType_array_var anIdList = new SMESH::smIdType
_array;
int added = aAddList.count();
anIdList->length(added);
for (i = 0; i < added; i++)
int added = aAddList.count();
anIdList->length(added);
for (i = 0; i < added; i++)
@@
-1045,7
+1045,7
@@
bool SMESHGUI_GroupDlg::onApply()
myGroup->Add(anIdList.inout());
}
if (!myIdList.empty()) {
myGroup->Add(anIdList.inout());
}
if (!myIdList.empty()) {
- SMESH::
long_array_var anIdList = new SMESH::long
_array;
+ SMESH::
smIdType_array_var anIdList = new SMESH::smIdType
_array;
int removed = myIdList.count();
anIdList->length(removed);
for (i = 0; i < removed; i++)
int removed = myIdList.count();
anIdList->length(removed);
for (i = 0; i < removed; i++)
@@
-1263,7
+1263,7
@@
void SMESHGUI_GroupDlg::onListSelectionChanged()
if (myCurrentLineEdit == 0) {
mySelectionMgr->clearSelected();
if (myCurrentLineEdit == 0) {
mySelectionMgr->clearSelected();
-
TColStd_MapOfInteger
aIndexes;
+
SVTK_TVtkIDsMap
aIndexes;
QList<QListWidgetItem*> selItems = myElements->selectedItems();
QListWidgetItem* anItem;
foreach(anItem, selItems) aIndexes.Add(anItem->text().toInt());
QList<QListWidgetItem*> selItems = myElements->selectedItems();
QListWidgetItem* anItem;
foreach(anItem, selItems) aIndexes.Add(anItem->text().toInt());
@@
-1956,7
+1956,7
@@
void SMESHGUI_GroupDlg::onAdd()
// check if mesh is the same
if (aSubMesh->GetFather()->GetId() == myMesh->GetId()) {
try {
// check if mesh is the same
if (aSubMesh->GetFather()->GetId() == myMesh->GetId()) {
try {
- SMESH::
long
_array_var anElements = aSubMesh->GetElementsByType(aType);
+ SMESH::
smIdType
_array_var anElements = aSubMesh->GetElementsByType(aType);
int k = anElements->length();
for (int i = 0; i < k; i++) {
QString aText = QString::number(anElements[i]);
int k = anElements->length();
for (int i = 0; i < k; i++) {
QString aText = QString::number(anElements[i]);
@@
-2004,7
+2004,7
@@
void SMESHGUI_GroupDlg::onAdd()
if (!aGroup->_is_nil()) {
// check if mesh is the same
if (aGroup->GetType() == aType && aGroup->GetMesh()->GetId() == myMesh->GetId()) {
if (!aGroup->_is_nil()) {
// check if mesh is the same
if (aGroup->GetType() == aType && aGroup->GetMesh()->GetId() == myMesh->GetId()) {
- SMESH::
long
_array_var anElements = aGroup->GetListOfID();
+ SMESH::
smIdType
_array_var anElements = aGroup->GetListOfID();
int k = anElements->length();
for (int i = 0; i < k; i++) {
QString aText = QString::number(anElements[i]);
int k = anElements->length();
for (int i = 0; i < k; i++) {
QString aText = QString::number(anElements[i]);
@@
-2062,7
+2062,7
@@
void SMESHGUI_GroupDlg::onAdd()
aBelongToGeom->SetElementType(aType);
aFilter->SetPredicate(aBelongToGeom);
aBelongToGeom->SetElementType(aType);
aFilter->SetPredicate(aBelongToGeom);
- SMESH::
long
_array_var anElements = aFilter->GetElementsId(myMesh);
+ SMESH::
smIdType
_array_var anElements = aFilter->GetElementsId(myMesh);
int k = anElements->length();
for (int i = 0; i < k; i++) {
int k = anElements->length();
for (int i = 0; i < k; i++) {
@@
-2143,7
+2143,7
@@
void SMESHGUI_GroupDlg::onRemove()
if (aSubMesh->GetFather()->GetId() == myMesh->GetId()) {
if (aType == SMESH::NODE) {
try {
if (aSubMesh->GetFather()->GetId() == myMesh->GetId()) {
if (aType == SMESH::NODE) {
try {
- SMESH::
long
_array_var anElements = aSubMesh->GetNodesId();
+ SMESH::
smIdType
_array_var anElements = aSubMesh->GetNodesId();
int k = anElements->length();
for (int i = 0; i < k; i++) {
QList<QListWidgetItem*> found =
int k = anElements->length();
for (int i = 0; i < k; i++) {
QList<QListWidgetItem*> found =
@@
-2158,7
+2158,7
@@
void SMESHGUI_GroupDlg::onRemove()
}
else {
try {
}
else {
try {
- SMESH::
long
_array_var anElements = aSubMesh->GetElementsId();
+ SMESH::
smIdType
_array_var anElements = aSubMesh->GetElementsId();
int k = anElements->length();
for (int i = 0; i < k; i++) {
QList<QListWidgetItem*> found =
int k = anElements->length();
for (int i = 0; i < k; i++) {
QList<QListWidgetItem*> found =
@@
-2185,7
+2185,7
@@
void SMESHGUI_GroupDlg::onRemove()
if (!aGroup->_is_nil()) {
// check if mesh is the same
if (aGroup->GetType() == aType && aGroup->GetMesh()->GetId() == myMesh->GetId()) {
if (!aGroup->_is_nil()) {
// check if mesh is the same
if (aGroup->GetType() == aType && aGroup->GetMesh()->GetId() == myMesh->GetId()) {
- SMESH::
long
_array_var anElements = aGroup->GetListOfID();
+ SMESH::
smIdType
_array_var anElements = aGroup->GetListOfID();
int k = anElements->length();
for (int i = 0; i < k; i++) {
QList<QListWidgetItem*> found =
int k = anElements->length();
for (int i = 0; i < k; i++) {
QList<QListWidgetItem*> found =
@@
-2213,15
+2213,19
@@
void SMESHGUI_GroupDlg::onSort()
// PAL5412: sorts items in ascending by "string" value
// myElements->sort(true);
// myElements->update();
// PAL5412: sorts items in ascending by "string" value
// myElements->sort(true);
// myElements->update();
-
int
i, k = myElements->count();
+
vtkIdType
i, k = myElements->count();
if (k > 0) {
myIsBusy = true;
if (k > 0) {
myIsBusy = true;
- QList<
int
> aSelected;
- std::vector<
int
> anArray(k);
+ QList<
vtkIdType
> aSelected;
+ std::vector<
vtkIdType
> anArray(k);
// QMemArray<int> anArray(k);
// fill the array
for (i = 0; i < k; i++) {
// QMemArray<int> anArray(k);
// fill the array
for (i = 0; i < k; i++) {
- int id = myElements->item(i)->text().toInt();
+ vtkIdType id;
+ if (sizeof(vtkIdType)==8)
+ id = myElements->item(i)->text().toLongLong();
+ else
+ id = myElements->item(i)->text().toInt();
anArray[i] = id;
if (myElements->item(i)->isSelected())
aSelected.append(id);
anArray[i] = id;
if (myElements->item(i)->isSelected())
aSelected.append(id);