Program hang on non zero length command queue on close fixed.

Denvi · Aug 12, 2015 · 2ee64f8 · 2ee64f8
1 parent 2cff1df
commit 2ee64f8
Show file tree

Hide file tree

Showing 34 changed files with 158 additions and 3 deletions.
diff --git a/arcproperties.cpp b/arcproperties.cpp
@@ -1,3 +1,10 @@
+// This file is a part of "grblControl" application.
+// This file was originally ported from "ArcProperties.java" class
+// of "Universal GcodeSender" application written by Will Winder
+// (https://github.com/winder/Universal-G-Code-Sender)
+
+// Copyright 2015 Hayrullin Denis Ravilevich
+
 #include "arcproperties.h"
 
 ArcProperties::ArcProperties(QObject *parent) : QObject(parent)

diff --git a/arcproperties.h b/arcproperties.h
@@ -1,3 +1,10 @@
+// This file is a part of "grblControl" application.
+// This file was originally ported from "ArcProperties.java" class
+// of "Universal GcodeSender" application written by Will Winder
+// (https://github.com/winder/Universal-G-Code-Sender)
+
+// Copyright 2015 Hayrullin Denis Ravilevich
+
 #ifndef ARCPROPERTIES_H
 #define ARCPROPERTIES_H
 

diff --git a/bin/grblControl.zip b/bin/grblControl.zip
diff --git a/frmabout.cpp b/frmabout.cpp
@@ -1,3 +1,6 @@
+// This file is a part of "grblControl" application.
+// Copyright 2015 Hayrullin Denis Ravilevich
+
 #include <QDesktopServices>
 #include "frmabout.h"
 #include "ui_frmabout.h"

diff --git a/frmabout.h b/frmabout.h
@@ -1,3 +1,6 @@
+// This file is a part of "grblControl" application.
+// Copyright 2015 Hayrullin Denis Ravilevich
+
 #ifndef FRMABOUT_H
 #define FRMABOUT_H
 

diff --git a/frmmain.cpp b/frmmain.cpp
@@ -1,3 +1,6 @@
+// This file is a part of "grblControl" application.
+// Copyright 2015 Hayrullin Denis Ravilevich
+
 #include <QFileDialog>
 #include <QTextStream>
 #include <QDebug>
@@ -90,8 +93,7 @@ frmMain::frmMain(QWidget *parent) :
 }
 
 frmMain::~frmMain()
-{
-    if (m_serialPort.isOpen()) m_serialPort.close();
+{    
     saveSettings();
 
     delete ui;
@@ -266,6 +268,8 @@ void frmMain::sendCommand(QString command, int tableIndex)
         command = cq.command;
         tableIndex = cq.tableIndex;
 
+        if (!m_serialPort.isOpen()) return;
+
 //        qDebug() << "get queue:" << cq.command;
     }
 
@@ -308,7 +312,7 @@ void frmMain::grblReset()
     m_timerToolAnimation.stop();
 
     m_commands.clear();
-    m_queue.clear();
+//    m_queue.clear();
 
     ui->txtConsole->appendPlainText("[CTRL+X]");
     m_serialPort.write(QByteArray(1, (char)24));
@@ -717,6 +721,12 @@ void frmMain::timerEvent(QTimerEvent *te)
     }
 }
 
+void frmMain::closeEvent(QCloseEvent *ce)
+{
+    if (m_serialPort.isOpen()) m_serialPort.close();
+    if (m_queue.length() > 0) m_commands.clear();
+}
+
 void frmMain::on_actFileExit_triggered()
 {
     close();

diff --git a/frmmain.h b/frmmain.h
@@ -1,3 +1,6 @@
+// This file is a part of "grblControl" application.
+// Copyright 2015 Hayrullin Denis Ravilevich
+
 #ifndef FRMMAIN_H
 #define FRMMAIN_H
 
@@ -100,6 +103,7 @@ private slots:
     void showEvent(QShowEvent *se);
     void resizeEvent(QResizeEvent *re);
     void timerEvent(QTimerEvent *);
+    void closeEvent(QCloseEvent *ce);
 
 private:
     const int BUFFERLENGTH = 127;

diff --git a/frmsettings.cpp b/frmsettings.cpp
@@ -1,3 +1,6 @@
+// This file is a part of "grblControl" application.
+// Copyright 2015 Hayrullin Denis Ravilevich
+
 #include "frmsettings.h"
 #include "ui_frmsettings.h"
 #include <QtSerialPort/QSerialPort>

diff --git a/frmsettings.h b/frmsettings.h
@@ -1,3 +1,6 @@
+// This file is a part of "grblControl" application.
+// Copyright 2015 Hayrullin Denis Ravilevich
+
 #ifndef FRMSETTINGS_H
 #define FRMSETTINGS_H
 

diff --git a/gcodedrawer.cpp b/gcodedrawer.cpp
@@ -1,3 +1,6 @@
+// This file is a part of "grblControl" application.
+// Copyright 2015 Hayrullin Denis Ravilevich
+
 #include <QDebug>
 #include "gcodedrawer.h"
 #include "math.h"

diff --git a/gcodedrawer.h b/gcodedrawer.h
@@ -1,3 +1,6 @@
+// This file is a part of "grblControl" application.
+// Copyright 2015 Hayrullin Denis Ravilevich
+
 #ifndef GCODEDRAWER_H
 #define GCODEDRAWER_H
 

diff --git a/gcodeparser.cpp b/gcodeparser.cpp
@@ -1,3 +1,10 @@
+// This file is a part of "grblControl" application.
+// This file was originally ported from "GcodeParser.java" class
+// of "Universal GcodeSender" application written by Will Winder
+// (https://github.com/winder/Universal-G-Code-Sender)
+
+// Copyright 2015 Hayrullin Denis Ravilevich
+
 #include <QListIterator>
 #include <QDebug>
 #include "gcodeparser.h"

diff --git a/gcodeparser.h b/gcodeparser.h
@@ -1,3 +1,10 @@
+// This file is a part of "grblControl" application.
+// This file was originally ported from "GcodeParser.java" class
+// of "Universal GcodeSender" application written by Will Winder
+// (https://github.com/winder/Universal-G-Code-Sender)
+
+// Copyright 2015 Hayrullin Denis Ravilevich
+
 #ifndef GCODEPARSER_H
 #define GCODEPARSER_H
 

diff --git a/gcodepreprocessorutils.cpp b/gcodepreprocessorutils.cpp
@@ -1,3 +1,10 @@
+// This file is a part of "grblControl" application.
+// This file was originally ported from "GcodePreprocessorUtils.java" class
+// of "Universal GcodeSender" application written by Will Winder
+// (https://github.com/winder/Universal-G-Code-Sender)
+
+// Copyright 2015 Hayrullin Denis Ravilevich
+
 #include <QRegExp>
 #include <QDebug>
 #include <QVector3D>

diff --git a/gcodepreprocessorutils.h b/gcodepreprocessorutils.h
@@ -1,3 +1,10 @@
+// This file is a part of "grblControl" application.
+// This file was originally ported from "GcodePreprocessorUtils.java" class
+// of "Universal GcodeSender" application written by Will Winder
+// (https://github.com/winder/Universal-G-Code-Sender)
+
+// Copyright 2015 Hayrullin Denis Ravilevich
+
 #ifndef GCODEPREPROCESSORUTILS_H
 #define GCODEPREPROCESSORUTILS_H
 

diff --git a/gcodetablemodel.cpp b/gcodetablemodel.cpp
@@ -1,3 +1,6 @@
+// This file is a part of "grblControl" application.
+// Copyright 2015 Hayrullin Denis Ravilevich
+
 #include "gcodetablemodel.h"
 
 GCodeItem::GCodeItem()

diff --git a/gcodetablemodel.h b/gcodetablemodel.h
@@ -1,3 +1,6 @@
+// This file is a part of "grblControl" application.
+// Copyright 2015 Hayrullin Denis Ravilevich
+
 #ifndef GCODETABLEMODEL_H
 #define GCODETABLEMODEL_H
 

diff --git a/gcodeviewparse.cpp b/gcodeviewparse.cpp
@@ -1,3 +1,10 @@
+// This file is a part of "grblControl" application.
+// This file was originally ported from "GcodeViewParse.java" class
+// of "Universal GcodeSender" application written by Will Winder
+// (https://github.com/winder/Universal-G-Code-Sender)
+
+// Copyright 2015 Hayrullin Denis Ravilevich
+
 #include <QDebug>
 #include "gcodeviewparse.h"
 

diff --git a/gcodeviewparse.h b/gcodeviewparse.h
@@ -1,3 +1,10 @@
+// This file is a part of "grblControl" application.
+// This file was originally ported from "GcodeViewParse.java" class
+// of "Universal GcodeSender" application written by Will Winder
+// (https://github.com/winder/Universal-G-Code-Sender)
+
+// Copyright 2015 Hayrullin Denis Ravilevich
+
 #ifndef GCODEVIEWPARSE_H
 #define GCODEVIEWPARSE_H
 

diff --git a/gldrawable.cpp b/gldrawable.cpp
@@ -1,3 +1,6 @@
+// This file is a part of "grblControl" application.
+// Copyright 2015 Hayrullin Denis Ravilevich
+
 #include "gldrawable.h"
 
 GLDrawable::GLDrawable(QObject *parent) :

diff --git a/gldrawable.h b/gldrawable.h
@@ -1,3 +1,6 @@
+// This file is a part of "grblControl" application.
+// Copyright 2015 Hayrullin Denis Ravilevich
+
 #ifndef GLDRAWABLE_H
 #define GLDRAWABLE_H
 

diff --git a/glwidget.cpp b/glwidget.cpp
@@ -1,3 +1,6 @@
+// This file is a part of "grblControl" application.
+// Copyright 2015 Hayrullin Denis Ravilevich
+
 #include "glwidget.h"
 #include "tooldrawer.h"
 #include <QDebug>

diff --git a/glwidget.h b/glwidget.h
@@ -1,3 +1,6 @@
+// This file is a part of "grblControl" application.
+// Copyright 2015 Hayrullin Denis Ravilevich
+
 #ifndef GLWIDGET_H
 #define GLWIDGET_H
 

diff --git a/linesegment.cpp b/linesegment.cpp
@@ -1,3 +1,10 @@
+// This file is a part of "grblControl" application.
+// This file was originally ported from "LineSegment.java" class
+// of "Universal GcodeSender" application written by Will Winder
+// (https://github.com/winder/Universal-G-Code-Sender)
+
+// Copyright 2015 Hayrullin Denis Ravilevich
+
 #include "linesegment.h"
 #include <QDebug>
 

diff --git a/linesegment.h b/linesegment.h
@@ -1,3 +1,10 @@
+// This file is a part of "grblControl" application.
+// This file was originally ported from "LineSegment.java" class
+// of "Universal GcodeSender" application written by Will Winder
+// (https://github.com/winder/Universal-G-Code-Sender)
+
+// Copyright 2015 Hayrullin Denis Ravilevich
+
 #ifndef LINESEGMENT_H
 #define LINESEGMENT_H
 

diff --git a/main.cpp b/main.cpp
@@ -1,3 +1,6 @@
+// This file is a part of "grblControl" application.
+// Copyright 2015 Hayrullin Denis Ravilevich
+
 #include "frmmain.h"
 #include "gcodepreprocessorutils.h"
 #include "gcodeparser.h"

diff --git a/pointsegment.cpp b/pointsegment.cpp
@@ -1,3 +1,10 @@
+// This file is a part of "grblControl" application.
+// This file was originally ported from "PointSegment.java" class
+// of "Universal GcodeSender" application written by Will Winder
+// (https://github.com/winder/Universal-G-Code-Sender)
+
+// Copyright 2015 Hayrullin Denis Ravilevich
+
 #include <QVector>
 
 #include "pointsegment.h"

diff --git a/pointsegment.h b/pointsegment.h
@@ -1,3 +1,10 @@
+// This file is a part of "grblControl" application.
+// This file was originally ported from "PointSegment.java" class
+// of "Universal GcodeSender" application written by Will Winder
+// (https://github.com/winder/Universal-G-Code-Sender)
+
+// Copyright 2015 Hayrullin Denis Ravilevich
+
 #ifndef POINTSEGMENT_H
 #define POINTSEGMENT_H
 

diff --git a/styledtoolbutton.cpp b/styledtoolbutton.cpp
@@ -1,3 +1,6 @@
+// This file is a part of "grblControl" application.
+// Copyright 2015 Hayrullin Denis Ravilevich
+
 #include "styledtoolbutton.h"
 #include <QDebug>
 #include <QEvent>

diff --git a/styledtoolbutton.h b/styledtoolbutton.h
@@ -1,3 +1,6 @@
+// This file is a part of "grblControl" application.
+// Copyright 2015 Hayrullin Denis Ravilevich
+
 #ifndef STYLEDTOOLBUTTON_H
 #define STYLEDTOOLBUTTON_H
 

diff --git a/tablewidget.cpp b/tablewidget.cpp
@@ -1,3 +1,6 @@
+// This file is a part of "grblControl" application.
+// Copyright 2015 Hayrullin Denis Ravilevich
+
 #include "tablewidget.h"
 #include <QEvent>
 #include <QKeyEvent>

diff --git a/tablewidget.h b/tablewidget.h
@@ -1,3 +1,6 @@
+// This file is a part of "grblControl" application.
+// Copyright 2015 Hayrullin Denis Ravilevich
+
 #ifndef TABLEWIDGET_H
 #define TABLEWIDGET_H
 

diff --git a/tooldrawer.cpp b/tooldrawer.cpp
@@ -1,3 +1,6 @@
+// This file is a part of "grblControl" application.
+// Copyright 2015 Hayrullin Denis Ravilevich
+
 #include "tooldrawer.h"
 #include "math.h"
 

diff --git a/tooldrawer.h b/tooldrawer.h
@@ -1,3 +1,6 @@
+// This file is a part of "grblControl" application.
+// Copyright 2015 Hayrullin Denis Ravilevich
+
 #ifndef TOOLDRAWER_H
 #define TOOLDRAWER_H