Add files via upload

Author: spectralcode

src/buttonquerywidget.cpp

@@ -34,10 +34,10 @@ ButtonQueryWidget::ButtonQueryWidget(QWidget *parent) : QueryWidget(parent) {
 	this->button = new QPushButton(this);
     //this->button->setFixedWidth(75);
 	this->button->setFixedHeight(23);
-	//this->layout = new QHBoxLayout(this);
-	//this->layout->setMargin(1);
-	//this->layout->addWidget(this->button);;
-    //this->layout->setMargin(1);
+    this->layout = new QHBoxLayout(this);
+    this->layout->setMargin(1);
+    this->layout->addWidget(this->button);;
+    this->layout->setMargin(1);
 	connect(this->button, &QPushButton::clicked, this, &ButtonQueryWidget::sendQuery);
 }
 

src/consolewidget.cpp

@@ -0,0 +1,56 @@
+/***************************************************************************
+**                                                                        **
+**  This file is part of FDMLControl.                                     **
+**  FDMLControl enables the control of the Optores FDML laser via a       **
+**  serial connection.                                                    **
+**  Copyright (C) 2019 Miroslav Zabic                                     **
+**                                                                        **
+**  FDMLControl is free software: you can redistribute it and/or modify   **
+**  it under the terms of the GNU General Public License as published by  **
+**  the Free Software Foundation, either version 3 of the License, or     **
+**  (at your option) any later version.                                   **
+**                                                                        **
+**  This program is distributed in the hope that it will be useful,       **
+**  but WITHOUT ANY WARRANTY; without even the implied warranty of        **
+**  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         **
+**  GNU General Public License for more details.                          **
+**                                                                        **
+**  You should have received a copy of the GNU General Public License     **
+**  along with this program. If not, see http://www.gnu.org/licenses/.    **
+**                                                                        **
+****************************************************************************
+**          Author:     Miroslav Zabic                                    **
+**          Contact:    zabic                                             **
+**                      at                                                **
+**                      iqo.uni-hannover.de                               **
+**                                                                        **
+**          Date:       12 June 2019                                      **
+**          Version:    1.0.0                                             **
+****************************************************************************/
+
+#include "consolewidget.h"
+
+ConsoleWidget::ConsoleWidget(QWidget *parent)
+	: QueryWidget(parent)
+{
+	ui.setupUi(this);
+	connect(this->ui.lineEdit, &QLineEdit::returnPressed, this, &ConsoleWidget::slot_commandSent);
+	connect(this->ui.pushButton_send, &QPushButton::clicked, this, &ConsoleWidget::slot_commandSent);
+}
+
+ConsoleWidget::~ConsoleWidget()
+{
+}
+
+void ConsoleWidget::slot_commandSent() {
+	QString command = this->ui.lineEdit->text();
+	emit query(this, command);
+}
+
+void ConsoleWidget::slot_addText(QString text) {
+	this->ui.plainTextEdit->appendPlainText(text);
+}
+
+void ConsoleWidget::handleResponse(QString initialQuery, QString response) {
+	this->slot_addText(initialQuery.remove(QRegExp("[\\r\\n]")) + "> " + response.remove(QRegExp("[\\r\\n]")));
+}

src/fdmlcontrol.cpp

@@ -88,15 +88,15 @@ void FDMLControl::initQueryWidgets(){
 	auto comboBoxWidgets = this->widgetManager->getComboBoxWidgets();
 
 	auto buttonLayout = new QHBoxLayout(this);
-	buttonLayout->setContentsMargins(1, 3, 1, 3);
-	buttonLayout->setSpacing(0);
+    buttonLayout->setContentsMargins(1, 3, 1, 3);
+    buttonLayout->setSpacing(1);
 	this->ui.groupBox_commands->setLayout(buttonLayout);
     this->ui.groupBox_commands->setFixedHeight(55);
-	buttonLayout->addSpacing(10);
 	for (int i = 0; i < buttonWidgets.size(); i++) {
 		buttonLayout->addWidget(buttonWidgets.at(i));
 		connect(buttonWidgets.at(i), &QueryWidget::query, this->queryManager, &QueryManager::receiveQuery, Qt::QueuedConnection);
 	}
+    buttonLayout->addStretch();
 
 	//Init IntVlaueWidgets and scroll area
     auto scrollAreaLayout = new QVBoxLayout(this->ui.scrollAreaWidgetContents);

src/main.cpp

@@ -41,8 +41,8 @@ void style(){
     dark.setColor(QPalette::Button,QColor(50, 50, 50));
     dark.setColor(QPalette::Base, QColor(25, 25, 25));
     dark.setColor(QPalette::AlternateBase, QColor(50, 50, 50));
-    dark.setColor(QPalette::ToolTipBase, QColor(255, 255, 255));
-    dark.setColor(QPalette::ToolTipText, QColor(255, 255, 255));
+    dark.setColor(QPalette::ToolTipBase, QColor(200, 200, 200));
+    dark.setColor(QPalette::ToolTipText, QColor(50, 50, 50));
     dark.setColor(QPalette::ButtonText, QColor(255, 255, 255));
     dark.setColor(QPalette::BrightText, QColor(255, 0, 0));
     dark.setColor(QPalette::Link, QColor(40, 130, 220));