Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
INSPQ
genomique
auspice
Commits
2e98ef75
Commit
2e98ef75
authored
Jun 30, 2020
by
Pierre Lemay
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Integration des ajustements d'Eric
parent
cef3a2a4
Pipeline
#18493
failed with stages
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
3 deletions
+6
-3
src/components/controls/controls.js
src/components/controls/controls.js
+0
-1
src/components/tree/phyloTree/defaultParams.js
src/components/tree/phyloTree/defaultParams.js
+2
-0
src/components/tree/phyloTree/labels.js
src/components/tree/phyloTree/labels.js
+4
-2
No files found.
src/components/controls/controls.js
View file @
2e98ef75
...
...
@@ -23,7 +23,6 @@ function Controls({mapOn}) {
return
(
<
ControlsContainer
>
<
ChooseDataset
/>
<
SidebarHeader
>
{
t
(
"
sidebar:Date Range
"
)}
<
/SidebarHeader
>
<
DateRangeInputs
/>
...
...
src/components/tree/phyloTree/defaultParams.js
View file @
2e98ef75
...
...
@@ -36,9 +36,11 @@ export const createDefaultParams = () => ({
tipLabelPadX
:
8
,
tipLabelPadY
:
2
,
mapToScreenDebounceTime
:
500
,
tipLabelFontSizeL0
:
6
,
tipLabelFontSizeL1
:
8
,
tipLabelFontSizeL2
:
10
,
tipLabelFontSizeL3
:
12
,
tipLabelBreakL0
:
150
,
tipLabelBreakL1
:
75
,
tipLabelBreakL2
:
50
,
tipLabelBreakL3
:
25
...
...
src/components/tree/phyloTree/labels.js
View file @
2e98ef75
...
...
@@ -19,14 +19,16 @@ export const updateTipLabels = function updateTipLabels(dt) {
const
inViewVisibleTips
=
inViewTips
.
filter
((
d
)
=>
d
.
visibility
===
NODE_VISIBLE
);
/* We show tip labels by checking the number of "inView & visible" tips */
if
(
inViewVisibleTips
.
length
<
this
.
params
.
tipLabelBreakL
1
)
{
if
(
inViewVisibleTips
.
length
<
this
.
params
.
tipLabelBreakL
0
)
{
/* We calculate font size based on the total number of in view tips (both visible & non-visible) */
let
fontSize
=
this
.
params
.
tipLabelFontSizeL
1
;
let
fontSize
=
this
.
params
.
tipLabelFontSizeL
0
;
if
(
inViewTips
.
length
<
this
.
params
.
tipLabelBreakL3
)
{
fontSize
=
this
.
params
.
tipLabelFontSizeL3
;
}
else
if
(
inViewTips
.
length
<
this
.
params
.
tipLabelBreakL2
)
{
fontSize
=
this
.
params
.
tipLabelFontSizeL2
;
}
else
if
(
inViewTips
.
length
<
this
.
params
.
tipLabelBreakL1
)
{
fontSize
=
this
.
params
.
tipLabelFontSizeL1
;
}
window
.
setTimeout
(()
=>
{
...
...
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