-// Copyright (C) 2014-2017 CEA/DEN, EDF R&D
+// Copyright (C) 2014-2019 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
//
// 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
+// 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>
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
#include <Model_ResultPart.h>
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
+ if (aDocRef->isInitialized() && // initialized immediately means already exist and will be loaded
!Model_Application::getApplication()->hasDocument(aDocRef->docId()))
Model_Application::getApplication()->setLoadByDemand(data()->name(), aDocRef->docId());
}
if (myTrsf.get() && baseRef().get()) { // the second condition is due to #2035
return baseRef()->partDoc();
}
+ if (!data()->isValid())
+ return DocumentPtr();
DocumentPtr aRes = data()->document(DOC_REF())->value();
return aRes;
}
if (!myTrsf.get()) { // disable of base result part
DocumentPtr aDoc = Model_ResultPart::partDoc();
if (aDoc.get() && aDoc->isOpened()) {
- // make the current feature the last in any case: to update shapes defore deactivation too
+ // make the current feature the last in any case: to update shapes before deactivation too
int aSize = aDoc->size(ModelAPI_Feature::group());
FeaturePtr aLastFeature;
if (aSize)
std::shared_ptr<GeomAPI_Shape> aResult(new GeomAPI_Shape);
if (myShape.IsNull()) { // shape is not produced yet, create it
SessionPtr aMgr = ModelAPI_Session::get();
- bool aToSendUpdate = aMgr->isOperation(); // inside of operation may send an update evnet
+ bool aToSendUpdate = aMgr->isOperation(); // inside of operation may send an update event
if (myTrsf.get()) { // get shape of the base result and apply the transformation
ResultPtr anOrigResult = baseRef();
std::shared_ptr<GeomAPI_Shape> anOrigShape = anOrigResult->shape();
TopoDS_Shape aBodyShape = *(aBody->shape()->implPtr<TopoDS_Shape>());
// check is body contain the selected sub-shape
for(TopExp_Explorer anExp(aBodyShape, aShape.ShapeType()); anExp.More(); anExp.Next()) {
- if (aShape.IsEqual(anExp.Current())) {
+ if (aShape.IsSame(anExp.Current())) {
aContext = aBody;
break;
}
static Events_ID EVENT_DISP = aLoop->eventByName(EVENT_OBJECT_TO_REDISPLAY);
ModelAPI_EventCreator::get()->sendUpdated(theThis, EVENT_DISP); // flush is in preview-update
}
+
+std::shared_ptr<GeomAPI_Trsf> Model_ResultPart::summaryTrsf()
+{
+ GeomTrsfPtr aResult(new GeomAPI_Trsf);
+ aResult->setImpl<gp_Trsf>(new gp_Trsf(sumTrsf()));
+ return aResult;
+}