Salome HOME
projects
/
modules
/
shaper.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit '9b79b986a894aff7ede04c8e43609842e5a9401b'
[modules/shaper.git]
/
src
/
Model
/
Model_AttributeIntArray.cpp
diff --git
a/src/Model/Model_AttributeIntArray.cpp
b/src/Model/Model_AttributeIntArray.cpp
index f933ad261408582eeb7b93f71b5267056377737a..55f4b0e966bf815504cb439ef5b6937359d030ed 100644
(file)
--- a/
src/Model/Model_AttributeIntArray.cpp
+++ b/
src/Model/Model_AttributeIntArray.cpp
@@
-1,4
+1,4
@@
-// Copyright (C) 2014-20
19 CEA/DEN, EDF R&D
+// Copyright (C) 2014-20
23 CEA, EDF
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
@@
-54,7
+54,8
@@
void Model_AttributeIntArray::setSize(const int theSize, bool sendUpdated)
} else { // reset the old array
if (theSize) {
if (theSize != myArray->Length()) { // old data is not kept, a new array is created
} else { // reset the old array
if (theSize) {
if (theSize != myArray->Length()) { // old data is not kept, a new array is created
- Handle(TColStd_HArray1OfInteger) aNewArray = new TColStd_HArray1OfInteger(0, theSize - 1);
+ Handle(TColStd_HArray1OfInteger) aNewArray =
+ new TColStd_HArray1OfInteger(0, theSize - 1, 0);
myArray->ChangeArray(aNewArray);
if (sendUpdated)
owner()->data()->sendAttributeUpdated(this);
myArray->ChangeArray(aNewArray);
if (sendUpdated)
owner()->data()->sendAttributeUpdated(this);
@@
-74,7
+75,8
@@
void Model_AttributeIntArray::setValue(const int theIndex,
const int theValue,
bool sendUpdated)
{
const int theValue,
bool sendUpdated)
{
- if (myArray->Value(theIndex) != theValue) {
+ if (!isInitialized() || myArray->Value(theIndex) != theValue) {
+ setInitialized();
myArray->SetValue(theIndex, theValue);
if (sendUpdated)
owner()->data()->sendAttributeUpdated(this);
myArray->SetValue(theIndex, theValue);
if (sendUpdated)
owner()->data()->sendAttributeUpdated(this);