Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch to setup.cfg and use pyHDLParser fork as dependency #8

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
+1,852 −1,682
Open

Switch to setup.cfg and use pyHDLParser fork as dependency #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a269c4f
switch to setup.cfg + dep: hdlparse@master
kammoh Mar 8, 2022
279637b
fix vhdl_parser if no component is defined
kammoh Mar 9, 2022
79294d2
inline color description for signal sections
kammoh Nov 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
196 changes: 97 additions & 99 deletions nucanvas/nucanvas.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,100 +7,99 @@


class NuCanvas(GroupShape):
'''This is a clone of the Tk canvas subset used by the original Tcl
It implements an abstracted canvas that can render objects to different
backends other than just a Tk canvas widget.
'''
def __init__(self, surf):
GroupShape.__init__(self, surf, 0, 0, {})
self.markers = {}

def set_surface(self, surf):
self.surf = surf

def clear_shapes(self):
self.shapes = []

def _get_shapes(self, item=None):
# Filter shapes
if item is None or item == 'all':
shapes = self.shapes
else:
shapes = [s for s in self.shapes if s.is_tagged(item)]
return shapes

def render(self, transparent):
self.surf.render(self, transparent)

def add_marker(self, name, shape, ref=(0,0), orient='auto', units='stroke'):
self.markers[name] = (shape, ref, orient, units)

def bbox(self, item=None):
bx0 = 0
bx1 = 0
by0 = 0
by1 = 0

boxes = [s.bbox for s in self._get_shapes(item)]
boxes = list(zip(*boxes))
if len(boxes) > 0:
bx0 = min(boxes[0])
by0 = min(boxes[1])
bx1 = max(boxes[2])
by1 = max(boxes[3])

return [bx0, by0, bx1, by1]

def move(self, item, dx, dy):
for s in self._get_shapes(item):
s.move(dx, dy)

def tag_raise(self, item):
to_raise = self._get_shapes(item)
for s in to_raise:
self.shapes.remove(s)
self.shapes.extend(to_raise)

def addtag_withtag(self, tag, item):
for s in self._get_shapes(item):
s.addtag(tag)


def dtag(self, item, tag=None):
for s in self._get_shapes(item):
s.dtag(tag)

def draw(self, c):
'''Draw all shapes on the canvas'''
for s in self.shapes:
tk_draw_shape(s, c)

def delete(self, item):
for s in self._get_shapes(item):
self.shapes.remove(s)
'''This is a clone of the Tk canvas subset used by the original Tcl
It implements an abstracted canvas that can render objects to different
backends other than just a Tk canvas widget.
'''

def __init__(self, surf):
GroupShape.__init__(self, surf, 0, 0, {})
self.markers = {}

def set_surface(self, surf):
self.surf = surf

def clear_shapes(self):
self.shapes = []

def _get_shapes(self, item=None):
# Filter shapes
if item is None or item == 'all':
shapes = self.shapes
else:
shapes = [s for s in self.shapes if s.is_tagged(item)]
return shapes

def render(self, transparent):
self.surf.render(self, transparent)

def add_marker(self, name, shape, ref=(0, 0), orient='auto', units='stroke'):
self.markers[name] = (shape, ref, orient, units)

def bbox(self, item=None):
bx0 = 0
bx1 = 0
by0 = 0
by1 = 0

boxes = [s.bbox for s in self._get_shapes(item)]
boxes = list(zip(*boxes))
if len(boxes) > 0:
bx0 = min(boxes[0])
by0 = min(boxes[1])
bx1 = max(boxes[2])
by1 = max(boxes[3])

return [bx0, by0, bx1, by1]

def move(self, item, dx, dy):
for s in self._get_shapes(item):
s.move(dx, dy)

def tag_raise(self, item):
to_raise = self._get_shapes(item)
for s in to_raise:
self.shapes.remove(s)
self.shapes.extend(to_raise)

def addtag_withtag(self, tag, item):
for s in self._get_shapes(item):
s.addtag(tag)

def dtag(self, item, tag=None):
for s in self._get_shapes(item):
s.dtag(tag)

def draw(self, c):
'''Draw all shapes on the canvas'''
for s in self.shapes:
tk_draw_shape(s, c)

def delete(self, item):
for s in self._get_shapes(item):
self.shapes.remove(s)


if __name__ == '__main__':

from .svg_backend import SvgSurface
from .cairo_backend import CairoSurface
from .shapes import PathShape
from .svg_backend import SvgSurface
from .cairo_backend import CairoSurface
from .shapes import PathShape

#surf = CairoSurface('nc.png', DrawStyle(), padding=5, scale=2)
surf = SvgSurface('nc.svg', DrawStyle(), padding=5, scale=2)
#surf = CairoSurface('nc.png', DrawStyle(), padding=5, scale=2)
surf = SvgSurface('nc.svg', DrawStyle(), padding=5, scale=2)

#surf.add_shape_class(DoubleRectShape, cairo_draw_DoubleRectShape)
#surf.add_shape_class(DoubleRectShape, cairo_draw_DoubleRectShape)

nc = NuCanvas(surf)
nc = NuCanvas(surf)

nc.add_marker('arrow_fwd',
PathShape(((0, -4), (2, -1, 2, 1, 0, 4), (8, 0), 'z'), fill=(0, 0, 0, 120), width=0),
(3.2, 0), 'auto')

nc.add_marker('arrow_fwd',
PathShape(((0,-4), (2,-1, 2,1, 0,4), (8,0), 'z'), fill=(0,0,0, 120), width=0),
(3.2,0), 'auto')

nc.add_marker('arrow_back',
PathShape(((0,-4), (-2,-1, -2,1, 0,4), (-8,0), 'z'), fill=(0,0,0, 120), width=0),
(-3.2,0), 'auto')
nc.add_marker('arrow_back',
PathShape(((0, -4), (-2, -1, -2, 1, 0, 4), (-8, 0), 'z'), fill=(0, 0, 0, 120), width=0),
(-3.2, 0), 'auto')

#
# nc.create_rectangle(5,5, 20,20, fill=(255,0,0,127))
Expand Down Expand Up @@ -128,27 +127,26 @@ def delete(self, item):
# nc.create_path([(20,40), (30,70), (40,120, 60,50, 10), (60, 50, 80,90, 10), (80, 90, 150,89, 15),
# (150, 89), (130,20), 'z'], width=1)

nc.create_line(30,50, 200,100, width=5, line_color=(200,100,50,100), marker_start='arrow_back',
marker_end='arrow_fwd')

nc.create_line(30, 50, 200, 100, width=5, line_color=(200, 100, 50, 100), marker_start='arrow_back',
marker_end='arrow_fwd')

nc.create_rectangle(30,85, 60,105, width=1, line_color=(255,0,0))
nc.create_line(30,90, 60,90, width=2, marker_start='arrow_back',
marker_end='arrow_fwd')
nc.create_rectangle(30, 85, 60, 105, width=1, line_color=(255, 0, 0))
nc.create_line(30, 90, 60, 90, width=2, marker_start='arrow_back',
marker_end='arrow_fwd')

nc.create_line(30,100, 60,100, width=2, marker_start='arrow_back',
marker_end='arrow_fwd', marker_adjust=1.0)
nc.create_line(30, 100, 60, 100, width=2, marker_start='arrow_back',
marker_end='arrow_fwd', marker_adjust=1.0)


# ls.options['marker_start'] = 'arrow_back'
# ls.options['marker_end'] = 'arrow_fwd'
# ls.options['marker_adjust'] = 0.8

nc.create_oval(50-2,80-2, 50+2,80+2, width=0, fill=(255,0,0))
nc.create_text(50,80, text='Hello world', anchor='nw', font=('Helvetica', 14, 'normal'), text_color=(0,0,0), spacing=-8)
nc.create_oval(50 - 2, 80 - 2, 50 + 2, 80 + 2, width=0, fill=(255, 0, 0))
nc.create_text(50, 80, text='Hello world', anchor='nw', font=('Helvetica', 14, 'normal'), text_color=(0, 0, 0), spacing=-8)

nc.create_oval(50-2,100-2, 50+2,100+2, width=0, fill=(255,0,0))
nc.create_text(50,100, text='Hello world', anchor='ne')
nc.create_oval(50 - 2, 100 - 2, 50 + 2, 100 + 2, width=0, fill=(255, 0, 0))
nc.create_text(50, 100, text='Hello world', anchor='ne')

surf.draw_bbox = True
nc.render()
surf.draw_bbox = True
nc.render(True)
Loading