Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
vidjil
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
1,711
Issues
1,711
List
Boards
Labels
Service Desk
Milestones
Merge Requests
86
Merge Requests
86
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
vidjil
vidjil
Commits
6c510f94
Commit
6c510f94
authored
Nov 26, 2014
by
Marc Duez
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
graph.js : ajout de la legende pour les data
parent
1ad4f563
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
76 additions
and
22 deletions
+76
-22
browser/css/dark.css
browser/css/dark.css
+4
-0
browser/css/light.css
browser/css/light.css
+4
-0
browser/css/vidjil.less
browser/css/vidjil.less
+5
-0
browser/js/graph.js
browser/js/graph.js
+58
-20
browser/js/list.js
browser/js/list.js
+5
-2
No files found.
browser/css/dark.css
View file @
6c510f94
...
...
@@ -206,6 +206,10 @@ line {
fill
:
#839496
;
text-anchor
:
end
;
}
.graph_text2
{
font-weight
:
bold
;
fill
:
#839496
;
}
.graph_time
:hover
{
cursor
:
pointer
;
fill
:
#fdf6e3
;
...
...
browser/css/light.css
View file @
6c510f94
...
...
@@ -206,6 +206,10 @@ line {
fill
:
#657b83
;
text-anchor
:
end
;
}
.graph_text2
{
font-weight
:
bold
;
fill
:
#657b83
;
}
.graph_time
:hover
{
cursor
:
pointer
;
fill
:
#002b36
;
...
...
browser/css/vidjil.less
View file @
6c510f94
...
...
@@ -252,6 +252,11 @@ line {
text-anchor:end;
}
.graph_text2{
font-weight : bold;
fill : @default ;
}
.graph_time:hover{
cursor:pointer;
fill : @select;
...
...
browser/js/graph.js
View file @
6c510f94
...
...
@@ -142,7 +142,6 @@ Graph.prototype = {
initData
:
function
()
{
this
.
data_data
=
[];
var
g_min
,
g_max
;
for
(
var
key
in
this
.
m
.
data_info
)
{
var
max
=
this
.
m
.
data
[
key
][
0
]
...
...
@@ -153,8 +152,6 @@ Graph.prototype = {
var
t
=
this
.
m
.
samples
.
order
.
indexOf
(
i
)
var
val
=
this
.
m
.
data
[
key
][
t
]
if
(
this
.
m
.
norm
&&
this
.
m
.
normalization
.
type
==
"
data
"
)
val
=
this
.
m
.
normalize
(
val
,
t
)
if
(
val
>
max
)
max
=
val
;
if
(
val
<
min
)
min
=
val
;
tab
.
push
(
val
)
}
...
...
@@ -165,8 +162,6 @@ Graph.prototype = {
active
:
this
.
m
.
data_info
[
key
].
isActive
});
if
(
typeof
g_min
==
'
undefined
'
||
g_min
>
min
)
g_min
=
min
if
(
typeof
g_max
==
'
undefined
'
||
g_max
<
max
)
g_max
=
max
}
this
.
g_data
=
this
.
data_container
.
selectAll
(
"
path
"
)
...
...
@@ -177,19 +172,6 @@ Graph.prototype = {
this
.
g_data
.
exit
()
.
remove
();
if
(
typeof
g_min
!=
'
undefined
'
){
if
(
g_min
!=
0
&&
(
g_min
*
100
)
<
g_max
){
this
.
scale_data
=
d3
.
scale
.
log
()
.
domain
([
g_max
,
g_min
])
.
range
([
0
,
1
]);
}
else
{
if
(
(
g_min
*
2
)
<
g_max
)
g_min
=
0
this
.
scale_data
=
d3
.
scale
.
linear
()
.
domain
([
g_max
,
g_min
])
.
range
([
0
,
1
]);
}
}
},
updateData
:
function
()
{
...
...
@@ -265,6 +247,36 @@ Graph.prototype = {
this
.
scale_x
=
d3
.
scale
.
log
()
.
domain
([
1
,
this
.
m
.
precision
*
this
.
m
.
max_size
])
.
range
([
0
,
1
]);
var
g_min
=
undefined
var
g_max
=
undefined
for
(
var
key
in
this
.
m
.
data_info
)
{
var
max
=
this
.
m
.
data
[
key
][
0
]
var
min
=
this
.
m
.
data
[
key
][
0
];
for
(
var
i
=
0
;
i
<
this
.
m
.
samples
.
number
;
i
++
)
{
var
t
=
this
.
m
.
samples
.
order
.
indexOf
(
i
)
var
val
=
this
.
m
.
data
[
key
][
t
]
if
(
this
.
m
.
norm
&&
this
.
m
.
normalization
.
type
==
"
data
"
)
val
=
this
.
m
.
normalize
(
val
,
t
)
if
(
val
>
max
)
max
=
val
;
if
(
val
<
min
)
min
=
val
;
}
if
(
typeof
g_min
==
'
undefined
'
||
g_min
>
min
)
g_min
=
min
if
(
typeof
g_max
==
'
undefined
'
||
g_max
<
max
)
g_max
=
max
}
if
(
g_min
!=
0
&&
(
g_min
*
100
)
<
g_max
){
this
.
scale_data
=
d3
.
scale
.
log
()
.
domain
([
g_max
,
g_min
])
.
range
([
0
,
1
]);
}
else
{
if
(
(
g_min
*
2
)
<
g_max
)
g_min
=
0
this
.
scale_data
=
d3
.
scale
.
linear
()
.
domain
([
g_max
,
g_min
])
.
range
([
0
,
1
]);
}
//abscisse
for
(
var
i
=
0
;
i
<
this
.
m
.
samples
.
order
.
length
;
i
++
)
{
...
...
@@ -306,7 +318,7 @@ Graph.prototype = {
this
.
data_axis
.
push
(
d
);
}
//ordonnée
//ordonnée
clone
if
(
this
.
mode
==
"
stack
"
){
this
.
data_axis
.
push
({
"
type
"
:
"
axis_h
"
,
"
text
"
:
"
0%
"
,
"
orientation
"
:
"
hori
"
,
"
pos
"
:
1
});
this
.
data_axis
.
push
({
"
type
"
:
"
axis_h
"
,
"
text
"
:
"
50%
"
,
"
orientation
"
:
"
hori
"
,
"
pos
"
:
0.5
});
...
...
@@ -326,6 +338,24 @@ Graph.prototype = {
height
=
height
/
10
;
}
}
//ordonnée data
if
(
typeof
g_min
!=
'
undefined
'
){
var
height
=
1
;
while
(
height
<
g_max
)
height
=
height
*
10
while
((
height
)
>
g_min
/
2
)
{
var
d
=
{};
d
.
type
=
"
axis_h2
"
;
d
.
text
=
height
d
.
orientation
=
"
hori
"
;
d
.
pos
=
this
.
scale_data
(
height
);
if
(
d
.
pos
>=-
0.1
)
this
.
data_axis
.
push
(
d
);
height
=
height
/
10
;
}
}
//current time_point
if
(
this
.
m
.
samples
.
order
.
indexOf
(
this
.
m
.
t
)
!=
-
1
){
...
...
@@ -431,6 +461,11 @@ Graph.prototype = {
.
attr
(
"
width
"
,
this
.
resizeW
)
.
attr
(
"
height
"
,
div_height
);
this
.
text_position_y
=
15
;
this
.
text_position_x
=
60
;
this
.
text_position_x2
=
div_width
-
60
;
this
.
update
();
},
...
...
@@ -650,20 +685,23 @@ Graph.prototype = {
.
attr
(
"
class
"
,
function
(
d
)
{
if
(
d
.
type
==
"
axis_v
"
)
return
"
axis_button
"
;
if
(
d
.
type
==
"
axis_h
"
)
return
"
axis_leg
"
;
if
(
d
.
type
==
"
axis_h2
"
)
return
"
axis_leg
"
;
})
.
attr
(
"
id
"
,
function
(
d
)
{
if
(
d
.
type
==
"
axis_v
"
)
return
(
"
time
"
+
d
.
time
);
})
.
attr
(
"
y
"
,
function
(
d
)
{
if
(
d
.
type
==
"
axis_h
"
)
return
Math
.
floor
(
self
.
resizeH
*
d
.
pos
)
+
self
.
marge5
;
if
(
d
.
type
==
"
axis_h
"
||
d
.
type
==
"
axis_h2
"
)
return
Math
.
floor
(
self
.
resizeH
*
d
.
pos
)
+
self
.
marge5
;
else
return
self
.
text_position_y
;
})
.
attr
(
"
x
"
,
function
(
d
)
{
if
(
d
.
type
==
"
axis_h
"
)
return
self
.
text_position_x
;
if
(
d
.
type
==
"
axis_h2
"
)
return
self
.
text_position_x2
;
else
return
Math
.
floor
(
self
.
resizeW
*
d
.
pos
+
self
.
marge4
);
})
.
attr
(
"
class
"
,
function
(
d
)
{
if
(
d
.
type
==
"
axis_v
"
)
return
"
graph_time
"
else
if
(
d
.
type
==
"
axis_h2
"
)
return
"
graph_text2
"
else
return
"
graph_text
"
;
});
...
...
browser/js/list.js
View file @
6c510f94
...
...
@@ -111,7 +111,6 @@ List.prototype = {
div
.
appendChild
(
name
)
var
value
=
document
.
createElement
(
'
span
'
);
value
.
appendChild
(
document
.
createTextNode
(
this
.
m
.
data
[
key
][
this
.
m
.
t
]))
value
.
className
=
"
data_value
"
;
div
.
appendChild
(
value
)
...
...
@@ -136,11 +135,15 @@ List.prototype = {
}
div_parent
.
appendChild
(
div_list_data
);
this
.
update_data_list
()
},
update_data_list
:
function
()
{
for
(
var
key
in
this
.
index_data
){
this
.
index_data
[
key
].
innerHTML
=
this
.
m
.
data
[
key
][
this
.
m
.
t
]
var
val
=
this
.
m
.
data
[
key
][
this
.
m
.
t
]
if
(
this
.
m
.
norm
&&
this
.
m
.
normalization
.
type
==
"
data
"
)
val
=
this
.
m
.
normalize
(
val
,
this
.
m
.
t
)
if
(
val
>
100
)
this
.
index_data
[
key
].
innerHTML
=
val
.
toFixed
(
0
);
if
(
val
<
100
)
this
.
index_data
[
key
].
innerHTML
=
val
.
toPrecision
(
3
);
}
},
...
...
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