X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModel%2FModel_AttributeReference.cpp;h=e164ffdb034dd7ea060ccdb51aeb1767c6233938;hb=52b0fdb3bbe3b4ca84519c9dd752f89a73bf6c05;hp=43bbabe658fff74259890026c982b1302d55670c;hpb=5c93de643578deee4726ab1ae799ea4a421daabe;p=modules%2Fshaper.git diff --git a/src/Model/Model_AttributeReference.cpp b/src/Model/Model_AttributeReference.cpp index 43bbabe65..e164ffdb0 100644 --- a/src/Model/Model_AttributeReference.cpp +++ b/src/Model/Model_AttributeReference.cpp @@ -1,13 +1,27 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D - -// File: ModelAPI_AttributeReference.cxx -// Created: 2 Apr 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_AttributeReference.h" #include "Model_Application.h" #include "Model_Events.h" #include "Model_Data.h" +#include "Model_Objects.h" #include #include @@ -15,32 +29,44 @@ #include #include -using namespace std; - void Model_AttributeReference::setValue(ObjectPtr theObject) { - if(!theObject) - return; - if (!myIsInitialized || value() != theObject) { - std::shared_ptr aData = std::dynamic_pointer_cast( - theObject->data()); - TDF_Label anObjLab = aData->label().Father(); // object label + // now allow to deselect in this attribute: extrusion from/to + //if(!theObject) + // return; + ObjectPtr aValue = value(); + if (!myIsInitialized || aValue != theObject) { + REMOVE_BACK_REF(aValue); - if (owner()->document() == theObject->document()) { // same document, use reference attribute + TDF_Label anObjLab; + if (theObject.get() && theObject->data()->isValid()) { + std::shared_ptr aData = std::dynamic_pointer_cast( + theObject->data()); + anObjLab = aData->label().Father(); // object label + } + // same document, use reference attribute + if (anObjLab.IsNull() || owner()->document() == theObject->document()) { - std::shared_ptr aDoc = - std::dynamic_pointer_cast(owner()->document()); - myRef->Set(anObjLab); // references to the object label + if (anObjLab.IsNull()) { + myRef->Set(myRef->Label()); + } else { + myRef->Set(anObjLab); // references to the object label + } // remove external link attributes (if any) myRef->Label().ForgetAttribute(TDataStd_Comment::GetID()); myRef->Label().ForgetAttribute(TDataStd_AsciiString::GetID()); } else { // different document: store the document name (comment) and entry (string): external // if these attributes exist, the link is external: keep reference to access the label - TDataStd_Comment::Set(myRef->Label(), theObject->document()->id().c_str()); + std::ostringstream anIdString; // string with document Id + anIdString<document()->id(); + TDataStd_Comment::Set(myRef->Label(), anIdString.str().c_str()); TCollection_AsciiString anEntry; TDF_Tool::Entry(anObjLab, anEntry); TDataStd_AsciiString::Set(myRef->Label(), anEntry); } + // 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); } @@ -48,42 +74,60 @@ void Model_AttributeReference::setValue(ObjectPtr theObject) ObjectPtr Model_AttributeReference::value() { - if (myIsInitialized) { - Handle(TDataStd_Comment) aDocID; - if (myRef->Label().FindAttribute(TDataStd_Comment::GetID(), aDocID)) { // external ref - DocumentPtr aRefDoc = - ModelAPI_Session::get()->document(TCollection_AsciiString(aDocID->Get()).ToCString()); - if (aRefDoc) { - Handle(TDataStd_AsciiString) anEntry; - if (myRef->Label().FindAttribute(TDataStd_AsciiString::GetID(), anEntry)) { - std::shared_ptr aDR = std::dynamic_pointer_cast(aRefDoc); + Handle(TDataStd_Comment) aDocID; + if (myRef->Label().FindAttribute(TDataStd_Comment::GetID(), aDocID)) { // external ref + int anID = atoi(TCollection_AsciiString(aDocID->Get()).ToCString()); + DocumentPtr aRefDoc = Model_Application::getApplication()->document(anID); + if (aRefDoc.get()) { + Handle(TDataStd_AsciiString) anEntry; + if (myRef->Label().FindAttribute(TDataStd_AsciiString::GetID(), anEntry)) { + std::shared_ptr aDR = std::dynamic_pointer_cast(aRefDoc); + if (aDR.get() && aDR->objects()) { TDF_Label aRefLab; - TDF_Tool::Label(aDR->featuresLabel().Data(), anEntry->Get().ToCString(), aRefLab); + TDF_Tool::Label(aDR->objects()->featuresLabel().Data(), + anEntry->Get().ToCString(), aRefLab); if (!aRefLab.IsNull()) { - return aDR->object(aRefLab); + return aDR->objects()->object(aRefLab); } } } - } else { // internal ref + } + } else { // internal ref + if (owner().get()) { std::shared_ptr aDoc = std::dynamic_pointer_cast( owner()->document()); if (aDoc) { TDF_Label aRefLab = myRef->Get(); if (!aRefLab.IsNull()) { // it may happen with old document, issue #285 - return aDoc->object(aRefLab); + return aDoc->objects()->object(aRefLab); } } } } - // not initialized return FeaturePtr(); } +bool Model_AttributeReference::isInitialized() +{ + if (myRef->Label() == myRef->Get() && !myRef->Label().IsAttribute(TDataStd_Comment::GetID())) { + // empty reference is not initialized + return false; + } + return ModelAPI_AttributeReference::isInitialized(); +} + Model_AttributeReference::Model_AttributeReference(TDF_Label& theLabel) { - myIsInitialized = theLabel.FindAttribute(TDF_Reference::GetID(), myRef) == Standard_True; + myLab = theLabel; + reinit(); +} + +void Model_AttributeReference::reinit() +{ + myIsInitialized = myLab.FindAttribute(TDF_Reference::GetID(), myRef) == Standard_True; if (!myIsInitialized) { - myRef = TDF_Reference::Set(theLabel, theLabel); // not initialized references to itself + myRef = TDF_Reference::Set(myLab, myLab); // not initialized references to itself + myIsInitialized = true; } else { if (owner()) { std::shared_ptr aDoc = @@ -96,14 +140,10 @@ void Model_AttributeReference::setObject(const std::shared_ptr& { if (owner() != theObject) { ModelAPI_AttributeReference::setObject(theObject); - std::shared_ptr aDoc = - std::dynamic_pointer_cast(owner()->document()); + //std::shared_ptr aDoc = + // std::dynamic_pointer_cast(owner()->document()); } } Model_AttributeReference::~Model_AttributeReference() -{ - std::shared_ptr aDoc = - std::dynamic_pointer_cast(owner()->document()); - TDF_Label aLab = myRef->Get(); -} +{}