Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Redstart
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Iterations
Merge Requests
0
Merge Requests
0
Requirements
Requirements
List
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Incidents
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
Code Review
Insights
Issue
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Institute of Technical Acoustics (ITA)
Redstart
Commits
c4962de8
Commit
c4962de8
authored
Dec 06, 2017
by
Dipl.-Ing. Jonas Stienen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Adding level meter support, but WIP
parent
1c9a9b67
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
30 additions
and
4 deletions
+30
-4
src/RedstartWindow.cpp
src/RedstartWindow.cpp
+23
-2
ui/RedstartWindow.ui
ui/RedstartWindow.ui
+7
-2
No files found.
src/RedstartWindow.cpp
View file @
c4962de8
...
...
@@ -176,6 +176,8 @@ void RedstartWindow::ConnectSignalsAndSlots()
connect
(
ui
->
comboBox_core_settings_log_level
,
SIGNAL
(
currentIndexChanged
(
int
)
),
this
,
SLOT
(
CoreChangeLogLevel
(
int
)
)
);
connect
(
&
m_qSporadicTimer
,
SIGNAL
(
timeout
()
),
this
,
SLOT
(
SporadicTimeout
()
)
);
connect
(
&
m_qSporadicTimer
,
SIGNAL
(
timeout
()
),
ui
->
graphicsView_input_levels
,
SLOT
(
UpdateLevels
()
)
);
connect
(
&
m_qSporadicTimer
,
SIGNAL
(
timeout
()
),
ui
->
graphicsView_output_levels
,
SLOT
(
UpdateLevels
()
)
);
}
...
...
@@ -391,7 +393,12 @@ void RedstartWindow::HandleVAEvent( const CVAEvent* pEvent )
//ui->statusBar->showMessage( pEvent->sParam.c_str() );
break
;
case
CVAEvent
::
MEASURES_UPDATE
:
UpdateMeasures
(
pEvent
->
vfInputRMSs
,
pEvent
->
vfInputPeaks
,
pEvent
->
vfOutputRMSs
,
pEvent
->
vfOutputPeaks
);
if
(
pEvent
->
sParam
==
"RenderingModule"
)
;
// @todo update rendering module GUI for sObjectID
else
if
(
pEvent
->
sParam
==
"ReproductionModule"
)
;
// @todo update reproduction module GUI for sObjectID
else
if
(
pEvent
->
sParam
.
empty
()
)
UpdateMeasures
(
pEvent
->
vfInputRMSs
,
pEvent
->
vfInputPeaks
,
pEvent
->
vfOutputRMSs
,
pEvent
->
vfOutputPeaks
);
// Core i/o
break
;
}
...
...
@@ -426,7 +433,21 @@ void RedstartWindow::HandleVAEvent( const CVAEvent* pEvent )
void
RedstartWindow
::
UpdateMeasures
(
const
std
::
vector
<
float
>&
vfInputRMSs
,
const
std
::
vector
<
float
>&
vfInputPeaks
,
const
std
::
vector
<
float
>&
vfOutputRMSs
,
const
std
::
vector
<
float
>&
vfOutputPeaks
)
{
// @todo feed level meters
int
iNumInputChannels
=
(
int
)
vfInputRMSs
.
size
();
assert
(
vfInputRMSs
.
size
()
==
vfInputPeaks
.
size
()
);
if
(
ui
->
graphicsView_input_levels
->
GetNumChannels
()
!=
iNumInputChannels
)
ui
->
graphicsView_input_levels
->
SetNumChannels
(
iNumInputChannels
);
ui
->
graphicsView_input_levels
->
SetRMSs
(
vfInputRMSs
);
ui
->
graphicsView_input_levels
->
SetPeaks
(
vfInputPeaks
);
int
iNumOutputChannels
=
(
int
)
vfOutputRMSs
.
size
();
assert
(
vfOutputRMSs
.
size
()
==
vfOutputPeaks
.
size
()
);
if
(
ui
->
graphicsView_output_levels
->
GetNumChannels
()
!=
iNumOutputChannels
)
ui
->
graphicsView_output_levels
->
SetNumChannels
(
iNumOutputChannels
);
ui
->
graphicsView_output_levels
->
SetRMSs
(
vfInputRMSs
);
ui
->
graphicsView_output_levels
->
SetPeaks
(
vfInputPeaks
);
}
void
RedstartWindow
::
AcquireAsioDevices
()
...
...
ui/RedstartWindow.ui
View file @
c4962de8
...
...
@@ -651,7 +651,7 @@ background-color: rgb(208, 255, 188);</string>
</widget>
</item>
<item
row=
"1"
column=
"1"
>
<widget
class=
"
QGraphicsView
"
name=
"graphicsView_output_levels"
>
<widget
class=
"
CITAQtWLevelMeter
"
name=
"graphicsView_output_levels"
>
<property
name=
"sizePolicy"
>
<sizepolicy
hsizetype=
"Minimum"
vsizetype=
"Fixed"
>
<horstretch>
0
</horstretch>
...
...
@@ -714,7 +714,7 @@ background-color: rgb(208, 255, 188);</string>
</widget>
</item>
<item
row=
"1"
column=
"0"
>
<widget
class=
"
QGraphicsView
"
name=
"graphicsView_input_levels"
>
<widget
class=
"
CITAQtWLevelMeter
"
name=
"graphicsView_input_levels"
>
<property
name=
"sizePolicy"
>
<sizepolicy
hsizetype=
"Minimum"
vsizetype=
"Fixed"
>
<horstretch>
0
</horstretch>
...
...
@@ -1287,6 +1287,11 @@ background-color: rgb(208, 255, 188);</string>
</widget>
<layoutdefault
spacing=
"6"
margin=
"11"
/>
<customwidgets>
<customwidget>
<class>
CITAQtWLevelMeter
</class>
<extends>
QGraphicsView
</extends>
<header
location=
"global"
>
ITAQtWLevelMeter.h
</header>
</customwidget>
<customwidget>
<class>
RedstartSessionListView
</class>
<extends>
QListView
</extends>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment