Merge pull request #232 from NeuroML/experimental

To v1.0.8; Catches import of vispy so won't fail if not installed.

Author: pgleeson

pyneuroml/__init__.py

@@ -1,6 +1,6 @@
 import logging
 
-__version__ = "1.0.7"
+__version__ = "1.0.8"
 
 JNEUROML_VERSION = "0.12.2"
 

pyneuroml/utils/plot.py

@@ -17,63 +17,73 @@
 from matplotlib.lines import Line2D
 from matplotlib.patches import Rectangle
 from matplotlib_scalebar.scalebar import ScaleBar
-from vispy import scene
-from vispy.scene import SceneCanvas
-from vispy.app import Timer
+
 from neuroml import Cell, Segment
 
 
 logger = logging.getLogger(__name__)
 logger.setLevel(logging.INFO)
 
-
 VISPY_THEME = {
     "light": {"bg": "white", "fg": "black"},
     "dark": {"bg": "black", "fg": "white"},
 }
 PYNEUROML_VISPY_THEME = "light"
 
+try: 
+    from vispy import scene
+    from vispy.scene import SceneCanvas
+    from vispy.app import Timer
+
+
+    def add_text_to_vispy_3D_plot(
+        current_scene: SceneCanvas,
+        xv: typing.List[float],
+        yv: typing.List[float],
+        zv: typing.List[float],
+        color: str,
+        text: str,
+    ):
+        """Add text to a vispy plot between two points.
+
+        Wrapper around vispy.scene.visuals.Text
+
+        Rotates the text label to ensure it is at the same angle as the line.
+
+        :param scene: vispy scene object
+        :type scene: SceneCanvas
+        :param xv: start and end coordinates in one axis
+        :type xv: list[x1, x2]
+        :param yv: start and end coordinates in second axis
+        :type yv: list[y1, y2]
+        :param zv: start and end coordinates in third axix
+        :type zv: list[z1, z2]
+        :param color: color of text
+        :type color: str
+        :param text: text to write
+        :type text: str
+        """
+
+        angle = int(numpy.rad2deg(numpy.arctan2((yv[1] - yv[0]), (xv[1] - xv[0]))))
+        if angle > 90:
+            angle -= 180
+        elif angle < -90:
+            angle += 180
+
+        return scene.Text(
+            pos=((xv[0] + xv[1]) / 2, (yv[0] + yv[1]) / 2, (zv[0] + zv[1]) / 2),
+            text=text,
+            color=color,
+            rotation=angle,
+            parent=current_scene,
+        )
 
-def add_text_to_vispy_3D_plot(
-    current_scene: SceneCanvas,
-    xv: typing.List[float],
-    yv: typing.List[float],
-    zv: typing.List[float],
-    color: str,
-    text: str,
-):
-    """Add text to a vispy plot between two points.
-
-    Wrapper around vispy.scene.visuals.Text
+except:
+    print("\n**************************\n  Please install vispy to use 3D plotting features!\n**************************")
+    
 
-    Rotates the text label to ensure it is at the same angle as the line.
 
-    :param scene: vispy scene object
-    :type scene: SceneCanvas
-    :param xv: start and end coordinates in one axis
-    :type xv: list[x1, x2]
-    :param yv: start and end coordinates in second axis
-    :type yv: list[y1, y2]
-    :param zv: start and end coordinates in third axix
-    :type zv: list[z1, z2]
-    :param color: color of text
-    :type color: str
-    :param text: text to write
-    :type text: str
-    """
-    angle = int(numpy.rad2deg(numpy.arctan2((yv[1] - yv[0]), (xv[1] - xv[0]))))
-    if angle > 90:
-        angle -= 180
-    elif angle < -90:
-        angle += 180
 
-    return scene.Text(
-        pos=((xv[0] + xv[1]) / 2, (yv[0] + yv[1]) / 2, (zv[0] + zv[1]) / 2),
-        text=text,
-        color=color,
-        rotation=angle,
-        parent=current_scene,
-    )
 
 
 def add_text_to_matplotlib_2D_plot(