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
vidjil
vidjil
Commits
ea9b361b
Commit
ea9b361b
authored
Apr 04, 2014
by
Marc Duez
Browse files
graph.js : better label positionning
parent
2c3a1189
Changes
2
Hide whitespace changes
Inline
Side-by-side
browser/css/vidjil.less
View file @
ea9b361b
...
...
@@ -14,7 +14,7 @@ html{
body {
font-family: Arial, Helvetica, Sans-serif;
font-size: 1
4
px;
font-size: 1
3
px;
height : 100%;
margin:0px;
color : @default;
...
...
@@ -103,7 +103,7 @@ max-height: calc(~"100%" - @margin)
#info{
font-family : Courier New,monaco,terminal,courier,system;
font-size: 1
4
px;
font-size: 1
3
px;
height :150px;
padding:3px;
background : @background;
...
...
@@ -197,12 +197,18 @@ max-height: calc(~"100%" - @margin)
opacity : 0.75;
}
.graph_text,
.graph_time{
.graph_time{
font-weight : bold;
fill : @secondary ;
text-anchor:middle;
}
.graph_text{
font-weight : bold;
fill : @secondary ;
text-anchor:end;
}
.graph_time:hover{
cursor:pointer;
fill : @select;
...
...
@@ -346,8 +352,7 @@ max-height: calc(~"100%" - @margin)
.listElem{
width : @width_listElem;
font-family : Courier New,monaco,terminal,courier,system;
font-size: 14px;
font-size: 13px;
cursor:pointer;
-webkit-transition: color 0.2s;
-o-transition: color 0.2s;
...
...
@@ -442,7 +447,7 @@ max-height: calc(~"100%" - @margin)
#listSeq {
font-weight: bold;
font-family: Courier New,monaco,terminal,courier,system;
font-size: 1
4
px;
font-size: 1
3
px;
}
.sequence-line {
...
...
@@ -515,7 +520,7 @@ max-height: calc(~"100%" - @margin)
min-width:400px;
margin-left:-250px;
left :50%;
font-size: 1
4
px;
font-size: 1
3
px;
padding: 10px;
background:inherit;
display:none;
...
...
@@ -524,7 +529,7 @@ max-height: calc(~"100%" - @margin)
.buttonSelector {
background : @background;
cursor:pointer;
font-size: 1
4
px;
font-size: 1
3
px;
margin :2px;
display:block;
text-align:left;
...
...
@@ -546,7 +551,7 @@ max-height: calc(~"100%" - @margin)
top: 250px;
left:50% ;
width:500px;
font-size: 1
4
px;
font-size: 1
3
px;
padding: 10px;
background: @background;
display:none;
...
...
@@ -571,7 +576,7 @@ max-height: calc(~"100%" - @margin)
position: fixed;
top: 50px;
left: 20px + @width_left_container;
font-size: 1
4
px;
font-size: 1
3
px;
padding: 10px;
background: @background;
display:none;
...
...
@@ -616,7 +621,7 @@ max-height: calc(~"100%" - @margin)
.button {
cursor:pointer;
font-size: 1
4
px;
font-size: 1
3
px;
padding: 0px 3px;
margin-right:5px;
margin-left:5px;
...
...
@@ -626,7 +631,7 @@ max-height: calc(~"100%" - @margin)
.smallbutton {
cursor:pointer;
font-size: 1
4
px;
font-size: 1
3
px;
text-decoration:underline;
}
...
...
browser/js/graph.js
View file @
ea9b361b
...
...
@@ -36,7 +36,7 @@ function Graph(id, model) {
this
.
marge1
=
0.05
;
//marge droite bord du graph/premiere colonne
this
.
marge2
=
0.08
;
//marge gauche derniere colonne/bord du graph
this
.
marge3
=
0
;
//marge droite (non influencé par le resize)
this
.
marge4
=
8
0
;
//marge gauche (non influencé par le resize)
this
.
marge4
=
6
0
;
//marge gauche (non influencé par le resize)
this
.
marge5
=
25
;
//marge top (non influencé par le resize)
this
.
data_axis
=
[];
...
...
@@ -44,6 +44,9 @@ function Graph(id, model) {
this
.
drag_on
=
false
;
this
.
dragged_time_point
=
0
;
this
.
text_position_y
=
15
;
this
.
text_position_x
=
60
;
this
.
m
.
view
.
push
(
this
)
...
...
@@ -517,10 +520,10 @@ Graph.prototype = {
})
.
attr
(
"
y
"
,
function
(
d
)
{
if
(
d
.
type
==
"
axis_h
"
)
return
Math
.
floor
(
self
.
resizeH
*
d
.
pos
)
+
self
.
marge5
;
else
return
15
;
else
return
self
.
text_position_y
;
})
.
attr
(
"
x
"
,
function
(
d
)
{
if
(
d
.
type
==
"
axis_h
"
)
return
40
;
if
(
d
.
type
==
"
axis_h
"
)
return
self
.
text_position_x
;
else
return
Math
.
floor
(
self
.
resizeW
*
d
.
pos
+
self
.
marge4
);
})
.
attr
(
"
class
"
,
function
(
d
)
{
...
...
Write
Preview
Supports
Markdown
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