X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModel%2FModel_AttributeIntArray.cpp;h=e0548b700803b887270668badb0e9a9f767d3659;hb=f36409774efce7c530518a1553946c9c76526fb9;hp=a61a9cc0e97c3d373bd9b2731f35c8dcc61e7d10;hpb=53e2c9672f0b63b678726fbae915184093f145e1;p=modules%2Fshaper.git diff --git a/src/Model/Model_AttributeIntArray.cpp b/src/Model/Model_AttributeIntArray.cpp index a61a9cc0e..e0548b700 100644 --- a/src/Model/Model_AttributeIntArray.cpp +++ b/src/Model/Model_AttributeIntArray.cpp @@ -1,8 +1,22 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D - -// File: Model_AttributeIntArray.cpp -// Created: 6 Mar 2015 -// Author: Natalia ERMOLAEVA +// Copyright (C) 2014-2017 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 #include @@ -23,7 +37,7 @@ int Model_AttributeIntArray::size() 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); + 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 undoed @@ -34,7 +48,7 @@ void Model_AttributeIntArray::setSize(const int theSize) { 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 @@ -71,7 +85,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; }