diff options
| Commit | 7febd01493afa6b5406a8c09ab16eba1d30270a9 (patch) | |
|---|---|---|
| Author | 2022-06-14 09:08:56 +0300 | |
| Committer | 2022-06-14 09:08:56 +0300 | |
| Files | 03935229a0ab78a038b3060af6e2e2dad430f8ec /src | |
| FMI-OOP-P2_Tables-7febd01493afa6b5406a8c09ab16eba1d30270a9.tar FMI-OOP-P2_Tables-7febd01493afa6b5406a8c09ab16eba1d30270a9.tar.gz FMI-OOP-P2_Tables-7febd01493afa6b5406a8c09ab16eba1d30270a9.zip | ||
| Parent | 067612cecd7d91159177b421366476134af0247d (diff) | |
Autocommit at 14.06.2022 @ 09:08
3 files changed, 8 insertions, 1 deletions
| -rw-r--r-- | src/Models/Table.cpp | 6 | ||||
| -rw-r--r-- | src/Models/Table.h | 1 | ||||
| -rw-r--r-- | src/test.table | 2 |
diff --git a/src/Models/Table.cpp b/src/Models/Table.cpp index c8e2cb3..f55e986 100644 --- a/src/Models/Table.cpp +++ b/src/Models/Table.cpp @@ -104,11 +104,15 @@ void Table::readFromFile(std::ifstream& inFile) { cells[row].add((Cell*)new CellInt(buffer.raw_data())); } } + + if (cells[row].get_count() > longestRow) + longestRow = cells[row].get_count(); } } #include <iostream> Table::Table(const char* filePath) { + longestRow = 0; std::ifstream inFile(filePath); if (!inFile.is_open()) throw std::logic_error("Could not open file!"); @@ -130,7 +134,7 @@ unsigned Table::get_rows() const { } unsigned Table::get_cols() const { - return cells[0].get_length(); + return longestRow; } #define abs(a) ((a < 0) ? -a : a) diff --git a/src/Models/Table.h b/src/Models/Table.h index fb778e3..f65cf04 100644 --- a/src/Models/Table.h +++ b/src/Models/Table.h @@ -7,6 +7,7 @@ class Table { List<List<Cell*>> cells; + unsigned longestRow; void readFromFile(std::ifstream& inFile); public: diff --git a/src/test.table b/src/test.table index e69de29..9290552 100644 --- a/src/test.table +++ b/src/test.table @@ -0,0 +1,2 @@ +8.6,3,"String","= 3 * R0C1 + R0C0 ^ R0C1 * 27 / R0C1 - 2 * 2.5 * 2 * 2 + R0C2 ^ R0C2",, +,,,,, |
