added wait option to execute_command_line

fixed for invalid escape sequence in the tests
Fixes #53

Author: jacobwilliams

README.md

@@ -94,8 +94,8 @@ The following example generates a plot of the sine function:
 
  !plot it:
  call plt%initialize(grid=.true.,xlabel='angle (rad)',&
-                     title='Plot of $\sin(x)$',legend=.true.)
- call plt%add_plot(x,sx,label='$\sin(x)$',linestyle='b-o',markersize=5,linewidth=2)
+                     title='Plot of $\\sin(x)$',legend=.true.)
+ call plt%add_plot(x,sx,label='$\\sin(x)$',linestyle='b-o',markersize=5,linewidth=2)
  call plt%savefig('sinx.png', pyfile='sinx.py')
 
  end program test

src/pyplot_module.F90

@@ -1371,25 +1371,34 @@ end subroutine matrix_to_string
 !  If user specifies a Python file name, then the file is kept, otherwise
 !  a temporary filename is used, and the file is deleted after it is used.
 
-    subroutine execute(me, pyfile, istat, python)
+    subroutine execute(me, pyfile, istat, python, wait)
 
     class(pyplot),    intent(inout)         :: me     !! pytplot handler
     character(len=*), intent(in),  optional :: pyfile !! name of the python script to generate
     integer,          intent (out),optional :: istat  !! status output (0 means no problems)
     character(len=*), intent(in),optional   :: python !! python executable to use. (by default, this is 'python')
+    logical,          intent(in),optional   :: wait   !! if true, will wait for the python process to
+                                                      !! finish before continuing. (default is true).
 
     integer                       :: iunit   !! IO unit
     character(len=:), allocatable :: file    !! file name
     logical                       :: scratch !! if a scratch file is to be used
     integer                       :: iostat  !! open/close status code
     character(len=:), allocatable :: python_ !! python executable to use
+    logical                       :: wait_   !! whether to wait for the python process to finish
 
     if (allocated(me%str)) then
 
         if (present(istat)) istat = 0
 
         scratch = (.not. present(pyfile))
 
+        if (present(wait)) then
+            wait_ = wait
+        else
+            wait_ = .true.
+        end if
+
         !file name to use:
         if (scratch) then
             file = trim(tmp_file)  !use the default
@@ -1431,9 +1440,9 @@ subroutine execute(me, pyfile, istat, python)
             !run the file using python:
             if (file(1:1)/='"') then
                 ! if not already in quotes, should enclose in quotes
-                call execute_command_line(python_//' "'//file//'"')
+                call execute_command_line(python_//' "'//file//'"', wait=wait_)
             else
-                call execute_command_line(python_//' '//file)
+                call execute_command_line(python_//' '//file,       wait=wait_)
             end if
 
             if (scratch) then

test/date_test.f90

@@ -40,9 +40,9 @@ program date_test
                         title='date test',legend=.true.,axis_equal=.true.,&
                         tight_layout=.true., &
                         xaxis_date_fmt=xaxis_date_fmt, yaxis_date_fmt=yaxis_date_fmt)
-    call plt%add_plot(x,sx,label='$\sin (x)$',linestyle='b-o',markersize=5,linewidth=2,istat=istat)
-    call plt%add_plot(x,cx,label='$\cos (x)$',linestyle='r-o',markersize=5,linewidth=2,istat=istat)
-    call plt%add_plot(x,tx,label='$\sin (x) \cos (x)$',linestyle='g-o',markersize=2,linewidth=1,istat=istat)
+    call plt%add_plot(x,sx,label='$\\sin (x)$',linestyle='b-o',markersize=5,linewidth=2,istat=istat)
+    call plt%add_plot(x,cx,label='$\\cos (x)$',linestyle='r-o',markersize=5,linewidth=2,istat=istat)
+    call plt%add_plot(x,tx,label='$\\sin (x) \\cos (x)$',linestyle='g-o',markersize=2,linewidth=1,istat=istat)
     call plt%savefig(testdir//'datetest.png', pyfile=testdir//'datetest.py',&
                      istat=istat)
 

test/test.f90

@@ -63,9 +63,9 @@ program test
     call plt%initialize(grid=.true.,xlabel='angle (rad)',figsize=[20,10],&
                         title='plot test',legend=.true.,axis_equal=.true.,&
                         tight_layout=.true.)
-    call plt%add_plot(x,sx,label='$\sin (x)$',linestyle='b-o',markersize=5,linewidth=2,istat=istat)
-    call plt%add_plot(x,cx,label='$\cos (x)$',linestyle='r-o',markersize=5,linewidth=2,istat=istat)
-    call plt%add_plot(x,tx,label='$\sin (x) \cos (x)$',linestyle='g-o',markersize=2,linewidth=1,istat=istat)
+    call plt%add_plot(x,sx,label='$\\sin (x)$',linestyle='b-o',markersize=5,linewidth=2,istat=istat)
+    call plt%add_plot(x,cx,label='$\\cos (x)$',linestyle='r-o',markersize=5,linewidth=2,istat=istat)
+    call plt%add_plot(x,tx,label='$\\sin (x) \\cos (x)$',linestyle='g-o',markersize=2,linewidth=1,istat=istat)
     call plt%savefig(testdir//'plottest.png', pyfile=testdir//'plottest.py',&
                      istat=istat)