X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModel%2FModel_AttributeRefList.cpp;h=44f7e44ab01fa922d1923a40384c438f3a742e65;hb=3ce3e69a217055142b03d67add35d054979a6340;hp=cf45b99a957792820aa8c461941539d8bb3db3f6;hpb=68d4cb233e48ce3c2ca827d8c32bf5fe54e6bf8c;p=modules%2Fshaper.git diff --git a/src/Model/Model_AttributeRefList.cpp b/src/Model/Model_AttributeRefList.cpp index cf45b99a9..44f7e44ab 100644 --- a/src/Model/Model_AttributeRefList.cpp +++ b/src/Model/Model_AttributeRefList.cpp @@ -1,8 +1,21 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D - -// File: ModelAPI_AttributeRefList.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_AttributeRefList.h" #include "Model_Application.h" @@ -10,27 +23,87 @@ #include "Model_Objects.h" #include #include - -using namespace std; +#include +#include void Model_AttributeRefList::append(ObjectPtr theObject) { - std::shared_ptr aData = std::dynamic_pointer_cast(theObject->data()); - myRef->Append(aData->label().Father()); // store label of the object + if (owner()->document() == theObject->document()) { + std::shared_ptr aData = std::dynamic_pointer_cast(theObject->data()); + myRef->Append(aData->label().Father()); // store label of the object + } else if (theObject.get() && theObject->data()->isValid()) { // reference to the other document + myRef->Append(myRef->Label()); + // if these attributes exist, the link is external: keep reference to access the label + std::ostringstream anIdString; // string with document Id + anIdString<document()->id(); + myExtDocRef->Append(anIdString.str().c_str()); + std::shared_ptr aData = std::dynamic_pointer_cast(theObject->data()); + TCollection_AsciiString anEntry; + TDF_Tool::Entry(aData->label().Father(), anEntry); + myExtDocRef->Append(anEntry); + } else return; // something is wrong + + if (myHashUsed) { + myHashObjects.insert(theObject); + myHashIndex[myRef->Extent() - 1] = theObject; + myHashIndexNoEmpty[int(myHashIndexNoEmpty.size())] = theObject; + } + // do it before the transaction finish to make just created/removed objects know dependencies // and reference from composite feature is removed automatically ADD_BACK_REF(theObject); - owner()->data()->sendAttributeUpdated(this); } void Model_AttributeRefList::remove(ObjectPtr theObject) { - std::shared_ptr aData; + eraseHash(); if (theObject.get() != NULL) { - aData = std::dynamic_pointer_cast(theObject->data()); - myRef->Remove(aData->label().Father()); - REMOVE_BACK_REF(theObject); + if (owner()->document() == theObject->document()) { + std::shared_ptr aData; + aData = std::dynamic_pointer_cast(theObject->data()); + myRef->Remove(aData->label().Father()); + REMOVE_BACK_REF(theObject); + owner()->data()->sendAttributeUpdated(this); + } else { + // LCOV_EXCL_START + // create new lists because for the current moment remove one of the duplicated elements + // from the list is buggy + TDF_LabelList anOldList = myRef->List(); + myRef->Clear(); + TDataStd_ListOfExtendedString anOldExts = myExtDocRef->List(); + myExtDocRef->Clear(); + + std::ostringstream anIdString; // string with document Id + anIdString<document()->id(); + std::shared_ptr aData = std::dynamic_pointer_cast(theObject->data()); + TCollection_AsciiString anEntry; + TDF_Tool::Entry(aData->label().Father(), anEntry); + bool aFound = false; + TDataStd_ListIteratorOfListOfExtendedString anExtIter(anOldExts); + for (TDF_ListIteratorOfLabelList aLIter(anOldList); aLIter.More(); aLIter.Next()) { + if (aLIter.Value() == myRef->Label()) { + if (anExtIter.Value() == anIdString.str().c_str()) { + TDataStd_ListIteratorOfListOfExtendedString anExtIter2 = anExtIter; + anExtIter2.Next(); + if (anExtIter2.Value() == anEntry) { // fully matches, so, remove(don't copy) + aFound = true; + continue; + } + } + myExtDocRef->Append(anExtIter.Value()); + anExtIter.Next(); + myExtDocRef->Append(anExtIter.Value()); + anExtIter.Next(); + } + myRef->Append(aLIter.Value()); + } + if (aFound) { + REMOVE_BACK_REF(theObject); + owner()->data()->sendAttributeUpdated(this); + } + // LCOV_EXCL_STOP + } } else { // in case of empty object remove, the first empty object is removed from the list std::shared_ptr aDoc = std::dynamic_pointer_cast( @@ -42,12 +115,12 @@ void Model_AttributeRefList::remove(ObjectPtr theObject) if (anObj.get() == NULL) { myRef->Remove(aLIter.Value()); REMOVE_BACK_REF(theObject); + owner()->data()->sendAttributeUpdated(this); break; } } } } - owner()->data()->sendAttributeUpdated(this); } void Model_AttributeRefList::clear() @@ -58,6 +131,8 @@ void Model_AttributeRefList::clear() for(; anOldIter != anOldList.end(); anOldIter++) { REMOVE_BACK_REF((*anOldIter)); } + myExtDocRef->Clear(); + eraseHash(); owner()->data()->sendAttributeUpdated(this); } @@ -65,6 +140,10 @@ int Model_AttributeRefList::size(const bool theWithEmpty) const { if (theWithEmpty) return myRef->Extent(); + + if (myHashUsed) + return int(myHashIndexNoEmpty.size()); + int aResult = 0; const TDF_LabelList& aList = myRef->List(); for (TDF_ListIteratorOfLabelList aLIter(aList); aLIter.More(); aLIter.Next()) { @@ -75,26 +154,50 @@ int Model_AttributeRefList::size(const bool theWithEmpty) const bool Model_AttributeRefList::isInitialized() { - if (size(false) == 0) { // empty list is not initialized list: sketch will be not valid after add/undo + if (size(false) == 0) { + // empty list is not initialized list: sketch will be not valid after add/undo return false; } return ModelAPI_AttributeRefList::isInitialized(); } -list Model_AttributeRefList::list() +ObjectPtr Model_AttributeRefList::iteratedObject(TDF_ListIteratorOfLabelList& theLIter, + TDataStd_ListIteratorOfListOfExtendedString& theExtIter, + std::shared_ptr theDoc) const { - std::list aResult; - std::shared_ptr aDoc = std::dynamic_pointer_cast( - owner()->document()); - if (aDoc) { - const TDF_LabelList& aList = myRef->List(); - for (TDF_ListIteratorOfLabelList aLIter(aList); aLIter.More(); aLIter.Next()) { - ObjectPtr anObj; - if (!aLIter.Value().IsNull() && !aLIter.Value().IsRoot()) - anObj = aDoc->objects()->object(aLIter.Value()); - aResult.push_back(anObj); + ObjectPtr anObj; + if (!theLIter.Value().IsNull() && !theLIter.Value().IsRoot()) { + if (theLIter.Value() == myRef->Label()) { // external document object + int anID = atoi(TCollection_AsciiString(theExtIter.Value()).ToCString()); + theExtIter.Next(); + DocumentPtr aRefDoc = Model_Application::getApplication()->document(anID); + if (aRefDoc.get()) { + std::shared_ptr aDR = std::dynamic_pointer_cast(aRefDoc); + TDF_Label aRefLab; + TDF_Tool::Label(aDR->objects()->featuresLabel().Data(), + TCollection_AsciiString(theExtIter.Value()).ToCString(), aRefLab); + if (!aRefLab.IsNull()) { + anObj = aDR->objects()->object(aRefLab); + } + } + theExtIter.Next(); + } else { // internal document object + TDF_Label aLab = theLIter.Value(); + if (!aLab.IsNull()) + anObj = theDoc->objects()->object(theLIter.Value()); } } + return anObj; +} + +std::list Model_AttributeRefList::list() +{ + createHash(); + std::list aResult; + std::map::iterator aHashIter = myHashIndex.begin(); + for(; aHashIter != myHashIndex.end(); aHashIter++) { + aResult.push_back(aHashIter->second); + } return aResult; } @@ -103,43 +206,24 @@ bool Model_AttributeRefList::isInList(const ObjectPtr& theObj) if(!theObj.get()) { return false; } - std::list aResult; - std::shared_ptr aDoc = std::dynamic_pointer_cast( - owner()->document()); - if (aDoc) { - std::shared_ptr aData = std::dynamic_pointer_cast(theObj->data()); - if (aData.get() && aData->isValid()) { - TDF_Label anObjLab = aData->label().Father(); - const TDF_LabelList& aList = myRef->List(); - for (TDF_ListIteratorOfLabelList aLIter(aList); aLIter.More(); aLIter.Next()) { - if (aLIter.Value().IsEqual(anObjLab)) { - return true; - } - } - } - } - return false; + createHash(); + return myHashObjects.count(theObj) != 0; } -ObjectPtr Model_AttributeRefList::object(const int theIndex, const bool theWithEmpty) const +ObjectPtr Model_AttributeRefList::object(const int theIndex, const bool theWithEmpty) { - std::shared_ptr aDoc = std::dynamic_pointer_cast( - owner()->document()); - if (aDoc) { - const TDF_LabelList& aList = myRef->List(); - int anIndex = -1; - for (TDF_ListIteratorOfLabelList aLIter(aList); aLIter.More(); aLIter.Next()) { - if (theWithEmpty || (!aLIter.Value().IsNull() && !aLIter.Value().IsRoot())) - anIndex++; - if (anIndex == theIndex) { - if (aLIter.Value().IsNull() || aLIter.Value().IsRoot()) { // null label => null sub - return ObjectPtr(); - } - return aDoc->objects()->object(aLIter.Value()); - } - } + createHash(); + std::map::iterator aFind; + if (theWithEmpty) { + aFind = myHashIndex.find(theIndex); + if (aFind == myHashIndex.end()) + return ObjectPtr(); + } else { + aFind = myHashIndexNoEmpty.find(theIndex); + if (aFind == myHashIndexNoEmpty.end()) + return ObjectPtr(); } - return ObjectPtr(); + return aFind->second; } void Model_AttributeRefList::substitute(const ObjectPtr& theCurrent, const ObjectPtr& theNew) @@ -152,13 +236,14 @@ void Model_AttributeRefList::substitute(const ObjectPtr& theCurrent, const Objec TDF_Label aCurrentLab = aData->label().Father(); TDF_Label aNewLab; if (theNew.get() && theNew->data()->isValid()) { // the new may be null - std::shared_ptr aNewData = + std::shared_ptr aNewData = std::dynamic_pointer_cast(theNew->data()); aNewLab = aNewData->label().Father(); } else { aNewLab = aCurrentLab.Root(); // root means null object } // do the substitution + eraseHash(); ADD_BACK_REF(theNew); if (myRef->InsertAfter(aNewLab, aCurrentLab)) { myRef->Remove(aCurrentLab); @@ -169,37 +254,6 @@ void Model_AttributeRefList::substitute(const ObjectPtr& theCurrent, const Objec } } -void Model_AttributeRefList::exchange(const ObjectPtr& theObject1, const ObjectPtr& theObject2) -{ - std::shared_ptr aDoc = std::dynamic_pointer_cast( - owner()->document()); - if (aDoc) { - std::shared_ptr aData1 = std::dynamic_pointer_cast(theObject1->data()); - if (aData1.get() && aData1->isValid()) { - TDF_Label aLab1 = aData1->label().Father(); - if (theObject2.get() && theObject2->data()->isValid()) { // the new may be null - std::shared_ptr aData2 = - std::dynamic_pointer_cast(theObject2->data()); - if (aData2.get() && aData2->isValid()) { - TDF_Label aLab2 = aData2->label().Father(); - // do the substitution: use the temporary label, as usually in exchange - TDF_Label aTmpLab = aLab1.Root(); - if (myRef->InsertAfter(aTmpLab, aLab1)) { - myRef->Remove(aLab1); - } - if (myRef->InsertAfter(aLab1, aLab2)) { - myRef->Remove(aLab2); - } - if (myRef->InsertAfter(aLab2, aTmpLab)) { - myRef->Remove(aTmpLab); - } - owner()->data()->sendAttributeUpdated(this); - } - } - } - } -} - void Model_AttributeRefList::removeLast() { std::shared_ptr aDoc = std::dynamic_pointer_cast( @@ -207,6 +261,7 @@ void Model_AttributeRefList::removeLast() if (aDoc && !myRef->IsEmpty()) { ObjectPtr anObj = aDoc->objects()->object(myRef->Last()); if (anObj.get()) { + eraseHash(); myRef->Remove(myRef->Last()); REMOVE_BACK_REF(anObj); owner()->data()->sendAttributeUpdated(this); @@ -219,7 +274,7 @@ void Model_AttributeRefList::remove(const std::set& theIndices) std::shared_ptr aDoc = std::dynamic_pointer_cast( owner()->document()); if (aDoc && !myRef->IsEmpty()) { - // collet labels that will be removed + // collect labels that will be removed TDF_LabelList aLabelsToRemove; TDF_ListIteratorOfLabelList aLabIter(myRef->List()); for(int aCurrent = 0; aLabIter.More(); aLabIter.Next(), aCurrent++) { @@ -235,6 +290,7 @@ void Model_AttributeRefList::remove(const std::set& theIndices) } } if (!aLabelsToRemove.IsEmpty()) { + eraseHash(); owner()->data()->sendAttributeUpdated(this); } } @@ -242,8 +298,49 @@ void Model_AttributeRefList::remove(const std::set& theIndices) Model_AttributeRefList::Model_AttributeRefList(TDF_Label& theLabel) { - myIsInitialized = theLabel.FindAttribute(TDataStd_ReferenceList::GetID(), myRef) == Standard_True; + myLab = theLabel; + reinit(); +} + +void Model_AttributeRefList::reinit() +{ + myIsInitialized = myLab.FindAttribute(TDataStd_ReferenceList::GetID(), myRef) == Standard_True; if (!myIsInitialized) { - myRef = TDataStd_ReferenceList::Set(theLabel); + myRef = TDataStd_ReferenceList::Set(myLab); + } + if (!myLab.FindAttribute(TDataStd_ExtStringList::GetID(), myExtDocRef)) { + myExtDocRef = TDataStd_ExtStringList::Set(myLab); + } + eraseHash(); +} + +void Model_AttributeRefList::createHash() +{ + if (myHashUsed) + return; + eraseHash(); + std::shared_ptr aDoc = std::dynamic_pointer_cast( + owner()->document()); + if (aDoc) { + const TDF_LabelList& aList = myRef->List(); + TDataStd_ListIteratorOfListOfExtendedString anExtIter(myExtDocRef->List()); + for (TDF_ListIteratorOfLabelList aLIter(aList); aLIter.More(); aLIter.Next()) { + ObjectPtr anObj = iteratedObject(aLIter, anExtIter, aDoc); + myHashIndex[int(myHashIndex.size())] = anObj; + if (anObj.get()) { + myHashIndexNoEmpty[int(myHashIndexNoEmpty.size())] = anObj; + myHashObjects.insert(anObj); + } + } } + if (!myHashObjects.empty()) // on open document with multi-rotation referenced have no results + myHashUsed = true; +} + +void Model_AttributeRefList::eraseHash() +{ + myHashObjects.clear(); + myHashIndex.clear(); + myHashIndexNoEmpty.clear(); + myHashUsed = false; }