[WIP] Paint in different color normal beats, bar beats, and phrase beats. #1918

JaviVilarroig · 2018-11-25T11:20:19Z

Also writes a tag with the beat number with the phrase beats.

The colors are taken from the skin.

Added placeholder values in all skins. Please improve them!!!

Also writes a tag with the beat number with the phrase beats. The colors are taken from the skin. Added placeholder values in all skins. Please improve them!!!

JaviVilarroig · 2018-11-25T11:21:39Z

This is still a work in progress

daschuer

Thank you very much. I have added some comments. Sorry for being too picky.
Did you concider to alter the minor down beat in a 7/8 measure?

src/waveform/renderers/waveformrenderbeat.cpp

ronso0 · 2018-11-26T23:14:25Z

while I see the benefit for others, I think (for me) this adds yet another distraction to the Mixxx interface.
Could you please make bar/phrase makers otional?

@daschuer what was that downbeat marker PR again? @JaviVilarroig I bet you can pick some snippets from that one..

(didn't test yet, but I'll help with the colors)

daschuer · 2018-11-27T07:17:47Z

This is the other PR targeting the same problem:
#1529

JaviVilarroig · 2018-11-29T18:45:35Z

while I see the benefit for others, I think (for me) this adds yet another distraction to the Mixxx interface.
Could you please make bar/phrase makers otional?
I understand your point. Somthing like adding an option in the preferences dialog will be OK?

I will have to investigate how to do it. Any pointer will be welcome :)

@daschuer what was that downbeat marker PR again? @JaviVilarroig I bet you can pick some snippets from that one..
I will take a look.

(didn't test yet, but I'll help with the colors)

ronso0 · 2018-11-29T18:59:33Z

I understand your point. Somthing like adding an option in the preferences dialog will be OK?

yeah, an Preferences option would be nice.

I will have to investigate how to do it. Any pointer will be welcome :)

Maybe look at /src/preferences/dialog/dlgprefwaveform.cpp for example how waveform type is changed and how the value is passed to the waveform widget. Or the elapsed/remaining switch of the PlayPos widget, that's also changeable in the prefs.

WaylonR

Please fix the whitespace you've added.
Seems to be causing a merge conflict, or at least, its making life difficult for me, manually merging.

JaviVilarroig · 2018-12-19T18:09:39Z

Sorry @WaylonR didn't wanted to me it difficult.
I'm new to GitHub and I don't know how to identify the conflicts.
If you can tell me which are the files/lines involved, or how to identify the conflicts by myself, I will be more than happy to fix the issue.

xeruf · 2018-12-23T14:30:05Z

@JaviVilarroig you need to

git checkout master
git pull upstream master
git checkout lp1128005_Bar_and_phrase_marking
git merge master

Then you should see the merge conflicts, solve them and enter git add . && git merge --continue after resolving them. Then you can push and everything should be done ;)

Be-ing · 2018-12-31T01:21:02Z

@JaviVilarroig read https://git-scm.com/book/en/v2/Git-Branching-Basic-Branching-and-Merging#_basic_merge_conflicts for information about resolving merge conflicts.

Be-ing

Thank you for getting started on this. It is a good step in the right direction.

The preference option currently does not work. The bar and phrase markers are always drawn regardless of the option.

I think before we merge this we should implement some way for users to set the first downbeat. I suspect any automatic method of determining this will be wrong in many cases, even with 4/4 beat grids. Let's discuss that further on Zulip and keep the discussion here focused on the code.

src/waveform/renderers/waveformrenderbeat.cpp

Be-ing · 2018-12-31T01:28:49Z

src/waveform/renderers/waveformrenderbeat.cpp

+
+        // Selects the right pen, if we are in phrase also paints the phrase tag
+        bool showBarAndPhrase = true;
+        if(beatNum % (c_beatsPerBar * c_barsPerPhrase) == 0 && beatNum > 0 && showBarAndPhrase) {


I think the logic for determining a beat's position in the bar and the phrase should be moved to the Beats class. For this initial implementation that can rely on the constants that are currently private members of WaveformRenderBeat (those constants should be moved to Beats too). Then it will be easier to implement support for configurable time signatures and the waveform rendering logic shouldn't need any updating. The code here should look something like if (trackBeats->barNumberInPhrase(beatPosition) == 0 && trackBeats->beatNumberInBar(beatPosition) == 0) {

Be-ing · 2018-12-31T01:41:02Z

src/waveform/renderers/waveformrenderbeat.cpp

+            QString label(QString::number(beatNum/16+1));
+            QRect wordRect = metrics.tightBoundingRect(label);
+            const int marginX = 1;
+            const int marginY = 1;


I think these should be multiplied by the scale factor.

Be-ing · 2018-12-31T01:46:36Z

src/waveform/renderers/waveformrenderbeat.cpp

+            painter->drawText(labelRect, Qt::AlignCenter, label);
+
+            painter->setPen(phrasePen);
+        } else if(beatNum % c_beatsPerBar == 0 && beatNum > 0 && showBarAndPhrase) {


Likewise, this check should be replaced by a call to Beats, something like:
if (trackBeats->beatNumberInBar(beatPosition) == 0) {

Be-ing · 2018-12-31T01:48:09Z

src/waveform/renderers/waveformrenderbeat.cpp

+            const int marginX = 1;
+            const int marginY = 1;
+            wordRect.moveTop(marginX + 1);
+            wordRect.moveLeft(marginY + 1);


use scaleFactor() instead of 1

Be-ing · 2018-12-31T01:48:46Z

src/waveform/renderers/waveformrenderbeat.cpp

+            //even wordrect to have an even Image >> draw the line in the middle !
+
+            int labelRectWidth = wordRect.width() + 2 * marginX + 4;
+            int labelRectHeight = wordRect.height() + 2 * marginY + 4 ;


Suggested change

int labelRectHeight = wordRect.height() + 2 * marginY + 4 ;

int labelRectHeight = wordRect.height() + 2 * marginY + 4 * scaleFactor();

Be-ing · 2018-12-31T01:49:29Z

src/waveform/renderers/waveformrenderbeat.cpp

+            rectColor.setAlpha(200);
+            painter->setPen(m_phraseColor);
+            painter->setBrush(QBrush(rectColor));
+            painter->drawRoundedRect(labelRect, 2.0, 2.0);


2 * scaleFactor()

src/waveform/waveformwidgetfactory.h

src/waveform/waveformwidgetfactory.cpp

src/waveform/waveformwidgetfactory.h

Be-ing · 2018-12-31T02:14:50Z

The bottom edge of the phrase markers look cut off:

xeruf · 2018-12-31T13:52:12Z

The first downbeat is obviously the Cue, what is there to discuss? Why would you set the Cue differently?

Be-ing · 2018-12-31T15:08:32Z

That is not a safe assumption. There are many different ways to use the cue point with the variety of modes that Mixxx supports. With some of these modes, the cue point moves often and it would be very easy to throw off the grid if that was tied to the cue point.

xeruf · 2018-12-31T19:29:42Z

Okay. But then the track should also jump to the first downbeat at load instead of the cue. Isn't there an unused "Beat" Cue? What about using that?

xeruf · 2018-12-31T19:32:29Z

Btw, the green markings pop out much more than the phrase markings. It should be the other way around.

Be-ing · 2018-12-31T19:37:23Z

IMO it would be inappropriate to use a cue for marking the beatgrid. That information belongs with the Beats class.

xeruf · 2018-12-31T20:00:42Z

So I guess it could just be part of the Beatgrid, and you just move the first downbeat with the Beatgrid?

xeruf · 2018-12-31T20:03:17Z

Also, we need something for songs that have extra one or two measures in the middle, sometimes that is like that before the drop and it would offset all phrase markings.

Be-ing · 2018-12-31T20:06:46Z

Yes, but this is going beyond the scope of this PR to draw the marks on the waveforms. If you want to discuss that further, let's continue on Zulip.

JaviVilarroig · 2019-01-09T13:21:59Z

@JaviVilarroig you need to
git checkout master
git pull upstream master
git checkout lp1128005_Bar_and_phrase_marking
git merge master
Then you should see the merge conflicts, solve them and enter git add . && git merge --continue after resolving them. Then you can push and everything should be done ;)

I think I manage to solve the conflicts that were affecting you. Not 100% sure dure to my lack of expertise on git. Can you please confirm?

Be-ing · 2019-01-09T13:22:20Z

It looks like you accidentally committed a lot of new files with the last commit.

JaviVilarroig · 2019-01-09T13:40:52Z

It looks like you accidentally committed a lot of new files with the last commit.

Humm. May be I added in my branch all the changes from master? I just wanted to remove the conflict :(

Again my lack of undestanding of git. Sorry for the mess. Is there any way I can fix that? Something like undo the commit and then try again to fix the files?

Be-ing · 2019-01-09T13:47:47Z

First, list the files that should not be committed in .git/info/exclude. Then run git reset --hard HEAD~ and redo the merge. You'll need to do git push --force when you are done to overwrite the old merge commit.

Co-Authored-By: JaviVilarroig <43292281+JaviVilarroig@users.noreply.github.com>

…arroig/mixxx into lp1128005_Bar_and_phrase_marking

JaviVilarroig · 2019-01-12T17:33:35Z

Thank you for getting started on this. It is a good step in the right direction.

The preference option currently does not work. The bar and phrase markers are always drawn regardless of the option.

Yep. I know.

Despite the fact of being able to add a new configuration variable, add it to the dialog and having it properly serialized, I have been unable to read the value from the WaveformRenderBeat class. I have set up a constant to allow testing while I try to find a solution to that issue.

I tried with a Control/ControlProxy pair but failed. If you can point me to a practical example of the use of that classes to read configuration parameters I will investigate from there.

still pending.

JaviVilarroig · 2019-03-13T19:15:12Z

I'm going to put this PR in stand by wile I work in a separate one for improving the Beats class to manage additional information for bars and phrases, variable BPM and beat emphasis, as discussed in Zulip.
My question is, is better to reject that one and to start from scratch in a new PR when I'm ready to work again on that topic or we just leave it as it is by now?

xeruf · 2019-03-15T17:41:46Z

Can we please integrate this as is soon and care about the details later? I do a lot of stuff that just revolves around phrases, and having this would already save me a huge amount of work.
Maybe just implement this together with a config option that is disabled by default and indicates that this feature is WIP. But I'd really like to use this soon!

JaviVilarroig · 2019-03-25T17:15:23Z

I have been playing some sessions using this PR and the result is not really satisfactory. Without more control on what is considered a downbeat, initial one and short phrases, it's not really helpful.
The issue is that is very difficult to produce something better that I have made already without the improvements in Beats.
You can build that branch and test it yourself.

JaviVilarroig · 2019-04-22T15:41:06Z

I have been playing some sessions using this PR and the result is not really satisfactory. Without more control on what is considered a downbeat, initial one and short phrases, it's not really helpful.
The issue is that is very difficult to produce something better that I have made already without the improvements in Beats.
You can build that branch and test it yourself.

Be-ing · 2019-04-22T17:21:41Z

@JaviVilarroig can you undelete your branch? It will still be a useful starting point for whoever works on adding bar and phrase information to the Beats class.

sharst · 2019-06-08T10:27:25Z

I agree that this is not in a state to be merged, but since there was some interest in the feature so far, I recreated the original branch and fixed the option to enable / disable from menu: https://github.com/sharst/mixxx/tree/beat_and_phrase_marks

daschuer · 2019-06-08T17:08:14Z

Cool Thank you. Can you issue a PR for this and describe the current state of work, to make it visible for all.

sharst · 2019-06-11T03:24:47Z

Yes, I will create a new PR once I have integrated the suggestions made here and finished adapting the Track class.

…

On 6/8/19 7:08 PM, Daniel Schürmann wrote: Cool Thank you. Can you issue a PR for this and describe the current state of work, to make it visible for all. — You are receiving this because you commented. Reply to this email directly, view it on GitHub <#1918?email_source=notifications&email_token=AAIQQPWJZEOT5YZAJCIPMN3PZPRQLA5CNFSM4GGHJLR2YY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGODXHY35Q#issuecomment-500141558>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AAIQQPXCXJCP6BKWKI4YXZLPZPRQLANCNFSM4GGHJLRQ>.

Paint in different color normal beats, bar beats, and phrase beats.

5883024

Also writes a tag with the beat number with the phrase beats. The colors are taken from the skin. Added placeholder values in all skins. Please improve them!!!

JaviVilarroig changed the title ~~Paint in different color normal beats, bar beats, and phrase beats.~~ [WIP] Paint in different color normal beats, bar beats, and phrase beats. Nov 25, 2018

daschuer reviewed Nov 26, 2018

View reviewed changes

daschuer mentioned this pull request Nov 27, 2018

Bug #1128005 - Emphasize the downbeats of a track by a separate marker on the waveform #1529

Closed

Adde preference for showing or not the bar and phrase markers

92bdfdd

WaylonR suggested changes Dec 18, 2018

View reviewed changes

Be-ing suggested changes Dec 31, 2018

View reviewed changes

Be-ing mentioned this pull request Dec 31, 2018

[WIP] Enable Setting hotcue color via controlobject #1830

Closed

8 tasks

JaviVilarroig force-pushed the lp1128005_Bar_and_phrase_marking branch from 1a33720 to 92bdfdd Compare January 11, 2019 10:21

JaviVilarroig and others added 6 commits January 11, 2019 11:28

Fixes merge conflict on skin definitions.

f06ce6a

Swap colors between Bar and Phrase markers

0673f34

Update src/waveform/waveformwidgetfactory.h

e60a6e1

Co-Authored-By: JaviVilarroig <43292281+JaviVilarroig@users.noreply.github.com>

Update src/waveform/waveformwidgetfactory.cpp

8472504

Co-Authored-By: JaviVilarroig <43292281+JaviVilarroig@users.noreply.github.com>

Misc fixes proposed by Be-ing

0d2f2bd

Merge branch 'lp1128005_Bar_and_phrase_marking' of github.com:JaviVil…

adc8bf6

…arroig/mixxx into lp1128005_Bar_and_phrase_marking

JaviVilarroig added 4 commits January 21, 2019 20:03

Different fixes requested by the PR reviewers.

c21f910

Beat/Bar/Phrase logic moved to Beats and BeatGrid classes. BeatMap is

ddede35

still pending.

Cleanup of unused constants.

c48d8bc

Fixes unitilized variable

b174415

JaviVilarroig closed this Apr 22, 2019

JaviVilarroig deleted the lp1128005_Bar_and_phrase_marking branch April 22, 2019 15:41

sharst mentioned this pull request Jun 22, 2019

Render bar and phrase marks and a menu option to enable / disable #2186

Closed

	int labelRectHeight = wordRect.height() + 2 * marginY + 4 ;
	int labelRectHeight = wordRect.height() + 2 * marginY + 4 * scaleFactor();

[WIP] Paint in different color normal beats, bar beats, and phrase beats. #1918

[WIP] Paint in different color normal beats, bar beats, and phrase beats. #1918

Conversation

JaviVilarroig commented Nov 25, 2018

JaviVilarroig commented Nov 25, 2018

daschuer left a comment

Choose a reason for hiding this comment

ronso0 commented Nov 26, 2018 • edited Loading

daschuer commented Nov 27, 2018

JaviVilarroig commented Nov 29, 2018

ronso0 commented Nov 29, 2018

WaylonR left a comment

Choose a reason for hiding this comment

JaviVilarroig commented Dec 19, 2018

xeruf commented Dec 23, 2018

Be-ing commented Dec 31, 2018

Be-ing left a comment

Choose a reason for hiding this comment

Be-ing Dec 31, 2018 • edited Loading

Choose a reason for hiding this comment

Be-ing Dec 31, 2018

Choose a reason for hiding this comment

Be-ing Dec 31, 2018

Choose a reason for hiding this comment

Be-ing Dec 31, 2018

Choose a reason for hiding this comment

Be-ing Dec 31, 2018

Choose a reason for hiding this comment

Be-ing Dec 31, 2018

Choose a reason for hiding this comment

Be-ing commented Dec 31, 2018

xeruf commented Dec 31, 2018

Be-ing commented Dec 31, 2018

xeruf commented Dec 31, 2018

xeruf commented Dec 31, 2018

Be-ing commented Dec 31, 2018

xeruf commented Dec 31, 2018

xeruf commented Dec 31, 2018

Be-ing commented Dec 31, 2018

JaviVilarroig commented Jan 9, 2019

Be-ing commented Jan 9, 2019

JaviVilarroig commented Jan 9, 2019

Be-ing commented Jan 9, 2019

JaviVilarroig commented Jan 12, 2019

JaviVilarroig commented Mar 13, 2019

xeruf commented Mar 15, 2019

JaviVilarroig commented Mar 25, 2019

JaviVilarroig commented Apr 22, 2019

Be-ing commented Apr 22, 2019

sharst commented Jun 8, 2019

daschuer commented Jun 8, 2019

sharst commented Jun 11, 2019 via email

ronso0 commented Nov 26, 2018 •

edited

Loading

Be-ing Dec 31, 2018 •

edited

Loading