fix for comment positions / number_tilde

Author: shakfu

CHANGELOG.md

@@ -3,6 +3,10 @@
 
 ## 0.1.1
 
+- Added number_tilde test
+
+- Fixed comment positioning
+
 - Added pyhola layout.
 
 - Added graphviz layouts.

docs/auto-layouts.md

@@ -112,7 +112,7 @@ The default is a very basic grid layout algo that's implemented in the current `
 ![tsmpy1](assets/imgs/tsmp1.png)
 
 
-###  Layout
+### OrthogonalDrawing Layout
 
 ![orthogonal](assets/imgs/orthogonal.png)
 

py2max/core.py

@@ -43,21 +43,26 @@ class LayoutManager:
     i.e. objects flow and wrap to the right.
     """
 
+
     LAYOUT_DEFAULT_PAD = 1.5*32.0
+    # LAYOUT_DEFAULT_PAD = 32.0
     LAYOUT_DEFAULT_BOX_WIDTH = 66.0
     LAYOUT_DEFAULT_BOX_HEIGHT = 22.0
+    LAYOUT_DEFAULT_COMMENT_PAD = 2
 
     def __init__(
         self,
         parent: "Patcher",
         pad: int = None,
         box_width: int = None,
         box_height: int = None,
+        comment_pad: int = None,
     ):
         self.parent = parent
         self.pad = pad or self.LAYOUT_DEFAULT_PAD
         self.box_width = box_width or self.LAYOUT_DEFAULT_BOX_WIDTH
         self.box_height = box_height or self.LAYOUT_DEFAULT_BOX_HEIGHT
+        self.comment_pad = comment_pad or self.LAYOUT_DEFAULT_COMMENT_PAD
         self.x_layout_counter = 0
         self.y_layout_counter = 0
         self.prior_rect = None
@@ -163,17 +168,20 @@ def above(self, rect):
     def below(self, rect):
         """Return a position below the object"""
         x, y, w, h = rect
-        return [x, y + (self.box_height + h), w, h]
+        # return [x, y + (self.box_height + h + self.comment_pad), w, h]
+        return [x, y + (self.box_height + self.comment_pad), w, h]
 
     def left(self, rect):
         """Return a position left of the object"""
         x, y, w, h = rect
-        return [x - self.box_width, y, w, h]
+        return [x - (self.box_width - self.comment_pad), y, w, h]
 
     def right(self, rect):
         """Return a position right of the object"""
         x, y, w, h = rect
-        return [x + (self.box_width + w), y, w, h]
+        # return [x + (self.box_width + w), y, w, h]
+        # return [x + (self.box_width - self.pad + w), y, w, h]
+        return [x + (self.box_width + self.comment_pad), y, w, h]
 
 
 class VerticalLayoutManager(LayoutManager):
@@ -464,9 +472,9 @@ def add_textbox(
         _maxclass, *tail = text.split()
         if _maxclass in MAXCLASS_DEFAULTS and not maxclass:
             maxclass = _maxclass
-            _defaults = MAXCLASS_DEFAULTS[_maxclass]
-            if "patching_rect" in _defaults and not patching_rect:
-                patching_rect = _defaults["patching_rect"]
+            # _defaults = MAXCLASS_DEFAULTS[_maxclass]
+            # if "patching_rect" in _defaults and not patching_rect:
+            #     patching_rect = _defaults["patching_rect"]
 
         if self.classnamespace == "rnbo":
             kwds["rnbo_classname"] = _maxclass

py2max/tests/test_number_tilde.py

@@ -0,0 +1,16 @@
+from .. import Patcher
+
+POSITIONS = ["above", "right", "below", "left"]
+
+
+def test_number_tilde():
+    p = Patcher('outputs/test_number_tilde.maxpat')
+    for pos in POSITIONS:
+        p.add_textbox("number~", mode=1, comment=f"mode1-{pos}", comment_pos=pos)
+    for pos in POSITIONS:
+        p.add_textbox("number~", mode=2, comment=f"mode2-{pos}", comment_pos=pos)
+    p.save()
+
+
+if __name__ == '__main__':
+    test_number_tilde()

py2max/tests/test_numbers.py

@@ -16,7 +16,7 @@ def test_add_floatbox():
     p.save()
 
 
-def test_add_floatbox():
+def test_add_intbox():
     p = Patcher('outputs/test_intbox.maxpat')
 
     d = {}