Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
ensembl-gh-mirror
ensembl-hive
Commits
c7895493
Commit
c7895493
authored
Nov 12, 2015
by
Leo Gordon
Browse files
extending the JSON config to shapes/colours/fonts of the new node types
parent
9683ed80
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
62 additions
and
21 deletions
+62
-21
hive_config.json
hive_config.json
+24
-2
modules/Bio/EnsEMBL/Hive/Utils/Graph.pm
modules/Bio/EnsEMBL/Hive/Utils/Graph.pm
+38
-19
No files found.
hive_config.json
View file @
c7895493
...
...
@@ -42,7 +42,6 @@
"Node"
:
{
"Font"
:
"Times-Roman"
,
"Colour"
:
"cyan"
,
"Table"
:
{
"Colour"
:
"black"
,
"Font"
:
"Courier"
},
"Details"
:
{
"Font"
:
"Helvetica"
},
"JobStatus"
:
{
...
...
@@ -63,7 +62,30 @@
"WORKING"
:
{
"Colour"
:
"yellow"
},
"DONE"
:
{
"Colour"
:
"DeepSkyBlue"
},
"FAILED"
:
{
"Colour"
:
"red"
}
}
},
"Table"
:
{
"Colour"
:
"orange"
,
"HeaderColour"
:
"orangered"
,
"Font"
:
"Courier"
,
"FontColour"
:
"black"
},
"AccuSink"
:
{
"Shape"
:
"invhouse"
,
"Style"
:
"filled"
,
"Colour"
:
"darkgreen"
,
"Font"
:
"Courier"
,
"FontColour"
:
"white"
},
"Switch"
:
{
"Shape"
:
"diamond"
,
"Style"
:
"filled"
,
"Colour"
:
"blueviolet"
,
"Font"
:
"Courier"
,
"FontColour"
:
"white"
},
},
"Edge"
:
{
"Font"
:
"Helvetica"
,
...
...
modules/Bio/EnsEMBL/Hive/Utils/Graph.pm
View file @
c7895493
...
...
@@ -214,8 +214,8 @@ sub build {
my
$from
=
$self
->
_analysis_node_name
(
$analysis
);
my
$to
=
_midpoint_name
(
$analysis
->
{'
_funnel_dfr
'}
);
$self
->
graph
->
add_edge
(
$from
=>
$to
,
color
=>
'
black
',
style
=>
'
invis
',
# toggle visibility by changing 'invis' to 'dashed'
color
=>
'
black
',
);
}
}
...
...
@@ -323,9 +323,9 @@ sub _add_pipeline_label {
my
$pipelabel_node_name
=
'
pipelabel_
'
.
$pipeline
->
hive_pipeline_name
;
$self
->
graph
()
->
add_node
(
$pipelabel_node_name
,
label
=>
$pipeline_label
,
fontname
=>
$node_fontname
,
shape
=>
'
plaintext
',
fontname
=>
$node_fontname
,
label
=>
$pipeline_label
,
);
return
$pipelabel_node_name
;
...
...
@@ -408,11 +408,11 @@ sub _add_analysis_node {
$analysis_label
.=
'
</table>>
';
$self
->
graph
->
add_node
(
$this_analysis_node_name
,
label
=>
$analysis_label
,
shape
=>
'
record
',
fontname
=>
$node_fontname
,
style
=>
$style
,
fillcolor
=>
$analysis_status_colour
,
fontname
=>
$node_fontname
,
label
=>
$analysis_label
,
);
$self
->
_add_control_rules
(
$analysis
->
control_rules_collection
);
...
...
@@ -425,15 +425,21 @@ sub _add_analysis_node {
sub
_add_accu_sink_node
{
my
(
$self
,
$funnel_dfr
)
=
@_
;
my
$accusink_shape
=
$self
->
config_get
('
Node
',
'
AccuSink
',
'
Shape
');
my
$accusink_style
=
$self
->
config_get
('
Node
',
'
AccuSink
',
'
Style
');
my
$accusink_colour
=
$self
->
config_get
('
Node
',
'
AccuSink
',
'
Colour
');
my
$accusink_font
=
$self
->
config_get
('
Node
',
'
AccuSink
',
'
Font
');
my
$accusink_fontcolour
=
$self
->
config_get
('
Node
',
'
AccuSink
',
'
FontColour
');
my
$accu_sink_node_name
=
_accu_sink_node_name
(
$funnel_dfr
);
$self
->
graph
->
add_node
(
$accu_sink_node_name
,
#
s
hap
e =>
'noverhang'
,
#
shape =>
'invtriangle'
,
shape
=>
'
invhouse
'
,
label
=>
''
,
style
=>
'
filled
'
,
fillcolor
=>
'
darkgreen
',
s
tyl
e
=>
$accusink_style
,
shape
=>
$accusink_shape
,
fillcolor
=>
$accusink_colour
,
fontname
=>
$accusink_font
,
fontcolor
=>
$accusink_fontcolour
,
label
=>
'
Accu
',
);
return
$accu_sink_node_name
;
...
...
@@ -526,6 +532,11 @@ sub _twopart_arrow {
my
$graph
=
$self
->
graph
();
my
$df_edge_fontname
=
$self
->
config_get
('
Edge
',
'
Data
',
'
Font
');
my
$switch_shape
=
$self
->
config_get
('
Node
',
'
Switch
',
'
Shape
');
my
$switch_style
=
$self
->
config_get
('
Node
',
'
Switch
',
'
Style
');
my
$switch_colour
=
$self
->
config_get
('
Node
',
'
Switch
',
'
Colour
');
my
$switch_font
=
$self
->
config_get
('
Node
',
'
Switch
',
'
Font
');
my
$switch_fontcolour
=
$self
->
config_get
('
Node
',
'
Switch
',
'
FontColour
');
my
$from_analysis
=
$df_rule
->
from_analysis
;
my
$from_node_name
=
$self
->
_analysis_node_name
(
$from_analysis
);
...
...
@@ -535,10 +546,13 @@ sub _twopart_arrow {
my
$choice
=
(
scalar
(
@$df_targets
)
!=
1
)
||
defined
(
$df_targets
->
[
0
]
->
on_condition
);
$graph
->
add_node
(
$midpoint_name
,
# midpoint itself
color
=>
'
black
',
$choice
?
(
shape
=>
'
diamond
',
label
=>
scalar
(
@$df_targets
)
==
1
?
'
Filter
'
:
'
Switch
',
style
=>
$switch_style
,
shape
=>
$switch_shape
,
fillcolor
=>
$switch_colour
,
fontname
=>
$switch_font
,
fontcolor
=>
$switch_fontcolour
,
label
=>
scalar
(
@$df_targets
)
==
1
?
'
Filter
'
:
'
Switch
',
)
:
(
shape
=>
'
point
',
fixedsize
=>
1
,
...
...
@@ -616,7 +630,11 @@ sub _add_dataflow_rules {
sub
_add_table_node
{
my
(
$self
,
$naked_table
)
=
@_
;
my
$node_fontname
=
$self
->
config_get
('
Node
',
'
Table
',
'
Font
');
my
$table_colour
=
$self
->
config_get
('
Node
',
'
Table
',
'
Colour
');
my
$table_header_colour
=
$self
->
config_get
('
Node
',
'
Table
',
'
HeaderColour
');
my
$table_fontcolour
=
$self
->
config_get
('
Node
',
'
Table
',
'
FontColour
');
my
$table_fontname
=
$self
->
config_get
('
Node
',
'
Table
',
'
Font
');
my
$hive_pipeline
=
$self
->
pipeline
;
my
$this_table_node_name
=
$self
->
_table_node_name
(
$naked_table
);
...
...
@@ -638,7 +656,7 @@ sub _add_table_node {
if
(
$self
->
config_get
('
DisplayData
')
and
$columns
)
{
$table_label
.=
'
<tr><td colspan="
'
.
$columns
.
'
"> </td></tr>
';
$table_label
.=
'
<tr>
'
.
join
('',
map
{
qq{<td bgcolor="
lightblue
" border="1">$_</td>}
}
@column_names
)
.
'
</tr>
';
$table_label
.=
'
<tr>
'
.
join
('',
map
{
qq{<td bgcolor="
$table_header_colour
" border="1">$_</td>}
}
@column_names
)
.
'
</tr>
';
foreach
my
$row
(
@$table_data
)
{
$table_label
.=
'
<tr>
'
.
join
('',
map
{
qq{<td>$_</td>}
}
@
{
$row
}{
@column_names
})
.
'
</tr>
';
}
...
...
@@ -649,11 +667,12 @@ sub _add_table_node {
$table_label
.=
'
</table>>
';
$self
->
graph
()
->
add_node
(
$this_table_node_name
,
label
=>
$table_label
,
shape
=>
'
record
',
fontname
=>
$node_fontname
,
style
=>
'
filled
',
fillcolor
=>
'
white
',
fillcolor
=>
$table_colour
,
fontname
=>
$table_fontname
,
fontcolor
=>
$table_fontcolour
,
label
=>
$table_label
,
);
return
$this_table_node_name
;
...
...
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