Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
beat.editor
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
11
Issues
11
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
beat
beat.editor
Commits
0d90f83e
Commit
0d90f83e
authored
Oct 31, 2019
by
Flavio TARSETTI
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[widgets][toolchaineditor] adding colors for blocks/connection channels
parent
180d795e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
42 additions
and
4 deletions
+42
-4
beat/editor/widgets/space_nodes_config.json
beat/editor/widgets/space_nodes_config.json
+3
-0
beat/editor/widgets/toolchaineditor.py
beat/editor/widgets/toolchaineditor.py
+39
-4
No files found.
beat/editor/widgets/space_nodes_config.json
View file @
0d90f83e
...
...
@@ -16,6 +16,9 @@
"pin_font_size"
:
10
,
"pin_color"
:
[
255
,
155
,
0
,
255
],
"background_color"
:
[
80
,
80
,
80
,
255
],
"background_color_datasets"
:
[
255
,
254
,
200
,
255
],
"background_color_blocks"
:
[
204
,
204
,
204
,
255
],
"background_color_analyzers"
:
[
136
,
150
,
216
,
255
],
"border_color"
:
[
50
,
50
,
50
,
255
],
"selection_border_color"
:
[
170
,
80
,
80
,
255
],
"text_color"
:
[
0
,
0
,
0
,
255
]
...
...
beat/editor/widgets/toolchaineditor.py
View file @
0d90f83e
...
...
@@ -143,7 +143,7 @@ class OutputPin(BasePin):
class
Connection
(
QGraphicsPathItem
):
def
__init__
(
self
,
toolchain
,
connection_details
,
style
):
def
__init__
(
self
,
toolchain
,
connection_details
,
style
,
channel_colors
):
super
().
__init__
()
...
...
@@ -153,6 +153,13 @@ class Connection(QGraphicsPathItem):
self
.
end_pin_name
=
connection_details
[
"to"
].
split
(
"."
)[
1
]
self
.
channel
=
connection_details
[
"channel"
]
hexadecimal
=
channel_colors
[
self
.
channel
].
lstrip
(
"#"
)
hlen
=
len
(
hexadecimal
)
self
.
connection_color
=
list
(
int
(
hexadecimal
[
i
:
i
+
hlen
//
3
],
16
)
for
i
in
range
(
0
,
hlen
,
hlen
//
3
)
)
self
.
connection_color
.
append
(
255
)
self
.
blocks
=
toolchain
.
blocks
for
block
in
self
.
blocks
:
...
...
@@ -183,7 +190,7 @@ class Connection(QGraphicsPathItem):
self
.
color
=
config
[
"color"
]
self
.
connection_pen
=
QPen
()
self
.
connection_pen
.
setColor
(
QColor
(
*
config
[
"color"
]
))
self
.
connection_pen
.
setColor
(
QColor
(
*
self
.
connection_color
))
self
.
connection_pen
.
setWidth
(
config
[
"width"
])
def
drawCubicBezierCurve
(
self
):
...
...
@@ -320,7 +327,12 @@ class Block(QGraphicsObject):
self
.
background_brush
=
QBrush
()
self
.
background_brush
.
setStyle
(
Qt
.
SolidPattern
)
self
.
background_brush
.
setColor
(
QColor
(
*
config
[
"background_color"
]))
self
.
background_color_datasets
=
QColor
(
*
config
[
"background_color_datasets"
])
self
.
background_color_analyzers
=
QColor
(
*
config
[
"background_color_analyzers"
])
self
.
background_color_blocks
=
QColor
(
*
config
[
"background_color_blocks"
])
self
.
background_brush
.
setColor
(
self
.
background_color_blocks
)
self
.
background_pen
=
QPen
()
self
.
background_pen
.
setStyle
(
Qt
.
SolidLine
)
...
...
@@ -422,6 +434,11 @@ class Block(QGraphicsObject):
"""Paint the block"""
# Design tools
if
self
.
type
==
BlockType
.
DATASETS
.
name
:
self
.
background_brush
.
setColor
(
self
.
background_color_datasets
)
elif
self
.
type
==
BlockType
.
ANALYZERS
.
name
:
self
.
background_brush
.
setColor
(
self
.
background_color_analyzers
)
painter
.
setBrush
(
self
.
background_brush
)
painter
.
setPen
(
self
.
border_pen
)
...
...
@@ -490,6 +507,7 @@ class Toolchain(QWidget):
self
.
scene
.
items
().
clear
()
self
.
blocks
=
[]
self
.
connections
=
[]
self
.
channels
=
[]
def
load
(
self
,
json_object
):
"""Parse the json in parameter and generates a graph"""
...
...
@@ -501,20 +519,37 @@ class Toolchain(QWidget):
else
:
self
.
web_representation
=
None
if
"editor_gui"
in
self
.
json_object
:
self
.
editor_gui
=
self
.
json_object
[
"editor_gui"
]
else
:
self
.
editor_gui
=
None
self
.
clear_space
()
# Get datasets, blocks, analyzers
for
block_type
in
BlockType
:
for
block_item
in
self
.
json_object
[
block_type
.
value
]:
block
=
Block
(
block_item
,
block_type
.
name
,
self
.
block_config
)
# Place blocks (x,y) if information is given
if
self
.
editor_gui
is
not
None
:
if
block
.
name
in
self
.
editor_gui
:
block
.
setPos
(
self
.
editor_gui
[
block
.
name
][
"x"
],
self
.
editor_gui
[
block
.
name
][
"y"
],
)
block
.
position
=
block
.
scenePos
()
block
.
dataChanged
.
connect
(
self
.
dataChanged
)
self
.
blocks
.
append
(
block
)
self
.
scene
.
addItem
(
block
)
# Display connections
connections
=
self
.
json_object
[
"connections"
]
channel_colors
=
self
.
json_object
[
"representation"
][
"channel_colors"
]
for
connection_item
in
connections
:
connection
=
Connection
(
self
,
connection_item
,
self
.
connection_config
)
connection
=
Connection
(
self
,
connection_item
,
self
.
connection_config
,
channel_colors
)
self
.
connections
.
append
(
connection
)
self
.
scene
.
addItem
(
connection
)
...
...
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