Skip to content
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.

Sign up for GitHub

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

Find nearest color JS #2356

Closed
wants to merge 45 commits into from
Closed

Find nearest color JS #2356

Changes from 1 commit
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
a1a96d5
Create HotcueColorPalette class
ferranpujolcamins Oct 27, 2019
9af324c
Add methods to store QColor in the config
ferranpujolcamins Oct 27, 2019
39d8624
Add class to store HotcueColorPalette in userconfig
ferranpujolcamins Oct 27, 2019
a25b3a8
Add tests for color config methods
ferranpujolcamins Nov 1, 2019
547a1f7
Merge branch 'master' into new_colors_impl
ferranpujolcamins Nov 1, 2019
f4c29b2
Make Cue related code use QColor
ferranpujolcamins Nov 2, 2019
ece9385
Migrate hotcue color id to RGBA in DB
ferranpujolcamins Nov 2, 2019
ae4907e
Remove PredefinedColorRepresentation
ferranpujolcamins Nov 2, 2019
4367fe3
Make UserSettings available in ControllerEngine
ferranpujolcamins Nov 3, 2019
bfe25a3
Remove PredefinedColors from controller scripts
ferranpujolcamins Nov 3, 2019
e99e1a8
Remove PredefinedColor
ferranpujolcamins Nov 3, 2019
223911e
Update midi-components library
ferranpujolcamins Nov 3, 2019
150cddf
Avoid constructing HotcueColorPaletteSettings every time its used
ferranpujolcamins Nov 3, 2019
44ffe5d
Change test names
ferranpujolcamins Nov 4, 2019
89927fe
Reorder constructor parameters
ferranpujolcamins Nov 4, 2019
91067eb
Rename member variable
ferranpujolcamins Nov 4, 2019
3233dc3
Rename some color related classes
ferranpujolcamins Nov 4, 2019
768c306
Remove cues tab on TrackInfo
ferranpujolcamins Nov 4, 2019
03b4f06
Add QColorDialog to ColorMenu
ferranpujolcamins Nov 4, 2019
a16a290
Merge branch 'master' into new_colors_impl
ferranpujolcamins Nov 11, 2019
5f22b90
Set hotcue color to the first predefined color
ferranpujolcamins Nov 11, 2019
1bc6c77
Set hotcue color CO to -1 when no hotcue is loaded
ferranpujolcamins Nov 11, 2019
fc22b25
Make hotcue skin buttons use the cue color
ferranpujolcamins Nov 11, 2019
85a3762
Pass UserSettings to Controller constructor
ferranpujolcamins Nov 11, 2019
3027abd
Format code
ferranpujolcamins Nov 11, 2019
53a0877
Rename members
ferranpujolcamins Nov 11, 2019
83892d2
Change string literal
ferranpujolcamins Nov 11, 2019
b858137
Allow skins to configure text color depending on background
ferranpujolcamins Nov 11, 2019
bde2fa8
Highlight hotcue buttons when hovered
ferranpujolcamins Nov 11, 2019
c35de30
Fix Shade hotcue buttons color
ferranpujolcamins Nov 12, 2019
7930270
Make hotcue button hover highlighting configurable
ferranpujolcamins Nov 12, 2019
efda2b1
Merge branch 'master' into new_colors_impl
ferranpujolcamins Nov 12, 2019
318025e
src/controllers/colorjsproxy: Add nearestColorMidiCode function
Holzhaus Nov 14, 2019
77b3f55
res/controllers/midi-components: Update HotcueButton to use new API
Holzhaus Nov 14, 2019
ad38a40
Roland DJ-505: Update controller script for new color API
Holzhaus Nov 14, 2019
b873ca2
src/controllers/colorjsproxy: Fix indentation in colorDistance function
Holzhaus Nov 15, 2019
1d05858
src/controllers/colorjsproxy: Add comment to colorDistance algorithm
Holzhaus Nov 15, 2019
2b61025
src/controllers: Add ColorMapper class for controller scripts
Holzhaus Nov 16, 2019
a24b22a
res/controllers/midi-components: Add support for ColorMapper class
Holzhaus Nov 16, 2019
3f42532
Roland DJ-505: Add support for ColorMapper class
Holzhaus Nov 16, 2019
efde9e4
controllers/colormapperjsproxy: Add separate getNearestValue method
Holzhaus Nov 19, 2019
b94a72f
Roland DJ-505: Switch to ControllerMapper::getNearestValue
Holzhaus Nov 19, 2019
73de6dc
midi-components: Remove default value for HotcueButton.colors
Holzhaus Nov 19, 2019
d4cda18
controllers/midi-components: Rename HotcueButton.colors to .colorMapper
Holzhaus Nov 19, 2019
c6c467b
Roland DJ-505: Rename Component.colors to .colorMapper
Holzhaus Nov 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion res/controllers/midi-components-0.0.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@
},
outputColor: function (colorCode) {
if (this.colors !== undefined) {
var nearestColor = color.nearestColorMidiCode(colorCode, this.colors);
var nearestColor = this.colors.getNearestColor(colorCode);
Holzhaus marked this conversation as resolved.
Show resolved Hide resolved
print("COLOR = "+nearestColor);
this.send(nearestColor);
} else {
Expand Down