Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
TTool
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mbe-tools
TTool
Commits
fb63a5a7
Commit
fb63a5a7
authored
4 years ago
by
Ludovic Apvrille
Browse files
Options
Downloads
Patches
Plain Diff
Update on dependency graphs
parent
852af036
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/main/java/avatartranslator/AvatarDependencyGraph.java
+7
-1
7 additions, 1 deletion
src/main/java/avatartranslator/AvatarDependencyGraph.java
src/main/java/graph/AUTGraphDisplay.java
+3
-18
3 additions, 18 deletions
src/main/java/graph/AUTGraphDisplay.java
with
10 additions
and
19 deletions
src/main/java/avatartranslator/AvatarDependencyGraph.java
+
7
−
1
View file @
fb63a5a7
...
@@ -77,6 +77,7 @@ public class AvatarDependencyGraph {
...
@@ -77,6 +77,7 @@ public class AvatarDependencyGraph {
}
}
// Connect everything ie writers to all potential readers
// Connect everything ie writers to all potential readers
// For each writing state, we draw a transition to all possible corresponding readers
// For each writing state, we draw a transition to all possible corresponding readers
// Double direction if synchronous
for
(
AUTState
state:
states
)
{
for
(
AUTState
state:
states
)
{
if
(
state
.
referenceObject
instanceof
AvatarActionOnSignal
)
{
if
(
state
.
referenceObject
instanceof
AvatarActionOnSignal
)
{
AvatarActionOnSignal
aaos
=
(
AvatarActionOnSignal
)
state
.
referenceObject
;
AvatarActionOnSignal
aaos
=
(
AvatarActionOnSignal
)
state
.
referenceObject
;
...
@@ -91,9 +92,14 @@ public class AvatarDependencyGraph {
...
@@ -91,9 +92,14 @@ public class AvatarDependencyGraph {
AvatarActionOnSignal
aaosD
=
(
AvatarActionOnSignal
)
stateDestination
.
referenceObject
;
AvatarActionOnSignal
aaosD
=
(
AvatarActionOnSignal
)
stateDestination
.
referenceObject
;
if
(
aaosD
.
getSignal
()
==
correspondingSig
)
{
if
(
aaosD
.
getSignal
()
==
correspondingSig
)
{
// Found relation
// Found relation
TraceManager
.
addDev
(
"Found relation!"
);
//
TraceManager.addDev("Found relation!");
AUTTransition
tr
=
new
AUTTransition
(
state
.
id
,
""
,
stateDestination
.
id
);
AUTTransition
tr
=
new
AUTTransition
(
state
.
id
,
""
,
stateDestination
.
id
);
transitions
.
add
(
tr
);
transitions
.
add
(
tr
);
AvatarRelation
ar
=
_avspec
.
getAvatarRelationWithSignal
(
correspondingSig
);
if
(!(
ar
.
isAsynchronous
()))
{
tr
=
new
AUTTransition
(
stateDestination
.
id
,
""
,
state
.
id
);
transitions
.
add
(
tr
);
}
}
}
}
}
}
}
...
...
This diff is collapsed.
Click to expand it.
src/main/java/graph/AUTGraphDisplay.java
+
3
−
18
View file @
fb63a5a7
...
@@ -99,8 +99,8 @@ public class AUTGraphDisplay implements MouseListener, ViewerListener, Runnable
...
@@ -99,8 +99,8 @@ public class AUTGraphDisplay implements MouseListener, ViewerListener, Runnable
"edge {text-color: black; shape: cubic-curve; text-size:10;} "
+
"edge {text-color: black; shape: cubic-curve; text-size:10;} "
+
"edge.defaultedge {text-size:10; text-color:black;} "
+
"edge.defaultedge {text-size:10; text-color:black;} "
+
"edge.external {text-color:blue; text-size:14;} "
+
"edge.external {text-color:blue; text-size:14;} "
+
"node.deadlock {fill-color:
red
; text-color:
white
; size: 20px, 20px; text-size:1
6
;} "
+
"node.deadlock {fill-color:
orange
; text-color:
red
; size: 20px, 20px; text-size:1
5
;} "
+
"node.init { fill-color: green; text-color: black; size: 20px, 20px; text-size:1
6
;}"
;
"node.init { fill-color: green; text-color: black; size: 20px, 20px; text-size:1
5
;}"
;
protected
static
String
STYLE_SHEET2
=
"graph { canvas-color: white; fill-mode: gradient-vertical; fill-color: white, #004; padding: 20px; } "
+
protected
static
String
STYLE_SHEET2
=
"graph { canvas-color: white; fill-mode: gradient-vertical; fill-color: white, #004; padding: 20px; } "
+
"node { shape: circle; size-mode: dyn-size; size: 10px; fill-mode: gradient-radial; fill-color: #FFFC, #FFF0; stroke-mode: none; "
+
"node { shape: circle; size-mode: dyn-size; size: 10px; fill-mode: gradient-radial; fill-color: #FFFC, #FFF0; stroke-mode: none; "
+
...
@@ -111,22 +111,7 @@ public class AUTGraphDisplay implements MouseListener, ViewerListener, Runnable
...
@@ -111,22 +111,7 @@ public class AUTGraphDisplay implements MouseListener, ViewerListener, Runnable
"edge.external { shape: L-square-line; size: 3px; fill-color: #AAA3; fill-mode: plain; arrow-shape: circle; } "
+
"edge.external { shape: L-square-line; size: 3px; fill-color: #AAA3; fill-mode: plain; arrow-shape: circle; } "
+
"sprite { shape: circle; fill-mode: gradient-radial; fill-color: #FFF8, #FFF0; }"
;
"sprite { shape: circle; fill-mode: gradient-radial; fill-color: #FFF8, #FFF0; }"
;
/*public static String STYLE_SHEET =
"node {" +
" fill-color: #B1CAF1; text-color: black; size: 11px, 11px;" +
"} " +
"edge.default edge {" + "text-color: blue;" + " shape: cubic-curve; }" +
"edge.external {" +
//" arrow-shape: circle" +
" text-style: bold;" +
"} " +
"node.deadlock {" +
" fill-color: red; text-color: white; size: 15px, 15px;" +
"} " +
"node.init {" +
" fill-color: green; text-color: black; size: 15px, 15px;" +
"} ";*/
public
AUTGraphDisplay
(
AUTGraph
_graph
,
boolean
_exitOnClose
)
{
public
AUTGraphDisplay
(
AUTGraph
_graph
,
boolean
_exitOnClose
)
{
graph
=
_graph
;
graph
=
_graph
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment