Website Summary Files Commits Branches @commit @diff @stats
path: root / src / Models
diff options
context:
space:
mode:
Commit1fd0d30ddf42f821b7b22c88af9ac576e05d420a (patch)
Author
 Syndamia <kamen@syndamia.com>
2022-05-28 18:49:34 +0300
Committer
 Syndamia <kamen@syndamia.com>
2022-05-28 18:49:34 +0300
Files10b1f2b4eff369941d203b0ebaf8dc070db95399 /src/Models
FMI-OOP-P2_Tables-1fd0d30ddf42f821b7b22c88af9ac576e05d420a.tar
FMI-OOP-P2_Tables-1fd0d30ddf42f821b7b22c88af9ac576e05d420a.tar.gz
FMI-OOP-P2_Tables-1fd0d30ddf42f821b7b22c88af9ac576e05d420a.zip
Parentfe20ad7968a7c4d51ffd4d46d7905a59867032a7 (diff)
Autocommit at 28.05.2022 @ 18:49
3 files changed, 9 insertions, 2 deletions
-rw-r--r--src/Models/CellFormula.cpp4
-rw-r--r--src/Models/Table.cpp5
-rw-r--r--src/Models/Table.h2
diff --git a/src/Models/CellFormula.cpp b/src/Models/CellFormula.cpp
index 21de3ec..d1c7c90 100644
--- a/src/Models/CellFormula.cpp
+++ b/src/Models/CellFormula.cpp
@@ -14,7 +14,9 @@ double CellFormula::calculate(unsigned index) {
case minus: return lval - calculate(index++);
case mult: return lval * calculate(index++);
case div: return lval / calculate(index++);
- default: return lval;
+ case pow:
+ case none:
+ default: return lval;
}
}
diff --git a/src/Models/Table.cpp b/src/Models/Table.cpp
index af72875..5840a6e 100644
--- a/src/Models/Table.cpp
+++ b/src/Models/Table.cpp
@@ -34,3 +34,8 @@ void Table::putCell(unsigned row, unsigned col, const char* rawValue) {
cells[row][col] = newCell;
}
+
+String Table::getAllCells() const {
+ //TODO
+ return String();
+}
diff --git a/src/Models/Table.h b/src/Models/Table.h
index 9fea34a..1554905 100644
--- a/src/Models/Table.h
+++ b/src/Models/Table.h
@@ -12,7 +12,7 @@ public:
Table(unsigned rows, unsigned cols);
void putCell(unsigned row, unsigned col, const char* rawValue);
- String getAllCells();
+ String getAllCells() const;
};
#endif