Subversion Repositories Code-Repo

Compare Revisions

Ignore whitespace Rev 355 → Rev 356

/Misc Projects/PcMarlinInterface/TextIOWidget.cpp
File deleted
/Misc Projects/PcMarlinInterface/TextIOWidget.h
File deleted
/Misc Projects/PcMarlinInterface/MainWindow.cpp
24,16 → 24,16
connect(serialInitWidget, SIGNAL(UpdateStatus(QString)), this, SLOT(UpdateSerialStatus(QString)));
 
// Initialize data widget
textIOWidget = new TextIOWidget();
serialIOWidget = new SerialIOWidget();
groupSerialData = new QGroupBox("Data");
QGridLayout *serialDataLayout = new QGridLayout();
serialDataLayout->setContentsMargins(0, 0, 0, 0);
serialDataLayout->addWidget(textIOWidget);
serialDataLayout->addWidget(serialIOWidget);
groupSerialData->setLayout(serialDataLayout);
connect(serialInitWidget, SIGNAL(Serial_ReceivedByte(char)), textIOWidget, SLOT(Serial_ReceivedByte(char)));
connect(serialInitWidget, SIGNAL(Serial_Connected()), textIOWidget, SLOT(Serial_EnableTransmit()));
connect(serialInitWidget, SIGNAL(Serial_Disconnected()), textIOWidget, SLOT(Serial_DisableTransmit()));
connect(textIOWidget, SIGNAL(Serial_TransmitByteArray(QByteArray)), serialInitWidget, SIGNAL(Serial_TransmitByteArray(QByteArray)));
connect(serialInitWidget, SIGNAL(Serial_ReceivedByte(char)), serialIOWidget, SLOT(Serial_ReceivedByte(char)));
connect(serialInitWidget, SIGNAL(Serial_Connected()), serialIOWidget, SLOT(Serial_EnableTransmit()));
connect(serialInitWidget, SIGNAL(Serial_Disconnected()), serialIOWidget, SLOT(Serial_DisableTransmit()));
connect(serialIOWidget, SIGNAL(Serial_TransmitByteArray(QByteArray)), serialInitWidget, SIGNAL(Serial_TransmitByteArray(QByteArray)));
 
// Initialize macro widget
macroDockWidget = new QDockWidget("Macro Controller", this);
42,7 → 42,7
macroDockWidget->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
macroDockWidget->hide();
addDockWidget(Qt::RightDockWidgetArea, macroDockWidget);
connect(macroWidget, SIGNAL(Macro_TransmitText(QByteArray)), textIOWidget, SLOT(Serial_PrepareTransmit(QByteArray)));
connect(macroWidget, SIGNAL(Macro_TransmitText(QByteArray)), serialIOWidget, SLOT(Serial_PrepareTransmit(QByteArray)));
connect(serialInitWidget, SIGNAL(Serial_Connected()), macroWidget, SLOT(Macro_EnableTransmit()));
connect(serialInitWidget, SIGNAL(Serial_Disconnected()), macroWidget, SLOT(Macro_DisableTransmit()));
 
/Misc Projects/PcMarlinInterface/MainWindow.h
4,7 → 4,7
#include "GlobalDefines.h"
#include "SerialWidget.h"
#include "MacroWidget.h"
#include "TextIOWidget.h"
#include "SerialIOWidget.h"
 
class MainWindow : public QMainWindow
{
31,7 → 31,7
QPushButton *btnSerialConnect;
 
// Serial data
TextIOWidget *textIOWidget;
SerialIOWidget *serialIOWidget;
QGroupBox *groupSerialData;
 
// Macro controller + UI
/Misc Projects/PcMarlinInterface/PcMarlinInterface.pro
15,16 → 15,16
SOURCES += main.cpp \
MainWindow.cpp \
SerialHelper.cpp \
TextIOWidget.cpp \
MacroWidget.cpp \
SerialWidget.cpp
SerialWidget.cpp \
SerialIOWidget.cpp
 
HEADERS += GlobalDefines.h \
MainWindow.h \
SerialHelper.h \
TextIOWidget.h \
MacroWidget.h \
SerialWidget.h
SerialWidget.h \
SerialIOWidget.h
 
RESOURCES += Resources.qrc
 
/Misc Projects/PcMarlinInterface/PcMarlinInterface.pro.user
1,10 → 1,10
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject>
<!-- Written by QtCreator 3.3.0, 2015-01-08T10:53:44. -->
<!-- Written by QtCreator 3.3.0, 2015-02-09T18:01:00. -->
<qtcreator>
<data>
<variable>EnvironmentId</variable>
<value type="QByteArray">{4c29e835-aad4-4677-99d7-2a63e01ab69b}</value>
<value type="QByteArray">{22bd4f67-ea17-48ee-8299-171e5aa125c2}</value>
</data>
<data>
<variable>ProjectExplorer.Project.ActiveTarget</variable>
/Misc Projects/PcMarlinInterface/SerialIOWidget.cpp
0,0 → 1,79
#include "SerialIOWidget.h"
 
SerialIOWidget::SerialIOWidget(QWidget *parent) : QWidget(parent)
{
// Serial data UI
textSerialData = new QTextEdit();
textSerialData->setCurrentFont(QFont("Consolas", 8));
textSerialData->append("Waiting for serial connection...");
textSerialData->setMinimumSize(400, 100);
textSerialData->setReadOnly(true);
textSerialTransmit = new QLineEdit();
textSerialTransmit->setEnabled(false);
textSerialTransmit->setFont(QFont("Consolas", 8));
btnSerialTransmit = new QPushButton("&Send");
btnSerialTransmit->setEnabled(false);
btnSerialClear = new QPushButton("Clear");
 
QHBoxLayout *serialTransmitLayout = new QHBoxLayout();
serialTransmitLayout->addWidget(textSerialTransmit);
serialTransmitLayout->addWidget(btnSerialTransmit);
serialTransmitLayout->addWidget(btnSerialClear);
QVBoxLayout *serialDataLayout = new QVBoxLayout();
serialDataLayout->addWidget(textSerialData);
serialDataLayout->addLayout(serialTransmitLayout);
setLayout(serialDataLayout);
 
connect(btnSerialTransmit, SIGNAL(clicked()), this, SLOT(Serial_PrepareTransmit()));
connect(textSerialTransmit, SIGNAL(returnPressed()), btnSerialTransmit, SIGNAL(clicked()));
connect(btnSerialClear, SIGNAL(clicked()), this, SLOT(Serial_ClearBtn()));
 
Serial_DisableTransmit();
}
 
SerialIOWidget::~SerialIOWidget()
{
 
}
 
void SerialIOWidget::Serial_PrepareTransmit(QByteArray data)
{
QString str;
if (data.isEmpty()) {
str = textSerialTransmit->text();
textSerialTransmit->setText("");
} else {
str = QString(data);
}
 
emit Serial_TransmitByteArray(str.toUtf8());
textSerialData->setTextColor(Qt::darkBlue);
 
QStringList cmds = str.split('\n');
for (int i = 0; i < cmds.size(); i++) {
textSerialData->append("TX: " + cmds[i]);
}
}
 
void SerialIOWidget::Serial_ReceivedByte(char byte)
{
textSerialData->setTextColor(Qt::darkRed);
textSerialData->append("RX: " + QString(byte));
}
 
void SerialIOWidget::Serial_ClearBtn()
{
textSerialData->clear();
}
 
void SerialIOWidget::Serial_EnableTransmit()
{
textSerialTransmit->setEnabled(true);
btnSerialTransmit->setEnabled(true);
}
 
void SerialIOWidget::Serial_DisableTransmit()
{
textSerialTransmit->setEnabled(false);
btnSerialTransmit->setEnabled(false);
}
/Misc Projects/PcMarlinInterface/SerialIOWidget.h
0,0 → 1,30
#ifndef SERIALIOWIDGET_H
#define SERIALIOWIDGET_H
 
#include "GlobalDefines.h"
 
class SerialIOWidget : public QWidget
{
Q_OBJECT
public:
SerialIOWidget(QWidget *parent = 0);
~SerialIOWidget();
 
public slots:
void Serial_PrepareTransmit(QByteArray data = QByteArray());
void Serial_ReceivedByte(char byte);
void Serial_ClearBtn(void);
void Serial_EnableTransmit(void);
void Serial_DisableTransmit(void);
 
signals:
void Serial_TransmitByteArray(QByteArray data);
 
private:
QTextEdit *textSerialData;
QLineEdit *textSerialTransmit;
QPushButton *btnSerialTransmit;
QPushButton *btnSerialClear;
};
 
#endif // SERIALIOWIDGET_H