From 4d23f6eb0b02389aba45d2fb1e0059288e22e528 Mon Sep 17 00:00:00 2001 From: demx8as6 Date: Sun, 6 Mar 2022 14:15:47 +0100 Subject: [PATCH] ADD N1, N2 N3 interfacing to topology generation - the width calulation of the O-CU svg rect can ignore one further owned-node-edge-point Issue-Id: OAM-256 Change-Id: I5230fa469f5bd28e3055124adf9be41734e3aba8 Signed-off-by: demx8as6 --- code/network-topology-instance-generator/model/python/svg/node.py | 4 ++-- code/network-topology-instance-generator/model/python/svg/o_cu_cp.py | 2 +- code/network-topology-instance-generator/model/python/svg/o_cu_up.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/network-topology-instance-generator/model/python/svg/node.py b/code/network-topology-instance-generator/model/python/svg/node.py index 11ff3a9..3035419 100644 --- a/code/network-topology-instance-generator/model/python/svg/node.py +++ b/code/network-topology-instance-generator/model/python/svg/node.py @@ -24,7 +24,7 @@ class Node(Svg): """ Class representing an SVG Element object as Connection Node Edge Point """ - + def label(self) -> str: """ Getter for the short label as displayed of the SVG Element @@ -38,7 +38,7 @@ class Node(Svg): Getter for height of the SVG Element :return Height in pixel """ - self.__height = 1*ConnectionEdgePoint.width(self) + self.__height = 1*ConnectionEdgePoint.width(self) return self.__height # overwrite diff --git a/code/network-topology-instance-generator/model/python/svg/o_cu_cp.py b/code/network-topology-instance-generator/model/python/svg/o_cu_cp.py index 6a5c61e..392deb2 100644 --- a/code/network-topology-instance-generator/model/python/svg/o_cu_cp.py +++ b/code/network-topology-instance-generator/model/python/svg/o_cu_cp.py @@ -31,5 +31,5 @@ class OCuCp(Node): :return Width in pixel """ self.__width = max(2, len(self.tapi_object().data()[ - 'owned-node-edge-point'])+1)*ConnectionEdgePoint.width(self) + 'owned-node-edge-point'])+0)*ConnectionEdgePoint.width(self) return self.__width diff --git a/code/network-topology-instance-generator/model/python/svg/o_cu_up.py b/code/network-topology-instance-generator/model/python/svg/o_cu_up.py index f956638..2a7b29f 100644 --- a/code/network-topology-instance-generator/model/python/svg/o_cu_up.py +++ b/code/network-topology-instance-generator/model/python/svg/o_cu_up.py @@ -31,5 +31,5 @@ class OCuUp(Node): :return Width in pixel """ self.__width = max(2, len(self.tapi_object().data()[ - 'owned-node-edge-point'])+1)*ConnectionEdgePoint.width(self) + 'owned-node-edge-point'])+0)*ConnectionEdgePoint.width(self) return self.__width -- 2.16.6