- Self-reference bug

- Refactoring/clean-up of code - Dependency tracking of aliased cells - Various resolution errors - Rewriting of ranges when columns/rows are inserted/removed - References to aliases keep their units.
FreeCAD · Mar 4, 2015 · 3743008 · 3743008
1 parent 1b7c0e2
commit 3743008
Show file tree

Hide file tree

Showing 20 changed files with 382 additions and 178 deletions.
diff --git a/src/Mod/Spreadsheet/App/AppSpreadsheet.cpp b/src/Mod/Spreadsheet/App/AppSpreadsheet.cpp
@@ -31,6 +31,7 @@ void SpreadsheetExport initSpreadsheet() {
     (void) Py_InitModule("Spreadsheet", Spreadsheet_methods);   /* mod name, table ptr */
     Base::Console().Log("Loading Spreadsheet module... done\n");
 
+    Spreadsheet::PropertySpreadsheetQuantity::init();
     Spreadsheet::PropertyColumnWidths::init();
     Spreadsheet::PropertyRowHeights::init();
     Spreadsheet::PropertySheet::init();

diff --git a/src/Mod/Spreadsheet/App/Cell.cpp b/src/Mod/Spreadsheet/App/Cell.cpp
@@ -395,8 +395,20 @@ void Cell::setAlias(const std::string &n)
     if (alias != n) {
         PropertySheet::Signaller signaller(*owner);
 
+        owner->revAliasProp.erase(alias);
+
         alias = n;
+
+        // Update owner
+        if (alias != "") {
+            owner->aliasProp[address] = n;
+            owner->revAliasProp[n] = address;
+        }
+        else
+            owner->aliasProp.erase(address);
+
         setUsed(ALIAS_SET, !alias.empty());
+
     }
 }
 
@@ -590,7 +602,7 @@ void Cell::save(Base::Writer &writer) const
 
     writer.Stream() << writer.ind() << "<Cell ";
 
-    writer.Stream() << "address=\"" << addressToString(address) << "\" ";
+    writer.Stream() << "address=\"" << address.toString() << "\" ";
 
     if (isUsed(EXPRESSION_SET)) {
         std::string content;
@@ -663,7 +675,7 @@ bool Cell::isUsed() const
 void Cell::visit(ExpressionVisitor &v)
 {
     if (expression)
-        v.visit(expression);
+        expression->visit(v);
 }
 
 /**

diff --git a/src/Mod/Spreadsheet/App/Cell.h b/src/Mod/Spreadsheet/App/Cell.h
@@ -116,6 +116,8 @@ class SpreadsheetExport Cell {
 
     void visit(ExpressionVisitor & v);
 
+    CellAddress getAddress() const { return address; }
+
     /* Alignment */
     static const int ALIGNMENT_LEFT;
     static const int ALIGNMENT_HCENTER;

diff --git a/src/Mod/Spreadsheet/App/Expression.cpp b/src/Mod/Spreadsheet/App/Expression.cpp
@@ -176,7 +176,7 @@ std::string Path::getPythonAccessor() const
     const Property * prop = getProperty();
 
     if (!prop)
-        throw Exception("Property not found");
+        throw Exception(std::string("Property '") + getPropertyName() + std::string("' not found."));
 
     const DocumentObject * docObj = freecad_dynamic_cast<DocumentObject>(prop->getContainer());
 
@@ -1309,6 +1309,16 @@ Document * Path::getDocument() const
     return doc;
 }
 
+const DocumentObject *Path::getDocumentObject() const
+{
+    const App::Document * doc = getDocument();
+
+    if (!doc)
+        return 0;
+
+    return  getDocumentObject(doc, documentObjectName);
+}
+
 const Property *Path::getProperty() const
 {
     const App::Document * doc = getDocument();
@@ -1346,7 +1356,7 @@ const Property * VariableExpression::getProperty() const
     if (prop)
         return prop;
     else
-        throw Base::Exception("Property not found.");
+        throw Base::Exception(std::string("Property '") + var.getPropertyName() + std::string("' not found."));
 }
 
 /**
@@ -1785,6 +1795,11 @@ Expression *RangeExpression::simplify() const
     return copy();
 }
 
+void RangeExpression::setRange(const Range &r)
+{
+    range = r;
+}
+
 }
 
 /**

diff --git a/src/Mod/Spreadsheet/App/Expression.h b/src/Mod/Spreadsheet/App/Expression.h
@@ -158,6 +158,8 @@ class SpreadsheetExport Path {
 
     App::Document *getDocument() const;
 
+    const App::DocumentObject *getDocumentObject() const;
+
 protected:
 
     const App::DocumentObject *getDocumentObject(const App::Document *doc, const std::string &name) const;
@@ -367,6 +369,8 @@ class SpreadsheetExport RangeExpression : public Expression {
 
     Range getRange() const { return range; }
 
+    void setRange(const Range & r);
+
 protected:
     Range range;
 };

diff --git a/src/Mod/Spreadsheet/App/PropertyColumnWidths.cpp b/src/Mod/Spreadsheet/App/PropertyColumnWidths.cpp
@@ -155,3 +155,14 @@ PyObject *PropertyColumnWidths::getPyObject()
     }
     return Py::new_reference_to(PythonObject);
 }
+
+void PropertyColumnWidths::clear()
+{
+    std::map<int, int>::const_iterator i = begin();
+
+    while (i != end()) {
+        dirty.insert(i->first);
+        ++i;
+    }
+    std::map<int,int>::clear();
+}
diff --git a/src/Mod/Spreadsheet/App/PropertyColumnWidths.h b/src/Mod/Spreadsheet/App/PropertyColumnWidths.h
@@ -35,8 +35,6 @@ class SpreadsheetExport PropertyColumnWidths : public App::Property, std::map<in
 public:
     PropertyColumnWidths();
 
-    PropertyColumnWidths(const PropertyColumnWidths & other);
-
     void setValue() { }
 
     void setValue(int col, int width);
@@ -66,11 +64,15 @@ class SpreadsheetExport PropertyColumnWidths : public App::Property, std::map<in
 
     PyObject *getPyObject(void);
 
+    void clear();
+
     static const int defaultWidth;
     static const int defaultHeaderWidth;
 
 private:
 
+    PropertyColumnWidths(const PropertyColumnWidths & other);
+
     std::set<int> dirty;
 
     Py::Object PythonObject;

diff --git a/src/Mod/Spreadsheet/App/PropertyRowHeights.cpp b/src/Mod/Spreadsheet/App/PropertyRowHeights.cpp
@@ -148,3 +148,14 @@ PyObject *PropertyRowHeights::getPyObject()
     }
     return Py::new_reference_to(PythonObject);
 }
+
+void PropertyRowHeights::clear()
+{
+    std::map<int, int>::const_iterator i = begin();
+
+    while (i != end()) {
+        dirty.insert(i->first);
+        ++i;
+    }
+    std::map<int,int>::clear();
+}
diff --git a/src/Mod/Spreadsheet/App/PropertyRowHeights.h b/src/Mod/Spreadsheet/App/PropertyRowHeights.h
@@ -35,8 +35,6 @@ class SpreadsheetExport PropertyRowHeights : public App::Property, std::map<int,
 public:
     PropertyRowHeights();
 
-    PropertyRowHeights(const PropertyRowHeights & other);
-
     void setValue() { }
 
     void setValue(int row, int height);
@@ -68,8 +66,12 @@ class SpreadsheetExport PropertyRowHeights : public App::Property, std::map<int,
 
     static const int defaultHeight;
 
+    void clear();
+
 private:
 
+    PropertyRowHeights(const PropertyRowHeights & other);
+
     std::set<int> dirty;
 
     Py::Object PythonObject;