allow changing the waveform overview type without reloading the skin #13273
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ronso0
force-pushed
the
overview-type-integration
branch
from
6782e99
to
d0e0e94
Compare
|
I think this super low-risk and can go to 2.5 FWIW the only change I made here was to move the draw functions to the base class, no further adjustments. |
ronso0
force-pushed
the
overview-type-integration
branch
from
d0e0e94
to
7080e9d
Compare
ronso0
force-pushed
the
overview-type-integration
branch
2 times, most recently
from
866de76
to
6c3ec64
Compare
ronso0
force-pushed
the
overview-type-integration
branch
from
6c3ec64
to
d4c1bc2
Compare
daschuer
requested changes
Jun 13, 2024
| const QString m_group; | ||
| UserSettingsPointer m_pConfig; | ||
| parented_ptr<ControlProxy> m_endOfTrackControl; | ||
|
|
||
| int m_type; |
There was a problem hiding this comment.
Sure, we can that's why I mentioned it as nice-to-have in the description, and I already took a stab at it.
But I gave up since it took to long and isn't mandatory IMO, even feels like this makes the preferences more complicated (or I simply messed something up there)
I can take another look, but actually I'd appreciate if we could this merged soonish and refine later on (before the 2.5 release)
src/widget/woverview.cpp
Outdated
| @@ -1211,6 +1237,285 @@ void WOverview::drawPassthroughOverlay(QPainter* pPainter) { | |||
| } | |||
| } | |||
|
|
|||
| bool WOverview::drawNextPixmapPart() { | |||
| ScopedTimer t(u"WOverview::drawNextPixmapPartHSV"); | |||
There was a problem hiding this comment.
Suggested change
| ScopedTimer t(u"WOverview::drawNextPixmapPartHSV"); | |
| ScopedTimer t(QStringLiteral("WOverview::drawNextPixmapPartHSV")); |
Else it will break after merging 2.5 to main.
src/widget/woverview.cpp
Outdated
| ConstWaveformPointer pWaveform, | ||
| const int nextCompletion) { | ||
| DEBUG_ASSERT(!m_waveformSourceImage.isNull()); | ||
| ScopedTimer t(u"WOverview::drawNextPixmapPartHSV"); |
There was a problem hiding this comment.
Suggested change
| ScopedTimer t(u"WOverview::drawNextPixmapPartHSV"); | |
| ScopedTimer t(QStringLieral("WOverview::drawNextPixmapPartHSV")); |
src/widget/woverview.cpp
Outdated
| ConstWaveformPointer pWaveform, | ||
| const int nextCompletion) { | ||
| DEBUG_ASSERT(!m_waveformSourceImage.isNull()); | ||
| ScopedTimer t(u"WOverview::drawNextPixmapPartLMH"); |
There was a problem hiding this comment.
Suggested change
| ScopedTimer t(u"WOverview::drawNextPixmapPartLMH"); | |
| ScopedTimer t(QStringLiteral("WOverview::drawNextPixmapPartLMH")); |
src/widget/woverview.cpp
Outdated
| ConstWaveformPointer pWaveform, | ||
| const int nextCompletion) { | ||
| DEBUG_ASSERT(!m_waveformSourceImage.isNull()); | ||
| ScopedTimer t(u"WOverview::drawNextPixmapPartRGB"); |
There was a problem hiding this comment.
Suggested change
| ScopedTimer t(u"WOverview::drawNextPixmapPartRGB"); | |
| ScopedTimer t(QStringLiteral("WOverview::drawNextPixmapPartRGB")); |
ronso0
force-pushed
the
overview-type-integration
branch
from
227973f
to
3fd550b
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
... by moving the RGB/LMH/HSV pixmap drawing into the base class WOveriew.
Type change is caught by a ControlProxy.
Switching works super smooth 😎
Partially fixes #9745
This is a bugfix IMO and can slip in 2.5 anytime.
Nice to have: enum for overview type
Hopefully not to many conflicts with the current waveform pref work