-
-
Notifications
You must be signed in to change notification settings - Fork 1.3k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Cue colors #992
Cue colors #992
Conversation
@@ -7,6 +7,8 @@ | |||
#include "library/dao/cue.h" | |||
#include "util/assert.h" | |||
|
|||
const QString defaultColor = "#FF0000"; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should be enclosed in an anonymous namespace to restrict the visibility of this symbol. Otherwise it is visible globally and might cause conflicts during linking.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would use QColor instead of QString for this constant.
By the way: Thank you very much for adopting this big topic. |
Also remove empty string literal from Cue constructor.
Everything's fixed :) |
private: | ||
void generateMarkImage(WaveformMark& mark); | ||
void generateMarkImage(WaveformMark* mark); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just a minor naming issue: Should be pMark in both this declaration and the definition in the .cpp file.
Thank you very much, Ferran! I did not have the time to test your extensions, maybe sometime during the following days ;) |
Travis fails: Failed query: "ALTER TABLE cues ADD COLUMN color INTEGER DEFAULT 0xFFFF0000 NOT NULL" QSqlError(1, "Unable to execute statement", "unrecognized token: "0xFFFF0000"") |
As I mentioned, hexadecimal integers are supported since SQLite 4.8.6 I thought this was already fixed? On 21.08.2016 22:23, Daniel Schürmann wrote:
|
Sorry, I forgot about that. It is fixed now. Thank your for the review and explanations, I really appreciate it! Next thing to come is a new combobox to select colors :) |
Done |
I don't have write permissions ;) On 27.08.2016 12:39, Ferran Pujol Camins wrote:
|
Thank you very much for this nice first step! :-) |
Thank you for your support :) |
…eform to the format ``#:label``. See mixxxdj/mixxx#992
This is the first step of https://blueprints.launchpad.net/mixxx/+spec/cuepoints-2.0-new
I'll be issuing small PR regularly, instead of a big messy one.
Here I prepare the database and the DAO layer to support cue colors. I also make waveformrendermark to draw the mark according to the cue color. It also draws cue label.