Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
metexplore
MetExploreViz
Commits
2c2b25ae
Commit
2c2b25ae
authored
Jan 08, 2020
by
maxchaza
Browse files
Merge branch 'hotfix/captionContinuous'
parents
b300161e
ec739e66
Changes
3
Hide whitespace changes
Inline
Side-by-side
app/view/form/continuousNumberMappingEditor/ContinuousNumberMappingEditorController.js
View file @
2c2b25ae
...
...
@@ -51,6 +51,9 @@ Ext.define('metExploreViz.view.form.continuousNumberMappingEditor.ContinuousNumb
view
.
lookupReference
(
'
textfieldValue
'
).
on
({
focusleave
:
function
(
that
){
console
.
log
(
me
);
console
.
log
(
view
);
var
value
=
parseFloat
(
that
.
getRawValue
());
...
...
app/view/menu/viz_ImportMenu/Viz_ImportMenu.js
View file @
2c2b25ae
...
...
@@ -70,12 +70,11 @@ Ext.define('metExploreViz.view.menu.viz_ImportMenu.Viz_ImportMenu', {
items
:
[
{
text
:
'
By Name
'
,
reference
:
'
importImageMappingName
'
,
reference
:
'
importImageMappingName
'
},
{
text
:
'
By Id
'
,
reference
:
'
importImageMappingID
'
,
reference
:
'
importImageMappingID
'
}]
},
iconCls
:
'
importImage
'
...
...
resources/lib/functions/GraphNumberScaleEditor.js
View file @
2c2b25ae
...
...
@@ -134,7 +134,7 @@ metExploreD3.GraphNumberScaleEditor = {
me
.
textfieldValue
=
textfieldValue
;
me
.
height
=
height
;
me
.
width
=
width
;
console
.
log
(
me
.
textfieldValue
);
me
.
data
=
data
;
me
.
begin
=
me
.
data
.
find
(
function
(
sr
)
{
return
sr
.
id
===
"
begin
"
;
});
...
...
@@ -295,7 +295,6 @@ metExploreD3.GraphNumberScaleEditor = {
});
me
.
selectedValue
=
indexYVal
;
console
.
log
(
me
.
selectedValue
);
if
(
1
<
me
.
selectedValue
&&
me
.
selectedValue
<
me
.
data
.
length
-
2
)
me
.
delButton
.
enable
();
else
...
...
@@ -497,7 +496,6 @@ metExploreD3.GraphNumberScaleEditor = {
});
me
.
selectedValue
=
indexVal
;
console
.
log
(
me
.
selectedValue
);
if
(
1
<
me
.
selectedValue
&&
me
.
selectedValue
<
me
.
data
.
length
)
me
.
delButton
.
enable
();
else
...
...
@@ -817,7 +815,7 @@ metExploreD3.GraphNumberScaleEditor = {
for
(
var
j
=
i
+
1
;
j
<
me
.
data
.
length
-
1
;
j
++
)
{
me
.
data
[
j
].
id
=
j
;
}
console
.
log
(
me
.
data
);
me
.
createNumberScaleEditor
(
me
.
svg
,
me
.
width
,
me
.
height
,
me
.
numberField
,
me
.
textfieldValue
,
me
.
delButton
,
me
.
data
);
},
...
...
@@ -964,7 +962,7 @@ metExploreD3.GraphNumberScaleEditor = {
},
updateValNumberField
:
function
(
indexVal
){
var
me
=
this
;
console
.
log
(
indexVal
);
if
(
indexVal
===
0
||
indexVal
===
me
.
data
.
length
-
1
){
if
(
indexVal
===
0
){
me
.
textfieldValue
.
setRawValue
(
"
< min
"
);
...
...
@@ -988,6 +986,15 @@ metExploreD3.GraphNumberScaleEditor = {
},
updateValue
:
function
(
value
){
var
me
=
this
;
var
index
=
me
.
data
.
indexOf
(
me
.
data
[
me
.
selectedValue
]);
if
(
index
===
1
){
me
.
data
[
0
].
value
=
value
;
}
if
(
index
===
me
.
data
.
length
-
2
){
me
.
data
[
me
.
data
.
length
-
1
].
value
=
value
;
}
me
.
data
[
me
.
selectedValue
].
value
=
value
;
me
.
createNumberScaleEditor
(
me
.
svg
,
me
.
width
,
me
.
height
,
me
.
numberField
,
me
.
textfieldValue
,
me
.
delButton
,
me
.
data
);
},
...
...
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