Aufgeräumter GUI-Code. Klassen wurden in eigene

cpp-Dateien ausgelagert. GUI.hpp wurde implementiert.
Klasseninitialisierung wurde in init.cpp ausgelagert.

CMakeLists.txt

@@ -22,7 +22,7 @@ file(GLOB_RECURSE TESTS test/*.cpp)
 set(LIB_PATH "${CMAKE_SOURCE_DIR}/../library")
 
 include_directories(${LIB_PATH}/include)
-add_executable(GUI ${SOURCES} ${HEADERS} main/main.cpp)
+add_executable(GUI ${SOURCES} ${HEADERS} main/main.cpp src/Statusbar.cpp src/GUI_Window.cpp src/Image.cpp src/GUI.hpp src/init.cpp)
 
 target_link_libraries(GUI ${LIB_PATH}/lib/liblibrary.a)
 

main/main.cpp

@@ -1,199 +1,10 @@
+#include "GUI.hpp"
 
-#include <iostream>
+/** main
-#include <Fl/Fl.H>
+ *  The main function executes the functions of the GUI.
-#include <Fl/Fl_Box.H>
-#include <FL/Fl_Window.H>
-#include <FL/fl_draw.H>
-
-#include "vkvm.hpp"
-
-
-#define window_height 600
-#define window_width 800
-
-//Statusbar**************************************/
-
-/** The class inherits a char *text from the Fl_Box. It also shows the window-resolution and the mouse-position.
- * @param text: A pointer to a char-array, that can contain a text like a status or whatever you want.
- */
-
-class Statusbar : public Fl_Box {
-    char *text;
-public:
-    /** The constructor of Statusbar has to get additional parameters.
-      * @param x: The mouse-position on the x-axis.
-      * @param y: The mouse-position on the y-axis:
-      * @param w: The width of a single pixel,
-      * @param h: The height of a single pixel.
-      */
-    Statusbar (int x, int y, int w, int h, char *text) :
-            Fl_Box(x, y, w, h,text) {
-        this->text = text;
-    };
-    void set_text(char *text) {
-        this->text = text;
-    }
-    //An exampel to show, how the content of the text can be changed.
-    void change_text(){
-        if(text=="status0")
-            set_text("status1");
-        else
-            set_text("status0");
-    }
-    //This function refreshes the statusbar.
-    void refresh_label(){
-        this->label(text);
-    }
-};
-
-
-//My_Window*************************************/
-/** The My_Windows-class generates a window, within the window it recognizes the curretn mouse-position.
- * It also recognizes if a button is pushed on the keyboard or the mouse. Furthermore the class depict the
- * content of the Image-class and provides functions to refresh it.
- * @parame x The mouse-position on the x-axis.
- * @parame y The mouse-position on the y-axis.
- * @parame button The button that was pushed last.
- */
-
-class My_Window : public Fl_Window {
-    int x, y, button;
-
-    /*Function to handle the input*/
-    int handle(int e) {
-        switch (e) {
-            /*Mousebutton*/
-            case FL_PUSH:
-                if (Fl::event_button() == FL_LEFT_MOUSE) {
-                    std::cout << "Mouse:left" << std::endl;
-                } else if (Fl::event_button() == FL_RIGHT_MOUSE) {
-                    std::cout << "Mouse:right" << std::endl;
-                } else {
-                    std::cout << "Mouse:middle" << std::endl;
-                }
-                return 1;
-                /*Mousebutton and movement*/
-            case FL_DRAG:
-                x = Fl::event_x();
-                y = Fl::event_y();
-                std::cout << "Postion X:" << x << " Postion Y:" << y << std::endl;
-                if (Fl::event_button() == FL_LEFT_MOUSE) {
-                    std::cout << "Mouse:left" << std::endl;
-                } else if (Fl::event_button() == FL_RIGHT_MOUSE) {
-                    std::cout << "Mouse:right" << std::endl;
-                } else {
-                    std::cout << "Mouse:middle" << std::endl;
-                }
-                return 1;
-                /*Mousemovement*/
-            case FL_MOVE:
-                x = Fl::event_x();
-                y = Fl::event_y();
-                std::cout << "Postion X:" << x << " Postion Y:" << y << std::endl;
-                return 1;
-                /*keyboardbutton*/
-            case FL_KEYBOARD:
-                button = Fl::event_button();
-                std::cout << "Keyboard:" << (unsigned short) button << " down"<<std::endl;
-                return 1;
-            case FL_KEYUP:
-                button = Fl::event_button();
-                std::cout << "Keyboard:" << (unsigned short) button << " up"<<std::endl;
-                return 1;
-        }
-
-    }
-
-public:
-    My_Window(int x, int y, const char *l) : Fl_Window(x, y, l) {}
-};
-
-
-//Image**************************************/
-/** The Image-class draws the bitmap that it get from the Shared Memory.
- * @param *buf: A pointer to the bitmap, that the image-class has to draw. Three chars are needed to get the RGB-value of a pixel, so the size equals window_height * window_width * 3.
- */
-
-class Image : public Fl_Widget {
-    uchar *buf;
-    //Function to draw a bitmap
-    void draw() {
-        fl_draw_image(buf, x(), y(), w(), h());
-    }
-
-    /** The constructor of the image class, get additional
-      * @param x: The mouse-position on the x-axis.
-      * @param y: The mouse-position on the y-axis:
-      * @param w: The width of a single pixel,
-      * @param h: The height of a single pixel.
-      */
-
-public:
-
-    Image(int x, int y, int w, int h) :
-            Fl_Widget(x, y, w, h, 0) {
-        buf = new uchar[w * h * 3];
-        /*Just an example.*/
-        for (int i = 0; i < h; i++) {
-            for (int j = 0; j < w; j++) {
-                buf[(j + (i * w)) * 3 + 1] = 0xff;
-            }
-        }
-    }
-
-    /*A function to change the colors of the image-class. It reads the colors from the Shared Memory-Class*/
-    void change_color() {
-        for (int i = 0; i < h(); i++) {
-            for (int j = 0; j < w(); j++) {
-                vkvm::Color c = vkvm::getPixel(j,i);
-                buf[(i * w() + j) * 3 + 0] = c.getRed();
-                buf[(i * w() + j) * 3 + 1] = c.getGreen();
-                buf[(i * w() + j) * 3 + 2] = c.getBlue();
-            }
-        }
-    }
-};
-/*Functions to refresh the image.*/
-void refresh_image(void *pointer) {
-    ((Image *) pointer)->redraw();
-    Fl::repeat_timeout(0.5, refresh_image, pointer);//nach 0.5 sec refresh_image(pointer) anrufen. Here pointer ist wie ein Parameter
-}
-
-void change_color(void *pointer) {
-    ((Image *) pointer)->change_color();
-    Fl::repeat_timeout(1, change_color, pointer);
-}
-
-void refresh_statusbar(void *pointer) {
-    ((Statusbar **) pointer)[0]->refresh_label();
-    Fl::repeat_timeout(0.5, refresh_statusbar, pointer);
-}
-
-void change_status(void *pointer) {
-    ((Statusbar **) pointer)[0]->change_text();
-    Fl::repeat_timeout(1, change_status, pointer);
-}
-//main*************************************/
-/**
- * The main function initializes all needed classes and executes the functions.
  */
+ 
 int main(int argc, char **argv) {
-    vkvm::initialize(0);
+    GUI_init();
-
+    GUI_run();
-    My_Window *window = new My_Window(window_width, window_height, "example");
-    Statusbar *status[5];
-    window->begin();
-    Image *image = new Image(0, 30, window_width, window_height - 30);
-    status[0] = new Statusbar(0, 0, 60, 30, "status0");
-    status[1] = new Statusbar(60, 0, 60, 30, "status1");
-    status[2] = new Statusbar(120, 0, 60, 30, "status2");
-    status[3] = new Statusbar(180, 0, 60, 30, "status3");
-    status[4] = new Statusbar(240, 0, 60, 30, "status4");
-    Fl::repeat_timeout(0.5, refresh_image, image);
-    Fl::repeat_timeout(1, change_color, image);
-    Fl::repeat_timeout(0.5, refresh_statusbar, status);
-    Fl::repeat_timeout(1, change_status, status);
-    window->end();
-    window->show(argc, argv);
-    return Fl::run();
 }

src/GUI.hpp

@@ -0,0 +1,39 @@
+#include <iostream>
+#include <Fl/Fl.H>
+#include <Fl/Fl_Box.H>
+#include <FL/Fl_Window.H>
+#include <FL/fl_draw.H>
+#include "vkvm.hpp"
+
+#ifndef GUI_GUI_HPP
+#define GUI_GUI_HPP
+class GUI_Window : public Fl_Window {
+    int x, y, button;
+    int handle(int e);
+public:
+    GUI_Window(int x, int y, const char *l) : Fl_Window(x, y, l)
+}
+
+class Image : public Fl_Widget {
+    uchar *buf;
+public:
+    Image(int x, int y, int w, int h);
+    void refresh_image(void *pointer);
+    void change_color(void *pointer);
+    void refresh_statusbar(void *pointer);
+    void change_status(void *pointer);
+}
+
+class Statusbar : public Fl_Box {
+    char *text;
+public:
+    Statusbar (int x, int y, int w, int h, char *text);
+    void set_text(char *text);
+    void change_text();
+    void refresh_label();
+}
+
+void GUI_init();
+void GUI_run();
+
+#endif //GUI_GUI_HPP

src/GUI_Window.cpp

@@ -0,0 +1,63 @@
+#include "GUI.hpp"
+
+/** GUI_Window
+ * The GUI_Window-class generates a window, within the window it recognizes the curretn mouse-position.
+ * It also recognizes if a button is pushed on the keyboard or the mouse. Furthermore the class depict the
+ * content of the Image-class and provides functions to refresh it.
+ * @param x The mouse-position on the x-axis.
+ * @param y The mouse-position on the y-axis.
+ * @param button The button that was pushed last.
+ */
+
+class GUI_Window : public Fl_Window {
+    int x, y, button;
+
+    /*Function to handle the input*/
+    int handle(int e) {
+        switch (e) {
+            /*Mousebutton*/
+            case FL_PUSH:
+                if (Fl::event_button() == FL_LEFT_MOUSE) {
+                    std::cout << "Mouse:left" << std::endl;
+                } else if (Fl::event_button() == FL_RIGHT_MOUSE) {
+                    std::cout << "Mouse:right" << std::endl;
+                } else {
+                    std::cout << "Mouse:middle" << std::endl;
+                }
+                return 1;
+                /*Mousebutton and movement*/
+            case FL_DRAG:
+                x = Fl::event_x();
+                y = Fl::event_y();
+                std::cout << "Postion X:" << x << " Postion Y:" << y << std::endl;
+                if (Fl::event_button() == FL_LEFT_MOUSE) {
+                    std::cout << "Mouse:left" << std::endl;
+                } else if (Fl::event_button() == FL_RIGHT_MOUSE) {
+                    std::cout << "Mouse:right" << std::endl;
+                } else {
+                    std::cout << "Mouse:middle" << std::endl;
+                }
+                return 1;
+                /*Mousemovement*/
+            case FL_MOVE:
+                x = Fl::event_x();
+                y = Fl::event_y();
+                std::cout << "Postion X:" << x << " Postion Y:" << y << std::endl;
+                return 1;
+                /*keyboardbutton*/
+            case FL_KEYBOARD:
+                button = Fl::event_button();
+                std::cout << "Keyboard:" << (unsigned short) button << " down"<<std::endl;
+                return 1;
+            case FL_KEYUP:
+                button = Fl::event_button();
+                std::cout << "Keyboard:" << (unsigned short) button << " up"<<std::endl;
+                return 1;
+        }
+
+    }
+
+public:
+    GUI_Window(int x, int y, const char *l) : Fl_Window(x, y, l) {}
+};
+

src/Image.cpp

@@ -0,0 +1,66 @@
+#include "GUI.hpp"
+
+/** Image
+ *  The Image-class draws the bitmap that it get from the Shared Memory.
+ *  @param *buf: A pointer to the bitmap, that the image-class has to draw. Three chars are needed to get the RGB-value of a pixel, so the size equals window_height * window_width * 3.
+ */
+
+class Image : public Fl_Widget {
+    uchar *buf;
+    //Function to draw a bitmap
+    void draw() {
+        fl_draw_image(buf, x(), y(), w(), h());
+    }
+
+    /** The constructor of the image class, get additional
+      * @param x: The mouse-position on the x-axis.
+      * @param y: The mouse-position on the y-axis:
+      * @param w: The width of a single pixel,
+      * @param h: The height of a single pixel.
+      */
+
+public:
+
+    Image(int x, int y, int w, int h) :
+    Fl_Widget(x, y, w, h, 0) {
+        buf = new uchar[w * h * 3];
+        /*Just an example.*/
+        for (int i = 0; i < h; i++) {
+            for (int j = 0; j < w; j++) {
+                buf[(j + (i * w)) * 3 + 1] = 0xff;
+            }
+        }
+    }
+
+    /*A function to change the colors of the image-class. It reads the colors from the Shared Memory-Class*/
+    void change_color() {
+        for (int i = 0; i < h(); i++) {
+            for (int j = 0; j < w(); j++) {
+                vkvm::Color c = vkvm::getPixel(j,i);
+                buf[(i * w() + j) * 3 + 0] = c.getRed();
+                buf[(i * w() + j) * 3 + 1] = c.getGreen();
+                buf[(i * w() + j) * 3 + 2] = c.getBlue();
+            }
+        }
+    }
+};
+/*Functions to refresh the image.*/
+void refresh_image(void *pointer) {
+    ((Image *) pointer)->redraw();
+    Fl::repeat_timeout(0.5, refresh_image, pointer);//nach 0.5 sec refresh_image(pointer) anrufen. Here pointer ist wie ein Parameter
+}
+
+void change_color(void *pointer) {
+    ((Image *) pointer)->change_color();
+    Fl::repeat_timeout(1, change_color, pointer);
+}
+
+void refresh_statusbar(void *pointer) {
+    ((Statusbar **) pointer)[0]->refresh_label();
+    Fl::repeat_timeout(0.5, refresh_statusbar, pointer);
+}
+
+void change_status(void *pointer) {
+    ((Statusbar **) pointer)[0]->change_text();
+    Fl::repeat_timeout(1, change_status, pointer);
+}

src/Statusbar.cpp

@@ -0,0 +1,35 @@
+#include "GUI.hpp"
+
+/** Statusbar
+ *  The class inherits a char *text from the Fl_Box. It also shows the window-resolution and the mouse-position.
+ *  @param text: A pointer to a char-array, that can contain a text like a status or whatever you want.
+ */
+
+class Statusbar : public Fl_Box {
+    char *text;
+public:
+    /** The constructor of Statusbar has to get additional parameters.
+      * @param x: The mouse-position on the x-axis.
+      * @param y: The mouse-position on the y-axis:
+      * @param w: The width of a single pixel,
+      * @param h: The height of a single pixel.
+      */
+    Statusbar (int x, int y, int w, int h, char *text) :
+            Fl_Box(x, y, w, h,text) {
+        this->text = text;
+    };
+    void set_text(char *text) {
+        this->text = text;
+    }
+    //An exampel to show, how the content of the text can be changed.
+    void change_text(){
+        if(text=="status0")
+            set_text("status1");
+        else
+            set_text("status0");
+    }
+    //This function refreshes the statusbar.
+    void refresh_label(){
+        this->label(text);
+    }
+};

src/demo.cpp

@@ -1,5 +0,0 @@
-#include "demo.h"
-
-int test() {
-    return 42;
-}

src/demo.h

@@ -1,8 +0,0 @@
-#ifndef SHARED_MEMORY_DEMO_H
-#define SHARED_MEMORY_DEMO_H
-
-
-int test();
-
-
-#endif //SHARED_MEMORY_DEMO_H

src/init.cpp

@@ -0,0 +1,35 @@
+#include "GUI.hpp"
+#define window_height 600
+#define window_width 800
+/** GUI_init
+ *  The GUI_init-function initializes all needed classes for the GUI.
+ */
+void GUI_init() {
+    vkvm::initialize(0);
+    My_Window *window = new My_Window(window_width, window_height, "example");
+    Statusbar *status[5];
+    Image *image = new Image(0, 30, window_width, window_height - 30);
+
+    //Dummy-Values TBD
+    status[0] = new Statusbar(0, 0, 60, 30, "status0");
+    status[1] = new Statusbar(60, 0, 60, 30, "status1");
+    status[2] = new Statusbar(120, 0, 60, 30, "status2");
+    status[3] = new Statusbar(180, 0, 60, 30, "status3");
+    status[4] = new Statusbar(240, 0, 60, 30, "status4");
+
+}
+
+/** GUI_run
+ *  The GUI_run-function starts all functions needed for the GUI.
+ */
+
+void GUI_run() {
+    window->begin();
+    Fl::repeat_timeout(0.5, refresh_image, image);
+    Fl::repeat_timeout(1, change_color, image);
+    Fl::repeat_timeout(0.5, refresh_statusbar, status);
+    Fl::repeat_timeout(1, change_status, status);
+    window->end();
+    window->show(argc, argv);
+    return Fl::run();
+}

test/test_GUI.cpp

@@ -1,6 +1,6 @@
 #include <catch2/catch.hpp>
-#include "../src/demo.h"
+#include "../src/GUI.hpp"
 
-TEST_CASE("Demo test") {
+TEST_CASE("GUI Test") {
     REQUIRE(test() == 42);
 }