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
a4be7991
Commit
a4be7991
authored
Jun 24, 2013
by
Sebastien Robin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
gui prototype: display repairman and start generating json input
parent
2ec8c5b0
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
89 additions
and
17 deletions
+89
-17
DREAM/dream/dream/platform/static/css/demo-new.css
DREAM/dream/dream/platform/static/css/demo-new.css
+1
-1
DREAM/dream/dream/platform/static/index.html
DREAM/dream/dream/platform/static/index.html
+19
-12
DREAM/dream/dream/platform/static/src/jsonPlumb.js
DREAM/dream/dream/platform/static/src/jsonPlumb.js
+69
-4
No files found.
DREAM/dream/dream/platform/static/css/demo-new.css
View file @
a4be7991
...
@@ -215,7 +215,7 @@ path, ._jsPlumb_endpoint { cursor:pointer; }
...
@@ -215,7 +215,7 @@ path, ._jsPlumb_endpoint { cursor:pointer; }
border
:
1px
dotted
gray
;
border
:
1px
dotted
gray
;
/*margin-top: 20px;
/*margin-top: 20px;
margin-left: 35px;*/
margin-left: 35px;*/
width
:
4
em
;
width
:
5
em
;
height
:
2em
;
height
:
2em
;
z-index
:
10001
;
z-index
:
10001
;
border-radius
:
10px
;
border-radius
:
10px
;
...
...
DREAM/dream/dream/platform/static/index.html
View file @
a4be7991
...
@@ -31,11 +31,29 @@
...
@@ -31,11 +31,29 @@
<ul>
<ul>
</ul>
</ul>
</div>
</div>
<div
id=
"Dream.Repairman"
class=
"tool"
>
Repairman
<ul>
</ul>
</div>
</div>
</div>
<div
id=
"main"
>
<div
id=
"main"
>
<div
id=
"render"
></div>
<div
id=
"render"
></div>
</div>
</div>
<div
id=
"sidebar"
>
<div
id=
"sidebar"
>
<table>
<tr>
<td>
Input
</td>
<td>
Result
</td>
</tr>
<tr>
<td>
<textarea
rows=
"20"
cols=
"47"
id=
"json_output"
style=
"align:left"
>
</textarea></td>
<td>
<textarea
rows=
"20"
cols=
"47"
id=
"json_result"
style=
"align:right"
>
</textarea></td>
</table>
<div
id=
"explanation"
>
<div
id=
"explanation"
>
<p>
This is a demonstration of Flowchart combined with simulation.
</p>
<p>
This is a demonstration of Flowchart combined with simulation.
</p>
<p>
Drag not available people to the box "Available". If there is enough workers, a green path will be displayed on the Flowchart.
</p>
<p>
Drag not available people to the box "Available". If there is enough workers, a green path will be displayed on the Flowchart.
</p>
...
@@ -44,17 +62,6 @@
...
@@ -44,17 +62,6 @@
<p>
This demonstration uses jsPlumb 1.4.0, jQuery 1.8.1 and jQuery UI 1.8.23.
</p>
<p>
This demonstration uses jsPlumb 1.4.0, jQuery 1.8.1 and jQuery UI 1.8.23.
</p>
</div>
</div>
</div>
</div>
<div
id=
"dialog-form"
title=
"Change Througput"
>
<p
class=
"validateTips"
>
All form fields are required.
</p>
<form>
<fieldset>
<label
for=
"Throughput"
>
Throughput
</label>
<input
type=
"text"
name=
"throughput"
id=
"throughput"
class=
"text ui-widget-content ui-corner-all"
/>
</fieldset>
</form>
</div>
<!-- DEP -->
<!-- DEP -->
<script
type=
"text/javascript"
src=
"lib/underscore-min.js"
></script>
<script
type=
"text/javascript"
src=
"lib/underscore-min.js"
></script>
<script
type=
"text/javascript"
src=
"lib/jquery-1.8.1-min.js"
></script>
<script
type=
"text/javascript"
src=
"lib/jquery-1.8.1-min.js"
></script>
...
...
DREAM/dream/dream/platform/static/src/jsonPlumb.js
View file @
a4be7991
...
@@ -61,6 +61,20 @@
...
@@ -61,6 +61,20 @@
anchor
:
"
Continuous
"
anchor
:
"
Continuous
"
});
});
var
updateConnectionData
=
function
(
connection
,
remove
)
{
console
.
log
(
"
updateConnectionData is being called
"
);
var
i
,
core_length
=
priv
.
graph_data
.
coreObject
.
length
,
element
;
for
(
i
=
0
;
i
<
core_length
;
i
++
)
{
element
=
priv
.
graph_data
.
coreObject
[
i
];
if
(
element
.
id
===
connection
.
sourceId
)
{
element
.
successorList
=
element
.
successorList
||
[];
element
.
successorList
.
push
(
connection
.
targetId
);
};
}
priv
.
updateJsonOutput
();
};
// bind to connection/connectionDetached events, and update the list of connections on screen.
// bind to connection/connectionDetached events, and update the list of connections on screen.
jsPlumb
.
bind
(
"
connection
"
,
function
(
info
,
originalEvent
)
{
jsPlumb
.
bind
(
"
connection
"
,
function
(
info
,
originalEvent
)
{
updateConnectionData
(
info
.
connection
);
updateConnectionData
(
info
.
connection
);
...
@@ -68,8 +82,42 @@
...
@@ -68,8 +82,42 @@
jsPlumb
.
bind
(
"
connectionDetached
"
,
function
(
info
,
originalEvent
)
{
jsPlumb
.
bind
(
"
connectionDetached
"
,
function
(
info
,
originalEvent
)
{
updateConnectionData
(
info
.
connection
,
true
);
updateConnectionData
(
info
.
connection
,
true
);
});
});
};
priv
.
updateJsonOutput
=
function
()
{
//temporary method to display json on the screen (for debugging)
$
(
"
#json_output
"
)[
0
].
value
=
JSON
.
stringify
(
priv
.
graph_data
,
null
,
"
"
);
};
priv
.
addModelResourceToGraphData
=
function
(
element
)
{
var
element_data
=
{
_class
:
element
.
class
,
id
:
element
.
id
,
name
:
element
.
id
,
capacity
:
"
1
"
,
};
priv
.
graph_data
.
modelResource
.
push
(
element_data
);
priv
.
updateJsonOutput
();
};
priv
.
addElementToGraphData
=
function
(
element
)
{
// Now update the graph_data
var
element_data
=
{
_class
:
element
.
class
,
id
:
element
.
id
,
name
:
element
.
id
};
priv
.
graph_data
.
coreObject
.
push
(
element_data
);
priv
.
updateJsonOutput
();
/*{"_class": "Dream.Source",
"id": "S1",
"name": "Raw Material",
"interarrivalTime":
{
"distributionType": "Fixed",
"mean": "0.5"
},
"entity": "Part",
"successorList": ["DummyQ"]
}, */
};
};
Object
.
defineProperty
(
that
,
"
start
"
,
{
Object
.
defineProperty
(
that
,
"
start
"
,
{
...
@@ -79,7 +127,9 @@
...
@@ -79,7 +127,9 @@
value
:
function
()
{
value
:
function
()
{
//priv.setModel();
//priv.setModel();
priv
.
element_list
=
[];
priv
.
element_list
=
[];
priv
.
graph_data
=
{};
priv
.
graph_data
=
{
coreObject
:
[],
modelResource
:
[],
};
priv
.
initJsPlumb
();
priv
.
initJsPlumb
();
//priv.initDialog();
//priv.initDialog();
//priv.displayGraph();
//priv.displayGraph();
...
@@ -111,13 +161,19 @@
...
@@ -111,13 +161,19 @@
// Add endPoint to allow drawing connections
// Add endPoint to allow drawing connections
var
color
=
"
#00f
"
;
var
color
=
"
#00f
"
;
var
gradient_color
=
"
#09098e
"
;
// Different endpoint color for Repairman
if
(
element
.
class
===
"
Dream.Repairman
"
)
{
color
=
"
rgb(189,11,11)
"
;
gradient_color
=
"
rgb(255,0,0)
"
;
};
var
endpoint
=
{
var
endpoint
=
{
endpoint
:
"
Rectangle
"
,
endpoint
:
"
Rectangle
"
,
paintStyle
:{
width
:
25
,
height
:
21
,
fillStyle
:
color
},
paintStyle
:{
width
:
25
,
height
:
21
,
fillStyle
:
color
},
isSource
:
true
,
isSource
:
true
,
scope
:
"
blue rectangle
"
,
scope
:
"
blue rectangle
"
,
connectorStyle
:
{
connectorStyle
:
{
gradient
:{
stops
:[[
0
,
color
],
[
0.5
,
"
#09098e
"
],
[
1
,
color
]]},
gradient
:{
stops
:[[
0
,
color
],
[
0.5
,
gradient_color
],
[
1
,
color
]]},
lineWidth
:
5
,
lineWidth
:
5
,
strokeStyle
:
color
,
strokeStyle
:
color
,
dashstyle
:
"
2 2
"
dashstyle
:
"
2 2
"
...
@@ -127,6 +183,7 @@
...
@@ -127,6 +183,7 @@
isTarget
:
true
,
isTarget
:
true
,
//dropOptions : exampleDropOptions
//dropOptions : exampleDropOptions
};
};
var
resource_type_list
=
[
"
Dream.Repairman
"
];
var
right_end_point_list
=
[
"
Dream.Machine
"
,
"
Dream.Queue
"
,
"
Dream.Source
"
];
var
right_end_point_list
=
[
"
Dream.Machine
"
,
"
Dream.Queue
"
,
"
Dream.Source
"
];
if
(
right_end_point_list
.
indexOf
(
element
.
class
)
!==
-
1
)
{
if
(
right_end_point_list
.
indexOf
(
element
.
class
)
!==
-
1
)
{
jsPlumb
.
addEndpoint
(
element
.
id
,
{
anchor
:
"
RightMiddle
"
},
endpoint
);
jsPlumb
.
addEndpoint
(
element
.
id
,
{
anchor
:
"
RightMiddle
"
},
endpoint
);
...
@@ -135,8 +192,16 @@
...
@@ -135,8 +192,16 @@
if
(
left_end_point_list
.
indexOf
(
element
.
class
)
!==
-
1
)
{
if
(
left_end_point_list
.
indexOf
(
element
.
class
)
!==
-
1
)
{
jsPlumb
.
addEndpoint
(
element
.
id
,
{
anchor
:
"
LeftMiddle
"
},
endpoint
);
jsPlumb
.
addEndpoint
(
element
.
id
,
{
anchor
:
"
LeftMiddle
"
},
endpoint
);
}
}
var
repair_point_list
=
[
"
Dream.Repairman
"
,
"
Dream.Machine
"
]
if
(
repair_point_list
.
indexOf
(
element
.
class
)
!==
-
1
)
{
jsPlumb
.
addEndpoint
(
element
.
id
,
{
anchor
:
"
TopCenter
"
},
endpoint
);
jsPlumb
.
addEndpoint
(
element
.
id
,
{
anchor
:
"
BottomCenter
"
},
endpoint
);
};
if
(
resource_type_list
.
indexOf
(
element
.
class
)
===
-
1
)
{
priv
.
addElementToGraphData
(
element
);
}
else
{
priv
.
addModelResourceToGraphData
(
element
);
}
}
}
});
});
...
...
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