Fir for the issue #3020 : Error in console after dump/load python script.

[modules/shaper.git] / src / Model / Model_AttributeIntArray.cpp

diff --git a/src/Model/Model_AttributeIntArray.cpp b/src/Model/Model_AttributeIntArray.cpp
index 8f21a427dcc2f437a7573fd57022d1c15e690fd9..3ee99ee6af12816746d0d9833473e54c1333b34b 100644 (file)
--- a/src/Model/Model_AttributeIntArray.cpp
+++ b/src/Model/Model_AttributeIntArray.cpp
@@ -1,8 +1,21 @@
-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
-
-// File:        Model_AttributeIntArray.cpp
-// Created:     6 Mar 2015
-// Author:      Natalia ERMOLAEVA
+// Copyright (C) 2014-2019  CEA/DEN, EDF R&D
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #include <Model_AttributeIntArray.h>
 #include <ModelAPI_AttributeString.h>
@@ -20,19 +33,26 @@
 
 int Model_AttributeIntArray::size()
 {
-  return myArray.IsNull() ? 0 : myArray->Length();
+  if (myArray.IsNull() || !myArray->IsValid()) {
+    // this could be on undo and then redo creation of the attribute
+    // in result creation it may be uninitialized
+    myIsInitialized = myLab.FindAttribute(TDataStd_IntegerArray::GetID(), myArray) == Standard_True;
+  }
+  // checking the validity because attribute (as a field) may be presented,
+  // but without label: it is undone
+  return (myArray.IsNull() || !myArray->IsValid()) ? 0 : myArray->Length();
 }
 
 void Model_AttributeIntArray::setSize(const int theSize)
 {
-  if (myArray.IsNull()) { // create array if it is not done yet
+  if (myArray.IsNull() || !myArray->IsValid()) { // create array if it is not done yet
     if (theSize != 0) { // if size is zero, nothing to do (null array means there is no array)
-      myArray = TDataStd_IntegerArray::Set(myLab, 0, theSize);
+      myArray = TDataStd_IntegerArray::Set(myLab, 0, theSize - 1);
       owner()->data()->sendAttributeUpdated(this);
     }
   } else { // reset the old array
     if (theSize) {
-      if (theSize != myArray->Length()) { // old data is not keept, a new array is created
+      if (theSize != myArray->Length()) { // old data is not kept, a new array is created
         Handle(TColStd_HArray1OfInteger) aNewArray = new TColStd_HArray1OfInteger(0, theSize - 1);
         myArray->ChangeArray(aNewArray);
         owner()->data()->sendAttributeUpdated(this);
@@ -64,7 +84,12 @@ int Model_AttributeIntArray::value(const int theIndex)
 Model_AttributeIntArray::Model_AttributeIntArray(TDF_Label& theLabel)
 {
   myLab = theLabel;
+  reinit();
+}
+
+void Model_AttributeIntArray::reinit()
+{
   // check the attribute could be already presented in this doc (after load document)
-  myIsInitialized = 
+  myIsInitialized =
     myLab.FindAttribute(TDataStd_IntegerArray::GetID(), myArray) == Standard_True;
 }