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>
...@@ -69,8 +70,7 @@ public: ...@@ -69,8 +70,7 @@ public:
inline RedstartCoreOutputPlainTextEdit( QWidget* pParent ) inline RedstartCoreOutputPlainTextEdit( QWidget* pParent )
: 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,537 +347,551 @@ background-color: rgb(208, 255, 188);</string> ...@@ -347,537 +347,551 @@ background-color: rgb(208, 255, 188);</string>
</layout> </layout>
</item> </item>
<item> <item>
<layout class="QGridLayout" name="gridLayout" columnstretch="1,1,1,1,0,0"> <widget class="QFrame" name="">
<item row="0" column="0" colspan="2"> <property name="frameShape">
<widget class="QGroupBox" name="groupBox_core"> <enum>QFrame::Box</enum>
<property name="enabled"> </property>
<bool>true</bool> <property name="frameShadow">
</property> <enum>QFrame::Sunken</enum>
<property name="title"> </property>
<string>Core</string> <property name="lineWidth">
</property> <number>2</number>
<layout class="QVBoxLayout" name="verticalLayout_14"> </property>
<item> <property name="midLineWidth">
<layout class="QGridLayout" name="gridLayout_core_settings"> <number>1</number>
<item row="3" column="0"> </property>
<widget class="QLabel" name="label_7"> <layout class="QGridLayout" name="gridLayout" columnstretch="1,1,1,1,0,0">
<property name="text"> <item row="0" column="0" colspan="2">
<string>Core clock</string> <widget class="QGroupBox" name="groupBox_core">
</property> <property name="enabled">
</widget> <bool>true</bool>
</item> </property>
<item row="0" column="1"> <property name="title">
<widget class="QLineEdit" name="lineEdit_core_settings_version"> <string>Core</string>
<property name="enabled"> </property>
<bool>true</bool> <layout class="QVBoxLayout" name="verticalLayout_14">
</property> <item>
</widget> <layout class="QGridLayout" name="gridLayout_core_settings">
</item> <item row="3" column="0">
<item row="2" column="1"> <widget class="QLabel" name="label_7">
<widget class="QComboBox" name="comboBox_core_settings_log_level"/> <property name="text">
</item> <string>Core clock</string>
<item row="2" column="0"> </property>
<widget class="QLabel" name="label_4"> </widget>
<property name="text"> </item>
<string>Log level</string> <item row="0" column="1">
</property> <widget class="QLineEdit" name="lineEdit_core_settings_version">
</widget> <property name="enabled">
</item> <bool>true</bool>
<item row="0" column="0"> </property>
<widget class="QLabel" name="label_3"> </widget>
<property name="text"> </item>
<string>Version</string> <item row="2" column="1">
</property> <widget class="QComboBox" name="comboBox_core_settings_log_level"/>
</widget> </item>
</item> <item row="2" column="0">
<item row="3" column="1"> <widget class="QLabel" name="label_4">
<widget class="QLineEdit" name="lineEdit_core_settings_core_clock"> <property name="text">
<property name="enabled"> <string>Log level</string>
<bool>true</bool> </property>
</property> </widget>
</widget> </item>
</item> <item row="0" column="0">
</layout> <widget class="QLabel" name="label_3">
</item> <property name="text">
<item> <string>Version</string>
<spacer name="verticalSpacer"> </property>
<property name="orientation"> </widget>
<enum>Qt::Vertical</enum> </item>
</property> <item row="3" column="1">
<property name="sizeHint" stdset="0"> <widget class="QLineEdit" name="lineEdit_core_settings_core_clock">
<size> <property name="enabled">
<width>20</width> <bool>true</bool>
<height>40</height> </property>
</size> </widget>
</property> </item>
</spacer> </layout>
</item> </item>
</layout> <item>
</widget> <spacer name="verticalSpacer">
</item> <property name="orientation">
<item row="0" column="2"> <enum>Qt::Vertical</enum>
<widget class="QGroupBox" name="groupBox_clients"> </property>
<property name="enabled"> <property name="sizeHint" stdset="0">
<bool>true</bool> <size>
</property> <width>20</width>
<property name="title"> <height>40</height>
<string>Clients</string> </size>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_7"> </spacer>
<item> </item>
<widget class="QListView" name="listView_server_connected_clients"> </layout>
<property name="editTriggers"> </widget>
<set>QAbstractItemView::NoEditTriggers</set> </item>
</property> <item row="0" column="2">
</widget> <widget class="QGroupBox" name="groupBox_clients">
</item> <property name="enabled">
</layout> <bool>true</bool>
</widget> </property>
</item> <property name="title">
<item row="2" column="0" colspan="3"> <string>Clients</string>
<widget class="QGroupBox" name="groupBox_macros"> </property>
<property name="enabled"> <layout class="QVBoxLayout" name="verticalLayout_7">
<bool>true</bool> <item>
</property> <widget class="QListView" name="listView_server_connected_clients">
<property name="title"> <property name="editTriggers">
<string>Macros</string> <set>QAbstractItemView::NoEditTriggers</set>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_9"> </widget>
<item> </item>
<widget class="QListView" name="listView_macros"> </layout>
<property name="editTriggers"> </widget>
<set>QAbstractItemView::NoEditTriggers</set> </item>
</property> <item row="2" column="0" colspan="3">
</widget> <widget class="QGroupBox" name="groupBox_macros">
</item> <property name="enabled">
</layout> <bool>true</bool>
</widget> </property>
</item> <property name="title">
<item row="1" column="0" colspan="3"> <string>Macros</string>
<widget class="QGroupBox" name="groupBox_paths"> </property>
<property name="enabled"> <layout class="QVBoxLayout" name="verticalLayout_9">
<bool>true</bool> <item>
</property> <widget class="QListView" name="listView_macros">
<property name="title"> <property name="editTriggers">
<string>Paths</string> <set>QAbstractItemView::NoEditTriggers</set>
</property> </property>
<layout class="QGridLayout" name="gridLayout_6"> </widget>
<item row="2" column="0"> </item>
<widget class="QPushButton" name="pushButton_add_path"> </layout>
<property name="text"> </widget>
<string>add path</string> </item>
</property> <item row="1" column="0" colspan="3">
</widget> <widget class="QGroupBox" name="groupBox_paths">
</item> <property name="enabled">
<item row="2" column="1"> <bool>true</bool>
<widget class="QPushButton" name="pushButton_add_local_path"> </property>
<property name="enabled"> <property name="title">
<bool>false</bool> <string>Paths</string>
</property> </property>
<property name="text"> <layout class="QGridLayout" name="gridLayout_6">
<string>add local path</string> <item row="2" column="0">
</property> <widget class="QPushButton" name="pushButton_add_path">
</widget> <property name="text">
</item> <string>add path</string>
<item row="0" column="0" colspan="2"> </property>
<widget class="QListView" name="listView_paths"> </widget>
<property name="editTriggers"> </item>
<set>QAbstractItemView::NoEditTriggers</set> <item row="2" column="1">
</property> <widget class="QPushButton" name="pushButton_add_local_path">
</widget> <property name="enabled">
</item> <bool>false</bool>
</layout> </property>
</widget> <property name="text">
</item> <string>add local path</string>
<item row="3" column="5"> </property>
<widget class="QGroupBox" name="groupBox_global_am"> </widget>
<property name="title"> </item>
<string>Global auralization mode</string> <item row="0" column="0" colspan="2">
</property> <widget class="QListView" name="listView_paths">
<layout class="QVBoxLayout" name="verticalLayout_12"> <property name="editTriggers">
<item> <set>QAbstractItemView::NoEditTriggers</set>
<widget class="QCheckBox" name="checkBox_am_ds"> </property>
<property name="text"> </widget>
<string>Direct sound</string> </item>
</property> </layout>
<property name="checked"> </widget>
<bool>true</bool> </item>
</property> <item row="3" column="5">
</widget> <widget class="QGroupBox" name="groupBox_global_am">
</item> <property name="title">
<item> <string>Global auralization mode</string>
<widget class="QCheckBox" name="checkBox_am_er"> </property>
<property name="text"> <layout class="QVBoxLayout" name="verticalLayout_12">
<string>Early reflections</string> <item>
</property> <widget class="QCheckBox" name="checkBox_am_ds">
<property name="checked"> <property name="text">
<bool>true</bool> <string>Direct sound</string>
</property> </property>
</widget> <property name="checked">
</item> <bool>true</bool>
<item> </property>
<widget class="QCheckBox" name="checkBox_am_dd"> </widget>
<property name="text"> </item>
<string>Diffuse decay</string> <item>
</property> <widget class="QCheckBox" name="checkBox_am_er">
<property name="checked"> <property name="text">
<bool>true</bool> <string>Early reflections</string>
</property> </property>
</widget> <property name="checked">
</item> <bool>true</bool>
<item> </property>
<widget class="QCheckBox" name="checkBox_am_dir"> </widget>
<property name="text"> </item>
<string>Source directivity</string> <item>
</property> <widget class="QCheckBox" name="checkBox_am_dd">
<property name="checked"> <property name="text">
<bool>true</bool> <string>Diffuse decay</string>
</property> </property>
</widget> <property name="checked">
</item> <bool>true</bool>
<item> </property>
<widget class="QCheckBox" name="checkBox_am_ma"> </widget>
<property name="text"> </item>
<string>Medium absorption</string> <item>
</property> <widget class="QCheckBox" name="checkBox_am_dir">
<property name="checked"> <property name="text">
<bool>true</bool> <string>Source directivity</string>
</property> </property>
</widget> <property name="checked">
</item> <bool>true</bool>
<item> </property>
<widget class="QCheckBox" name="checkBox_am_tv"> </widget>
<property name="text"> </item>
<string>Temporal variations</string> <item>
</property> <widget class="QCheckBox" name="checkBox_am_ma">
<property name="checked"> <property name="text">
<bool>true</bool> <string>Medium absorption</string>
</property> </property>
</widget> <property name="checked">
</item> <bool>true</bool>
<item> </property>
<widget class="QCheckBox" name="checkBox_am_sca"> </widget>
<property name="text"> </item>
<string>Scattering</string> <item>
</property> <widget class="QCheckBox" name="checkBox_am_tv">
<property name="checked"> <property name="text">
<bool>true</bool> <string>Temporal variations</string>
</property> </property>
</widget> <property name="checked">
</item> <bool>true</bool>
<item> </property>
<widget class="QCheckBox" name="checkBox_am_dif"> </widget>
<property name="text"> </item>
<string>Diffraction</string> <item>
</property> <widget class="QCheckBox" name="checkBox_am_sca">
<property name="checked"> <property name="text">
<bool>true</bool> <string>Scattering</string>
</property> </property>
</widget> <property name="checked">
</item> <bool>true</bool>
<item> </property>
<widget class="QCheckBox" name="checkBox_am_nf"> </widget>
<property name="text"> </item>
<string>Near-field</string> <item>
</property> <widget class="QCheckBox" name="checkBox_am_dif">
<property name="checked"> <property name="text">
<bool>true</bool> <string>Diffraction</string>
</property> </property>
</widget> <property name="checked">
</item> <bool>true</bool>
<item> </property>
<widget class="QCheckBox" name="checkBox_am_dp"> </widget>
<property name="text"> </item>
<string>Doppler</string> <item>
</property> <widget class="QCheckBox" name="checkBox_am_nf">
<property name="checked"> <property name="text">
<bool>true</bool> <string>Near-field</string>
</property> </property>
</widget> <property name="checked">
</item> <bool>true</bool>
<item> </property>
<widget class="QCheckBox" name="checkBox_am_sl"> </widget>
<property name="text"> </item>
<string>Spreading loss</string> <item>
</property> <widget class="QCheckBox" name="checkBox_am_dp">
<property name="checked"> <property name="text">
<bool>true</bool> <string>Doppler</string>
</property> </property>
</widget> <property name="checked">
</item> <bool>true</bool>
<item> </property>
<widget class="QCheckBox" name="checkBox_am_tr"> </widget>
<property name="text"> </item>
<string>Transmission</string> <item>
</property> <widget class="QCheckBox" name="checkBox_am_sl">
<property name="checked"> <property name="text">
<bool>true</bool> <string>Spreading loss</string>
</property> </property>
</widget> <property name="checked">
</item> <bool>true</bool>
<item> </property>
<widget class="QCheckBox" name="checkBox_am_ab"> </widget>
<property name="text"> </item>
<string>Absorption</string> <item>
</property> <widget class="QCheckBox" name="checkBox_am_tr">
<property name="checked"> <property name="text">
<bool>true</bool> <string>Transmission</string>
</property> </property>
</widget> <property name="checked">
</item> <bool>true</bool>
</layout> </property>
</widget> </widget>
</item> </item>
<item row="0" column="3" rowspan="3" colspan="3"> <item>
<widget class="QGroupBox" name="groupBox_core_control"> <widget class="QCheckBox" name="checkBox_am_ab">
<property name="title"> <property name="text">
<string>Control</string> <string>Absorption</string>
</property> </property>
<property name="alignment"> <property name="checked">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set> <bool>true</bool>
</property> </property>
<layout class="QGridLayout" name="gridLayout_5"> </widget>
<item row="3" column="0"> </item>
<widget class="QDoubleSpinBox" name="doubleSpinBox_input_gain"> </layout>
<property name="layoutDirection"> </widget>
<enum>Qt::LeftToRight</enum> </item>
</property> <item row="0" column="3" rowspan="3" colspan="3">
<property name="frame"> <widget class="QGroupBox" name="groupBox_core_control">
<bool>true</bool> <property name="title">
</property> <string>Control</string>
<property name="showGroupSeparator" stdset="0"> </property>
<bool>false</bool> <property name="alignment">
</property> <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
<property name="suffix"> </property>
<string comment="dB" extracomment="Decibel"/> <layout class="QGridLayout" name="gridLayout_5">
</property> <item row="3" column="0">
<property name="decimals"> <widget class="QDoubleSpinBox" nam