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 @@
#include <QPlainTextEdit>
#include <QStringListModel>
#include <QMutex>
#include <iostream>
......@@ -69,8 +70,7 @@ public:
inline RedstartCoreOutputPlainTextEdit( QWidget* pParent )
: QPlainTextEdit( pParent )
{
m_pOutStream = new COutStream( this );
m_pOutStream = new COutStream( this );
};
inline ~RedstartCoreOutputPlainTextEdit()
......@@ -86,8 +86,11 @@ public:
inline void append()
{
// Append a copy
m_qLock.lock();
appendPlainText( m_sLine );
m_sLine.clear();
m_qLock.unlock();
};
inline void write( char c )
......@@ -105,6 +108,7 @@ public:
private:
COutStream* m_pOutStream;
QString m_sLine;
QMutex m_qLock;
};
......
......@@ -93,7 +93,7 @@
<x>0</x>
<y>0</y>
<width>1071</width>
<height>788</height>
<height>798</height>
</rect>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_2" stretch="1,2">
......@@ -347,537 +347,551 @@ background-color: rgb(208, 255, 188);</string>
</layout>
</item>
<item>
<layout class="QGridLayout" name="gridLayout" columnstretch="1,1,1,1,0,0">
<item row="0" column="0" colspan="2">
<widget class="QGroupBox" name="groupBox_core">
<property name="enabled">
<bool>true</bool>
</property>
<property name="title">
<string>Core</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_14">
<item>
<layout class="QGridLayout" name="gridLayout_core_settings">
<item row="3" column="0">
<widget class="QLabel" name="label_7">
<property name="text">
<string>Core clock</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLineEdit" name="lineEdit_core_settings_version">
<property name="enabled">
<bool>true</bool>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QComboBox" name="comboBox_core_settings_log_level"/>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_4">
<property name="text">
<string>Log level</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
<string>Version</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QLineEdit" name="lineEdit_core_settings_core_clock">
<property name="enabled">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
<item row="0" column="2">
<widget class="QGroupBox" name="groupBox_clients">
<property name="enabled">
<bool>true</bool>
</property>
<property name="title">
<string>Clients</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_7">
<item>
<widget class="QListView" name="listView_server_connected_clients">
<property name="editTriggers">
<set>QAbstractItemView::NoEditTriggers</set>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="2" column="0" colspan="3">
<widget class="QGroupBox" name="groupBox_macros">
<property name="enabled">
<bool>true</bool>
</property>
<property name="title">
<string>Macros</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_9">
<item>
<widget class="QListView" name="listView_macros">
<property name="editTriggers">
<set>QAbstractItemView::NoEditTriggers</set>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="1" column="0" colspan="3">
<widget class="QGroupBox" name="groupBox_paths">
<property name="enabled">
<bool>true</bool>
</property>
<property name="title">
<string>Paths</string>
</property>
<layout class="QGridLayout" name="gridLayout_6">
<item row="2" column="0">
<widget class="QPushButton" name="pushButton_add_path">
<property name="text">
<string>add path</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QPushButton" name="pushButton_add_local_path">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>add local path</string>
</property>
</widget>
</item>
<item row="0" column="0" colspan="2">
<widget class="QListView" name="listView_paths">
<property name="editTriggers">
<set>QAbstractItemView::NoEditTriggers</set>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="3" column="5">
<widget class="QGroupBox" name="groupBox_global_am">
<property name="title">
<string>Global auralization mode</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_12">
<item>
<widget class="QCheckBox" name="checkBox_am_ds">
<property name="text">
<string>Direct sound</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="checkBox_am_er">
<property name="text">
<string>Early reflections</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="checkBox_am_dd">
<property name="text">
<string>Diffuse decay</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="checkBox_am_dir">
<property name="text">
<string>Source directivity</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="checkBox_am_ma">
<property name="text">
<string>Medium absorption</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="checkBox_am_tv">
<property name="text">
<string>Temporal variations</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="checkBox_am_sca">
<property name="text">
<string>Scattering</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="checkBox_am_dif">
<property name="text">
<string>Diffraction</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="checkBox_am_nf">
<property name="text">
<string>Near-field</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="checkBox_am_dp">
<property name="text">
<string>Doppler</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="checkBox_am_sl">
<property name="text">
<string>Spreading loss</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="checkBox_am_tr">
<property name="text">
<string>Transmission</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="checkBox_am_ab">
<property name="text">
<string>Absorption</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="0" column="3" rowspan="3" colspan="3">
<widget class="QGroupBox" name="groupBox_core_control">
<property name="title">
<string>Control</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
<layout class="QGridLayout" name="gridLayout_5">
<item row="3" column="0">
<widget class="QDoubleSpinBox" name="doubleSpinBox_input_gain">
<property name="layoutDirection">
<enum>Qt::LeftToRight</enum>
</property>
<property name="frame">
<bool>true</bool>
</property>
<property name="showGroupSeparator" stdset="0">
<bool>false</bool>
</property>
<property name="suffix">
<string comment="dB" extracomment="Decibel"/>
</property>
<property name="decimals">
<number>1</number>
</property>
<property name="minimum">
<double>-60.000000000000000</double>
</property>
<property name="maximum">
<double>9.000000000000000</double>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="CITAQtWLevelMeter" name="graphicsView_output_levels">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>90</width>
<height>30</height>
</size>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label_13">
<property name="layoutDirection">
<enum>Qt::LeftToRight</enum>
</property>
<property name="text">
<string>Input</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QDial" name="dial_core_control_output_gain">
<property name="minimumSize">
<size>
<width>90</width>
<height>90</height>
</size>
</property>
<property name="minimum">
<number>-60</number>
</property>
<property name="maximum">
<number>9</number>
</property>
<property name="pageStep">
<number>3</number>
</property>
<property name="tracking">
<bool>false</bool>
</property>
<property name="invertedAppearance">
<bool>false</bool>
</property>
<property name="invertedControls">
<bool>false</bool>
</property>
<property name="notchTarget">
<double>3.000000000000000</double>
</property>
<property name="notchesVisible">
<bool>true</bool>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="CITAQtWLevelMeter" name="graphicsView_input_levels">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>90</width>
<height>30</height>
</size>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QDial" name="dial_core_control_input_gain">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>90</width>
<height>90</height>
</size>
</property>
<property name="minimum">
<number>-60</number>
</property>
<property name="maximum">
<number>9</number>
</property>
<property name="pageStep">
<number>3</number>
</property>
<property name="value">
<number>0</number>
</property>
<property name="sliderPosition">
<number>0</number>
</property>
<property name="tracking">
<bool>false</bool>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="invertedAppearance">
<bool>false</bool>
</property>
<property name="invertedControls">
<bool>false</bool>
</property>
<property name="notchTarget">
<double>3.000000000000000</double>
</property>
<property name="notchesVisible">
<bool>true</bool>
</property>
</widget>
</item>
<item row="5" column="0" colspan="2">
<widget class="QPushButton" name="pushButton_core_control_reset">
<property name="text">
<string>Reset core</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLabel" name="label_14">
<property name="text">
<string>Output</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QDoubleSpinBox" name="doubleSpinBox_output_gain">
<property name="layoutDirection">
<enum>Qt::LeftToRight</enum>
</property>
<property name="frame">
<bool>true</bool>
</property>
<property name="showGroupSeparator" stdset="0">
<bool>false</bool>
</property>
<property name="suffix">
<string comment="dB" extracomment="Decibel"/>
</property>
<property name="decimals">
<number>1</number>
</property>
<property name="minimum">
<double>-60.000000000000000</double>
</property>
<property name="maximum">
<double>9.000000000000000</double>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QCheckBox" name="checkBox_core_control_input_mute">
<property name="text">
<string>Mute</string>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QCheckBox" name="checkBox_core_control_output_mute">
<property name="text">
<string>Mute</string>
</property>
</widget>
</item>
<item row="6" column="0" colspan="2">
<spacer name="verticalSpacer_2">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
<item row="3" column="0" colspan="5">
<widget class="QGroupBox" name="groupBox_output">
<property name="enabled">
<bool>true</bool>
</property>
<property name="title">
<string>Output</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_13">
<item>
<widget class="RedstartCoreOutputPlainTextEdit" name="plainTextEdit_core_output"/>
</item>
</layout>
</widget>
</item>
</layout>
<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">
<item row="0" column="0" colspan="2">
<widget class="QGroupBox" name="groupBox_core">
<property name="enabled">
<bool>true</bool>
</property>
<property name="title">
<string>Core</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_14">
<item>
<layout class="QGridLayout" name="gridLayout_core_settings">
<item row="3" column="0">
<widget class="QLabel" name="label_7">
<property name="text">
<string>Core clock</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLineEdit" name="lineEdit_core_settings_version">
<property name="enabled">
<bool>true</bool>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QComboBox" name="comboBox_core_settings_log_level"/>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_4">
<property name="text">
<string>Log level</string>
</property>
</widget>