X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModel%2FModel_AttributeRefAttrList.cpp;h=66067c06a57ca63635b6fbe41c2d3edf2dd44507;hb=ca925f26180f15699a77e76461679f11abd499ba;hp=e1ffa3b62ea2987ee3f9949d06dde7c99c476613;hpb=b5eaf6f6971771b1e39f55ba5fc484e2f150ffb8;p=modules%2Fshaper.git diff --git a/src/Model/Model_AttributeRefAttrList.cpp b/src/Model/Model_AttributeRefAttrList.cpp index e1ffa3b62..66067c06a 100755 --- a/src/Model/Model_AttributeRefAttrList.cpp +++ b/src/Model/Model_AttributeRefAttrList.cpp @@ -1,8 +1,22 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D - -// File: ModelAPI_AttributeRefAttrList.cxx -// Created: 8 May 2014 -// Author: Mikhail PONIKAROV +// 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 "Model_AttributeRefAttrList.h" #include "Model_Application.h" @@ -12,8 +26,6 @@ #include #include -using namespace std; - void Model_AttributeRefAttrList::append(ObjectPtr theObject) { std::shared_ptr aData = std::dynamic_pointer_cast(theObject->data()); @@ -28,7 +40,7 @@ void Model_AttributeRefAttrList::append(ObjectPtr theObject) void Model_AttributeRefAttrList::append(AttributePtr theAttr) { - std::shared_ptr aData = + std::shared_ptr aData = std::dynamic_pointer_cast(theAttr->owner()->data()); myRef->Append(aData->label().Father()); // store label of the object myIDs->Append(theAttr->id().c_str()); // store the ID of the referenced attribute @@ -45,7 +57,7 @@ void Model_AttributeRefAttrList::remove(ObjectPtr theObject) if (theObject.get() != NULL) { aTheObjLab = std::dynamic_pointer_cast(theObject->data())->label().Father(); } - std::shared_ptr aDoc = + std::shared_ptr aDoc = std::dynamic_pointer_cast(owner()->document()); // remove from the both lists by clearing the list and then appending one by one // TODO: in OCCT 7.0 there are methods for removing by index, seems will be more optimal @@ -78,7 +90,7 @@ void Model_AttributeRefAttrList::remove(AttributePtr theAttr) if (theAttr->owner().get() != NULL) { aTheObjLab = std::dynamic_pointer_cast(theAttr->owner()->data())->label().Father(); } - std::shared_ptr aDoc = + std::shared_ptr aDoc = std::dynamic_pointer_cast(owner()->document()); // remove from the both lists by clearing the list and then appending one by one // TODO: in OCCT 7.0 there are methods for removing by index, seems will be more optimal @@ -90,7 +102,8 @@ void Model_AttributeRefAttrList::remove(AttributePtr theAttr) TDF_ListIteratorOfLabelList aRefIter(aRefList); TDataStd_ListIteratorOfListOfExtendedString anIDIter(anIDList); for (; aRefIter.More(); aRefIter.Next(), anIDIter.Next()) { - if (aOneisDeleted || anIDIter.Value() != theAttr->id().c_str() || // append now only not removed + if (aOneisDeleted || anIDIter.Value() != theAttr->id().c_str() || + // append now only not removed aRefIter.Value() != aTheObjLab || // append now only not removed (aTheObjLab.IsNull() && aDoc->objects()->object(aRefIter.Value()) != NULL)) { myRef->Append(aRefIter.Value()); @@ -144,7 +157,7 @@ std::list > Model_AttributeRefAttrList::list( ObjectPtr anObj; if (!aLIter.Value().IsNull()) { anObj = aDoc->objects()->object(aLIter.Value()); - aResult.push_back(std::pair(anObj, + aResult.push_back(std::pair(anObj, anObj->data()->attribute(TCollection_AsciiString(anIDIter.Value()).ToCString()))); } else { aResult.push_back(std::pair(ObjectPtr(), AttributePtr())); @@ -189,7 +202,7 @@ bool Model_AttributeRefAttrList::isInList(const AttributePtr& theAttr) std::shared_ptr aDoc = std::dynamic_pointer_cast( owner()->document()); if (aDoc) { - std::shared_ptr aData = + std::shared_ptr aData = std::dynamic_pointer_cast(theAttr->owner()->data()); if (aData.get() && aData->isValid()) { TDF_Label anObjLab = aData->label().Father();