image panel now shows an image, added mantises for testing

color_editor.pro

@@ -1,17 +1,19 @@
 TEMPLATE = app
 
-QT = core widgets gui
+QT += widgets
 
-INCLUDEPATH = src/
+INCLUDEPATH += src/
 
-SOURCES = src/main.cpp \
-		  src/editor/mainwindow.cpp \
-		  src/editor/image/imagepanel.cpp \
-		  src/editor/tools/toolpanel.cpp
+SOURCES += src/main.cpp \
+		   src/editor/mainwindow.cpp \
+		   src/editor/image/imagepanel.cpp \
+		   src/editor/image/imagearea.cpp \
+		   src/editor/tools/toolpanel.cpp
 
-HEADERS = src/editor/mainwindow.cpp \
-		  src/editor/image/imagepanel.cpp \
-		  src/editor/tools/toolpanel.cpp
+HEADERS += src/editor/mainwindow.hpp \
+		   src/editor/image/imagepanel.hpp \
+		   src/editor/image/imagearea.hpp \
+		   src/editor/tools/toolpanel.hpp
 
 TARGET = color_editor.exe
 DESTDIR = build

src/editor/image/imagearea.cpp

@@ -0,0 +1,39 @@
+#include "./imagearea.hpp"
+
+#include <QPainter>
+#include <QTextStream>
+
+namespace editor{
+namespace image {
+
+QTextStream out3(stdout);
+
+image_area::image_area(QWidget* parent) : QWidget(parent) {
+
+}
+
+void image_area::load_image(QString filename) {
+	out3 << "loading" << Qt::endl;
+	if(img.load(filename))
+		out3 << "loaded" << Qt::endl;
+	else
+		out3 << "failed" << Qt::endl;
+
+}
+
+QSize image_area::sizeHint() const {
+	out3 << "sizehint" << Qt::endl;
+	return img.size();
+}
+
+void image_area::paintEvent(QPaintEvent *) {
+// 	out3 << "paitevent" << Qt::endl;
+	QPainter painter(this);
+	painter.drawImage(img.rect(), img);
+}
+
+
+
+} // image
+} // editor
+

src/editor/image/imagearea.hpp

@@ -0,0 +1,30 @@
+#pragma once
+
+#include <QWidget>
+#include <QPaintEvent>
+#include <QImage>
+
+namespace editor{
+namespace image {
+
+class image_area : public QWidget {
+	Q_OBJECT
+
+public:
+	image_area(QWidget* parent);
+
+	void load_image(QString filename);
+
+	QSize sizeHint() const override;
+
+protected:
+	void paintEvent(QPaintEvent *) override;
+
+private:
+	QImage img;
+
+}; // image_panel
+
+} // image
+} // editor
+

src/editor/image/imagepanel.cpp

@@ -1 +1,25 @@
 #include "./imagepanel.hpp"
+
+#include <QVBoxLayout>
+#include <QLabel>
+#include <QPixmap>
+
+#include <QTextStream>
+
+namespace editor{
+namespace image {
+
+QTextStream out2(stdout);
+
+image_panel::image_panel(QWidget* parent) : QWidget(parent) {
+	img_area = new image_area(this);
+	img_area->load_image("../data/mantis300.jpg");
+
+	QVBoxLayout *vbox = new QVBoxLayout;
+	vbox->addWidget(img_area);
+	setLayout(vbox);
+}
+
+
+} // image
+} // editor

src/editor/image/imagepanel.hpp

@@ -1,12 +1,23 @@
 #pragma once
 
+#include "./imagearea.hpp"
+
 #include <QWidget>
+#include <QString>
 
-namespace editor::image {
+namespace editor{
+namespace image {
 
 class image_panel : public QWidget {
+	Q_OBJECT
+
+public:
+	image_panel(QWidget* parent);
+
+private:
+	image_area *img_area;
 
 }; // image_panel
 
-} // editor::image
-
+} // image
+} // editor

src/editor/mainwindow.cpp

@@ -1 +1,28 @@
 #include "./mainwindow.hpp"
+#include "image/imagepanel.hpp"
+#include "tools/toolpanel.hpp"
+
+#include <QGridLayout>
+
+#include <QTextStream>
+QTextStream out1(stdout);
+
+editor::main_window::main_window() {
+	setWindowTitle("color editor");
+
+	// initialization
+	image_pan = new editor::image::image_panel(this);
+	//image_pan->load_image("../data/mantis300.jpg");
+	color_pan = new editor::tools::tool_panel(this, editor::tools::color);
+	select_pan = new editor::tools::tool_panel(this, editor::tools::select);
+
+	// connections
+
+
+	// layout stuff
+	QGridLayout *grid = new QGridLayout;
+	grid->addWidget(image_pan, 0, 0, 2, 1);
+	grid->addWidget(color_pan, 1, 0);
+	grid->addWidget(select_pan, 1, 1);
+	setLayout(grid);
+}

src/editor/mainwindow.hpp

@@ -2,11 +2,19 @@
 
 #include "image/imagepanel.hpp"
 #include "tools/toolpanel.hpp"
-#include <QMainWindow>
+#include <QWidget>
 
 namespace editor {
 
-class main_window : public QMainWindow {
+class main_window : public QWidget {
+	Q_OBJECT
+
+public:
+	main_window();
+
+ 	image::image_panel *image_pan;
+	tools::tool_panel *color_pan;
+	tools::tool_panel *select_pan;
 
 }; // window
 

src/editor/tools/toolpanel.cpp

@@ -1 +1,7 @@
 #include "./toolpanel.hpp"
+
+editor::tools::tool_panel::tool_panel(QWidget *parent, tool_type type) 
+: QWidget(parent) {
+	if (type == editor::tools::select)
+		return;
+}

src/editor/tools/toolpanel.hpp

@@ -4,9 +4,13 @@
 
 namespace editor::tools {
 
+enum tool_type {color, select};
+
 class tool_panel : public QWidget {
+	Q_OBJECT
 
+public:
+	tool_panel(QWidget *parent, tool_type type);
 }; // tool_panel
 
 } // editor::image
-

src/main.cpp

@@ -5,7 +5,6 @@ int main(int argc, char **argv) {
 	QApplication app(argc, argv);
 
 	editor::main_window window;
-	window.setWindowTitle("color editor");
 	window.show();
 
 	return app.exec();