-// Copyright (C) 2014-2019 CEA/DEN, EDF R&D
+// Copyright (C) 2014-2022 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
#include <Model_Application.h>
#include <Events_Loop.h>
#include <ModelAPI_Events.h>
+#include <ModelAPI_Tools.h>
#include <GeomAPI_Trsf.h>
+#include <GeomAlgoAPI_Transform.h>
+
+#include <Locale_Convert.h>
+
#include <TNaming_Tool.hxx>
#include <TNaming_NamedShape.hxx>
#include <TDataStd_Name.hxx>
data()->addAttribute(BASE_REF_ID(), ModelAPI_AttributeReference::typeId());
data()->addAttribute(DEFLECTION_ID(), ModelAPI_AttributeDouble::typeId());
data()->addAttribute(TRANSPARENCY_ID(), ModelAPI_AttributeDouble::typeId());
+ data()->addAttribute(ISO_LINES_ID(), ModelAPI_AttributeIntArray::typeId());
if (aDocRef->isInitialized() && // initialized immediately means already exist and will be loaded
!Model_Application::getApplication()->hasDocument(aDocRef->docId()))
SessionPtr aMgr = ModelAPI_Session::get();
if (!aMgr->isOperation()) {
// open transaction even document is not created to set current docs in setActiveDocument
- aMgr->startOperation("Activation");
+ std::string aMsg = "Activation " + Locale::Convert::toString(data()->name());
+ aMgr->startOperation(aMsg);
isNewTransaction = true;
}
if (!aDocRef->value().get()) { // create (or open) a document if it is not yet created
}
}
+
+void Model_ResultPart::loadPart()
+{
+ std::shared_ptr<ModelAPI_AttributeDocRef> aDocRef = data()->document(DOC_REF());
+ 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(), 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() && baseRef().get()) { // the second condition is due to #2035
return false;
}
+static GeomShapePtr transformShape(const GeomShapePtr theShape, const gp_Trsf& theTrsf)
+{
+ GeomShapePtr aResult(new GeomAPI_Shape);
+ if (theTrsf.ScaleFactor() > 0) {
+ // just update the location of the shape in case of affine transformation
+ TopoDS_Shape aShape = theShape->impl<TopoDS_Shape>();
+ if (!aShape.IsNull()) {
+ aShape.Move(theTrsf);
+ aResult->setImpl(new TopoDS_Shape(aShape));
+ }
+ }
+ else {
+ // all other transformations will modify the shape
+ GeomTrsfPtr aTrsf = std::make_shared<GeomAPI_Trsf>(new gp_Trsf(theTrsf));
+ GeomAlgoAPI_Transform aTransform(theShape, aTrsf);
+ aResult = aTransform.shape();
+ }
+ return aResult;
+}
+
std::shared_ptr<GeomAPI_Shape> Model_ResultPart::shape()
{
std::shared_ptr<GeomAPI_Shape> aResult(new GeomAPI_Shape);
ResultPtr anOrigResult = baseRef();
std::shared_ptr<GeomAPI_Shape> anOrigShape = anOrigResult->shape();
if (anOrigShape.get()) {
- TopoDS_Shape aShape = anOrigShape->impl<TopoDS_Shape>();
- if (!aShape.IsNull()) {
- aShape.Move(*(myTrsf.get()));
- myShape = aShape;
- aResult->setImpl(new TopoDS_Shape(aShape));
- }
+ aResult = transformShape(anOrigShape, *myTrsf);
+ myShape = aResult->impl<TopoDS_Shape>();
}
if (!myShape.IsNull() && aToSendUpdate) {
static const Events_ID anEvent = Events_Loop::eventByName(EVENT_OBJECT_UPDATED);
return true;
}
-std::string Model_ResultPart::nameInPart(const std::shared_ptr<GeomAPI_Shape>& theShape,
+std::wstring Model_ResultPart::nameInPart(const std::shared_ptr<GeomAPI_Shape>& theShape,
int& theIndex)
{
theIndex = 0; // not initialized
}
}
// something is not right
- return "";
+ return L"";
}
TopoDS_Shape aShape = theShape->impl<TopoDS_Shape>();
if (aShape.IsNull())
- return "";
+ return L"";
// getting an access to the document of part
std::shared_ptr<Model_Document> aDoc = std::dynamic_pointer_cast<Model_Document>(partDoc());
if (!aDoc.get()) // the part document is not presented for the moment
- return "";
- TDF_Label anAccessLabel = aDoc->generalLabel();
+ return L"";
+ MAYBE_UNUSED TDF_Label anAccessLabel = aDoc->generalLabel();
// make the selection attribute anyway:
// otherwise just by name it is not stable to search the result
- std::string aName;
+ std::wstring aName;
// for this the context result is needed
ResultPtr aContext;
const std::string& aBodyGroup = ModelAPI_ResultBody::group();
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;
}
AttributeSelectionListPtr aSelAttr = aDoc->selectionInPartFeature();
AttributeSelectionPtr aThisAttr = aSelAttr->value(theIndex - 1);
if (aThisAttr.get()) {
- return aThisAttr->update();
+ if (aThisAttr->update()) {
+ bool aRemove = false;
+ aThisAttr->updateInHistory(aRemove);
+ return true; // it was updated
+ }
}
}
return false; // something is wrong
return aResult;
}
-bool Model_ResultPart::combineGeometrical(const int theIndex, std::string& theNewName)
+bool Model_ResultPart::combineGeometrical(const int theIndex, std::wstring& theNewName)
{
std::shared_ptr<Model_Document> aDoc = std::dynamic_pointer_cast<Model_Document>(partDoc());
if (aDoc.get()) {
}
std::shared_ptr<GeomAPI_Shape> Model_ResultPart::shapeInPart(
- const std::string& theName, const std::string& theType, int& theIndex)
+ const std::wstring& theName, const std::string& theType, int& theIndex)
{
theIndex = 0; // not found yet
std::shared_ptr<GeomAPI_Shape> aResult;
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;
+}
