Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
morpheus.js
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Daria Zenkova
morpheus.js
Commits
a211fa6e
Commit
a211fa6e
authored
Apr 14, 2016
by
jgould
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
don't set min and max on min and max changed
parent
3eb03e49
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
12 deletions
+10
-12
src/ui/heat_map_color_scheme.js
src/ui/heat_map_color_scheme.js
+3
-3
src/ui/heat_map_color_scheme_chooser.js
src/ui/heat_map_color_scheme_chooser.js
+7
-9
No files found.
src/ui/heat_map_color_scheme.js
View file @
a211fa6e
...
@@ -429,7 +429,7 @@ morpheus.HeatMapColorScheme.prototype = {
...
@@ -429,7 +429,7 @@ morpheus.HeatMapColorScheme.prototype = {
:
new
morpheus
.
GradientColorSupplier
();
:
new
morpheus
.
GradientColorSupplier
();
newColorSupplier
.
sizer
=
oldColorSupplier
.
getSizer
();
newColorSupplier
.
sizer
=
oldColorSupplier
.
getSizer
();
newColorSupplier
.
conditions
=
oldColorSupplier
.
getConditions
();
newColorSupplier
.
conditions
=
oldColorSupplier
.
getConditions
();
newColorSupplier
.
g
etScalingMode
(
oldColorSupplier
.
getScalingMode
());
newColorSupplier
.
s
etScalingMode
(
oldColorSupplier
.
getScalingMode
());
newColorSupplier
.
setMin
(
oldColorSupplier
.
getMin
());
newColorSupplier
.
setMin
(
oldColorSupplier
.
getMin
());
newColorSupplier
.
setMax
(
oldColorSupplier
.
getMax
());
newColorSupplier
.
setMax
(
oldColorSupplier
.
getMax
());
newColorSupplier
.
setFractions
({
newColorSupplier
.
setFractions
({
...
@@ -449,8 +449,8 @@ morpheus.HeatMapColorScheme.prototype = {
...
@@ -449,8 +449,8 @@ morpheus.HeatMapColorScheme.prototype = {
_
.
each
(
_
.
keys
(
this
.
rowValueToColorSupplier
),
function
(
key
)
{
_
.
each
(
_
.
keys
(
this
.
rowValueToColorSupplier
),
function
(
key
)
{
// save each scheme
// save each scheme
var
val
=
_this
.
rowValueToColorSupplier
[
key
];
var
val
=
_this
.
rowValueToColorSupplier
[
key
];
//
delete val.sizer;
//
delete val.sizer;
//
delete val.conditions;
//
delete val.conditions;
json
.
colorSchemes
[
key
]
=
val
;
json
.
colorSchemes
[
key
]
=
val
;
});
});
...
...
src/ui/heat_map_color_scheme_chooser.js
View file @
a211fa6e
...
@@ -140,29 +140,26 @@ morpheus.HeatMapColorSchemeChooser = function(options) {
...
@@ -140,29 +140,26 @@ morpheus.HeatMapColorSchemeChooser = function(options) {
formBuilder
.
$form
.
on
(
'
change
'
,
'
[name=missing_color]
'
,
function
(
e
)
{
formBuilder
.
$form
.
on
(
'
change
'
,
'
[name=missing_color]
'
,
function
(
e
)
{
var
color
=
$
(
this
).
val
();
var
color
=
$
(
this
).
val
();
that
.
colorScheme
.
setMissingColor
(
color
);
that
.
colorScheme
.
setMissingColor
(
color
);
that
.
fireChanged
();
that
.
fireChanged
(
false
);
});
});
formBuilder
.
$form
.
on
(
'
change
'
,
'
[name=stepped_colors]
'
,
function
(
e
)
{
formBuilder
.
$form
.
on
(
'
change
'
,
'
[name=stepped_colors]
'
,
function
(
e
)
{
that
.
colorScheme
.
setStepped
(
$
(
this
).
prop
(
'
checked
'
));
that
.
colorScheme
.
setStepped
(
$
(
this
).
prop
(
'
checked
'
));
that
.
fireChanged
();
that
.
fireChanged
();
});
});
formBuilder
.
$form
.
on
(
'
keyup
'
,
'
[name=minimum]
'
,
_
.
debounce
(
function
(
e
)
{
formBuilder
.
$form
.
on
(
'
keyup
'
,
'
[name=minimum]
'
,
_
.
debounce
(
function
(
e
)
{
var
val
=
parseFloat
(
$
(
this
).
val
());
var
val
=
parseFloat
(
$
(
this
).
val
());
if
(
!
isNaN
(
val
))
{
if
(
!
isNaN
(
val
))
{
that
.
colorScheme
.
setMin
(
val
);
that
.
colorScheme
.
setMin
(
val
);
that
.
setSelectedIndex
(
that
.
legend
.
selectedIndex
);
that
.
setSelectedIndex
(
that
.
legend
.
selectedIndex
);
that
.
fireChanged
();
that
.
fireChanged
(
false
);
}
}
},
100
));
},
100
));
formBuilder
.
$form
.
on
(
'
keyup
'
,
'
[name=maximum]
'
,
_
.
debounce
(
function
(
e
)
{
formBuilder
.
$form
.
on
(
'
keyup
'
,
'
[name=maximum]
'
,
_
.
debounce
(
function
(
e
)
{
var
val
=
parseFloat
(
$
(
this
).
val
());
var
val
=
parseFloat
(
$
(
this
).
val
());
if
(
!
isNaN
(
val
))
{
if
(
!
isNaN
(
val
))
{
that
.
colorScheme
.
setMax
(
val
);
that
.
colorScheme
.
setMax
(
val
);
that
.
setSelectedIndex
(
that
.
legend
.
selectedIndex
);
that
.
setSelectedIndex
(
that
.
legend
.
selectedIndex
);
that
.
fireChanged
();
that
.
fireChanged
(
false
);
}
}
},
100
));
},
100
));
...
@@ -290,10 +287,11 @@ morpheus.HeatMapColorSchemeChooser.prototype = {
...
@@ -290,10 +287,11 @@ morpheus.HeatMapColorSchemeChooser.prototype = {
[
this
.
legend
.
border
,
[
this
.
legend
.
border
,
this
.
legend
.
getUnscaledWidth
()
-
this
.
legend
.
border
]);
this
.
legend
.
getUnscaledWidth
()
-
this
.
legend
.
border
]);
},
},
fireChanged
:
function
()
{
fireChanged
:
function
(
noreset
)
{
this
.
trigger
(
'
change
'
);
this
.
trigger
(
'
change
'
);
// restore currentValue
if
(
noreset
!==
false
)
{
this
.
setColorScheme
(
this
.
colorScheme
);
this
.
setColorScheme
(
this
.
colorScheme
);
}
},
},
draw
:
function
()
{
draw
:
function
()
{
var
colorScheme
=
this
.
colorScheme
;
var
colorScheme
=
this
.
colorScheme
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment