[Plplot-cvs] SF.net SVN: plplot:[12824] trunk/bindings/f95

[<arj...@us...>]

Revision: 12824
          http://sourceforge.net/p/plplot/code/12824
Author:   arjenmarkus
Date:     2013-12-07 06:54:18 +0000 (Sat, 07 Dec 2013)
Log Message:
-----------
Replace the optional "rectangular" argument to plshades by an overloaded function so that it can be placed in the same position as in the corresponding C function.

Modified Paths:
--------------
    trunk/bindings/f95/plplotf95.def
    trunk/bindings/f95/plplotf95_ifort.def
    trunk/bindings/f95/plplotf95_mingw.def
    trunk/bindings/f95/sfstubs.f90
    trunk/bindings/f95/sfstubsf95.f90

Modified: trunk/bindings/f95/plplotf95.def
===================================================================
--- trunk/bindings/f95/plplotf95.def	2013-12-07 02:15:07 UTC (rev 12823)
+++ trunk/bindings/f95/plplotf95.def	2013-12-07 06:54:18 UTC (rev 12824)
@@ -31,6 +31,7 @@
     _PLPLOTP_mp_PLSHADE_SINGLE_TR@68
     _PLPLOTP_mp_PLSHADES_MULTIPLE_0@44
     _PLPLOTP_mp_PLSHADES_MULTIPLE_1@52
+    _PLPLOTP_mp_PLSHADES_MULTIPLE_1R@56
     _PLPLOTP_mp_PLSHADES_MULTIPLE_2@52
     _PLPLOTP_mp_PLSHADES_MULTIPLE_TR@48
     _PLPLOTP_mp_PLSPAL0@8

Modified: trunk/bindings/f95/plplotf95_ifort.def
===================================================================
--- trunk/bindings/f95/plplotf95_ifort.def	2013-12-07 02:15:07 UTC (rev 12823)
+++ trunk/bindings/f95/plplotf95_ifort.def	2013-12-07 06:54:18 UTC (rev 12824)
@@ -31,6 +31,7 @@
     PLPLOTP_mp_PLSHADE_SINGLE_TR
     PLPLOTP_mp_PLSHADES_MULTIPLE_0
     PLPLOTP_mp_PLSHADES_MULTIPLE_1
+    PLPLOTP_mp_PLSHADES_MULTIPLE_1R
     PLPLOTP_mp_PLSHADES_MULTIPLE_2
     PLPLOTP_mp_PLSHADES_MULTIPLE_TR
     PLPLOTP_mp_PLSPAL0

Modified: trunk/bindings/f95/plplotf95_mingw.def
===================================================================
--- trunk/bindings/f95/plplotf95_mingw.def	2013-12-07 02:15:07 UTC (rev 12823)
+++ trunk/bindings/f95/plplotf95_mingw.def	2013-12-07 06:54:18 UTC (rev 12824)
@@ -38,6 +38,7 @@
 	__plplotp_MOD_plshade_single_tr
 	__plplotp_MOD_plshades_multiple_0
 	__plplotp_MOD_plshades_multiple_1
+	__plplotp_MOD_plshades_multiple_1r
 	__plplotp_MOD_plshades_multiple_2
 	__plplotp_MOD_plshades_multiple_tr
 	__plplotp_MOD_plspal0

Modified: trunk/bindings/f95/sfstubs.f90
===================================================================
--- trunk/bindings/f95/sfstubs.f90	2013-12-07 02:15:07 UTC (rev 12823)
+++ trunk/bindings/f95/sfstubs.f90	2013-12-07 06:54:18 UTC (rev 12824)
@@ -534,12 +534,11 @@
       subroutine plshades_multiple_1(z, defined, &
         xmin, xmax, ymin, ymax, &
         clevel, fill_width, &
-        cont_color, cont_width, xg1, yg1, rectangular)
+        cont_color, cont_width, xg1, yg1)
 
       implicit none
       character defined*(*)
       integer cont_color
-      logical, optional :: rectangular
       real(kind=plflt) fill_width, cont_width
       real(kind=plflt) clevel(:)
       real(kind=plflt) z(:,:), xmin, xmax, ymin, ymax, &
@@ -550,9 +549,6 @@
 !	call plstrf2c(dnam, string1)
 
       rect = 1
-      if ( present(rectangular) ) then
-          rect = merge( 1, 0, rectangular )
-      endif
 
       s1 = transfer( string1, s1 )
       call plshades17(z, size(z,1), size(z,2), s1, &
@@ -564,6 +560,36 @@
 
 !***********************************************************************
 
+      subroutine plshades_multiple_1r(z, defined, &
+        xmin, xmax, ymin, ymax, &
+        clevel, fill_width, &
+        cont_color, cont_width, rectangular, xg1, yg1)
+
+      implicit none
+      character defined*(*)
+      integer cont_color
+      logical rectangular
+      real(kind=plflt) fill_width, cont_width
+      real(kind=plflt) clevel(:)
+      real(kind=plflt) z(:,:), xmin, xmax, ymin, ymax, &
+                       xg1(:), yg1(:)
+
+      integer rect
+
+!	call plstrf2c(dnam, string1)
+
+      rect = merge( 1, 0, rectangular )
+
+      s1 = transfer( string1, s1 )
+      call plshades17(z, size(z,1), size(z,2), s1, &
+        xmin, xmax, ymin, ymax, &
+        clevel, size(clevel), fill_width, &
+        cont_color, cont_width, xg1, yg1, size(z,1), rect)
+
+      end subroutine
+
+!***********************************************************************
+
       subroutine plshades_multiple_2(z, defined, &
         xmin, xmax, ymin, ymax, &
         clevel, fill_width, &

Modified: trunk/bindings/f95/sfstubsf95.f90
===================================================================
--- trunk/bindings/f95/sfstubsf95.f90	2013-12-07 02:15:07 UTC (rev 12823)
+++ trunk/bindings/f95/sfstubsf95.f90	2013-12-07 06:54:18 UTC (rev 12824)
@@ -110,6 +110,7 @@
     interface plshades
         module procedure plshades_multiple_0
         module procedure plshades_multiple_1
+        module procedure plshades_multiple_1r
         module procedure plshades_multiple_2
         module procedure plshades_multiple_tr
     end interface
@@ -898,7 +899,7 @@
 
     interface plsvect
         module procedure plsvect1
-        
+
         subroutine plsvect2
         end subroutine plsvect2
 
@@ -1089,7 +1090,7 @@
            cont_color, cont_width, &
            n_labels, label_opts, n_axes, ticks, sub_ticks, &
            n_values, values)
-    end subroutine plcolorbar_2      
+    end subroutine plcolorbar_2
 
     subroutine plcpstrm( iplsr, flags )
        integer                        :: iplsr

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.