-// 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<mailto:webmaster.salome@opencascade.com>
+//
#include <Model_ResultPart.h>
#include <ModelAPI_Data.h>
#include <Events_Loop.h>
#include <ModelAPI_Events.h>
+#include <GeomAPI_Trsf.h>
+
#include <TNaming_Tool.hxx>
#include <TNaming_NamedShape.hxx>
#include <TDataStd_Name.hxx>
#include <BRep_Builder.hxx>
#include <TopExp_Explorer.hxx>
-#define baseRef() std::dynamic_pointer_cast<Model_ResultPart>(data()->reference(BASE_REF_ID())->value())
+#define baseRef() \
+ std::dynamic_pointer_cast<Model_ResultPart>(data()->reference(BASE_REF_ID())->value())
void Model_ResultPart::initAttributes()
{
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());
+ Model_Application::getApplication()->setLoadByDemand(data()->name(), aDocRef->docId());
}
std::shared_ptr<ModelAPI_Document> 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();
}
std::shared_ptr<ModelAPI_AttributeDocRef> 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
+ 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
Handle(Model_Application) anApp = Model_Application::getApplication();
- if (anApp->isLoadByDemand(data()->name())) {
- anApp->loadDocument(data()->name(), aDocRef->docId()); // if it is just ne part, load may fail
+ 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<ModelAPI_ResultPart> 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<ModelAPI_ResultPart>(data()->owner());
}
-bool Model_ResultPart::isActivated()
+bool Model_ResultPart::isActivated()
{
if (myTrsf.get()) {
if (!baseRef().get()) // may be on close
for(int a = aDoc->size(aBodyGroup) - 1; a >= 0; a--) {
ResultPtr aBody = std::dynamic_pointer_cast<ModelAPI_Result>(aDoc->object(aBodyGroup, a));
// "object" method filters out disabled and concealed anyway, so don't check
- if (aBody.get() && aBody->shape().get()) {
+ if (aBody.get() && aBody->data()->isValid() && aBody->shape().get()) {
TopoDS_Shape aShape = *(aBody->shape()->implPtr<TopoDS_Shape>());
if (!aShape.IsNull()) {
aBuilder.Add(aResultComp, aShape);
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;
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<GeomAPI_Shape> Model_ResultPart::shapeInPart(
const std::string& theName, const std::string& theType, int& theIndex)
{
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<TopoDS_Shape>().Moved(aSumTrsf);
+ aResult->setImpl(new TopoDS_Shape(anOrigMoved));
+ }
return aResult;
}
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<TopoDS_Shape>().Moved(aSumTrsf);
+ aResult->setImpl(new TopoDS_Shape(anOrigMoved));
+ }
return aResult;
}
myTrsf.reset();
}
-void Model_ResultPart::setTrsf(std::shared_ptr<ModelAPI_Result> theThis,
+void Model_ResultPart::setTrsf(std::shared_ptr<ModelAPI_Result> theThis,
const std::shared_ptr<GeomAPI_Trsf>& theTransformation)
{
updateShape();
