Library: add overview column #14140

ronso0 · 2025-01-08T09:38:23Z

continuation of #13638
This is now based on @ninomp's initial POC commit 80d8b5f
from https://github.com/ninomp/mixxx/commits/overviewsinlibrary-rebased/
(incl. the fix from #14150 )
I addressed @Swiftb0y's review and a lot evolved anyway.

the library shows a pseudo-mono view (hardcoded in OverviewCache::prepareOverview), though with a bit of refactoring this could be made optional
overviews are rendered as soon as track analysis finished (loading tracks not required)
overviews (decks and library) are updated when the library row height, overview type or the Normalize/visual gain options are changed, and the cache is cleared
the signal colors can be set in the <Library> node exactly like in the waveform templates (<Visual> widget)
WOverView and OverviewDelegate use the same renderer for all types which I extracted from WOverview to src/waveform/renderers/waveformoverviewrenderer
(I adopted the RGB simplifications made by @Nino MP, and simplified the others, too)
there's an OverviewCache which holds the images sized for the overview column

Ideas / Nice to have

show analyzer progress / partial painting like in decks
add mono-mixdown / stereo option
click Overview column header to sort by 'has overview'
cleanup / optimize draw functions in WaveformOverviewRenderer
some sort of analysis progress indicator in the library? (though I think partial rendering would be distracting)
implement preview interface: click to select, click position to preview
show cue markers?

ronso0 · 2025-01-08T09:40:35Z

Draft until CI is happy.
I'll rebase and force-push, so please don't start reviewing yet.

…AnalysisFeature

ronso0 · 2025-01-09T02:00:57Z

I took a second look and polished it a bit.
Ready for review!

passthrough entire color set to WaveformOverviewRenderer, extract what's needed

This catches all additions as before but in a simpler way. Also catches updates and removals (when the track waveform has been cleared).

daschuer

Left some comments, not tested yet.

daschuer · 2025-01-09T15:07:19Z

src/analyzer/analyzerwaveform.cpp

+    // Set waveforms on track AFTER they'been written to disk in order to have
+    // a consistency when OverviewCache asks AnalysisDAO for a waveform summary.
+    if (m_waveform) {
+        tio->setWaveform(m_waveform);


You may chang it to pTrack->...

sure, done.

daschuer · 2025-01-09T15:09:45Z

src/analyzer/analyzerwaveform.cpp

@@ -353,6 +351,15 @@ void AnalyzerWaveform::storeResults(TrackPointer tio) {
            m_waveform,
            m_waveformSummary);

+    // Set waveforms on track AFTER they'been written to disk in order to have
+    // a consistency when OverviewCache asks AnalysisDAO for a waveform summary.
+    if (m_waveform) {


The old code removes the waveform from the track in case of nullptr. It hink that shall remain.

daschuer · 2025-01-09T15:10:20Z

src/analyzer/analyzerwaveform.cpp

+    if (m_waveform) {
+        tio->setWaveform(m_waveform);
+    }
+    if (m_waveformSummary) {


Same here, write the waveform uncoditionally?

okay. I didn't consider that the analyzer may a produce null waveforms.
done.

daschuer · 2025-01-09T15:13:51Z

src/coreservices.cpp

@@ -372,6 +373,12 @@ void CoreServices::initialize(QApplication* pApp) {
            m_pPlayerManager.get(),
            m_pRecordingManager.get());

+    OverviewCache* pOverviewCache = OverviewCache::createInstance(pConfig, m_pDbConnectionPool);
+    connect(&(m_pLibrary->trackCollectionManager()->internalCollection()->getTrackDAO()),


Suggested change

connect(&(m_pLibrary->trackCollectionManager()->internalCollection()->getTrackDAO()),

connect(&(m_pTrackCollectionManager->internalCollection()->getTrackDAO()),

daschuer · 2025-01-09T15:48:26Z

src/library/analysis/analysisfeature.cpp

+                &TrackAnalysisScheduler::trackProgress,
+                this,
+                &AnalysisFeature::trackProgress,
+                Qt::DirectConnection);


We should not use a direct connection here, this may cause headaches later. See my other comment.

daschuer · 2025-01-09T15:51:51Z

src/skin/legacy/legacyskinparser.cpp

+    connect(m_pLibrary,
+            &Library::onTrackAnalyzerProgress,
+            overviewWidget,
+            &WOverview::onTrackAnalyzerProgress);


Here we have probably the a queued connection. Without the Qt::DirectConnections before, we would have the queued connection at the place wher it enteres a main thread object and here we would have automatically a direct connection.
It think this is the way to go.

Thanks for the hint!
The connection are added in #14150, and since that (probably) will be merged before this PR I'll fix it there and it'll be no issue here when I squash after final LGTM.

github-actions bot added skins library ui build preferences waveform analyzer labels Jan 8, 2025

ronso0 mentioned this pull request Jan 8, 2025

Lib overview column ronso0/mixxx#79

Open

4 tasks

ronso0 marked this pull request as draft January 8, 2025 09:39

ronso0 force-pushed the lib-overview-column-ro branch 2 times, most recently from ec7c78c to b0038fb Compare January 8, 2025 13:48

ronso0 and others added 5 commits January 9, 2025 02:03

(fix) WOverview: render progress of analysis triggered by WTrackMenu/…

f08a206

…AnalysisFeature

add Overview column

b6ba762

Overview column: cleanup, performance fixes, TrackId instead of row etc.

222be47

Overview: move renderers to WaveformOverviewRenderer

b96775d

Overview column: use same type as in decks, use scale factor

54684e3

ronso0 force-pushed the lib-overview-column-ro branch from b0038fb to fba0ecc Compare January 9, 2025 02:00

ronso0 marked this pull request as ready for review January 9, 2025 02:00

ronso0 mentioned this pull request Jan 9, 2025

(fix) WOverview: render progress of analysis triggered by WTrackMenu/AnalysisFeature #14150

Open

ronso0 force-pushed the lib-overview-column-ro branch from fba0ecc to 17243c3 Compare January 9, 2025 02:25

ronso0 added 8 commits January 9, 2025 14:39

Overview column: set waveform colors in <Library> node

d093c7c

passthrough entire color set to WaveformOverviewRenderer, extract what's needed

Overview column: update when type is changed in preferences

48150af

WaveformOverviewRenderer: no singleton anymore, all static

ae7fa54

Overview: move type declaration to src/waveform/overviews/overviewtype.h

f7eeb11

Overview column: simplify waveform updates via Track/TrackDAO ...

15a15fa

This catches all additions as before but in a simpler way. Also catches updates and removals (when the track waveform has been cleared).

Overview column: use mono-mixdown mode, painted bottom -> top

1f0d791

Overview column: normalize/scale, update all when options change

bbf6394

overview waveform: move renderer and type declaration

d226e96

ronso0 added 3 commits January 9, 2025 14:39

OverviewCache: make cache clearing on Normalize/Gain change safer

f74d56d

OverviewDelegate: implement lazy loading like in CoverArtDelegate

c0a6d38

Overview: clean up includes and assertions

d644456

ronso0 force-pushed the lib-overview-column-ro branch from 17243c3 to d644456 Compare January 9, 2025 13:39

daschuer requested changes Jan 9, 2025

View reviewed changes

ronso0 added 3 commits January 9, 2025 20:52

fixup! Overview column: simplify waveform updates via Track/TrackDAO ...

5b9dd52

AnalyzerWaveform: tio -> pTrack

a114021

fixup! Overview column: simplify waveform updates via Track/TrackDAO ...

f76a51b

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Library: add overview column #14140

Library: add overview column #14140

ronso0 commented Jan 8, 2025 •

edited

Loading

ronso0 commented Jan 8, 2025

ronso0 commented Jan 9, 2025

daschuer left a comment

daschuer Jan 9, 2025

ronso0 Jan 9, 2025

daschuer Jan 9, 2025

daschuer Jan 9, 2025

ronso0 Jan 9, 2025

daschuer Jan 9, 2025

ronso0 Jan 9, 2025

daschuer Jan 9, 2025

daschuer Jan 9, 2025

ronso0 Jan 9, 2025 •

edited

Loading

	connect(&(m_pLibrary->trackCollectionManager()->internalCollection()->getTrackDAO()),
	connect(&(m_pTrackCollectionManager->internalCollection()->getTrackDAO()),

Library: add overview column #14140

Are you sure you want to change the base?

Library: add overview column #14140

Conversation

ronso0 commented Jan 8, 2025 • edited Loading

Ideas / Nice to have

ronso0 commented Jan 8, 2025

ronso0 commented Jan 9, 2025

daschuer left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ronso0 Jan 9, 2025 • edited Loading

Choose a reason for hiding this comment

ronso0 commented Jan 8, 2025 •

edited

Loading

ronso0 Jan 9, 2025 •

edited

Loading