Implemented framework for GUI

Author: JoshTheLion

CMakeLists.txt

@@ -40,7 +40,10 @@ set(tui_src
 # EDIT
 # add source for any GUI modules here
 set(gui_src
-  )
+  notebook_app.hpp notebook_app.cpp
+  input_widget.hpp input_widget.cpp
+  output_widget.hpp output_widget.cpp
+)
 
 # EDIT
 # add source for any GUI tests here

input_widget.cpp

@@ -0,0 +1,36 @@
+#include "input_widget.hpp"
+
+#include <QWidget>
+#include <QDebug>
+#include <QLineEdit>
+
+// public:
+InputWidget::InputWidget(QWidget * parent): QPlainTextEdit(parent){
+	
+	//inputExp = new QLineEdit();
+    //inputExp = new QLineEdit();
+    //inputExp->setParent(parent);
+	//QObject::connect();
+	
+	// Evaluate
+}
+/*	
+QString InputWidget::getUserText(){
+	return inputExp;
+}
+
+Expression InputWidget::getEvalResult(){
+	return result;
+}
+
+//private slots:
+void InputWidget::textChanged(std::string s){
+	qDebug() << s;
+	inputExp = s;
+}
+*/
+void InputWidget::keyPressEvent(QKeyEvent * event){
+	// Stub
+}
+
+

input_widget.hpp

@@ -0,0 +1,42 @@
+#ifndef INPUT_WIDGET_H
+#define INPUT_WIDGET_H
+
+#include <QPlainTextEdit>
+#include <QLineEdit>
+#include <QWidget>
+#include <QDebug>
+#include <QKeyEvent>
+
+#include <QString>
+#include <string>
+
+class InputWidget: public QPlainTextEdit
+{
+Q_OBJECT // Necessary macro in class definition
+
+public:
+	InputWidget(QWidget * parent = nullptr);
+	
+	//std::string getUserText();
+    //QString getUserText();
+	//Expression getEvalResult();
+
+//public slots:
+
+private slots:
+	//void textChanged(QString text);
+
+signals:
+  // When the shift+enter keys are pushed, the text is put into the stream
+    void textChanged(QString text);
+	
+private:
+	//QLineEdit * value;
+	//std::string inputExp;
+    QString inputExp;
+    //QLineEdit * inputExp;
+	void keyPressEvent(QKeyEvent *event);
+//signals: // Neither public nor private
+	//Expression * result; // Send result to OutputWidget
+};
+#endif // INPUT_WIDGET_H

notebook.cpp

@@ -1,11 +1,13 @@
 #include <QApplication>
 #include <QWidget>
 
+#include "notebook_app.hpp"
+
 int main(int argc, char *argv[])
 {
   QApplication app(argc, argv);
 
-  QWidget widget;
+  NotebookApp widget;
 
   widget.show();
 

notebook_app.cpp

@@ -0,0 +1,27 @@
+#include "notebook_app.hpp"
+
+//#include <InputWidget>
+//#include <OutputWidget>
+
+//#include <QLayout>
+//#include <QDebug>
+
+NotebookApp::NotebookApp(QWidget * parent): QWidget(parent){
+	
+	input = new InputWidget();
+	input->setParent(parent);
+    
+	output = new OutputWidget();
+	output->setParent(parent);
+    
+    QObject::connect(input, SIGNAL(textChanged(QString)),
+      output, SLOT(showResult(QString)));
+	
+    auto layout = new QGridLayout();
+	
+	// layout->addWidget(widget, row, column)
+	layout->addWidget(input, 0, 0);
+	layout->addWidget(output, 1, 0);
+	
+	setLayout(layout);
+}

notebook_app.hpp

@@ -0,0 +1,31 @@
+#ifndef NOTEBOOK_APP_H
+#define NOTEBOOK_APP_H
+
+#include <QWidget> 
+#include <QLayout>  
+#include <QDebug>	
+
+#include"input_widget.hpp" 
+#include"output_widget.hpp"
+
+class NotebookApp: public QWidget	// Extends QObject base class
+{
+Q_OBJECT // Necessary macro first line of class definition
+
+public:
+	NotebookApp(QWidget * parent = nullptr);
+
+//public slots:
+
+private slots:
+	// Keypress in the input widget has occurred
+	//void plotScriptUpdated(std::string input);
+	
+private:
+	InputWidget * input;
+	OutputWidget * output;
+	
+//signals: // Neither public nor private
+	
+};
+#endif // NOTEBOOK_APP_H

output_widget.cpp

@@ -0,0 +1,44 @@
+#include "output_widget.hpp"
+
+//#include <QGraphicsView>
+//#include <QGraphicsScene>
+//#include <QLineEdit>
+//#include <QDebug>
+#include <QWidget>
+#include <QDebug>
+#include <QLayout>
+
+
+// public:
+OutputWidget::OutputWidget(QWidget * parent){
+	
+	image = new QGraphicsView;
+	//QObject::connect();
+	
+	
+	display = new QGraphicsScene;
+	//QObject::connect();
+	
+	// Display
+    auto layout = new QGridLayout();
+    // layout->addWidget(widget, row, column)
+    layout->addWidget(image, 0, 0);
+
+    setLayout(layout);
+}
+
+//public slots:
+void OutputWidget::showResult(QString res){
+  //qDebug() << "Hello World!";
+  qDebug() << res;
+  result = res;
+  
+}
+/*
+void OutputWidget::resultEvaluated(Expression res){
+	qDebug() << s;
+	inputExp = s;
+    qDebug() << "Hello World!";
+}
+*/
+

output_widget.hpp

@@ -0,0 +1,37 @@
+#ifndef OUTPUT_WIDGET_H
+#define OUTPUT_WIDGET_H
+
+#include <QWidget>
+#include <QGraphicsView>
+#include <QGraphicsScene>
+#include <QGraphicsLayout>
+#include <QLayout>
+#include <QBoxLayout>
+
+//class GraphicsView;
+//class GraphicsScene;
+
+class OutputWidget: public QWidget	// Extends QWidget base class
+{
+Q_OBJECT // Necessary macro in class definition
+
+public:
+	OutputWidget(QWidget * parent = nullptr);
+	
+public slots:
+	//void resultEvaluated(Expression res); // Catch the result of evaluating input
+	void showResult(QString res);
+
+//private slots:
+	
+private:
+	QGraphicsView * image;
+	QGraphicsScene * display;
+	
+    QString result;
+    //std::string result;
+	
+//signals: // Neither public nor private
+	
+};
+#endif // OUTPUT_WIDGET_H