Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
dream
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
1
Issues
1
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
dream
Commits
923eed0f
Commit
923eed0f
authored
Mar 03, 2015
by
Jérome Perrin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Graph Editor: use CSS defined in the json and define box-sizing to have proper ratio
parent
65cbd50f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
50 deletions
+12
-50
dream/platform/src/jsplumb/jsplumb.css
dream/platform/src/jsplumb/jsplumb.css
+3
-2
dream/platform/src/jsplumb/jsplumb.js
dream/platform/src/jsplumb/jsplumb.js
+7
-5
dream/platform/src/toolbox/toolbox.css
dream/platform/src/toolbox/toolbox.css
+2
-43
No files found.
dream/platform/src/jsplumb/jsplumb.css
View file @
923eed0f
...
@@ -74,8 +74,9 @@ path, ._jsPlumb_endpoint {
...
@@ -74,8 +74,9 @@ path, ._jsPlumb_endpoint {
.window
,
.dummy_window
{
.window
,
.dummy_window
{
border
:
1px
solid
lightgray
;
border
:
1px
solid
lightgray
;
width
:
100px
;
width
:
80px
;
height
:
64px
;
height
:
80px
;
box-sizing
:
border-box
;
position
:
absolute
;
position
:
absolute
;
color
:
black
;
color
:
black
;
font-family
:
serif
;
font-family
:
serif
;
...
...
dream/platform/src/jsplumb/jsplumb.js
View file @
923eed0f
...
@@ -149,7 +149,7 @@
...
@@ -149,7 +149,7 @@
}
}
function
convertToAbsolutePosition
(
gadget
,
x
,
y
)
{
function
convertToAbsolutePosition
(
gadget
,
x
,
y
)
{
var
zoom_level
=
gadget
.
props
.
zoom_level
*
1.1111
,
var
zoom_level
=
gadget
.
props
.
zoom_level
,
canvas_size_x
=
$
(
gadget
.
props
.
main
).
width
(),
canvas_size_x
=
$
(
gadget
.
props
.
main
).
width
(),
canvas_size_y
=
$
(
gadget
.
props
.
main
).
height
(),
canvas_size_y
=
$
(
gadget
.
props
.
main
).
height
(),
size_x
=
$
(
gadget
.
props
.
element
).
find
(
'
.dummy_window
'
).
width
()
*
size_x
=
$
(
gadget
.
props
.
element
).
find
(
'
.dummy_window
'
).
width
()
*
...
@@ -162,7 +162,7 @@
...
@@ -162,7 +162,7 @@
}
}
function
convertToRelativePosition
(
gadget
,
x
,
y
)
{
function
convertToRelativePosition
(
gadget
,
x
,
y
)
{
var
zoom_level
=
gadget
.
props
.
zoom_level
*
1.1111
,
var
zoom_level
=
gadget
.
props
.
zoom_level
,
canvas_size_x
=
$
(
gadget
.
props
.
main
).
width
(),
canvas_size_x
=
$
(
gadget
.
props
.
main
).
width
(),
canvas_size_y
=
$
(
gadget
.
props
.
main
).
height
(),
canvas_size_y
=
$
(
gadget
.
props
.
main
).
height
(),
size_x
=
$
(
gadget
.
props
.
element
).
find
(
'
.dummy_window
'
).
width
()
*
size_x
=
$
(
gadget
.
props
.
element
).
find
(
'
.dummy_window
'
).
width
()
*
...
@@ -240,11 +240,11 @@
...
@@ -240,11 +240,11 @@
function
updateNodeStyle
(
gadget
,
element_id
)
{
function
updateNodeStyle
(
gadget
,
element_id
)
{
// Update node size according to the zoom level
// Update node size according to the zoom level
// XXX does nothing for now
// XXX does nothing for now
var
zoom_level
=
gadget
.
props
.
zoom_level
*
1.1111
,
var
zoom_level
=
gadget
.
props
.
zoom_level
,
element
=
$
(
gadget
.
props
.
element
).
find
(
"
#
"
+
element_id
),
element
=
$
(
gadget
.
props
.
element
).
find
(
"
#
"
+
element_id
),
new_value
;
new_value
;
$
.
each
(
gadget
.
props
.
style_attr_list
,
function
(
i
,
j
)
{
$
.
each
(
gadget
.
props
.
style_attr_list
,
function
(
i
,
j
)
{
new_value
=
$
(
gadget
.
props
.
element
).
find
(
'
.dummy_window
'
)
.
css
(
j
)
new_value
=
element
.
css
(
j
)
.
replace
(
'
px
'
,
''
)
*
zoom_level
+
'
px
'
;
.
replace
(
'
px
'
,
''
)
*
zoom_level
+
'
px
'
;
element
.
css
(
j
,
new_value
);
element
.
css
(
j
,
new_value
);
});
});
...
@@ -734,7 +734,6 @@
...
@@ -734,7 +734,6 @@
coordinate
coordinate
);
);
// XXX make node template an option, or use CSS from class_definition
/*jslint nomen: true*/
/*jslint nomen: true*/
domElement
=
domParser
.
parseFromString
(
domElement
=
domParser
.
parseFromString
(
node_template
({
node_template
({
...
@@ -755,6 +754,9 @@
...
@@ -755,6 +754,9 @@
coordinate
.
left
,
coordinate
.
left
,
coordinate
.
top
coordinate
.
top
);
);
if
(
class_definition
.
css
)
{
box
.
css
(
class_definition
.
css
);
}
box
.
css
(
"
top
"
,
absolute_position
[
1
]);
box
.
css
(
"
top
"
,
absolute_position
[
1
]);
box
.
css
(
"
left
"
,
absolute_position
[
0
]);
box
.
css
(
"
left
"
,
absolute_position
[
0
]);
updateNodeStyle
(
gadget
,
dom_element_id
);
updateNodeStyle
(
gadget
,
dom_element_id
);
...
...
dream/platform/src/toolbox/toolbox.css
View file @
923eed0f
...
@@ -17,7 +17,8 @@
...
@@ -17,7 +17,8 @@
border
:
1px
solid
lightgray
;
border
:
1px
solid
lightgray
;
box-shadow
:
1px
1px
2px
#aaa
;
box-shadow
:
1px
1px
2px
#aaa
;
min-width
:
7em
;
min-width
:
7em
;
height
:
3em
;
min-height
:
6em
;
box-sizing
:
border-box
;
z-index
:
10001
;
z-index
:
10001
;
color
:
gray
;
color
:
gray
;
font-family
:
serif
;
font-family
:
serif
;
...
@@ -30,45 +31,3 @@
...
@@ -30,45 +31,3 @@
padding-top
:
1.3em
;
padding-top
:
1.3em
;
cursor
:
move
;
cursor
:
move
;
}
}
.Dream-Source
,
.Dream-BatchSource
{
border
:
1px
solid
#bbc
;
background-color
:
#ffe
;
background-image
:
linear-gradient
(
to
bottom
,
#ffe
0%
,
#dde
100%
);
}
.Dream-Machine
,
.Dream-MachineJobShop
,
.Dream-BatchScrapMachine
,
.Dream-MachineManagedJob
,
.Dream-MouldAssembly
{
border
:
1px
solid
#cbc
;
background-color
:
#fef
;
background-image
:
linear-gradient
(
to
bottom
,
#fef
0%
,
#ede
100%
);
}
.Dream-Queue
,
.Dream-QueueJobShop
,
.Dream-LineClearance
,
.Dream-QueueManagedJob
,
.Dream-ConditionalBuffer
,
.Dream-OrderDecomposition
,
.Dream-MouldAssemblyBuffer
{
border
:
1px
solid
#bcc
;
background-color
:
#eff
;
background-image
:
linear-gradient
(
to
bottom
,
#eff
0%
,
#dee
100%
);
}
.Dream-Exit
,
.Dream-ExitJobShop
{
border
:
1px
solid
#ccb
;
background-color
:
#eef
;
background-image
:
linear-gradient
(
to
bottom
,
#eef
0%
,
#dde
100%
);
}
.Dream-EventGenerator
{
border
:
1px
solid
#cba
;
background-color
:
#fdc
;
background-image
:
linear-gradient
(
to
bottom
,
#fdc
0%
,
#ecb
100%
);
}
.Dream-BatchDecomposition
,
.Dream-BatchDecompositionStartTime
,
.Dream-BatchReassembly
{
border
:
1px
solid
#bcb
;
background-color
:
#dfd
;
background-image
:
linear-gradient
(
to
bottom
,
#dfd
0%
,
#cec
100%
);
}
.Dream-Repairman
{
border
:
1px
solid
#cbb
;
background-color
:
#fdd
;
background-image
:
linear-gradient
(
to
bottom
,
#fdd
0%
,
#dcc
100%
);
}
\ No newline at end of file
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