Commit 0ce3ab5f authored by Dipl.-Ing. Jonas Stienen's avatar Dipl.-Ing. Jonas Stienen

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

parents 893836f3 b04f5bab
......@@ -51,7 +51,7 @@ public:
BuildStandardItemFromVAStruct( oStruct, m_pModel->invisibleRootItem() );
expandAll();
collapseAll();
resizeColumnToContents( 0 );
resizeColumnToContents( 1 );
resizeColumnToContents( 2 );
......
......@@ -228,13 +228,16 @@ void RedstartWindow::PostCoreStart()
// Switch UI elements enabled
ui->groupBox_redstart_audio_iface->setEnabled( false );
ui->groupBox_redstart_network->setEnabled( false );
ui->horizontalLayout_redstart_session->setEnabled( false );
ui->groupBox_session_list->setEnabled( false );
ui->groupBox_session_details->setEnabled( false );
ui->groupBox_core->setEnabled( true );
ui->groupBox_paths->setEnabled( true );
ui->groupBox_macros->setEnabled( true );
ui->menuRun->setEnabled( true );
ui->groupBox_core_control->setEnabled( true );
ui->groupBox_level_meters->setEnabled( true );
ui->graphicsView_input_levels->setEnabled( true );
ui->graphicsView_output_levels->setEnabled( true );
ui->groupBox_global_am->setEnabled( true );
ui->groupBox_output->setEnabled( true );
CVAVersionInfo oVersion;
......@@ -266,13 +269,16 @@ void RedstartWindow::PostCoreStop()
// Switch UI elements enabled
ui->groupBox_redstart_audio_iface->setEnabled( true );
ui->groupBox_redstart_network->setEnabled( true );
ui->horizontalLayout_redstart_session->setEnabled( true );
ui->groupBox_session_list->setEnabled( true );
ui->groupBox_session_details->setEnabled( true );
ui->groupBox_core->setEnabled( false );
ui->groupBox_paths->setEnabled( false );
ui->groupBox_macros->setEnabled( false );
ui->menuRun->setEnabled( false );
ui->groupBox_core_control->setEnabled( false );
ui->groupBox_level_meters->setEnabled( false );
ui->graphicsView_input_levels->setEnabled( false );
ui->graphicsView_output_levels->setEnabled( false );
ui->groupBox_global_am->setEnabled( false );
ui->groupBox_output->setEnabled( false );
......
......@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>1067</width>
<height>766</height>
<width>1103</width>
<height>816</height>
</rect>
</property>
<property name="windowTitle">
......@@ -71,15 +71,15 @@
<rect>
<x>0</x>
<y>0</y>
<width>1015</width>
<height>709</height>
<width>1024</width>
<height>768</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_5" stretch="1,0,0,0,1">
<layout class="QHBoxLayout" name="horizontalLayout_2" stretch="0,0">
<item>
<layout class="QHBoxLayout" name="horizontalLayout_redstart_session" stretch="1,2">
<layout class="QVBoxLayout" name="verticalLayout_5" stretch="1,2,0,0,0">
<item>
<widget class="QGroupBox" name="groupBox_2">
<widget class="QGroupBox" name="groupBox_session_list">
<property name="autoFillBackground">
<bool>false</bool>
</property>
......@@ -108,7 +108,7 @@ background-color: rgb(254, 228, 255);</string>
</widget>
</item>
<item>
<widget class="QGroupBox" name="groupBox_5">
<widget class="QGroupBox" name="groupBox_session_details">
<property name="enabled">
<bool>true</bool>
</property>
......@@ -126,245 +126,292 @@ background-color: rgb(254, 228, 255);</string>
</layout>
</widget>
</item>
</layout>
</item>
<item>
<widget class="Line" name="line_after_session">
<property name="styleSheet">
<string notr="true">color: rgb(255, 255, 255);</string>
</property>
<property name="frameShadow">
<enum>QFrame::Plain</enum>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_redstart_config_panel" stretch="0">
<property name="spacing">
<number>0</number>
</property>
<item>
<layout class="QHBoxLayout" name="horizontalLayout" stretch="1,1,0">
<item>
<widget class="QGroupBox" name="groupBox_redstart_network">
<property name="title">
<string>Network</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<layout class="QGridLayout" name="gridLayout_redstart_network">
<item row="1" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>TCP/IP port</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>TCP/IP server address</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLineEdit" name="lineEdit_redstart_network_address">
<property name="text">
<string>localhost</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLineEdit" name="lineEdit_redstart_network_port">
<property name="text">
<string>12340</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QCheckBox" name="checkBox_redstart_network_connect_as_client">
<property name="text">
<string>Connect as client</string>
</property>
</widget>
</item>
</layout>
<widget class="QGroupBox" name="groupBox_redstart_network">
<property name="title">
<string>Network</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<layout class="QGridLayout" name="gridLayout_redstart_network">
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>TCP/IP server address</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="groupBox_redstart_audio_iface">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="title">
<string>Audio interface</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2" stretch="0">
<item>
<layout class="QGridLayout" name="gridLayout_Settings_redstart_vaserver_audio_iface" columnstretch="0,1,0" columnminimumwidth="0,1,0">
<item row="3" column="0">
<widget class="QLabel" name="label_8">
<property name="text">
<string>Buffer size</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QComboBox" name="comboBox_audio_iface_device"/>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_6">
<property name="text">
<string>Device</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label_5">
<property name="text">
<string>Driver</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QComboBox" name="comboBox_audio_driver"/>
</item>
<item row="4" column="1">
<widget class="QComboBox" name="comboBox_audio_iface_sampling_rate"/>
</item>
<item row="4" column="0">
<widget class="QLabel" name="label_16">
<property name="text">
<string>Sampling rate</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QComboBox" name="comboBox_audio_iface_buffer_size"/>
</item>
<item row="0" column="2">
<widget class="QPushButton" name="pushButton_refresh">
<property name="text">
<string>Refresh</string>
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="QCheckBox" name="checkBox_portaudio_default_device">
<property name="enabled">
<bool>false</bool>
</property>
<property name="toolTip">
<string>Portaudio default device (not available for ASIO backend)</string>
</property>
<property name="text">
<string>default</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
<item row="1" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>TCP/IP port</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLineEdit" name="lineEdit_redstart_network_address">
<property name="text">
<string>localhost</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLineEdit" name="lineEdit_redstart_network_port">
<property name="text">
<string>12340</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QCheckBox" name="checkBox_redstart_network_connect_as_client">
<property name="text">
<string>Connect as client</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="groupBox_redstart">
<property name="styleSheet">
<string notr="true"/>
</property>
<property name="title">
<string>Redstart</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_10">
<item>
<widget class="QCheckBox" name="checkBox_redstart_auto_start">
</item>
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="groupBox_redstart_audio_iface">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="title">
<string>Audio interface</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2" stretch="0">
<item>
<layout class="QGridLayout" name="gridLayout_Settings_redstart_vaserver_audio_iface" columnstretch="0,1,0" columnminimumwidth="0,1,0">
<item row="3" column="0">
<widget class="QLabel" name="label_8">
<property name="text">
<string>auto-start</string>
<string>Buffer size</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButton_start_stop">
<item row="1" column="1">
<widget class="QComboBox" name="comboBox_audio_iface_device">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>90</width>
<height>60</height>
<width>180</width>
<height>0</height>
</size>
</property>
<property name="font">
<font>
<family>Arial Black</family>
<pointsize>10</pointsize>
<weight>7</weight>
<italic>false</italic>
<bold>false</bold>
</font>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_6">
<property name="text">
<string>Device</string>
</property>
<property name="styleSheet">
<string notr="true">font: 60 10pt &quot;Arial Black&quot;;
background-color: rgb(208, 255, 188);</string>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label_5">
<property name="text">
<string>Driver</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QComboBox" name="comboBox_audio_driver"/>
</item>
<item row="4" column="1">
<widget class="QComboBox" name="comboBox_audio_iface_sampling_rate"/>
</item>
<item row="4" column="0">
<widget class="QLabel" name="label_16">
<property name="text">
<string>Sampling rate</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QComboBox" name="comboBox_audio_iface_buffer_size"/>
</item>
<item row="0" column="2">
<widget class="QPushButton" name="pushButton_refresh">
<property name="text">
<string>Start</string>
<string>Refresh</string>
</property>
<property name="autoDefault">
</widget>
</item>
<item row="1" column="2">
<widget class="QCheckBox" name="checkBox_portaudio_default_device">
<property name="enabled">
<bool>false</bool>
</property>
<property name="default">
<property name="toolTip">
<string>Portaudio default device (not available for ASIO backend)</string>
</property>
<property name="text">
<string>default</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
<property name="flat">
</widget>
</item>
</layout>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="groupBox_redstart">
<property name="styleSheet">
<string notr="true"/>
</property>
<property name="title">
<string>Redstart</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_10">
<item>
<widget class="QCheckBox" name="checkBox_redstart_auto_start">
<property name="text">
<string>auto-start</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButton_start_stop">
<property name="minimumSize">
<size>
<width>90</width>
<height>60</height>
</size>
</property>
<property name="font">
<font>
<family>Arial Black</family>
<pointsize>10</pointsize>
<weight>7</weight>
<italic>false</italic>
<bold>false</bold>
</font>
</property>
<property name="styleSheet">
<string notr="true">font: 60 10pt &quot;Arial Black&quot;;
background-color: rgb(208, 255, 188);</string>
</property>
<property name="text">
<string>Start</string>
</property>
<property name="autoDefault">
<bool>false</bool>
</property>
<property name="default">
<bool>true</bool>
</property>
<property name="flat">
<bool>false</bool>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</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>false</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>false</bool>
</property>
</widget>
</item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
<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>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>11</height>
</size>
</widget>
</item>
<item row="3" column="1">
<widget class="QLineEdit" name="lineEdit_core_settings_core_clock">
<property name="enabled">
<bool>false</bool>
</property>
</spacer>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
</item>
</layout>
</item>
<item>
<widget class="Line" name="line_after_redstart_control">
<property name="styleSheet">
<string notr="true">color: rgb(255, 255, 255);</string>
</property>
<property name="frameShadow">
<enum>QFrame::Plain</enum>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item>
<layout class="QGridLayout" name="gridLayout_redstart_va" rowstretch="3,0,0" columnstretch="2,0,0,0,0,1">
<item row="0" column="1" colspan="2">
<item row="0" column="2">
<widget class="QGroupBox" name="groupBox_clients">
<property name="enabled">
<bool>false</bool>
</property>
<property name="title">
<string>Clients</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_7">
<item>
<widget class="QListView" name="listView_server_connected_clients"/>
</item>
</layout>
</widget>
</item>
<item row="2" column="0" colspan="3">
<widget class="QGroupBox" name="groupBox_macros">
<property name="enabled">
<bool>false</bool>
</property>
<property name="title">
<string>Macros</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_9">
<item>
<widget class="QListView" name="listView_macros"/>
</item>
</layout>
</widget>
</item>
<item row="1" column="0" colspan="3">
<widget class="QGroupBox" name="groupBox_paths">
<property name="enabled">
<bool>false</bool>
......@@ -396,52 +443,107 @@ background-color: rgb(208, 255, 188);</string>
</layout>
</widget>
</item>
<item row="0" column="0" rowspan="3">
<widget class="QGroupBox" name="groupBox_output">
<property name="enabled">
<bool>false</bool>
</property>
<item row="3" column="5">
<widget class="QGroupBox" name="groupBox_global_am">
<property name="title">
<string>Output</string>
<string>Global auralization mode</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_13">
<layout class="QVBoxLayout" name="verticalLayout_12">
<item>
<widget class="RedstartCoreOutputPlainTextEdit" name="plainTextEdit_core_output"/>
<widget class="QCheckBox" name="checkBox">
<property name="text">
<string>Direct sound</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="1" column="4">
<widget class="QGroupBox" name="groupBox_clients">
<property name="enabled">
<bool>false</bool>
</property>
<property name="title">
<string>Clients</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_7">
<item>
<widget class="QListView" name="listView_server_connected_clients"/>
<widget class="QCheckBox" name="checkBox_2">
<property name="text">
<string>Early reflections</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="checkBox_3">
<property name="text">
<string>Diffuse decay</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="checkBox_4">
<property name="text">
<string>Source directivity</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="checkBox_10">
<property name="text">
<string>Medium absorption</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="checkBox_9">
<property name="text">
<string>Temporal variations</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="checkBox_11">
<property name="text">
<string>Scattering</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="1" column="5" rowspan="2">
<widget class="QGroupBox" name="groupBox_level_meters">
<property name="title">
<string>Level meters</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_11">
<item>
<widget class="QGraphicsView" name="graphicsView"/>
<widget class="QCheckBox" name="checkBox_7">
<property name="text">
<string>Diffraction</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="checkBox_12">
<property name="text">
<string>Near-field</string>
</property>
</widget>
</item>
<item>
<widget class="QGraphicsView" name="graphicsView_2"/>
<widget class="QCheckBox" name="checkBox_6">
<property name="text">
<string>Doppler</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="checkBox_5">
<property name="text">
<string>Spreading loss</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="checkBox_8">
<property name="text">
<string>Transmission</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="checkBox_13">
<property name="text">
<string>Absorption</string>
</property>
</widget>
</item>
</layout>
</widget>