Add VertexShapeFunction

Author: rocky

pymathics/graph/__main__.py

@@ -22,6 +22,18 @@
 
 from inspect import isgenerator
 
+WL_MARKER_TO_MATPLOTLIB = {
+    "Circle": "o",
+    "Diamond" :"D",
+    "Square" :"s",
+    "Star": "*",
+    "Pentagon": "p",
+    "Octagon": "8",
+    "Hexagon": "h",
+    "Triangle": "^",
+    # And many others. Is there a list somewhere?
+}
+
 DEFAULT_GRAPH_OPTIONS = {
     "DirectedEdges": "False",
     "EdgeStyle": "{}",
@@ -30,6 +42,7 @@
     "PlotLabel": "Null",
     "VertexLabels": "False",
     "VertexSize": "{}",
+    "VertexShape": "o",
     "VertexStyle": "{}",
 }
 
@@ -660,6 +673,8 @@ def full_new_edge_properties(new_edge_style):
     g = Graph(G)
     g.vertex_labels = G.vertex_labels = options["System`VertexLabels"]
     G.title = g.title = options["System`PlotLabel"]
+    shape = options["System`VertexShape"].get_string_value()
+    G.node_shape = g.vertex_shape = WL_MARKER_TO_MATPLOTLIB.get(shape, shape)
     return g
 
 

pymathics/graph/graph_generators.py

@@ -1,5 +1,6 @@
 from pymathics.graph.__main__ import (
     Graph,
+    WL_MARKER_TO_MATPLOTLIB,
     _NetworkXBuiltin,
     nx,
 )
@@ -33,7 +34,9 @@ def graph_helper(
         return None
     G.graph_layout = options["System`GraphLayout"].get_string_value() or graph_layout
     g = Graph(G)
-    G.vertex_labels = g.vertex_labels = options["System`VertexLabels"]
+    G.vertex_labels = g.vertex_labels = options["System`VertexLabels"].get_string_value()
+    shape = options["System`VertexShape"]
+    G.node_shape = g.node_shape = WL_MARKER_TO_MATPLOTLIB.get(shape, shape)
 
     if root is not None:
         G.root = g.root = root

pymathics/graph/tree.py

@@ -1,5 +1,5 @@
 import networkx as nx
-from pymathics.graph.__main__ import Graph, _graph_from_list, DEFAULT_GRAPH_OPTIONS, _NetworkXBuiltin
+from pymathics.graph.__main__ import Graph, _graph_from_list, DEFAULT_GRAPH_OPTIONS, _NetworkXBuiltin, WL_MARKER_TO_MATPLOTLIB
 from mathics.core.expression import String, Symbol
 
 DEFAULT_TREE_OPTIONS = {