[Plplot-cvs] SF.net SVN: plplot:[12532] trunk/examples

[<and...@us...>]

Revision: 12532
          http://sourceforge.net/p/plplot/code/12532
Author:   andrewross
Date:     2013-09-26 15:18:37 +0000 (Thu, 26 Sep 2013)
Log Message:
-----------
Fix from Phil Rosenberg for the missing land in example 19, propagated to all languages.

Also, further small fix to f95 example 19 to get the latitude label length right for the case where it is 0. 

Modified Paths:
--------------
    trunk/examples/ada/x19a.adb
    trunk/examples/ada/xthick19a.adb
    trunk/examples/c/x19c.c
    trunk/examples/c++/x19.cc
    trunk/examples/d/x19d.d
    trunk/examples/f77/x19f.fm4
    trunk/examples/f95/x19f.f90
    trunk/examples/java/x19.java
    trunk/examples/lua/x19.lua
    trunk/examples/ocaml/x19.ml
    trunk/examples/octave/x19c.m
    trunk/examples/perl/x19.pl
    trunk/examples/python/xw19.py
    trunk/examples/tcl/x19.tcl

Modified: trunk/examples/ada/x19a.adb
===================================================================
--- trunk/examples/ada/x19a.adb	2013-09-26 06:44:36 UTC (rev 12531)
+++ trunk/examples/ada/x19a.adb	2013-09-26 15:18:37 UTC (rev 12532)
@@ -207,8 +207,8 @@
 
     -- Cartesian plots 
     -- Most of world 
-    minx := 190.0;
-    maxx := 190.0 + 360.0;
+    minx := -170.0;
+    maxx := minx + 360.0;
 
     -- Setup a custom latitude and longitude-based scaling function.
     plslabelfunc(geolocation_labeler'Unrestricted_Access, System.Null_Address);

Modified: trunk/examples/ada/xthick19a.adb
===================================================================
--- trunk/examples/ada/xthick19a.adb	2013-09-26 06:44:36 UTC (rev 12531)
+++ trunk/examples/ada/xthick19a.adb	2013-09-26 15:18:37 UTC (rev 12532)
@@ -207,8 +207,8 @@
 
     -- Cartesian plots 
     -- Most of world 
-    minx := 190.0;
-    maxx := 190.0 + 360.0;
+    minx := -170.0;
+    maxx := minx + 360.0;
 
     -- Setup a custom latitude and longitude-based scaling function.
     Set_Custom_Label(geolocation_labeler'Unrestricted_Access, System.Null_Address);

Modified: trunk/examples/c/x19c.c
===================================================================
--- trunk/examples/c/x19c.c	2013-09-26 06:44:36 UTC (rev 12531)
+++ trunk/examples/c/x19c.c	2013-09-26 15:18:37 UTC (rev 12532)
@@ -142,8 +142,8 @@
 // Cartesian plots
 // Most of world
 
-    minx = 190;
-    maxx = 190 + 360;
+    minx = -170;
+    maxx = minx + 360;
 
     // Setup a custom latitude and longitude-based scaling function.
     plslabelfunc( geolocation_labeler, NULL );

Modified: trunk/examples/c++/x19.cc
===================================================================
--- trunk/examples/c++/x19.cc	2013-09-26 06:44:36 UTC (rev 12531)
+++ trunk/examples/c++/x19.cc	2013-09-26 15:18:37 UTC (rev 12532)
@@ -170,8 +170,8 @@
     // Cartesian plots
     // Most of world
 
-    minx = 190;
-    maxx = 190 + 360;
+    minx = -170;
+    maxx = minx + 360;
 
     // Setup a custom latitude and longitude-based scaling function.
     pls->slabelfunc( geolocation_labeler, NULL );

Modified: trunk/examples/d/x19d.d
===================================================================
--- trunk/examples/d/x19d.d	2013-09-26 06:44:36 UTC (rev 12531)
+++ trunk/examples/d/x19d.d	2013-09-26 15:18:37 UTC (rev 12532)
@@ -114,8 +114,8 @@
 
     // Cartesian plots
     // Most of world
-    PLFLT minx = 190;
-    PLFLT maxx = 190 + 360;
+    PLFLT minx = -170;
+    PLFLT maxx = minx + 360;
 
     // Setup a custom latitude and longitude-based scaling function.
     plslabelfunc( &geolocation_labeler, null );

Modified: trunk/examples/f77/x19f.fm4
===================================================================
--- trunk/examples/f77/x19f.fm4	2013-09-26 06:44:36 UTC (rev 12531)
+++ trunk/examples/f77/x19f.fm4	2013-09-26 15:18:37 UTC (rev 12532)
@@ -167,8 +167,8 @@
 c Cartesian plots
 c Most of world
 
-      minx = 190
-      maxx = 190+360
+      minx = -170
+      maxx = minx+360
 
 c Setup a custom latitude and longitude-based scaling function.
       call plslabelfunc(geolocation_labeler)

Modified: trunk/examples/f95/x19f.f90
===================================================================
--- trunk/examples/f95/x19f.f90	2013-09-26 06:44:36 UTC (rev 12531)
+++ trunk/examples/f95/x19f.f90	2013-09-26 15:18:37 UTC (rev 12532)
@@ -116,6 +116,8 @@
       if (axis .eq. 2 .and. value .eq. 0.0_plflt) then
 !     A special case for the equator
          label = direction_label    
+      else if (abs(label_val) .lt. 10.0_plflt) then
+         write(label,'(I1.1,A2)') iabs(int(label_val)),direction_label
       else if (abs(label_val) .lt. 100.0_plflt) then
          write(label,'(I2.1,A2)') iabs(int(label_val)),direction_label
       else
@@ -151,8 +153,8 @@
 ! Cartesian plots
 ! Most of world
 
-      minx = 190._plflt
-      maxx = 190._plflt+360._plflt
+      minx = -170._plflt
+      maxx = minx+360._plflt
 
 ! Setup a custom latitude and longitude-based scaling function.
       call plslabelfunc(geolocation_labeler)

Modified: trunk/examples/java/x19.java
===================================================================
--- trunk/examples/java/x19.java	2013-09-26 06:44:36 UTC (rev 12531)
+++ trunk/examples/java/x19.java	2013-09-26 15:18:37 UTC (rev 12532)
@@ -169,8 +169,8 @@
         // Cartesian plots
         // Most of world
 
-        minx = 190;
-        maxx = 190 + 360;
+        minx = -170;
+        maxx = minx + 360;
 
         // Setup a custom latitude and longitude-based scaling function.
         pls.slabelfunc( geolocation_labeler );

Modified: trunk/examples/lua/x19.lua
===================================================================
--- trunk/examples/lua/x19.lua	2013-09-26 06:44:36 UTC (rev 12531)
+++ trunk/examples/lua/x19.lua	2013-09-26 15:18:37 UTC (rev 12532)
@@ -125,8 +125,8 @@
 -- Cartesian plots 
 -- Most of world 
 
-minx = 190
-maxx = 190+360
+minx = -170
+maxx = minx+360
 
 -- Setup a custom latitude and longitude-based scaling function.
 pl.slabelfunc("geolocation_labeler");

Modified: trunk/examples/ocaml/x19.ml
===================================================================
--- trunk/examples/ocaml/x19.ml	2013-09-26 06:44:36 UTC (rev 12531)
+++ trunk/examples/ocaml/x19.ml	2013-09-26 15:18:37 UTC (rev 12532)
@@ -105,8 +105,8 @@
   (* Cartesian plots *)
   (* Most of world *)
 
-  let minx = 190.0 in
-  let maxx = 190.0 +. 360.0 in
+  let minx = -170.0 in
+  let maxx = minx +. 360.0 in
 
   (* Setup a custom latitude and longitude-based scaling function. *)
   plslabelfunc geolocation_labeler;

Modified: trunk/examples/octave/x19c.m
===================================================================
--- trunk/examples/octave/x19c.m	2013-09-26 06:44:36 UTC (rev 12531)
+++ trunk/examples/octave/x19c.m	2013-09-26 15:18:37 UTC (rev 12532)
@@ -32,8 +32,8 @@
   ## Cartesian plots
   ## Most of world
   
-  minx = 190;
-  maxx = 190 + 360;
+  minx = -170;
+  maxx = minx + 360;
  
   ## Setup a custom latitude and longitude-based scaling function.
   plslabelfunc( @geolocation_labeler, [] );

Modified: trunk/examples/perl/x19.pl
===================================================================
--- trunk/examples/perl/x19.pl	2013-09-26 06:44:36 UTC (rev 12531)
+++ trunk/examples/perl/x19.pl	2013-09-26 15:18:37 UTC (rev 12532)
@@ -48,8 +48,8 @@
 # Cartesian plots
 # Most of world
 
-my $minx = 190;
-my $maxx = 190 + 360;
+my $minx = -170;
+my $maxx = $minx + 360;
 
 # Setup a custom latitude and longitude-based scaling function.
 plslabelfunc(\&geolocation_labeler);

Modified: trunk/examples/python/xw19.py
===================================================================
--- trunk/examples/python/xw19.py	2013-09-26 06:44:36 UTC (rev 12531)
+++ trunk/examples/python/xw19.py	2013-09-26 15:18:37 UTC (rev 12532)
@@ -100,8 +100,8 @@
     # Cartesian plots 
     # Most of world
 
-    minx = 190
-    maxx = 190+360
+    minx = -170
+    maxx = minx+360
 
     # Setup a custom latitude and longitude-based scaling function.
     plslabelfunc(geolocation_labeler, None)

Modified: trunk/examples/tcl/x19.tcl
===================================================================
--- trunk/examples/tcl/x19.tcl	2013-09-26 06:44:36 UTC (rev 12531)
+++ trunk/examples/tcl/x19.tcl	2013-09-26 15:18:37 UTC (rev 12532)
@@ -113,8 +113,8 @@
 #   Cartesian plots
 #   Most of the world
 
-    set minx 190
-    set maxx 550
+    set minx -170
+    set maxx 190
 
     # Setup a custom latitude and longitude-based scaling function.
     $w cmd plslabelfunc "geolocation_labeler"

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