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.

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

[WIP] Macro nodes #196

Draft
wants to merge 73 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
73 commits
Select commit Hold shift + click to select a range
bc28c13
SchemeNode: Add/remove I/O channels at runtime
ales-erjavec Jul 9, 2020
831dc05
widgetmanager: Also dispatch NodeAdded/Removed events to the controls
ales-erjavec Jul 9, 2020
d788a1d
scene: ItemDelegate
ales-erjavec Sep 17, 2020
8d55e73
readwrite: Store runtime added input/output channels
ales-erjavec Sep 22, 2020
3689935
nodeitem: Create icon item in constructor
ales-erjavec Sep 23, 2020
5f2b571
nodeitem: Deprecate set{Widget,Category}Description
ales-erjavec Sep 23, 2020
daa2fa7
nodeitem: Ensure anchor item is visible when adding a new anchor
ales-erjavec Sep 23, 2020
cfe6763
scene: Deprecate set_registry
ales-erjavec Sep 23, 2020
76bf44a
registry: 'inherit' background from category
ales-erjavec Sep 23, 2020
b652bad
schemeedit: Copy extra channels
ales-erjavec Sep 24, 2020
83ff150
test_usagestatistics: Fix test
ales-erjavec Sep 24, 2020
0935949
nodeitem: initFromHelper
ales-erjavec Sep 24, 2020
8ba0a04
scheme: ItemDelegate - tool tip
ales-erjavec Sep 24, 2020
1715877
node: Add 'icon' method
ales-erjavec Nov 4, 2020
5143b2d
node: Use Node.icon() where applicable
ales-erjavec Nov 4, 2020
7d68faa
utils: Add apply_all helper
ales-erjavec Mar 18, 2021
93a68d7
annotationitem: Rename Annotation -> AnnotationItem
ales-erjavec May 20, 2021
672aef1
scene: Use shorter alias names
ales-erjavec May 20, 2021
fd0a103
scene: Move grab_svg implementation
ales-erjavec May 20, 2021
0197946
scheme: Move 'propose_link' implementation
ales-erjavec May 24, 2021
cc401e3
scene: Remove unused/obsolete code
ales-erjavec May 25, 2021
13884d5
scheme: Add a MetaNode, a sub workflow node
ales-erjavec Feb 1, 2021
e24f10d
scheme: Root macro node
ales-erjavec May 25, 2021
24a2500
scene: MacroNodes
ales-erjavec May 25, 2021
47e9cc9
commands: Root meta
ales-erjavec Aug 6, 2021
9068702
schemeedit: MetaNodes
ales-erjavec May 25, 2021
e0c1b7b
widgetmanager: MetaNode
ales-erjavec Aug 10, 2021
07c5077
scheme: Change how window_group_presets are stored
ales-erjavec May 28, 2021
ab26a52
interactions: Fixup imports
ales-erjavec May 28, 2021
33aec26
signalmanager: Redispatch Input/OutputNode signals
ales-erjavec Aug 10, 2021
d55b188
test_scheme: Test for meta nodes
ales-erjavec May 28, 2021
c07eb2e
schemeedit: Move WindowGroupsDialog into its own module
ales-erjavec May 28, 2021
f09b948
schemeedit: Move uniquify and is_printable into utils
ales-erjavec May 28, 2021
0e436b2
schemeedit: Move disable_undo_stack_actions into utils
ales-erjavec May 31, 2021
2f83332
node: Input/Output/MetaNode icons
ales-erjavec May 31, 2021
571c609
interactions: MetaNode
ales-erjavec Jun 1, 2021
721f252
canvasmain: Fix swap
ales-erjavec Jun 1, 2021
4fc9e9a
readwrite: Use intermediate workflow representation in both read/write
ales-erjavec Jun 3, 2019
9145529
readwrite: Add input channels in intermediate
ales-erjavec Jun 2, 2021
a5abe2b
readwrite: Macro nodes
ales-erjavec Jun 2, 2021
be8340f
scene: Extract scene user interactions
ales-erjavec Jun 7, 2021
069e7f7
prepare_macro_patch: Position
ales-erjavec Jun 9, 2021
f10019e
prepare_macro_patch: Only one input node per input channel
ales-erjavec Jun 9, 2021
ea28e35
schemeedit: Swipe navigation
ales-erjavec Jun 10, 2021
ce75dd0
description: Make handler optional
ales-erjavec Jun 11, 2021
d7ba3c8
widgetmanager: Handle meta node
ales-erjavec Jun 15, 2021
cc11619
schemeedit: Copy/paste fix
ales-erjavec Jun 15, 2021
268d8d1
canvasmain: MacroNode
ales-erjavec Jun 16, 2021
72f5730
readwrite: Add utility methods
ales-erjavec Jun 16, 2021
e572cec
test_schemeedit: Fix test
ales-erjavec Jun 16, 2021
a3aafb0
signalmanager: Remove support for `id` for `send()`
ales-erjavec Jun 17, 2021
9e7719f
command: Handle MacroNode Input/Output deletion
ales-erjavec Jun 17, 2021
71df774
suggestions: Fix
ales-erjavec Jun 17, 2021
8910f0d
interactions: MetaNode
ales-erjavec Jul 5, 2021
997b95a
schemeedit: Copy MetaNode
ales-erjavec Jul 5, 2021
592f6ff
readwrite: Store multiple flag for input nodes
ales-erjavec Jul 6, 2021
ed641d1
signalmanager: Tunnel Multiple macro node inputs
ales-erjavec Jul 6, 2021
dbb7c14
schemeedit: Add select, clearSelection, ...
ales-erjavec Jul 14, 2021
1292648
schemeedit: Add 'Expand Macro' action
ales-erjavec Jul 14, 2021
4f892db
scene: Add item_for_element method
ales-erjavec Jul 15, 2021
93c1b1b
scehemedit: Duplicate selected links to non copied nodes
ales-erjavec Jul 15, 2021
f8bcd9e
schemeedit: Use all_nodes/links/annotations where appropriate
ales-erjavec Jul 19, 2021
1b33694
tests: Fix deprecation warnings
ales-erjavec Jul 30, 2021
8974dc5
usagestatistics: Use all_nodes, all_links
ales-erjavec Jul 30, 2021
0ffc57f
schemeedit: Show appropriate macro level on ActivateParentRequest
ales-erjavec Aug 2, 2021
7b3d5e8
gui/breadcrumbs: Add Breadcrumbs navigation
ales-erjavec Aug 3, 2021
842c7bc
schemeedit: Handle MetaNode removal
ales-erjavec Aug 5, 2021
0af42e7
canvas/items: Update names
ales-erjavec Aug 10, 2021
e8ed4e1
document: Update names
ales-erjavec Aug 10, 2021
69ba861
schemeedit: Add mouse back/forward button navigation
ales-erjavec Sep 9, 2021
fb8501a
utils: Move index helper into utils
ales-erjavec Jan 26, 2024
16d5be1
canvasmain: Remove optional scheme margins
ales-erjavec Jan 26, 2024
0d2d8e9
setup.cfg: Move metadata to setup.cfg, raise version
ales-erjavec Sep 9, 2021
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
1 change: 1 addition & 0 deletions docs/source/orangecanvas/canvas.rst
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,4 @@ Canvas (``canvas``)
canvas.items.nodeitem
canvas.items.linkitem
canvas.items.annotationitem
canvas.utils
3 changes: 0 additions & 3 deletions docs/source/orangecanvas/canvas.scene.rst
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,3 @@ Canvas Scene (``scene``)
.. autoattribute:: node_item_hovered(NodeItem)

.. autoattribute:: link_item_hovered(LinkItem)


.. autofunction:: grab_svg
9 changes: 9 additions & 0 deletions docs/source/orangecanvas/canvas.utils.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
.. canvas-utils:

========================
Canvas Utils (``utils``)
========================

.. automodule:: orangecanvas.canvas.utils

.. autofunction:: grab_svg
6 changes: 3 additions & 3 deletions docs/source/orangecanvas/scheme.annotation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Scheme Annotations (``annotations``)
.. automodule:: orangecanvas.scheme.annotations


.. autoclass:: BaseSchemeAnnotation
.. autoclass:: Annotation
:members:
:member-order: bysource
:show-inheritance:
Expand All @@ -17,13 +17,13 @@ Scheme Annotations (``annotations``)
Signal emitted when the geometry of the annotation changes


.. autoclass:: SchemeArrowAnnotation
.. autoclass:: ArrowAnnotation
:members:
:member-order: bysource
:show-inheritance:


.. autoclass:: SchemeTextAnnotation
.. autoclass:: TextAnnotation
:members:
:member-order: bysource
:show-inheritance:
Expand Down
11 changes: 7 additions & 4 deletions docs/source/orangecanvas/scheme.link.rst
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
.. schemelink:

======================
Scheme Link (``link``)
======================
===============
Link (``link``)
===============

.. automodule:: orangecanvas.scheme.link


.. autoclass:: SchemeLink
.. autoclass:: Link
:members:
:exclude-members:
enabled_changed,
Expand All @@ -18,3 +18,6 @@ Scheme Link (``link``)
.. autoattribute:: enabled_changed(enabled)

.. autoattribute:: dynamic_enabled_changed(enabled)


.. autoclass:: SchemeLink
38 changes: 38 additions & 0 deletions docs/source/orangecanvas/scheme.metanode.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
.. scheme-meta-node:

========================
Meta Node (``metanode``)
========================

.. automodule:: orangecanvas.scheme.metanode


.. autoclass:: MetaNode
:members:
:exclude-members:
node_inserted,
node_removed,
link_inserted,
link_removed,
annotation_inserted,
annotation_removed
:member-order: bysource
:show-inheritance:

.. autoattribute:: node_inserted(index, node)

.. autoattribute:: node_removed(node)

.. autoattribute:: link_inserted(int, node)

.. autoattribute:: link_removed(node)

.. autoattribute:: annotation_inserted(index, node)

.. autoattribute:: annotation_removed(node)


.. autoclass:: InputNode

.. autoclass:: OutputNode

29 changes: 23 additions & 6 deletions docs/source/orangecanvas/scheme.node.rst
Original file line number Diff line number Diff line change
@@ -1,19 +1,22 @@
.. scheme-node:

======================
Scheme Node (``node``)
======================
===============
Node (``node``)
===============

.. automodule:: orangecanvas.scheme.node


.. autoclass:: SchemeNode
.. autoclass:: Node
:members:
:exclude-members:
title_changed,
position_changed,
progress_changed,
processing_state_changed
processing_state_changed,
input_channel_inserted,
input_channel_removed,
output_channel_inserted,
output_channel_removed
:member-order: bysource
:show-inheritance:

Expand All @@ -24,3 +27,17 @@ Scheme Node (``node``)
.. autoattribute:: progress_changed(progress)

.. autoattribute:: processing_state_changed(state)

.. autoattribute:: input_channel_inserted(index, signal)

.. autoattribute:: input_channel_removed(signal)

.. autoattribute:: output_channel_inserted(index, signal)

.. autoattribute:: output_channel_removed(signal)


.. autoclass:: SchemeNode
:members:
:member-order: bysource
:show-inheritance:
1 change: 1 addition & 0 deletions docs/source/orangecanvas/scheme.rst
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ Scheme (``scheme``)

scheme.scheme
scheme.node
scheme.metanode
scheme.link
scheme.annotation
scheme.readwrite
Expand Down
5 changes: 4 additions & 1 deletion docs/source/orangecanvas/scheme.scheme.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,10 @@ Scheme (``scheme``)

.. autoclass:: Scheme
:members:
:exclude-members: runtime_env_changed
:exclude-members:
runtime_env_changed,
children,
parents
:member-order: bysource
:show-inheritance:

Expand Down
Loading
Loading