Menu
▾
▴
plplot-cvs — For PLplot svn commit messages
You can subscribe to this list here.
| 2000 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(33) |
Jun
|
Jul
(30) |
Aug
(2) |
Sep
|
Oct
(30) |
Nov
(136) |
Dec
(59) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2001 |
Jan
(255) |
Feb
(169) |
Mar
(322) |
Apr
(185) |
May
(33) |
Jun
(89) |
Jul
(47) |
Aug
(59) |
Sep
(40) |
Oct
(31) |
Nov
(74) |
Dec
(84) |
| 2002 |
Jan
(163) |
Feb
(78) |
Mar
(23) |
Apr
(5) |
May
(22) |
Jun
(75) |
Jul
(143) |
Aug
(48) |
Sep
(111) |
Oct
(58) |
Nov
(124) |
Dec
(278) |
| 2003 |
Jan
(106) |
Feb
(276) |
Mar
(354) |
Apr
(97) |
May
(14) |
Jun
(3) |
Jul
(7) |
Aug
(21) |
Sep
(83) |
Oct
(110) |
Nov
(3) |
Dec
(119) |
| 2004 |
Jan
(318) |
Feb
(409) |
Mar
(68) |
Apr
(23) |
May
(105) |
Jun
(147) |
Jul
(69) |
Aug
(53) |
Sep
(23) |
Oct
(14) |
Nov
(15) |
Dec
(63) |
| 2005 |
Jan
(146) |
Feb
(69) |
Mar
(157) |
Apr
(127) |
May
(166) |
Jun
(8) |
Jul
(5) |
Aug
(3) |
Sep
(8) |
Oct
(17) |
Nov
(29) |
Dec
(34) |
| 2006 |
Jan
(3) |
Feb
(4) |
Mar
(1) |
Apr
(70) |
May
(241) |
Jun
(82) |
Jul
(344) |
Aug
(196) |
Sep
(87) |
Oct
(57) |
Nov
(121) |
Dec
(86) |
| 2007 |
Jan
(60) |
Feb
(67) |
Mar
(102) |
Apr
(28) |
May
(13) |
Jun
(29) |
Jul
(38) |
Aug
(56) |
Sep
(91) |
Oct
(89) |
Nov
(50) |
Dec
(68) |
| 2008 |
Jan
(87) |
Feb
(47) |
Mar
(100) |
Apr
(34) |
May
(65) |
Jun
(54) |
Jul
(98) |
Aug
(128) |
Sep
(109) |
Oct
(141) |
Nov
(40) |
Dec
(206) |
| 2009 |
Jan
(176) |
Feb
(226) |
Mar
(134) |
Apr
(84) |
May
(152) |
Jun
(85) |
Jul
(91) |
Aug
(153) |
Sep
(141) |
Oct
(59) |
Nov
(87) |
Dec
(75) |
| 2010 |
Jan
(58) |
Feb
(41) |
Mar
(51) |
Apr
(74) |
May
(81) |
Jun
(39) |
Jul
(30) |
Aug
(43) |
Sep
(76) |
Oct
(59) |
Nov
(62) |
Dec
(52) |
| 2011 |
Jan
(125) |
Feb
(41) |
Mar
(96) |
Apr
(53) |
May
(21) |
Jun
(23) |
Jul
(48) |
Aug
(71) |
Sep
(37) |
Oct
(81) |
Nov
(60) |
Dec
(32) |
| 2012 |
Jan
(51) |
Feb
(23) |
Mar
|
Apr
(8) |
May
(2) |
Jun
|
Jul
(8) |
Aug
(25) |
Sep
(4) |
Oct
(32) |
Nov
(17) |
Dec
(2) |
| 2013 |
Jan
(8) |
Feb
(2) |
Mar
(9) |
Apr
(9) |
May
(37) |
Jun
(48) |
Jul
(63) |
Aug
(42) |
Sep
(59) |
Oct
(83) |
Nov
(141) |
Dec
(133) |
| 2014 |
Jan
(57) |
Feb
(58) |
Mar
(58) |
Apr
(25) |
May
(14) |
Jun
(3) |
Jul
(6) |
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <ai...@us...> - 2013-09-28 16:52:24
|
Revision: 12539
http://sourceforge.net/p/plplot/code/12539
Author: airwin
Date: 2013-09-28 16:52:20 +0000 (Sat, 28 Sep 2013)
Log Message:
-----------
Make check_plplot_h.inc target to check consistency of plplot_h.inc.
Modified Paths:
--------------
trunk/bindings/ocaml/CMakeLists.txt
Modified: trunk/bindings/ocaml/CMakeLists.txt
===================================================================
--- trunk/bindings/ocaml/CMakeLists.txt 2013-09-27 15:53:14 UTC (rev 12538)
+++ trunk/bindings/ocaml/CMakeLists.txt 2013-09-28 16:52:20 UTC (rev 12539)
@@ -53,22 +53,20 @@
endforeach(DEP ${plplotd_LIB_DEPENDS})
endif(NOT BUILD_SHARED_LIBS)
- # optional command to generate generated_plplot_h.inc. This generated
- # version of the file should be identical to plplot_h.inc.
+ # optional command to check consistency of plplot_h.inc.
if(GENERATE_PLPLOT_H_INC)
- add_custom_command(
- OUTPUT
- ${CMAKE_CURRENT_BINARY_DIR}/generated_plplot_h.inc
- COMMAND ${OCAML} ${CMAKE_CURRENT_SOURCE_DIR}/touchup.ml ${CMAKE_CURRENT_SOURCE_DIR}/plplot_h ${CMAKE_CURRENT_BINARY_DIR}/generated_plplot_h.inc
- DEPENDS
- ${CMAKE_CURRENT_SOURCE_DIR}/touchup.ml
- ${CMAKE_CURRENT_SOURCE_DIR}/plplot_h
+ add_custom_target(
+ check_plplot_h.inc
+ COMMAND
+ ${CMAKE_COMMAND} -E remove -f ${CMAKE_CURRENT_BINARY_DIR}/generated_plplot_h.inc
+ COMMAND
+ ${OCAML} ${CMAKE_CURRENT_SOURCE_DIR}/touchup.ml ${CMAKE_CURRENT_SOURCE_DIR}/plplot_h ${CMAKE_CURRENT_BINARY_DIR}/generated_plplot_h.inc
+ COMMAND
+ ${CMAKE_COMMAND} -E echo "Check that plplot_h.inc is consistent with touchup.ml and plplot_h"
+ COMMAND
+ cmp ${CMAKE_CURRENT_SOURCE_DIR}/plplot_h.inc ${CMAKE_CURRENT_BINARY_DIR}/generated_plplot_h.inc
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
)
- add_custom_target(generate_plplot_h.inc
- DEPENDS
- ${CMAKE_CURRENT_BINARY_DIR}/generated_plplot_h.inc
- )
endif(GENERATE_PLPLOT_H_INC)
#Detailed CMake logic to build ocaml bindings for PLplot.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2013-09-27 15:53:16
|
Revision: 12538
http://sourceforge.net/p/plplot/code/12538
Author: airwin
Date: 2013-09-27 15:53:14 +0000 (Fri, 27 Sep 2013)
Log Message:
-----------
Initial commit of documentation concerning how to implement,
configure, build, and test our doxygen form of documentation.
Added Paths:
-----------
trunk/doc/README.doxygen
Added: trunk/doc/README.doxygen
===================================================================
--- trunk/doc/README.doxygen (rev 0)
+++ trunk/doc/README.doxygen 2013-09-27 15:53:14 UTC (rev 12538)
@@ -0,0 +1,48 @@
+This file shows how to implement, configure, build, and test our
+doxygen form of documentation.
+
+* Implementation. Doxygen documentation consists of comments in
+ source code with a special leading prefix. For our C source code
+ the adopted doxygen prefix style we use is "//!". See
+ src/pllegend.c for an example of such comments which are largely up
+ to date for that source file. However, there are many other source
+ files in src where the doxygen comments are only part done or not
+ done at all. It is our long-term goal to complete all of these
+ making the doxygen wording describing the formal arguments
+ consistent with our API description in doc/docbook/src/api.xml.
+ Implementation of this goal could be partially automated by
+ transforming the DocBook form of documentation in
+ doc/docbook/src/api.xml into a temporary file in correct doxygen
+ form. This could be done in python using the
+ http://docs.python.org/library/xml.etree.elementtree.html approach
+ or we could follow the perl approach that is already implemented in
+ docbook/bin for a number of other transformations of the api.xml
+ documentation. However we decide to do this automation, it would
+ reduce the hand-editing work to copying the appropriate parts of the
+ temporary file in doxygen form that is generated by the python or
+ perl script to the appropriate parts of the files in src.
+
+* Configuration. This is all done using the configurable Doxyfile.in
+ file. This file needs to be adjusted from time to time to drop or
+ add certain files to the list of files that are processed by
+ doxygen. Also, this file needs to be consistent with the doxygen
+ version that is installed. That should be done by running the
+
+doxygen -u Doxyfile.in
+
+ command (and committing the result) whenever the doxygen build (see
+ below) emits a warning message concerning doxygen version
+ consistency.
+
+* Building the doxygen documentation. This is done by configuring the
+ CMake-based build of PLplot using the cmake command-line option
+ -DBUILD_DOX=ON and running
+
+make build_doxygen >& build_doxygen.out
+
+* Testing the doxygen results. Do this by checking build_doxygen.out
+ for any error or warning messages. Then use a browser to look at
+ doc/doxygen/html/index.html that is generated by doxygen in the
+ build tree. Then click on Files ==> pllegend.c result to see the
+ doxygen results for, e.g., pllegend.c. And similarly for all other
+ files in src.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2013-09-26 23:28:33
|
Revision: 12537
http://sourceforge.net/p/plplot/code/12537
Author: airwin
Date: 2013-09-26 23:28:30 +0000 (Thu, 26 Sep 2013)
Log Message:
-----------
Update broken or redirected links.
Modified Paths:
--------------
trunk/www/credits.php
Modified: trunk/www/credits.php
===================================================================
--- trunk/www/credits.php 2013-09-26 23:07:02 UTC (rev 12536)
+++ trunk/www/credits.php 2013-09-26 23:28:30 UTC (rev 12537)
@@ -13,7 +13,7 @@
<div id="contentwrapper">
<div id="leftside">
<h3>Developers</h3>
- <p>Many developers have contributed to PLplot over its long history. The list of the current core developers is <a href="http://sourceforge.net/project/memberlist.php?group_id=2915">here.</a> A more complete list of developers is at the <a href="http://www.ohloh.net/projects/10094/contributors"> PLplot project page</a> at <a href="http://www.ohloh.net/">Ohloh</a>. In addition many other individuals have contributed to PLplot by providing patches, finding bugs, or requesting features.</p>
+ <p>Many developers have contributed to PLplot over its long history. The list of the current core developers is <a href="http://sourceforge.net/p/plplot/_members/">here.</a> A more complete list of developers is at the <a href="http://www.ohloh.net/p/plplot/contributors/"> PLplot project page</a> at <a href="http://www.ohloh.net/">Ohloh</a>. In addition many other individuals have contributed to PLplot by providing patches, finding bugs, or requesting features.</p>
<h3>Additional libraries</h3>
<p>The PLplot library depends on some other open source libraries provided by
@@ -33,10 +33,10 @@
<li>The cairo device driver depends on <a href="http://www.cairographics.org/">cairo</a>; a 2D graphics library with support for multiple output devices. Currently supported output targets include the X Window System, Quartz, Win32, image buffers, PostScript, PDF, and SVG file output.</li>
<li>The gcw device driver depends on <a href="http://www.gtk.org/">GTK+</a>; a multi-platform toolkit library for creating graphical user interfaces.</li>
<li>The gcw, gd, wingcc, and wxwidgets device drivers depend on <a href="http://www.freetype.org/">FreeType</a>; a free, high-quality, and portable font engine.</li>
- <li>The gd device driver depends on <a href="http://www.libgd.org/">libgd</a>; an open-source code library for the dynamic creation of images by programmers.</li>
+ <li>The gd device driver depends on <a href="http://libgd.bitbucket.org/">libgd</a>; an open-source code library for the dynamic creation of images by programmers.</li>
<li>The pdf device driver depends on <a href="http://www.libharu.org/">libHaru</a>; a free, cross-platform, open-source library for generating PDF files.</li>
<li>The psttf device driver depends on <a href="http://www.unifont.org/lasi/">LASi</a>; a library that provides a C++ stream output interface (with operator <<) for creating Postscript documents that can contain characters from any of the scripts and symbol blocks supported in Unicode and by Owen Taylor's Pango layout engine.</li>
- <li>The Qt device driver depends on <a href="http://qt.nokia.com/products/">Qt</a>; a multi-platform toolkit library for creating graphical user interfaces.</li>
+ <li>The Qt device driver depends on <a href="http://qt.digia.com/Product/">Qt</a>; a multi-platform toolkit library for creating graphical user interfaces.</li>
<li>The wxwidgets device driver depends on <a href="http://www.wxwidgets.org/">wxWidgets</a>; a GUI and tools library that lets developers create GUI applications for Win32, Mac OS X, GTK+, X11, Motif, WinCE, and more using one codebase.</li>
<li>The wxwidgets device driver optionally depends on <a href="http://www.antigrain.com/">Anti-Grain Geometry</a>; an open-source, free-of-charge, high-quality rendering engine written in C++.</li>
</ul>
@@ -46,7 +46,7 @@
<ul class="arrowlist">
<li><a href="http://www.cmake.org/">CMake</a>, a cross-platform, open-source build system.</li>
<li><a href="http://www.swig.org/">SWIG</a>, a software development tool that connects programs written in C and C++ with a variety of high-level programming languages.</li>
- <li><a href="http://pkg-config.freedesktop.org/wiki/">pkg-config</a>, a helper tool used when compiling applications and libraries.</li>
+ <li><a href="http://www.freedesktop.org/wiki/Software/pkg-config/">pkg-config</a>, a helper tool used when compiling applications and libraries.</li>
<li><a href="http://www.docbook.org/">DocBook</a>, an XML schema (available in several languages including RELAX NG, SGML and XML DTDs, and W3C XML Schema) which is particularly well suited for writing books and papers about computer hardware and software.</li>
</ul>
</div>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2013-09-26 23:07:07
|
Revision: 12536
http://sourceforge.net/p/plplot/code/12536
Author: airwin
Date: 2013-09-26 23:07:02 +0000 (Thu, 26 Sep 2013)
Log Message:
-----------
Implement a method (used just for example 33 right now) for selecting
a subset of the pages to display on our website.
Tested by Alan W. Irwin <ai...@us...> by running
the scripts/generate_website.sh script and looking at the
website results for each example to make sure all pages
are displayed except for example 33 where, as expected, the
correct subset of pages was displayed.
Modified Paths:
--------------
trunk/www/examples.php
Modified: trunk/www/examples.php
===================================================================
--- trunk/www/examples.php 2013-09-26 21:59:56 UTC (rev 12535)
+++ trunk/www/examples.php 2013-09-26 23:07:02 UTC (rev 12536)
@@ -40,7 +40,7 @@
\n", array_fill( 0, 1, 1)),
array(11, 8, 1, "
<p>Mesh plot demo.</p>
- \n, array_fill( 0, 8, 1)"),
+ \n", array_fill( 0, 8, 1)),
array(12, 1, 1, "
<p>Bar chart demo.</p>
\n", array_fill( 0, 1, 1)),
@@ -119,8 +119,20 @@
<p>Demo of how to draw box-whisker / candlestick plots using PLplot. These are commonly used for financial data.</p>
\n", array_fill( 0, 1, 1)),
array(33, 100, 1, "
- <p>Demo of legends and colorbars.</p>
- \n", array_fill( 0, 100, 1)));
+ <p>Subset of the results from the demo of legends and colorbars.</p>
+ \n", array_fill( 0, 100, 0)));
+ # Overwrite the example 33 pages (currently none) that will be displayed
+ $demoArray[33][4][0] = 1;
+ $demoArray[33][4][1] = 1;
+ $demoArray[33][4][2] = 1;
+ $demoArray[33][4][3] = 1;
+ $demoArray[33][4][4] = 1;
+ $demoArray[33][4][20] = 1;
+ $demoArray[33][4][36] = 1;
+ $demoArray[33][4][52] = 1;
+ $demoArray[33][4][68] = 1;
+ for($ndx = 84; $ndx <= 99; ++$ndx)
+ $demoArray[33][4][$ndx] = 1;
?>
<!-- include the html header -->
@@ -189,10 +201,12 @@
echo "<p>Select to view full-size image</p>\n";
echo "<p>\n";
for($ndx = 1; $ndx <= $nplots; ++$ndx) {
+ if($demoArray[$demoID-0][4][$ndx-1]==1){
$ndx_str = sprintf ("%02d", $ndx);
echo "<a href=\"$demo_dir/x$demo_str.$ndx_str.png\" rel=\"lightbox[plplot]\" title=\"x$demo_str.$ndx_str\">
<img src=\"$demo_dir/prev-x$demo_str.$ndx_str.png\" border=\"1\" alt=\"x$demo_str.$ndx_str\"/></a>\n";
}
+ }
echo "</p>\n";
// show credits if any
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2013-09-26 21:59:59
|
Revision: 12535
http://sourceforge.net/p/plplot/code/12535
Author: airwin
Date: 2013-09-26 21:59:56 +0000 (Thu, 26 Sep 2013)
Log Message:
-----------
Add an additional array to demoArray which contains flags to store
which pages of each example are displayed on the website. But for
now this extra array is not used (see ToDo below).
Add an entry in demoArray for example 00
Change demoArray to allow 100 pages for example 33
Drop f77 and Perl/PDL from list of languages whose source code is
displayed for each example.
ToDo. Implement using the extra array in demoArray to control which
pages are displayed on the website.
Modified Paths:
--------------
trunk/www/examples.php
Modified: trunk/www/examples.php
===================================================================
--- trunk/www/examples.php 2013-09-26 21:51:35 UTC (rev 12534)
+++ trunk/www/examples.php 2013-09-26 21:59:56 UTC (rev 12535)
@@ -2,78 +2,81 @@
include "corefunctions.php";
# Each element of the structure below contains:
- # [ demo#, number of pages, particular thumbnail for top-level page, credits]
+ # [ demo#, number of pages, particular thumbnail for top-level page, credits, logical array indicating which pages to display]
# if number of pages==0 the entry is ignored (currently none are ignored).
$demoArray = array(
+ array( 0, 1, 1, "
+ <p>Simplest tutorial demo of a 2D line plot.</p>
+ \n", array_fill( 0, 1, 1)),
array( 1, 1, 1, "
<p>Simple line plot and multiple windows demo.</p>
- \n"),
+ \n", array_fill( 0, 1, 1)),
array( 2, 2, 1, "
<p>Multiple window and color map 0 demo.</p>
- \n"),
+ \n", array_fill( 0, 2, 1)),
array( 3, 1, 1, "
<p>Polar plot demo.</p>
- \n"),
+ \n", array_fill( 0, 1, 1)),
array( 4, 2, 1, "
<p>Log plot demo.</p>
- \n"),
+ \n", array_fill( 0, 2, 1)),
array( 5, 1, 1, "
<p>Histogram demo.</p>
- \n"),
+ \n", array_fill( 0, 1, 1)),
array( 6, 5, 1, "
<p>Symbol demo.</p>
- \n"),
+ \n", array_fill( 0, 5, 1)),
array( 7, 19, 1, "
<p>Font demo for Hershey encodings.</p>
- \n"),
+ \n", array_fill( 0, 19, 1)),
array( 8, 8, 1, "
<p>3-d plot demo.</p>
- \n"),
+ \n", array_fill( 0, 8, 1)),
array( 9, 5, 1, "
<p>Contour plot demo.</p>
- \n"),
+ \n", array_fill( 0, 5, 1)),
array(10, 1, 1, "
<p>Window positioning demo.</p>
- \n"),
+ \n", array_fill( 0, 1, 1)),
array(11, 8, 1, "
<p>Mesh plot demo.</p>
- \n"),
+ \n, array_fill( 0, 8, 1)"),
array(12, 1, 1, "
<p>Bar chart demo.</p>
- \n"),
+ \n", array_fill( 0, 1, 1)),
array(13, 1, 1, "
<p>Pie chart demo.</p>
- \n"),
+ \n", array_fill( 0, 1, 1)),
array(14, 4, 1, "
<p>Demo of multiple stream/window capability. The two pages of the master stream appear as the first two pages here. The two pages of the slave stream appear as pages 3 and 4 here.</p>
- \n"),
+ \n", array_fill( 0, 4, 1)),
array(15, 3, 1, "
<p>Shade plot demo using color map 0 (discrete colors) (plshade).</p>
- \n"),
+ \n", array_fill( 0, 3, 1)),
array(16, 5, 1, "
<p>Shade plot demo using color map 1 (continuous colours) (plshades).</p>
- \n"),
+ \n", array_fill( 0, 5, 1)),
array(17, 1, 1, "
<p>4-pen strip chart demo.</p>
- \n"),
+ \n", array_fill( 0, 1, 1)),
array(18, 8, 1, "
<p>3-d line and point plot demo.</p>
- \n"),
+ \n", array_fill( 0, 8, 1)),
array(19, 4, 1, "
<p>Demo of backdrop plotting of world, US maps.</p>
- \n"),
+ \n", array_fill( 0, 4, 1)),
array(20, 6, 3, "
<p>Demo of gray-scale image manipulation (plimage).</p>
- \n"),
+ \n", array_fill( 0, 6, 1)),
array(21, 3, 3, "
<p>Grid data demo.</p>
- \n"),
+ \n", array_fill( 0, 3, 1)),
array(22, 4, 3, "
<p>Demo of simple vector plotting.</p>
- \n"),
+ \n", array_fill( 0, 4, 1)),
array(23, 16, 1, "
<p>Font demo for unicode encodings which shows Greek letters and math symbols.</p>
- \n"),
+ \n", array_fill( 0, 16, 1)),
array(24, 1, 1, "
<p>Demo of unicode Pace Flag.</p>
<p>Credits:</p>
@@ -81,13 +84,13 @@
<li><a href=\"http://www.columbia.edu/~fdc/pace/\">Say Peace in all languages!</a></li>
<li><a href=\"http://www.columbia.edu/~fdc/pace/flag.html\">Pace flag</a></li>
</ul>
- \n"),
+ \n", array_fill( 0, 1, 1)),
array(25, 8, 1, "
<p>Diagnostic demo of filling and clipping polygons.</p>
- \n"),
+ \n", array_fill( 0, 8, 1)),
array(26, 2, 1, "
<p>Demo of multi-lingual unicode versions of the first page of example 4.</p>
- \n"),
+ \n", array_fill( 0, 2, 1)),
array(27, 19, 1, "
<p>Demo of drawing and filling 'spirograph' curves -
epitrochoids, cycolids, roulettes. We have specified the general
@@ -99,25 +102,25 @@
much larger fraction of the complex spirographic curve would be
filled).
</p>
- \n"),
+ \n", array_fill( 0, 19, 1)),
array(28, 5, 1, "
<p>Demo of 3-d writing of text (plmtex3 and plptex3).</p>
- \n"),
+ \n", array_fill( 0, 5, 1)),
array(29, 10, 1, "
<p>Demo of date / time formatting for axes.</p>
- \n"),
+ \n", array_fill( 0, 10, 1)),
array(30, 2, 1, "
<p>Demo of opacity/ transparency (or alpha channel).</p>
- \n"),
+ \n", array_fill( 0, 2, 1)),
array(31, 1, 1, "
<p>Diagnostic demo to exercise all our set/get functions. The result should be a properly-formatted empty plot with black background.</p>
- \n"),
+ \n", array_fill( 0, 1, 1)),
array(32, 1, 1, "
<p>Demo of how to draw box-whisker / candlestick plots using PLplot. These are commonly used for financial data.</p>
- \n"),
- array(33, 4, 1, "
- <p>Demo of legends.</p>
- \n"));
+ \n", array_fill( 0, 1, 1)),
+ array(33, 100, 1, "
+ <p>Demo of legends and colorbars.</p>
+ \n", array_fill( 0, 100, 1)));
?>
<!-- include the html header -->
@@ -134,15 +137,16 @@
<div id="contentwrapper">
<div id="fullside">
<?php
+
// if the variable demo was set the source code of this example
// is displayed
if(isset($_GET["demo"])) {
$demoID=$_GET["demo"]; // demo number
$lbind=$_GET["lbind"]; // language
- $demo_str = sprintf("%02d", $demoArray[$demoID-1][0]);
- $nplots = $demoArray[$demoID-1][1];
- $credits = $demoArray[$demoID-1][3];
- $demo_dir = "examples-data/demo$demo_str";
+ $demo_str = sprintf("%02d", $demoArray[$demoID-0][0]);
+ $nplots = $demoArray[$demoID-0][1];
+ $credits = $demoArray[$demoID-0][3];
+ $demo_dir = "examples-data/demo$demo_str";
// add buttons for language selection
echo <<<END
@@ -154,12 +158,10 @@
<input type="submit" name="lbind" value="Ada(thin)" />
<input type="submit" name="lbind" value="C" />
<input type="submit" name="lbind" value="C++" />
- <input type="submit" name="lbind" value="F77" />
<input type="submit" name="lbind" value="F95" />
<input type="submit" name="lbind" value="Java" />
<input type="submit" name="lbind" value="Ocaml" />
<input type="submit" name="lbind" value="Octave" />
- <input type="submit" name="lbind" value="PerlDL" />
<input type="submit" name="lbind" value="Python" />
<input type="submit" name="lbind" value="Tcl" />
</form>
@@ -170,12 +172,10 @@
case ("Ada(thin)"): $fname = "x" . $demo_str . "a.adb-"; break;
case ("C"): $fname = "x" . $demo_str . "c.c-"; break;
case ("C++"):$fname = "x" . $demo_str . ".cc-"; break;
- case ("F77"): $fname = "x" . $demo_str . "f.f-"; break;
case ("F95"): $fname = "x" . $demo_str . "f.f90-"; break;
case ("Java"): $fname = "x" . $demo_str . ".java-"; break;
case ("Ocaml"): $fname = "x" . $demo_str . ".ml-"; break;
case ("Octave"): $fname = "x" . $demo_str . "c.m-"; break;
- case ("PerlDL"): $fname = "x" . $demo_str . ".pl-"; break;
case ("Python"): $fname = "xw" . $demo_str . ".py-"; break;
case ("Tcl"): $fname = "x" . $demo_str . ".tcl-"; break;
default: $fname = "x" . $demo_str . "c.c-";
@@ -216,7 +216,7 @@
echo <<<END
<h3>Examples</h3>
<p>These examples were generated with the pngcairo device and
- reflect the status of PLplot-5.9.9.</p>
+ reflect the status of PLplot-5.9.10.</p>
<p>Select a thumbnail to view full-size image and source code.</p>
<p>
END;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2013-09-26 21:51:39
|
Revision: 12534
http://sourceforge.net/p/plplot/code/12534
Author: airwin
Date: 2013-09-26 21:51:35 +0000 (Thu, 26 Sep 2013)
Log Message:
-----------
Drop f77 and Perl/PDL example source code from being copied to website.
Include source code and pngcairo results for x00.
For generated results, allow more than 99 pages. (N.B. example 33
currently has 100 pages).
Modified Paths:
--------------
trunk/scripts/htdocs-gen_plot-examples.sh
Modified: trunk/scripts/htdocs-gen_plot-examples.sh
===================================================================
--- trunk/scripts/htdocs-gen_plot-examples.sh 2013-09-26 15:32:18 UTC (rev 12533)
+++ trunk/scripts/htdocs-gen_plot-examples.sh 2013-09-26 21:51:35 UTC (rev 12534)
@@ -62,9 +62,8 @@
rm -rf htdocsgen/build_dir htdocsgen/install
mkdir -p htdocsgen/build_dir htdocsgen/install
cd htdocsgen/build_dir
- # Specifically enable f77 and Ada so that examples will be generated.
cmake -DCMAKE_INSTALL_PREFIX=`pwd`/../install \
- -DDEFAULT_NO_BINDINGS=ON -DENABLE_f77=ON -DENABLE_ada=ON\
+ -DDEFAULT_NO_BINDINGS=ON \
-DDEFAULT_NO_DEVICES=ON -DPLD_pngcairo=ON \
../../
make -j3
@@ -81,7 +80,7 @@
# hack, x20c needs lena in the current directory
$CP examples/c/lena.pgm .
-for exe in 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 18 19 20 21 22 \
+for exe in 00 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 18 19 20 21 22 \
23 24 25 26 27 28 29 30 31 32 33; do
if [ $exe = "08" -o $exe = "16" -o $exe = "20" -o $exe = "30" ] ; then
@@ -129,20 +128,17 @@
echo populating www directory demo${exe}
rm -rf $EXDIR/demo${exe}
mkdir -p $EXDIR/demo${exe}
- mv *${exe}.??.png $EXDIR/demo${exe}
- # Note configured fortran 77 examples must be grabbed from the installed
- # examples.
+ # page number is two digits or more.
+ mv *${exe}.*[0-9][0-9].png $EXDIR/demo${exe}
for f in \
examples/ada/x${exe}a.adb \
examples/ada/xthick${exe}a.adb \
examples/c/x${exe}c.c \
examples/c++/x${exe}.cc \
- $cexamples_dir/../f77/x${exe}f.f \
examples/f95/x${exe}f.f90 \
examples/java/x${exe}.java \
examples/ocaml/x${exe}.ml \
examples/octave/x${exe}c.m \
- examples/perl/x${exe}.pl \
examples/python/xw${exe}.py \
examples/tcl/x${exe}.tcl \
; do
@@ -161,12 +157,10 @@
*.adb \
*.c \
*.cc \
- *.f \
*.f90 \
*.java \
*.ml \
*.m \
- *.pl \
*.py \
*.tcl \
; do
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2013-09-26 15:32:23
|
Revision: 12533
http://sourceforge.net/p/plplot/code/12533
Author: andrewross
Date: 2013-09-26 15:32:18 +0000 (Thu, 26 Sep 2013)
Log Message:
-----------
Potential fix for wxWidgets problem on windows.
Modified Paths:
--------------
trunk/cmake/modules/wxwidgets.cmake
Modified: trunk/cmake/modules/wxwidgets.cmake
===================================================================
--- trunk/cmake/modules/wxwidgets.cmake 2013-09-26 15:18:37 UTC (rev 12532)
+++ trunk/cmake/modules/wxwidgets.cmake 2013-09-26 15:32:18 UTC (rev 12533)
@@ -70,12 +70,12 @@
"-D${wxWidgets_DEFINITIONS}"
)
set(wxWidgets_DEFINITIONS_DEBUG_wD "")
- if(wxWidgets_DEFINITIONS_DEBUG)
+ if(wxWidgets_DEFINITIONS_DEBUG AND CMAKE_BUILD_TYPE MATCHES "Debug")
string(REGEX REPLACE ";" " -D"
wxWidgets_DEFINITIONS_DEBUG_wD
"-D${wxWidgets_DEFINITIONS_DEBUG}"
)
- endif(wxWidgets_DEFINITIONS_DEBUG)
+ endif(wxWidgets_DEFINITIONS_DEBUG AND CMAKE_BUILD_TYPE MATCHES "Debug")
string(REGEX REPLACE ";" " "
wxwidgets_COMPILE_FLAGS
${wxwidgets_COMPILE_FLAGS}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2013-09-26 15:18:41
|
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.
|
|
From: <and...@us...> - 2013-09-26 06:44:38
|
Revision: 12531
http://sourceforge.net/p/plplot/code/12531
Author: andrewross
Date: 2013-09-26 06:44:36 +0000 (Thu, 26 Sep 2013)
Log Message:
-----------
Debian packages - bump standards version.
Modified Paths:
--------------
trunk/debian/changelog
trunk/debian/control
trunk/debian/control.in
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2013-09-25 22:31:44 UTC (rev 12530)
+++ trunk/debian/changelog 2013-09-26 06:44:36 UTC (rev 12531)
@@ -7,8 +7,9 @@
fix D language support.
* debian/patches/java-pltr2-fix.diff: Add patch from upstream to fix
crash in java examples using pltr2 (closes: #713309).
+ * debian/control.in: Bump standards version to 3.9.4.
- -- Andrew Ross <and...@us...> Thu, 27 Jun 2013 08:44:20 +0100
+ -- Andrew Ross <and...@us...> Fri, 28 Jun 2013 21:15:24 +0100
plplot (5.9.9-6) unstable; urgency=low
Modified: trunk/debian/control
===================================================================
--- trunk/debian/control 2013-09-25 22:31:44 UTC (rev 12530)
+++ trunk/debian/control 2013-09-26 06:44:36 UTC (rev 12531)
@@ -2,7 +2,7 @@
Section: math
Priority: optional
Maintainer: Andrew Ross <and...@us...>
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
Build-Depends: cmake (>= 2.6.3), debhelper (>= 7),
tcl8.5-dev, tk8.5-dev, itcl3-dev, libx11-dev, libxext-dev,
libxi-dev, gfortran, itk3-dev, liboctave-dev,
Modified: trunk/debian/control.in
===================================================================
--- trunk/debian/control.in 2013-09-25 22:31:44 UTC (rev 12530)
+++ trunk/debian/control.in 2013-09-26 06:44:36 UTC (rev 12531)
@@ -2,7 +2,7 @@
Section: math
Priority: optional
Maintainer: Andrew Ross <and...@us...>
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
Build-Depends: cmake (>= 2.6.3), debhelper (>= 7),
tcl8.5-dev, tk8.5-dev, itcl3-dev, libx11-dev, libxext-dev,
libxi-dev, gfortran, itk3-dev, liboctave-dev,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2013-09-25 22:31:47
|
Revision: 12530
http://sourceforge.net/p/plplot/code/12530
Author: andrewross
Date: 2013-09-25 22:31:44 +0000 (Wed, 25 Sep 2013)
Log Message:
-----------
Update d bindings for pllegend to allow null arrays.
Update d example 33 consistent with the C version.
Modified Paths:
--------------
trunk/bindings/d/plplot.d
trunk/examples/d/x33d.d
Modified: trunk/bindings/d/plplot.d
===================================================================
--- trunk/bindings/d/plplot.d 2013-09-25 18:07:21 UTC (rev 12529)
+++ trunk/bindings/d/plplot.d 2013-09-25 22:31:44 UTC (rev 12530)
@@ -375,17 +375,17 @@
immutable( char ) * *symbolsz = array( map!toStringz( symbols ) ).ptr;
assert( nlegend == text_colors.length, "pllegend(): Arrays must be of same length!" );
assert( nlegend == text.length, "pllegend(): Arrays must be of same length!" );
- assert( nlegend == box_colors.length, "pllegend(): Arrays must be of same length!" );
- assert( nlegend == box_patterns.length, "pllegend(): Arrays must be of same length!" );
- assert( nlegend == box_scales.length, "pllegend(): Arrays must be of same length!" );
- assert( nlegend == box_line_widths.length, "pllegend(): Arrays must be of same length!" );
- assert( nlegend == line_colors.length, "pllegend(): Arrays must be of same length!" );
- assert( nlegend == line_styles.length, "pllegend(): Arrays must be of same length!" );
- assert( nlegend == line_widths.length, "pllegend(): Arrays must be of same length!" );
- assert( nlegend == symbol_colors.length, "pllegend(): Arrays must be of same length!" );
- assert( nlegend == symbol_scales.length, "pllegend(): Arrays must be of same length!" );
- assert( nlegend == symbol_numbers.length, "pllegend(): Arrays must be of same length!" );
- assert( nlegend == symbols.length, "pllegend(): Arrays must be of same length!" );
+ assert( box_colors == null || nlegend == box_colors.length, "pllegend(): Arrays must be of same length!" );
+ assert( box_patterns == null || nlegend == box_patterns.length, "pllegend(): Arrays must be of same length!" );
+ assert( box_scales == null || nlegend == box_scales.length, "pllegend(): Arrays must be of same length!" );
+ assert( box_line_widths == null || nlegend == box_line_widths.length, "pllegend(): Arrays must be of same length!" );
+ assert( line_colors == null || nlegend == line_colors.length, "pllegend(): Arrays must be of same length!" );
+ assert( line_styles == null || nlegend == line_styles.length, "pllegend(): Arrays must be of same length!" );
+ assert( line_widths == null || nlegend == line_widths.length, "pllegend(): Arrays must be of same length!" );
+ assert( symbol_colors == null || nlegend == symbol_colors.length, "pllegend(): Arrays must be of same length!" );
+ assert( symbol_scales == null || nlegend == symbol_scales.length, "pllegend(): Arrays must be of same length!" );
+ assert( symbol_numbers == null || nlegend == symbol_numbers.length, "pllegend(): Arrays must be of same length!" );
+ assert( symbols == null || nlegend == symbols.length, "pllegend(): Arrays must be of same length!" );
c_pllegend( p_legend_width, p_legend_height,
opt, position, x, y, plot_width,
bg_color, bb_color, bb_style,
Modified: trunk/examples/d/x33d.d
===================================================================
--- trunk/examples/d/x33d.d 2013-09-25 18:07:21 UTC (rev 12529)
+++ trunk/examples/d/x33d.d 2013-09-25 22:31:44 UTC (rev 12530)
@@ -34,65 +34,280 @@
import std.math;
import std.string;
+static PLINT position_options[16] = [
+ PL_POSITION_LEFT | PL_POSITION_TOP | PL_POSITION_OUTSIDE,
+ PL_POSITION_TOP | PL_POSITION_OUTSIDE,
+ PL_POSITION_RIGHT | PL_POSITION_TOP | PL_POSITION_OUTSIDE,
+ PL_POSITION_RIGHT | PL_POSITION_OUTSIDE,
+ PL_POSITION_RIGHT | PL_POSITION_BOTTOM | PL_POSITION_OUTSIDE,
+ PL_POSITION_BOTTOM | PL_POSITION_OUTSIDE,
+ PL_POSITION_LEFT | PL_POSITION_BOTTOM | PL_POSITION_OUTSIDE,
+ PL_POSITION_LEFT | PL_POSITION_OUTSIDE,
+ PL_POSITION_LEFT | PL_POSITION_TOP | PL_POSITION_INSIDE,
+ PL_POSITION_TOP | PL_POSITION_INSIDE,
+ PL_POSITION_RIGHT | PL_POSITION_TOP | PL_POSITION_INSIDE,
+ PL_POSITION_RIGHT | PL_POSITION_INSIDE,
+ PL_POSITION_RIGHT | PL_POSITION_BOTTOM | PL_POSITION_INSIDE,
+ PL_POSITION_BOTTOM | PL_POSITION_INSIDE,
+ PL_POSITION_LEFT | PL_POSITION_BOTTOM | PL_POSITION_INSIDE,
+ PL_POSITION_LEFT | PL_POSITION_INSIDE
+];
+
+// Pick 5 arbitrary UTF-8 symbols useful for plotting points (✠✚✱✪✽✺✰✴✦).
+static string special_symbols[5] = [
+ "✰",
+ "✴",
+ "✱",
+ "✽",
+ "✦"
+];
+
+// plcolorbar options
+
+// Colorbar type options
+const int COLORBAR_KINDS = 4;
+static PLINT colorbar_option_kinds[COLORBAR_KINDS] = [
+ PL_COLORBAR_SHADE,
+ PL_COLORBAR_SHADE | PL_COLORBAR_SHADE_LABEL,
+ PL_COLORBAR_IMAGE,
+ PL_COLORBAR_GRADIENT
+];
+static string colorbar_option_kind_labels[COLORBAR_KINDS] = [
+ "Shade colorbars",
+ "Shade colorbars with custom labels",
+ "Image colorbars",
+ "Gradient colorbars"
+];
+
+// Which side of the page are we positioned relative to?
+const int COLORBAR_POSITIONS = 4;
+static PLINT colorbar_position_options[COLORBAR_POSITIONS] = [
+ PL_POSITION_LEFT,
+ PL_POSITION_RIGHT,
+ PL_POSITION_TOP,
+ PL_POSITION_BOTTOM
+];
+static string colorbar_position_option_labels[COLORBAR_POSITIONS] = [
+ "Left",
+ "Right",
+ "Top",
+ "Bottom"
+];
+
+// Colorbar label positioning options
+const int COLORBAR_LABELS = 4;
+static PLINT colorbar_label_options[COLORBAR_LABELS] = [
+ PL_COLORBAR_LABEL_LEFT,
+ PL_COLORBAR_LABEL_RIGHT,
+ PL_COLORBAR_LABEL_TOP,
+ PL_COLORBAR_LABEL_BOTTOM
+];
+static string colorbar_label_option_labels[COLORBAR_LABELS] = [
+ "Label left",
+ "Label right",
+ "Label top",
+ "Label bottom"
+];
+
+// Colorbar cap options
+const int COLORBAR_CAPS = 4;
+static PLINT colorbar_cap_options[COLORBAR_CAPS] = [
+ PL_COLORBAR_CAP_NONE,
+ PL_COLORBAR_CAP_LOW,
+ PL_COLORBAR_CAP_HIGH,
+ PL_COLORBAR_CAP_LOW | PL_COLORBAR_CAP_HIGH
+];
+static string colorbar_cap_option_labels[COLORBAR_CAPS] = [
+ "No caps",
+ "Low cap",
+ "High cap",
+ "Low and high caps"
+];
+
+static int colorbar = 1; // By default do not plot plcolorbar pages
+ // for now while we are working out the API.
+void
+plcolorbar_example_page( int kind_i, int label_i, int cap_i, PLINT cont_color, PLFLT cont_width, PLINT n_values, PLFLT [] values )
+{
+ // Parameters for the colorbars on this page
+ PLINT position_i, position, opt;
+ PLFLT x, y, x_length, y_length;
+ PLFLT ticks[1] = [ 0.0 ];
+ PLINT sub_ticks[1] = [ 0 ];
+ PLFLT low_cap_color, high_cap_color;
+ PLINT vertical, ifn;
+ PLINT n_axes = 1;
+ string[] axis_opts;
+ PLINT n_labels = 1;
+ PLINT label_opts[1] = [ 0 ];
+ string[] label;
+ string title;
+ PLFLT colorbar_width, colorbar_height;
+ PLINT n_values_array[1];
+ PLFLT[][] values_array;
+
+ axis_opts.length = 1;
+ label.length = 1;
+ values_array = new PLFLT[][1];
+ n_values_array[0] = n_values;
+ values_array[0] = values;
+
+ low_cap_color = 0.0;
+ high_cap_color = 1.0;
+
+ // Start a new page
+ pladv( 0 );
+
+ // Draw one colorbar relative to each side of the page
+ for ( position_i = 0; position_i < COLORBAR_POSITIONS; position_i++ )
+ {
+ position = colorbar_position_options[position_i];
+ opt =
+ colorbar_option_kinds[kind_i] |
+ colorbar_label_options[label_i] |
+ colorbar_cap_options[cap_i];
+
+ vertical = position & PL_POSITION_LEFT || position & PL_POSITION_RIGHT;
+ ifn = position & PL_POSITION_LEFT || position & PL_POSITION_BOTTOM;
+
+ // Set the offset position on the page
+ if ( vertical )
+ {
+ x = 0.0;
+ y = 0.0;
+ x_length = 0.05;
+ y_length = 0.5;
+ }
+ else
+ {
+ x = 0.0;
+ y = 0.0;
+ x_length = 0.5;
+ y_length = 0.05;
+ }
+
+ // Set appropriate labelling options.
+ if ( ifn )
+ {
+ if ( cont_color == 0 || cont_width == 0. )
+ {
+ axis_opts[0] = "uwtivn";
+ //axis_opts[0] = "uwtin";
+ }
+ else
+ {
+ axis_opts[0] = "uwxvn";
+ //axis_opts[0] = "uwxn";
+ }
+ }
+ else
+ {
+ if ( cont_color == 0 || cont_width == 0. )
+ {
+ axis_opts[0] = "uwtivm";
+ //axis_opts[0] = "uwtim";
+ }
+ else
+ {
+ axis_opts[0] = "uwxvm";
+ //axis_opts[0] = "uwxm";
+ }
+ }
+
+ label[0] = format( "%s, %s",
+ colorbar_position_option_labels[position_i],
+ colorbar_label_option_labels[label_i] );
+
+ // Smaller text
+ plschr( 0.0, 0.75 );
+ // Small ticks on the vertical axis
+ plsmaj( 0.0, 0.5 );
+ plsmin( 0.0, 0.5 );
+
+ plvpor( 0.20, 0.80, 0.20, 0.80 );
+ plwind( 0.0, 1.0, 0.0, 1.0 );
+ // Set interesting background colour.
+ plscol0a( 15, 0, 0, 0, 0.20 );
+ plcolorbar( &colorbar_width, &colorbar_height,
+ opt | PL_COLORBAR_BOUNDING_BOX | PL_COLORBAR_BACKGROUND, position,
+ x, y, x_length, y_length,
+ 15, 1, 1,
+ low_cap_color, high_cap_color,
+ cont_color, cont_width,
+ label_opts, label,
+ axis_opts,
+ ticks, sub_ticks,
+ values_array );
+
+ // Reset text and tick sizes
+ plschr( 0.0, 1.0 );
+ plsmaj( 0.0, 1.0 );
+ plsmin( 0.0, 1.0 );
+ }
+
+ // Draw a page title
+ title = format( "%s - %s",
+ colorbar_option_kind_labels[kind_i],
+ colorbar_cap_option_labels[cap_i] );
+ plvpor( 0.0, 1.0, 0.0, 1.0 );
+ plwind( 0.0, 1.0, 0.0, 1.0 );
+ plptex( 0.5, 0.5, 0.0, 0.0, 0.5, title );
+}
+
+void
+plcolorbar_example( string palette, int kind_i, PLINT cont_color, PLFLT cont_width, PLINT n_values, PLFLT [] values )
+{
+ int label_i, cap_i;
+
+ // Load the color palette
+ plspal1( palette, 1 );
+
+ for ( label_i = 0; label_i < COLORBAR_LABELS; label_i++ )
+ {
+ for ( cap_i = 0; cap_i < COLORBAR_CAPS; cap_i++ )
+ {
+ plcolorbar_example_page( kind_i, label_i, cap_i,
+ cont_color, cont_width,
+ n_values, values );
+ }
+ }
+}
+
//--------------------------------------------------------------------------
// main
//
// Demonstrate most pllegend capability including unicode symbols.
//--------------------------------------------------------------------------
+const int MAX_NLEGEND = 7;
int main( char[][] args )
{
- PLINT opt;
- PLINT nlegend, nturn;
- PLINT[] opt_array;
- PLINT[] text_colors;
- PLINT[] box_colors;
- PLINT[] box_patterns;
- PLFLT[] box_scales;
- PLFLT[] box_line_widths;
- PLINT[] line_colors;
- PLINT[] line_styles;
- PLFLT[] line_widths;
- PLINT[] symbol_numbers, symbol_colors;
- PLFLT[] symbol_scales;
- string[] text, symbols;
+ int i, k;
+ PLINT opt;
+ PLINT nlegend, nturn;
+ PLINT opt_array[MAX_NLEGEND];
+ PLINT text_colors[MAX_NLEGEND];
+ PLINT box_colors[MAX_NLEGEND];
+ PLINT box_patterns[MAX_NLEGEND];
+ PLFLT box_scales[MAX_NLEGEND];
+ PLFLT box_line_widths[MAX_NLEGEND];
+ PLINT line_colors[MAX_NLEGEND];
+ PLINT line_styles[MAX_NLEGEND];
+ PLFLT line_widths[MAX_NLEGEND];
+ PLINT symbol_numbers[MAX_NLEGEND];
+ PLINT symbol_colors[MAX_NLEGEND];
+ PLFLT symbol_scales[MAX_NLEGEND];
+ string text[MAX_NLEGEND];
+ string symbols[MAX_NLEGEND];
+ PLFLT legend_width, legend_height, x, y, xstart, ystart;
+ PLFLT max_height, text_scale;
+ PLINT position, opt_base, nrow, ncolumn;
- PLFLT legend_width, legend_height, x, y, xstart, ystart;
- PLFLT max_height, text_scale;
- PLINT position, opt_base, nrow, ncolumn;
-
- PLINT[16] position_options = [
- PL_POSITION_LEFT | PL_POSITION_TOP | PL_POSITION_OUTSIDE,
- PL_POSITION_TOP | PL_POSITION_OUTSIDE,
- PL_POSITION_RIGHT | PL_POSITION_TOP | PL_POSITION_OUTSIDE,
- PL_POSITION_RIGHT | PL_POSITION_OUTSIDE,
- PL_POSITION_RIGHT | PL_POSITION_BOTTOM | PL_POSITION_OUTSIDE,
- PL_POSITION_BOTTOM | PL_POSITION_OUTSIDE,
- PL_POSITION_LEFT | PL_POSITION_BOTTOM | PL_POSITION_OUTSIDE,
- PL_POSITION_LEFT | PL_POSITION_OUTSIDE,
- PL_POSITION_LEFT | PL_POSITION_TOP | PL_POSITION_INSIDE,
- PL_POSITION_TOP | PL_POSITION_INSIDE,
- PL_POSITION_RIGHT | PL_POSITION_TOP | PL_POSITION_INSIDE,
- PL_POSITION_RIGHT | PL_POSITION_INSIDE,
- PL_POSITION_RIGHT | PL_POSITION_BOTTOM | PL_POSITION_INSIDE,
- PL_POSITION_BOTTOM | PL_POSITION_INSIDE,
- PL_POSITION_LEFT | PL_POSITION_BOTTOM | PL_POSITION_INSIDE,
- PL_POSITION_LEFT | PL_POSITION_INSIDE
- ];
-
- // Pick 5 arbitrary UTF-8 symbols useful for plotting points (✠✚✱✪✽✺✰✴✦).
- string[5] special_symbols = [
- "✰",
- "✴",
- "✱",
- "✽",
- "✦"
- ];
-
// Parse and process command line arguments
plparseopts( args, PL_PARSE_FULL );
- // Initialize plplot
+
+// Initialize plplot
plinit();
// First page illustrating the 16 standard positions.
@@ -105,22 +320,6 @@
plmtex( "t", 6.0, 0.5, 0.5, "the same (0.05) offset in x and y" );
nlegend = 1;
- // Initialize arrays needed for pllegend.
- opt_array.length = nlegend;
- text_colors.length = nlegend;
- text.length = nlegend;
- line_colors.length = nlegend;
- line_styles.length = nlegend;
- line_widths.length = nlegend;
- box_colors.length = nlegend;
- box_patterns.length = nlegend;
- box_scales.length = nlegend;
- box_line_widths.length = nlegend;
- symbol_numbers.length = nlegend;
- symbol_colors.length = nlegend;
- symbol_scales.length = nlegend;
- symbols.length = nlegend;
-
// Only specify legend data that are required according to the
// value of opt_array for that entry.
opt_base = PL_LEGEND_BACKGROUND | PL_LEGEND_BOUNDING_BOX;
@@ -135,22 +334,22 @@
plsfont( PL_FCI_MONO, -1, -1 );
plscol0a( 15, 32, 32, 32, 0.70 );
- for ( size_t k = 0; k < 16; k++ )
+ for ( k = 0; k < 16; k++ )
{
- position = position_options[k];
- opt = opt_base;
- text[0] = format( "%2.2d", k );
+ position = position_options[k];
+ opt = opt_base;
+ text[0] = format( "%2.2d", k );
text_colors[0] = 1 + ( k % 8 );
line_colors[0] = 1 + ( k % 8 );
symbol_colors[0] = 1 + ( k % 8 );
pllegend( &legend_width, &legend_height, opt, position, 0.05, 0.05,
0.1, 15, 1, 1, 0, 0,
- opt_array, 1.0, 1.0, 2.0,
- 1., text_colors, text,
- box_colors, box_patterns, box_scales, box_line_widths,
- line_colors, line_styles, line_widths,
- symbol_colors, symbol_scales, symbol_numbers, symbols );
+ opt_array[0..nlegend], 1.0, 1.0, 2.0,
+ 1., text_colors[0..nlegend], text[0..nlegend],
+ null, null, null, null,
+ line_colors[0..nlegend], line_styles[0..nlegend], line_widths[0..nlegend],
+ symbol_colors[0..nlegend], symbol_scales[0..nlegend], symbol_numbers[0..nlegend], symbols[0..nlegend] );
}
// Second page illustrating effect of nrow, ncolumn for the same legend
@@ -164,26 +363,11 @@
plmtex( "t", 6.0, 0.5, 0.5, "and position for the same legend data" );
nlegend = 7;
- // Initialize arrays needed for pllegend.
- opt_array.length = nlegend;
- text_colors.length = nlegend;
- text.length = nlegend;
- line_colors.length = nlegend;
- line_styles.length = nlegend;
- line_widths.length = nlegend;
- box_colors.length = nlegend;
- box_patterns.length = nlegend;
- box_scales.length = nlegend;
- box_line_widths.length = nlegend;
- symbol_numbers.length = nlegend;
- symbol_colors.length = nlegend;
- symbol_scales.length = nlegend;
- symbols.length = nlegend;
// Only specify legend data that are required according to the
// value of opt_array for that entry.
opt_base = PL_LEGEND_BACKGROUND | PL_LEGEND_BOUNDING_BOX;
- for ( size_t k = 0; k < nlegend; k++ )
+ for ( k = 0; k < nlegend; k++ )
{
opt_array[k] = PL_LEGEND_LINE | PL_LEGEND_SYMBOL;
line_styles[k] = 1;
@@ -191,10 +375,10 @@
symbol_scales[k] = 1.;
symbol_numbers[k] = 2;
symbols[k] = "*";
- text[k] = format( "%2.2d", k );
- text_colors[k] = 1 + ( k % 8 );
- line_colors[k] = 1 + ( k % 8 );
- symbol_colors[k] = 1 + ( k % 8 );
+ text[k] = format( "%2.2d", k );
+ text_colors[k] = 1 + ( k % 8 );
+ line_colors[k] = 1 + ( k % 8 );
+ symbol_colors[k] = 1 + ( k % 8 );
}
// Use monotype fonts so that all legends are the same size.
@@ -209,11 +393,11 @@
ncolumn = nlegend;
pllegend( &legend_width, &legend_height, opt, position, x, y,
0.05, 15, 1, 1, nrow, ncolumn,
- opt_array, 1.0, 1.0, 2.0,
- 1., text_colors, text,
- box_colors, box_patterns, box_scales, box_line_widths,
- line_colors, line_styles, line_widths,
- symbol_colors, symbol_scales, symbol_numbers, symbols );
+ opt_array[0..nlegend], 1.0, 1.0, 2.0,
+ 1., text_colors[0..nlegend], text[0..nlegend],
+ null, null, null, null,
+ line_colors[0..nlegend], line_styles[0..nlegend], line_widths[0..nlegend],
+ symbol_colors[0..nlegend], symbol_scales[0..nlegend], symbol_numbers[0..nlegend], symbols[0..nlegend] );
position = PL_POSITION_BOTTOM | PL_POSITION_OUTSIDE;
opt = opt_base;
@@ -223,11 +407,11 @@
ncolumn = nlegend;
pllegend( &legend_width, &legend_height, opt, position, x, y,
0.05, 15, 1, 1, nrow, ncolumn,
- opt_array, 1.0, 1.0, 2.0,
- 1., text_colors, text,
- box_colors, box_patterns, box_scales, box_line_widths,
- line_colors, line_styles, line_widths,
- symbol_colors, symbol_scales, symbol_numbers, symbols );
+ opt_array[0..nlegend], 1.0, 1.0, 2.0,
+ 1., text_colors[0..nlegend], text[0..nlegend],
+ null, null, null, null,
+ line_colors[0..nlegend], line_styles[0..nlegend], line_widths[0..nlegend],
+ symbol_colors[0..nlegend], symbol_scales[0..nlegend], symbol_numbers[0..nlegend], symbols[0..nlegend] );
position = PL_POSITION_LEFT | PL_POSITION_OUTSIDE;
opt = opt_base;
@@ -237,11 +421,11 @@
ncolumn = 1;
pllegend( &legend_width, &legend_height, opt, position, x, y,
0.05, 15, 1, 1, nrow, ncolumn,
- opt_array, 1.0, 1.0, 2.0,
- 1., text_colors, text,
- box_colors, box_patterns, box_scales, box_line_widths,
- line_colors, line_styles, line_widths,
- symbol_colors, symbol_scales, symbol_numbers, symbols );
+ opt_array[0..nlegend], 1.0, 1.0, 2.0,
+ 1., text_colors[0..nlegend], text[0..nlegend],
+ null, null, null, null,
+ line_colors[0..nlegend], line_styles[0..nlegend], line_widths[0..nlegend],
+ symbol_colors[0..nlegend], symbol_scales[0..nlegend], symbol_numbers[0..nlegend], symbols[0..nlegend] );
position = PL_POSITION_RIGHT | PL_POSITION_OUTSIDE;
opt = opt_base;
@@ -251,11 +435,11 @@
ncolumn = 1;
pllegend( &legend_width, &legend_height, opt, position, x, y,
0.05, 15, 1, 1, nrow, ncolumn,
- opt_array, 1.0, 1.0, 2.0,
- 1., text_colors, text,
- box_colors, box_patterns, box_scales, box_line_widths,
- line_colors, line_styles, line_widths,
- symbol_colors, symbol_scales, symbol_numbers, symbols );
+ opt_array[0..nlegend], 1.0, 1.0, 2.0,
+ 1., text_colors[0..nlegend], text[0..nlegend],
+ null, null, null, null,
+ line_colors[0..nlegend], line_styles[0..nlegend], line_widths[0..nlegend],
+ symbol_colors[0..nlegend], symbol_scales[0..nlegend], symbol_numbers[0..nlegend], symbols[0..nlegend] );
position = PL_POSITION_LEFT | PL_POSITION_TOP | PL_POSITION_INSIDE;
opt = opt_base;
@@ -265,11 +449,11 @@
ncolumn = 2;
pllegend( &legend_width, &legend_height, opt, position, x, y,
0.05, 15, 1, 1, nrow, ncolumn,
- opt_array, 1.0, 1.0, 2.0,
- 1., text_colors, text,
- box_colors, box_patterns, box_scales, box_line_widths,
- line_colors, line_styles, line_widths,
- symbol_colors, symbol_scales, symbol_numbers, symbols );
+ opt_array[0..nlegend], 1.0, 1.0, 2.0,
+ 1., text_colors[0..nlegend], text[0..nlegend],
+ null, null, null, null,
+ line_colors[0..nlegend], line_styles[0..nlegend], line_widths[0..nlegend],
+ symbol_colors[0..nlegend], symbol_scales[0..nlegend], symbol_numbers[0..nlegend], symbols[0..nlegend] );
position = PL_POSITION_RIGHT | PL_POSITION_TOP | PL_POSITION_INSIDE;
opt = opt_base | PL_LEGEND_ROW_MAJOR;
@@ -279,11 +463,11 @@
ncolumn = 2;
pllegend( &legend_width, &legend_height, opt, position, x, y,
0.05, 15, 1, 1, nrow, ncolumn,
- opt_array, 1.0, 1.0, 2.0,
- 1., text_colors, text,
- box_colors, box_patterns, box_scales, box_line_widths,
- line_colors, line_styles, line_widths,
- symbol_colors, symbol_scales, symbol_numbers, symbols );
+ opt_array[0..nlegend], 1.0, 1.0, 2.0,
+ 1., text_colors[0..nlegend], text[0..nlegend],
+ null, null, null, null,
+ line_colors[0..nlegend], line_styles[0..nlegend], line_widths[0..nlegend],
+ symbol_colors[0..nlegend], symbol_scales[0..nlegend], symbol_numbers[0..nlegend], symbols[0..nlegend] );
position = PL_POSITION_BOTTOM | PL_POSITION_INSIDE;
opt = opt_base | PL_LEGEND_ROW_MAJOR;
@@ -293,11 +477,11 @@
ncolumn = 3;
pllegend( &legend_width, &legend_height, opt, position, x, y,
0.05, 15, 1, 1, nrow, ncolumn,
- opt_array, 1.0, 1.0, 2.0,
- 1., text_colors, text,
- box_colors, box_patterns, box_scales, box_line_widths,
- line_colors, line_styles, line_widths,
- symbol_colors, symbol_scales, symbol_numbers, symbols );
+ opt_array[0..nlegend], 1.0, 1.0, 2.0,
+ 1., text_colors[0..nlegend], text[0..nlegend],
+ null, null, null, null,
+ line_colors[0..nlegend], line_styles[0..nlegend], line_widths[0..nlegend],
+ symbol_colors[0..nlegend], symbol_scales[0..nlegend], symbol_numbers[0..nlegend], symbols[0..nlegend] );
// Third page demonstrating legend alignment
pladv( 0 );
@@ -313,33 +497,17 @@
position = PL_POSITION_TOP | PL_POSITION_LEFT | PL_POSITION_SUBPAGE;
opt_base = PL_LEGEND_BACKGROUND | PL_LEGEND_BOUNDING_BOX;
opt = opt_base;
- for ( size_t i = 0; i < 9; i++ )
+ for ( i = 0; i < 9; i++ )
{
// Set up legend arrays with the correct size, type.
if ( i <= nturn )
nlegend += 1;
else
nlegend -= 1;
- nlegend = cast(PLINT) fmax( 1, nlegend );
- // Initialize arrays needed for pllegend.
- opt_array.length = nlegend;
- text_colors.length = nlegend;
- text.length = nlegend;
- line_colors.length = nlegend;
- line_styles.length = nlegend;
- line_widths.length = nlegend;
- box_colors.length = nlegend;
- box_patterns.length = nlegend;
- box_scales.length = nlegend;
- box_line_widths.length = nlegend;
- symbol_numbers.length = nlegend;
- symbol_colors.length = nlegend;
- symbol_scales.length = nlegend;
- symbols.length = nlegend;
-
+ nlegend = cast(int) fmax( 1, nlegend );
// nly specify legend data that are required according to the
// value of opt_array for that entry.
- for ( size_t k = 0; k < nlegend; k++ )
+ for ( k = 0; k < nlegend; k++ )
{
opt_array[k] = PL_LEGEND_LINE | PL_LEGEND_SYMBOL;
line_styles[k] = 1;
@@ -347,25 +515,25 @@
symbol_scales[k] = 1.;
symbol_numbers[k] = 2;
symbols[k] = "*";
- text[k] = format( "%2.2d", k );
- text_colors[k] = 1 + ( k % 8 );
- line_colors[k] = 1 + ( k % 8 );
- symbol_colors[k] = 1 + ( k % 8 );
+ text[k] = format( "%2.2d", k );
+ text_colors[k] = 1 + ( k % 8 );
+ line_colors[k] = 1 + ( k % 8 );
+ symbol_colors[k] = 1 + ( k % 8 );
}
// Use monotype fonts so that all legends are the same size.
plsfont( PL_FCI_MONO, -1, -1 );
plscol0a( 15, 32, 32, 32, 0.70 );
- nrow = cast(PLINT) fmin( 3, nlegend );
+ nrow = cast(int)fmin( 3, nlegend );
ncolumn = 0;
pllegend( &legend_width, &legend_height, opt, position, x, y,
0.025, 15, 1, 1, nrow, ncolumn,
- opt_array, 1.0, 1.0, 1.5,
- 1., text_colors, text,
- box_colors, box_patterns, box_scales, box_line_widths,
- line_colors, line_styles, line_widths,
- symbol_colors, symbol_scales, symbol_numbers, symbols );
+ opt_array[0..nlegend], 1.0, 1.0, 1.5,
+ 1., text_colors[0..nlegend], text[0..nlegend],
+ null, null, null, null,
+ line_colors[0..nlegend], line_styles[0..nlegend], line_widths[0..nlegend],
+ symbol_colors[0..nlegend], symbol_scales[0..nlegend], symbol_numbers[0..nlegend], symbols[0..nlegend] );
if ( i == nturn )
{
@@ -396,61 +564,45 @@
plmtex( "t", 2.0, 0.5, 0.5, "Demonstrate Various Kinds of Legends" );
nlegend = 5;
- // Initialize arrays needed for pllegend.
- opt_array.length = nlegend;
- text_colors.length = nlegend;
- text.length = nlegend;
- line_colors.length = nlegend;
- line_styles.length = nlegend;
- line_widths.length = nlegend;
- box_colors.length = nlegend;
- box_patterns.length = nlegend;
- box_scales.length = nlegend;
- box_line_widths.length = nlegend;
- symbol_numbers.length = nlegend;
- symbol_colors.length = nlegend;
- symbol_scales.length = nlegend;
- symbols.length = nlegend;
-
// Only specify legend data that are required according to the
// value of opt_array for that entry.
position = PL_POSITION_LEFT | PL_POSITION_TOP;
opt_base = PL_LEGEND_BACKGROUND | PL_LEGEND_BOUNDING_BOX | PL_LEGEND_TEXT_LEFT;
// Set up None, Box, Line, Symbol, and Line & Symbol legend entries.
- opt_array[0] = PL_LEGEND_NONE;
- text[0] = format( "%s", "None" );
+ opt_array[0] = PL_LEGEND_NONE;
+ text[0] = format( "%s", "None" );
text_colors[0] = 1;
- opt_array[1] = PL_LEGEND_COLOR_BOX;
- text[1] = format( "%s", "Box" );
+ opt_array[1] = PL_LEGEND_COLOR_BOX;
+ text[1] = format( "%s", "Box" );
text_colors[1] = 2;
box_colors[1] = 2;
box_patterns[1] = 0;
box_scales[1] = 0.8;
- box_line_widths[1] = 1;
+ box_line_widths[1] = 1.;
- opt_array[2] = PL_LEGEND_LINE;
- text[2] = format( "%s", "Line" );
+ opt_array[2] = PL_LEGEND_LINE;
+ text[2] = format( "%s", "Line" );
text_colors[2] = 3;
line_colors[2] = 3;
line_styles[2] = 1;
- line_widths[2] = 1;
+ line_widths[2] = 1.;
- opt_array[3] = PL_LEGEND_SYMBOL;
- text[3] = format( "%s", "Symbol" );
+ opt_array[3] = PL_LEGEND_SYMBOL;
+ text[3] = format( "%s", "Symbol" );
text_colors[3] = 4;
symbol_colors[3] = 4;
symbol_scales[3] = text_scale;
symbol_numbers[3] = 4;
symbols[3] = special_symbols[2];
- opt_array[4] = PL_LEGEND_SYMBOL | PL_LEGEND_LINE;
- text[4] = format( "%s", "L & S" );
+ opt_array[4] = PL_LEGEND_SYMBOL | PL_LEGEND_LINE;
+ text[4] = format( "%s", "L & S" );
text_colors[4] = 5;
line_colors[4] = 5;
line_styles[4] = 1;
- line_widths[4] = 1;
+ line_widths[4] = 1.;
symbol_colors[4] = 5;
symbol_scales[4] = text_scale;
symbol_numbers[4] = 4;
@@ -461,20 +613,20 @@
pllegend( &legend_width, &legend_height, opt, position, x, y,
0.1, 15, 1, 1, 0, 0,
- opt_array, 1.0, text_scale, 2.0,
- 0., text_colors, text,
- box_colors, box_patterns, box_scales, box_line_widths,
- line_colors, line_styles, line_widths,
- symbol_colors, symbol_scales, symbol_numbers, symbols );
+ opt_array[0..nlegend], 1.0, text_scale, 2.0,
+ 0., text_colors[0..nlegend], text[0..nlegend],
+ box_colors[0..nlegend], box_patterns[0..nlegend], box_scales[0..nlegend], box_line_widths[0..nlegend],
+ line_colors[0..nlegend], line_styles[0..nlegend], line_widths[0..nlegend],
+ symbol_colors[0..nlegend], symbol_scales[0..nlegend], symbol_numbers[0..nlegend], symbols[0..nlegend] );
max_height = fmax( max_height, legend_height );
// Set up symbol legend entries with various symbols.
- for ( size_t i = 0; i < nlegend; i++ )
+ for ( i = 0; i < nlegend; i++ )
{
- opt_array[i] = PL_LEGEND_SYMBOL;
- text[i] = format( "%s%s", "Symbol ", special_symbols[i] );
- text_colors[i] = cast(PLINT) ( i + 1 );
- symbol_colors[i] = cast(PLINT) ( i + 1 );
+ opt_array[i] = PL_LEGEND_SYMBOL;
+ text[i] = format( "%s%s", "Symbol ", special_symbols[i] );
+ text_colors[i] = i + 1;
+ symbol_colors[i] = i + 1;
symbol_scales[i] = text_scale;
symbol_numbers[i] = 4;
symbols[i] = special_symbols[i];
@@ -486,22 +638,22 @@
pllegend( &legend_width, &legend_height, opt, position, x, y,
0.1, 15, 1, 1, 0, 0,
- opt_array, 1.0, text_scale, 2.0,
- 0., text_colors, text,
- box_colors, box_patterns, box_scales, box_line_widths,
- line_colors, line_styles, line_widths,
- symbol_colors, symbol_scales, symbol_numbers, symbols );
+ opt_array[0..nlegend], 1.0, text_scale, 2.0,
+ 0., text_colors[0..nlegend], text[0..nlegend],
+ null, null, null, null,
+ null, null, null,
+ symbol_colors[0..nlegend], symbol_scales[0..nlegend], symbol_numbers[0..nlegend], symbols[0..nlegend] );
max_height = fmax( max_height, legend_height );
// Set up symbol legend entries with various numbers of symbols.
- for ( size_t i = 0; i < nlegend; i++ )
+ for ( i = 0; i < nlegend; i++ )
{
- opt_array[i] = PL_LEGEND_SYMBOL;
- text[i] = format( "%s %d", "Symbol Number", i + 2 );
- text_colors[i] = cast(PLINT) ( i + 1 );
- symbol_colors[i] = cast(PLINT) ( i + 1 );
+ opt_array[i] = PL_LEGEND_SYMBOL;
+ text[i] = format( "%s %d", "Symbol Number", i + 2 );
+ text_colors[i] = i + 1;
+ symbol_colors[i] = i + 1;
symbol_scales[i] = text_scale;
- symbol_numbers[i] = cast(PLINT) ( i + 2 );
+ symbol_numbers[i] = i + 2;
symbols[i] = special_symbols[2];
}
@@ -511,23 +663,23 @@
pllegend( &legend_width, &legend_height, opt, position, x, y,
0.1, 15, 1, 1, 0, 0,
- opt_array, 1.0, text_scale, 2.0,
- 0., text_colors, text,
- box_colors, box_patterns, box_scales, box_line_widths,
- line_colors, line_styles, line_widths,
- symbol_colors, symbol_scales, symbol_numbers, symbols );
+ opt_array[0..nlegend], 1.0, text_scale, 2.0,
+ 0., text_colors[0..nlegend], text[0..nlegend],
+ null, null, null, null,
+ null, null, null,
+ symbol_colors[0..nlegend], symbol_scales[0..nlegend], symbol_numbers[0..nlegend], symbols[0..nlegend] );
max_height = fmax( max_height, legend_height );
// Set up box legend entries with various colours.
- for ( size_t i = 0; i < nlegend; i++ )
+ for ( i = 0; i < nlegend; i++ )
{
- opt_array[i] = PL_LEGEND_COLOR_BOX;
- text[i] = format( "%s %d", "Box Color", i + 1 );
- text_colors[i] = cast(PLINT) ( i + 1 );
- box_colors[i] = cast(PLINT) ( i + 1 );
+ opt_array[i] = PL_LEGEND_COLOR_BOX;
+ text[i] = format( "%s %d", "Box Color", i + 1 );
+ text_colors[i] = i + 1;
+ box_colors[i] = i + 1;
box_patterns[i] = 0;
box_scales[i] = 0.8;
- box_line_widths[i] = 1;
+ box_line_widths[i] = 1.;
}
opt = opt_base;
@@ -539,23 +691,23 @@
pllegend( &legend_width, &legend_height, opt, position, x, y,
0.1, 15, 1, 1, 0, 0,
- opt_array, 1.0, text_scale, 2.0,
- 0., text_colors, text,
- box_colors, box_patterns, box_scales, box_line_widths,
- line_colors, line_styles, line_widths,
- symbol_colors, symbol_scales, symbol_numbers, symbols );
+ opt_array[0..nlegend], 1.0, text_scale, 2.0,
+ 0., text_colors[0..nlegend], text[0..nlegend],
+ box_colors[0..nlegend], box_patterns[0..nlegend], box_scales[0..nlegend], box_line_widths[0..nlegend],
+ null, null, null,
+ null, null, null, null );
max_height = fmax( max_height, legend_height );
// Set up box legend entries with various patterns.
- for ( size_t i = 0; i < nlegend; i++ )
+ for ( i = 0; i < nlegend; i++ )
{
- opt_array[i] = PL_LEGEND_COLOR_BOX;
- text[i] = format( "%s %d", "Box Pattern", i );
+ opt_array[i] = PL_LEGEND_COLOR_BOX;
+ text[i] = format( "%s %d", "Box Pattern", i );
text_colors[i] = 2;
box_colors[i] = 2;
- box_patterns[i] = cast(PLINT) i;
+ box_patterns[i] = i;
box_scales[i] = 0.8;
- box_line_widths[i] = 1;
+ box_line_widths[i] = 1.;
}
opt = opt_base;
@@ -564,23 +716,23 @@
pllegend( &legend_width, &legend_height, opt, position, x, y,
0.1, 15, 1, 1, 0, 0,
- opt_array, 1.0, text_scale, 2.0,
- 0., text_colors, text,
- box_colors, box_patterns, box_scales, box_line_widths,
- line_colors, line_styles, line_widths,
- symbol_colors, symbol_scales, symbol_numbers, symbols );
+ opt_array[0..nlegend], 1.0, text_scale, 2.0,
+ 0., text_colors[0..nlegend], text[0..nlegend],
+ box_colors[0..nlegend], box_patterns[0..nlegend], box_scales[0..nlegend], box_line_widths[0..nlegend],
+ null, null, null,
+ null, null, null, null );
max_height = fmax( max_height, legend_height );
// Set up box legend entries with various box pattern line widths.
- for ( size_t i = 0; i < nlegend; i++ )
+ for ( i = 0; i < nlegend; i++ )
{
- opt_array[i] = PL_LEGEND_COLOR_BOX;
- text[i] = format( "%s %d", "Box Line Width", i + 1 );
+ opt_array[i] = PL_LEGEND_COLOR_BOX;
+ text[i] = format( "%s %d", "Box Line Width", i + 1 );
text_colors[i] = 2;
box_colors[i] = 2;
box_patterns[i] = 3;
box_scales[i] = 0.8;
- box_line_widths[i] = cast(PLINT) ( i + 1 );
+ box_line_widths[i] = cast(PLFLT) ( i + 1 );
}
opt = opt_base;
@@ -589,22 +741,22 @@
pllegend( &legend_width, &legend_height, opt, position, x, y,
0.1, 15, 1, 1, 0, 0,
- opt_array, 1.0, text_scale, 2.0,
- 0., text_colors, text,
- box_colors, box_patterns, box_scales, box_line_widths,
- line_colors, line_styles, line_widths,
- symbol_colors, symbol_scales, symbol_numbers, symbols );
+ opt_array[0..nlegend], 1.0, text_scale, 2.0,
+ 0., text_colors[0..nlegend], text[0..nlegend],
+ box_colors[0..nlegend], box_patterns[0..nlegend], box_scales[0..nlegend], box_line_widths[0..nlegend],
+ null, null, null,
+ null, null, null, null );
max_height = fmax( max_height, legend_height );
// Set up line legend entries with various colours.
- for ( size_t i = 0; i < nlegend; i++ )
+ for ( i = 0; i < nlegend; i++ )
{
- opt_array[i] = PL_LEGEND_LINE;
- text[i] = format( "%s %d", "Line Color", i + 1 );
- text_colors[i] = cast(PLINT) ( i + 1 );
- line_colors[i] = cast(PLINT) ( i + 1 );
+ opt_array[i] = PL_LEGEND_LINE;
+ text[i] = format( "%s %d", "Line Color", i + 1 );
+ text_colors[i] = i + 1;
+ line_colors[i] = i + 1;
line_styles[i] = 1;
- line_widths[i] = 1;
+ line_widths[i] = 1.;
}
opt = opt_base;
@@ -616,22 +768,22 @@
pllegend( &legend_width, &legend_height, opt, position, x, y,
0.1, 15, 1, 1, 0, 0,
- opt_array, 1.0, text_scale, 2.0,
- 0., text_colors, text,
- box_colors, box_patterns, box_scales, box_line_widths,
- line_colors, line_styles, line_widths,
- symbol_colors, symbol_scales, symbol_numbers, symbols );
+ opt_array[0..nlegend], 1.0, text_scale, 2.0,
+ 0., text_colors[0..nlegend], text[0..nlegend],
+ null, null, null, null,
+ line_colors[0..nlegend], line_styles[0..nlegend], line_widths[0..nlegend],
+ null, null, null, null );
max_height = fmax( max_height, legend_height );
// Set up line legend entries with various styles.
- for ( size_t i = 0; i < nlegend; i++ )
+ for ( i = 0; i < nlegend; i++ )
{
- opt_array[i] = PL_LEGEND_LINE;
- text[i] = format( "%s %d", "Line Style", i + 1 );
+ opt_array[i] = PL_LEGEND_LINE;
+ text[i] = format( "%s %d", "Line Style", i + 1 );
text_colors[i] = 2;
line_colors[i] = 2;
- line_styles[i] = cast(PLINT) ( i + 1 );
- line_widths[i] = 1;
+ line_styles[i] = i + 1;
+ line_widths[i] = 1.;
}
opt = opt_base;
@@ -640,22 +792,22 @@
pllegend( &legend_width, &legend_height, opt, position, x, y,
0.1, 15, 1, 1, 0, 0,
- opt_array, 1.0, text_scale, 2.0,
- 0., text_colors, text,
- box_colors, box_patterns, box_scales, box_line_widths,
- line_colors, line_styles, line_widths,
- symbol_colors, symbol_scales, symbol_numbers, symbols );
+ opt_array[0..nlegend], 1.0, text_scale, 2.0,
+ 0., text_colors[0..nlegend], text[0..nlegend],
+ null, null, null, null,
+ line_colors[0..nlegend], line_styles[0..nlegend], line_widths[0..nlegend],
+ null, null, null, null );
max_height = fmax( max_height, legend_height );
// Set up line legend entries with various widths.
- for ( size_t i = 0; i < nlegend; i++ )
+ for ( i = 0; i < nlegend; i++ )
{
- opt_array[i] = PL_LEGEND_LINE;
- text[i] = format( "%s %d", "Line Width", i + 1 );
+ opt_array[i] = PL_LEGEND_LINE;
+ text[i] = format( "%s %d", "Line Width", i + 1 );
text_colors[i] = 2;
line_colors[i] = 2;
line_styles[i] = 1;
- line_widths[i] = cast(PLINT) ( i + 1 );
+ line_widths[i] = cast(PLFLT) ( i + 1 );
}
opt = opt_base;
@@ -664,13 +816,41 @@
pllegend( &legend_width, &legend_height, opt, position, x, y,
0.1, 15, 1, 1, 0, 0,
- opt_array, 1.0, text_scale, 2.0,
- 0., text_colors, text,
- box_colors, box_patterns, box_scales, box_line_widths,
- line_colors, line_styles, line_widths,
- symbol_colors, symbol_scales, symbol_numbers, symbols );
+ opt_array[0..nlegend], 1.0, text_scale, 2.0,
+ 0., text_colors[0..nlegend], text[0..nlegend],
+ null, null, null, null,
+ line_colors[0..nlegend], line_styles[0..nlegend], line_widths[0..nlegend],
+ null, null, null, null );
max_height = fmax( max_height, legend_height );
+ if ( colorbar )
+ {
+ // Color bar examples
+ PLFLT values_small[2] = [ -1.0e-200, 1.0e-200 ];
+ PLFLT values_uneven[9] = [ -1.0e-200, 2.0e-200, 2.6e-200, 3.4e-200, 6.0e-200, 7.0e-200, 8.0e-200, 9.0e-200, 10.0e-200 ];
+ PLFLT values_even[9] = [ -2.0e-200, -1.0e-200, 0.0e-200, 1.0e-200, 2.0e-200, 3.0e-200, 4.0e-200, 5.0e-200, 6.0e-200 ];
+
+ // Use unsaturated green background colour to contrast with black caps.
+ plscolbg( 70, 185, 70 );
+ // Cut out the greatest and smallest bits of the color spectrum to
+ // leave colors for the end caps.
+ plscmap1_range( 0.01, 0.99 );
+
+ // We can only test image and gradient colorbars with two element arrays
+ for ( i = 2; i < COLORBAR_KINDS; i++ )
+ {
+ plcolorbar_example( "cmap1_blue_yellow.pal", i, 0, 0, 2, values_small );
+ }
+ // Test shade colorbars with larger arrays
+ for ( i = 0; i < 2; i++ )
+ {
+ plcolorbar_example( "cmap1_blue_yellow.pal", i, 4, 2, 9, values_even );
+ }
+ for ( i = 0; i < 2; i++ )
+ {
+ plcolorbar_example( "cmap1_blue_yellow.pal", i, 0, 0, 9, values_uneven );
+ }
+ }
plend();
return 0;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2013-09-25 18:07:25
|
Revision: 12529
http://sourceforge.net/p/plplot/code/12529
Author: airwin
Date: 2013-09-25 18:07:21 +0000 (Wed, 25 Sep 2013)
Log Message:
-----------
Make clear distinction between the copyright of the contents and the copyright
of the design.
Modified Paths:
--------------
trunk/www/corefunctions.php
Modified: trunk/www/corefunctions.php
===================================================================
--- trunk/www/corefunctions.php 2013-09-25 05:44:57 UTC (rev 12528)
+++ trunk/www/corefunctions.php 2013-09-25 18:07:21 UTC (rev 12529)
@@ -34,9 +34,9 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<!--
-Copyright: Darren Hester 2006, http://www.designsbydarren.com
-License: Released Under the "Creative Commons License",
-http://creativecommons.org/licenses/by-nc/2.5/
+Copyright 2008-2010 Werner Smekal
+Copyright 2008-2011 Hazen Babcock
+Copyright 2008-2013 Alan W. Irwin
-->
<head>
@@ -81,7 +81,7 @@
function pageFooter()
{
echo ' <div id="pagefooter">';
- echo ' <p>© 2008 Plplot developer community.<br/>Design by <a href="http://DesignsByDarren.com">DesignsByDarren.com</a>, Some Rights Reserved.<br /><br/>';
+ echo ' <p>Original design by <a href="http://DesignsByDarren.com">DesignsByDarren.com</a>, Some Rights Reserved.<br/>Design modifications © 2008-2013 Plplot developer community.<br /><br/>';
echo ' <a href="http://validator.w3.org/check?uri=referer"><img style="border:0;width:88px;height:31px" src="http://www.w3.org/Icons/valid-xhtml10" alt="Valid XHTML 1.0 Transitional" /></a>';
echo ' <a href="http://jigsaw.w3.org/css-validator/check?uri=referer"><img style="border:0;width:88px;height:31px" src="http://jigsaw.w3.org/css-validator/images/vcss" alt="Valid CSS!" /></a>';
echo ' </p>';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2013-09-25 05:45:02
|
Revision: 12528
http://sourceforge.net/p/plplot/code/12528
Author: airwin
Date: 2013-09-25 05:44:57 +0000 (Wed, 25 Sep 2013)
Log Message:
-----------
Update news feed location to be consistent with Allura version
of SourceForge.
N.B. This change does not deal with the remaining news sidebar issues
mentioned on list (too many news items, broken rendering of each
webpage with the sidebar, old version of simplepie software).
Modified Paths:
--------------
trunk/www/corefunctions.php
Modified: trunk/www/corefunctions.php
===================================================================
--- trunk/www/corefunctions.php 2013-09-25 04:34:57 UTC (rev 12527)
+++ trunk/www/corefunctions.php 2013-09-25 05:44:57 UTC (rev 12528)
@@ -65,7 +65,7 @@
echo ' <div id="menubar">';
echo ' <ul>';
echo ' <li><a href="index.php" ' . (($item=='index') ? ('id="selected"') : ('')) .'>Home</a></li>';
- echo ' <li><a href="http://sourceforge.net/news/?group_id=2915" ' . (($item=='news') ? ('id="selected"') : ('')) .'>News</a></li>';
+ echo ' <li><a href="http://sourceforge.net/p/plplot/news" ' . (($item=='news') ? ('id="selected"') : ('')) .'>News</a></li>';
echo ' <li><a href="download.php" ' . (($item=='download') ? ('id="selected"') : ('')) .'>Download</a></li>';
echo ' <li><a href="examples.php" ' . (($item=='examples') ? ('id="selected"') : ('')) .'>Examples</a></li>';
echo ' <li><a href="documentation.php" ' . (($item=='documentation') ? ('id="selected"') : ('')) .'>Documentation</a></li>';
@@ -98,7 +98,10 @@
// Open the PLplot News RSS feed and parse it
$feed = new SimplePie();
$feed->enable_cache(false); // disable cache
- $url = sprintf("http://sourceforge.net/export/rss2_projnews.php?group_id=2915&rss_limit=%d", $newscount);
+// This old url just redirects to the correct one below (without
+// rss_limit).
+// $url = sprintf("http://sourceforge.net/export/rss2_projnews.php?group_id=2915&rss_limit=%d", $newscount);
+ $url = sprintf("http://sourceforge.net/p/plplot/news/feed");
$feed->set_feed_url($url);
$feed->init();
$feed->handle_content_type();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jb...@us...> - 2013-09-25 04:35:02
|
Revision: 12527
http://sourceforge.net/p/plplot/code/12527
Author: jbauck
Date: 2013-09-25 04:34:57 +0000 (Wed, 25 Sep 2013)
Log Message:
-----------
Update Ada docs.
Modified Paths:
--------------
trunk/doc/docbook/src/ada.xml
Modified: trunk/doc/docbook/src/ada.xml
===================================================================
--- trunk/doc/docbook/src/ada.xml 2013-09-25 02:16:25 UTC (rev 12526)
+++ trunk/doc/docbook/src/ada.xml 2013-09-25 04:34:57 UTC (rev 12527)
@@ -227,7 +227,7 @@
<sect1 id="ada_examples">
<title>The Examples</title>
- <para>An important part of the Ada bindings is the examples, some 30 of
+ <para>An important part of the Ada bindings is the examples, some 33 of
which demonstrate how to use many of the features of the PLplot package.
These examples also serve as a test bed for the bindings in Ada and other
languages by checking the Postscript files that are generated by each
@@ -277,18 +277,16 @@
url="http://sourceforge.net/projects/plplot">sourceforge.net</ulink>.
Follow the installation instructions after downloading. The installation
process requires that your computer has CMake installed. OS X users can
- try installing PLplot in its entirety from MacPorts but that activity is
- not officially supported by the PLplot developers. The advantage of
+ try installing PLplot in its entirety from MacPorts. The advantage of
using MacPorts is that all installation dependencies are automatically
installed for you.</para>
</sect2>
<sect2 id="ada_obtaining_bindings">
- <title>Download the Ada bindings to PLplot</title>
+ <title>The Ada bindings to PLplot</title>
- <para>The third major software component is the bindings themselves.
- Since they are currently included with the PLplot software itself, there
- is no need to download them from another place.</para>
+ <para>The third major software component is the bindings themselves;
+ they are included with the PLplot software itself.</para>
<para>The bindings themselves are six Ada source files named (using GNAT
filename extensions) <literal>plplot.ads</literal>,
@@ -298,8 +296,7 @@
<literal>plplothin.ads</literal>, and <literal>plplotthin.adb</literal>.
There are two additional files, <literal>plplot_auxiliary.ads</literal>
and <literal>plplot_auxililary.adb</literal> which will be discussed
- later, in Section 9. These can be stored somewhere on your system's
- search paths for easy access.</para>
+ later, in Section 9.</para>
</sect2>
</sect1>
@@ -328,18 +325,22 @@
to these types and in the process require linking to the BLAS and LAPACK
numerical libraries.</para>
- <para>For users who wish to either attain compatibility with Ada 2005
- Annex G.3 or to access its features which actually depend on BLAS and
- LAPACK, there are two routes. One is to build PLplot normally and then to
- edit <literal>PLplot_Auxiliary.ads</literal> as is indicated in that
- file. This is a very simple process requiring commenting two lines and
- uncommenting three lines. Then recompile only the Ada bindings and use
- the newly-created compiled files in the user project. The other way is
- to type-convert the <literal>Real_Vector</literal> and
- <literal>Real_Matrix</literal> objects in the user program so that they
- are compatible with the declarations of Annex G.3 when accessing the
- numerical functionality in that annex. (In GNAT, the relevant file is
- <literal>a-nlrear.ads</literal>.)</para>
+ <para>Ada 2005 introduced an annex G.3 which formally defines vector and
+ matrix support to Ada, along with some common mathematical operations on
+ those types. (This feature is a specific to vectors and matrices and
+ extends the usual array apparatus.) The Ada PLplot user has a choice on how
+ to deal with this. The default, as described in
+ <literal>PLplot_Auxiliary.ads</literal>,
+ has <literal>Real_Vector</literal> and <literal>Real_Matrix</literal>
+ declared therein, separate from the Ada 2005 declarations. This allows the
+ widest compatibility and does not require an Ada 2005 compiler. However,
+ many users will want to gain the benefit of the built-in declarations of
+ 2005. This is easily done: Read the short comments in
+ <literal>PLplot_Auxiliary.ads</literal> on how to comment-out two lines and
+ uncomment three lines. Either configuration will compile correctly, but
+ depending on the Cmake configuration to expose a 2005 compiler in the later
+ case. (Note that at some points in the documentation, Ada 2005 is referred
+ to as Ada 2007, including some Cmake flags.)</para>
<para>This policy was changed in SVN version 11153. Before this, the
type of compiler (Ada 95 or Ada 2005) had to be specified at the time
@@ -948,6 +949,9 @@
sure to contact the very friendly Macintosh Ada mailing list at <ulink
url="http://www.macada.org/">www.macada.org</ulink> or study the FAQ at
that same site if you have any difficulties.</para>
+
+ <para>[This plug-in still works for some older versions of Xcode but not
+ for newer versions, as of 2013.]</para>
</sect2>
<sect2>
@@ -968,28 +972,21 @@
<title>X11</title>
<para>Apple supplies the X11 windowing system that is popular on some
- other Unix and Linux operations systems as part of the Developer Tools.
+ other Unix and Linux operations systems. Formerly it was available as part
+ of the Developer Tools but as of OS X 10.8 it is a separate installation.
All PLplot programs made with the Ada bindings will run on X11. In fact,
- some types of interactivity such as Examples 14 and 17 will not run on
- Apple's X11 (as of OS X 10.4 at least) and must be run on X11 (or some
- other output device such as TCL/TK).</para>
+ some types of interactivity such as Example 17 will not run on
+ Apple's Terminal.app and should be run on X11 (or
+ some other output device such as TCL/TK).</para>
</sect2>
<sect2>
<title>GNAT for OS X</title>
- <para>Apple Macintosh users will benefit from a pre-built version of
- GNAT that comes packaged using the usual Apple software installer and is
- strongly recommended. This compiler is available for both PowerPC and
- Intel Macintoshes at <ulink
- url="http://www.macada.org/macada/Welcome.html">www.macada.org</ulink>.
- This site is traditionally rather confusing but the mailing list is
- extremely helpful. The installer also includes an Ada-specific plug-in
- for Apple's Xcode IDE which is strongly recommended if you plan to work
- on this platform. Xcode is part of the Developer Tools and is available
- on the Apple system disks that also contain the operating system or it
- can be downloaded for free from <ulink
- url="http://developer.apple.com/tools/xcode/">here</ulink>.</para>
+ <para>A web site for OS X users is at <ulink
+ url="http://www.macada.org/macada/Welcome.html">www.macada.org</ulink>.
+ Although rather dated, the mailing list is still active. Assistance can be
+ found at other places on the web including the usenet comp.lang.ada.</para>
</sect2>
</sect1>
</chapter>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jb...@us...> - 2013-09-25 02:16:30
|
Revision: 12526
http://sourceforge.net/p/plplot/code/12526
Author: jbauck
Date: 2013-09-25 02:16:25 +0000 (Wed, 25 Sep 2013)
Log Message:
-----------
Update copyright dates for Ada binding. Fix "redacted" form in docs for plcolorbar.
Modified Paths:
--------------
trunk/bindings/ada/plplot_thin.adb
trunk/bindings/ada/plplot_thin.ads
trunk/doc/docbook/src/api.xml
Modified: trunk/bindings/ada/plplot_thin.adb
===================================================================
--- trunk/bindings/ada/plplot_thin.adb 2013-09-24 22:21:20 UTC (rev 12525)
+++ trunk/bindings/ada/plplot_thin.adb 2013-09-25 02:16:25 UTC (rev 12526)
@@ -2,7 +2,7 @@
-- Thin Ada binding to PLplot
--- Copyright (C) 2006-2007 Jerry Bauck
+-- Copyright (C) 2006-2013 Jerry Bauck
-- This file is part of PLplot.
Modified: trunk/bindings/ada/plplot_thin.ads
===================================================================
--- trunk/bindings/ada/plplot_thin.ads 2013-09-24 22:21:20 UTC (rev 12525)
+++ trunk/bindings/ada/plplot_thin.ads 2013-09-25 02:16:25 UTC (rev 12526)
@@ -2,7 +2,7 @@
-- Thin Ada binding to PLplot
--- Copyright (C) 2006-2007 Jerry Bauck
+-- Copyright (C) 2006-2013 Jerry Bauck
-- This file is part of PLplot.
Modified: trunk/doc/docbook/src/api.xml
===================================================================
--- trunk/doc/docbook/src/api.xml 2013-09-24 22:21:20 UTC (rev 12525)
+++ trunk/doc/docbook/src/api.xml 2013-09-25 02:16:25 UTC (rev 12526)
@@ -2308,7 +2308,7 @@
</variablelist>
<para>
- Redacted form: <function>plcolorbar(p_legend_width, p_legend_height,
+ Redacted form: <function>plcolorbar(p_colorbar_width, p_colorbar_height,
opt, position, x, y, x_length, y_length, bg_color,
bb_color, bb_style, low_cap_color, high_cap_color, cont_color, cont_width, label_opts, labels, axis_opts, ticks, sub_ticks, values)</function>
</para>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2013-09-24 22:21:23
|
Revision: 12525
http://sourceforge.net/p/plplot/code/12525
Author: airwin
Date: 2013-09-24 22:21:20 +0000 (Tue, 24 Sep 2013)
Log Message:
-----------
Fix broken URL's contained inside ulink elements of our DocBook
documentation.
Modified Paths:
--------------
trunk/doc/docbook/src/ada.xml
trunk/doc/docbook/src/deploying.xml
trunk/doc/docbook/src/drivers.xml
trunk/doc/docbook/src/intro.xml
trunk/doc/docbook/src/os_notes.xml
trunk/doc/docbook/src/perl.xml
trunk/doc/docbook/src/wish.xml
Modified: trunk/doc/docbook/src/ada.xml
===================================================================
--- trunk/doc/docbook/src/ada.xml 2013-09-24 16:51:13 UTC (rev 12524)
+++ trunk/doc/docbook/src/ada.xml 2013-09-24 22:21:20 UTC (rev 12525)
@@ -957,10 +957,10 @@
using OS X and is supported by PLplot. It is a native Cocoa graphics
"terminal" that is highly recommended. All output is antialiased and is
easily cut-and-pasted in OS X's native PDF format. Get it <ulink
- url="http://sourceforge.net/project/showfiles.php?group_id=39915">here</ulink>.
+ url="http://sourceforge.net/projects/aquaterm/files">here</ulink>.
It can also be installed from either the <ulink
- url="http://www.finkproject.org/">Fink</ulink> or <ulink
- url="http://www.macports.org/projects.">MacPorts</ulink>
+ url="http://fink.thetis.ig42.org/">Fink</ulink> or <ulink
+ url="http://www.macports.org/">MacPorts</ulink>
projects.</para>
</sect2>
@@ -982,7 +982,7 @@
GNAT that comes packaged using the usual Apple software installer and is
strongly recommended. This compiler is available for both PowerPC and
Intel Macintoshes at <ulink
- url="http://www.macada.org/macada/Welcome.html.">www.macada.org</ulink>.
+ url="http://www.macada.org/macada/Welcome.html">www.macada.org</ulink>.
This site is traditionally rather confusing but the mailing list is
extremely helpful. The installer also includes an Ada-specific plug-in
for Apple's Xcode IDE which is strongly recommended if you plan to work
Modified: trunk/doc/docbook/src/deploying.xml
===================================================================
--- trunk/doc/docbook/src/deploying.xml 2013-09-24 16:51:13 UTC (rev 12524)
+++ trunk/doc/docbook/src/deploying.xml 2013-09-24 22:21:20 UTC (rev 12525)
@@ -88,7 +88,7 @@
user's machine is to use PLplot deb binary packages for the <ulink
url="http://www.debian.org">Debian</ulink> distribution, and PLplot rpm
binary packages for rpm-based distributions. (See the <ulink
- url="http://plplot.sourceforge.net/resources/index.html">Resources
+ url="http://plplot.sourceforge.net/download.php">download
area</ulink> of the PLplot web site for locations of debs and rpms.)
Build the application on the build machine using the results of the
<userinput>pkg-config --cflags --libs plplotd</userinput> command, and copy
Modified: trunk/doc/docbook/src/drivers.xml
===================================================================
--- trunk/doc/docbook/src/drivers.xml 2013-09-24 16:51:13 UTC (rev 12524)
+++ trunk/doc/docbook/src/drivers.xml 2013-09-24 22:21:20 UTC (rev 12525)
@@ -239,8 +239,8 @@
<para>
A basic version of a pdf driver has been added to PLplot. This driver
is based on the libharu library see:
- <ulink url="http://libharu.sourceforge.net/">
- http://libharu.sourceforge.net/</ulink>.
+ <ulink url="http://libharu.org/">
+ libharu.org</ulink>.
At present only the Hershey fonts are used and there is no support for
pdf or ttf fonts. Compression of the pdf output is not enabled and the
paper size can't be chosen. All these issues will be addressed in
@@ -312,8 +312,8 @@
to work. The pango and pangoft2 libraries are widely distributed
with most Linux distributions and give the psttf driver full complex
text layout (CTL) capability (see
- <ulink url="http://plplot.sourceforge.net/examples/demo24.php">
- http://plplot.sourceforge.net/examples/demo24.php</ulink>
+ <ulink url="http://plplot.sourceforge.net/examples.php?demo=24">
+ http://plplot.sourceforge.net/examples.php?demo=24</ulink>
for an example of this capability). The LASi library is not part of
most distributions at this time. The source code can be downloaded
from http://www.unifont.org/lasi/. The library is small and easy to
Modified: trunk/doc/docbook/src/intro.xml
===================================================================
--- trunk/doc/docbook/src/intro.xml 2013-09-24 16:51:13 UTC (rev 12524)
+++ trunk/doc/docbook/src/intro.xml 2013-09-24 22:21:20 UTC (rev 12525)
@@ -195,7 +195,7 @@
to make the desired PLplot calls. Example programs in C, C++,
Fortran77, Fortran95 and Java are included as a guide.
Plots generated from the example programs are shown
- <ulink url="http://&PLplot-website;/examples/index.html">here</ulink>.
+ <ulink url="http://&PLplot-website;/examples.php">here</ulink>.
</para>
<para>
You will then need to compile your program and link it with the
Modified: trunk/doc/docbook/src/os_notes.xml
===================================================================
--- trunk/doc/docbook/src/os_notes.xml 2013-09-24 16:51:13 UTC (rev 12524)
+++ trunk/doc/docbook/src/os_notes.xml 2013-09-24 22:21:20 UTC (rev 12525)
@@ -69,7 +69,7 @@
</para>
<para>
The longer (CMake) story is currently documented <ulink
- url="http://www.miscdebris.net/plplot_wiki/index.php?title=Main_Page#Building_PLplot_with_our_new_CBS">here</ulink>.
+ url="http://www.miscdebris.net/plplot_wiki/index.php?title=Building_PLplot">here</ulink>.
The eventual plan is to incorporate that material in this documentation,
but we haven't done it yet so this section NEEDS DOCUMENTATION.
</para>
@@ -92,8 +92,8 @@
<sect2>
<title>Windows Configure and Build</title>
<para>
- This (CMake) story currently documented <ulink
- url="http://www.miscdebris.net/plplot_wiki/index.php?title=Main_Page#Windows">here</ulink>.
+ This (CMake) story is currently documented <ulink
+ url="http://www.miscdebris.net/plplot_wiki/index.php?title=Specifics_for_various_platforms#Windows">here</ulink>.
The eventual plan is to incorporate that material into this documentation,
but we haven't done it yet so this section NEEDS DOCUMENTATION.
</para>
Modified: trunk/doc/docbook/src/perl.xml
===================================================================
--- trunk/doc/docbook/src/perl.xml 2013-09-24 16:51:13 UTC (rev 12524)
+++ trunk/doc/docbook/src/perl.xml 2013-09-24 22:21:20 UTC (rev 12525)
@@ -99,7 +99,7 @@
There is also a Perl PLplot interface on <ulink
url="http://www.cpan.org">CPAN</ulink> which is not dependent on PDL.
The Perl module is called <ulink
- url="http://search.cpan.org/%7Etjenness/">Graphics::PLplot</ulink> and is
+ url="http://search.cpan.org/~tjenness/Graphics-PLplot/">Graphics::PLplot</ulink> and is
appropriate for small data arrays. The API is very similar to the C
API except that if the number of elements in an array is required by
the C function the perl interface calculates it automatically. Also,
Modified: trunk/doc/docbook/src/wish.xml
===================================================================
--- trunk/doc/docbook/src/wish.xml 2013-09-24 16:51:13 UTC (rev 12524)
+++ trunk/doc/docbook/src/wish.xml 2013-09-24 22:21:20 UTC (rev 12525)
@@ -141,30 +141,13 @@
<para>
There are several important sources of info and code for Tcl.
- Definitely get the book mentioned above. The Tcl and Tk toolkits
- are distributed by anonymous <command>ftp</command> at <ulink
- url="ftp://sprite.berkeley.edu/tcl"><filename>sprite.berkeley.edu:/tcl</filename></ulink>.
- There are several files in there corresponding to Tcl, Tk, and
- various forms of documentation. At the time of this writing, the
- current versions of Tcl and Tk are 7.3 and 3.6 respectively.
- Retrieve those files, and install using the instructions provided
- therein.
+ Definitely get the book mentioned above, and the source code for the
+ Tcl and Tk toolkits can be downloaded from <ulink
+ url="http://www.tcl.tk/software/tcltk/download.html">The Tcl developer
+ Xchange</ulink>.
</para>
<para>
- The other major anonymous <command>ftp</command> site for Tcl is
- <ulink
- url="ftp://harbor.ecn.purdue.edu/pub/tcl"><filename>harbor.ecn.purdue.edu:/pub/tcl</filename></ulink>.
- Harbor contains a mirror of <literal>sprite</literal> as well as
- innumerable extensions, Tcl/Tk packages, tutorials, documentation,
- etc. The level of excitement in the Tcl community is
- extraordinarily high, and this is reflected by the great plethora
- of available, high quality, packages and extensions available for
- use with Tcl and Tk. Explore—there is definitely something
- for everyone.
- </para>
-
- <para>
Additionally there is a newsgroup, <literal>comp.lang.tcl</literal>
which is well read, and an excellent place for people to get
oriented, find help, etc. Highly recommended.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2013-09-24 16:51:18
|
Revision: 12524
http://sourceforge.net/p/plplot/code/12524
Author: airwin
Date: 2013-09-24 16:51:13 +0000 (Tue, 24 Sep 2013)
Log Message:
-----------
Fix broken links for the sidebar that occurs for all pages and for the principal
page and the download page.
Modified Paths:
--------------
trunk/www/corefunctions.php
trunk/www/download.php
trunk/www/index.php
Modified: trunk/www/corefunctions.php
===================================================================
--- trunk/www/corefunctions.php 2013-09-24 10:27:16 UTC (rev 12523)
+++ trunk/www/corefunctions.php 2013-09-24 16:51:13 UTC (rev 12524)
@@ -141,14 +141,14 @@
<li><a href="http://www.miscdebris.net/plplot_wiki">Wiki</a></li>
<li><a href="http://sourceforge.net/projects/plplot">SourceForge Project Page</a></li>
<li><a href="http://sourceforge.net/projects/plplot/support">Project Support Page</a></li>
- <li><a href="http://sourceforge.net/mail/?group_id=2915">Mailing Lists</a></li>
- <li><a href="http://sourceforge.net/tracker/?group_id=2915&tid=102915">Bug Tracker</a></li>
+ <li><a href="http://sourceforge.net/p/plplot/mailman/">Mailing Lists</a></li>
+ <li><a href="http://sourceforge.net/p/plplot/bugs/">Bug Tracker</a></li>
</ul>
<h3>Source Code</h3>
<ul class="arrowlist">
- <li><a href="http://sourceforge.net/project/showfiles.php?group_id=2915&package_id=2865">Download</a></li>
- <li><a href="http://sourceforge.net/svn/?group_id=2915">SVN Repository</a></li>
- <li><a href="http://plplot.svn.sourceforge.net/viewvc/plplot/">Browse SVN</a></li>
+ <li><a href="http://sourceforge.net/projects/plplot/files/plplot/">Download</a></li>
+ <li><a href="http://svn.code.sf.net/p/plplot/code/trunk/">SVN Repository</a></li>
+ <li><a href="http://sourceforge.net/p/plplot/code/HEAD/tree/">Browse SVN</a></li>
</ul>
</div>
Modified: trunk/www/download.php
===================================================================
--- trunk/www/download.php 2013-09-24 10:27:16 UTC (rev 12523)
+++ trunk/www/download.php 2013-09-24 16:51:13 UTC (rev 12524)
@@ -14,23 +14,23 @@
<div id="leftside">
<h3>Obtain the source code of the PLplot library</h3>
<p>You can obtain the latest stable version of PLplot from our
- <a href="http://sourceforge.net/project/showfiles.php?group_id=2915&package_id=2865">file
+ <a href="http://sourceforge.net/projects/plplot/files/plplot/">file
release site</a>. Alternatively, you can obtain the cutting-edge version of
PLplot (but with no promises about stability) from SVN via anonymous
- access to our <a href="http://sourceforge.net/svn/?group_id=2915">
+ access to our <a href="http://svn.code.sf.net/p/plplot/code/trunk/">
SVN repository</a>. Finally, you can browse our SVN repository
- <a href="http://plplot.svn.sourceforge.net/viewvc/plplot/">
+ <a href="http://sourceforge.net/p/plplot/code/HEAD/tree/">
here</a>.</p>
<h3>Subversion Access</h3>
<p>The PLplot Subversion repository can be checked out on the command line through svn
with the following instruction set:</p>
- <p><tt>svn co https://plplot.svn.sourceforge.net/svnroot/plplot/trunk plplot</tt></p>
+ <p><tt>svn checkout http://svn.code.sf.net/p/plplot/code/trunk plplot</tt></p>
<p>Here is a partial list of subversion clients</p>
<ul class="arrowlist">
- <li><a href="http://www.lachoseinteractive.net/en/community/subversion/svnx/features/">SvnX (Mac OS X)</a></li>
+ <li><a href="http://code.google.com/p/svnx/">SvnX (Mac OS X)</a></li>
<li><a href="http://tortoisesvn.tigris.org/">TortoiseSVN (Windows)</a></li>
- <li><a href="http://kdesvn.alwins-world.de/wiki">KDESvn (Linux)</a></li>
+ <li><a href="http://kdesvn.alwins-world.de/">KDESvn (Linux)</a></li>
<li>svn, a powerful command-line subversion client (Linux)</li>
</ul>
Modified: trunk/www/index.php
===================================================================
--- trunk/www/index.php 2013-09-24 10:27:16 UTC (rev 12523)
+++ trunk/www/index.php 2013-09-24 16:51:13 UTC (rev 12524)
@@ -45,7 +45,7 @@
<li>Lua</li>
<li>OCaml</li>
<li>Octave</li>
- <li><a href="http://search.cpan.org/~dhunt/PDL-Graphics-PLplot-0.47/plplot.pd">Perl</a></li>
+ <li><a href="http://search.cpan.org/~dhunt/PDL-Graphics-PLplot">Perl</a></li>
<li>Python</li>
<li>Tcl/Tk</li>
</ul>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jb...@us...> - 2013-09-24 10:27:22
|
Revision: 12523
http://sourceforge.net/p/plplot/code/12523
Author: jbauck
Date: 2013-09-24 10:27:16 +0000 (Tue, 24 Sep 2013)
Log Message:
-----------
Update Ada bindings and examples 16 and 33 for plcolorbar capability. Also add support for plscmap1_range and plgcmap1_range.
Modified Paths:
--------------
trunk/bindings/ada/plplot.adb
trunk/bindings/ada/plplot.ads
trunk/bindings/ada/plplot_thin.adb
trunk/bindings/ada/plplot_thin.ads
trunk/bindings/ada/plplot_traditional.adb
trunk/bindings/ada/plplot_traditional.ads
trunk/examples/ada/x16a.adb
trunk/examples/ada/x33a.adb
trunk/examples/ada/xthick16a.adb
trunk/examples/ada/xthick33a.adb
Modified: trunk/bindings/ada/plplot.adb
===================================================================
--- trunk/bindings/ada/plplot.adb 2013-09-24 05:27:13 UTC (rev 12522)
+++ trunk/bindings/ada/plplot.adb 2013-09-24 10:27:16 UTC (rev 12523)
@@ -1,8 +1,8 @@
-- $Id$
--- Thick Ada binding to PLplot
+-- Thick Ada binding to PLplot
--- Copyright (C) 2006-2011 Jerry Bauck
+-- Copyright (C) 2006-2013 Jerry Bauck
-- This file is part of PLplot.
@@ -1909,7 +1909,7 @@
X_Offset, Y_Offset : Long_Float;
Plot_Area_Width : Long_Float;
Background_Color, Bounding_Box_Color : Plot_Color_Type;
- Bounding_Box_Style : Legend_Flag_Type;
+ Bounding_Box_Style : Line_Style_Type;
Number_Rows, Number_Columns : Integer;
Entry_Options : Integer_Array_1D;
Text_Offset, Text_Scale, Text_Spacing : Long_Float;
@@ -1931,7 +1931,7 @@
PL_Label_Text, PL_Symbols : PL_Legend_String_Array(Label_Text'range);
C_Legend_String_Array : array(Label_Text'range) of PL_Legend_String;
C_Symbols_String_Array : array(Symbols'range) of PL_Legend_String;
- Dum_Text : Legend_String_Array_Type(Label_Text'range);
+ Dum_Text : Legend_String_Array_Type(Label_Text'range); --Could be a single unbounded string.
begin
-- Check that all array lengths in the argument list are the same.
L := Entry_Options'length;
@@ -1997,6 +1997,100 @@
end Create_Legend;
+ -- Routine for drawing continous colour legends
+ -- plcolorbar
+ procedure Create_Colorbar
+ (Colorbar_Width, Colorbar_Height : out Long_Float;
+ Options, Position : Integer;
+ X_Offset, Y_Offset : Long_Float;
+ X_Length, Y_Length : Long_Float;
+ Background_Color, Bounding_Box_Color : Plot_Color_Type;
+ Bounding_Box_Style : Line_Style_Type;
+ Low_Cap_Color, High_Cap_Color : Long_Float;
+ Contour_Color_For_Shade : Plot_Color_Type;
+ Contour_Width_For_Shade : Long_Float;
+ Label_Options : Integer_Array_1D;
+ Label_Text : Legend_String_Array_Type;
+ Axis_Options : Legend_String_Array_Type;
+ Tick_Spacing : Real_Vector;
+ Number_Subticks : Integer_Array_1D;
+ Number_Values : Integer_Array_1D;
+ Values : Real_Matrix)
+ is
+ Number_Labels : Integer := Label_Options'length;
+ Number_Axes : Integer := Axis_Options'length;
+ PL_Label_Text : PL_Legend_String_Array(Label_Text'range);
+ C_Legend_String_Array : array(Label_Text'range) of PL_Legend_String;
+ PL_Axis_Options : PL_Legend_String_Array(Axis_Options'range);
+ C_Axis_Options_String_Array : array(Axis_Options'range) of PL_Legend_String;
+ Dum_Text : Legend_String_Array_Type(Label_Text'range);
+ PL_Values : Long_Float_Pointer_Array(values'range(2));
+ begin
+ -- Check some array lengths.
+ if Number_Labels /= Label_Text'length then
+ Put_Line("*** WARNING: Mismatched array lengths at plcolorbar labels");
+ end if;
+ if Number_Axes /= Tick_Spacing'length or Number_Axes /= Number_Subticks'length
+ or Number_Axes /= Values'length(1) then
+ Put_Line("*** WARNING: Mismatched array lengths at plcolorbar values");
+ end if;
+
+ -- Adapt Label_Text and Axis_Options to C. See the comment at Create_Stripchart.
+ -- Adapt Label_Text first.
+ for I in Label_Text'range loop
+
+ -- Check length and adjust if necessary.
+ if Length(Label_Text(I)) >= Max_Legend_Label_Length then
+ Put_Line("*** Warning: Colorbar label was truncated to"
+ & Integer'Image(Max_Legend_Label_Length) & " characters. ***");
+ Dum_Text(I) := Head(Label_Text(I), Max_Legend_Label_Length);
+ else
+ Dum_Text(I) := Label_Text(I);
+ end if;
+
+ -- Make the C-style string with null character and spaces immediately after the text.
+ C_Legend_String_Array(I) := To_C(To_String(Dum_Text(I)
+ & Character'val(0)
+ & (Max_Legend_Label_Length - Length(Dum_Text(I))) * " "), False);
+
+ -- Set the I-th pointer in the array of pointers.
+ PL_Label_Text(I) := C_Legend_String_Array(I)'Address;
+ end loop;
+
+ -- Adapt Axis_Options next.
+ for I in Axis_Options'range loop
+
+ -- Check length and adjust if necessary.
+ if Length(Axis_Options(I)) >= Max_Legend_Label_Length then
+ Put_Line("*** Warning: Colorbar asix options label was truncated to"
+ & Integer'Image(Max_Legend_Label_Length) & " characters. ***");
+ Dum_Text(I) := Head(Axis_Options(I), Max_Legend_Label_Length);
+ else
+ Dum_Text(I) := Axis_Options(I);
+ end if;
+
+ -- Make the C-style string with null character and spaces immediately after the text.
+ C_Axis_Options_String_Array(I) := To_C(To_String(Dum_Text(I)
+ & Character'val(0)
+ & (Max_Legend_Label_Length - Length(Dum_Text(I))) * " "), False);
+
+ -- Set the I-th pointer in the array of pointers.
+ PL_Axis_Options(I) := C_Axis_Options_String_Array(I)'Address;
+ end loop;
+
+ -- Adapt values in a similar way as Label_Text: make an array of pointers to Real_Vector.
+ -- We need to transpose because we present the Values matrix to the user as described in the
+ -- PLplot documentation for plcolorbar as rows indexing axes and columns indexing the axis
+ -- values, and Matrix_To_Pointers wants things the other way.
+ PL_Values := Matrix_To_Pointers(PLplot_Thin.PL_Transpose(Values));
+ PLplot_Thin.plcolorbar(Colorbar_Width, Colorbar_Height, Options, Position, X_Offset,
+ Y_Offset, X_Length, Y_Length, Background_Color, Bounding_Box_Color, Bounding_Box_Style,
+ Low_Cap_Color, High_Cap_Color, Contour_Color_For_Shade, Contour_Width_For_Shade,
+ Number_Labels, Label_Options, PL_Label_Text, Number_Axes,
+ PL_Axis_Options, Tick_Spacing, Number_Subticks, Number_Values, PL_Values);
+ end Create_Colorbar;
+
+
-- Sets position of the light source
-- pllightsource
procedure Set_Light_Source
@@ -2562,6 +2656,22 @@
begin
plscmap1n(Number_Of_Colors);
end Set_Number_Of_Colors_In_Color_Map_1;
+
+
+ -- Set the color map 1 range used in continuous plots.
+ -- plscmap1_range
+ procedure Set_Color_Map_1_Range(Min_Color, Max_Color : Long_Float) is
+ begin
+ plscmap1_range(Min_Color, Max_Color);
+ end Set_Color_Map_1_Range;
+
+
+ -- Get the color map 1 range used in continuous plots
+ -- plgcmap1_range
+ procedure Get_Color_Map_1_Range(Min_Color : out Long_Float; Max_Color : out Long_Float) is
+ begin
+ plgcmap1_range(Min_Color, Max_Color);
+ end Get_Color_Map_1_Range;
-- Set a given color from color map 0 by 8 bit RGB value
Modified: trunk/bindings/ada/plplot.ads
===================================================================
--- trunk/bindings/ada/plplot.ads 2013-09-24 05:27:13 UTC (rev 12522)
+++ trunk/bindings/ada/plplot.ads 2013-09-24 10:27:16 UTC (rev 12523)
@@ -2,7 +2,7 @@
-- Thick Ada binding to PLplot
--- Copyright (C) 2006-2011 Jerry Bauck
+-- Copyright (C) 2006-2013 Jerry Bauck
-- This file is part of PLplot.
@@ -201,28 +201,42 @@
Legend_Row_Major : constant Legend_Flag_Type := PL_Legend_Row_Major;
-- Flags for plcolorbar (duplicated from plplot_thin.ads)
- PL_Colorbar_Label_Left : constant Colorbar_Flag_Type := 1;
- PL_Colorbar_Label_Right : constant Colorbar_Flag_Type := 2;
- PL_Colorbar_Label_Top : constant Colorbar_Flag_Type := 4;
- PL_Colorbar_Label_Bottom : constant Colorbar_Flag_Type := 8;
- PL_Colorbar_Image : constant Colorbar_Flag_Type := 16;
- PL_Colorbar_Shade : constant Colorbar_Flag_Type := 32;
- PL_Colorbar_Gradient : constant Colorbar_Flag_Type := 64;
- PL_Colorbar_Cap_Low : constant Colorbar_Flag_Type := 128;
- PL_Colorbar_Cap_High : constant Colorbar_Flag_Type := 256;
- PL_Colorbar_Shade_Label : constant Colorbar_Flag_Type := 512;
+ PL_Colorbar_Label_Left : constant Colorbar_Flag_Type := 1;
+ PL_Colorbar_Label_Right : constant Colorbar_Flag_Type := 2;
+ PL_Colorbar_Label_Top : constant Colorbar_Flag_Type := 4;
+ PL_Colorbar_Label_Bottom : constant Colorbar_Flag_Type := 8;
+ PL_Colorbar_Image : constant Colorbar_Flag_Type := 16;
+ PL_Colorbar_Shade : constant Colorbar_Flag_Type := 32;
+ PL_Colorbar_Gradient : constant Colorbar_Flag_Type := 64;
+ PL_Colorbar_Cap_None : constant Colorbar_Flag_Type := 128;
+ PL_Colorbar_Cap_Low : constant Colorbar_Flag_Type := 256;
+ PL_Colorbar_Cap_High : constant Colorbar_Flag_Type := 512;
+ PL_Colorbar_Shade_Label : constant Colorbar_Flag_Type := 1024;
+ PL_Colorbar_Orient_Right : constant Colorbar_Flag_Type := 2048;
+ PL_Colorbar_Orient_Top : constant Colorbar_Flag_Type := 4096;
+ PL_Colorbar_Orient_Left : constant Colorbar_Flag_Type := 8192;
+ PL_Colorbar_Orient_Bottom : constant Colorbar_Flag_Type := 16384;
+ PL_Colorbar_Background : constant Colorbar_Flag_Type := 32768;
+ PL_Colorbar_Bounding_Box : constant Colorbar_Flag_Type := 65536;
-- Renamed flags for plcolorbar
- Colorbar_Label_Left : constant Colorbar_Flag_Type := PL_Colorbar_Label_Left;
- Colorbar_Label_Right : constant Colorbar_Flag_Type := PL_Colorbar_Label_Right;
- Colorbar_Label_Top : constant Colorbar_Flag_Type := PL_Colorbar_Label_Top;
- Colorbar_Label_Bottom : constant Colorbar_Flag_Type := PL_Colorbar_Label_Bottom;
- Colorbar_Image : constant Colorbar_Flag_Type := PL_Colorbar_Image;
- Colorbar_Shade : constant Colorbar_Flag_Type := PL_Colorbar_Shade;
- Colorbar_Gradient : constant Colorbar_Flag_Type := PL_Colorbar_Gradient;
- Colorbar_Cap_Low : constant Colorbar_Flag_Type := PL_Colorbar_Cap_Low;
- Colorbar_Cap_High : constant Colorbar_Flag_Type := PL_Colorbar_Cap_High;
- Colorbar_Shade_Label : constant Colorbar_Flag_Type := PL_Colorbar_Shade_Label;
+ Colorbar_Label_Left : constant Colorbar_Flag_Type := PL_Colorbar_Label_Left;
+ Colorbar_Label_Right : constant Colorbar_Flag_Type := PL_Colorbar_Label_Right;
+ Colorbar_Label_Top : constant Colorbar_Flag_Type := PL_Colorbar_Label_Top;
+ Colorbar_Label_Bottom : constant Colorbar_Flag_Type := PL_Colorbar_Label_Bottom;
+ Colorbar_Image : constant Colorbar_Flag_Type := PL_Colorbar_Image;
+ Colorbar_Shade : constant Colorbar_Flag_Type := PL_Colorbar_Shade;
+ Colorbar_Gradient : constant Colorbar_Flag_Type := PL_Colorbar_Gradient;
+ Colorbar_Cap_None : constant Colorbar_Flag_Type := PL_Colorbar_Cap_None;
+ Colorbar_Cap_Low : constant Colorbar_Flag_Type := PL_Colorbar_Cap_Low;
+ Colorbar_Cap_High : constant Colorbar_Flag_Type := PL_Colorbar_Cap_High;
+ Colorbar_Shade_Label : constant Colorbar_Flag_Type := PL_Colorbar_Shade_Label;
+ Colorbar_Orient_Right : constant Colorbar_Flag_Type := PL_Colorbar_Orient_Right;
+ Colorbar_Orient_Top : constant Colorbar_Flag_Type := PL_Colorbar_Orient_Top;
+ Colorbar_Orient_Left : constant Colorbar_Flag_Type := PL_Colorbar_Orient_Left;
+ Colorbar_Orient_Bottom : constant Colorbar_Flag_Type := PL_Colorbar_Orient_Bottom;
+ Colorbar_Background : constant Colorbar_Flag_Type := PL_Colorbar_Background;
+ Colorbar_Bounding_Box : constant Colorbar_Flag_Type := PL_Colorbar_Bounding_Box;
-- Justification for plots
subtype Justification_Type is Integer range -1..2;
@@ -1299,7 +1313,7 @@
X_Offset, Y_Offset : Long_Float;
Plot_Area_Width : Long_Float;
Background_Color, Bounding_Box_Color : Plot_Color_Type;
- Bounding_Box_Style : Legend_Flag_Type;
+ Bounding_Box_Style : Line_Style_Type;
Number_Rows, Number_Columns : Integer;
Entry_Options : Integer_Array_1D;
Text_Offset, Text_Scale, Text_Spacing : Long_Float;
@@ -1317,6 +1331,27 @@
Symbols : Legend_String_Array_Type);
+ -- Routine for drawing continous colour legends
+ -- plcolorbar
+ procedure Create_Colorbar
+ (Colorbar_Width, Colorbar_Height : out Long_Float;
+ Options, Position : Integer;
+ X_Offset, Y_Offset : Long_Float;
+ X_Length, Y_Length : Long_Float;
+ Background_Color, Bounding_Box_Color : Plot_Color_Type;
+ Bounding_Box_Style : Line_Style_Type;
+ Low_Cap_Color, High_Cap_Color : Long_Float;
+ Contour_Color_For_Shade : Plot_Color_Type;
+ Contour_Width_For_Shade : Long_Float;
+ Label_Options : Integer_Array_1D;
+ Label_Text : Legend_String_Array_Type;
+ Axis_Options : Legend_String_Array_Type;
+ Tick_Spacing : Real_Vector;
+ Number_Subticks : Integer_Array_1D;
+ Number_Values : Integer_Array_1D;
+ Values : Real_Matrix);
+
+
-- Sets position of the light source
-- pllightsource
procedure Set_Light_Source
@@ -1639,6 +1674,16 @@
procedure Set_Number_Of_Colors_In_Color_Map_1(Number_Of_Colors : Integer);
+ -- Set the color map 1 range used in continuous plots.
+ -- plscmap1_range
+ procedure Set_Color_Map_1_Range(Min_Color, Max_Color : Long_Float);
+
+
+ -- Get the color map 1 range used in continuous plots
+ -- plgcmap1_range
+ procedure Get_Color_Map_1_Range(Min_Color, Max_Color : out Long_Float);
+
+
-- Set a given color from color map 0 by 8 bit RGB value
-- plscol0
procedure Set_One_Color_Map_0
Modified: trunk/bindings/ada/plplot_thin.adb
===================================================================
--- trunk/bindings/ada/plplot_thin.adb 2013-09-24 05:27:13 UTC (rev 12522)
+++ trunk/bindings/ada/plplot_thin.adb 2013-09-24 10:27:16 UTC (rev 12523)
@@ -65,6 +65,22 @@
end Matrix_To_Pointers;
+ --------------------------------------------------------------------------------
+ -- Transpose a Matrix. --
+ --------------------------------------------------------------------------------
+
+ function PL_Transpose(A : Real_Matrix) return Real_Matrix is
+ B : Real_Matrix(A'range(2), A'range(1));
+ begin
+ for i in A'range(1) loop
+ for j in A'range(2) loop
+ B(j, i) := A(i, j);
+ end loop;
+ end loop;
+ return B;
+ end PL_Transpose;
+
+
--------------------------------------------------------------------------------
-- Functions for use from C or C++ only --
-- (Not really ;). --
Modified: trunk/bindings/ada/plplot_thin.ads
===================================================================
--- trunk/bindings/ada/plplot_thin.ads 2013-09-24 05:27:13 UTC (rev 12522)
+++ trunk/bindings/ada/plplot_thin.ads 2013-09-24 10:27:16 UTC (rev 12523)
@@ -80,6 +80,13 @@
--------------------------------------------------------------------------------
+-- Transpose a Matrix. --
+--------------------------------------------------------------------------------
+
+ function PL_Transpose(A : Real_Matrix) return Real_Matrix;
+
+
+--------------------------------------------------------------------------------
-- PLplot-specific things --
--------------------------------------------------------------------------------
@@ -1048,24 +1055,34 @@
PL_Legend_Row_Major : constant Legend_Flag_Type := 128;
-- Colorbar characteristics are chosen by adding flag values.
- subtype Colorbar_Flag_Type is Integer
- range 1 .. 1 + 2 + 4 + 8 + 16 + 32 + 64 + 128 + 256 + 512 ;
+ subtype Colorbar_Flag_Type is Integer range 1 .. 1 + 2 + 4 + 8 + 16 + 32 + 64 + 128 + 256 +
+ 512 + 1024 + 2048 + 4096 + 8192 + 16384 + 32768 + 65536;
-- Flags for plcolorbar
- PL_Colorbar_Label_Left : constant Integer := 1;
- PL_Colorbar_Label_Right : constant Integer := 2;
- PL_Colorbar_Label_Top : constant Integer := 4;
- PL_Colorbar_Label_Bottom : constant Integer := 8;
- PL_Colorbar_Image : constant Integer := 16;
- PL_Colorbar_Shade : constant Integer := 32;
- PL_Colorbar_Gradient : constant Integer := 64;
- PL_Colorbar_Cap_Low : constant Integer := 128;
- PL_Colorbar_Cap_High : constant Integer := 256;
- PL_Colorbar_Shade_Label : constant Integer := 512;
+ PL_Colorbar_Label_Left : constant Colorbar_Flag_Type := 1;
+ PL_Colorbar_Label_Right : constant Colorbar_Flag_Type := 2;
+ PL_Colorbar_Label_Top : constant Colorbar_Flag_Type := 4;
+ PL_Colorbar_Label_Bottom : constant Colorbar_Flag_Type := 8;
+ PL_Colorbar_Image : constant Colorbar_Flag_Type := 16;
+ PL_Colorbar_Shade : constant Colorbar_Flag_Type := 32;
+ PL_Colorbar_Gradient : constant Colorbar_Flag_Type := 64;
+ PL_Colorbar_Cap_Low : constant Colorbar_Flag_Type := 256;
+ PL_Colorbar_Cap_High : constant Colorbar_Flag_Type := 512;
+ PL_Colorbar_Shade_Label : constant Colorbar_Flag_Type := 1024;
+ PL_Colorbar_Orient_Right : constant Colorbar_Flag_Type := 2048;
+ PL_Colorbar_Orient_Top : constant Colorbar_Flag_Type := 4096;
+ PL_Colorbar_Orient_Left : constant Colorbar_Flag_Type := 8192;
+ PL_Colorbar_Orient_Bottom : constant Colorbar_Flag_Type := 16384;
+ PL_Colorbar_Background : constant Colorbar_Flag_Type := 32768;
+ PL_Colorbar_Bounding_Box : constant Colorbar_Flag_Type := 65536;
+ -- Flags for drawing mode
+ PL_Drawmode_Unknown : constant Integer := 0;
+ PL_Drawmode_Default : constant Integer := 1;
+ PL_Drawmode_Replace : constant Integer := 2;
+ PL_Drawmode_Xor : constant Integer := 4;
-- Routine for drawing discrete line, symbol, or cmap0 legends
-
procedure
pllegend
(p_legend_width : out PLFLT; p_legend_height : out PLFLT;
@@ -1088,15 +1105,19 @@
-- Routine for drawing continous colour legends
- -- procedure
- -- plcolorbar
- -- (PLINT position, PLINT opt,
- -- PLFLT x, PLFLT y, PLFLT length, PLFLT width,
- -- PLINT cont_color, PLINT cont_width,
- -- PLFLT ticks, PLINT sub_ticks,
- -- const char *axis_opts, const char *label,
- -- PLINT n_colors, PLFLT *colors, PLFLT *values);
- -- pragma Import(C, plcolorbar, "c_pllegend");
+ procedure
+ plcolorbar
+ (p_colorbar_width : out PLFLT; p_colorbar_height : out PLFLT;
+ opt : PLINT; position : PLINT; x : PLFLT; y : PLFLT;
+ x_length : PLFLT; y_length : PLFLT;
+ bg_color : PLINT; bb_color : PLINT; bb_style : PLINT;
+ low_cap_color : PLFLT; high_cap_color : PLFLT;
+ cont_color : PLINT; cont_width : PLFLT;
+ n_labels : PLINT; label_opts : PL_Integer_Array; labels : PL_Legend_String_Array;
+ n_axes : PLINT; axis_opts : PL_Legend_String_Array;
+ ticks : PL_Float_Array; sub_ticks : PL_Integer_Array;
+ n_values : PL_Integer_Array; values : Long_Float_Pointer_Array);
+ pragma Import(C, plcolorbar, "c_plcolorbar");
-- Sets position of the light source
@@ -1395,6 +1416,20 @@
pragma Import(C, plscmap1n, "c_plscmap1n");
+ -- Set the color map 1 range used in continuous plots.
+
+ procedure
+ plscmap1_range(min_color : PLFLT; max_color : PLFLT);
+ pragma Import(C, plscmap1_range, "c_plscmap1_range");
+
+
+ -- Get the color map 1 range used in continuous plots
+
+ procedure
+ plgcmap1_range(min_color, max_color : out PLFLT);
+ pragma Import(C, plgcmap1_range, "c_plgcmap1_range");
+
+
-- Set a given color from color map 0 by 8 bit RGB value
procedure
Modified: trunk/bindings/ada/plplot_traditional.adb
===================================================================
--- trunk/bindings/ada/plplot_traditional.adb 2013-09-24 05:27:13 UTC (rev 12522)
+++ trunk/bindings/ada/plplot_traditional.adb 2013-09-24 10:27:16 UTC (rev 12523)
@@ -2,7 +2,7 @@
-- Ada binding to PLplot using the traditional PLplot subprogram names
--- Copyright (C) 2006-2011 Jerry Bauck
+-- Copyright (C) 2006-2013 Jerry Bauck
-- This file is part of PLplot.
@@ -1840,7 +1840,7 @@
X_Offset, Y_Offset : Long_Float;
Plot_Area_Width : Long_Float;
Background_Color, Bounding_Box_Color : Plot_Color_Type;
- Bounding_Box_Style : Legend_Flag_Type;
+ Bounding_Box_Style : Line_Style_Type;
Number_Rows, Number_Columns : Integer;
Entry_Options : Integer_Array_1D;
Text_Offset, Text_Scale, Text_Spacing : Long_Float;
@@ -1888,7 +1888,7 @@
Dum_Text(I) := Label_Text(I);
end if;
- -- Make the C-style string with null character immediately after the text.
+ -- Make the C-style string with null character and spaces immediately after the text.
C_Legend_String_Array(I) := To_C(To_String(Dum_Text(I)
& Character'val(0)
& (Max_Legend_Label_Length - Length(Dum_Text(I))) * " "), False);
@@ -1909,7 +1909,7 @@
Dum_Text(I) := Symbols(I);
end if;
- -- Make the C-style string with null character immediately after the text.
+ -- Make the C-style string with null character and spaces immediately after the text.
C_Symbols_String_Array(I) := To_C(To_String(Dum_Text(I)
& Character'val(0)
& (Max_Legend_Label_Length - Length(Dum_Text(I))) * " "), False);
@@ -1928,6 +1928,99 @@
end pllegend;
+ -- Routine for drawing continous colour legends
+ procedure plcolorbar
+ (Colorbar_Width, Colorbar_Height : out Long_Float;
+ Options, Position : Integer;
+ X_Offset, Y_Offset : Long_Float;
+ X_Length, Y_Length : Long_Float;
+ Background_Color, Bounding_Box_Color : Plot_Color_Type;
+ Bounding_Box_Style : Line_Style_Type;
+ Low_Cap_Color, High_Cap_Color : Long_Float;
+ Contour_Color_For_Shade : Plot_Color_Type;
+ Contour_Width_For_Shade : Long_Float;
+ Label_Options : Integer_Array_1D;
+ Label_Text : Legend_String_Array_Type;
+ Axis_Options : Legend_String_Array_Type;
+ Tick_Spacing : Real_Vector;
+ Number_Subticks : Integer_Array_1D;
+ Number_Values : Integer_Array_1D;
+ Values : Real_Matrix)
+ is
+ Number_Labels : Integer := Label_Options'length;
+ Number_Axes : Integer := Axis_Options'length;
+ PL_Label_Text : PL_Legend_String_Array(Label_Text'range);
+ C_Legend_String_Array : array(Label_Text'range) of PL_Legend_String;
+ PL_Axis_Options : PL_Legend_String_Array(Axis_Options'range);
+ C_Axis_Options_String_Array : array(Axis_Options'range) of PL_Legend_String;
+ Dum_Text : Legend_String_Array_Type(Label_Text'range);
+ PL_Values : Long_Float_Pointer_Array(values'range(2));
+ begin
+ -- Check some array lengths.
+ if Number_Labels /= Label_Text'length then
+ Put_Line("*** WARNING: Mismatched array lengths at plcolorbar labels");
+ end if;
+ if Number_Axes /= Tick_Spacing'length or Number_Axes /= Number_Subticks'length
+ or Number_Axes /= Values'length(1) then
+ Put_Line("*** WARNING: Mismatched array lengths at plcolorbar values");
+ end if;
+
+ -- Adapt Label_Text and Axis_Options to C. See the comment at Create_Stripchart.
+ -- Adapt Label_Text first.
+ for I in Label_Text'range loop
+
+ -- Check length and adjust if necessary.
+ if Length(Label_Text(I)) >= Max_Legend_Label_Length then
+ Put_Line("*** Warning: Colorbar label was truncated to"
+ & Integer'Image(Max_Legend_Label_Length) & " characters. ***");
+ Dum_Text(I) := Head(Label_Text(I), Max_Legend_Label_Length);
+ else
+ Dum_Text(I) := Label_Text(I);
+ end if;
+
+ -- Make the C-style string with null character and spaces immediately after the text.
+ C_Legend_String_Array(I) := To_C(To_String(Dum_Text(I)
+ & Character'val(0)
+ & (Max_Legend_Label_Length - Length(Dum_Text(I))) * " "), False);
+
+ -- Set the I-th pointer in the array of pointers.
+ PL_Label_Text(I) := C_Legend_String_Array(I)'Address;
+ end loop;
+
+ -- Adapt Axis_Options next.
+ for I in Axis_Options'range loop
+
+ -- Check length and adjust if necessary.
+ if Length(Axis_Options(I)) >= Max_Legend_Label_Length then
+ Put_Line("*** Warning: Colorbar asix options label was truncated to"
+ & Integer'Image(Max_Legend_Label_Length) & " characters. ***");
+ Dum_Text(I) := Head(Axis_Options(I), Max_Legend_Label_Length);
+ else
+ Dum_Text(I) := Axis_Options(I);
+ end if;
+
+ -- Make the C-style string with null character and spaces immediately after the text.
+ C_Axis_Options_String_Array(I) := To_C(To_String(Dum_Text(I)
+ & Character'val(0)
+ & (Max_Legend_Label_Length - Length(Dum_Text(I))) * " "), False);
+
+ -- Set the I-th pointer in the array of pointers.
+ PL_Axis_Options(I) := C_Axis_Options_String_Array(I)'Address;
+ end loop;
+
+ -- Adapt values in a similar way as Label_Text: make an array of pointers to Real_Vector.
+ -- We need to transpose because we present the Values matrix to the user as described in the
+ -- PLplot documentation for plcolorbar as rows indexing axes and columns indexing the axis
+ -- values, and Matrix_To_Pointers wants things the other way.
+ PL_Values := Matrix_To_Pointers(PLplot_Thin.PL_Transpose(Values));
+ PLplot_Thin.plcolorbar(Colorbar_Width, Colorbar_Height, Options, Position, X_Offset,
+ Y_Offset, X_Length, Y_Length, Background_Color, Bounding_Box_Color, Bounding_Box_Style,
+ Low_Cap_Color, High_Cap_Color, Contour_Color_For_Shade, Contour_Width_For_Shade,
+ Number_Labels, Label_Options, PL_Label_Text, Number_Axes,
+ PL_Axis_Options, Tick_Spacing, Number_Subticks, Number_Values, PL_Values);
+ end plcolorbar;
+
+
-- Sets position of the light source
procedure pllightsource
(x : Long_Float := 1.0;
@@ -2457,8 +2550,22 @@
begin
PLplot_Thin.plscmap1n(Number_Of_Colors);
end plscmap1n;
-
+
+ -- Set the color map 1 range used in continuous plots.
+ procedure plscmap1_range(Min_Color, Max_Color : Long_Float) is
+ begin
+ PLplot_Thin.plscmap1_range(Min_Color, Max_Color);
+ end plscmap1_range;
+
+
+ -- Get the color map 1 range used in continuous plots
+ procedure plgcmap1_range(Min_Color : out Long_Float; Max_Color : out Long_Float) is
+ begin
+ PLplot_Thin.plgcmap1_range(Min_Color, Max_Color);
+ end plgcmap1_range;
+
+
-- Set a given color from color map 0 by 8 bit RGB value
procedure plscol0
(Plot_Color : Plot_Color_Type;
Modified: trunk/bindings/ada/plplot_traditional.ads
===================================================================
--- trunk/bindings/ada/plplot_traditional.ads 2013-09-24 05:27:13 UTC (rev 12522)
+++ trunk/bindings/ada/plplot_traditional.ads 2013-09-24 10:27:16 UTC (rev 12523)
@@ -2,7 +2,7 @@
-- Ada binding to PLplot using the traditional PLplot subprogram names
--- Copyright (C) 2006-2011 Jerry Bauck
+-- Copyright (C) 2006-2013 Jerry Bauck
-- This file is part of PLplot.
@@ -168,7 +168,7 @@
PL_Position_Viewport : constant Legend_Colorbar_Position_Type := 64;
PL_Position_Subpage : constant Legend_Colorbar_Position_Type := 128;
- --Renamed flags used for position argument of both pllegend and plcolorbar
+ -- Renamed flags used for position argument of both pllegend and plcolorbar
Legend_Position_Left : constant Legend_Colorbar_Position_Type := PL_Position_Left;
Legend_Position_Right : constant Legend_Colorbar_Position_Type := PL_Position_Right;
Legend_Position_Top : constant Legend_Colorbar_Position_Type := PL_Position_Top;
@@ -199,28 +199,42 @@
Legend_Row_Major : constant Legend_Flag_Type := PL_Legend_Row_Major;
-- Flags for plcolorbar (duplicated from plplot_thin.ads)
- PL_Colorbar_Label_Left : constant Colorbar_Flag_Type := 1;
- PL_Colorbar_Label_Right : constant Colorbar_Flag_Type := 2;
- PL_Colorbar_Label_Top : constant Colorbar_Flag_Type := 4;
- PL_Colorbar_Label_Bottom : constant Colorbar_Flag_Type := 8;
- PL_Colorbar_Image : constant Colorbar_Flag_Type := 16;
- PL_Colorbar_Shade : constant Colorbar_Flag_Type := 32;
- PL_Colorbar_Gradient : constant Colorbar_Flag_Type := 64;
- PL_Colorbar_Cap_Low : constant Colorbar_Flag_Type := 128;
- PL_Colorbar_Cap_High : constant Colorbar_Flag_Type := 256;
- PL_Colorbar_Shade_Label : constant Colorbar_Flag_Type := 512;
+ PL_Colorbar_Label_Left : constant Colorbar_Flag_Type := 1;
+ PL_Colorbar_Label_Right : constant Colorbar_Flag_Type := 2;
+ PL_Colorbar_Label_Top : constant Colorbar_Flag_Type := 4;
+ PL_Colorbar_Label_Bottom : constant Colorbar_Flag_Type := 8;
+ PL_Colorbar_Image : constant Colorbar_Flag_Type := 16;
+ PL_Colorbar_Shade : constant Colorbar_Flag_Type := 32;
+ PL_Colorbar_Gradient : constant Colorbar_Flag_Type := 64;
+ PL_Colorbar_Cap_None : constant Colorbar_Flag_Type := 128;
+ PL_Colorbar_Cap_Low : constant Colorbar_Flag_Type := 256;
+ PL_Colorbar_Cap_High : constant Colorbar_Flag_Type := 512;
+ PL_Colorbar_Shade_Label : constant Colorbar_Flag_Type := 1024;
+ PL_Colorbar_Orient_Right : constant Colorbar_Flag_Type := 2048;
+ PL_Colorbar_Orient_Top : constant Colorbar_Flag_Type := 4096;
+ PL_Colorbar_Orient_Left : constant Colorbar_Flag_Type := 8192;
+ PL_Colorbar_Orient_Bottom : constant Colorbar_Flag_Type := 16384;
+ PL_Colorbar_Background : constant Colorbar_Flag_Type := 32768;
+ PL_Colorbar_Bounding_Box : constant Colorbar_Flag_Type := 65536;
-- Renamed flags for plcolorbar
- Colorbar_Label_Left : constant Colorbar_Flag_Type := PL_Colorbar_Label_Left;
- Colorbar_Label_Right : constant Colorbar_Flag_Type := PL_Colorbar_Label_Right;
- Colorbar_Label_Top : constant Colorbar_Flag_Type := PL_Colorbar_Label_Top;
- Colorbar_Label_Bottom : constant Colorbar_Flag_Type := PL_Colorbar_Label_Bottom;
- Colorbar_Image : constant Colorbar_Flag_Type := PL_Colorbar_Image;
- Colorbar_Shade : constant Colorbar_Flag_Type := PL_Colorbar_Shade;
- Colorbar_Gradient : constant Colorbar_Flag_Type := PL_Colorbar_Gradient;
- Colorbar_Cap_Low : constant Colorbar_Flag_Type := PL_Colorbar_Cap_Low;
- Colorbar_Cap_High : constant Colorbar_Flag_Type := PL_Colorbar_Cap_High;
- Colorbar_Shade_Label : constant Colorbar_Flag_Type := PL_Colorbar_Shade_Label;
+ Colorbar_Label_Left : constant Colorbar_Flag_Type := PL_Colorbar_Label_Left;
+ Colorbar_Label_Right : constant Colorbar_Flag_Type := PL_Colorbar_Label_Right;
+ Colorbar_Label_Top : constant Colorbar_Flag_Type := PL_Colorbar_Label_Top;
+ Colorbar_Label_Bottom : constant Colorbar_Flag_Type := PL_Colorbar_Label_Bottom;
+ Colorbar_Image : constant Colorbar_Flag_Type := PL_Colorbar_Image;
+ Colorbar_Shade : constant Colorbar_Flag_Type := PL_Colorbar_Shade;
+ Colorbar_Gradient : constant Colorbar_Flag_Type := PL_Colorbar_Gradient;
+ Colorbar_Cap_None : constant Colorbar_Flag_Type := PL_Colorbar_Cap_None;
+ Colorbar_Cap_Low : constant Colorbar_Flag_Type := PL_Colorbar_Cap_Low;
+ Colorbar_Cap_High : constant Colorbar_Flag_Type := PL_Colorbar_Cap_High;
+ Colorbar_Shade_Label : constant Colorbar_Flag_Type := PL_Colorbar_Shade_Label;
+ Colorbar_Orient_Right : constant Colorbar_Flag_Type := PL_Colorbar_Orient_Right;
+ Colorbar_Orient_Top : constant Colorbar_Flag_Type := PL_Colorbar_Orient_Top;
+ Colorbar_Orient_Left : constant Colorbar_Flag_Type := PL_Colorbar_Orient_Left;
+ Colorbar_Orient_Bottom : constant Colorbar_Flag_Type := PL_Colorbar_Orient_Bottom;
+ Colorbar_Background : constant Colorbar_Flag_Type := PL_Colorbar_Background;
+ Colorbar_Bounding_Box : constant Colorbar_Flag_Type := PL_Colorbar_Bounding_Box;
-- Justification for plots
subtype Justification_Type is Integer range -1..2;
@@ -1225,7 +1239,7 @@
X_Offset, Y_Offset : Long_Float;
Plot_Area_Width : Long_Float;
Background_Color, Bounding_Box_Color : Plot_Color_Type;
- Bounding_Box_Style : Legend_Flag_Type;
+ Bounding_Box_Style : Line_Style_Type;
Number_Rows, Number_Columns : Integer;
Entry_Options : Integer_Array_1D;
Text_Offset, Text_Scale, Text_Spacing : Long_Float;
@@ -1243,6 +1257,26 @@
Symbols : Legend_String_Array_Type);
+ -- Routine for drawing continous colour legends
+ procedure plcolorbar
+ (Colorbar_Width, Colorbar_Height : out Long_Float;
+ Options, Position : Integer;
+ X_Offset, Y_Offset : Long_Float;
+ X_Length, Y_Length : Long_Float;
+ Background_Color, Bounding_Box_Color : Plot_Color_Type;
+ Bounding_Box_Style : Line_Style_Type;
+ Low_Cap_Color, High_Cap_Color : Long_Float;
+ Contour_Color_For_Shade : Plot_Color_Type;
+ Contour_Width_For_Shade : Long_Float;
+ Label_Options : Integer_Array_1D;
+ Label_Text : Legend_String_Array_Type;
+ Axis_Options : Legend_String_Array_Type;
+ Tick_Spacing : Real_Vector;
+ Number_Subticks : Integer_Array_1D;
+ Number_Values : Integer_Array_1D;
+ Values : Real_Matrix);
+
+
-- Sets position of the light source
procedure pllightsource
(x : Long_Float := 1.0;
@@ -1527,6 +1561,14 @@
procedure plscmap1n(Number_Of_Colors : Integer);
+ -- Set the color map 1 range used in continuous plots.
+ procedure plscmap1_range(Min_Color, Max_Color : Long_Float);
+
+
+ -- Get the color map 1 range used in continuous plots
+ procedure plgcmap1_range(Min_Color, Max_Color : out Long_Float);
+
+
-- Set a given color from color map 0 by 8 bit RGB value
procedure plscol0
(Plot_Color : Plot_Color_Type;
Modified: trunk/examples/ada/x16a.adb
===================================================================
--- trunk/examples/ada/x16a.adb 2013-09-24 05:27:13 UTC (rev 12522)
+++ trunk/examples/ada/x16a.adb 2013-09-24 10:27:16 UTC (rev 12523)
@@ -6,7 +6,7 @@
-- IFS, University of Texas at Austin
-- 20 Mar 1994
--- Copyright (C) 2008 Jerry Bauck
+-- Copyright (C) 2008-2013 Jerry Bauck
-- This file is part of PLplot.
@@ -36,8 +36,6 @@
PLplot_Traditional,
PLplot_Auxiliary;
-
-
procedure x16a is
-- Fundamental settings. See notes() for more info.
ns : Integer := 20; -- Default number of shade levels
@@ -65,8 +63,20 @@
y_Last => ny - 1);
fill_width : Long_Float := 2.0;
+ colorbar_width, colorbar_height : Long_Float;
cont_color : Integer := 0;
cont_width : Long_Float := 0.0;
+ num_axes : constant Integer := 1;
+ n_axis_opts : constant Integer := num_axes;
+ -- TUB is renamed To_Unbounded_String.
+ axis_opts : Legend_String_Array_Type(0 .. n_axis_opts - 1) := (others => TUB("bcvtm"));
+ num_values : Integer_Array_1D(0 .. num_axes - 1);
+ values : Real_Matrix(0 .. num_axes - 1, 0 .. ns);
+ axis_ticks : Real_Vector(0 .. num_axes - 1) := (others => 0.0);
+ axis_subticks : Integer_Array_1D(0 .. num_axes - 1) := (others => 0);
+ num_labels : constant Integer := 1;
+ label_opts : Integer_Array_1D(0 .. num_labels - 1);
+ labels : Legend_String_Array_Type(0 .. num_labels - 1) := (others => TUB("Magnitude"));
-- Transformation function
tr : Real_Vector(0 .. 5);
@@ -77,6 +87,7 @@
pltr_data : PLpointer);
pragma Convention(Convention => C, Entity => mypltr);
+
procedure mypltr
(x, y : Long_Float;
tx, ty : out Long_Float;
@@ -101,14 +112,15 @@
end if;
end zdefined;
+begin
+ label_opts(0) := COLORBAR_LABEL_BOTTOM;
-begin
----------------------------------------------------------------------------
-- Does several shade plots using different coordinate mappings.
----------------------------------------------------------------------------
-- Parse and process command line arguments.
- plparseopts(PL_PARSE_FULL);
+ plparseopts(Parse_Full);
-- Load colour palettes
plspal0("cmap0_black_on_white.pal");
@@ -178,6 +190,30 @@
cont_color, cont_width,
plfill'access, True, Null, System.Null_Address);
+ -- Smaller text
+ plschr(0.0, 0.75);
+ -- Small ticks on the vertical axis
+ plsmaj(0.0, 0.5);
+ plsmin(0.0, 0.5);
+
+ num_values(0) := ns + 1;
+ for i in values'range(2) loop
+ values(0, i) := shedge(i);
+ end loop;
+ plcolorbar(colorbar_width, colorbar_height,
+ Colorbar_Shade + Colorbar_Shade_Label, 0,
+ 0.005, 0.0, 0.0375, 0.875, 0, 1, 1, 0.0, 0.0,
+ cont_color, cont_width,
+ label_opts, labels,
+ axis_opts,
+ axis_ticks, axis_subticks,
+ num_values, values);
+
+ -- Reset text and tick sizes
+ plschr(0.0, 1.0);
+ plsmaj(0.0, 1.0);
+ plsmin(0.0, 1.0);
+
plcol0(1);
plbox("bcnst", 0.0, 0, "bcnstv", 0.0, 0);
plcol0(2);
@@ -204,6 +240,30 @@
cont_color, cont_width,
plfill'access, True, pltr1'access, cgrid1'Address);
+ -- Smaller text
+ plschr(0.0, 0.75);
+ -- Small ticks on the vertical axis
+ plsmaj(0.0, 0.5);
+ plsmin(0.0, 0.5);
+
+ num_values(0) := ns + 1;
+ for i in values'range(2) loop
+ values(0, i) := shedge(i);
+ end loop;
+ plcolorbar(colorbar_width, colorbar_height,
+ Colorbar_Shade + Colorbar_Shade_Label, 0,
+ 0.005, 0.0, 0.0375, 0.875, 0, 1, 1, 0.0, 0.0,
+ cont_color, cont_width,
+ label_opts, labels,
+ axis_opts,
+ axis_ticks, axis_subticks,
+ num_values, values);
+
+ -- Reset text and tick sizes
+ plschr(0.0, 1.0);
+ plsmaj(0.0, 1.0);
+ plsmin(0.0, 1.0);
+
plcol0(1);
plbox("bcnst", 0.0, 0, "bcnstv", 0.0, 0);
plcol0(2);
@@ -230,6 +290,30 @@
cont_color, cont_width,
plfill'access, False, pltr2'access, cgrid2'Address);
+ -- Smaller text
+ plschr(0.0, 0.75);
+ -- Small ticks on the vertical axis
+ plsmaj(0.0, 0.5);
+ plsmin(0.0, 0.5);
+
+ num_values(0) := ns + 1;
+ for i in values'range(2) loop
+ values(0, i) := shedge(i);
+ end loop;
+ plcolorbar(colorbar_width, colorbar_height,
+ Colorbar_Shade + Colorbar_Shade_Label, 0,
+ 0.005, 0.0, 0.0375, 0.875, 0, 1, 1, 0.0, 0.0,
+ cont_color, cont_width,
+ label_opts, labels,
+ axis_opts,
+ axis_ticks, axis_subticks,
+ num_values, values);
+
+ -- Reset text and tick sizes
+ plschr(0.0, 1.0);
+ plsmaj(0.0, 1.0);
+ plsmin(0.0, 1.0);
+
plcol0(1);
plbox("bcnst", 0.0, 0, "bcnstv", 0.0, 0);
plcol0(2);
@@ -257,6 +341,30 @@
2, 3.0,
plfill'access, False, pltr2'access, cgrid2'Address);
+ -- Smaller text
+ plschr(0.0, 0.75);
+ -- Small ticks on the vertical axis
+ plsmaj(0.0, 0.5);
+ plsmin(0.0, 0.5);
+
+ num_values(0) := ns + 1;
+ for i in values'range(2) loop
+ values(0, i) := shedge(i);
+ end loop;
+ plcolorbar(colorbar_width, colorbar_height,
+ Colorbar_Shade + Colorbar_Shade_Label, 0,
+ 0.005, 0.0, 0.0375, 0.875, 0, 1, 1, 0.0, 0.0,
+ 2, 3.0,
+ label_opts, labels,
+ axis_opts,
+ axis_ticks, axis_subticks,
+ num_values, values);
+
+ -- Reset text and tick sizes
+ plschr(0.0, 1.0);
+ plsmaj(0.0, 1.0);
+ plsmin(0.0, 1.0);
+
plcol0(1);
plbox("bcnst", 0.0, 0, "bcnstv", 0.0, 0);
plcol0(2);
@@ -270,7 +378,7 @@
-- Ada note: This "exclusion" part works if exclude is set to True.
-- In the C original example, the setting of exclude was handled by the
-- the input parser which handling is not implemented in this Ada example.
--- exclude := False;
+ -- exclude := False;
if exclude then
-- Load colour palettes.
@@ -337,6 +445,30 @@
cont_color, cont_width,
plfill'access, False, pltr2'access, cgrid2'Address);
+ -- Smaller text
+ plschr(0.0, 0.75);
+ -- Small ticks on the vertical axis
+ plsmaj(0.0, 0.5);
+ plsmin(0.0, 0.5);
+
+ num_values(0) := ns + 1;
+ for i in values'range(2) loop
+ values(0, i) := shedge(i);
+ end loop;
+ plcolorbar(colorbar_width, colorbar_height,
+ Colorbar_Shade + Colorbar_Shade_Label, 0,
+ 0.005, 0.0, 0.0375, 0.875, 0, 1, 1, 0.0, 0.0,
+ cont_color, cont_width,
+ label_opts, labels,
+ axis_opts,
+ axis_ticks, axis_subticks,
+ num_values, values);
+
+ -- Reset text and tick sizes
+ plschr(0.0, 1.0);
+ plsmaj(0.0, 1.0);
+ plsmin(0.0, 1.0);
+
-- Now we can draw the perimeter. (If do before, shade stuff may overlap.)
for i in px'range loop
t := 2.0 * pi / Long_Float(px'Length - 1) * Long_Float(i);
Modified: trunk/examples/ada/x33a.adb
===================================================================
--- trunk/examples/ada/x33a.adb 2013-09-24 05:27:13 UTC (rev 12522)
+++ trunk/examples/ada/x33a.adb 2013-09-24 10:27:16 UTC (rev 12523)
@@ -4,7 +4,7 @@
--
-- Demonstrate most pllegend capability including unicode symbols.
--
--- Copyright (C) 2011 Jerry Bauck
+-- Copyright (C) 2011-2013 Jerry Bauck
--
-- This file is part of PLplot.
--
@@ -46,224 +46,221 @@
PLplot_Auxiliary,
PLplot_Traditional;
+----------------------------------------------------------------------------
+-- Demonstrate most pllegend capability including unicode symbols.
+----------------------------------------------------------------------------
+
procedure x33a is
position_options : Integer_Array_1D(0 .. 15) :=
- (PL_POSITION_LEFT + PL_POSITION_TOP + PL_POSITION_OUTSIDE,
- PL_POSITION_TOP + PL_POSITION_OUTSIDE,
- PL_POSITION_RIGHT + PL_POSITION_TOP + PL_POSITION_OUTSIDE,
- PL_POSITION_RIGHT + PL_POSITION_OUTSIDE,
- PL_POSITION_RIGHT + PL_POSITION_BOTTOM + PL_POSITION_OUTSIDE,
- PL_POSITION_BOTTOM + PL_POSITION_OUTSIDE,
- PL_POSITION_LEFT + PL_POSITION_BOTTOM + PL_POSITION_OUTSIDE,
- PL_POSITION_LEFT + PL_POSITION_OUTSIDE,
- PL_POSITION_LEFT + PL_POSITION_TOP + PL_POSITION_INSIDE,
- PL_POSITION_TOP + PL_POSITION_INSIDE,
- PL_POSITION_RIGHT + PL_POSITION_TOP + PL_POSITION_INSIDE,
- PL_POSITION_RIGHT + PL_POSITION_INSIDE,
- PL_POSITION_RIGHT + PL_POSITION_BOTTOM + PL_POSITION_INSIDE,
- PL_POSITION_BOTTOM + PL_POSITION_INSIDE,
- PL_POSITION_LEFT + PL_POSITION_BOTTOM + PL_POSITION_INSIDE,
- PL_POSITION_LEFT + PL_POSITION_INSIDE);
+ (Pl_Position_Left + Pl_Position_Top + Pl_Position_Outside,
+ Pl_Position_Top + Pl_Position_Outside,
+ Pl_Position_Right + Pl_Position_Top + Pl_Position_Outside,
+ Pl_Position_Right + Pl_Position_Outside,
+ Pl_Position_Right + Pl_Position_Bottom + Pl_Position_Outside,
+ Pl_Position_Bottom + Pl_Position_Outside,
+ Pl_Position_Left + Pl_Position_Bottom + Pl_Position_Outside,
+ Pl_Position_Left + Pl_Position_Outside,
+ Pl_Position_Left + Pl_Position_Top + Pl_Position_Inside,
+ Pl_Position_Top + Pl_Position_Inside,
+ Pl_Position_Right + Pl_Position_Top + Pl_Position_Inside,
+ Pl_Position_Right + Pl_Position_Inside,
+ Pl_Position_Right + Pl_Position_Bottom + Pl_Position_Inside,
+ Pl_Position_Bottom + Pl_Position_Inside,
+ Pl_Position_Left + Pl_Position_Bottom + Pl_Position_Inside,
+ Pl_Position_Left + Pl_Position_Inside);
-- Pick 5 arbitrary UTF-8 symbols useful for plotting points (✠✚✱✪✽✺✰✴✦).
special_symbols : Legend_String_Array_Type(0 .. 4) :=
- (TUB("✰"), TUB("✴"), TUB("✱"), TUB("✽"), TUB("✦"));
+ (TUB("✰"), TUB("✴"), TUB("✱"), TUB("✽"), TUB("✦")); -- TUB is renamed To_Unbounded_String.
- colorbar : Boolean := False; -- By default do not plot plcolorbar pages
- -- for now while we are working out the API.
+ -- plcolorbar options
--- static PLOptionTable options() := {
--- {
--- "colorbar", -- Turns on pages showing colorbars
--- NULL,
--- NULL,
--- &colorbar,
--- PL_OPT_BOOL,
--- "-colorbar",
--- "Plot the \"color bar\" pages."
--- },
--- {
--- NULL, -- option
--- NULL, -- handler
--- NULL, -- client data
--- NULL, -- address of variable to set
--- 0, -- mode flag
--- NULL, -- short syntax
--- NULL
--- } -- long syntax
--- };
+ -- Colorbar type options
+ Colorbar_Kinds : constant Integer := 4;
+ colorbar_option_kinds : Integer_Array_1D(0 .. Colorbar_Kinds - 1) := (
+ Pl_Colorbar_Shade,
+ Pl_Colorbar_Shade + Pl_Colorbar_Shade_Label,
+ Pl_Colorbar_Image,
+ Pl_Colorbar_Gradient);
+ colorbar_option_kind_labels : Legend_String_Array_Type(0 .. Colorbar_Kinds - 1) :=
+ (TUB("Shade colorbars"),
+ TUB("Shade colorbars with custom labels"),
+ TUB("Image colorbars"),
+ TUB("Gradient colorbars"));
---const char *notes() := { "Make sure you get it right!", NULL };
+ -- Which side of the page are we positioned relative to?
+ Colorbar_Positions :constant Integer := 4;
+ colorbar_position_options : Integer_Array_1D(0 .. Colorbar_Positions - 1) :=
+ (Pl_Position_Left,
+ Pl_Position_Right,
+ Pl_Position_Top,
+ Pl_Position_Bottom);
+
+ colorbar_position_option_labels : Legend_String_Array_Type(0 .. Colorbar_Positions - 1) :=
+ (TUB("Left"),
+ TUB("Right"),
+ TUB("Top"),
+ TUB("Bottom"));
+
+ -- Colorbar label positioning options
+ Colorbar_Labels : constant Integer := 4;
+ colorbar_label_options : Integer_Array_1D(0 .. Colorbar_Labels - 1) :=
+ (Pl_Colorbar_Label_Left,
+ Pl_Colorbar_Label_Right,
+ Pl_Colorbar_Label_Top,
+ Pl_Colorbar_Label_Bottom);
- --procedure plcolorbar_example_1(PLINT bar_type, PLINT cont_color, PLINT cont_width, PLFLT ticks, PLINT sub_ticks, PLINT n, PLFLT *values, const char *title)
+ colorbar_label_option_labels : Legend_String_Array_Type(0 .. Colorbar_Labels - 1) :=
+ (TUB("Label left"),
+ TUB("Label right"),
+ TUB("Label top"),
+ TUB("Label bottom"));
+
+ -- Colorbar cap options
+ Colorbar_Caps : constant Integer := 4;
+ colorbar_cap_options : Integer_Array_1D(0 .. Colorbar_Caps - 1) :=
+ (Pl_Colorbar_Cap_None,
+ Pl_Colorbar_Cap_Low,
+ Pl_Colorbar_Cap_High,
+ Pl_Colorbar_Cap_Low + Pl_Colorbar_Cap_High);
+ colorbar_cap_option_labels : Legend_String_Array_Type(0 .. Colorbar_Caps - 1) :=
+ (TUB("No caps"),
+ TUB("Low cap"),
+ TUB("High cap"),
+ TUB("Low and high caps"));
- -- procedure plcolorbar_example_1
- -- (bar_type, cont_color, cont_width : Integer;
- -- ticks : Long_Float;
- -- sub_ticks, n : Integer;
- -- values : Real_Vector;
- -- title : Unbounded_String)
- -- is
- -- colors : Real_Vector(0 .. n - 1);
- -- i : Integer;
- -- color_step, color_offset : Long_Float;
- -- opt, position : Integer;
- -- axis_opts_1, axis_opts_2 : Unbounded_String;
- -- begin
- -- pladv(0);
- --
- -- -- Set up color palette 1.
- -- plspal1("cmap1_blue_red.pal", True);
- --
- -- color_step := 1.0 / Long_Float(n - 1);
- -- for i in 0 .. n - 1 loop
- -- colors(i) := color_offset + color_step * Long_Float(i); -- COLOR_OFFSET NOT DEFINED!
- -- end loop;
- --
- -- position := PL_POSITION_LEFT;
- -- opt := bar_type + PL_COLORBAR_LABEL_LEFT + PL_COLORBAR_CAP_HIGH;
- --
- -- if bar_type and PL_COLORBAR_SHADE_LABEL then
- -- axis_opts_1 := To_Unbounded_String("iv");
- -- axis_opts_2 := To_Unbounded_String("i");
- -- else
- -- if sub_ticks /= 0 then
- -- axis_opts_1 := To_Unbounded_String("stv");
- -- axis_opts_2 := To_Unbounded_String("st");
- -- else
- -- axis_opts_1 := To_Unbounded_String("tv");
- -- axis_opts_2 := To_Unbounded_String("t");
- -- end if;
- -- end if;
- --
- -- plcolorbar(opt, position, 0.1, 0.1, 0.5, 0.1, -- fixme
- -- cont_color, cont_width,
- -- ticks, sub_ticks,
- -- axis_opts_1, "Test label - Left, High Cap",
- -- n, colors, values);
- --
- -- position := PL_POSITION_RIGHT;
- -- opt := bar_type + PL_COLORBAR_LABEL_RIGHT + PL_COLORBAR_CAP_LOW;
- --
- -- plcolorbar(opt, position, 0.1, 0.4, 0.5, 0.1, -- fixme etc.
- -- cont_color, cont_width,
- -- ticks, sub_ticks,
- -- axis_opts_1, "Test label - Right, Low Cap",
- -- n, colors, values);
- --
- -- position := PL_POSITION_TOP;
- -- opt := bar_type + PL_COLORBAR_LABEL_TOP + PL_COLORBAR_CAP_HIGH;
- --
- -- plcolorbar(opt, position, 0.1, 0.1, 0.5, 0.1,
- -- cont_color, cont_width,
- -- ticks, sub_ticks,
- -- axis_opts_2, "Test label - Top, High Cap",
- -- n, colors, values);
- --
- -- position := PL_POSITION_BOTTOM;
- -- opt := bar_type + PL_COLORBAR_LABEL_BOTTOM + PL_COLORBAR_CAP_LOW;
- --
- -- plcolorbar(opt, position, 0.4, 0.1, 0.5, 0.1,
- -- cont_color, cont_width,
- -- ticks, sub_ticks,
- -- axis_opts_2, "Test label - Bottom, Low Cap",
- -- n, colors, values);
- --
- -- plvpor(0.0, 1.0, 0.0, 1.0);
- -- plwind(0.0, 1.0, 0.0, 1.0);
- -- plptex(0.5, 0.5, 0.0, 0.0, 0.5, To_String(title));
- -- end plcolorbar_example_1;
- --
- --
- -- procedure plcolorbar_example_2
- -- (bar_type, cont_color, cont_width : Integer;
- -- ticks, sub_ticks : Long_Float;
- -- n : Integer;
- -- values : Real_Vector;
- -- title : Unbounded_String)
- -- is
- -- colors : Long_Float(0 .. n - 1);
- -- i : Integer;
- -- color_step, color_offset : Long_Float;
- -- opt, position : Integer;
- -- axis_opts_1, axis_opts_2 : Unbounded_String;
- -- begin
- -- pladv(0);
- --
- -- -- Set up color palette 1.
- -- plspal1("cmap1_blue_yellow.pal", True);
- --
- -- color_step := 1.0 / Long_Float(n - 1);
- -- for i in 0 .. n - 1 loop
- -- if i = 0 then
- -- color_offset := 0.01;
- -- elsif i = n - 1 then
- -- color_offset := -0.01;
- -- else
- -- color_offset := 0.0;
- -- end if;
- -- colors(i) := color_offset + color_step * Long_Float(i);
- -- end loop;
- --
- -- position := PL_POSITION_LEFT;
- -- opt := bar_type + PL_COLORBAR_LABEL_LEFT + PL_COLORBAR_CAP_LOW;
- --
- -- if bar_type = PL_COLORBAR_SHADE_LABEL then
- -- axis_opts_1 := "";
- -- axis_opts_2 := "";
- -- else
- -- if sub_ticks /= 0 then
- -- axis_opts_1 := "stv";
- -- axis_opts_2 := "st";
- -- else
- -- axis_opts_1 := "tv";
- -- axis_opts_2 := "t";
- -- end if;
- -- end if;
- --
- -- plcolorbar(opt, position, 0.1, 0.1, 0.5, 0.1,
- -- cont_color, cont_width,
- -- ticks, sub_ticks,
- -- axis_opts_1, "Test label - Left, Low Cap",
- -- n, colors, values);
- --
- -- position := PL_POSITION_RIGHT;
- -- opt := bar_type + PL_COLORBAR_LABEL_RIGHT + PL_COLORBAR_CAP_HIGH;
- --
- -- plcolorbar(opt, position, 0.1, 0.4, 0.5, 0.1,
- -- cont_color, cont_width,
- -- ticks, sub_ticks,
- -- axis_opts_1, "Test label - Right, High Cap",
- -- n, colors, values);
- --
- -- position := PL_POSITION_TOP;
- -- opt := bar_type + PL_COLORBAR_LABEL_TOP + PL_COLORBAR_CAP_LOW;
- --
- -- plcolorbar(opt, position, 0.1, 0.1, 0.5, 0.1,
- -- cont_color, cont_width,
- -- ticks, sub_ticks,
- -- axis_opts_2, "Test label - Top, Low Cap",
- -- n, colors, values);
- --
- -- position := PL_POSITION_BOTTOM;
- -- opt := bar_type + PL_COLORBAR_LABEL_BOTTOM + PL_COLORBAR_CAP_HIGH;
- --
- -- plcolorbar(opt, position, 0.4, 0.1, 0.5, 0.1,
- -- cont_color, cont_width,
- -- ticks, sub_ticks,
- -- axis_opts_2, "Test label - Bottom, High Cap",
- -- n, colors, values);
- --
- -- plvpor(0.0, 1.0, 0.0, 1.0);
- -- plwind(0.0, 1.0, 0.0, 1.0);
- -- plptex(0.5, 0.5, 0.0, 0.0, 0.5, To_String(title));
- -- end plcolorbar_example_2;
+ procedure plcolorbar_example_page(kind_i : Integer; label_i : Integer; cap_i : Integer;
+ cont_color : Integer; cont_width : Long_Float; n_values : Integer; values : Real_Vector)
+ is
+ -- Parameters for the colorbars on this page
+ position, opt : Integer;
+ x, y, x_length, y_length : Long_Float;
+ ticks : Real_Vector(0 .. 0) := (others => 0.0);
+ sub_ticks : Integer_Array_1D(0 .. 0) := (others => 0);
+ low_cap_color, high_cap_color : Long_Float;
+ vertical, ifn : Boolean;
+ n_axes : Integer := 1;
+ axis_opts : Legend_String_Array_Type(0 .. 0);
+ n_labels : Integer := 1;
+ label_opts : Integer_Array_1D(0 .. 0) := (others => 0);
+ label : Legend_String_Array_Type(0 .. 0);
+ title : Unbounded_String;
+ colorbar_width, colorbar_height : Long_Float;
+ n_values_array : Integer_Array_1D(0 .. 0);
+ values_array : Real_Matrix(0 .. 0, values'first .. values'last);
+ type Stupid is mod 2**7; -- To cover Legend_Colorbar_Position_Type in plplot_thin.ads.
+ begin
+ n_values_array(0) := n_values;
+ for i in values'range loop
+ values_array(0, i) := values(i);
+ end loop;
-----------------------------------------------------------------------------
--- Demonstrate most pllegend capability including unicode symbols.
-----------------------------------------------------------------------------
+ low_cap_color := 0.0;
+ high_cap_color := 1.0;
+ -- Start a new page.
+ pladv(0);
+
+ -- Draw one colorbar relative to each side of the page.
+ for position_i in 0 .. Colorbar_Positions - 1 loop
+ position := colorbar_position_options(position_i);
+ opt := colorbar_option_kinds(kind_i) +
+ colorbar_label_options(label_i) + colorbar_cap_options(cap_i);
+
+ -- We have to convert these integers to modular type Stupid before and-ing the bits.
+ -- That's because manipulating bits of non-modular types is nonsense but other
+ -- languages seem to not care about stuff like this.
+ vertical := ((Stupid(position) and Stupid(Pl_Position_Left)) > 0) or
+ ((Stupid(position) and Stupid(Pl_Position_Right)) > 0);
+
+ ifn := ((Stupid(position) and Stupid(Pl_Position_Left)) > 0) or
+ ((Stupid(position) and Stupid(Pl_Position_Bottom)) > 0);
+
+ -- Set the offset position on the page.
+ if vertical then
+ x := 0.0;
+ y := 0.0;
+ x_length := 0.05;
+ y_length := 0.5;
+ else
+ x := 0.0;
+ y := 0.0;
+ x_length := 0.5;
+ y_length := 0.05;
+ end if;
+
+ -- Set appropriate labelling options.
+ if ifn then
+ if cont_color = 0 or cont_width = 0.0 then
+ axis_opts(0) := TUB("uwtivn"); -- TUB is renamed To_Unbounded_String.
+ else
+ axis_opts(0) := TUB("uwxvn");
+ end if;
+ else
+ if cont_color = 0 or cont_width = 0.0 then
+ axis_opts(0) := TUB("uwtivm");
+ else
+ axis_opts(0) := TUB("uwxvm");
+ end if;
+ end if;
+
+ label(0) := colorbar_position_option_labels(position_i) & ", "
+ & colorbar_label_option_labels(label_i);
+
+ -- Smaller text
+ plschr(0.0, 0.75);
+ -- Small ticks on the vertical axis
+ plsmaj(0.0, 0.5);
+ plsmin...
[truncated message content] |
|
From: <ai...@us...> - 2013-09-24 05:27:17
|
Revision: 12522
http://sourceforge.net/p/plplot/code/12522
Author: airwin
Date: 2013-09-24 05:27:13 +0000 (Tue, 24 Sep 2013)
Log Message:
-----------
Spelling updates generated by aspell check <filename>.
Modified Paths:
--------------
trunk/www/credits.php
trunk/www/development.php
trunk/www/documentation.php.in
Modified: trunk/www/credits.php
===================================================================
--- trunk/www/credits.php 2013-09-24 05:21:15 UTC (rev 12521)
+++ trunk/www/credits.php 2013-09-24 05:27:13 UTC (rev 12522)
@@ -28,7 +28,7 @@
<h4>PLplot device-driver dependencies</h4>
<p> N.B. each device driver is an optional component of PLplot.</p>
<ul class="arrowlist">
- <li>The aquaterm device driver depends on <a href="http://aquaterm.sourceforge.net/">AquaTerm.app</a>; a Mac OS X plotting front end (grahics terminal) written using Objective-C and the Cocoa API.</li>
+ <li>The aquaterm device driver depends on <a href="http://aquaterm.sourceforge.net/">AquaTerm.app</a>; a Mac OS X plotting front end (graphics terminal) written using Objective-C and the Cocoa API.</li>
<li>The cairo device driver depends on <a href="http://www.pango.org/">Pango</a>; a library for laying out and rendering of text, with an emphasis on internationalization.</li>
<li>The cairo device driver depends on <a href="http://www.cairographics.org/">cairo</a>; a 2D graphics library with support for multiple output devices. Currently supported output targets include the X Window System, Quartz, Win32, image buffers, PostScript, PDF, and SVG file output.</li>
<li>The gcw device driver depends on <a href="http://www.gtk.org/">GTK+</a>; a multi-platform toolkit library for creating graphical user interfaces.</li>
Modified: trunk/www/development.php
===================================================================
--- trunk/www/development.php 2013-09-24 05:21:15 UTC (rev 12521)
+++ trunk/www/development.php 2013-09-24 05:27:13 UTC (rev 12522)
@@ -17,7 +17,7 @@
information on where new developers should start.</p>
<h3>Information</h3>
- <p>Apart from this webpage there are some other sources where the developer
+ <p>Apart from this web page there are some other sources where the developer
can get some information on the PLplot library.
<ul class="arrowlist">
<li>The source code itself is well commented and it's always worth have
@@ -41,7 +41,7 @@
Functions" and "Adding FreeType Library Support to Bitmap Drivers"
in Chapter 3) that you should look at. If the new driver provides
the functions needed and is working you can extend the driver e.g.
- by processing the font or your own (drivers/cairco.c or
+ by processing the font on your own (drivers/cairo.c or
drivers/wxwidgets.cpp) and handle key and mouse inputs (drivers/xwin.c).
</p>
<h3>Extending the PLplot core</h3>
Modified: trunk/www/documentation.php.in
===================================================================
--- trunk/www/documentation.php.in 2013-09-24 05:21:15 UTC (rev 12521)
+++ trunk/www/documentation.php.in 2013-09-24 05:27:13 UTC (rev 12522)
@@ -46,7 +46,7 @@
href="http://www.docbook.org/tdg/en/html/docbook.html">"DocBook: The
Definitive Guide"</a>, is an excellent reference. For the doxygen
case, the documentation is controlled by a special form of comments in
-our source files. See src/plllegend.c for a good example of how to
+our source files. See src/pllegend.c for a good example of how to
document arguments of PLplot functions. Note there are many other
files in src without this argument documentation at the present time
so there is plenty of scope to help out here.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2013-09-24 05:21:21
|
Revision: 12521
http://sourceforge.net/p/plplot/code/12521
Author: airwin
Date: 2013-09-24 05:21:15 +0000 (Tue, 24 Sep 2013)
Log Message:
-----------
A large number of spelling fixes generated by "aspell check <filename>".
Modified Paths:
--------------
trunk/doc/docbook/src/ada.xml
trunk/doc/docbook/src/advanced.xml
trunk/doc/docbook/src/api-c.xml
trunk/doc/docbook/src/api-compat.xml
trunk/doc/docbook/src/api.xml
trunk/doc/docbook/src/bibliography.xml
trunk/doc/docbook/src/c.xml
trunk/doc/docbook/src/cplus.xml
trunk/doc/docbook/src/deploying.xml
trunk/doc/docbook/src/drivers.xml
trunk/doc/docbook/src/intro.xml
trunk/doc/docbook/src/libraries.xml
trunk/doc/docbook/src/ocaml.xml
trunk/doc/docbook/src/simple.xml
trunk/doc/docbook/src/tcl.xml
trunk/doc/docbook/src/wish.xml
Modified: trunk/doc/docbook/src/ada.xml
===================================================================
--- trunk/doc/docbook/src/ada.xml 2013-09-23 22:07:57 UTC (rev 12520)
+++ trunk/doc/docbook/src/ada.xml 2013-09-24 05:21:15 UTC (rev 12521)
@@ -100,7 +100,7 @@
<para>Many of the comments from the C source header file (similar in
purpose to an Ada specification file) have been retained in the thin
- binding, even when they are no longer sensical. These might be pruned at
+ binding, even when they are no longer make sense. These might be pruned at
some point to facilitate reading the Ada source.</para>
<para>Also included in the thin binding are some other declarations
@@ -229,7 +229,7 @@
<para>An important part of the Ada bindings is the examples, some 30 of
which demonstrate how to use many of the features of the PLplot package.
- These examples also serve as a testbed for the bindings in Ada and other
+ These examples also serve as a test bed for the bindings in Ada and other
languages by checking the Postscript files that are generated by each
example against those generated by the C versions. These examples have
been completely re-written in Ada (but retain a C flavor in the names that
@@ -326,11 +326,11 @@
requiring the user program to <literal>with</literal>
<literal>Ada.Numerics.Long_Real_Arrays</literal> simply to gain access
to these types and in the process require linking to the BLAS and LAPACK
- numerics libraries.</para>
+ numerical libraries.</para>
<para>For users who wish to either attain compatibility with Ada 2005
Annex G.3 or to access its features which actually depend on BLAS and
- LAPACK, there are two routes. One is to build PLpot normally and then to
+ LAPACK, there are two routes. One is to build PLplot normally and then to
edit <literal>PLplot_Auxiliary.ads</literal> as is indicated in that
file. This is a very simple process requiring commenting two lines and
uncommenting three lines. Then recompile only the Ada bindings and use
@@ -338,7 +338,7 @@
to type-convert the <literal>Real_Vector</literal> and
<literal>Real_Matrix</literal> objects in the user program so that they
are compatible with the declarations of Annex G.3 when accessing the
- numerics functionality in that annex. (In GNAT, the relevant file is
+ numerical functionality in that annex. (In GNAT, the relevant file is
<literal>a-nlrear.ads</literal>.)</para>
<para>This policy was changed in SVN version 11153. Before this, the
@@ -369,8 +369,8 @@
<para>Pragma Warnings (Off, "some text") and Pragma Warnings (On, "some
text") are used in the bindings to suppress warnings about a particular
- method used to intereface with C code. These pragmas are also used in
- Ada Exaamples 21 to suppress a particular warning. Pragma Warnings is a
+ method used to interface with C code. These pragmas are also used in
+ Ada Examples 21 to suppress a particular warning. Pragma Warnings is a
GNAT extension. Non-GNAT usage could simply remove these pragmas with
the resulting warnings ignored as they are benign.</para>
@@ -473,7 +473,7 @@
<literal>Draw_On_Black</literal>. Each of these manipulates color
map 0 by swapping black and white so that e.g.with
<literal>Draw_On_White</literal>, formerly white lines on a black
- background autotmatically become black lines on a white
+ background automatically become black lines on a white
background.</para>
</sect4>
</sect3>
@@ -490,7 +490,7 @@
<title>Multiplot_Pairs</title>
<para>Plot up to five <emphasis>x-y</emphasis> pairs with easy
- labeling, coloring, line width and styles, justification, and
+ labelling, coloring, line width and styles, justification, and
zooming.</para>
</sect4>
@@ -498,7 +498,7 @@
<title>Simple_Plot</title>
<para>Plot up to five <emphasis>y</emphasis>'s against a single
- <emphasis>x</emphasis> with easy labeling and automatic line colors
+ <emphasis>x</emphasis> with easy labelling and automatic line colors
and styles.</para>
</sect4>
@@ -527,7 +527,7 @@
<title>Simple_Plot_Pairs</title>
<para>Plot up to five <emphasis>x</emphasis>-<emphasis>y</emphasis>
- pairs with easy labeling and automatic line colors and
+ pairs with easy labelling and automatic line colors and
styles.</para>
</sect4>
@@ -566,7 +566,7 @@
<para>PLplot provides extensive manipulation and control of two
separate color maps, color map 0 and color map 1. The Ada binding
makes basic manipulations easier and also adds facilities for making
- snapshots of color map 0 so that any state of the map can easlily be
+ snapshots of color map 0 so that any state of the map can easily be
restored later. An initial snapshot is taken when the package is
initialized so that the default color settings can always be restored
after having been changed.</para>
@@ -803,7 +803,7 @@
<para>The custom label function <literal>Set_Custom_Label</literal>
(<literal>plslabelfunc</literal> in the traditional binding) can be
- called with null arguments to revert to using the default labeling
+ called with null arguments to revert to using the default labelling
scheme. Alternately, an Ada-only procedure with no arguments,
<literal>Use_Default_Labels</literal>, is provided. See Ada example 19
(<literal>x19a.adb</literal> or <literal>xthick19a.adb</literal>) for a
@@ -814,7 +814,7 @@
(<literal>plstransform</literal> in the traditional binding) can be
called with null arguments to clear any previous custom coordinate
transforms that the user has set, thus reverting to the default
- coordinate transform. Alternately, an Ada-only procdure with no
+ coordinate transform. Alternately, an Ada-only procedure with no
arguments, <literal>Clear_Custom_Coordinate_Transform</literal>, is
provided. See Ada example 19 (<literal>x19a.adb</literal> or
<literal>xthick19a.adb</literal>) for a usage example.</para>
@@ -887,7 +887,7 @@
<para>As discussed in Section 6.1, the bindings are made to work with
Ada 95 and Ada 2005, but special steps need to be taken in order to
- access the numerics capabilities of Ada 2005 to the extent that vectors
+ access the numerical capabilities of Ada 2005 to the extent that vectors
and arrays of the type defined in the Ada Reference Manual Annex G.3 are
required to be passed to PLplot routines.</para>
</sect2>
@@ -906,7 +906,7 @@
and <literal>PLplot_Auxiliary.adb</literal>. These files are currently
used to provide a few convenience subprograms that are used in the
examples. However, they are also associated with the above-mentioned
- facility to easily accommodate acessing the G.3 Annex vector-matrix
+ facility to easily accommodate accessing the G.3 Annex vector-matrix
manipulation facilities. If not for the desire for this easy "switching"
ability, the <literal>PLplot_Auxiliary</literal> package could be
removed from the <literal>with</literal> parts of the other binding
Modified: trunk/doc/docbook/src/advanced.xml
===================================================================
--- trunk/doc/docbook/src/advanced.xml 2013-09-23 22:07:57 UTC (rev 12520)
+++ trunk/doc/docbook/src/advanced.xml 2013-09-24 05:21:15 UTC (rev 12521)
@@ -664,7 +664,7 @@
</para>
<para>
- Additional startup routines &plstar; and &plstart; are available but
+ Additional start up routines &plstar; and &plstart; are available but
these are simply front-ends to &plinit;, and should be avoided. It
is preferable to call &plinit; directly, along with the appropriate
setup calls, for the greater amount of control this provides (see the
@@ -791,13 +791,13 @@
</sect2>
<sect2>
- <title>Initialise FreeType</title>
+ <title>Initialize FreeType</title>
- <para>Next, we have to initialise the FreeType library. For the
+ <para>Next, we have to initialize the FreeType library. For the
<filename>gd.c</filename> driver this is done via two separate functions due
- to the order that dependent information is initialised in the driver.</para>
+ to the order that dependent information is initialized in the driver.</para>
- <para>The "level 1" initialisation of FreeType does two things: 1) calls
+ <para>The "level 1" initialization of FreeType does two things: 1) calls
<literal>plD_FreeType_init(pls)</literal>, which in turn allocates memory to
the pls->FT structure; and 2) stores the location of the call back routine.
</para>
@@ -817,7 +817,7 @@
</programlisting>
</para>
- <para>This initialisation routine is called at the end of
+ <para>This initialization routine is called at the end of
<literal>plD_init_png_Dev(PLStream *pls)</literal> in the
<filename>gd.c</filename> driver:</para>
@@ -845,7 +845,7 @@
smoothing. Since there is nothing in PLStream to track smoothing, we have to
set the FT->smooth_text flag as well at this time.</para>
- <para>The "level 2" initialisation function initialises everything else
+ <para>The "level 2" initialization function initializes everything else
required for using the FreeType library but has to be called after the
screen resolution and dpi have been set. Therefore, it is called at the end
of <literal>plD_init_png()</literal>, where it looks like:
@@ -902,7 +902,7 @@
<para>Some coordinate systems have zero on the bottom, others have zero on
the top. FreeType does it one way, and most everything else does it the
- other. To make sure everything is working ok, we have to "flip" the
+ other. To make sure everything is working OK, we have to "flip" the
coordinates, and to do this we need to know how big in the Y dimension the
page is, and whether we have to invert the page or leave it alone.</para>
@@ -1416,7 +1416,7 @@
current color (as opposed to the background color) at any point in the
plot by selecting any of the colors from either color map 0 or 1 using
calls to &plcol0; or &plcol1;. When the current color is changed all
- subsequent drawing actions will utilise the new color until it is
+ subsequent drawing actions will utilize the new color until it is
changed again.
</para>
@@ -1479,7 +1479,7 @@
<para> There is a one-to-one correspondence between RGB and HLS color
spaces. RGB space is characterized by three 8-bit unsigned integers
corresponding to the intensity of the red, green, and blue colors. Thus,
- in hexidecimal notation with the 3 bytes concatanated together the RGB
+ in hexadecimal notation with the 3 bytes concatenated together the RGB
values of FF0000, FFFF00, 00FF00, 00FFFF, 0000FF, FF00FF, 000000, and
FFFFFF correspond to red, yellow, green, cyan, blue, magenta, black, and
white. </para>
@@ -1504,7 +1504,7 @@
<para> Here are some C-code fragments which use &plscmap1l; to set the
map1 color palette. This first example illustrates how to set up a
- gray-scale pallette using linear interpolation in RGB space.
+ gray-scale palette using linear interpolation in RGB space.
<programlisting> i[0] = 0.;
i[1] = 1.;
@@ -1537,7 +1537,7 @@
</para>
<para> This final example using &plscmap1l; illustrates how the default
- map1 color pallette is set with just 4 control points (taken from
+ map1 color palette is set with just 4 control points (taken from
<filename>src/plctrl.c</filename>).
<programlisting>/*--------------------------------------------------------------------------*\
@@ -1565,7 +1565,7 @@
i[3] = 1; /* right boundary */
/* For center control points, pick black or white, whichever is closer to bg */
- /* Be carefult to pick just short of top or bottom else hue info is lost */
+ /* Be careful to pick just short of top or bottom else hue info is lost */
if (plsc->cmap0 != NULL)
vertex = ((float) plsc->cmap0[0].r +
@@ -1607,7 +1607,7 @@
&plscmap1; so it is the programmer's responsibility to make sure that
the colors vary smoothly. Here is an example of the method taken from
<filename>examples/c/x08c.c</filename> which sets (yet again) the
- gray-scale color pallette.
+ gray-scale color palette.
<programlisting> for (i=0;i<n_col;i++)
rr[i] = gg[i] = bb[i] = i*256/n_col;
@@ -2455,11 +2455,11 @@
</para>
<para>
- Labeling a three-dimensional or mesh plot is somewhat more
+ Labelling a three-dimensional or mesh plot is somewhat more
complicated than a two dimensional plot due to the need for skewing
the characters in the label so that they are parallel to the
coordinate axes. The routine &plbox3; thus combines the functions of
- box drawing and labeling.
+ box drawing and labelling.
</para>
</sect1>
@@ -2778,7 +2778,7 @@
plot and typically identifying certain colors with certain numerical
values using an axis). &pllegend; is useful for visually annotating
most two-dimensional plots. See standard examples 4 and 26 for some
- examples. &plcolorbar; is especially useful for annotating continous
+ examples. &plcolorbar; is especially useful for annotating continuous
shade plots generated by &plshades;. See standard example 16 for an
example.
</para>
Modified: trunk/doc/docbook/src/api-c.xml
===================================================================
--- trunk/doc/docbook/src/api-c.xml 2013-09-23 22:07:57 UTC (rev 12520)
+++ trunk/doc/docbook/src/api-c.xml 2013-09-24 05:21:15 UTC (rev 12521)
@@ -40,7 +40,7 @@
<title>The Specialized C API for PLplot</title>
<para>
- The purpose of this chapter is to document the PLPlot C functions that are
+ The purpose of this chapter is to document the PLplot C functions that are
currently not part of the common API,
either because they are C/C++ specific utility
functions (e.g. &plAlloc2dGrid;, &plFree2dGrid;) or because they are not
@@ -636,7 +636,7 @@
<para>
Resets the internal command line options table to the default
- builtin value. Any user options added with &plMergeOpts; will be
+ built in value. Any user options added with &plMergeOpts; will be
cleared. See &plparseopts; for details of how to parse these
options in a program.
</para>
@@ -952,7 +952,7 @@
<sect1 id="pltr1" renderas="sect3">
<title>
<function>pltr1</function>: Linear interpolation for grid to world
- mapping using singly dimensioned coord arrays
+ mapping using singly dimensioned coordinate arrays
</title>
<para>
@@ -972,7 +972,7 @@
<para>
Linear interpolation for grid to world mapping using singly
- dimensioned coord arrays.
+ dimensioned coordinate arrays.
This routine can be used both for &plcont; and &plshade;.
See also <xref linkend="contour-plots-c"/> and
<xref linkend="shade-plots-c"/>.
@@ -1052,7 +1052,7 @@
<sect1 id="pltr2" renderas="sect3">
<title>
<function>pltr2</function>: Linear interpolation for grid to world
- mapping using doubly dimensioned coord arrays (column
+ mapping using doubly dimensioned coordinate arrays (column
dominant, as per normal C 2d arrays)
</title>
@@ -1073,7 +1073,7 @@
<para>
Linear interpolation for grid to world mapping using doubly
- dimensioned coord arrays (column dominant, as per normal C 2d arrays).
+ dimensioned coordinate arrays (column dominant, as per normal C 2d arrays).
This routine can be used both for &plcont; and &plshade;.
See also <xref linkend="contour-plots-c"/> and
<xref linkend="shade-plots-c"/>.
Modified: trunk/doc/docbook/src/api-compat.xml
===================================================================
--- trunk/doc/docbook/src/api-compat.xml 2013-09-23 22:07:57 UTC (rev 12520)
+++ trunk/doc/docbook/src/api-compat.xml 2013-09-24 05:21:15 UTC (rev 12521)
@@ -91,7 +91,7 @@
<para>
Since PLplot is developed by so many people, the task of checking for
- backwards compatiblity of the library is very hard. As for the 5.3.1
+ backwards compatibility of the library is very hard. As for the 5.3.1
release, we do not have any rigorous regression test for check
whether the library is really backwards compatible.
</para>
@@ -104,7 +104,7 @@
<para>
Check if there are any changes in
<filename>plplot.h</filename>. If no prototype is changed,
- then the chances are high that no backwards compatibilities
+ then the chances are high that no backwards incompatibilities
have been introduced. If new functions has been added, then
the library soname will be kept, although the soversion
strings in <filename>cmake/module/plplot_version.cmake</filename>
Modified: trunk/doc/docbook/src/api.xml
===================================================================
--- trunk/doc/docbook/src/api.xml 2013-09-23 22:07:57 UTC (rev 12520)
+++ trunk/doc/docbook/src/api.xml 2013-09-24 05:21:15 UTC (rev 12521)
@@ -52,8 +52,8 @@
</para>
<para>
- What follows is a list of all common API functions of the current
- CVS HEAD with their arguments except for obsolete/deprecated API
+ What follows is a list of all common API functions of the latest
+ PLplot version with their arguments except for obsolete/deprecated API
functions which are listed in <xref linkend="API-OBSOLETE"/>. The
following information is provided for each function:
<orderedlist>
@@ -632,9 +632,9 @@
</listitem>
<listitem>
<para>
- <literal>o</literal>: Use custom labeling function to
- generate axis label text. The custom labeling function
- can be defined with the plslabelfuncplslabelfunc; command.
+ <literal>o</literal>: Use custom labelling function to
+ generate axis label text. The custom labelling function
+ can be defined with the &plslabelfunc; command.
</para>
</listitem>
<listitem>
@@ -1072,9 +1072,9 @@
</listitem>
<listitem>
<para>
- <literal>o</literal>: Use custom labeling function to
- generate axis label text. The custom labeling function
- can be defined with the plslabelfuncplslabelfunc; command.
+ <literal>o</literal>: Use custom labelling function to
+ generate axis label text. The custom labelling function
+ can be defined with the &plslabelfunc; command.
</para>
</listitem>
<listitem>
@@ -1290,9 +1290,9 @@
</listitem>
<listitem>
<para>
- <literal>o</literal>: Use custom labeling function to
- generate axis label text. The custom labeling function
- can be defined with the plslabelfuncplslabelfunc; command.
+ <literal>o</literal>: Use custom labelling function to
+ generate axis label text. The custom labelling function
+ can be defined with the &plslabelfunc; command.
</para>
</listitem>
<listitem>
@@ -1472,9 +1472,9 @@
</listitem>
<listitem>
<para>
- <literal>o</literal>: Use custom labeling function to
- generate axis label text. The custom labeling function
- can be defined with the plslabelfuncplslabelfunc; command.
+ <literal>o</literal>: Use custom labelling function to
+ generate axis label text. The custom labelling function
+ can be defined with the &plslabelfunc; command.
</para>
</listitem>
<listitem>
@@ -1676,7 +1676,7 @@
and possibly more than one window (set of world coordinates) per
viewport, <literal><parameter>window</parameter></literal>
and the corresponding output world coordinates
- corresponds to the last window created that fulfils the criterion
+ corresponds to the last window created that fulfills the criterion
that the relative device coordinates are inside it. Finally, in
all cases where the input relative device coordinates are not
inside any viewport/window, then
@@ -6557,7 +6557,7 @@
</term>
<listitem>
<para>
- Plot coordinates to strecth the image data to. idata[0][0]
+ Plot coordinates to stretch the image data to. idata[0][0]
corresponds to (xmin, ymin) and idata[nx - 1][ny - 1] corresponds
to (xmax, ymax).
</para>
@@ -8207,7 +8207,7 @@
<para>
<literal><parameter>opt</parameter>=MAG_COLOR</literal>: Each line
in the mesh is colored according to the z value being plotted. The
- color is used from the current colormap 1.
+ color is used from the current color map 1.
</para>
</listitem>
<listitem>
@@ -13434,8 +13434,8 @@
<listitem>
<para>
This is the custom label function. In order to reset to the
- default labeling, set this to <literal>NULL</literal>.
- The labeling function parameters are, in order:
+ default labelling, set this to <literal>NULL</literal>.
+ The labelling function parameters are, in order:
<variablelist>
<varlistentry>
<term><parameter>axis</parameter></term>
@@ -13452,7 +13452,7 @@
<term><parameter>value</parameter></term>
<listitem>
<para>
- This is the value along the axis which is being labeled.
+ This is the value along the axis which is being labelled.
</para>
</listitem>
</varlistentry>
@@ -14325,7 +14325,7 @@
desired output device must be supplied as an argument. The device
keywords are the same as those printed out by &plstar;. If the
requested device is not available, or if the input string is empty or
- begins with ``?'', the prompted startup of &plstar; is used. This
+ begins with ``?'', the prompted start up of &plstar; is used. This
routine also divides the output device into
<literal><parameter>nx</parameter></literal> by
<literal><parameter>ny</parameter></literal> subpages, each of which
@@ -14343,7 +14343,7 @@
<para>
Device name (keyword) of the required output device. If NULL
or if the first character is a ``?'', the normal (prompted)
- startup is used.
+ start up is used.
</para>
</listitem>
</varlistentry>
@@ -14433,7 +14433,7 @@
<listitem>
<para>
Pointer to a function that defines a transformation from the
- input (x, y) coordinate to a new plot world coordiante.
+ input (x, y) coordinate to a new plot world coordinate.
</para>
</listitem>
</varlistentry>
@@ -14668,7 +14668,7 @@
<sect1 id="plstripa" renderas="sect3">
<title>
- <function>plstripa</function>: Add a point to a stripchart
+ <function>plstripa</function>: Add a point to a strip chart
</title>
<para>
@@ -14686,7 +14686,7 @@
</para>
<para>
- Add a point to a given pen of a given stripchart.
+ Add a point to a given pen of a given strip chart.
There is no need for all pens to have the same number of
points or to be equally sampled in the x coordinate.
Allocates memory and rescales as
@@ -14701,7 +14701,7 @@
</term>
<listitem>
<para>
- Identification number (set up in &plstripc;) of the stripchart.
+ Identification number (set up in &plstripc;) of the strip chart.
</para>
</listitem>
</varlistentry>
@@ -14752,7 +14752,7 @@
<sect1 id="plstripc" renderas="sect3">
<title>
- <function>plstripc</function>: Create a 4-pen stripchart
+ <function>plstripc</function>: Create a 4-pen strip chart
</title>
<para>
@@ -14786,7 +14786,7 @@
</para>
<para>
- Create a 4-pen stripchart, to be used afterwards by &plstripa;
+ Create a 4-pen strip chart, to be used afterwards by &plstripa;
</para>
<variablelist>
@@ -14797,7 +14797,7 @@
</term>
<listitem>
<para>
- Identification number of stripchart to use on &plstripa; and &plstripd;.
+ Identification number of strip chart to use on &plstripa; and &plstripd;.
</para>
</listitem>
</varlistentry>
@@ -15047,7 +15047,7 @@
<sect1 id="plstripd" renderas="sect3">
<title>
<function>plstripd</function>: Deletes and releases memory used by a
- stripchart
+ strip chart
</title>
<para>
@@ -15062,7 +15062,7 @@
</para>
<para>
- Deletes and releases memory used by a stripchart.
+ Deletes and releases memory used by a strip chart.
</para>
<variablelist>
@@ -15073,7 +15073,7 @@
</term>
<listitem>
<para>
- Identification number of stripchart to delete.
+ Identification number of strip chart to delete.
</para>
</listitem>
</varlistentry>
Modified: trunk/doc/docbook/src/bibliography.xml
===================================================================
--- trunk/doc/docbook/src/bibliography.xml 2013-09-23 22:07:57 UTC (rev 12520)
+++ trunk/doc/docbook/src/bibliography.xml 2013-09-24 05:21:15 UTC (rev 12521)
@@ -1,6 +1,6 @@
<!-- -*- mode: nxml -*- -->
<!--
- bilbiograpy.xml: "Bibliography" chapter
+ bibliography.xml: "Bibliography" chapter
Copyright (C) 1994 Geoffrey Furnish and Maurice LeBrun
Copyright (C) 1999, 2000, 2001, 2002, 2003 Alan W. Irwin and Rafael Laboissiere
Modified: trunk/doc/docbook/src/c.xml
===================================================================
--- trunk/doc/docbook/src/c.xml 2013-09-23 22:07:57 UTC (rev 12520)
+++ trunk/doc/docbook/src/c.xml 2013-09-24 05:21:15 UTC (rev 12521)
@@ -118,11 +118,11 @@
<para>
The one additional complicating factor concerns the use of stub routines to
interface with Fortran (see the following section for more explanation). On
- some systems, the Fortran and C namespaces are set up to clobber each other.
+ some systems, the Fortran and C name spaces are set up to clobber each other.
More reasonable (from our viewpoint) is to agree on a standard map between
- namespaces, such as the appending of an underscore to Fortran routine names
+ name spaces, such as the appending of an underscore to Fortran routine names
as is common on many Unix-like systems. The only case where the shared
- Fortran/C namespaces do any good is when passing a pointer to a like data
+ Fortran/C name spaces do any good is when passing a pointer to a like data
type, which represents only a small fraction of the cases that need to
be handled (which includes constant values passed on the stack, strings, and
two-dimensional arrays).
Modified: trunk/doc/docbook/src/cplus.xml
===================================================================
--- trunk/doc/docbook/src/cplus.xml 2013-09-23 22:07:57 UTC (rev 12520)
+++ trunk/doc/docbook/src/cplus.xml 2013-09-24 05:21:15 UTC (rev 12521)
@@ -190,7 +190,7 @@
<para>
The <literal>plstream</literal> class will provide an abstract interface to the
2-d drawing functions. Instead of forcing the C++ user to organize
- data in one of a small set of generally braindead data layouts with
+ data in one of a small set of generally brain dead data layouts with
poor memory management properties, potentially forcing the C++ user to
not use a superior method, or to copy data computed in one layout
format to another for plotting (with consequent bug production), the
Modified: trunk/doc/docbook/src/deploying.xml
===================================================================
--- trunk/doc/docbook/src/deploying.xml 2013-09-23 22:07:57 UTC (rev 12520)
+++ trunk/doc/docbook/src/deploying.xml 2013-09-24 05:21:15 UTC (rev 12521)
@@ -54,7 +54,7 @@
environment that you use, but that is in general only an option if your
user is comfortable with making programs themselves. A more common
situation is that your user just wants the executable programs and
- wants to get using them rightaway. We will focus on this particular
+ wants to get using them right away. We will focus on this particular
solution, as there are a few non-trivial issues.
</para>
@@ -306,7 +306,7 @@
</para>
<para>
- To summarise the case where you don't have a deb or rpm option, and
+ To summarize the case where you don't have a deb or rpm option, and
you must use inconsistent install locations on your users' machines:
<itemizedlist>
<listitem>
@@ -369,7 +369,7 @@
<envar>LD_LIBRARY_PATH</envar> and equivalents, can be set within
the program (by using a small configuration file or by determining the
position of the files relative to the program's location). They just
- have be set before PLplot is initialised.
+ have be set before PLplot is initialized.
</para>
</chapter>
Modified: trunk/doc/docbook/src/drivers.xml
===================================================================
--- trunk/doc/docbook/src/drivers.xml 2013-09-23 22:07:57 UTC (rev 12520)
+++ trunk/doc/docbook/src/drivers.xml 2013-09-24 05:21:15 UTC (rev 12521)
@@ -59,7 +59,7 @@
<para>
Plots are displayed one page at a time. The pager is advanced by
- pressing the Enter key, and may only be advanced in the foreward
+ pressing the Enter key, and may only be advanced in the forward
direction.
</para>
@@ -206,7 +206,7 @@
The available driver options are:
<itemizedlist>
<listitem><para>
- optimise: Optimise PNG palette when possible
+ optimize: Optimize PNG palette when possible
</para></listitem>
<listitem><para>
def_black15: Define idx 15 as black. If the background is
@@ -241,7 +241,7 @@
is based on the libharu library see:
<ulink url="http://libharu.sourceforge.net/">
http://libharu.sourceforge.net/</ulink>.
- At present only the hershey fonts are used and there is no support for
+ At present only the Hershey fonts are used and there is no support for
pdf or ttf fonts. Compression of the pdf output is not enabled and the
paper size can't be chosen. All these issues will be addressed in
later releases.
Modified: trunk/doc/docbook/src/intro.xml
===================================================================
--- trunk/doc/docbook/src/intro.xml 2013-09-23 22:07:57 UTC (rev 12520)
+++ trunk/doc/docbook/src/intro.xml 2013-09-24 05:21:15 UTC (rev 12521)
@@ -74,7 +74,7 @@
package. Sze Tan writes:
<blockquote>
<para>
- I'm rather amazed how far PLPLOT has traveled given its origins
+ I'm rather amazed how far PLPLOT has travelled given its origins
etc. I first used PGPLOT on the Starlink VAX computers while I was
a graduate student at the Mullard Radio Astronomy Observatory in
Cambridge from 1983-1987. At the beginning of 1986, I was to give a
@@ -86,7 +86,7 @@
able to draw a line or a dot on the screen in order to do arbitrary
graphics. The application programmer's interface was made as
similar as possible to PGPLOT so that I could easily port my
- programs from the VAX to the PC. The kernel of PLPLOT was modeled
+ programs from the VAX to the PC. The kernel of PLPLOT was modelled
on PGPLOT but the code is not derived from it.
</para>
</blockquote>
@@ -127,7 +127,7 @@
several new routines to enhance usage from Fortran and design of a
portable C to Fortran interface. Additional support was added for
coordinate mappings in contour plots and some bugs fixed. New
- labeling options were added. The font handling code was made more
+ labelling options were added. The font handling code was made more
flexible and portable. A portable PLplot metafile driver and
renderer was developed, allowing one to create a generic graphics
file and do the actual rendering later (even on a different
@@ -161,7 +161,7 @@
<para>
We welcome suggestions on how to improve this code, especially in
the form of user-contributed enhancements or bug fixes. If PLplot
- is used in any published papers, please include an acknowledgment
+ is used in any published papers, please include an acknowledgement
or citation of our work, which will help us to continue improving
PLplot. Please direct all communication to the general PLplot
mailing list, plp...@li....
@@ -175,7 +175,7 @@
the PLplot is by electronic transmission over the Internet. We
encourage others to make it available to users without Internet
access. PLplot is a SourceForge project and may be obtained by
- the usual SourceForge file release and anonymous cvs access that is made
+ the usual SourceForge file release and anonymous svn repository access that is made
available from links at
<ulink url="http://sourceforge.net/projects/plplot">http://sourceforge.net/projects/plplot</ulink>.
</para>
@@ -296,7 +296,7 @@
<sect2 id="additional-copyrights">
<title>Additional Copyrights</title>
<para>
- The startup code used in argument handling
+ The start up code used in argument handling
(<filename>utils/plrender.c</filename> and
<filename>src/plargs.c</filename>) is partially derived from
<filename>xterm.c</filename> of the X11R5 distribution, and its
Modified: trunk/doc/docbook/src/libraries.xml
===================================================================
--- trunk/doc/docbook/src/libraries.xml 2013-09-23 22:07:57 UTC (rev 12520)
+++ trunk/doc/docbook/src/libraries.xml 2013-09-24 05:21:15 UTC (rev 12521)
@@ -183,7 +183,7 @@
these limitations are not acceptable for plotting of scientific time
series and are addressed by the qsastime library which was originally
donated under the LGPL to the PLplot project in early 2009 by Anthony
- J. Allen of the QSAS team and substantially modifed after that by a
+ J. Allen of the QSAS team and substantially modified after that by a
PLplot developer, Alan W. Irwin (e.g., to add leap-second
functionality).
</para>
Modified: trunk/doc/docbook/src/ocaml.xml
===================================================================
--- trunk/doc/docbook/src/ocaml.xml 2013-09-23 22:07:57 UTC (rev 12520)
+++ trunk/doc/docbook/src/ocaml.xml 2013-09-24 05:21:15 UTC (rev 12521)
@@ -147,7 +147,7 @@
<para>
An important part of the OCaml bindings is the examples, some 31 of
which demonstrate how to use many of the features of the PLplot package.
- These examples also serve as a testbed for the bindings in OCaml and
+ These examples also serve as a test bed for the bindings in OCaml and
other languages by checking the Postscript files that are generated by
each example against those generated by the C versions. These examples
have been completely re-written in OCaml (but retain a C flavor in their
@@ -167,7 +167,7 @@
<title>Obtaining the OCaml compiler</title>
<para>
You will need the OCaml compiler in order to build and use the OCaml
- PLplot bindings. OCaml includes both a bytecode compiler (ocamlc) and
+ PLplot bindings. OCaml includes both a byte code compiler (ocamlc) and
a native code compiler (ocamlopt). Both of these are supported by
PLplot.
</para>
@@ -199,7 +199,7 @@
<ulink url="http://projects.camlcity.org/projects/findlib.html">
findlib
</ulink>
- and its associated tools (ie., ocamlfind) are installed in in your
+ and its associated tools (i.e., ocamlfind) are installed in in your
<literal>$PATH</literal>.
</para>
<para>
Modified: trunk/doc/docbook/src/simple.xml
===================================================================
--- trunk/doc/docbook/src/simple.xml 2013-09-23 22:07:57 UTC (rev 12520)
+++ trunk/doc/docbook/src/simple.xml 2013-09-24 05:21:15 UTC (rev 12521)
@@ -232,7 +232,7 @@
<listitem>
<para>
- <parameter>axis</parameter> = 0: Draw box, labeled with
+ <parameter>axis</parameter> = 0: Draw box, labelled with
coordinate values around edge.
</para>
</listitem>
@@ -304,15 +304,15 @@
</para>
<para>
- For greater control over the size of the plots, axis labeling and
+ For greater control over the size of the plots, axis labelling and
tick intervals, more complex graphs should make use of the functions
&plvpor;, &plvasp;, &plvpas;, &plwind;, &plbox;, and routines for
- manipulating axis labeling &plgxax; through &plszax;.
+ manipulating axis labelling &plgxax; through &plszax;.
</para>
</sect1>
<sect1 id="labelling">
- <title>Labeling the Graph</title>
+ <title>Labelling the Graph</title>
<para>
The function &pllab; may be called after &plenv; to write labels on
Modified: trunk/doc/docbook/src/tcl.xml
===================================================================
--- trunk/doc/docbook/src/tcl.xml 2013-09-23 22:07:57 UTC (rev 12520)
+++ trunk/doc/docbook/src/tcl.xml 2013-09-24 05:21:15 UTC (rev 12521)
@@ -860,7 +860,7 @@
</para>
<para>
- So, the point is, do your heavy numerics in a compiled language, and
+ So, the point is, do your heavy numerical calculations in a compiled language, and
feel free to use Tcl for the plotting, if you want to. You can of
course mix it up so that some plotting is done from Tcl and some from
a compiled language.
Modified: trunk/doc/docbook/src/wish.xml
===================================================================
--- trunk/doc/docbook/src/wish.xml 2013-09-23 22:07:57 UTC (rev 12520)
+++ trunk/doc/docbook/src/wish.xml 2013-09-24 05:21:15 UTC (rev 12521)
@@ -112,7 +112,7 @@
Having done this, you have essentially created a shell. That is, your
program can now execute shell scripts in the Tcl language. Tcl
provides support for basic control flow, variable substitution file
- i/o and subroutines. In addition to the builtin Tcl commands, you can
+ i/o and subroutines. In addition to the built in Tcl commands, you can
define your own subroutines as Tcl procedures which effectively
become new keywords.
</para>
@@ -480,10 +480,10 @@
/*
- * Specify a user-specific startup file to invoke if the
- * application is run interactively. Typically the startup
+ * Specify a user-specific start up file to invoke if the
+ * application is run interactively. Typically the start up
* file is "~/.apprc" where "app" is the name of the application.
- * If this line is deleted then no user-specific startup file
+ * If this line is deleted then no user-specific start up file
* will be run under any conditions.
*/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2013-09-23 22:08:00
|
Revision: 12520
http://sourceforge.net/p/plplot/code/12520
Author: airwin
Date: 2013-09-23 22:07:57 +0000 (Mon, 23 Sep 2013)
Log Message:
-----------
Update "AUTHORS" and "SEE ALSO" sections of the generated man pages.
Modified Paths:
--------------
trunk/doc/docbook/bin/api2man.pl.in
Modified: trunk/doc/docbook/bin/api2man.pl.in
===================================================================
--- trunk/doc/docbook/bin/api2man.pl.in 2013-09-23 21:52:25 UTC (rev 12519)
+++ trunk/doc/docbook/bin/api2man.pl.in 2013-09-23 22:07:57 UTC (rev 12520)
@@ -92,11 +92,10 @@
$opening = ".\\\" This page was automatically generated. Do not edit!\n.\\\" \n";
$closing = "
.SH AUTHORS
-Geoffrey Furnish and Maurice LeBrun wrote and maintain PLplot. This man page
-was automatically generated from the DocBook source of the PLplot
-documentation, maintained by Alan W. Irwin and Rafael Laboissiere.
+Many developers (who are credited at http://@PLPLOT_WEBSITE@/credits.php)
+have contributed to PLplot over its long history.
.SH SEE ALSO
-PLplot documentation at http://@PLPLOT_WEBSITE@/resources.
+PLplot documentation at http://@PLPLOT_WEBSITE@/documentation.php.
";
$manifest = "";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2013-09-23 21:52:29
|
Revision: 12519
http://sourceforge.net/p/plplot/code/12519
Author: airwin
Date: 2013-09-23 21:52:25 +0000 (Mon, 23 Sep 2013)
Log Message:
-----------
Disable generation of DVI form of documentation and drop references to
it on the generated website.
Modified Paths:
--------------
trunk/cmake/modules/docbook.cmake
trunk/doc/docbook/src/CMakeLists.txt
trunk/www/documentation.php.in
Modified: trunk/cmake/modules/docbook.cmake
===================================================================
--- trunk/cmake/modules/docbook.cmake 2013-09-23 19:30:11 UTC (rev 12518)
+++ trunk/cmake/modules/docbook.cmake 2013-09-23 21:52:25 UTC (rev 12519)
@@ -119,7 +119,7 @@
set(BUILD_HTML ON)
if(GZIP)
set(BUILD_PRINT ON)
- option(BUILD_DVI "BUILD dvi form of documentation" ON)
+ set(BUILD_DVI OFF CACHE BOOL "Build dvi form of documentation" FORCE)
else(GZIP)
set(BUILD_PRINT OFF)
message(STATUS
Modified: trunk/doc/docbook/src/CMakeLists.txt
===================================================================
--- trunk/doc/docbook/src/CMakeLists.txt 2013-09-23 19:30:11 UTC (rev 12518)
+++ trunk/doc/docbook/src/CMakeLists.txt 2013-09-23 21:52:25 UTC (rev 12519)
@@ -382,12 +382,12 @@
docbook_plplot-structs_txt
)
- file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/static_built_files
- "${BASE}.ps.gz\n"
- )
-
endif(BUILD_DVI)
+ file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/static_built_files
+ "${BASE}.ps.gz\n"
+ )
+
add_custom_command(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${BASE}.ps.gz
# xmlto --with-fop is currently (at least on Debian) craps out
@@ -801,9 +801,9 @@
)
set(tarball_depends_list
- ${CMAKE_CURRENT_BINARY_DIR}/${HTML_TARBALL}
${CMAKE_CURRENT_BINARY_DIR}/${INFO_TARBALL}
${CMAKE_CURRENT_BINARY_DIR}/${MAN_TARBALL}
+ ${CMAKE_CURRENT_BINARY_DIR}/${HTML_TARBALL}
)
if(BUILD_PRINT)
Modified: trunk/www/documentation.php.in
===================================================================
--- trunk/www/documentation.php.in 2013-09-23 19:30:11 UTC (rev 12518)
+++ trunk/www/documentation.php.in 2013-09-23 21:52:25 UTC (rev 12519)
@@ -17,7 +17,6 @@
<li> <a href="docbook-manual/@BASE_HTML@">Browse the latest on-line documentation</a> </li>
<li> <a href="docbook-manual/@BASE@.ps.gz">PostScript form of documentation (<?php $size = number_format((filesize("docbook-manual/@BASE@.ps.gz")/1024/1024),2); echo $size;?> MB)</a> </li>
<li> <a href="docbook-manual/@BASE@.pdf">PDF form of documentation (<?php $size = number_format((filesize("docbook-manual/@BASE@.pdf")/1024/1024),2); echo $size;?> MB)</a> </li>
- <li> <a href="docbook-manual/@BASE@.dvi">DVI form of documentation (<?php $size = number_format((filesize("docbook-manual/@BASE@.dvi")/1024/1024),2); echo $size;?> MB)</a> </li>
<li> <a href="docbook-manual/@BASE_INFO@.tar.gz">Info documentation tarball (<?php $size = number_format((filesize("docbook-manual/@BASE_INFO@.tar.gz")/1024/1024),2); echo $size;?> MB)</a> </li>
<li> <a href="docbook-manual/@BASE_MAN@.tar.gz">Man pages tarball (API chapter in nroff format) (<?php $size = number_format((filesize("docbook-manual/@BASE_MAN@.tar.gz")/1024/1024),2); echo $size;?> MB)</a> </li>
<li> <a href="docbook-manual/@BASE_HTML@.tar.gz">HTML results tarball (<?php $size = number_format((filesize("docbook-manual/@BASE_HTML@.tar.gz")/1024/1024),2); echo $size;?> MB)</a> </li>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2013-09-23 19:30:15
|
Revision: 12518
http://sourceforge.net/p/plplot/code/12518
Author: airwin
Date: 2013-09-23 19:30:11 +0000 (Mon, 23 Sep 2013)
Log Message:
-----------
Add sections describing work on plcolorbar and the pllegend and plcolorbar
documentation.
Reword the section describing the width changes.
colour ==> color.
Modified Paths:
--------------
trunk/README.release
Modified: trunk/README.release
===================================================================
--- trunk/README.release 2013-09-23 19:22:13 UTC (rev 12517)
+++ trunk/README.release 2013-09-23 19:30:11 UTC (rev 12518)
@@ -33,6 +33,8 @@
1.2 Python support for Numeric has been dropped
1.3 Non-integer line widths allowed
1.4 Improvements to the build system for the Cygwin case
+1.5 The plcolorbar API has been finalized
+1.6 Documentation of the new legend and color bar capabilities of PLplot
2. Changes relative to PLplot 5.8.0 (the previous stable release)
@@ -95,12 +97,14 @@
2.54 Python support for Numeric has been dropped
2.55 Non-integer line widths allowed
2.56 Improvements to the build system for the Cygwin case
+2.57 The plcolorbar API has been finalized
+2.58 Documentation of the new legend and color bar capabilities of PLplot
OFFICIAL NOTICES FOR USERS
(5.9.10) The long deprecated support for the python Numeric package has been
dropped. This is no longer supported and is superceded by numpy. Support for
-numpy has been the default in plplot for a number of years so most users
+numpy has been the default in PLplot for a number of years so most users
should notice no difference.
(5.9.10) The current format for maps used by plmap has been deprecated in
@@ -291,7 +295,7 @@
font fallback), falls back to ugly software fills, doesn't support
alpha transparency, etc. It also has a serious run-time issue with
example 2 (double free detected by glibc) which probably indicates
-some fundamental issue with the 100 colours in cmap0 for that
+some fundamental issue with the 100 colors in cmap0 for that
example. For those who really need portable pixmap results, we suggest
using the ImageMagick convert programme, e.g., "convert
examples/x24c01.pngqt test.ppm" or "convert examples/x24c01.pngcairo
@@ -307,7 +311,7 @@
some mainstream (e.g., Intel) chipsets. All of these characteristics
make it difficult to even test this device much less use it for
anything serious. Finally, it has had a well-known issue for years
-(incorrect colours) which has never been fixed indicating nobody is
+(incorrect colors) which has never been fixed indicating nobody is
interested in maintaining this device.
(5.9.6) We have retired our platform support of djgpp that used to
@@ -492,10 +496,15 @@
1.3 Non-integer line widths allowed
-All functions which take line width arguments (plwid, plshade*, pllegend)
-now support PLFLT values for the line width. This allows drivers which
-support this to take advantage of fine line widths. This is an API change
-from previous releases.
+All functions which take line width arguments (plwidth, plshade*,
+pllegend) now use PLFLT values for the line width. This allows device
+drivers which are based on modern graphics libraries such as Qt4 and
+pango/cairo to make full use (e.g., extremely fine line widths) of the
+floating-point line width capabilities of those libraries. The
+replacement of plwid by plwidth, and the change in argument lists for
+plshade* and pllegend constitute a backwards incompatible API change
+from previous releases and the soname of libraries has been bumped
+accordingly (which forces a recompile).
1.4 Improvements to the build system for the Cygwin case
@@ -516,6 +525,36 @@
access to the many high-quality PLplot devices that are available with
these two different device drivers.
+1.5 The plcolorbar API has been finalized
+
+The function plcolorbar allows users to create a color bar (an
+annotated subplot representing a continuous range of colors within the
+main plot and typically identifying certain colors with certain
+numerical values using an axis). The plcolorbar capabilities are
+documented in our DocBook (and doxygen) documentation and demonstrated
+in standard examples 16 and 33.
+
+N.B. The previous two releases (5.9.8 and 5.9.9) contained
+unadvertised experimental versions of plcolorbar. Any PLplot user who
+found and tried those capabilities will have to reprogramme their
+plcolorbar calls to be compatible with the argument list of the latest
+version.
+
+1.6. Documentation of the new legend and color bar capabilities of PLplot
+
+The pllegend and plcolorbar API has been documented in both doxygen
+and DocBook forms. In addition, the "advanced use" chapter of the
+DocBook form of documentation now contains a section giving an
+overview of pllegend and plcolorbar.
+
+N.B. Although we feel the pllegend and plcolorbar API has now been
+finalized with regard to the PLplot core developers own interests and
+needs, we also realize that as more and more PLplot users take
+advantage of these new PLplot capabilities there will likely be calls
+to add additional features to pllegend or plcolorbar based on
+additional experience with these powerful capabilities. In general,
+we would welcome such feature requests.
+
2. Changes relative to PLplot 5.8.0 (the previous stable release)
2.1 All autotools-related files have now been removed
@@ -1049,7 +1088,7 @@
(e.g., axis labels) will then use it for command-line input of
floating-point values as well.
-Certain critical areas of the PLplot library (e.g., our colour palette file
+Certain critical areas of the PLplot library (e.g., our color palette file
reading routines and much of the code in our device drivers) absolutely
require a period for the decimal separator. We now protect those critical
areas by saving the normal PLplot LC_NUMERIC locale (established with the
@@ -1064,7 +1103,7 @@
2.37 Linear gradients have been implemented
The new plgradient routine draws a linear gradient (based on the
-current colour map 1) at a specified angle with the x axis for a
+current color map 1) at a specified angle with the x axis for a
specified polygon. Standard examples 25 and 30 now demonstrate use of
plgradient. Some devices use a software fallback to render the
gradient. This fallback is implemented with plshades which uses a
@@ -1201,7 +1240,6 @@
(most of which are optional) within that legend. The resulting legend
is clipped at the boundaries of the current subpage
-
2.45 Add full bindings and examples for the D language.
As of release 5.9.5 we added full bindings and examples for the D
@@ -1361,10 +1399,15 @@
2.55 Non-integer line widths allowed
-All functions which take line width arguments (plwid, plshade*, pllegend)
-now support PLFLT values for the line width. This allows drivers which
-support this to take advantage of fine line widths. This is an API change
-from previous releases.
+All functions which take line width arguments (plwidth, plshade*,
+pllegend) now use PLFLT values for the line width. This allows device
+drivers which are based on modern graphics libraries such as Qt4 and
+pango/cairo to make full use (e.g., extremely fine line widths) of the
+floating-point line width capabilities of those libraries. The
+replacement of plwid by plwidth, and the change in argument lists for
+plshade* and pllegend constitute a backwards incompatible API change
+from previous releases and the soname of libraries has been bumped
+accordingly (which forces a recompile).
2.56 Improvements to the build system for the Cygwin case
@@ -1384,3 +1427,34 @@
drivers on the Cygwin platform giving our Windows users convenient
access to the many high-quality PLplot devices that are available with
these two different device drivers.
+
+2.57 The plcolorbar API has been finalized
+
+The function plcolorbar allows users to create a color bar (an
+annotated subplot representing a continuous range of colors within the
+main plot and typically identifying certain colors with certain
+numerical values using an axis). The plcolorbar capabilities are
+documented in our DocBook (and doxygen) documentation and demonstrated
+in standard examples 16 and 33.
+
+N.B. The previous two releases (5.9.8 and 5.9.9) contained
+unadvertised experimental versions of plcolorbar. Any PLplot user who
+found and tried those capabilities will have to reprogramme their
+plcolorbar calls to be compatible with the argument list of the latest
+version.
+
+2.58 Documentation of the new legend and color bar capabilities of PLplot
+
+The pllegend and plcolorbar API has been documented in both doxygen
+and DocBook forms. In addition, the "advanced use" chapter of the
+DocBook form of documentation now contains a section giving an
+overview of pllegend and plcolorbar.
+
+N.B. Although we feel the pllegend and plcolorbar API has now been
+finalized with regard to the PLplot core developers own interests and
+needs, we also realize that as more and more PLplot users take
+advantage of these new PLplot capabilities there will likely be calls
+to add additional features to pllegend or plcolorbar based on
+additional experience with these powerful capabilities. In general,
+we would welcome such feature requests.
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2013-09-23 19:22:15
|
Revision: 12517
http://sourceforge.net/p/plplot/code/12517
Author: airwin
Date: 2013-09-23 19:22:13 +0000 (Mon, 23 Sep 2013)
Log Message:
-----------
colour ==> color.
Modified Paths:
--------------
trunk/doc/docbook/src/advanced.xml
Modified: trunk/doc/docbook/src/advanced.xml
===================================================================
--- trunk/doc/docbook/src/advanced.xml 2013-09-23 18:24:27 UTC (rev 12516)
+++ trunk/doc/docbook/src/advanced.xml 2013-09-23 19:22:13 UTC (rev 12517)
@@ -3,7 +3,7 @@
advanced.xml: "Advanced Use of PLplot" chapter
Copyright (C) 1994 Geoffrey Furnish and Maurice LeBrun
-Copyright (C) 1999, 2000, 2001, 2002, 2005 Alan W. Irwin
+Copyright (C) 1999-2013 Alan W. Irwin
Copyright (C) 1999, 2000, 2001, 2002, 2003 Rafael Laboissiere
Copyright (C) 2004 Andrew Roach
Copyright (C) 2005 Thomas J. Duck
@@ -776,7 +776,7 @@
<para>First, write a call back function, of type
<literal>plD_pixel_fp</literal>, which specifies how a single pixel is set
- in the current colour. This can be of type static void. For example, in the
+ in the current color. This can be of type static void. For example, in the
<filename>gd.c</filename> driver it looks like this:
<programlisting>
@@ -914,8 +914,8 @@
<para>We also do some computational gymnastics to "expand" cmap0 if the user
wants anti-aliased text. Basically, you have to work out how many spare
- colours there are in the driver after cmap0 and cmap1 are done, then set a
- few variables in FT to let the render know how many colours it's going to
+ colors there are in the driver after cmap0 and cmap1 are done, then set a
+ few variables in FT to let the render know how many colors it's going to
have at its disposal, and call plscmap0n to resize cmap0. The call to
<literal>pl_set_extended_cmap0</literal> does the remaining part of the
work. Note it essential to protect that call by the
@@ -1404,7 +1404,7 @@
if so desired) using &plscolor;. </para>
<para> The PLplot color model allows the user to set the current
- color from a wide range of colours using two distinct color maps.
+ color from a wide range of colors using two distinct color maps.
Color map0 (discussed in <xref linkend="color-map-0"/>) has discrete
colors with no particular order and is most suited to coloring the
background, axes, lines, and labels, and color map1 (discussed in
@@ -2774,8 +2774,8 @@
provide users with the capability of visually annotating their plots
with a legend (a series of patterned boxes, lines, or symbols with
associated explanatory UTF-8 text) or a color bar (an annotated
- subplot representing a continuous range of colours within the main
- plot and typically identifying certain colours with certain numerical
+ subplot representing a continuous range of colors within the main
+ plot and typically identifying certain colors with certain numerical
values using an axis). &pllegend; is useful for visually annotating
most two-dimensional plots. See standard examples 4 and 26 for some
examples. &plcolorbar; is especially useful for annotating continous
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2013-09-23 18:24:29
|
Revision: 12516
http://sourceforge.net/p/plplot/code/12516
Author: airwin
Date: 2013-09-23 18:24:27 +0000 (Mon, 23 Sep 2013)
Log Message:
-----------
Add section in advanced.xml concerning the pllegend and plcolorbar
capabilities.
Modified Paths:
--------------
trunk/doc/docbook/src/advanced.xml
Modified: trunk/doc/docbook/src/advanced.xml
===================================================================
--- trunk/doc/docbook/src/advanced.xml 2013-09-22 10:01:44 UTC (rev 12515)
+++ trunk/doc/docbook/src/advanced.xml 2013-09-23 18:24:27 UTC (rev 12516)
@@ -2767,4 +2767,38 @@
</sect1>
+ <sect1 id="legends">
+ <title>Legends and color bars</title>
+ <para>
+ The &pllegend; and &plcolorbar; routines are available in PLplot to
+ provide users with the capability of visually annotating their plots
+ with a legend (a series of patterned boxes, lines, or symbols with
+ associated explanatory UTF-8 text) or a color bar (an annotated
+ subplot representing a continuous range of colours within the main
+ plot and typically identifying certain colours with certain numerical
+ values using an axis). &pllegend; is useful for visually annotating
+ most two-dimensional plots. See standard examples 4 and 26 for some
+ examples. &plcolorbar; is especially useful for annotating continous
+ shade plots generated by &plshades;. See standard example 16 for an
+ example.
+ </para>
+
+ <para>
+ The &pllegend; and &plcolorbar; routines provide the users complete
+ and convenient control of the size and position of the results on the
+ plot and also return size data that makes it straightforward to stack
+ different legend or colorbar results together on the plot (see
+ standard example 33 for an example of this capability). Furthermore,
+ the &pllegend; and &plcolorbar; routines provide the user with many
+ different style possibilities for the results. Because of all these
+ features, &pllegend; and &plcolorbar; have an extensive argument list.
+ So we recommend first-time users of &pllegend; and &plcolorbar; use
+ examples 4, 16, and 26 as a tutorial on how to use these PLplot
+ capabilities in a simple way, and for more advanced use we recommend
+ that users study the &pllegend; and &plcolorbar; documentation and
+ also example 33 which attempts to exercise most capabilities of these
+ two PLplot functions.
+ </para>
+ </sect1>
+
</chapter>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <arj...@us...> - 2013-09-22 10:01:47
|
Revision: 12515
http://sourceforge.net/p/plplot/code/12515
Author: arjenmarkus
Date: 2013-09-22 10:01:44 +0000 (Sun, 22 Sep 2013)
Log Message:
-----------
Changed the general reference to the Wiki to the specific page regarding Cygwin.
Modified Paths:
--------------
trunk/README.release
Modified: trunk/README.release
===================================================================
--- trunk/README.release 2013-09-22 05:46:07 UTC (rev 12514)
+++ trunk/README.release 2013-09-22 10:01:44 UTC (rev 12515)
@@ -105,10 +105,10 @@
(5.9.10) The current format for maps used by plmap has been deprecated in
favour of using shapefiles (a standard format widely used for GIS and with
-suitable free data sources available). This requires the shapelib library
+suitable free data sources available). This requires the shapelib library
to be installed. If this library is not installed then by default no map
-support will be available. Support for the old binary format is still
-available by setting the cmake variable PL_DEPRECATED, however this
+support will be available. Support for the old binary format is still
+available by setting the cmake variable PL_DEPRECATED, however this
support will be removed in a future release of PLplot.
(5.9.10) Those who use the Python version of plgriddata will have to
@@ -170,7 +170,7 @@
as well all g77's legacy features).
An important consequence is that we can not test the implementation for
-compliance to the FORTRAN 77 standard.
+compliance to the FORTRAN 77 standard.
Furthermore, we would prefer to concentrate all our Fortran
development effort on our f95 bindings and strongly encourage all our
Fortran users to use those bindings if they haven't switched from the
@@ -473,28 +473,28 @@
1.1 The format for map data used by plmap has changed
-The format for map data used by plmap is now the shapefile format.
+The format for map data used by plmap is now the shapefile format.
This is a widely used standard format and there are many sources of data
in this format. This replaces the custom binary format that PLplot used
-to use. The support for reading shapefiles is provided by the shapelib
+to use. The support for reading shapefiles is provided by the shapelib
library, which is a new dependency for PLplot. If users do not have this
-installed then, by default, they will not get any map capabilites with
+installed then, by default, they will not get any map capabilites with
PLplot. Support for the old format can still be enabled by setting the
-PL_DEPRECATED cmake variable, but this support will be removed in a
+PL_DEPRECATED cmake variable, but this support will be removed in a
subsequent PLplot release.
1.2 Python support for Numeric has been dropped
-Support for the python Numeric package has been dropped. This has been
-deprecated since 5.9.6. Numeric is no longer supported and is superceded
-by numpy. Support for numpy has been the default in plplot for a number
+Support for the python Numeric package has been dropped. This has been
+deprecated since 5.9.6. Numeric is no longer supported and is superceded
+by numpy. Support for numpy has been the default in plplot for a number
of years so most users should notice no difference.
1.3 Non-integer line widths allowed
All functions which take line width arguments (plwid, plshade*, pllegend)
now support PLFLT values for the line width. This allows drivers which
-support this to take advantage of fine line widths. This is an API change
+support this to take advantage of fine line widths. This is an API change
from previous releases.
1.4 Improvements to the build system for the Cygwin case
@@ -508,8 +508,8 @@
CMake-based build system to adjust for these recent CMake changes for
Cygwin, we have indeed confirmed that prediction for the PLplot case.
There are still some Cygwin platform issues left which are being
-discussed on our Wiki at http://www.miscdebris.net/plplot_wiki/, but
-some fundamental breakthroughs have also been made for the Cygwin case
+discussed on our Wiki at http://www.miscdebris.net/plplot_wiki/index.php?title=Setup_cygwin,
+but some fundamental breakthroughs have also been made for the Cygwin case
that should interest all our Windows users. For example, for the
first time ever we have been able to build our cairo and qt device
drivers on the Cygwin platform giving our Windows users convenient
@@ -1342,28 +1342,28 @@
2.53 The format for map data used by plmap has changed
-The format for map data used by plmap is now the shapefile format.
+The format for map data used by plmap is now the shapefile format.
This is a widely used standard format and there are many sources of data
in this format. This replaces the custom binary format that PLplot used
to use. The support for reading shapefiles is provided by the shapelib
library, which is a new dependency for PLplot. If users do not have this
installed then, by default, they will not get any map capabilites with
PLplot. Support for the old format can still be enabled by setting the
-PL_DEPRECATED cmake variable, but this support will be removed in a
+PL_DEPRECATED cmake variable, but this support will be removed in a
subsequent PLplot release.
2.54 Python support for Numeric has been dropped
-Support for the python Numeric package has been dropped. This has been
-deprecated since 5.9.6. Numeric is no longer supported and is superceded
-by numpy. Support for numpy has been the default in plplot for a number
+Support for the python Numeric package has been dropped. This has been
+deprecated since 5.9.6. Numeric is no longer supported and is superceded
+by numpy. Support for numpy has been the default in plplot for a number
of years so most users should notice no difference.
2.55 Non-integer line widths allowed
All functions which take line width arguments (plwid, plshade*, pllegend)
now support PLFLT values for the line width. This allows drivers which
-support this to take advantage of fine line widths. This is an API change
+support this to take advantage of fine line widths. This is an API change
from previous releases.
2.56 Improvements to the build system for the Cygwin case
@@ -1377,8 +1377,8 @@
CMake-based build system to adjust for these recent CMake changes for
Cygwin, we have indeed confirmed that prediction for the PLplot case.
There are still some Cygwin platform issues left which are being
-discussed on our Wiki at http://www.miscdebris.net/plplot_wiki/, but
-some fundamental breakthroughs have also been made for the Cygwin case
+discussed on our Wiki at http://www.miscdebris.net/plplot_wiki/index.php?title=Setup_cygwin,
+but some fundamental breakthroughs have also been made for the Cygwin case
that should interest all our Windows users. For example, for the
first time ever we have been able to build our cairo and qt device
drivers on the Cygwin platform giving our Windows users convenient
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
1 message has been excluded from this view by a project administrator.
