added bar charts.

Author: jacobwilliams

README.md

@@ -6,13 +6,19 @@ A simple module for generating plots from Fortran using Python's matplotlib.pypl
 Overview
 ---------------
 
-Currently, this module can be used to generate simple x-y plots from Fortran.  Eventually, it may be expanded to provide additional features and other types of plots.
+Currently, this module can be used to generate simple plots from Fortran.  Eventually, it may be expanded to provide additional features and other types of plots.
 
 The way it works is simply to generate a Python script with the plotting code, which
 is then executed from the command line using the Fortran ```execute_command_line``` function.
 
 The module requires a modern Fortran compiler (it uses various Fortran 2003/2008 features such as deferred-length strings). It should work fine with the latest gfortran or ifort compilers.  A simple script ```build.sh``` is provided for building the library and test program (requires gfortran and [FoBiS](https://github.com/szaghi/FoBiS)).  It will also build the HTML documentation if [ROBODoc](https://github.com/gumpu/ROBODoc) is installed.
 
+Supported plot types
+---------------
+
+* ```matplotlib.pyplot.plot``` -- 2D plot of lines and/or markers.
+* ```matplotlib.pyplot.bar``` -- Make a bar plot.
+
 Example
 ---------------
 

src/pyplot_module.f90

@@ -89,6 +89,7 @@ module pyplot_module
 
         procedure,public :: initialize
         procedure,public :: add_plot
+        procedure,public :: add_bar
         procedure,public :: savefig
         procedure,public :: destroy
 
@@ -220,7 +221,7 @@ end subroutine initialize
 !    add_plot
 !
 !  DESCRIPTION
-!    Add data for plotting.
+!    Add an x,y plot.
 !
 !  SOURCE
 
@@ -272,6 +273,69 @@ subroutine add_plot(me,x,y,label,linestyle,markersize,linewidth)
     end subroutine add_plot
 !*****************************************************************************************
 
+!*****************************************************************************************
+!****f* pyplot_module/add_bar
+!
+!  NAME  
+!    add_bar
+!
+!  DESCRIPTION
+!    Add a bar plot.
+!
+!  SOURCE
+
+    subroutine add_bar(me,left,height,label,width,bottom)
+
+    implicit none
+
+    class(pyplot),intent(inout)               :: me
+    real(wp),dimension(:),intent(in)          :: left
+    real(wp),dimension(:),intent(in)          :: height
+    character(len=*),intent(in)               :: label
+    real(wp),dimension(:),intent(in),optional :: width
+    real(wp),dimension(:),intent(in),optional :: bottom
+
+    character(len=:),allocatable :: xstr,ystr,wstr,bstr,plt_str
+
+    character(len=*),parameter :: xname = 'x'    !variable names for script
+    character(len=*),parameter :: yname = 'y'    !
+    character(len=*),parameter :: wname = 'w'    !
+    character(len=*),parameter :: bname = 'b'    !
+
+    !convert the arrays to strings:
+    call vec_to_string(left,xstr)
+    call vec_to_string(height,ystr)
+    if (present(width))  call vec_to_string(width,wstr)
+    if (present(bottom)) call vec_to_string(bottom,bstr)
+
+    !write the arrays:
+    call me%add_str('')
+    if (me%use_numpy) then
+        call me%add_str(trim(xname)//' = np.array('//xstr//')')
+        call me%add_str(trim(yname)//' = np.array('//ystr//')')
+        if (present(width))  call me%add_str(trim(wname)//' = np.array('//wstr//')')
+        if (present(bottom)) call me%add_str(trim(bname)//' = np.array('//bstr//')')
+    else
+        call me%add_str(trim(xname)//' = '//xstr)
+        call me%add_str(trim(yname)//' = '//ystr)
+        if (present(width))  call me%add_str(trim(wname)//' = '//wstr)
+        if (present(bottom)) call me%add_str(trim(bname)//' = '//bstr)
+    end if
+
+    !create the plot string:
+    plt_str = 'ax.bar('//&
+              'left='//trim(xname)//','//&
+              'height='//trim(yname)//','
+    if (present(width))  plt_str=plt_str//'width='//trim(wname)//','
+    if (present(bottom)) plt_str=plt_str//'bottom='//trim(bstr)//','
+    plt_str=plt_str//'label="'//trim(label)//'")'
+
+    !write the plot statement:
+    call me%add_str(plt_str)
+
+    end subroutine add_bar
+!*****************************************************************************************
+
 !*****************************************************************************************
 !****f* pyplot_module/optional_int_to_string
 !

src/test.f90

@@ -29,13 +29,20 @@ program test
     cx = cos(x)
     tx = sx * cx
 
-    !plot it:
+    !2d line plot:
     call plt%initialize(grid=.true.,xlabel='angle (rad)',&
-                        title='python_plot test',legend=.true.)
+                        title='plot test',legend=.true.)
     call plt%add_plot(x,sx,label='$\sin (x)$',linestyle='b-o',markersize=5,linewidth=2)
     call plt%add_plot(x,cx,label='$\cos (x)$',linestyle='r-o',markersize=5,linewidth=2)
     call plt%add_plot(x,tx,label='$\sin (x) \cos (x)$',linestyle='g-o',markersize=2,linewidth=1)
-    call plt%savefig('test.png', pyfile='test.py')
+    call plt%savefig('plottest.png', pyfile='plottest.py')
+
+    !bar chart:
+    tx = 0.1_wp !for bar width
+    call plt%initialize(grid=.true.,xlabel='angle (rad)',&
+                        title='bar test',legend=.true.)
+    call plt%add_bar(left=x,height=sx,width=tx,label='$\sin (x)$')
+    call plt%savefig('bartest.png', pyfile='bartest.py')
 
     end program test
 !*****************************************************************************************