kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

App: record transaction on non DocumentObject

Browse Source 
Related #0004265
This commit is contained in:
Zheng, Lei
2020-03-24 07:18:50 +08:00
committed by wwmayer
parent 95a0312275
commit f67d960146
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/App/Document.cpp
View File

@@ -1152,12 +1152,8 @@ void Document::_checkTransaction(DocumentObject* pcDelObj, const Property *What,
const char *name = GetApplication().getActiveTransaction(&tid);
if(name && tid>0) {
bool ignore = false;
if(What) {
auto parent = What->getContainer();
auto parentObj = Base::freecad_dynamic_cast<DocumentObject>(parent);
if(!parentObj || What->testStatus(Property::NoModify))
ignore = true;
}
if(What && What->testStatus(Property::NoModify))
ignore = true;
if(FC_LOG_INSTANCE.isEnabled(FC_LOGLEVEL_LOG)) {
if(What)
FC_LOG((ignore?"ignore":"auto") << " transaction ("

8
src/Gui/Command.cpp
View File

@@ -381,7 +381,13 @@ void Command::invoke(int i, TriggerSource trigger)
if(displayText.empty())
displayText = getName();
}
App::AutoTransaction committer((eType&NoTransaction)?0:displayText.c_str(),true);
// Because Transaction now captures ViewObject changes, auto named
// transaction is disabled here to avoid too many unnecessary transactions.
//
// App::AutoTransaction committer((eType&NoTransaction)?0:displayText.c_str(),true);
App::AutoTransaction committer(0,true);
// Do not query _pcAction since it isn't created necessarily
#ifdef FC_LOGUSERACTION
Base::Console().Log("CmdG: %s\n",sName);