More error messages

This commit is contained in:
NeoTheFox 2015-03-21 16:36:14 +03:00
parent 9fff9d6743
commit 7e354a56d7
4 changed files with 33 additions and 4 deletions

View File

@ -1,11 +1,26 @@
#include "errorwindow.h" #include "errorwindow.h"
#include "ui_errorwindow.h" #include "ui_errorwindow.h"
ErrorWindow::ErrorWindow(QWidget *parent, QString errorText) : using namespace RepRaptor;
ErrorWindow::ErrorWindow(QWidget *parent, QString errorText, int errType):
QDialog(parent), QDialog(parent),
ui(new Ui::ErrorWindow) ui(new Ui::ErrorWindow)
{ {
ui->setupUi(this); ui->setupUi(this);
switch(errType)
{
case SerialPortError:
ui->label->setText("Serial port error:");
break;
case OpenFileError:
ui->label->setText("File open error:");
break;
default:
ui->label->setText("Unknown error type:");
break;
}
ui->errorlabel->setText(errorText); ui->errorlabel->setText(errorText);
} }

View File

@ -4,6 +4,7 @@
#include <QDialog> #include <QDialog>
#include "erroricon.h" #include "erroricon.h"
#include "repraptor.h"
namespace Ui { namespace Ui {
class ErrorWindow; class ErrorWindow;
@ -14,7 +15,7 @@ class ErrorWindow : public QDialog
Q_OBJECT Q_OBJECT
public: public:
explicit ErrorWindow(QWidget *parent = 0, QString errorText = "Unknown error"); explicit ErrorWindow(QWidget *parent = 0, QString errorText = "Unknown error", int errType = 0);
~ErrorWindow(); ~ErrorWindow();
private: private:

View File

@ -222,6 +222,13 @@ void MainWindow::parseFile(QString filename)
ui->filename->setText(gfile.fileName().split(QDir::separator()).last()); ui->filename->setText(gfile.fileName().split(QDir::separator()).last());
ui->filelines->setText(QString::number(gcode.size()) + QString("/0 lines")); ui->filelines->setText(QString::number(gcode.size()) + QString("/0 lines"));
} }
else
{
ErrorWindow window(this, "Can't open file", OpenFileError);
ui->filename->setText("");
ui->filelines->setText("");
window.exec();
}
} }
void MainWindow::serialupdate() void MainWindow::serialupdate()
@ -691,7 +698,7 @@ void MainWindow::serialError(QSerialPort::SerialPortError error)
} }
//Spawn the error message //Spawn the error message
ErrorWindow errorwindow(this, errorMsg); ErrorWindow errorwindow(this, errorMsg, SerialPortError);
errorwindow.exec(); errorwindow.exec();
} }
@ -871,7 +878,7 @@ void MainWindow::baudrateSetFailed(int b)
{ {
ErrorWindow errorwindow(this, QString("Baudrate set failed:\n" + ErrorWindow errorwindow(this, QString("Baudrate set failed:\n" +
QString::number(b) + QString::number(b) +
" baud")); " baud"), SerialPortError);
errorwindow.show(); errorwindow.show();
} }

View File

@ -24,6 +24,12 @@ namespace RepRaptor
OtherFirmware OtherFirmware
}; };
enum ErrorType
{
SerialPortError,
OpenFileError
};
typedef struct typedef struct
{ {
int T, P; int T, P;