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
8b890910
Commit
8b890910
authored
Jan 31, 2020
by
maxchaza
Browse files
Merge branch 'hotfix/interligne'
parents
13832e89
12a8f8dc
Changes
2
Show whitespace changes
Inline
Side-by-side
app.json
View file @
8b890910
...
...
@@ -7,7 +7,7 @@
/**
*
The
version
of
the
application.
*/
"version"
:
"3.0.
6
"
,
"version"
:
"3.0.
7
"
,
/**
*
The
relative
path
to
the
application's
markup
file
(html
,
jsp
,
asp
,
etc.).
...
...
resources/lib/functions/D3Extention.js
View file @
8b890910
...
...
@@ -98,11 +98,36 @@ d3.selection.prototype.addNodeText = function(style) {
var
minDim
=
Math
.
min
(
style
.
getWidth
(),
style
.
getHeight
());
// Listening font-size attribute tu update tspan dy attr similarly
var
observer
=
new
MutationObserver
(
function
(
mutations
)
{
mutations
.
forEach
(
function
(
mutation
)
{
if
(
mutation
.
type
==
"
attributes
"
&&
mutation
.
oldValue
)
{
if
(
mutation
.
target
.
style
[
"
font-size
"
]
!==
mutation
.
oldValue
.
split
(
"
font-size:
"
)[
1
].
split
(
"
;
"
)[
0
]){
d3
.
select
(
mutation
.
target
).
selectAll
(
"
tspan
"
)
.
each
(
function
(
ts
,
i
)
{
if
(
i
>
0
){
d3
.
select
(
this
).
attr
(
'
dy
'
,
mutation
.
target
.
style
[
"
font-size
"
]);
}
});
}
}
});
});
this
.
append
(
"
svg:text
"
)
.
attr
(
"
fill
"
,
"
#000000
"
)
.
attr
(
"
class
"
,
function
(
d
)
{
return
d
.
getBiologicalType
();
})
.
each
(
function
(
d
)
{
observer
.
observe
(
this
,
{
attributes
:
true
,
//configure it to listen to attribute changes
characterData
:
true
,
attributeOldValue
:
true
,
characterDataOldValue
:
true
,
attributeFilter
:[
"
style
"
]
});
var
el
=
d3
.
select
(
this
);
var
name
=
style
.
getDisplayLabel
(
d
,
style
.
getLabel
(),
style
.
isUseAlias
());
...
...
@@ -144,37 +169,6 @@ d3.selection.prototype.addNodeText = function(style) {
.
style
(
"
font-style
"
,
function
(
node
)
{
if
(
node
.
labelFont
)
if
(
node
.
labelFont
.
fontItalic
)
return
node
.
labelFont
.
fontItalic
;
})
.
style
(
"
text-decoration-line
"
,
function
(
node
)
{
if
(
node
.
labelFont
)
if
(
node
.
labelFont
.
fontUnderline
)
return
node
.
labelFont
.
fontUnderline
;
})
.
style
(
"
opacity
"
,
function
(
node
)
{
if
(
node
.
labelFont
)
if
(
node
.
labelFont
.
fontOpacity
)
return
node
.
labelFont
.
fontOpacity
;
})
.
attr
(
"
x
"
,
function
(
node
)
{
if
(
node
.
labelFont
)
{
if
(
node
.
labelFont
.
fontX
){
return
node
.
labelFont
.
fontX
;
}
else
{
return
0
;
}
}
else
{
return
0
;
}
})
.
attr
(
"
y
"
,
function
(
node
)
{
var
minDim
=
Math
.
min
(
node
.
getSvgWidth
(),
node
.
getSvgHeight
());
if
(
node
.
labelFont
)
{
if
(
node
.
labelFont
.
fontY
){
return
node
.
labelFont
.
fontY
;
}
else
{
return
minDim
/
2
+
5
;
}
}
else
{
return
minDim
/
2
+
5
;
}
})
.
style
(
"
x
"
,
function
(
node
)
{
if
(
node
.
labelFont
)
{
if
(
node
.
labelFont
.
fontX
){
...
...
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