Autocommit at 30.05.2022 @ 19:07

2 files changed, 16 insertions, 5 deletions

diff --git a/src/Models/Table.cpp b/src/Models/Table.cpp
index b29b075..2b4eb6c 100644
--- a/src/Models/Table.cpp
+++ b/src/Models/Table.cpp
@@ -6,16 +6,27 @@
 #include <cstring>
 #include <fstream>
 #include <exception>
+#include <stdexcept>
 
-void Table::readFromFile(std::ifstream inFile) {
-	
+unsigned countOfCommas(std::ifstream& file) {
+	unsigned commaCount = 0;
+	while (file.peek() != '\n') {
+		if (file.get() == ',') commaCount++;
+	}
+	return commaCount;
+}
+
+void Table::readFromFile(std::ifstream& inFile) {
+	unsigned commaCount = countOfCommas(inFile);
+	cells = List<List<Cell*>>(commaCount + 1);
 }
 
 Table::Table(const char* filePath) {
 	std::ifstream inFile(filePath);
 	if (inFile.is_open())
-		throw new std::logic_error("Could now open file!");
-	cells = List<List<Cell*>>();
+		throw std::logic_error("Could now open file!");
+	readFromFile(inFile);
+	inFile.close();
 }
 
 Table::Table(unsigned rows, unsigned cols) {
diff --git a/src/Models/Table.h b/src/Models/Table.h
index 4eb4265..ade25d9 100644
--- a/src/Models/Table.h
+++ b/src/Models/Table.h
@@ -7,7 +7,7 @@
 
 class Table {
 	List<List<Cell*>> cells;
-	void readFromFile(std::ifstream inFile);
+	void readFromFile(std::ifstream& inFile);
 
 public:
 	Table(const char* filePath);