Fix import errors in compas_rhino conduits for Rhino 8

Author: tomvanmele

CHANGELOG.md

@@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * Fixed `RuntimeError` when using `compas_rhino.unload_modules` in CPython`. 
 * Fixed bug in `Box.scaled` causing a `TypeError` due to incorrect parameter forwarding.
 * Changed argument names of `Box.scale()` to `x`, `y`, `z`, instead of `factor` and made `y` and `z` optional to keep positional arguments backwards compatible.
+* Fixed import errors in `compas_rhino.conduits` for Rhino 8.
 
 ### Removed
 

src/compas_rhino/conduits/base.py

@@ -5,8 +5,8 @@
 import time
 from contextlib import contextmanager
 
-import Rhino
-import scriptcontext as sc
+import Rhino  # type: ignore
+import scriptcontext as sc  # type: ignore
 
 
 class BaseConduit(Rhino.Display.DisplayConduit):

src/compas_rhino/conduits/faces.py

@@ -2,11 +2,11 @@
 from __future__ import division
 from __future__ import print_function
 
-from Rhino.Geometry import Point3d
-from System.Drawing.Color import FromArgb
+import Rhino  # type: ignore
+import System  # type: ignore
 
+from compas.data.validators import is_sequence_of_iterable
 from compas.itertools import iterable_like
-from compas.utilities import is_sequence_of_iterable
 
 from .base import BaseConduit
 
@@ -49,7 +49,7 @@ class FacesConduit(BaseConduit):
 
     """
 
-    default_color = FromArgb(255, 255, 255)
+    default_color = System.Drawing.Color.FromArgb(255, 255, 255)
 
     def __init__(self, vertices, faces, color=None, **kwargs):
         super(FacesConduit, self).__init__(**kwargs)
@@ -68,7 +68,7 @@ def color(self, color):
             return
         if not is_sequence_of_iterable(color):
             color = [color]
-        color = [FromArgb(*c) for c in iterable_like(self.faces, color, self.default_color)]
+        color = [System.Drawing.Color.FromArgb(*c) for c in iterable_like(self.faces, color, self.default_color)]
         self._color = color
 
     def DrawForeground(self, e):
@@ -84,7 +84,7 @@ def DrawForeground(self, e):
 
         """
         for i, face in enumerate(self.faces):
-            points = [Point3d(*self.vertices[key]) for key in face]
+            points = [Rhino.Geometry.Point3d(*self.vertices[key]) for key in face]
             if self.color:
                 e.Display.DrawPolygon(points, self.color[i], True)
             else:

src/compas_rhino/conduits/labels.py

@@ -2,11 +2,11 @@
 from __future__ import division
 from __future__ import print_function
 
-from Rhino.Geometry import Point3d
-from System.Drawing.Color import FromArgb
+import Rhino  # type: ignore
+import System  # type: ignore
 
+from compas.data.validators import is_sequence_of_iterable
 from compas.itertools import iterable_like
-from compas.utilities import is_sequence_of_iterable
 
 from .base import BaseConduit
 
@@ -58,8 +58,8 @@ class LabelsConduit(BaseConduit):
 
     """
 
-    default_color = FromArgb(0, 0, 0)
-    default_textcolor = FromArgb(255, 255, 255)
+    default_color = System.Drawing.Color.FromArgb(0, 0, 0)
+    default_textcolor = System.Drawing.Color.FromArgb(255, 255, 255)
 
     def __init__(self, labels, color=None, **kwargs):
         super(LabelsConduit, self).__init__(**kwargs)
@@ -79,7 +79,10 @@ def color(self, color):
             # the first item in the list should be a tuple of colors
             # if not, wrap the tuple
             color = [color]
-        color = [(FromArgb(*bg), FromArgb(*text)) for bg, text in iterable_like(self.labels, color, (self.default_color, self.default_textcolor))]
+        color = [
+            (System.Drawing.Color.FromArgb(*bg), System.Drawing.Color.FromArgb(*text))
+            for bg, text in iterable_like(self.labels, color, (self.default_color, self.default_textcolor))  # type: ignore
+        ]
         self._color = color
 
     def DrawForeground(self, e):
@@ -97,6 +100,6 @@ def DrawForeground(self, e):
         for i, (pos, text) in enumerate(self.labels):
             if self.color:
                 color, textcolor = self.color[i]
-                e.Display.DrawDot(Point3d(*pos), text, color, textcolor)
+                e.Display.DrawDot(Rhino.Geometry.Point3d(*pos), text, color, textcolor)
             else:
-                e.Display.DrawDot(Point3d(*pos), text, self.default_color, self.default_textcolor)
+                e.Display.DrawDot(Rhino.Geometry.Point3d(*pos), text, self.default_color, self.default_textcolor)

src/compas_rhino/conduits/lines.py

@@ -2,11 +2,11 @@
 from __future__ import division
 from __future__ import print_function
 
-from Rhino.Geometry import Point3d
-from System.Drawing.Color import FromArgb
+import Rhino  # type: ignore
+import System  # type: ignore
 
+from compas.data.validators import is_sequence_of_iterable
 from compas.itertools import iterable_like
-from compas.utilities import is_sequence_of_iterable
 
 from .base import BaseConduit
 
@@ -58,7 +58,7 @@ class LinesConduit(BaseConduit):
     """
 
     default_thickness = 1.0
-    default_color = FromArgb(255, 255, 255)
+    default_color = System.Drawing.Color.FromArgb(255, 255, 255)
 
     def __init__(self, lines, thickness=None, color=None, **kwargs):
         super(LinesConduit, self).__init__(**kwargs)
@@ -76,7 +76,7 @@ def thickness(self):
     def thickness(self, thickness):
         thickness = thickness or self.default_thickness
         try:
-            len(thickness)
+            len(thickness)  # type: ignore
         except TypeError:
             thickness = [thickness]
         thickness = iterable_like(self.lines, thickness, self.default_thickness)
@@ -91,7 +91,7 @@ def color(self, color):
         color = color or self.default_color
         if not is_sequence_of_iterable(color):
             color = [color]
-        self._color = [FromArgb(*c) for c in iterable_like(self.lines, color, self.default_color)]
+        self._color = [System.Drawing.Color.FromArgb(*c) for c in iterable_like(self.lines, color, self.default_color)]
 
     def DrawForeground(self, e):
         """Draw the lines.
@@ -105,5 +105,10 @@ def DrawForeground(self, e):
         None
 
         """
-        for (start, end), color, thickness in zip(self.lines, self.color, self.thickness):
-            e.Display.DrawLine(Point3d(*start), Point3d(*end), color, thickness)
+        for (start, end), color, thickness in zip(self.lines, self.color, self.thickness):  # type: ignore
+            e.Display.DrawLine(
+                Rhino.Geometry.Point3d(*start),
+                Rhino.Geometry.Point3d(*end),
+                color,
+                thickness,
+            )

src/compas_rhino/conduits/points.py

@@ -2,13 +2,11 @@
 from __future__ import division
 from __future__ import print_function
 
-from Rhino.Display.PointStyle import Simple
-from Rhino.Geometry import Point3d
-from System.Drawing.Color import FromArgb
+import Rhino  # type: ignore
+import System  # type: ignore
 
+from compas.data.validators import is_sequence_of_iterable
 from compas.itertools import iterable_like
-from compas.utilities import color_to_rgb
-from compas.utilities.coercing import is_sequence_of_iterable
 
 from .base import BaseConduit
 
@@ -59,7 +57,7 @@ class PointsConduit(BaseConduit):
     """
 
     default_size = 3
-    default_color = FromArgb(255, 0, 0)
+    default_color = System.Drawing.Color.FromArgb(255, 0, 0)
 
     def __init__(self, points, size=None, color=None, **kwargs):
         super(PointsConduit, self).__init__(**kwargs)
@@ -77,7 +75,7 @@ def size(self):
     def size(self, size):
         size = size or self.default_size
         try:
-            len(size)
+            len(size)  # type: ignore
         except TypeError:
             size = [size]
         size = iterable_like(self.points, size, self.default_size)
@@ -92,7 +90,7 @@ def color(self, color):
         color = color or self.default_color
         if not is_sequence_of_iterable(color):
             color = [color]
-        color = [FromArgb(*color_to_rgb(c)) for c in iterable_like(self.points, color, self.default_color)]
+        color = [System.Drawing.Color.FromArgb(*c) for c in iterable_like(self.points, color, self.default_color)]
         self._color = color
 
     def DrawForeground(self, e):
@@ -107,5 +105,5 @@ def DrawForeground(self, e):
         None
 
         """
-        for xyz, size, color in zip(self.points, self.size, self.color):
-            e.Display.DrawPoint(Point3d(*xyz), Simple, size, color)
+        for xyz, size, color in zip(self.points, self.size, self.color):  # type: ignore
+            e.Display.DrawPoint(Rhino.Geometry.Point3d(*xyz), Rhino.Display.PointStyle.Simple, size, color)