suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Spreadsheet: Issue #2355: Do not recompute the spreadsheet and its dependents unless the change affects the spreadsheet

Browse Source
This commit is contained in:
Ed Martin 2016-01-17 02:48:55 -05:00 committed by wmayer
parent 670eaf04a6
commit d71a12db05
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/Mod/Spreadsheet/App/PropertySheet.cpp
View File

@ -1059,9 +1059,6 @@ void PropertySheet::invalidateDependants(const App::DocumentObject *docObj)
const char * docName = docObj->getDocument()->Label.getValue(); const char * docName = docObj->getDocument()->Label.getValue();
const char * docObjName = docObj->getNameInDocument(); const char * docObjName = docObj->getNameInDocument();
// Touch to force recompute
touch();
// Recompute cells that depend on this cell // Recompute cells that depend on this cell
std::string fullName = std::string(docName) + "#" + std::string(docObjName); std::string fullName = std::string(docName) + "#" + std::string(docObjName);
std::map<std::string, std::set< CellAddress > >::const_iterator i = documentObjectToCellMap.find(fullName); std::map<std::string, std::set< CellAddress > >::const_iterator i = documentObjectToCellMap.find(fullName);
@ -1069,6 +1066,9 @@ void PropertySheet::invalidateDependants(const App::DocumentObject *docObj)
if (i == documentObjectToCellMap.end()) if (i == documentObjectToCellMap.end())
return; return;
// Touch to force recompute
touch();
std::set<CellAddress> s = i->second; std::set<CellAddress> s = i->second;
std::set<CellAddress>::const_iterator j = s.begin(); std::set<CellAddress>::const_iterator j = s.begin();
std::set<CellAddress>::const_iterator end = s.end(); std::set<CellAddress>::const_iterator end = s.end();
@ -1084,12 +1084,12 @@ void PropertySheet::invalidateDependants(const App::DocumentObject *docObj)
void PropertySheet::renamedDocumentObject(const App::DocumentObject * docObj) void PropertySheet::renamedDocumentObject(const App::DocumentObject * docObj)
{ {
// Touch to force recompute
touch();
if (documentObjectName.find(docObj) == documentObjectName.end()) if (documentObjectName.find(docObj) == documentObjectName.end())
return; return;
// Touch to force recompute
touch();
std::map<CellAddress, Cell* >::iterator i = data.begin(); std::map<CellAddress, Cell* >::iterator i = data.begin();
Signaller signaller(*this); Signaller signaller(*this);
@ -1105,11 +1105,10 @@ void PropertySheet::renamedDocumentObject(const App::DocumentObject * docObj)
void PropertySheet::renamedDocument(const App::Document * doc) void PropertySheet::renamedDocument(const App::Document * doc)
{ {
// Touch to force recompute
touch();
if (documentName.find(doc) == documentName.end()) if (documentName.find(doc) == documentName.end())
return; return;
// Touch to force recompute
touch();
std::map<CellAddress, Cell* >::iterator i = data.begin(); std::map<CellAddress, Cell* >::iterator i = data.begin();
@ -1140,8 +1139,6 @@ void PropertySheet::recomputeDependants(const App::DocumentObject *docObj)
const char * docName = docObj->getDocument()->Label.getValue(); const char * docName = docObj->getDocument()->Label.getValue();
const char * docObjName = docObj->getNameInDocument(); const char * docObjName = docObj->getNameInDocument();
// Touch to force recompute
touch();
// Recompute cells that depend on this cell // Recompute cells that depend on this cell
std::string fullName = std::string(docName) + "#" + std::string(docObjName); std::string fullName = std::string(docName) + "#" + std::string(docObjName);
@ -1150,6 +1147,9 @@ void PropertySheet::recomputeDependants(const App::DocumentObject *docObj)
if (i == documentObjectToCellMap.end()) if (i == documentObjectToCellMap.end())
return; return;
// Touch to force recompute
touch();
std::set<CellAddress>::const_iterator j = i->second.begin(); std::set<CellAddress>::const_iterator j = i->second.begin();
std::set<CellAddress>::const_iterator end = i->second.end(); std::set<CellAddress>::const_iterator end = i->second.end();