AudioViz: added a wave spectrum visualization. changed color to "primary"
This commit is contained in:
parent
0e8c37a215
commit
cb9877cd1b
6 changed files with 116 additions and 32 deletions
|
|
@ -1,6 +1,5 @@
|
||||||
import QtQuick
|
import QtQuick
|
||||||
import qs.Commons
|
import qs.Commons
|
||||||
import qs.Services
|
|
||||||
|
|
||||||
Item {
|
Item {
|
||||||
id: root
|
id: root
|
||||||
|
|
@ -9,38 +8,30 @@ Item {
|
||||||
property int strokeWidth: 0
|
property int strokeWidth: 0
|
||||||
property var values: []
|
property var values: []
|
||||||
|
|
||||||
readonly property real xScale: width / (values.length * 2)
|
// Pre compute horizontal mirroring
|
||||||
|
readonly property int valuesCount: values.length
|
||||||
|
readonly property int totalBars: valuesCount * 2
|
||||||
|
readonly property real barSlotWidth: totalBars > 0 ? width / totalBars : 0
|
||||||
|
|
||||||
Repeater {
|
Repeater {
|
||||||
model: values.length
|
model: root.totalBars
|
||||||
Rectangle {
|
|
||||||
property real amp: values[values.length - 1 - index]
|
|
||||||
|
|
||||||
color: fillColor
|
Rectangle {
|
||||||
border.color: strokeColor
|
// The first half of bars are a mirror image (reversed values array).
|
||||||
border.width: strokeWidth
|
// The second half of bars are in normal order.
|
||||||
|
property int valueIndex: index < root.valuesCount ? root.valuesCount - 1 - index // Mirrored half
|
||||||
|
: index - root.valuesCount // Normal half
|
||||||
|
|
||||||
|
property real amp: root.values[valueIndex]
|
||||||
|
|
||||||
|
color: root.fillColor
|
||||||
|
border.color: root.strokeColor
|
||||||
|
border.width: root.strokeWidth
|
||||||
antialiasing: true
|
antialiasing: true
|
||||||
|
|
||||||
width: xScale * 0.5
|
width: root.barSlotWidth * 0.5 // Creates a small gap between bars
|
||||||
height: Math.max(1, root.height * amp)
|
height: Math.max(1, root.height * amp)
|
||||||
x: index * xScale
|
x: index * root.barSlotWidth
|
||||||
y: root.height - height
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Repeater {
|
|
||||||
model: values.length
|
|
||||||
Rectangle {
|
|
||||||
property real amp: values[index]
|
|
||||||
|
|
||||||
color: fillColor
|
|
||||||
border.color: strokeColor
|
|
||||||
border.width: strokeWidth
|
|
||||||
antialiasing: true
|
|
||||||
|
|
||||||
width: xScale * 0.5
|
|
||||||
height: Math.max(1, root.height * amp)
|
|
||||||
x: (values.length + index) * xScale
|
|
||||||
y: root.height - height
|
y: root.height - height
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
77
Modules/Audio/WaveSpectrum.qml
Normal file
77
Modules/Audio/WaveSpectrum.qml
Normal file
|
|
@ -0,0 +1,77 @@
|
||||||
|
import QtQuick
|
||||||
|
import qs.Commons
|
||||||
|
|
||||||
|
Item {
|
||||||
|
id: root
|
||||||
|
property color fillColor: Color.mPrimary
|
||||||
|
property color strokeColor: Color.mOnSurface
|
||||||
|
property int strokeWidth: 0
|
||||||
|
property var values: []
|
||||||
|
|
||||||
|
// Redraw when necessary
|
||||||
|
onWidthChanged: canvas.requestPaint()
|
||||||
|
onHeightChanged: canvas.requestPaint()
|
||||||
|
onValuesChanged: canvas.requestPaint()
|
||||||
|
onFillColorChanged: canvas.requestPaint()
|
||||||
|
onStrokeColorChanged: canvas.requestPaint()
|
||||||
|
|
||||||
|
Canvas {
|
||||||
|
id: canvas
|
||||||
|
anchors.fill: parent
|
||||||
|
antialiasing: true
|
||||||
|
|
||||||
|
onPaint: {
|
||||||
|
var ctx = getContext("2d")
|
||||||
|
ctx.reset()
|
||||||
|
|
||||||
|
if (values.length === 0) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Create the mirrored values
|
||||||
|
const partToMirror = values.slice(1).reverse()
|
||||||
|
const mirroredValues = partToMirror.concat(values)
|
||||||
|
|
||||||
|
if (mirroredValues.length < 2) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
ctx.fillStyle = root.fillColor
|
||||||
|
ctx.strokeStyle = root.strokeColor
|
||||||
|
ctx.lineWidth = root.strokeWidth
|
||||||
|
|
||||||
|
const count = mirroredValues.length
|
||||||
|
const stepX = width / (count - 1)
|
||||||
|
const centerY = height / 2
|
||||||
|
const amplitude = height / 2
|
||||||
|
|
||||||
|
ctx.beginPath()
|
||||||
|
|
||||||
|
// Draw the top half of the waveform from left to right
|
||||||
|
ctx.moveTo(0, centerY - (mirroredValues[0] * amplitude)) // Move to the first point
|
||||||
|
for (var i = 1; i < count; i++) {
|
||||||
|
const x = i * stepX
|
||||||
|
const y = centerY - (mirroredValues[i] * amplitude)
|
||||||
|
ctx.lineTo(x, y)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Draw the bottom half of the waveform from right to left to create a closed shape
|
||||||
|
for (var i = count - 1; i >= 0; i--) {
|
||||||
|
const x = i * stepX
|
||||||
|
const y = centerY + (mirroredValues[i] * amplitude)
|
||||||
|
// Mirrored across the center
|
||||||
|
ctx.lineTo(x, y)
|
||||||
|
}
|
||||||
|
|
||||||
|
ctx.closePath()
|
||||||
|
|
||||||
|
// --- Render the path ---
|
||||||
|
if (root.fillColor.a > 0) {
|
||||||
|
ctx.fill()
|
||||||
|
}
|
||||||
|
if (root.strokeWidth > 0) {
|
||||||
|
ctx.stroke()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -54,7 +54,7 @@ Row {
|
||||||
Row {
|
Row {
|
||||||
id: cpuTempLayout
|
id: cpuTempLayout
|
||||||
// spacing is thin here to compensate for the vertical thermometer icon
|
// spacing is thin here to compensate for the vertical thermometer icon
|
||||||
spacing: Style.marginTiniest * scaling
|
spacing: Style.marginTiniest * scaling
|
||||||
|
|
||||||
NIcon {
|
NIcon {
|
||||||
text: "thermometer"
|
text: "thermometer"
|
||||||
|
|
@ -93,8 +93,7 @@ Row {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}// Row {
|
||||||
// Row {
|
|
||||||
// id: layout
|
// id: layout
|
||||||
// anchors.verticalCenter: parent.verticalCenter
|
// anchors.verticalCenter: parent.verticalCenter
|
||||||
// spacing: Style.marginSmall * scaling
|
// spacing: Style.marginSmall * scaling
|
||||||
|
|
|
||||||
|
|
@ -265,6 +265,10 @@ ColumnLayout {
|
||||||
key: "linear"
|
key: "linear"
|
||||||
name: "Linear"
|
name: "Linear"
|
||||||
}
|
}
|
||||||
|
ListElement {
|
||||||
|
key: "wave"
|
||||||
|
name: "Wave"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
currentKey: Settings.data.audio.visualizerType
|
currentKey: Settings.data.audio.visualizerType
|
||||||
onSelected: function (key) {
|
onSelected: function (key) {
|
||||||
|
|
|
||||||
|
|
@ -340,7 +340,20 @@ NBox {
|
||||||
width: 300 * scaling
|
width: 300 * scaling
|
||||||
height: 80 * scaling
|
height: 80 * scaling
|
||||||
values: CavaService.values
|
values: CavaService.values
|
||||||
fillColor: Color.mOnSurface
|
fillColor: Color.mPrimary
|
||||||
|
Layout.alignment: Qt.AlignHCenter
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Loader {
|
||||||
|
active: Settings.data.audio.visualizerType == "wave"
|
||||||
|
Layout.alignment: Qt.AlignHCenter
|
||||||
|
|
||||||
|
sourceComponent: WaveSpectrum {
|
||||||
|
width: 300 * scaling
|
||||||
|
height: 80 * scaling
|
||||||
|
values: CavaService.values
|
||||||
|
fillColor: Color.mPrimary
|
||||||
Layout.alignment: Qt.AlignHCenter
|
Layout.alignment: Qt.AlignHCenter
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,7 @@ Singleton {
|
||||||
id: root
|
id: root
|
||||||
|
|
||||||
property var values: Array(barsCount).fill(0)
|
property var values: Array(barsCount).fill(0)
|
||||||
property int barsCount: 20
|
property int barsCount: 32
|
||||||
|
|
||||||
property var config: ({
|
property var config: ({
|
||||||
"general": {
|
"general": {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue