X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModel%2FModel_ResultPart.cpp;h=255f5e3802ce81352513e45182dd92b5dad70178;hb=b73fb7468bea81901dbeed8e229d742f788ec282;hp=b38c0bb092d812bb38f8dbdea66a886dc8c8621e;hpb=868158fe6d39b25e60ac528295b1c908821e4af5;p=modules%2Fshaper.git diff --git a/src/Model/Model_ResultPart.cpp b/src/Model/Model_ResultPart.cpp index b38c0bb09..255f5e380 100644 --- a/src/Model/Model_ResultPart.cpp +++ b/src/Model/Model_ResultPart.cpp @@ -1,8 +1,22 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D - -// File: ModelAPI_ResultPart.cpp -// Created: 07 Jul 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 #include @@ -14,43 +28,50 @@ #include #include #include +#include #include +#include #include #include +#include + #include #include -#include #include #include #include #include -#define baseRef() std::dynamic_pointer_cast(data()->reference(BASE_REF_ID())->value()) +#define baseRef() \ + std::dynamic_pointer_cast(data()->reference(BASE_REF_ID())->value()) void Model_ResultPart::initAttributes() { // append the color attribute. It is empty, the attribute will be filled by a request - data()->addAttribute(DOC_REF(), ModelAPI_AttributeDocRef::typeId()); + AttributeDocRefPtr aDocRef = std::dynamic_pointer_cast( + data()->addAttribute(DOC_REF(), ModelAPI_AttributeDocRef::typeId())); data()->addAttribute(COLOR_ID(), ModelAPI_AttributeIntArray::typeId()); data()->addAttribute(BASE_REF_ID(), ModelAPI_AttributeReference::typeId()); + data()->addAttribute(DEFLECTION_ID(), ModelAPI_AttributeDouble::typeId()); + data()->addAttribute(TRANSPARENCY_ID(), ModelAPI_AttributeDouble::typeId()); + + if (aDocRef->isInitialized() && // initialized immideately means already exist and will be loaded + !Model_Application::getApplication()->hasDocument(aDocRef->docId())) + Model_Application::getApplication()->setLoadByDemand(data()->name(), aDocRef->docId()); } std::shared_ptr Model_ResultPart::partDoc() { - if (myTrsf.get()) { + if (myTrsf.get() && baseRef().get()) { // the second condition is due to #2035 return baseRef()->partDoc(); } DocumentPtr aRes = data()->document(DOC_REF())->value(); - if (!aRes.get() && myIsInLoad) { // trying to get this document from the session - aRes = document()->subDocument(data()->name()); - } return aRes; } Model_ResultPart::Model_ResultPart() { - myIsInLoad = false; } void Model_ResultPart::activate() @@ -61,41 +82,49 @@ void Model_ResultPart::activate() } std::shared_ptr aDocRef = data()->document(DOC_REF()); - + + // activation may cause changes in current features in document, so it must be in transaction + bool isNewTransaction = false; + SessionPtr aMgr = ModelAPI_Session::get(); + if (!aMgr->isOperation()) { + // open transaction even document is not created to set current docs in setActiveDocument + aMgr->startOperation("Activation"); + isNewTransaction = true; + } if (!aDocRef->value().get()) { // create (or open) a document if it is not yet created - myIsInLoad = true; - std::shared_ptr aDoc = document()->subDocument(data()->name()); - myIsInLoad = false; - if (aDoc) { + Handle(Model_Application) anApp = Model_Application::getApplication(); + if (anApp->isLoadByDemand(data()->name(), aDocRef->docId())) { + anApp->loadDocument(data()->name(), aDocRef->docId()); // if it is just new part, load fails + } else { + anApp->createDocument(aDocRef->docId()); + } + std::shared_ptr aDoc = aDocRef->value(); + if (aDoc.get()) { aDoc->synchronizeTransactions(); aDocRef->setValue(aDoc); } } if (aDocRef->value().get()) { - SessionPtr aMgr = ModelAPI_Session::get(); - bool isNewTransaction = !aMgr->isOperation(); - // activation may cause changes in current features in document, so it must be in transaction - if (isNewTransaction) { - aMgr->startOperation("Activation"); - } ModelAPI_Session::get()->setActiveDocument(aDocRef->value()); - if (isNewTransaction) { - aMgr->finishOperation(); - } + } + if (isNewTransaction) { + aMgr->finishOperation(); } } std::shared_ptr Model_ResultPart::original() { - if (myTrsf.get()) { + if (myTrsf.get() && baseRef().get()) { // the second condition is due to #2035 return baseRef()->original(); } return std::dynamic_pointer_cast(data()->owner()); } -bool Model_ResultPart::isActivated() +bool Model_ResultPart::isActivated() { if (myTrsf.get()) { + if (!baseRef().get()) // may be on close + return false; return baseRef()->isActivated(); } @@ -110,9 +139,13 @@ bool Model_ResultPart::setDisabled(std::shared_ptr theThis, if (!myTrsf.get()) { // disable of base result part DocumentPtr aDoc = Model_ResultPart::partDoc(); if (aDoc.get() && aDoc->isOpened()) { - std::shared_ptr anIntDoc = std::dynamic_pointer_cast(aDoc); // make the current feature the last in any case: to update shapes defore deactivation too - FeaturePtr aLastFeature = anIntDoc->lastFeature(); + int aSize = aDoc->size(ModelAPI_Feature::group()); + FeaturePtr aLastFeature; + if (aSize) + aLastFeature = std::dynamic_pointer_cast(aDoc->object( + ModelAPI_Feature::group(), aSize - 1)); + aDoc->setCurrentFeature(aLastFeature, false); if (theFlag) { // disable, so make all features disabled too // update the shape just before the deactivation: it will be used outside of part @@ -135,39 +168,41 @@ bool Model_ResultPart::setDisabled(std::shared_ptr theThis, std::shared_ptr Model_ResultPart::shape() { std::shared_ptr aResult(new GeomAPI_Shape); - if (myTrsf.get()) { // get shape of the base result and apply the transformation - ResultPtr anOrigResult = baseRef(); - std::shared_ptr anOrigShape = anOrigResult->shape(); - if (anOrigShape.get()) { - TopoDS_Shape aShape = anOrigShape->impl(); - if (!aShape.IsNull()) { - aShape.Move(*(myTrsf.get())); - aResult->setImpl(new TopoDS_Shape(aShape)); - } - } - return aResult; - } if (myShape.IsNull()) { // shape is not produced yet, create it - DocumentPtr aDoc = Model_ResultPart::partDoc(); - if (aDoc.get() && aDoc->isOpened()) { - const std::string& aBodyGroup = ModelAPI_ResultBody::group(); - TopoDS_Compound aResultComp; - BRep_Builder aBuilder; - aBuilder.MakeCompound(aResultComp); - int aNumSubs = 0; - for(int a = aDoc->size(aBodyGroup) - 1; a >= 0; a--) { - ResultPtr aBody = std::dynamic_pointer_cast(aDoc->object(aBodyGroup, a)); - // "object" method filters out disabled and concealed anyway, so don't check - if (aBody.get() && aBody->shape().get()) { - TopoDS_Shape aShape = *(aBody->shape()->implPtr()); - if (!aShape.IsNull()) { - aBuilder.Add(aResultComp, aShape); - aNumSubs++; - } + if (myTrsf.get()) { // get shape of the base result and apply the transformation + ResultPtr anOrigResult = baseRef(); + std::shared_ptr anOrigShape = anOrigResult->shape(); + if (anOrigShape.get()) { + TopoDS_Shape aShape = anOrigShape->impl(); + if (!aShape.IsNull()) { + aShape.Move(*(myTrsf.get())); + myShape = aShape; + aResult->setImpl(new TopoDS_Shape(aShape)); } } - if (aNumSubs) { - myShape = aResultComp; + return aResult; + } else { + DocumentPtr aDoc = Model_ResultPart::partDoc(); + if (aDoc.get() && aDoc->isOpened()) { + const std::string& aBodyGroup = ModelAPI_ResultBody::group(); + TopoDS_Compound aResultComp; + BRep_Builder aBuilder; + aBuilder.MakeCompound(aResultComp); + int aNumSubs = 0; + for(int a = aDoc->size(aBodyGroup) - 1; a >= 0; a--) { + ResultPtr aBody = std::dynamic_pointer_cast(aDoc->object(aBodyGroup, a)); + // "object" method filters out disabled and concealed anyway, so don't check + if (aBody.get() && aBody->data()->isValid() && aBody->shape().get()) { + TopoDS_Shape aShape = *(aBody->shape()->implPtr()); + if (!aShape.IsNull()) { + aBuilder.Add(aResultComp, aShape); + aNumSubs++; + } + } + } + if (aNumSubs) { + myShape = aResultComp; + } } } } @@ -226,7 +261,8 @@ std::string Model_ResultPart::nameInPart(const std::shared_ptr& t if (!aDoc.get()) // the part document is not presented for the moment return ""; TDF_Label anAccessLabel = aDoc->generalLabel(); - // make the selection attribute anyway: otherwise just by name it is not stable to search the result + // make the selection attribute anyway: + // otherwise just by name it is not stable to search the result std::string aName; // for this the context result is needed ResultPtr aContext; @@ -267,6 +303,15 @@ bool Model_ResultPart::updateInPart(const int theIndex) return false; // something is wrong } +gp_Trsf Model_ResultPart::sumTrsf() { + gp_Trsf aResult; + if (myTrsf) { + aResult = *myTrsf; + aResult = aResult * baseRef()->sumTrsf(); + } + return aResult; +} + std::shared_ptr Model_ResultPart::shapeInPart( const std::string& theName, const std::string& theType, int& theIndex) { @@ -289,6 +334,11 @@ std::shared_ptr Model_ResultPart::shapeInPart( aSelAttr->append(theName, theType); theIndex = aSelAttr->size(); aResult = aSelAttr->value(theIndex - 1)->value(); + if (myTrsf.get() && aResult.get() && !aResult->isNull()) { + gp_Trsf aSumTrsf = sumTrsf(); + TopoDS_Shape anOrigMoved = aResult->impl().Moved(aSumTrsf); + aResult->setImpl(new TopoDS_Shape(anOrigMoved)); + } return aResult; } @@ -301,6 +351,11 @@ std::shared_ptr Model_ResultPart::selectionValue(const int theInd AttributeSelectionListPtr aSelAttr = aDoc->selectionInPartFeature(); aResult = aSelAttr->value(theIndex - 1)->value(); + if (myTrsf.get() && aResult.get() && !aResult->isNull()) { + gp_Trsf aSumTrsf = sumTrsf(); + TopoDS_Shape anOrigMoved = aResult->impl().Moved(aSumTrsf); + aResult->setImpl(new TopoDS_Shape(anOrigMoved)); + } return aResult; } @@ -318,7 +373,7 @@ void Model_ResultPart::updateShape() myTrsf.reset(); } -void Model_ResultPart::setTrsf(std::shared_ptr theThis, +void Model_ResultPart::setTrsf(std::shared_ptr theThis, const std::shared_ptr& theTransformation) { updateShape();