Commit 0db583c2 authored by Dipl.-Ing. Jonas Stienen's avatar Dipl.-Ing. Jonas Stienen
Browse files

Merge branch 'master' of https://git.rwth-aachen.de/ita/Redstart

parents 48621dd6 8603b62b
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
#include <QPlainTextEdit> #include <QPlainTextEdit>
#include <QStringListModel> #include <QStringListModel>
#include <QMutex>
#include <iostream> #include <iostream>
...@@ -70,7 +71,6 @@ public: ...@@ -70,7 +71,6 @@ public:
: QPlainTextEdit( pParent ) : QPlainTextEdit( pParent )
{ {
m_pOutStream = new COutStream( this ); m_pOutStream = new COutStream( this );
}; };
inline ~RedstartCoreOutputPlainTextEdit() inline ~RedstartCoreOutputPlainTextEdit()
...@@ -86,8 +86,11 @@ public: ...@@ -86,8 +86,11 @@ public:
inline void append() inline void append()
{ {
// Append a copy
m_qLock.lock();
appendPlainText( m_sLine ); appendPlainText( m_sLine );
m_sLine.clear(); m_sLine.clear();
m_qLock.unlock();
}; };
inline void write( char c ) inline void write( char c )
...@@ -105,6 +108,7 @@ public: ...@@ -105,6 +108,7 @@ public:
private: private:
COutStream* m_pOutStream; COutStream* m_pOutStream;
QString m_sLine; QString m_sLine;
QMutex m_qLock;
}; };
......
...@@ -93,7 +93,7 @@ ...@@ -93,7 +93,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>1071</width> <width>1071</width>
<height>788</height> <height>798</height>
</rect> </rect>
</property> </property>
<layout class="QHBoxLayout" name="horizontalLayout_2" stretch="1,2"> <layout class="QHBoxLayout" name="horizontalLayout_2" stretch="1,2">
...@@ -347,6 +347,19 @@ background-color: rgb(208, 255, 188);</string> ...@@ -347,6 +347,19 @@ background-color: rgb(208, 255, 188);</string>
</layout> </layout>
</item> </item>
<item> <item>
<widget class="QFrame" name="">
<property name="frameShape">
<enum>QFrame::Box</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Sunken</enum>
</property>
<property name="lineWidth">
<number>2</number>
</property>
<property name="midLineWidth">
<number>1</number>
</property>
<layout class="QGridLayout" name="gridLayout" columnstretch="1,1,1,1,0,0"> <layout class="QGridLayout" name="gridLayout" columnstretch="1,1,1,1,0,0">
<item row="0" column="0" colspan="2"> <item row="0" column="0" colspan="2">
<widget class="QGroupBox" name="groupBox_core"> <widget class="QGroupBox" name="groupBox_core">
...@@ -878,6 +891,7 @@ background-color: rgb(208, 255, 188);</string> ...@@ -878,6 +891,7 @@ background-color: rgb(208, 255, 188);</string>
</widget> </widget>
</item> </item>
</layout> </layout>
</widget>
</item> </item>
</layout> </layout>
</widget> </widget>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment