X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FModel%2FModel_AttributeRefAttrList.cpp;h=24e3462e811d2df31f2853bf3d56361cea4fc06b;hb=3803f064ab0c38ba6ae084921fd555a50310bcdb;hp=e08420a01031ef746cc3ed7e546d4c9d502ab742;hpb=83c4f9d21db70830d40da2a6d7d7ff66a697edf8;p=modules%2Fshaper.git diff --git a/src/Model/Model_AttributeRefAttrList.cpp b/src/Model/Model_AttributeRefAttrList.cpp old mode 100755 new mode 100644 index e08420a01..24e3462e8 --- a/src/Model/Model_AttributeRefAttrList.cpp +++ b/src/Model/Model_AttributeRefAttrList.cpp @@ -1,8 +1,21 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D - -// File: ModelAPI_AttributeRefAttrList.cxx -// Created: 8 May 2014 -// Author: Mikhail PONIKAROV +// Copyright (C) 2014-2020 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,12 +25,15 @@ #include #include -using namespace std; - void Model_AttributeRefAttrList::append(ObjectPtr theObject) { - std::shared_ptr aData = std::dynamic_pointer_cast(theObject->data()); - myRef->Append(aData->label().Father()); // store label of the object + TDF_Label aLabel; + if (theObject) { + std::shared_ptr aData = std::dynamic_pointer_cast(theObject->data()); + aLabel = aData->label().Father(); + } + + myRef->Append(aLabel); // store label of the object myIDs->Append(""); // for the object store an empty string // do it before the transaction finish to make just created/removed objects know dependencies // and reference from composite feature is removed automatically @@ -28,7 +44,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 +61,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 +94,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,12 +106,13 @@ 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()); myIDs->Append(anIDIter.Value()); - } else if (aTheObjLab.IsNull() && aDoc->objects()->object(aRefIter.Value()) != NULL) { + } else { aOneisDeleted = true; } } @@ -142,10 +159,13 @@ std::list > Model_AttributeRefAttrList::list( TDataStd_ListIteratorOfListOfExtendedString anIDIter(anIDList); for (; aLIter.More(); aLIter.Next(), anIDIter.Next()) { ObjectPtr anObj; - if (!aLIter.Value().IsNull()) + if (!aLIter.Value().IsNull()) { anObj = aDoc->objects()->object(aLIter.Value()); - aResult.push_back(std::pair(anObj, - anObj->data()->attribute(TCollection_AsciiString(anIDIter.Value()).ToCString()))); + aResult.push_back(std::pair(anObj, + anObj->data()->attribute(TCollection_AsciiString(anIDIter.Value()).ToCString()))); + } else { + aResult.push_back(std::pair(ObjectPtr(), AttributePtr())); + } } } return aResult; @@ -186,7 +206,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(); @@ -291,9 +311,10 @@ void Model_AttributeRefAttrList::remove(const std::set& theIndices) myIDs->Append(anIDIter.Value()); } else { // found, so need to update the dependencies aOneisDeleted = true; - ObjectPtr anObj = aDoc->objects()->object(aRefIter.Value()); + ObjectPtr anObj; + if (!aRefIter.Value().IsNull()) + anObj = aDoc->objects()->object(aRefIter.Value()); if (anObj.get()) { - myRef->Remove(aRefIter.Value()); REMOVE_BACK_REF(anObj); } } @@ -306,11 +327,17 @@ void Model_AttributeRefAttrList::remove(const std::set& theIndices) Model_AttributeRefAttrList::Model_AttributeRefAttrList(TDF_Label& theLabel) { - myIsInitialized = theLabel.FindAttribute(TDataStd_ReferenceList::GetID(), myRef) == Standard_True; + myLab = theLabel; + reinit(); +} + +void Model_AttributeRefAttrList::reinit() +{ + myIsInitialized = myLab.FindAttribute(TDataStd_ReferenceList::GetID(), myRef) == Standard_True; if (!myIsInitialized) { - myRef = TDataStd_ReferenceList::Set(theLabel); - myIDs = TDataStd_ExtStringList::Set(theLabel); + myRef = TDataStd_ReferenceList::Set(myLab); + myIDs = TDataStd_ExtStringList::Set(myLab); } else { - theLabel.FindAttribute(TDataStd_ExtStringList::GetID(), myIDs); + myLab.FindAttribute(TDataStd_ExtStringList::GetID(), myIDs); } }