From 802804aea35fe80aaa9672fd067a11779355dd8c Mon Sep 17 00:00:00 2001 From: zeffii Date: Sat, 14 Mar 2020 17:28:08 +0100 Subject: [PATCH 1/5] fix stethoscope recursive location to absolute_location --- nodes/text/stethoscope_v28.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nodes/text/stethoscope_v28.py b/nodes/text/stethoscope_v28.py index be60b2251..6c9238385 100644 --- a/nodes/text/stethoscope_v28.py +++ b/nodes/text/stethoscope_v28.py @@ -25,7 +25,6 @@ from bpy.props import BoolProperty, FloatVectorProperty, StringProperty, IntProp from mathutils import Vector from sverchok.settings import get_params -from sverchok.utils.sv_node_utils import recursive_framed_location_finder from sverchok.node_tree import SverchCustomTreeNode from sverchok.data_structure import node_id, updateNode from sverchok.ui import bgl_callback_nodeview as nvBGL @@ -166,7 +165,7 @@ class SvStethoscopeNodeMK2(bpy.types.Node, SverchCustomTreeNode): # adjust proposed text location in case node is framed. # take into consideration the hidden state node_width = self.width - _x, _y = recursive_framed_location_finder(self, self.location[:]) + _x, _y = self.absolute_location _x, _y = Vector((_x, _y)) + Vector((node_width + 20, 0)) # this alters location based on DPI/Scale settings. -- GitLab From ea1d01b7d09b09816d8b1bb6e309357c642278f2 Mon Sep 17 00:00:00 2001 From: zeffii Date: Sat, 14 Mar 2020 17:36:16 +0100 Subject: [PATCH 2/5] cleans up quicklink --- node_tree.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/node_tree.py b/node_tree.py index 3e06afd7e..888efeb92 100644 --- a/node_tree.py +++ b/node_tree.py @@ -74,10 +74,9 @@ class SvLinkNewNodeInput(bpy.types.Operator): links.new(new_node.outputs[0], caller_node.inputs[self.socket_index]) if caller_node.parent: + print('called') new_node.parent = caller_node.parent - loc_xy = new_node.location[:] - locx, locy = recursive_framed_location_finder(new_node, loc_xy) - new_node.location = locx, locy + new_node.location = new_node.absolute_location new_node.process_node(context) -- GitLab From e98407b395b7f44644a69b8e59ba15d69622423b Mon Sep 17 00:00:00 2001 From: zeffii Date: Sat, 14 Mar 2020 17:37:45 +0100 Subject: [PATCH 3/5] add comment for future --- node_tree.py | 1 - utils/sv_IO_panel_tools.py | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/node_tree.py b/node_tree.py index 888efeb92..97be769ef 100644 --- a/node_tree.py +++ b/node_tree.py @@ -74,7 +74,6 @@ class SvLinkNewNodeInput(bpy.types.Operator): links.new(new_node.outputs[0], caller_node.inputs[self.socket_index]) if caller_node.parent: - print('called') new_node.parent = caller_node.parent new_node.location = new_node.absolute_location diff --git a/utils/sv_IO_panel_tools.py b/utils/sv_IO_panel_tools.py index 5d5970c4d..dc4d6eaa8 100644 --- a/utils/sv_IO_panel_tools.py +++ b/utils/sv_IO_panel_tools.py @@ -144,7 +144,7 @@ def get_superficial_props(node_dict, node): node_dict['hide'] = node.hide _x, _y = recursive_framed_location_finder(node, node.location[:]) - node_dict['location'] = _x, _y + node_dict['location'] = _x, _y # node.absolute_location if node.use_custom_color: node_dict['color'] = node.color[:] -- GitLab From 67ad7e7fd6cd639067538492976bca1943010385 Mon Sep 17 00:00:00 2001 From: zeffii Date: Sat, 14 Mar 2020 17:38:58 +0100 Subject: [PATCH 4/5] really don't use it anymore --- node_tree.py | 1 - utils/sv_IO_panel_tools.py | 5 +---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/node_tree.py b/node_tree.py index 97be769ef..ad1248d61 100644 --- a/node_tree.py +++ b/node_tree.py @@ -42,7 +42,6 @@ from sverchok.core.socket_conversions import DefaultImplicitConversionPolicy from sverchok.core.node_defaults import set_defaults_if_defined from sverchok.utils import get_node_class_reference -from sverchok.utils.sv_node_utils import recursive_framed_location_finder from sverchok.utils.context_managers import sv_preferences from sverchok.utils.docstring import SvDocstring import sverchok.utils.logging diff --git a/utils/sv_IO_panel_tools.py b/utils/sv_IO_panel_tools.py index dc4d6eaa8..88e3e1548 100644 --- a/utils/sv_IO_panel_tools.py +++ b/utils/sv_IO_panel_tools.py @@ -28,7 +28,6 @@ from itertools import chain import bpy from sverchok import old_nodes -from sverchok.utils.sv_node_utils import recursive_framed_location_finder from sverchok.utils.sv_IO_monad_helpers import pack_monad, unpack_monad from sverchok.utils.logging import debug, info, warning, error, exception from sverchok.utils.sv_requests import urlopen @@ -142,9 +141,7 @@ def get_superficial_props(node_dict, node): node_dict['width'] = node.width node_dict['label'] = node.label node_dict['hide'] = node.hide - - _x, _y = recursive_framed_location_finder(node, node.location[:]) - node_dict['location'] = _x, _y # node.absolute_location + node_dict['location'] = node.absolute_location if node.use_custom_color: node_dict['color'] = node.color[:] -- GitLab From b234cf093cc744823e71d99d34ba2a17a167823b Mon Sep 17 00:00:00 2001 From: zeffii Date: Sat, 14 Mar 2020 17:41:46 +0100 Subject: [PATCH 5/5] gotta import it! --- node_tree.py | 1 + 1 file changed, 1 insertion(+) diff --git a/node_tree.py b/node_tree.py index ad1248d61..97be769ef 100644 --- a/node_tree.py +++ b/node_tree.py @@ -42,6 +42,7 @@ from sverchok.core.socket_conversions import DefaultImplicitConversionPolicy from sverchok.core.node_defaults import set_defaults_if_defined from sverchok.utils import get_node_class_reference +from sverchok.utils.sv_node_utils import recursive_framed_location_finder from sverchok.utils.context_managers import sv_preferences from sverchok.utils.docstring import SvDocstring import sverchok.utils.logging -- GitLab