-// Copyright (C) 2014-2017 CEA/DEN, EDF R&D
+// Copyright (C) 2014-2021 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_Document.h>
#include <Model_Application.h>
#include <Model_Session.h>
#include <Model_Events.h>
+#include <Model_Tools.h>
#include <ModelAPI_ResultPart.h>
#include <ModelAPI_Validator.h>
#include <ModelAPI_CompositeFeature.h>
#include <ModelAPI_ResultBody.h>
#include <Events_Loop.h>
#include <Events_InfoMessage.h>
+#include <GeomAPI_Tools.h>
+
+#include <Locale_Convert.h>
#include <TDataStd_Integer.hxx>
#include <TDataStd_Comment.hxx>
#include <TDataStd_AsciiString.hxx>
#include <TDF_Reference.hxx>
#include <TDF_ChildIDIterator.hxx>
-#include <TDF_LabelMapHasher.hxx>
#include <TDF_Delta.hxx>
#include <TDF_AttributeDelta.hxx>
#include <TDF_AttributeDeltaList.hxx>
#include <TDF_ListIteratorOfAttributeDeltaList.hxx>
#include <TDF_ListIteratorOfLabelList.hxx>
#include <TDF_LabelMap.hxx>
+#include <TDF_Tool.hxx>
#include <TDF_DeltaOnAddition.hxx>
+#include <TDataStd_ExtStringList.hxx>
#include <TDataStd_UAttribute.hxx>
#include <TNaming_Builder.hxx>
#include <TNaming_SameShapeIterator.hxx>
#include <TNaming_Iterator.hxx>
#include <TNaming_NamedShape.hxx>
#include <TNaming_Tool.hxx>
+#include <TNaming_OldShapeIterator.hxx>
+#include <TopTools_DataMapOfShapeShape.hxx>
+#include <TopTools_ListOfShape.hxx>
#include <TopExp_Explorer.hxx>
#include <TopoDS_Shape.hxx>
+#include <OSD_Directory.hxx>
#include <OSD_File.hxx>
#include <OSD_Path.hxx>
+#include <OSD_Protection.hxx>
+
+#ifdef TINSPECTOR
#include <CDF_Session.hxx>
#include <CDF_Directory.hxx>
+#endif
+
+#include <UTL.hxx>
#include <climits>
#ifndef WIN32
///< naming structures constructions selected from other document
static const int TAG_EXTERNAL_CONSTRUCTIONS = 5;
+/// reference to the shape in external document: sting list attribute identifier
+static const Standard_GUID kEXTERNAL_SHAPE_REF("9aa5dd14-6d34-4a8d-8786-05842fd7bbbd");
+
Model_Document::Model_Document(const int theID, const std::string theKind)
- : myID(theID), myKind(theKind), myIsActive(false), myIsSetCurrentFeature(false),
- myDoc(new TDocStd_Document("BinOcaf")) // binary OCAF format
+ : myID(theID),
+ myKind(theKind),
+ myDoc(new TDocStd_Document("BinOcaf")), // binary OCAF format
+ myIsActive(false),
+ myIsSetCurrentFeature(false)
{
#ifdef TINSPECTOR
CDF_Session::CurrentSession()->Directory()->Add(myDoc);
myDoc->CommitCommand();
}
+Model_Document::~Model_Document()
+{
+ if (!myDoc.IsNull())
+ {
+ myDoc->ClearUndos();
+ myDoc->ClearRedos();
+ }
+}
+
void Model_Document::setThis(DocumentPtr theDoc)
{
myObjs->setOwner(theDoc);
return this == Model_Session::get()->moduleDocument().get();
}
-bool Model_Document::load(const char* theDirName, const char* theFileName, DocumentPtr theThis)
+// LCOV_EXCL_START
+/// Makes all modification and generation naming shapes that have old shapes corresponding to
+/// shapes in a root document be equal to this root document
+static void updateShapesFromRoot(const TDF_Label theThisAccess, const TDF_Label theRootAccess)
{
- Handle(Model_Application) anApp = Model_Application::getApplication();
- if (isRoot()) {
- anApp->setLoadPath(theDirName);
+ TopTools_DataMapOfShapeShape aCurrentToRoot; // shapes that must be updated: from this to root
+ TDF_ChildIDIterator aThisIter(theThisAccess.Root(), kEXTERNAL_SHAPE_REF, true);
+ for(; aThisIter.More(); aThisIter.Next()) {
+ aCurrentToRoot.Clear();
+ Handle(TNaming_NamedShape) aNS;
+ if (!aThisIter.Value()->Label().FindAttribute(TNaming_NamedShape::GetID(), aNS))
+ continue;
+ if (aNS->Evolution() != TNaming_GENERATED && aNS->Evolution() != TNaming_MODIFY)
+ continue;
+ for (TNaming_Iterator aNSIter(aNS); aNSIter.More(); aNSIter.Next()) {
+ const TopoDS_Shape& anOld = aNSIter.OldShape();
+ if (anOld.IsNull())
+ continue;
+ TNaming_OldShapeIterator aNewIter(anOld, theThisAccess);
+ for (; aNewIter.More(); aNewIter.Next()) {
+ TNaming_Evolution anEvolution = aNewIter.NamedShape()->Evolution();
+ if (anEvolution != TNaming_SELECTED && anEvolution != TNaming_DELETE)
+ break;
+ }
+ if (aNewIter.More())
+ continue;
+ GeomShapePtr anOldShape(new GeomAPI_Shape), aRootShape(new GeomAPI_Shape);
+ anOldShape->setImpl<TopoDS_Shape>(new TopoDS_Shape(anOld));
+ anOldShape = GeomAPI_Tools::getTypedShape(anOldShape);
+
+ // search the same shape in the root document
+ Handle(TDataStd_ExtStringList) anEntries =
+ Handle(TDataStd_ExtStringList)::DownCast(aThisIter.Value());
+ TDataStd_ListOfExtendedString::Iterator anIter(anEntries->List());
+ for (; anIter.More(); anIter.Next()) {
+ TDF_Label aRootLab;
+ TDF_Tool::Label(theRootAccess.Data(), anIter.Value(), aRootLab);
+ if (aRootLab.IsNull())
+ continue;
+ Handle(TNaming_NamedShape) aRootNS;
+ if (!aRootLab.FindAttribute(TNaming_NamedShape::GetID(), aRootNS))
+ continue;
+ TNaming_Iterator aRootShapes(aRootNS);
+ for (; aRootShapes.More(); aRootShapes.Next()) {
+ if (aRootShapes.NewShape().IsNull())
+ continue;
+ aRootShape->setImpl(new TopoDS_Shape(aRootShapes.NewShape()));
+ aRootShape = GeomAPI_Tools::getTypedShape(aRootShape);
+ if (!anOldShape->isEqual(aRootShape)) // special checking by geometry
+ continue;
+ // found a good corresponded shape
+ if (!anOld.IsEqual(aRootShapes.NewShape()))
+ aCurrentToRoot.Bind(anOld, aRootShapes.NewShape());
+ }
+ }
+ }
+ if (!aCurrentToRoot.IsEmpty()) { // update the whole named shape content
+ TopTools_ListOfShape anOld, aNew;
+ TNaming_Evolution anEvol = aNS->Evolution();
+ for(TNaming_Iterator aNSIter(aNS); aNSIter.More(); aNSIter.Next()) {
+ anOld.Prepend(aCurrentToRoot.IsBound(aNSIter.OldShape()) ?
+ aCurrentToRoot.Find(aNSIter.OldShape()) : aNSIter.OldShape());
+ aNew.Prepend(aNSIter.NewShape());
+ }
+ TNaming_Builder aBuilder(aNS->Label());
+ TopTools_ListOfShape::Iterator anOldIter(anOld), aNewIter(aNew);
+ for(; anOldIter.More(); anOldIter.Next(), aNewIter.Next()) {
+ if (anEvol == TNaming_GENERATED) {
+ aBuilder.Generated(anOldIter.Value(), aNewIter.Value());
+ } else if (anEvol == TNaming_MODIFY) {
+ aBuilder.Modify(anOldIter.Value(), aNewIter.Value());
+ }
+ }
+ }
}
- TCollection_ExtendedString aPath(DocFileName(theDirName, theFileName));
- PCDM_ReaderStatus aStatus = (PCDM_ReaderStatus) -1;
- Handle(TDocStd_Document) aLoaded;
+}
+// LCOV_EXCL_STOP
+
+static bool loadDocument(Handle(Model_Application) theApp,
+ Handle(TDocStd_Document)& theDoc,
+ const TCollection_ExtendedString& theFilename)
+{
+ PCDM_ReaderStatus aStatus = (PCDM_ReaderStatus)-1;
try {
- aStatus = anApp->Open(aPath, aLoaded);
+ aStatus = theApp->Open(theFilename, theDoc);
} catch (Standard_Failure const& anException) {
Events_InfoMessage("Model_Document",
"Exception in opening of document: %1").arg(anException.GetMessageString()).send();
return false;
}
- bool isError = aStatus != PCDM_RS_OK;
- if (isError) {
+ bool isOk = aStatus == PCDM_RS_OK;
+ if (!isOk) {
+ // LCOV_EXCL_START
switch (aStatus) {
case PCDM_RS_UnknownDocument:
Events_InfoMessage("Model_Document", "Can not open document").send();
Events_InfoMessage("Model_Document", "Can not open document: unknown error").send();
break;
}
+ // LCOV_EXCL_STOP
+ }
+ return isOk;
+}
+
+bool Model_Document::load(const char* theDirName, const char* theFileName, DocumentPtr theThis)
+{
+ Handle(Model_Application) anApp = Model_Application::getApplication();
+ if (isRoot()) {
+ anApp->setLoadPath(theDirName);
}
+ TCollection_ExtendedString aPath(DocFileName(theDirName, theFileName));
+ Handle(TDocStd_Document) aLoaded;
+ bool isOk = loadDocument(anApp, aLoaded, aPath);
+
std::shared_ptr<Model_Session> aSession =
std::dynamic_pointer_cast<Model_Session>(Model_Session::get());
- if (!isError) {
+ if (isOk) {
+ // keep handle to avoid destruction of the document until myObjs works on it
+ Handle(TDocStd_Document) anOldDoc = myDoc;
myDoc = aLoaded;
myDoc->SetUndoLimit(UNDO_LIMIT);
aSession->setCheckTransactions(false);
if (myObjs)
delete myObjs;
+ anOldDoc->ClearRedos();
+ anOldDoc->ClearUndos();
+ anOldDoc.Nullify();
myObjs = new Model_Objects(myDoc->Main()); // synchronization is inside
myObjs->setOwner(theThis);
// update the current features status
setCurrentFeature(currentFeature(false), false);
aSession->setCheckTransactions(true);
- aSession->setActiveDocument(Model_Session::get()->moduleDocument(), false);
+ aSession->setActiveDocument(aSession->moduleDocument(), false);
// this is done in Part result "activate", so no needed here. Causes not-blue active part.
// aSession->setActiveDocument(anApp->getDocument(myID), true);
anApp->setLoadByDemand(aPart->data()->name(),
aPart->data()->document(ModelAPI_ResultPart::DOC_REF())->docId());
}
-
+ if (!isRoot()) {
+ updateShapesFromRoot(myDoc->Main(),
+ std::dynamic_pointer_cast<Model_Document>(aSession->moduleDocument())->generalLabel());
+ }
} else { // open failed, but new document was created to work with it: inform the model
aSession->setActiveDocument(Model_Session::get()->moduleDocument(), false);
}
- return !isError;
+ return isOk;
+}
+
+bool Model_Document::importPart(const char* theFileName,
+ std::list<std::shared_ptr<ModelAPI_Feature> >& theImported,
+ bool theCheckOnly)
+{
+ Handle(Model_Application) anApp = Model_Application::getApplication();
+ TCollection_ExtendedString aFormat;
+ if (!anApp->Format(theFileName, aFormat))
+ return false;
+
+ Handle(TDocStd_Document) aTempDoc;
+ bool isOk = loadDocument(anApp, aTempDoc, theFileName);
+
+ if (isOk && theCheckOnly) {
+ // verify all features are applicable for the current document type (e.g. PartSet)
+ std::shared_ptr<Model_Session> aSession =
+ std::dynamic_pointer_cast<Model_Session>(ModelAPI_Session::get());
+ for (TDF_ChildIterator anIt(aTempDoc->Main()); anIt.More() && isOk; anIt.Next()) {
+ TDF_Label aCurrentLab = anIt.Value();
+ Handle(TDataStd_Comment) aFeatureID;
+ TDF_Label aNewFeatuerLab;
+ if (aCurrentLab.FindAttribute(TDataStd_Comment::GetID(), aFeatureID)) {
+ TCollection_AsciiString anID(aFeatureID->Get());
+ std::string aFeatureKind(anID.ToCString());
+ if (aSession->myPlugins.find(aFeatureKind) != aSession->myPlugins.end()) {
+ std::string& aDocKind = aSession->myPlugins[aFeatureKind].second;
+ isOk = aDocKind.empty() || aDocKind == kind();
+ }
+ }
+ }
+ }
+
+ if (isOk && !theCheckOnly) {
+ // copy features from the temporary document to the current
+ Handle(TDF_RelocationTable) aRelocTable = new TDF_RelocationTable();
+ // add to relocation table source root label to the destination label because
+ // sometimes there could be a reference to root (issue 3267 on import part
+ // with sketch with removed features)
+ aRelocTable->SetRelocation(aTempDoc->Main().Root(), myDoc->Main().Root());
+ TDF_LabelList anAllNewFeatures;
+ // Perform the copying twice for correct references:
+ // 1. copy labels hierarchy and fill the relocation table
+ for (TDF_ChildIterator anIt(aTempDoc->Main()); anIt.More(); anIt.Next()) {
+ TDF_Label aCurrentLab = anIt.Value();
+ Handle(TDataStd_Comment) aFeatureID;
+ TDF_Label aNewFeatuerLab;
+ if (aCurrentLab.FindAttribute(TDataStd_Comment::GetID(), aFeatureID)) {
+ TCollection_AsciiString anID(aFeatureID->Get());
+ FeaturePtr aNewFeature = addFeature(anID.ToCString());
+ std::shared_ptr<Model_Data> aData =
+ std::dynamic_pointer_cast<Model_Data>(aNewFeature->data());
+ aNewFeatuerLab = aData->label().Father();
+ Model_Tools::copyLabels(aCurrentLab, aNewFeatuerLab, aRelocTable);
+ theImported.push_back(aNewFeature);
+ }
+ anAllNewFeatures.Append(aNewFeatuerLab);
+ }
+ // 2. copy attributes
+ std::set<TCollection_AsciiString> aCoordinateLabels;
+ Model_Tools::labelsOfCoordinates(aCoordinateLabels, aRelocTable);
+ TDF_ListIteratorOfLabelList aNewIt(anAllNewFeatures);
+ for (TDF_ChildIterator anIt(aTempDoc->Main()); anIt.More(); anIt.Next()) {
+ TDF_Label aCurrentLab = anIt.Value();
+ TDF_Label aFeatureLab = aNewIt.Value();
+ if (aFeatureLab.IsNull())
+ anAllNewFeatures.Remove(aNewIt);
+ else {
+ Model_Tools::copyAttrsAndKeepRefsToCoordinates(
+ aCurrentLab, aFeatureLab, aCoordinateLabels, aRelocTable);
+ aNewIt.Next();
+ }
+ }
+
+ myObjs->synchronizeFeatures(anAllNewFeatures, true, false, false, true);
+ }
+
+ if (anApp->CanClose(aTempDoc) == CDM_CCS_OK)
+ anApp->Close(aTempDoc);
+ return isOk;
+}
+
+static bool saveDocument(Handle(Model_Application) theApp,
+ Handle(TDocStd_Document) theDoc,
+ const TCollection_ExtendedString& theFilename)
+{
+ PCDM_StoreStatus aStatus;
+ try {
+ // create the directory to save the document
+ OSD_Path aPathToFile = UTL::Path(theFilename);
+ aPathToFile.SetName("");
+ aPathToFile.SetExtension("");
+ OSD_Directory aBaseDir(aPathToFile);
+ if (aPathToFile.TrekLength() != 0 && !aBaseDir.Exists())
+ aBaseDir.Build(OSD_Protection());
+ // save the document
+ aStatus = theApp->SaveAs(theDoc, theFilename);
+ }
+ catch (Standard_Failure const& anException) {
+ Events_InfoMessage("Model_Document",
+ "Exception in saving of document: %1").arg(anException.GetMessageString()).send();
+ return false;
+ }
+ bool isDone = aStatus == PCDM_SS_OK || aStatus == PCDM_SS_No_Obj;
+ if (!isDone) {
+ switch (aStatus) {
+ case PCDM_SS_DriverFailure:
+ Events_InfoMessage("Model_Document",
+ "Can not save document: save driver-library failure").send();
+ break;
+ case PCDM_SS_WriteFailure:
+ Events_InfoMessage("Model_Document", "Can not save document: file writing failure").send();
+ break;
+ case PCDM_SS_Failure:
+ default:
+ Events_InfoMessage("Model_Document", "Can not save document").send();
+ break;
+ }
+ }
+ return isDone;
}
bool Model_Document::save(
Handle(Model_Application) anApp = Model_Application::getApplication();
if (isRoot()) {
#ifdef WIN32
- CreateDirectory((LPTSTR) theDirName, NULL);
+ size_t aDirLen = strlen(theDirName);
+ std::wstring aWStr(aDirLen, L'#');
+ mbstowcs(&aWStr[0], theDirName, aDirLen);
+ CreateDirectory(aWStr.c_str(), NULL);
#else
mkdir(theDirName, 0x1ff);
#endif
}
// filename in the dir is id of document inside of the given directory
TCollection_ExtendedString aPath(DocFileName(theDirName, theFileName));
- PCDM_StoreStatus aStatus;
- try {
- aStatus = anApp->SaveAs(myDoc, aPath);
- } catch (Standard_Failure const& anException) {
- Events_InfoMessage("Model_Document",
- "Exception in saving of document: %1").arg(anException.GetMessageString()).send();
- if (aWasCurrent.get()) { // return the current feature to the initial position
- setCurrentFeature(aWasCurrent, false);
- aSession->setCheckTransactions(true);
- }
- return false;
- }
- bool isDone = aStatus == PCDM_SS_OK || aStatus == PCDM_SS_No_Obj;
- if (!isDone) {
- switch (aStatus) {
- case PCDM_SS_DriverFailure:
- Events_InfoMessage("Model_Document",
- "Can not save document: save driver-library failure").send();
- break;
- case PCDM_SS_WriteFailure:
- Events_InfoMessage("Model_Document", "Can not save document: file writing failure").send();
- break;
- case PCDM_SS_Failure:
- default:
- Events_InfoMessage("Model_Document", "Can not save document").send();
- break;
- }
- }
+ bool isDone = saveDocument(anApp, myDoc, aPath);
if (aWasCurrent.get()) { // return the current feature to the initial position
setCurrentFeature(aWasCurrent, false);
ResultPartPtr aPart = std::dynamic_pointer_cast<ModelAPI_ResultPart>(*aPartRes);
if (!aPart->isActivated()) {
// copy not-activated document that is not in the memory
- std::string aDocName = aPart->data()->name();
+ std::string aDocName = Locale::Convert::toString(aPart->data()->name());
if (!aDocName.empty()) {
// just copy file
TCollection_AsciiString aSubPath(DocFileName(anApp->loadPath().c_str(), aDocName));
- OSD_Path aPath(aSubPath);
- OSD_File aFile(aPath);
+ OSD_Path aCopyPath(aSubPath);
+ OSD_File aFile(aCopyPath);
if (aFile.Exists()) {
TCollection_AsciiString aDestinationDir(DocFileName(theDirName, aDocName));
OSD_Path aDestination(aDestinationDir);
}
}
} else { // simply save opened document
+ std::string aDocName = Locale::Convert::toString(aPart->data()->name());
isDone = std::dynamic_pointer_cast<Model_Document>(aPart->partDoc())->
- save(theDirName, aPart->data()->name().c_str(), theResults);
+ save(theDirName, aDocName.c_str(), theResults);
}
}
}
return isDone;
}
+bool Model_Document::save(const char* theFilename,
+ const std::list<FeaturePtr>& theExportFeatures) const
+{
+ Handle(Model_Application) anApp = Model_Application::getApplication();
+ TCollection_ExtendedString aFormat;
+ if (!anApp->Format(theFilename, aFormat))
+ return false;
+
+ Handle(TDocStd_Document) aTempDoc = new TDocStd_Document(aFormat);
+ TDF_Label aMain = aTempDoc->Main();
+
+ Handle(TDF_RelocationTable) aRelocTable = new TDF_RelocationTable();
+ std::list<FeaturePtr>::const_iterator anIt = theExportFeatures.begin();
+ // Perform the copying twice for correct references:
+ // 1. copy labels hierarchy and fill the relocation table
+ for (; anIt != theExportFeatures.end(); ++anIt) {
+ TDF_Label aFeatureLab = aMain.NewChild();
+ std::shared_ptr<Model_Data> aData = std::dynamic_pointer_cast<Model_Data>((*anIt)->data());
+ Model_Tools::copyLabels(aData->label().Father(), aFeatureLab, aRelocTable);
+ }
+ // 2. copy attributes
+ std::set<TCollection_AsciiString> aCoordinateLabels;
+ Model_Tools::labelsOfCoordinates(aCoordinateLabels, aRelocTable);
+ TDF_ChildIterator aChildIt(aMain);
+ for (anIt = theExportFeatures.begin(); anIt != theExportFeatures.end(); ++anIt) {
+ TDF_Label aFeatureLab = aChildIt.Value();
+ std::shared_ptr<Model_Data> aData = std::dynamic_pointer_cast<Model_Data>((*anIt)->data());
+ Model_Tools::copyAttrsAndKeepRefsToCoordinates(
+ aData->label().Father(), aFeatureLab, aCoordinateLabels, aRelocTable);
+ aChildIt.Next();
+ }
+
+ bool isDone = saveDocument(anApp, aTempDoc, theFilename);
+ if (aTempDoc->CanClose() == CDM_CCS_OK)
+ aTempDoc->Close();
+ return isDone;
+}
+
void Model_Document::close(const bool theForever)
{
std::shared_ptr<ModelAPI_Session> aPM = Model_Session::get();
aDelta = theDoc->GetUndos().Last();
TDF_LabelList aDeltaList;
aDelta->Labels(aDeltaList); // it clears list, so, use new one and then append to the result
- for(TDF_ListIteratorOfLabelList aListIter(aDeltaList); aListIter.More(); aListIter.Next()) {
+ if (!aDeltaList.IsEmpty()) {
return false;
}
// add also label of the modified attributes
}
myObjs->synchronizeBackRefs();
Events_Loop* aLoop = Events_Loop::loop();
- static const Events_ID kCreatedEvent = Events_Loop::loop()->eventByName(EVENT_OBJECT_CREATED);
- static const Events_ID kUpdatedEvent = Events_Loop::loop()->eventByName(EVENT_OBJECT_UPDATED);
- static const Events_ID kRedispEvent = Events_Loop::loop()->eventByName(EVENT_OBJECT_TO_REDISPLAY);
- static const Events_ID kDeletedEvent = Events_Loop::loop()->eventByName(EVENT_OBJECT_DELETED);
+ static const Events_ID kCreatedEvent = aLoop->eventByName(EVENT_OBJECT_CREATED);
+ static const Events_ID kUpdatedEvent = aLoop->eventByName(EVENT_OBJECT_UPDATED);
+ static const Events_ID kRedispEvent = aLoop->eventByName(EVENT_OBJECT_TO_REDISPLAY);
+ static const Events_ID kDeletedEvent = aLoop->eventByName(EVENT_OBJECT_DELETED);
aLoop->flush(kCreatedEvent);
aLoop->flush(kUpdatedEvent);
aLoop->flush(kRedispEvent);
bool Model_Document::isModified()
{
// is modified if at least one operation was committed and not undone
- return myTransactions.size() != myTransactionSave || isOperation();
+ return (int)myTransactions.size() != myTransactionSave || isOperation();
}
bool Model_Document::canUndo()
myDoc->Undo();
}
+ std::set<int> aSubs;
if (theWithSubs) {
// undo for all subs
- const std::set<int> aSubs = subDocuments();
+ aSubs = subDocuments();
std::set<int>::iterator aSubIter = aSubs.begin();
for (; aSubIter != aSubs.end(); aSubIter++) {
if (!subDoc(*aSubIter)->myObjs)
myObjs->synchronizeFeatures(aDeltaLabels, true, false, false, isRoot());
// update the current features status
setCurrentFeature(currentFeature(false), false);
+
+ if (theWithSubs) {
+ // undo for all subs
+ const std::set<int> aNewSubs = subDocuments();
+ std::set<int>::iterator aNewSubIter = aNewSubs.begin();
+ for (; aNewSubIter != aNewSubs.end(); aNewSubIter++) {
+ // synchronize only newly appeared documents
+ if (!subDoc(*aNewSubIter)->myObjs || aSubs.find(*aNewSubIter) != aSubs.end())
+ continue;
+ TDF_LabelList anEmptyDeltas;
+ subDoc(*aNewSubIter)->myObjs->synchronizeFeatures(anEmptyDeltas, true, false, true, true);
+ }
+ }
}
}
// update the current features status
setCurrentFeature(currentFeature(false), false);
}
-
+// this is used for creation of undo/redo1-list by GUI
+// LCOV_EXCL_START
std::list<std::string> Model_Document::undoList() const
{
std::list<std::string> aResult;
}
return aResult;
}
+// LCOV_EXCL_STOP
void Model_Document::operationId(const std::string& theId)
{
{
std::shared_ptr<Model_Session> aSession =
std::dynamic_pointer_cast<Model_Session>(ModelAPI_Session::get());
+ if (!aSession->hasModuleDocument() || !myObjs)
+ return FeaturePtr(); // this may be on close of the document
FeaturePtr aFeature = aSession->createFeature(theID, this);
if (!aFeature)
return aFeature;
}
}
}
+ // #2861,3029: if the parameter is added, add it after parameters existing in the list
+ if (aCurrent.get() &&
+ (aFeature->getKind() == "Parameter" || aFeature->getKind() == "ParametersMgr")) {
+ int anIndex = kUNDEFINED_FEATURE_INDEX;
+ for(FeaturePtr aNextFeat = myObjs->nextFeature(aCurrent, anIndex);
+ aNextFeat.get() && aNextFeat->getKind() == "Parameter";
+ aNextFeat = myObjs->nextFeature(aCurrent, anIndex))
+ aCurrent = aNextFeat;
+ }
aDocToAdd->myObjs->addFeature(aFeature, aCurrent);
if (!aFeature->isAction()) { // do not add action to the data model
if (theMakeCurrent) // after all this feature stays in the document, so make it current
return aFeature;
}
-
void Model_Document::refsToFeature(FeaturePtr theFeature,
std::set<std::shared_ptr<ModelAPI_Feature> >& theRefs, const bool isSendError)
{
{
myObjs->removeFeature(theFeature);
// fix for #2723: send signal that part is updated
- if (!isRoot()) {
+ if (!isRoot() && isOperation()) {
std::shared_ptr<Model_Document> aRoot =
std::dynamic_pointer_cast<Model_Document>(ModelAPI_Session::get()->moduleDocument());
std::list<ResultPtr> allParts;
return isSub(theMain, aParent);
}
-
-void Model_Document::moveFeature(FeaturePtr theMoved, FeaturePtr theAfterThis)
+void Model_Document::moveFeature(FeaturePtr theMoved, FeaturePtr theAfterThis, const bool theSplit)
{
bool aCurrentUp = theMoved == currentFeature(false);
if (aCurrentUp) {
FeaturePtr anAfterThisSub = theAfterThis;
if (aCompositeAfter.get()) {
FeaturePtr aSub = aCompositeAfter;
+ int anIndex = kUNDEFINED_FEATURE_INDEX;
do {
- FeaturePtr aNext = myObjs->nextFeature(aSub);
+ FeaturePtr aNext = myObjs->nextFeature(aSub, anIndex);
if (!isSub(aCompositeAfter, aNext)) {
anAfterThisSub = aSub;
break;
} while (aSub.get());
}
+ AttributeSelectionListPtr aMovedList;
+ if (theMoved->getKind() == "Group") {
+ aMovedList = theMoved->selectionList("group_list");
+ if (aMovedList.get())
+ aMovedList->setMakeCopy(true);
+ }
myObjs->moveFeature(theMoved, anAfterThisSub);
+
+ if (theSplit) { // split the group into sub-features
+ theMoved->customAction("split");
+ }
+
if (aCurrentUp) { // make the moved feature enabled or disabled due to the real status
setCurrentFeature(currentFeature(false), false);
} else if (theAfterThis == currentFeature(false) || anAfterThisSub == currentFeature(false)) {
// must be after move to make enabled all features which are before theMoved
setCurrentFeature(theMoved, true);
}
+ if (aMovedList.get())
+ aMovedList->setMakeCopy(false);
}
void Model_Document::updateHistory(const std::shared_ptr<ModelAPI_Object> theObject)
}
std::shared_ptr<ModelAPI_Object> Model_Document::objectByName(
- const std::string& theGroupID, const std::string& theName)
+ const std::string& theGroupID, const std::wstring& theName)
{
return myObjs->objectByName(theGroupID, theName);
}
TDF_Label aLab = aRef->Get();
FeaturePtr aResult = myObjs->feature(aLab);
if (theVisible) { // get nearest visible (in history) going up
+ int anIndex = kUNDEFINED_FEATURE_INDEX;
while(aResult.get() && !aResult->isInHistory()) {
- aResult = myObjs->nextFeature(aResult, true);
+ aResult = myObjs->nextFeature(aResult, anIndex, true);
}
}
return aResult;
if (theVisible && !theCurrent.get()) {
// needed to avoid disabling of PartSet initial constructions
+ int anIndex = kUNDEFINED_FEATURE_INDEX;
FeaturePtr aNext =
- theCurrent.get() ? myObjs->nextFeature(theCurrent) : myObjs->firstFeature();
- for (; aNext.get(); aNext = myObjs->nextFeature(theCurrent)) {
+ theCurrent.get() ? myObjs->nextFeature(theCurrent, anIndex, false) : myObjs->firstFeature();
+ for (; aNext.get(); aNext = myObjs->nextFeature(theCurrent, anIndex, false)) {
if (aNext->isInHistory()) {
break; // next in history is not needed
} else { // next not in history is good for making current
}
}
}
+ if (theVisible) { // make RemoveResults feature be active even it is performed after the current
+ int anIndex = kUNDEFINED_FEATURE_INDEX;
+ FeaturePtr aNext =
+ theCurrent.get() ? myObjs->nextFeature(theCurrent, anIndex, false) : myObjs->firstFeature();
+ for (; aNext.get(); aNext = myObjs->nextFeature(theCurrent, anIndex, false)) {
+ if (aNext->isInHistory()) {
+ break; // next in history is not needed
+ } else if (aNext->getKind() == "RemoveResults"){
+ theCurrent = aNext;
+ }
+ }
+ }
if (theCurrent.get()) {
std::shared_ptr<Model_Data> aData = std::static_pointer_cast<Model_Data>(theCurrent->data());
if (!aData.get() || !aData->isValid()) {
FeaturePtr anIter = myObjs->lastFeature();
bool aWasChanged = false;
bool isCurrentParameter = theCurrent.get() && theCurrent->getKind() == "Parameter";
- for(; anIter.get(); anIter = myObjs->nextFeature(anIter, true)) {
+ int anIndex = kUNDEFINED_FEATURE_INDEX;
+ for(; anIter.get(); anIter = myObjs->nextFeature(anIter, anIndex, true)) {
// check this before passed become enabled: the current feature is enabled!
if (anIter == theCurrent) aPassed = true;
myIsSetCurrentFeature = false;
// unblock the flush signals and up them after this
aLoop->activateFlushes(isActive);
+
+ static Events_ID kUpdatedSel = aLoop->eventByName(EVENT_UPDATE_SELECTION);
+ aLoop->flush(kUpdatedSel);
}
void Model_Document::setCurrentFeatureUp()
// problems if it is true: here and in "setCurrentFeature"
FeaturePtr aCurrent = currentFeature(false);
if (aCurrent.get()) { // if not, do nothing because null is the upper
- FeaturePtr aPrev = myObjs->nextFeature(aCurrent, true);
+ int anIndex = kUNDEFINED_FEATURE_INDEX;
+ FeaturePtr aPrev = myObjs->nextFeature(aCurrent, anIndex, true);
// make the higher level composite as current (sketch becomes disabled if line is enabled)
if (aPrev.get()) {
FeaturePtr aComp = ModelAPI_Tools::compositeOwner(aPrev);
return myObjs->feature(theResult);
}
-Standard_Integer HashCode(const TDF_Label& theLab, const Standard_Integer theUpper)
-{
- return TDF_LabelMapHasher::HashCode(theLab, theUpper);
-
-}
-Standard_Boolean IsEqual(const TDF_Label& theLab1, const TDF_Label& theLab2)
-{
- return TDF_LabelMapHasher::IsEqual(theLab1, theLab2);
-}
-
FeaturePtr Model_Document::featureByLab(const TDF_Label& theLab) {
TDF_Label aCurrentLab = theLab;
while(aCurrentLab.Depth() > 3)
return ResultPtr(); // not found
}
-
-void Model_Document::addNamingName(const TDF_Label theLabel, std::string theName)
+void Model_Document::addNamingName(const TDF_Label theLabel, std::wstring theName)
{
- std::map<std::string, std::list<TDF_Label> >::iterator aFind = myNamingNames.find(theName);
+ std::map<std::wstring, std::list<TDF_Label> >::iterator aFind = myNamingNames.find(theName);
if (aFind != myNamingNames.end()) { // to avoid duplicate-labels
// to keep correct order in spite of history line management
myNamingNames[theName].push_back(theLabel);
}
-void Model_Document::changeNamingName(const std::string theOldName,
- const std::string theNewName,
+void Model_Document::changeNamingName(const std::wstring theOldName,
+ const std::wstring theNewName,
const TDF_Label& theLabel)
{
- std::map<std::string, std::list<TDF_Label> >::iterator aFind = myNamingNames.find(theOldName);
+ std::map<std::wstring, std::list<TDF_Label> >::iterator aFind = myNamingNames.find(theOldName);
if (aFind != myNamingNames.end()) {
std::list<TDF_Label>::iterator aLabIter = aFind->second.begin();
for(; aLabIter != aFind->second.end(); aLabIter++) {
} else { // remove from the list
aFind->second.erase(aLabIter);
}
+ // check the sketch vertex name located under renamed sketch line
+ TDF_ChildIDIterator aChild(theLabel, TDataStd_Name::GetID());
+ for(; aChild.More(); aChild.Next()) {
+ Handle(TDataStd_Name) aSubName = Handle(TDataStd_Name)::DownCast(aChild.Value());
+ std::wstring aName = Locale::Convert::toWString(aSubName->Get().ToExtString());
+ if (aName.find(theOldName) == 0) { // started from parent name
+ std::wstring aNewSubName = theNewName + aName.substr(theOldName.size());
+ changeNamingName(aName, aNewSubName, aSubName->Label());
+ aSubName->Set(aNewSubName.c_str());
+ }
+ }
return;
}
}
}
}
-TDF_Label Model_Document::findNamingName(std::string theName, ResultPtr theContext)
+// returns true if names consist of the same sub-elements but with different order.
+// Sub-elements are separated by "-" symbol. First part must be "Face", second at the same place.
+static bool IsExchangedName(const TCollection_ExtendedString& theName1,
+ const TCollection_ExtendedString& theName2)
{
- std::map<std::string, std::list<TDF_Label> >::iterator aFind = myNamingNames.find(theName);
+ static const TCollection_ExtendedString aSepStr("-");
+ static const Standard_ExtString aSep = aSepStr.ToExtString();
+ static const TCollection_ExtendedString aWireTail("_wire");
+ if (theName1.Token(aSep, 1) != "Face" || theName2.Token(aSep, 1) != "Face")
+ return false;
+ if (theName1.Token(aSep, 2) != theName2.Token(aSep, 2))
+ return false;
+ // Collect Map of the sub-elements of the first name
+ NCollection_Map<TCollection_ExtendedString> aSubsMap;
+ TCollection_ExtendedString aWireSuffix;
+ int a = 3;
+ for (; true ; a++) {
+ TCollection_ExtendedString aToken = theName1.Token(aSep, a);
+ if (aToken.IsEmpty())
+ break;
+ int aTailPos = aToken.Search(aWireTail);
+ if (aTailPos > 0) {
+ aWireSuffix = aToken.Split(aTailPos - 1);
+ }
+ aSubsMap.Add(aToken);
+ }
+ // check all subs in the second name are in the map
+ for (int a2 = 3; true; a2++) {
+ TCollection_ExtendedString aToken = theName2.Token(aSep, a2);
+ if (aToken.IsEmpty()) {
+ if (a2 != a) // number of sub-elements is not equal
+ return false;
+ break;
+ }
+ int aTailPos = aToken.Search(aWireTail);
+ if (aTailPos > 0) {
+ TCollection_ExtendedString aSuffix = aToken.Split(aTailPos - 1);
+ if (aWireSuffix != aSuffix)
+ return false;
+ }
+ if (!aSubsMap.Contains(aToken))
+ return false;
+ }
+ return true;
+}
+
+TDF_Label Model_Document::findNamingName(std::wstring theName, ResultPtr theContext)
+{
+ std::map<std::wstring, std::list<TDF_Label> >::iterator aFind = myNamingNames.find(theName);
if (aFind != myNamingNames.end()) {
std::list<TDF_Label>::reverse_iterator aLabIter = aFind->second.rbegin();
for(; aLabIter != aFind->second.rend(); aLabIter++) {
return *(aFind->second.rbegin()); // no more variants, so, return the last
}
// not found exact name, try to find by sub-components
- std::string::size_type aSlash = theName.rfind('/');
- if (aSlash != std::string::npos) {
- std::string anObjName = theName.substr(0, aSlash);
+ std::wstring::size_type aSlash = theName.rfind(L'/');
+ if (aSlash != std::wstring::npos) {
+ std::wstring anObjName = theName.substr(0, aSlash);
aFind = myNamingNames.find(anObjName);
if (aFind != myNamingNames.end()) {
TCollection_ExtendedString aSubName(theName.substr(aSlash + 1).c_str());
}
// copy aSubName to avoid incorrect further processing after its suffix cutting
TCollection_ExtendedString aSubNameCopy(aSubName);
+ TDF_Label aFaceLabelWithExchangedSubs; // check also exchanged sub-elements of the name
// searching sub-labels with this name
TDF_ChildIDIterator aNamesIter(*aLabIter, TDataStd_Name::GetID(), Standard_True);
for(; aNamesIter.More(); aNamesIter.Next()) {
Handle(TDataStd_Name) aName = Handle(TDataStd_Name)::DownCast(aNamesIter.Value());
if (aName->Get() == aSubNameCopy)
return aName->Label();
+ if (aName->Get().Length() == aSubNameCopy.Length() &&
+ IsExchangedName(aName->Get(), aSubNameCopy))
+ aFaceLabelWithExchangedSubs = aName->Label();
}
+ if (!aFaceLabelWithExchangedSubs.IsNull())
+ return aFaceLabelWithExchangedSubs;
// If not found child label with the exact sub-name, then try to find compound with
// such sub-name without suffix.
Standard_Integer aSuffixPos = aSubNameCopy.SearchFromEnd('_');
if (aRefFeat.get()) {
if (aRefFeat == theThis)
return false; // other references to this, so other later than this
- if (std::dynamic_pointer_cast<ModelAPI_CompositeFeature>(aRefFeat)) {
- if (!isLaterByDep(theThis, aRefFeat)) // nested composites: recursion
- return false;
- }
+ //if (std::dynamic_pointer_cast<ModelAPI_CompositeFeature>(aRefFeat)) {
+ // if (!isLaterByDep(theThis, aRefFeat)) // nested composites: recursion
+ // return false;
+ //}
}
}
}
}
+ FeaturePtr aThisOwner = ModelAPI_Tools::compositeOwner(theThis);
+ if (aThisOwner.get()) {
+ if (aThisOwner == theOther)
+ return true; // composite owner is later that its sub
+ if (!isLaterByDep(aThisOwner, theOther))
+ return false;
+ }
return myObjs->isLater(theThis, theOther);
}
int Model_Document::numberOfNameInHistory(
const ObjectPtr& theNameObject, const TDF_Label& theStartFrom)
{
- std::map<std::string, std::list<TDF_Label> >::iterator aFind =
+ std::map<std::wstring, std::list<TDF_Label> >::iterator aFind =
myNamingNames.find(theNameObject->data()->name());
if (aFind == myNamingNames.end() || aFind->second.size() < 2) {
return 1; // no need to specify the name by additional identifiers
}
ResultPtr Model_Document::findByName(
- std::string& theName, std::string& theSubShapeName, bool& theUniqueContext)
+ std::wstring& theName, std::wstring& theSubShapeName, bool& theUniqueContext)
{
int aNumInHistory = 0;
- std::string aName = theName;
+ std::wstring aName = theName;
ResultPtr aRes = myObjs->findByName(aName);
theUniqueContext = !(aRes.get() && myNamingNames.find(aName) != myNamingNames.end());
while(!aRes.get() && aName[0] == '_') { // this may be theContext with the history index
aRes = myObjs->findByName(aName);
}
if (aNumInHistory) {
- std::map<std::string, std::list<TDF_Label> >::iterator aFind = myNamingNames.find(aName);
- if (aFind != myNamingNames.end() && aFind->second.size() > aNumInHistory) {
+ std::map<std::wstring, std::list<TDF_Label> >::iterator aFind = myNamingNames.find(aName);
+ if (aFind != myNamingNames.end() && (int)aFind->second.size() > aNumInHistory) {
std::list<TDF_Label>::reverse_iterator aLibIt = aFind->second.rbegin();
for(; aNumInHistory != 0; aNumInHistory--)
aLibIt++;
int aNewVal = transactionID() + 1;
TDataStd_Integer::Set(generalLabel().FindChild(TAG_CURRENT_TRANSACTION), aNewVal);
}
-void Model_Document::decrementTransactionID()
-{
- int aNewVal = transactionID() - 1;
- TDataStd_Integer::Set(generalLabel().FindChild(TAG_CURRENT_TRANSACTION), aNewVal);
-}
TDF_Label Model_Document::extConstructionsLabel() const
{
return myObjs->internalFeature(theIndex);
}
-std::shared_ptr<ModelAPI_Feature> Model_Document::featureById(const int theId)
-{
- return myObjs->featureById(theId);
-}
-
void Model_Document::synchronizeTransactions()
{
Model_Document* aRoot =
aData->setObject(mySelectionFeature);
mySelectionFeature->setDoc(myObjs->owner());
mySelectionFeature->setData(aData);
- std::string aName = id() + "_Part";
+ std::wstring aName = id() + L"_Part";
mySelectionFeature->data()->setName(aName);
mySelectionFeature->setDoc(myObjs->owner());
mySelectionFeature->initAttributes();
TopoDS_Shape anOldShape; // old shape in the pair old shape->theShape in the named shape
TopoDS_Shape aShapeContainer; // old shape of the shape that contains aShape as sub-element
Handle(TNaming_NamedShape) aCandidatInThis, aCandidatContainer;
- TDF_Label aBodyLab = aBodyData->label();
+ TDF_Label aBodyLab = aBodyData->shapeLab();
// use child and this label (the lowest priority)
TDF_ChildIDIterator aNSIter(aBodyLab, TNaming_NamedShape::GetID(), Standard_True);
bool aUseThis = !aNSIter.More();
return myObjs->isLater(theLater, theCurrent);
}
+// Object Browser nodes states
+// LCOV_EXCL_START
void Model_Document::storeNodesState(const std::list<bool>& theStates)
{
TDF_Label aLab = generalLabel().FindChild(TAG_NODES_STATE);
}
}
}
+// LCOV_EXCL_STOP
void Model_Document::eraseAllFeatures()
{
myObjs->eraseAllFeatures();
}
+std::shared_ptr<ModelAPI_Feature> Model_Document::nextFeature(
+ std::shared_ptr<ModelAPI_Feature> theCurrent, const bool theReverse) const
+{
+ if (theCurrent.get() && myObjs) {
+ int anIndex = kUNDEFINED_FEATURE_INDEX;
+ return myObjs->nextFeature(theCurrent, anIndex, theReverse);
+ }
+ return FeaturePtr(); // nothing by default
+}
+
void Model_Document::setExecuteFeatures(const bool theFlag)
{
myExecuteFeatures = theFlag;
{
Transaction anAppended = myTransactions.back();
myTransactions.pop_back();
+ if (!myNestedNum.empty())
+ (*myNestedNum.rbegin())--;
if (!myTransactions.empty()) { // if it is empty, just forget the appended
myTransactions.back().myOCAFNum += anAppended.myOCAFNum;
}
