Skip to content

GitLab

Commit 6d5ed2f0 authored by Dipl.-Ing. Jonas Stienen's avatar Dipl.-Ing. Jonas Stienen
Browse files

Updating UI elements

parent 8bf587a0
Hide whitespace changes
Inline Side-by-side
CMakeLists.txt
View file @ 6d5ed2f0
......@@ -58,6 +58,8 @@ set( Redstart_Sources
"src/RedstartUtils.h"
"src/RedstartSessionBinauralHeadphonesDialog.cpp"
"src/RedstartSessionBinauralHeadphonesDialog.h"
"src/RedstartSessionExperimentalTalkthroughDialog.cpp"
"src/RedstartSessionExperimentalTalkthroughDialog.h"
"src/RedstartSessionList.h"
)
......
src/RedstartSessionBinauralHeadphonesDialog.cpp
View file @ 6d5ed2f0
......@@ -65,7 +65,7 @@ QVariantHash RedstartSessionBinauralHeadphonesDialog::GetCoreConfig() const
QString sDemoSoundMacro = ui->lineEdit_macro_DemoSound->text();
if( ui->checkBox_folders_as_search_path->isChecked() )
{
QFileInfo oDemoSound( sHRIRMacro );
QFileInfo oDemoSound( sDemoSoundMacro );
sDemoSoundMacro = oDemoSound.fileName();
}
......
src/RedstartWindow.cpp
View file @ 6d5ed2f0
......@@ -21,6 +21,7 @@
#include "RedstartRunSimpleExample.h"
#include "RedstartSessionBinauralHeadphonesDialog.h"
#include "RedstartSessionExperimentalTalkthroughDialog.h"
#include "RedstartUtils.h"
#include <VA.h>
......@@ -574,7 +575,13 @@ void RedstartWindow::on_actionBinauralHeadphones_triggered()
void RedstartWindow::on_actionDefault_experimental_session_triggered()
{
RedstartSessionExperimentalTalkthroughDialog d( this );
if( d.exec() )
{
QVariantHash oCoreConfig = d.GetCoreConfig();
// add session
return;
}
}
void RedstartWindow::on_actionRunSimpleExample_triggered()
......@@ -596,3 +603,8 @@ void RedstartWindow::on_actionCirculating_source_triggered()
{
}
void RedstartWindow::on_actionAmbisonics_triggered()
{
}
src/RedstartWindow.h
View file @ 6d5ed2f0
......@@ -141,6 +141,8 @@ private slots:
void on_actionCirculating_source_triggered();
void on_actionAmbisonics_triggered();
private:
void PostCoreStart();
void PostCoreStop();
......
ui/RedstartSessionBinauralHeadphonesDialog.ui
View file @ 6d5ed2f0
......@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>576</width>
<height>209</height>
<height>316</height>
</rect>
</property>
<property name="windowTitle">
......@@ -23,20 +23,17 @@
</property>
</widget>
</item>
<item row="6" column="1" colspan="2">
<widget class="QCheckBox" name="checkBox_folders_as_search_path">
<item row="2" column="3">
<widget class="QPushButton" name="pushButton_BrowseHRIR">
<property name="text">
<string>Add all base folders as search paths (instead of using absolute paths)</string>
</property>
<property name="checked">
<bool>true</bool>
<string>Select</string>
</property>
</widget>
</item>
<item row="2" column="3">
<widget class="QPushButton" name="pushButton_BrowseHRIR">
<item row="6" column="1" colspan="2">
<widget class="QLineEdit" name="lineEdit_headphone_channels">
<property name="text">
<string>Select</string>
<string>1,2</string>
</property>
</widget>
</item>
......@@ -53,17 +50,16 @@
</property>
</widget>
</item>
<item row="5" column="1" colspan="2">
<widget class="QLineEdit" name="lineEdit_headphone_channels">
<property name="text">
<string>1,2</string>
<item row="4" column="2">
<widget class="QLabel" name="label_6">
<property name="toolTip">
<string>The filter length is only used to define the convolution engine length. Use a power of 2 and at least the filter length of your HRIR.</string>
</property>
<property name="statusTip">
<string/>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label_4">
<property name="text">
<string>Session name</string>
<string>Samples</string>
</property>
</widget>
</item>
......@@ -74,7 +70,7 @@
</property>
</widget>
</item>
<item row="3" column="0">
<item row="4" column="0">
<widget class="QLabel" name="label_5">
<property name="toolTip">
<string>The filter length is only used to define the convolution engine length. Use a power of 2 and at least the filter length of your HRIR.</string>
......@@ -87,16 +83,10 @@
</property>
</widget>
</item>
<item row="3" column="2">
<widget class="QLabel" name="label_6">
<property name="toolTip">
<string>The filter length is only used to define the convolution engine length. Use a power of 2 and at least the filter length of your HRIR.</string>
</property>
<property name="statusTip">
<string/>
</property>
<item row="0" column="0">
<widget class="QLabel" name="label_4">
<property name="text">
<string>Samples</string>
<string>Session name</string>
</property>
</widget>
</item>
......@@ -107,28 +97,28 @@
</property>
</widget>
</item>
<item row="1" column="1" colspan="2">
<widget class="QLineEdit" name="lineEdit_macro_DemoSound">
<item row="1" column="3">
<widget class="QPushButton" name="pushButton_BrowseDemoSound">
<property name="text">
<string>WelcomeToVA.wav</string>
<string>Select</string>
</property>
</widget>
</item>
<item row="1" column="3">
<widget class="QPushButton" name="pushButton_BrowseDemoSound">
<item row="1" column="1" colspan="2">
<widget class="QLineEdit" name="lineEdit_macro_DemoSound">
<property name="text">
<string>Select</string>
<string>WelcomeToVA.wav</string>
</property>
</widget>
</item>
<item row="5" column="0">
<item row="6" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
<string>Headphone channels</string>
</property>
</widget>
</item>
<item row="3" column="1">
<item row="4" column="1">
<widget class="QSpinBox" name="spinBox_hrir_filter_length">
<property name="minimum">
<number>1</number>
......@@ -141,12 +131,101 @@
</property>
</widget>
</item>
<item row="3" column="1" colspan="2">
<widget class="QCheckBox" name="checkBox_folders_as_search_path">
<property name="text">
<string>Add all folders as search paths (instead of using absolute paths)</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item row="7" column="0" colspan="4">
<widget class="QGroupBox" name="groupBox">
<property name="enabled">
<bool>false</bool>
</property>
<property name="title">
<string>Headphone equalization</string>
</property>
<property name="checkable">
<bool>true</bool>
</property>
<property name="checked">
<bool>false</bool>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<item row="1" column="1">
<widget class="QDoubleSpinBox" name="doubleSpinBox_InvHPIRCalibrationGain"/>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_8">
<property name="text">
<string>Inverse HPRI calibration gain</string>
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="QCheckBox" name="checkBox">
<property name="text">
<string>dB</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label_7">
<property name="text">
<string>Inverse HPIR file</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLineEdit" name="lineEdit"/>
</item>
<item row="0" column="2">
<widget class="QPushButton" name="pushButton">
<property name="text">
<string>Select</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QLineEdit" name="lineEdit_2">
<property name="enabled">
<bool>false</bool>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_9">
<property name="text">
<string>HPIR filter length</string>
</property>
</widget>
</item>
<item row="2" column="2">
<widget class="QCheckBox" name="checkBox_2">
<property name="text">
<string>auto</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QPushButton" name="pushButton_CreateSession">
<property name="text">
<string>Create binaural headphone session</string>
<string>Create</string>
</property>
</widget>
</item>
......
ui/RedstartSessionExperimentalTalkthroughDialog.ui
View file @ 6d5ed2f0
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>Dialog</class>
<widget class="QDialog" name="Dialog">
<class>RedstartSessionExperimentalTalkthroughDialog</class>
<widget class="QDialog" name="RedstartSessionExperimentalTalkthroughDialog">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>412</width>
<height>169</height>
<width>468</width>
<height>173</height>
</rect>
</property>
<property name="windowTitle">
......@@ -17,9 +17,9 @@
<item>
<layout class="QGridLayout" name="gridLayout">
<item row="1" column="1">
<widget class="QLineEdit" name="lineEdit_demo_sound_macro">
<widget class="QLineEdit" name="lineEdit_macro_DemoSound">
<property name="text">
<string>$(DemoSound)</string>
<string>WelcomeToVA.wav</string>
</property>
</widget>
</item>
......@@ -37,21 +37,21 @@
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label">
<item row="5" column="0" colspan="3">
<widget class="QPushButton" name="pushButton_CreateSession">
<property name="text">
<string>Session name</string>
<string>Create</string>
</property>
</widget>
</item>
<item row="4" column="0" colspan="3">
<widget class="QPushButton" name="pushButton_create">
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Create experimental session</string>
<string>Session name</string>
</property>
</widget>
</item>
<item row="2" column="0">
<item row="3" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
<string>Number of channels</string>
......@@ -65,30 +65,40 @@
</property>
</widget>
</item>
<item row="3" column="0">
<item row="3" column="1">
<widget class="QSpinBox" name="spinBox_num_channels">
<property name="minimum">
<number>1</number>
</property>
<property name="maximum">
<number>9999</number>
</property>
<property name="value">
<number>2</number>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="label_4">
<property name="text">
<string>Output channel routing</string>
</property>
</widget>
</item>
<item row="3" column="1">
<item row="4" column="1">
<widget class="QLineEdit" name="lineEdit_output_channels">
<property name="text">
<string>1,2</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QSpinBox" name="spinBox_num_channels">
<property name="minimum">
<number>1</number>
</property>
<property name="maximum">
<number>9999</number>
<item row="2" column="1" colspan="2">
<widget class="QCheckBox" name="checkBox_folders_as_search_path">
<property name="text">
<string>Add all folders as search paths (instead of using absolute paths)</string>
</property>
<property name="value">
<number>2</number>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
......
ui/RedstartWindow.ui
View file @ 6d5ed2f0
......@@ -833,9 +833,6 @@ background-color: rgb(208, 255, 188);</string>
<height>21</height>
</rect>
</property>
<property name="styleSheet">
<string notr="true">background-color: rgb(255, 255, 255);</string>
</property>
<widget class="QMenu" name="menuRedstart">
<property name="title">
<string>Redstart</string>
......@@ -844,16 +841,20 @@ background-color: rgb(208, 255, 188);</string>
<property name="title">
<string>New session</string>
</property>
<addaction name="actionAmbisonics"/>
<addaction name="actionBinauralHeadphones"/>
<addaction name="actionDefault_experimental_session"/>
<addaction name="separator"/>
<addaction name="actionSession_wizard"/>
<addaction name="separator"/>
<addaction name="actionEmpty_session"/>
<addaction name="separator"/>
<addaction name="actionOpen_session"/>
<addaction name="separator"/>
<addaction name="actionBinauralHeadphones"/>
<addaction name="actionDefault_experimental_session"/>
<addaction name="actionImport_session"/>
</widget>
<widget class="QMenu" name="menuCrurrent_session">
<property name="enabled">
<bool>false</bool>
</property>
<property name="title">
<string>Current session</string>
</property>
......@@ -897,7 +898,10 @@ background-color: rgb(208, 255, 188);</string>
<addaction name="menuRun"/>
<addaction name="menuHelp"/>
</widget>
<action name="actionOpen_session">
<action name="actionImport_session">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Import session from file</string>
</property>
......@@ -933,6 +937,9 @@ background-color: rgb(208, 255, 188);</string>
</property>
</action>
<action name="actionSession_wizard">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Session wizard</string>
</property>
......@@ -948,7 +955,7 @@ background-color: rgb(208, 255, 188);</string>
<string>Simple example</string>
</property>
<property name="toolTip">
<string>Run a simple example scene</string>
<string>Run a simple example scene (Requires macros DemoSound and DefaultHRIR)</string>
</property>
<property name="shortcut">
<string>R, S</string>
......@@ -966,6 +973,9 @@ background-color: rgb(208, 255, 188);</string>
</property>
</action>
<action name="actionAbout_Redstart">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>About</string>
</property>
......@@ -974,6 +984,9 @@ background-color: rgb(208, 255, 188);</string>
</property>
</action>
<action name="actionEmpty_session">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Empty session</string>
</property>
......@@ -986,7 +999,7 @@ background-color: rgb(208, 255, 188);</string>
</action>
<action name="actionBinauralHeadphones">
<property name="text">
<string>Binaural headphones</string>
<string>Binaural</string>
</property>
<property name="toolTip">
<string>Create a new binaural session for headphones</string>
......@@ -1026,6 +1039,9 @@ background-color: rgb(208, 255, 188);</string>
</property>
</action>
<action name="actionPreferences">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Preferences</string>
</property>
......@@ -1077,6 +1093,9 @@ background-color: rgb(208, 255, 188);</string>
</property>
</action>
<action name="actionCirculating_source">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Circulating source</string>
</property>
......@@ -1084,6 +1103,17 @@ background-color: rgb(208, 255, 188);</string>
<string>R, C</string>
</property>
</action>
<action name="actionAmbisonics">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Ambisonics</string>
</property>
<property name="shortcut">
<string>N, A</string>
</property>
</action>
</widget>
<layoutdefault spacing="6" margin="11"/>
<customwidgets>
......
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