#include <ModelAPI_CompositeFeature.h>
#include <ModelAPI_AttributeSelectionList.h>
#include <ModelAPI_Tools.h>
-
+#include <ModelAPI_ResultBody.h>
#include <Events_Loop.h>
-#include <Events_Error.h>
+#include <Events_InfoMessage.h>
#include <TDataStd_Integer.hxx>
#include <TDataStd_Comment.hxx>
#include <TDF_ChildIDIterator.hxx>
#include <TDF_LabelMapHasher.hxx>
#include <TDF_Delta.hxx>
-#include <OSD_File.hxx>
-#include <OSD_Path.hxx>
#include <TDF_AttributeDelta.hxx>
#include <TDF_AttributeDeltaList.hxx>
#include <TDF_ListIteratorOfAttributeDeltaList.hxx>
#include <TDF_ListIteratorOfLabelList.hxx>
+#include <TDF_LabelMap.hxx>
+#include <TDF_DeltaOnAddition.hxx>
+#include <TNaming_Builder.hxx>
+#include <TNaming_SameShapeIterator.hxx>
+#include <TNaming_Iterator.hxx>
+#include <TNaming_NamedShape.hxx>
+#include <TNaming_Tool.hxx>
+
+#include <TopExp_Explorer.hxx>
+#include <TopoDS_Shape.hxx>
+
+#include <OSD_File.hxx>
+#include <OSD_Path.hxx>
+#include <CDF_Session.hxx>
+#include <CDF_Directory.hxx>
#include <climits>
#ifndef WIN32
static const int TAG_GENERAL = 1; // general properties tag
// general sub-labels
-static const int TAG_CURRENT_FEATURE = 1; ///< where the reference to the current feature label is located (or no attribute if null feature)
+/// where the reference to the current feature label is located (or no attribute if null feature)
+static const int TAG_CURRENT_FEATURE = 1; ///< reference to the current feature
static const int TAG_CURRENT_TRANSACTION = 2; ///< integer, index of the transaction
static const int TAG_SELECTION_FEATURE = 3; ///< integer, tag of the selection feature label
+static const int TAG_NODES_STATE = 4; ///< array, tag of the Object Browser nodes states
-Model_Document::Model_Document(const std::string theID, const std::string theKind)
+Model_Document::Model_Document(const int theID, const std::string theKind)
: myID(theID), myKind(theKind), myIsActive(false),
myDoc(new TDocStd_Document("BinOcaf")) // binary OCAF format
{
+#ifdef TINSPECTOR
+ CDF_Session::CurrentSession()->Directory()->Add(myDoc);
+#endif
myObjs = new Model_Objects(myDoc->Main());
- myDoc->SetUndoLimit(UNDO_LIMIT);
+ myDoc->SetUndoLimit(UNDO_LIMIT);
myTransactionSave = 0;
myExecuteFeatures = true;
// to have something in the document and avoid empty doc open/save problem
myObjs->setOwner(theDoc);
}
-/// Returns the file name of this document by the nameof directory and identifuer of a document
-static TCollection_ExtendedString DocFileName(const char* theFileName, const std::string& theID)
+/// Returns the file name of this document by the name of directory and identifier of a document
+static TCollection_ExtendedString DocFileName(const char* theDirName, const std::string& theID)
{
- TCollection_ExtendedString aPath((const Standard_CString) theFileName);
+ TCollection_ExtendedString aPath((const Standard_CString) theDirName);
// remove end-separators
- while(aPath.Length() &&
+ while(aPath.Length() &&
(aPath.Value(aPath.Length()) == '\\' || aPath.Value(aPath.Length()) == '/'))
aPath.Remove(aPath.Length());
aPath += _separator_;
return this == Model_Session::get()->moduleDocument().get();
}
-bool Model_Document::load(const char* theFileName, DocumentPtr theThis)
+bool Model_Document::load(const char* theDirName, const char* theFileName, DocumentPtr theThis)
{
Handle(Model_Application) anApp = Model_Application::getApplication();
if (isRoot()) {
- anApp->setLoadPath(theFileName);
+ anApp->setLoadPath(theDirName);
}
- TCollection_ExtendedString aPath(DocFileName(theFileName, myID));
+ TCollection_ExtendedString aPath(DocFileName(theDirName, theFileName));
PCDM_ReaderStatus aStatus = (PCDM_ReaderStatus) -1;
Handle(TDocStd_Document) aLoaded;
try {
aStatus = anApp->Open(aPath, aLoaded);
} catch (Standard_Failure) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught();
- Events_Error::send(
- std::string("Exception in opening of document: ") + aFail->GetMessageString());
+ Events_InfoMessage("Model_Document",
+ "Exception in opening of document: %1").arg(aFail->GetMessageString()).send();
return false;
}
bool isError = aStatus != PCDM_RS_OK;
if (isError) {
switch (aStatus) {
case PCDM_RS_UnknownDocument:
- Events_Error::send(std::string("Can not open document"));
+ Events_InfoMessage("Model_Document", "Can not open document").send();
break;
case PCDM_RS_AlreadyRetrieved:
- Events_Error::send(std::string("Can not open document: already opened"));
+ Events_InfoMessage("Model_Document", "Can not open document: already opened").send();
break;
case PCDM_RS_AlreadyRetrievedAndModified:
- Events_Error::send(
- std::string("Can not open document: already opened and modified"));
+ Events_InfoMessage("Model_Document",
+ "Can not open document: already opened and modified").send();
break;
case PCDM_RS_NoDriver:
- Events_Error::send(std::string("Can not open document: driver library is not found"));
+ Events_InfoMessage("Model_Document",
+ "Can not open document: driver library is not found").send();
break;
case PCDM_RS_UnknownFileDriver:
- Events_Error::send(std::string("Can not open document: unknown driver for opening"));
+ Events_InfoMessage("Model_Document",
+ "Can not open document: unknown driver for opening").send();
break;
case PCDM_RS_OpenError:
- Events_Error::send(std::string("Can not open document: file open error"));
+ Events_InfoMessage("Model_Document", "Can not open document: file open error").send();
break;
case PCDM_RS_NoVersion:
- Events_Error::send(std::string("Can not open document: invalid version"));
+ Events_InfoMessage("Model_Document", "Can not open document: invalid version").send();
break;
case PCDM_RS_NoModel:
- Events_Error::send(std::string("Can not open document: no data model"));
+ Events_InfoMessage("Model_Document", "Can not open document: no data model").send();
break;
case PCDM_RS_NoDocument:
- Events_Error::send(std::string("Can not open document: no document inside"));
+ Events_InfoMessage("Model_Document", "Can not open document: no document inside").send();
break;
case PCDM_RS_FormatFailure:
- Events_Error::send(std::string("Can not open document: format failure"));
+ Events_InfoMessage("Model_Document", "Can not open document: format failure").send();
break;
case PCDM_RS_TypeNotFoundInSchema:
- Events_Error::send(std::string("Can not open document: invalid object"));
+ Events_InfoMessage("Model_Document", "Can not open document: invalid object").send();
break;
case PCDM_RS_UnrecognizedFileFormat:
- Events_Error::send(std::string("Can not open document: unrecognized file format"));
+ Events_InfoMessage("Model_Document",
+ "Can not open document: unrecognized file format").send();
break;
case PCDM_RS_MakeFailure:
- Events_Error::send(std::string("Can not open document: make failure"));
+ Events_InfoMessage("Model_Document", "Can not open document: make failure").send();
break;
case PCDM_RS_PermissionDenied:
- Events_Error::send(std::string("Can not open document: permission denied"));
+ Events_InfoMessage("Model_Document", "Can not open document: permission denied").send();
break;
case PCDM_RS_DriverFailure:
- Events_Error::send(std::string("Can not open document: driver failure"));
+ Events_InfoMessage("Model_Document", "Can not open document: driver failure").send();
break;
default:
- Events_Error::send(std::string("Can not open document: unknown error"));
+ Events_InfoMessage("Model_Document", "Can not open document: unknown error").send();
break;
}
}
- std::shared_ptr<Model_Session> aSession =
+ std::shared_ptr<Model_Session> aSession =
std::dynamic_pointer_cast<Model_Session>(Model_Session::get());
if (!isError) {
myDoc = aLoaded;
myDoc->SetUndoLimit(UNDO_LIMIT);
+
// to avoid the problem that feature is created in the current, not this, document
- aSession->setActiveDocument(anApp->getDocument(myID), false);
+ aSession->setActiveDocument(anApp->document(myID), false);
aSession->setCheckTransactions(false);
if (myObjs)
delete myObjs;
aSession->setActiveDocument(Model_Session::get()->moduleDocument(), false);
// this is done in Part result "activate", so no needed here. Causes not-blue active part.
// aSession->setActiveDocument(anApp->getDocument(myID), true);
+
+ // make sub-parts as loaded by demand
+ std::list<ResultPtr> aPartResults;
+ myObjs->allResults(ModelAPI_ResultPart::group(), aPartResults);
+ std::list<ResultPtr>::iterator aPartRes = aPartResults.begin();
+ for(; aPartRes != aPartResults.end(); aPartRes++) {
+ ResultPartPtr aPart = std::dynamic_pointer_cast<ModelAPI_ResultPart>(*aPartRes);
+ if (aPart.get())
+ anApp->setLoadByDemand(aPart->data()->name());
+ }
+
} else { // open failed, but new documnet was created to work with it: inform the model
aSession->setActiveDocument(Model_Session::get()->moduleDocument(), false);
- }
+ }
return !isError;
}
-bool Model_Document::save(const char* theFileName, std::list<std::string>& theResults)
+bool Model_Document::save(
+ const char* theDirName, const char* theFileName, std::list<std::string>& theResults)
{
// create a directory in the root document if it is not yet exist
Handle(Model_Application) anApp = Model_Application::getApplication();
if (isRoot()) {
#ifdef WIN32
- CreateDirectory(theFileName, NULL);
+ CreateDirectory(theDirName, NULL);
#else
- mkdir(theFileName, 0x1ff);
+ mkdir(theDirName, 0x1ff);
#endif
}
// filename in the dir is id of document inside of the given directory
- TCollection_ExtendedString aPath(DocFileName(theFileName, myID));
+ TCollection_ExtendedString aPath(DocFileName(theDirName, theFileName));
PCDM_StoreStatus aStatus;
try {
aStatus = anApp->SaveAs(myDoc, aPath);
} catch (Standard_Failure) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught();
- Events_Error::send(
- std::string("Exception in saving of document: ") + aFail->GetMessageString());
+ Events_InfoMessage("Model_Document",
+ "Exception in saving of document: %1").arg(aFail->GetMessageString()).send();
return false;
}
bool isDone = aStatus == PCDM_SS_OK || aStatus == PCDM_SS_No_Obj;
if (!isDone) {
switch (aStatus) {
case PCDM_SS_DriverFailure:
- Events_Error::send(std::string("Can not save document: save driver-library failure"));
+ Events_InfoMessage("Model_Document",
+ "Can not save document: save driver-library failure").send();
break;
case PCDM_SS_WriteFailure:
- Events_Error::send(std::string("Can not save document: file writing failure"));
+ Events_InfoMessage("Model_Document", "Can not save document: file writing failure").send();
break;
case PCDM_SS_Failure:
default:
- Events_Error::send(std::string("Can not save document"));
+ Events_InfoMessage("Model_Document", "Can not save document").send();
break;
}
}
- myTransactionSave = myTransactions.size();
+ myTransactionSave = int(myTransactions.size());
if (isDone) { // save also sub-documents if any
theResults.push_back(TCollection_AsciiString(aPath).ToCString());
- const std::set<std::string> aSubs = subDocuments(false);
- std::set<std::string>::iterator aSubIter = aSubs.begin();
- for (; aSubIter != aSubs.end() && isDone; aSubIter++) {
- if (anApp->isLoadByDemand(*aSubIter)) {
+ // iterate all result parts to find all loaded or not yet loaded documents
+ std::list<ResultPtr> aPartResults;
+ myObjs->allResults(ModelAPI_ResultPart::group(), aPartResults);
+ std::list<ResultPtr>::iterator aPartRes = aPartResults.begin();
+ for(; aPartRes != aPartResults.end(); aPartRes++) {
+ 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 = *aSubIter;
+ std::string aDocName = 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);
if (aFile.Exists()) {
- TCollection_AsciiString aDestinationDir(DocFileName(theFileName, aDocName));
+ TCollection_AsciiString aDestinationDir(DocFileName(theDirName, aDocName));
OSD_Path aDestination(aDestinationDir);
aFile.Copy(aDestination);
theResults.push_back(aDestinationDir.ToCString());
} else {
- Events_Error::send(
- std::string("Can not open file ") + aSubPath.ToCString() + " for saving");
+ Events_InfoMessage("Model_Document",
+ "Can not open file %1 for saving").arg(aSubPath.ToCString()).send();
}
}
} else { // simply save opened document
- isDone = subDoc(*aSubIter)->save(theFileName, theResults);
+ isDone = std::dynamic_pointer_cast<Model_Document>(aPart->partDoc())->
+ save(theDirName, aPart->data()->name().c_str(), theResults);
}
}
}
aPM->setActiveDocument(DocumentPtr());
}
// close all subs
- const std::set<std::string> aSubs = subDocuments(true);
- std::set<std::string>::iterator aSubIter = aSubs.begin();
+ const std::set<int> aSubs = subDocuments();
+ std::set<int>::iterator aSubIter = aSubs.begin();
for (; aSubIter != aSubs.end(); aSubIter++) {
std::shared_ptr<Model_Document> aSub = subDoc(*aSubIter);
if (aSub->myObjs) // if it was not closed before
mySelectionFeature.reset();
} else {
setCurrentFeature(FeaturePtr(), false); // disables all features
+ // update the OB: features are disabled (on remove of Part)
+ Events_Loop* aLoop = Events_Loop::loop();
+ static Events_ID aDeleteEvent = Events_Loop::eventByName(EVENT_OBJECT_DELETED);
+ aLoop->flush(aDeleteEvent);
}
std::static_pointer_cast<Model_Session>(Model_Session::get())->setCheckTransactions(true);
{
incrementTransactionID(); // outside of transaction in order to avoid empty transactions keeping
if (myDoc->HasOpenCommand()) { // start of nested command
- if (myDoc->CommitCommand()) { // commit the current: it will contain all nested after compactification
+ if (myDoc->CommitCommand()) {
+ // commit the current: it will contain all nested after compactification
myTransactions.rbegin()->myOCAFNum++; // if has open command, the list is not empty
}
myNestedNum.push_back(0); // start of nested operation with zero transactions inside yet
(*myNestedNum.rbegin())++;
myRedos.clear();
// new command for all subs
- const std::set<std::string> aSubs = subDocuments(true);
- std::set<std::string>::iterator aSubIter = aSubs.begin();
+ const std::set<int> aSubs = subDocuments();
+ std::set<int>::iterator aSubIter = aSubs.begin();
for (; aSubIter != aSubs.end(); aSubIter++)
subDoc(*aSubIter)->startOperation();
}
}
}
-/// Compares the content ofthe given attributes, returns true if equal.
+/// Compares the content of the given attributes, returns true if equal.
/// This method is used to avoid empty transactions when only "current" is changed
/// to some value and then comes back in this transaction, so, it compares only
/// references and Boolean and Integer Arrays for the current moment.
if (anArr1.IsNull() || anArr2.IsNull())
return false;
if (anArr1->Lower() == anArr2->Lower() && anArr1->Upper() == anArr2->Upper()) {
- for(int a = anArr1->Lower(); a <= anArr1->Upper(); a++)
- if (a != 1 && anArr1->Value(a) != anArr2->Value(a)) // second is for display
+ for(int a = anArr1->Lower(); a <= anArr1->Upper(); a++) {
+ if (a == 1 && // second is for display
+ anArr2->Label().Tag() == 1 && (anArr2->Label().Depth() == 4 ||
+ anArr2->Label().Depth() == 6))
+ continue;
+ if (anArr1->Value(a) != anArr2->Value(a))
return false;
+ }
return true;
}
} else if (Standard_GUID::IsEqual(theAttr1->ID(), TDataStd_IntegerArray::GetID())) {
return false;
}
-/// Returns true if the last transaction is actually empty: modification to te same values
+/// Returns true if the last transaction is actually empty: modification to te same values
/// were performed only
static bool isEmptyTransaction(const Handle(TDocStd_Document)& theDoc) {
Handle(TDF_Delta) aDelta;
if (isEqualContent(anADelta->Attribute(), aCurrentAttr)) {
continue; // attribute is not changed actually
}
- } else if (Standard_GUID::IsEqual(anADelta->Attribute()->ID(), TDataStd_AsciiString::GetID())) {
- continue; // error message is disappeared
+ } else
+ if (Standard_GUID::IsEqual(anADelta->Attribute()->ID(), TDataStd_AsciiString::GetID())) {
+ continue; // error message is disappeared
}
}
}
bool Model_Document::finishOperation()
{
bool isNestedClosed = !myDoc->HasOpenCommand() && !myNestedNum.empty();
- static std::shared_ptr<Model_Session> aSession =
+ static std::shared_ptr<Model_Session> aSession =
std::static_pointer_cast<Model_Session>(Model_Session::get());
+
+ // open transaction if nested is closed to fit inside
+ // all synchronizeBackRefs and flushed consequences
+ if (isNestedClosed) {
+ myDoc->OpenCommand();
+ }
// do it before flashes to enable and recompute nesting features correctly
if (myNestedNum.empty() || (isNestedClosed && myNestedNum.size() == 1)) {
- // if all nested operations are closed, make current the higher level objects (to perform
+ // if all nested operations are closed, make current the higher level objects (to perform
// it in the python scripts correctly): sketch become current after creation ofsub-elements
FeaturePtr aCurrent = currentFeature(false);
CompositeFeaturePtr aMain, aNext = ModelAPI_Tools::compositeOwner(aCurrent);
aLoop->flush(Events_Loop::eventByName(EVENT_OBJECT_UPDATED));
aLoop->flush(Events_Loop::eventByName(EVENT_OBJECT_TO_REDISPLAY));
aLoop->flush(Events_Loop::eventByName(EVENT_OBJECT_DELETED));
+
+ if (isNestedClosed) {
+ if (myDoc->CommitCommand())
+ myTransactions.rbegin()->myOCAFNum++;
+ }
+
// this must be here just after everything is finished but before real transaction stop
// to avoid messages about modifications outside of the transaction
// and to rebuild everything after all updates and creates
// finish for all subs first: to avoid nested finishing and "isOperation" calls problems inside
bool aResult = false;
- const std::set<std::string> aSubs = subDocuments(true);
- std::set<std::string>::iterator aSubIter = aSubs.begin();
+ const std::set<int> aSubs = subDocuments();
+ std::set<int>::iterator aSubIter = aSubs.begin();
for (; aSubIter != aSubs.end(); aSubIter++)
if (subDoc(*aSubIter)->finishOperation())
aResult = true;
// transaction may be empty if this document was created during this transaction (create part)
- if (!myTransactions.empty() && myDoc->CommitCommand()) { // if commit is successfull, just increment counters
+ if (!myTransactions.empty() && myDoc->CommitCommand()) {
+ // if commit is successfull, just increment counters
if (isEmptyTransaction(myDoc)) { // erase this transaction
myDoc->Undo();
myDoc->ClearRedos();
Handle(TDF_Delta) aDelta;
if (isRedo)
aDelta = theDoc->GetRedos().First();
- else
+ else
aDelta = theDoc->GetUndos().Last();
TDF_LabelList aDeltaList;
aDelta->Labels(aDeltaList); // it clears list, so, use new one and then append to the result
}
// add also label of the modified attributes
const TDF_AttributeDeltaList& anAttrs = aDelta->AttributeDeltas();
+ /// named shape evolution also modifies integer on this label: exclude it
+ TDF_LabelMap anExcludedInt;
for (TDF_ListIteratorOfAttributeDeltaList anAttr(anAttrs); anAttr.More(); anAttr.Next()) {
- theDelta.Append(anAttr.Value()->Label());
+ if (anAttr.Value()->Attribute()->ID() == TDataStd_BooleanArray::GetID()) {
+ // Boolean array is used for feature auxiliary attributes only, feature args are not modified
+ continue;
+ }
+ if (anAttr.Value()->Attribute()->ID() == TNaming_NamedShape::GetID()) {
+ anExcludedInt.Add(anAttr.Value()->Label());
+ // named shape evolution is changed in history update => skip them,
+ // they are not the features arguents
+ continue;
+ }
+ if (anAttr.Value()->Attribute()->ID() == TDataStd_Integer::GetID()) {
+ if (anExcludedInt.Contains(anAttr.Value()->Label()))
+ continue;
+ }
+ theDelta.Append(anAttr.Value()->Label());
+ }
+ TDF_ListIteratorOfLabelList aDeltaIter(theDelta);
+ for(; aDeltaIter.More(); aDeltaIter.Next()) {
+ if (anExcludedInt.Contains(aDeltaIter.Value())) {
+ theDelta.Remove(aDeltaIter);
+ if (!aDeltaIter.More())
+ break;
+ }
}
}
if (!myNestedNum.empty())
(*myNestedNum.rbegin())--;
// roll back the needed number of transactions
- // make commit/undo to get the modification delta
//myDoc->AbortCommand();
- if (myDoc->CommitCommand()) {
+ // instead of abort, do commit and undo: to get the delta of modifications
+ if (myDoc->CommitCommand()) {
modifiedLabels(myDoc, aDeltaLabels);
myDoc->Undo();
}
myDoc->ClearRedos();
}
// abort for all subs, flushes will be later, in the end of root abort
- const std::set<std::string> aSubs = subDocuments(true);
- std::set<std::string>::iterator aSubIter = aSubs.begin();
+ const std::set<int> aSubs = subDocuments();
+ std::set<int>::iterator aSubIter = aSubs.begin();
for (; aSubIter != aSubs.end(); aSubIter++)
subDoc(*aSubIter)->abortOperation();
// references may be changed because they are set in attributes on the fly
- myObjs->synchronizeFeatures(aDeltaLabels, true, isRoot());
+ myObjs->synchronizeFeatures(aDeltaLabels, true, false, false, isRoot());
}
bool Model_Document::isOperation() const
{
// issue 406 : if transaction is opened, but nothing to undo behind, can not undo
int aCurrentNum = isOperation() ? 1 : 0;
- if (myDoc->GetAvailableUndos() > 0 &&
- (myNestedNum.empty() || *myNestedNum.rbegin() - aCurrentNum > 0) && // there is something to undo in nested
+ if (myDoc->GetAvailableUndos() > 0 &&
+ // there is something to undo in nested
+ (myNestedNum.empty() || *myNestedNum.rbegin() - aCurrentNum > 0) &&
myTransactions.size() - aCurrentNum > 0 /* for omitting the first useless transaction */)
return true;
// check other subs contains operation that can be undoed
- const std::set<std::string> aSubs = subDocuments(true);
- std::set<std::string>::iterator aSubIter = aSubs.begin();
+ const std::set<int> aSubs = subDocuments();
+ std::set<int>::iterator aSubIter = aSubs.begin();
for (; aSubIter != aSubs.end(); aSubIter++) {
std::shared_ptr<Model_Document> aSub = subDoc(*aSubIter);
if (aSub->myObjs) {// if it was not closed before
void Model_Document::undoInternal(const bool theWithSubs, const bool theSynchronize)
{
+ if (myTransactions.empty())
+ return;
int aNumTransactions = myTransactions.rbegin()->myOCAFNum;
myRedos.push_back(*myTransactions.rbegin());
myTransactions.pop_back();
if (theWithSubs) {
// undo for all subs
- const std::set<std::string> aSubs = subDocuments(true);
- std::set<std::string>::iterator aSubIter = aSubs.begin();
+ const std::set<int> aSubs = subDocuments();
+ std::set<int>::iterator aSubIter = aSubs.begin();
for (; aSubIter != aSubs.end(); aSubIter++) {
if (!subDoc(*aSubIter)->myObjs)
continue;
}
// after undo of all sub-documents to avoid updates on not-modified data (issue 370)
if (theSynchronize) {
- myObjs->synchronizeFeatures(aDeltaLabels, true, isRoot());
+ myObjs->synchronizeFeatures(aDeltaLabels, true, false, false, isRoot());
// update the current features status
setCurrentFeature(currentFeature(false), false);
}
if (!myRedos.empty())
return true;
// check other subs contains operation that can be redoed
- const std::set<std::string> aSubs = subDocuments(true);
- std::set<std::string>::iterator aSubIter = aSubs.begin();
+ const std::set<int> aSubs = subDocuments();
+ std::set<int>::iterator aSubIter = aSubs.begin();
for (; aSubIter != aSubs.end(); aSubIter++) {
if (!subDoc(*aSubIter)->myObjs)
continue;
}
// redo for all subs
- const std::set<std::string> aSubs = subDocuments(true);
- std::set<std::string>::iterator aSubIter = aSubs.begin();
+ const std::set<int> aSubs = subDocuments();
+ std::set<int>::iterator aSubIter = aSubs.begin();
for (; aSubIter != aSubs.end(); aSubIter++)
subDoc(*aSubIter)->redo();
// after redo of all sub-documents to avoid updates on not-modified data (issue 370)
- myObjs->synchronizeFeatures(aDeltaLabels, true, isRoot());
+ myObjs->synchronizeFeatures(aDeltaLabels, true, false, false, isRoot());
// update the current features status
setCurrentFeature(currentFeature(false), false);
}
// the number of skipped current operations (on undo they will be aborted)
int aSkipCurrent = isOperation() ? 1 : 0;
std::list<Transaction>::const_reverse_iterator aTrIter = myTransactions.crbegin();
- int aNumUndo = myTransactions.size();
+ int aNumUndo = int(myTransactions.size());
if (!myNestedNum.empty())
aNumUndo = *myNestedNum.rbegin();
for( ; aNumUndo > 0; aTrIter++, aNumUndo--) {
FeaturePtr Model_Document::addFeature(std::string theID, const bool theMakeCurrent)
{
- std::shared_ptr<Model_Session> aSession =
+ std::shared_ptr<Model_Session> aSession =
std::dynamic_pointer_cast<Model_Session>(ModelAPI_Session::get());
FeaturePtr aFeature = aSession->createFeature(theID, this);
if (!aFeature)
FeaturePtr aCurrent = aDocToAdd->currentFeature(false);
bool isModified = true;
for(CompositeFeaturePtr aComp = std::dynamic_pointer_cast<ModelAPI_CompositeFeature>(aCurrent);
- aComp.get() && isModified;
+ aComp.get() && isModified;
aComp = std::dynamic_pointer_cast<ModelAPI_CompositeFeature>(aCurrent)) {
isModified = false;
int aSubs = aComp->numberOfSubs(false);
myObjs->removeFeature(theFeature);
}
+// recursive function to check if theSub is a child of theMain composite feature
+// through all the hierarchy of parents
+static bool isSub(const CompositeFeaturePtr theMain, const FeaturePtr theSub) {
+ CompositeFeaturePtr aParent = ModelAPI_Tools::compositeOwner(theSub);
+ if (!aParent.get())
+ return false;
+ if (aParent == theMain)
+ return true;
+ return isSub(theMain, aParent);
+}
+
+
void Model_Document::moveFeature(FeaturePtr theMoved, FeaturePtr theAfterThis)
{
+ bool aCurrentUp = theMoved == currentFeature(false);
+ if (aCurrentUp) {
+ setCurrentFeatureUp();
+ }
+ // if user adds after high-level feature with nested,
+ // add it after all nested (otherwise the nested will be disabled)
+ CompositeFeaturePtr aCompositeAfter =
+ std::dynamic_pointer_cast<ModelAPI_CompositeFeature>(theAfterThis);
+ if (aCompositeAfter.get()) {
+ FeaturePtr aSub = aCompositeAfter;
+ do {
+ FeaturePtr aNext = myObjs->nextFeature(aSub);
+ if (!isSub(aCompositeAfter, aNext)) {
+ theAfterThis = aSub;
+ break;
+ }
+ aSub = aNext;
+ } while (aSub.get());
+ }
+
myObjs->moveFeature(theMoved, theAfterThis);
- if (theAfterThis == currentFeature(true))
+ if (aCurrentUp) { // make the moved feature enabled or disabled due to the real status
+ setCurrentFeature(currentFeature(false), false);
+ } else if (theAfterThis == currentFeature(false)) {
+ // must be after move to make enabled all features which are before theMoved
setCurrentFeature(theMoved, true);
+ }
}
void Model_Document::updateHistory(const std::shared_ptr<ModelAPI_Object> theObject)
myObjs->updateHistory(theGroup);
}
-std::shared_ptr<ModelAPI_Document> Model_Document::subDocument(std::string theDocID)
-{
- return Model_Application::getApplication()->getDocument(theDocID);
-}
-
-const std::set<std::string> Model_Document::subDocuments(const bool theActivatedOnly) const
+const std::set<int> Model_Document::subDocuments() const
{
- std::set<std::string> aResult;
+ std::set<int> aResult;
std::list<ResultPtr> aPartResults;
myObjs->allResults(ModelAPI_ResultPart::group(), aPartResults);
std::list<ResultPtr>::iterator aPartRes = aPartResults.begin();
for(; aPartRes != aPartResults.end(); aPartRes++) {
ResultPartPtr aPart = std::dynamic_pointer_cast<ModelAPI_ResultPart>(*aPartRes);
- if (aPart && (!theActivatedOnly || aPart->isActivated())) {
- aResult.insert(aPart->original()->data()->name());
+ if (aPart && aPart->isActivated()) {
+ aResult.insert(aPart->original()->partDoc()->id());
}
}
return aResult;
}
-std::shared_ptr<Model_Document> Model_Document::subDoc(std::string theDocID)
+std::shared_ptr<Model_Document> Model_Document::subDoc(int theDocID)
{
// just store sub-document identifier here to manage it later
return std::dynamic_pointer_cast<Model_Document>(
- Model_Application::getApplication()->getDocument(theDocID));
+ Model_Application::getApplication()->document(theDocID));
}
ObjectPtr Model_Document::object(const std::string& theGroupID, const int theIndex)
int Model_Document::size(const std::string& theGroupID)
{
+ if (myObjs == 0) // may be on close
+ return 0;
return myObjs->size(theGroupID);
}
}
}
- if (theVisible) { // make features below which are not in history also enabled: sketch subs
- FeaturePtr aNext =
+ if (theVisible && !theCurrent.get()) {
+ // needed to avoid disabling of PartSet initial constructions
+ FeaturePtr aNext =
theCurrent.get() ? myObjs->nextFeature(theCurrent) : myObjs->firstFeature();
for (; aNext.get(); aNext = myObjs->nextFeature(theCurrent)) {
if (aNext->isInHistory()) {
} else { // remove reference for the null feature
aRefLab.ForgetAttribute(TDF_Reference::GetID());
}
- // make all features after this feature disabled in reversed order (to remove results without deps)
+ // make all features after this feature disabled in reversed order
+ // (to remove results without deps)
static Events_ID aRedispEvent = aLoop->eventByName(EVENT_OBJECT_TO_REDISPLAY);
- static Events_ID aCreateEvent = Events_Loop::eventByName(EVENT_OBJECT_CREATED);
- static Events_ID aDeleteEvent = aLoop->eventByName(EVENT_OBJECT_DELETED);
bool aPassed = false; // flag that the current object is already passed in cycle
FeaturePtr anIter = myObjs->lastFeature();
bool aWasChanged = false;
+ bool isCurrentParameter = theCurrent.get() && theCurrent->getKind() == "Parameter";
for(; anIter.get(); anIter = myObjs->nextFeature(anIter, true)) {
// check this before passed become enabled: the current feature is enabled!
if (anIter == theCurrent) aPassed = true;
bool aDisabledFlag = !aPassed;
if (aMain.get()) {
- if (aMain->isSub(anIter)) // sub-elements of not-disabled feature are not disabled
+ if (isSub(aMain, anIter)) // sub-elements of not-disabled feature are not disabled
aDisabledFlag = false;
- else if (anOwners.find(anIter) != anOwners.end()) // disable the higher-level feature is the nested is the current
+ else if (anOwners.find(anIter) != anOwners.end())
+ // disable the higher-level feature is the nested is the current
aDisabledFlag = true;
}
- if (anIter->getKind() == "Parameter") {// parameters are always out of the history of features, but not parameters
- if (theCurrent.get() && theCurrent->getKind() != "Parameter")
+ if (anIter->getKind() == "Parameter") {
+ // parameters are always out of the history of features, but not parameters
+ // due to the issue 1491 all parameters are kept enabled any time
+ //if (!isCurrentParameter)
aDisabledFlag = false;
+ } else if (isCurrentParameter) {
+ // if paramater is active, all other features become enabled (issue 1307)
+ aDisabledFlag = false;
}
+
if (anIter->setDisabled(aDisabledFlag)) {
- // state of feature is changed => so feature become updated
static Events_ID anUpdateEvent = aLoop->eventByName(EVENT_OBJECT_UPDATED);
- ModelAPI_EventCreator::get()->sendUpdated(anIter, anUpdateEvent);
+ // state of feature is changed => so inform that it must be updated if it has such state
+ if (!aDisabledFlag &&
+ (anIter->data()->execState() == ModelAPI_StateMustBeUpdated ||
+ anIter->data()->execState() == ModelAPI_StateInvalidArgument))
+ ModelAPI_EventCreator::get()->sendUpdated(anIter, anUpdateEvent);
// flush is in the end of this method
ModelAPI_EventCreator::get()->sendUpdated(anIter, aRedispEvent /*, false*/);
aWasChanged = true;
}
// update for everyone the concealment flag immideately: on edit feature in the midle of history
if (aWasChanged) {
- const std::list<std::shared_ptr<ModelAPI_Result> >& aResList = anIter->results();
- std::list<std::shared_ptr<ModelAPI_Result> >::const_iterator aRes = aResList.begin();
- for(; aRes != aResList.end(); aRes++) {
+ std::list<ResultPtr> aResults;
+ ModelAPI_Tools::allResults(anIter, aResults);
+ std::list<ResultPtr>::const_iterator aRes = aResults.begin();
+ for(; aRes != aResults.end(); aRes++) {
if ((*aRes).get() && (*aRes)->data()->isValid() && !(*aRes)->isDisabled())
std::dynamic_pointer_cast<Model_Data>((*aRes)->data())->updateConcealmentFlag();
}
-
+ // update the concealment status for disply in isConcealed of ResultBody
+ for(aRes = aResults.begin(); aRes != aResults.end(); aRes++) {
+ if ((*aRes).get() && (*aRes)->data()->isValid() && !(*aRes)->isDisabled())
+ (*aRes)->isConcealed();
+ }
}
}
// unblock the flush signals and up them after this
void Model_Document::setCurrentFeatureUp()
{
- // on remove just go up for minimum step: highlight external objects in sketch causes
+ // on remove just go up for minimum step: highlight external objects in sketch causes
// 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);
+ // make the higher level composite as current (sketch becomes disabled if line is enabled)
+ if (aPrev.get()) {
+ FeaturePtr aComp = ModelAPI_Tools::compositeOwner(aPrev);
+ // without cycle (issue 1555): otherwise extrusion fuse
+ // will be enabled and displayed whaen inside sketch
+ if (aComp.get())
+ aPrev = aComp;
+ }
// do not flush: it is called only on remove, it will be flushed in the end of transaction
setCurrentFeature(aPrev, false);
}
return myObjs->createGroup(theFeatureData, theIndex);
}
+std::shared_ptr<ModelAPI_ResultField> Model_Document::createField(
+ const std::shared_ptr<ModelAPI_Data>& theFeatureData, const int theIndex)
+{
+ return myObjs->createField(theFeatureData, theIndex);
+}
+
std::shared_ptr<ModelAPI_ResultParameter> Model_Document::createParameter(
const std::shared_ptr<ModelAPI_Data>& theFeatureData, const int theIndex)
{
myNamingNames[theName] = theLabel;
}
+void Model_Document::changeNamingName(const std::string theOldName, const std::string theNewName)
+{
+ std::map<std::string, TDF_Label>::iterator aFind = myNamingNames.find(theOldName);
+ if (aFind != myNamingNames.end()) {
+ myNamingNames[theNewName] = aFind->second;
+ myNamingNames.erase(theOldName);
+ }
+}
+
TDF_Label Model_Document::findNamingName(std::string theName)
{
std::map<std::string, TDF_Label>::iterator aFind = myNamingNames.find(theName);
- if (aFind == myNamingNames.end())
- return TDF_Label(); // not found
- return aFind->second;
+ if (aFind != myNamingNames.end()) {
+ return aFind->second;
+ }
+ // 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);
+ aFind = myNamingNames.find(anObjName);
+ if (aFind != myNamingNames.end()) {
+ TCollection_ExtendedString aSubName(theName.substr(aSlash + 1).c_str());
+ // searching sub-labels with this name
+ TDF_ChildIDIterator aNamesIter(aFind->second, TDataStd_Name::GetID(), Standard_True);
+ for(; aNamesIter.More(); aNamesIter.Next()) {
+ Handle(TDataStd_Name) aName = Handle(TDataStd_Name)::DownCast(aNamesIter.Value());
+ if (aName->Get() == aSubName)
+ return aName->Label();
+ }
+ // If not found child label with the exact sub-name, then try to find compound with
+ // such sub-name without suffix.
+ Standard_Integer aSuffixPos = aSubName.SearchFromEnd('_');
+ if (aSuffixPos != -1) {
+ TCollection_ExtendedString anIndexStr = aSubName.Split(aSuffixPos);
+ aSubName.Remove(aSuffixPos);
+ aNamesIter.Initialize(aFind->second, TDataStd_Name::GetID(), Standard_True);
+ for(; aNamesIter.More(); aNamesIter.Next()) {
+ Handle(TDataStd_Name) aName = Handle(TDataStd_Name)::DownCast(aNamesIter.Value());
+ if (aName->Get() == aSubName) {
+ return aName->Label();
+ }
+ }
+ }
+ }
+ }
+ return TDF_Label(); // not found
}
ResultPtr Model_Document::findByName(const std::string theName)
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 =
+ Model_Document* aRoot =
std::dynamic_pointer_cast<Model_Document>(ModelAPI_Session::get()->moduleDocument()).get();
if (aRoot == this)
return; // don't need to synchronise root with root
- std::shared_ptr<Model_Session> aSession =
+ std::shared_ptr<Model_Session> aSession =
std::dynamic_pointer_cast<Model_Session>(Model_Session::get());
while(myRedos.size() > aRoot->myRedos.size()) { // remove redos in this
aSession->setCheckTransactions(false);
if (!mySelectionFeature.get() || !mySelectionFeature->data()->isValid()) {
// create a new one
mySelectionFeature = FeaturePtr(new Model_SelectionInPartFeature);
-
+
TDF_Label aFeatureLab = generalLabel().FindChild(TAG_SELECTION_FEATURE);
std::shared_ptr<Model_Data> aData(new Model_Data);
aData->setLabel(aFeatureLab.FindChild(1));
mySelectionFeature->data()->setName(aName);
mySelectionFeature->setDoc(myObjs->owner());
mySelectionFeature->initAttributes();
+ mySelectionFeature->init(); // to make it enabled and Update correctly
+ // this update may cause recomputation of the part after selection on it, that is not needed
+ mySelectionFeature->data()->blockSendAttributeUpdated(true);
}
return mySelectionFeature->selectionList("selection");
}
return myObjs->lastFeature();
return FeaturePtr();
}
+
+static Handle(TNaming_NamedShape) searchForOriginalShape(TopoDS_Shape theShape, TDF_Label aMain) {
+ Handle(TNaming_NamedShape) aResult;
+ while(!theShape.IsNull()) { // searching for the very initial shape that produces this one
+ TopoDS_Shape aShape = theShape;
+ theShape.Nullify();
+ // to avoid crash of TNaming_SameShapeIterator if pure shape does not exists
+ if (!TNaming_Tool::HasLabel(aMain, aShape))
+ break;
+ for(TNaming_SameShapeIterator anIter(aShape, aMain); anIter.More(); anIter.Next()) {
+ TDF_Label aNSLab = anIter.Label();
+ Handle(TNaming_NamedShape) aNS;
+ if (aNSLab.FindAttribute(TNaming_NamedShape::GetID(), aNS)) {
+ for(TNaming_Iterator aShapesIter(aNS); aShapesIter.More(); aShapesIter.Next()) {
+ if (aShapesIter.Evolution() == TNaming_SELECTED ||
+ aShapesIter.Evolution() == TNaming_DELETE)
+ continue; // don't use the selection evolution
+ if (aShapesIter.NewShape().IsSame(aShape)) { // found the original shape
+ aResult = aNS;
+ if (aResult->Evolution() == TNaming_MODIFY)
+ theShape = aShapesIter.OldShape();
+ // otherwise may me searching for another item of this shape with longer history
+ if (!theShape.IsNull())
+ break;
+ }
+ }
+ }
+ }
+ }
+ return aResult;
+}
+
+std::shared_ptr<ModelAPI_Feature> Model_Document::producedByFeature(
+ std::shared_ptr<ModelAPI_Result> theResult,
+ const std::shared_ptr<GeomAPI_Shape>& theShape)
+{
+ ResultBodyPtr aBody = std::dynamic_pointer_cast<ModelAPI_ResultBody>(theResult);
+ if (!aBody.get()) {
+ return feature(theResult); // for not-body just returns the feature that produced this result
+ }
+ // otherwise get the shape and search the very initial label for it
+ TopoDS_Shape aShape = theShape->impl<TopoDS_Shape>();
+ if (aShape.IsNull())
+ return FeaturePtr();
+
+ // for comsolids and compounds all the naming is located in the main object, so, try to use
+ // it first
+ ResultCompSolidPtr aMain = ModelAPI_Tools::compSolidOwner(theResult);
+ if (aMain.get()) {
+ FeaturePtr aMainRes = producedByFeature(aMain, theShape);
+ if (aMainRes)
+ return aMainRes;
+ }
+
+ std::shared_ptr<Model_Data> aBodyData = std::dynamic_pointer_cast<Model_Data>(theResult->data());
+ if (!aBodyData.get() || !aBodyData->isValid())
+ return FeaturePtr();
+
+ TopoDS_Shape anOldShape; // old shape in the pair oldshape->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();
+ // use childs and this label (the lowest priority)
+ TDF_ChildIDIterator aNSIter(aBodyLab, TNaming_NamedShape::GetID(), Standard_True);
+ bool aUseThis = !aNSIter.More();
+ while(anOldShape.IsNull() && (aNSIter.More() || aUseThis)) {
+ Handle(TNaming_NamedShape) aNS;
+ if (aUseThis) {
+ if (!aBodyLab.FindAttribute(TNaming_NamedShape::GetID(), aNS))
+ break;
+ } else {
+ aNS = Handle(TNaming_NamedShape)::DownCast(aNSIter.Value());
+ }
+ for(TNaming_Iterator aShapesIter(aNS); aShapesIter.More(); aShapesIter.Next()) {
+ if (aShapesIter.Evolution() == TNaming_SELECTED || aShapesIter.Evolution() == TNaming_DELETE)
+ continue; // don't use the selection evolution
+ if (aShapesIter.NewShape().IsSame(aShape)) { // found the original shape
+ aCandidatInThis = aNS;
+ if (aCandidatInThis->Evolution() == TNaming_MODIFY)
+ anOldShape = aShapesIter.OldShape();
+ // otherwise may me searching for another item of this shape with longer history
+ if (!anOldShape.IsNull())
+ break;
+ }
+ // check that the shape contains aShape as sub-shape to fill container
+ if (aShapesIter.NewShape().ShapeType() < aShape.ShapeType() && aCandidatContainer.IsNull()) {
+ TopExp_Explorer anExp(aShapesIter.NewShape(), aShape.ShapeType());
+ for(; anExp.More(); anExp.Next()) {
+ if (aShape.IsSame(anExp.Current())) {
+ aCandidatContainer = aNS;
+ aShapeContainer = aShapesIter.NewShape();
+ }
+ }
+ }
+ }
+ // iterate to the next label or to the body label in the end
+ if (!aUseThis)
+ aNSIter.Next();
+ if (!aNSIter.More()) {
+ if (aUseThis)
+ break;
+ aUseThis = true;
+ }
+ }
+ if (aCandidatInThis.IsNull()) {
+ // to fix 1512: searching for original shape of this shape
+ // if modification of it is not in this result
+ aCandidatInThis = searchForOriginalShape(aShape, myDoc->Main());
+ if (aCandidatInThis.IsNull()) {
+ if (aCandidatContainer.IsNull())
+ return FeaturePtr();
+ // with the lower priority use the higher level shape that contains aShape
+ aCandidatInThis = aCandidatContainer;
+ anOldShape = aShapeContainer;
+ } else {
+ // to stop the searching by the following searchForOriginalShape
+ anOldShape.Nullify();
+ }
+ }
+
+ Handle(TNaming_NamedShape) aNS = searchForOriginalShape(anOldShape, myDoc->Main());
+ if (!aNS.IsNull())
+ aCandidatInThis = aNS;
+
+ FeaturePtr aResult;
+ TDF_Label aResultLab = aCandidatInThis->Label();
+ while(aResultLab.Depth() > 3)
+ aResultLab = aResultLab.Father();
+ FeaturePtr aFeature = myObjs->feature(aResultLab);
+ if (aFeature.get()) {
+ if (!aResult.get() || myObjs->isLater(aResult, aFeature)) {
+ aResult = aFeature;
+ }
+ }
+ return aResult;
+}
+
+bool Model_Document::isLater(FeaturePtr theLater, FeaturePtr theCurrent) const
+{
+ return myObjs->isLater(theLater, theCurrent);
+}
+
+void Model_Document::storeNodesState(const std::list<bool>& theStates)
+{
+ TDF_Label aLab = generalLabel().FindChild(TAG_NODES_STATE);
+ aLab.ForgetAllAttributes();
+ if (!theStates.empty()) {
+ Handle(TDataStd_BooleanArray) anArray =
+ TDataStd_BooleanArray::Set(aLab, 0, int(theStates.size()) - 1);
+ std::list<bool>::const_iterator aState = theStates.begin();
+ for(int anIndex = 0; aState != theStates.end(); aState++, anIndex++) {
+ anArray->SetValue(anIndex, *aState);
+ }
+ }
+}
+
+void Model_Document::restoreNodesState(std::list<bool>& theStates) const
+{
+ TDF_Label aLab = generalLabel().FindChild(TAG_NODES_STATE);
+ Handle(TDataStd_BooleanArray) anArray;
+ if (aLab.FindAttribute(TDataStd_BooleanArray::GetID(), anArray)) {
+ int anUpper = anArray->Upper();
+ for(int anIndex = 0; anIndex <= anUpper; anIndex++) {
+ theStates.push_back(anArray->Value(anIndex) == Standard_True);
+ }
+ }
+}