Enable hi-res SVG plotting in IPython

Author: jdemeyer

autogen/generator.py

@@ -302,15 +302,24 @@ def __call__(self):
         self.decl_file = io.open(self.decl_filename + '.tmp', 'w', encoding='utf-8')
         self.decl_file.write(decl_banner)
 
+        # Check for availability of hi-res SVG plotting. This requires
+        # PARI-2.10 or later.
+        have_plot_svg = False
+
         for v in D:
-            if not self.can_handle_function(**v):
-                sys.stdout.write(" (%s)" % v["function"])
-            else:
-                sys.stdout.write(" %s" % v["function"])
+            func = v["function"]
+            if self.can_handle_function(**v):
+                sys.stdout.write(" %s" % func)
                 sys.stdout.flush()
                 self.handle_pari_function(**v)
+                if func == "plothraw":
+                    have_plot_svg = True
+            else:
+                sys.stdout.write(" (%s)" % func)
         sys.stdout.write("\n")
 
+        self.instance_file.write("DEF HAVE_PLOT_SVG = {}".format(have_plot_svg))
+
         self.gen_file.close()
         self.instance_file.close()
         self.decl_file.close()

cypari2/pari_instance.pyx

@@ -579,6 +579,11 @@ cdef class Pari(Pari_auto):
         self.PARI_TWO = new_gen_noclear(gen_2)
         sig_off()
 
+        IF HAVE_PLOT_SVG:
+            # If we are running under IPython, setup for displaying SVG plots.
+            if "IPython" in sys.modules:
+                pari_set_plot_engine(get_plot_ipython)
+
     def _close(self):
         """
         Deallocate the PARI library.
@@ -1427,3 +1432,24 @@ cdef long get_var(v) except -2:
     varno = fetch_user_var(s)
     sig_off()
     return varno
+
+
+IF HAVE_PLOT_SVG:
+    cdef void get_plot_ipython(PARI_plot* T):
+        # Values copied from src/graph/plotsvg.c in PARI sources
+        T.width = 480
+        T.height = 320
+        T.hunit = 3
+        T.vunit = 3
+        T.fwidth = 9
+        T.fheight = 12
+
+        T.draw = draw_ipython
+
+    cdef void draw_ipython(PARI_plot *T, GEN w, GEN x, GEN y):
+        global avma
+        cdef pari_sp av = avma
+        cdef char* svg = rect2svg(w, x, y, T)
+        from IPython.core.display import SVG, display
+        display(SVG(svg))
+        avma = av

cypari2/paridecl.pxd

@@ -3754,6 +3754,46 @@ cdef extern from *:     # PARI headers already included by types.pxd
     void    pari_mt_init()
     void    pari_mt_close()
 
+    # plotport.c
+
+    void    color_to_rgb(GEN c, int *r, int *g, int *b)
+    void    colorname_to_rgb(const char *s, int *r, int *g, int *b)
+    void    pari_plot_by_file(const char *env, const char *suf, const char *img)
+    void    pari_set_plot_engine(void (*plot)(PARI_plot *))
+    void    pari_kill_plot_engine()
+    void    plotbox(long ne, GEN gx2, GEN gy2)
+    void    plotclip(long rect)
+    void    plotcolor(long ne, long color)
+    void    plotcopy(long source, long dest, GEN xoff, GEN yoff, long flag)
+    GEN     plotcursor(long ne)
+    void    plotdraw(GEN list, long flag)
+    GEN     ploth(void *E, GEN(*f)(void*,GEN), GEN a, GEN b, long flags,long n, long prec)
+    GEN     plothraw(GEN listx, GEN listy, long flag)
+    GEN     plothsizes(long flag)
+    void    plotinit(long ne, GEN x, GEN y, long flag)
+    void    plotkill(long ne)
+    void    plotline(long ne, GEN gx2, GEN gy2)
+    void    plotlines(long ne, GEN listx, GEN listy, long flag)
+    void    plotlinetype(long ne, long t)
+    void    plotmove(long ne, GEN x, GEN y)
+    void    plotpoints(long ne, GEN listx, GEN listy)
+    void    plotpointsize(long ne, GEN size)
+    void    plotpointtype(long ne, long t)
+    void    plotrbox(long ne, GEN x2, GEN y2)
+    GEN     plotrecth(void *E, GEN(*f)(void*,GEN), long ne, GEN a,GEN b, ulong flags,long n, long prec)
+    GEN     plotrecthraw(long ne, GEN data, long flags)
+    void    plotrline(long ne, GEN x2, GEN y2)
+    void    plotrmove(long ne, GEN x, GEN y)
+    void    plotrpoint(long ne, GEN x, GEN y)
+    void    plotscale(long ne, GEN x1, GEN x2, GEN y1, GEN y2)
+    void    plotstring(long ne, char *x, long dir)
+    void    psdraw(GEN list, long flag)
+    GEN     psploth(void *E, GEN(*f)(void*,GEN), GEN a, GEN b, long flags, long n, long prec)
+    GEN     psplothraw(GEN listx, GEN listy, long flag)
+    char*   rect2ps(GEN w, GEN x, GEN y, PARI_plot *T)
+    char*   rect2ps_i(GEN w, GEN x, GEN y, PARI_plot *T, int plotps)
+    char*   rect2svg(GEN w, GEN x, GEN y, PARI_plot *T)
+
     # polarit1.c
 
     GEN     ZX_Zp_root(GEN f, GEN a, GEN p, long prec)
@@ -4348,10 +4388,6 @@ cdef extern from *:     # PARI headers already included by types.pxd
     int    equaliu(GEN x, ulong y)
     int    equalsi(long x, GEN y)
     int    equalui(ulong x, GEN y)
-    long   evalexpo(long x)
-    long   evallg(long x)
-    long   evalprecp(long x)
-    long   evalvalp(long x)
     long   expi(GEN x)
     long   expu(ulong x)
     void   fixlg(GEN z, long ly)

cypari2/types.pxd

@@ -65,6 +65,15 @@ cdef extern from "pari/pari.h":
     long    evalexpo(long x)
     long    evallgefint(long x)
 
+    ctypedef struct PARI_plot:
+        long width
+        long height
+        long hunit
+        long vunit
+        long fwidth
+        long fheight
+        void (*draw)(PARI_plot *T, GEN w, GEN x, GEN y)
+
     # Various structures that we don't interface but which need to be
     # declared, such that Cython understands the declarations of
     # functions using these types.