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

Spreadsheet: improve cyclic dependency exception handling

Browse Source
This commit is contained in:
Zheng, Lei
2019-09-29 17:57:23 +08:00
committed by wmayer
parent 2df4fb754b
commit c061a4df7e
3 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -858,15 +858,15 @@ DocumentObjectExecReturn *Sheet::execute(void)
FC_LOG(addr.toString());
recomputeCell(addr);
}
} catch (std::exception&) {
} catch (std::exception &) {
for(auto &v : VertexList) {
Cell * cell = cells.getValue(v.first);
// Mark as erroneous
cellErrors.insert(v.first);
if (cell)
cell->setException("Pending computation due to cyclic dependency");
updateProperty(v.first);
updateAlias(v.first);
if(cell) {
cellErrors.insert(v.first);
cell->setException("Pending computation due to cyclic dependency",true);
cellUpdated(v.first);
}
}
// Try to be more user friendly by finding individual loops
@@ -912,10 +912,10 @@ DocumentObjectExecReturn *Sheet::execute(void)
} catch (std::exception&) {
// Cycle detected; flag all with errors
std::ostringstream ss;
ss << "Cyclic dependency" << std::endl;
ss << "Cyclic dependency";
int count = 0;
for(auto &v : VertexList) {
if(count==20)
if(count++%20 == 0)
ss << std::endl;
else
ss << ", ";
@@ -924,8 +924,10 @@ DocumentObjectExecReturn *Sheet::execute(void)
std::string msg = ss.str();
for(auto &v : VertexList) {
Cell * cell = cells.getValue(v.first);
if (cell)
cell->setException(msg.c_str());
if (cell) {
cell->setException(msg.c_str(),true);
cellUpdated(v.first);
}
}
}
}