plotwindow can load csv files

CMakeLists.txt

@@ -5,7 +5,6 @@ project(Regression)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTOUIC ON)
 set(CMAKE_AUTORCC ON)
 
 set(CMAKE_AUTOUIC_SEARCH_PATHS include/ui)
@@ -18,12 +17,18 @@ file(GLOB_RECURSE source_files
 
 file(GLOB_RECURSE include_files
 	"include/*.hpp"
-	"include/*.ui"
 )
 
+file(GLOB_RECURSE ui_files
+	"include/ui/*.ui"
+)
+
+qt5_wrap_ui(target_ui_files ${ui_files})
+
 add_executable(regression
 	${include_files}
 	${source_files}
+	${target_ui_files}
 )
 
 target_include_directories(regression PRIVATE

include/MainWindow.hpp

@@ -11,9 +11,12 @@ class MainWindow : public QMainWindow
 	Q_OBJECT
 
 public:
-	explicit MainWindow(QWidget* parent = nullptr);
+	explicit MainWindow(char** argv, QWidget* parent = nullptr);
 	~MainWindow();
 
+	int Failed() { return error_code; }
+
 private:
 	Ui::MainWindow* ui;
+	int error_code;
 };

include/PlotWidget.hpp

@@ -0,0 +1,28 @@
+#pragma once
+
+#include <QWidget>
+#include <vector>
+
+namespace Ui {
+	class PlotWidget;
+}
+
+typedef struct {
+	double x, y;
+} DataPoint;
+
+class PlotWidget : public QWidget
+{
+	Q_OBJECT
+
+public:
+	PlotWidget(QWidget* parent = nullptr);
+	~PlotWidget();
+
+	int SetDataSource(const std::string& filename);
+
+private:
+	Ui::PlotWidget* ui;
+
+	std::vector<DataPoint>* data;
+};

include/ui/MainWindow.ui

@@ -11,27 +11,20 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>MainWindow</string>
+   <string>Regression</string>
   </property>
   <widget class="QWidget" name="centralwidget">
-   <widget class="QLabel" name="label">
+   <widget class="PlotWidget" name="plot" native="true">
     <property name="geometry">
      <rect>
-      <x>146</x>
+      <x>-1</x>
-      <y>102</y>
+      <y>-1</y>
-      <width>271</width>
+      <width>801</width>
-      <height>91</height>
+      <height>551</height>
      </rect>
     </property>
-    <property name="font">
+    <property name="autoFillBackground">
-     <font>
+     <bool>false</bool>
-      <pointsize>28</pointsize>
-      <weight>75</weight>
-      <bold>true</bold>
-     </font>
-    </property>
-    <property name="text">
-     <string>TextLabel</string>
     </property>
    </widget>
   </widget>
@@ -41,12 +34,20 @@
      <x>0</x>
      <y>0</y>
      <width>800</width>
-     <height>21</height>
+     <height>26</height>
     </rect>
    </property>
   </widget>
   <widget class="QStatusBar" name="statusbar"/>
  </widget>
+ <customwidgets>
+  <customwidget>
+   <class>PlotWidget</class>
+   <extends>QWidget</extends>
+   <header>PlotWidget.hpp</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
  <resources/>
  <connections/>
 </ui>

include/ui/PlotWidget.ui

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>PlotWidget</class>
+ <widget class="QWidget" name="PlotWidget">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>718</width>
+    <height>572</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <widget class="QTextBrowser" name="tmp_CSVDisplay">
+   <property name="geometry">
+    <rect>
+     <x>35</x>
+     <y>31</y>
+     <width>651</width>
+     <height>511</height>
+    </rect>
+   </property>
+   <property name="html">
+    <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:6.6pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+   </property>
+  </widget>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

src/MainWindow.cpp

@@ -1,11 +1,12 @@
 #include "MainWindow.hpp"
 #include "ui_MainWindow.h"
 
-MainWindow::MainWindow(QWidget* parent) :
+MainWindow::MainWindow(char** argv, QWidget* parent) :
 	QMainWindow(parent), ui(new Ui::MainWindow)
 {
 	ui->setupUi(this);
-	ui->label->setText("Hello, World!");
+
+	error_code = ui->plot->SetDataSource(argv[1]);
 }
 
 MainWindow::~MainWindow()

src/PlotWidget.cpp

@@ -0,0 +1,50 @@
+#include "PlotWidget.hpp"
+#include "ui_PlotWidget.h"
+
+#include <iostream>
+#include <qmessagebox.h>
+
+#include "csv.h"
+
+PlotWidget::PlotWidget(QWidget* parent) :
+	QWidget(parent), ui(new Ui::PlotWidget), data(nullptr)
+{
+	ui->setupUi(this);
+}
+
+PlotWidget::~PlotWidget()
+{
+	delete data;
+	delete ui;
+}
+
+int PlotWidget::SetDataSource(const std::string& filename)
+{
+	try
+	{
+		io::CSVReader<2> reader(filename);
+
+		data = new std::vector<DataPoint>;
+
+		DataPoint dp;
+		while (reader.read_row(dp.x, dp.y))
+			data->push_back(dp);
+	}
+	catch (io::error::base& err)
+	{
+		if (data != nullptr) delete data;
+
+		QMessageBox::critical(this, "Error", err.what());
+		return 1;
+	}
+
+	// TODO: Remove, just for testing the CSV reader
+	QString tmp_string = "<table>";
+	for (DataPoint& dp : *data)
+		tmp_string += QString::asprintf("<tr><td>%f</td><td>%f</td></tr>", dp.x, dp.y);
+	tmp_string += "</table>";
+
+	ui->tmp_CSVDisplay->insertHtml(tmp_string);
+
+	return 0;
+}

src/main.cpp

@@ -25,7 +25,11 @@ int main(int argc, char** argv)
 		return 1;
 	}
 
-	MainWindow window;
+	MainWindow window(argv);
+	int err_code = window.Failed();
+	if (err_code)
+		return err_code;
+
 	window.show();
 
 	return app.exec();