From: <ai...@us...> - 2008-10-18 19:33:42
|
Revision: 8920 http://plplot.svn.sourceforge.net/plplot/?rev=8920&view=rev Author: airwin Date: 2008-10-18 19:33:37 +0000 (Sat, 18 Oct 2008) Log Message: ----------- Add plplot_logo.py, a Python script to generate a logo for PLplot. This script should be run with the -geometry 800x120 option in the installed examples tree and that will produce the basic plot result that is needed for the logo. However, additional improvements to this logo (adjustments of the underlying plot as well as shading and overall text still to be added) are planned. Modified Paths: -------------- trunk/examples/python/CMakeLists.txt Added Paths: ----------- trunk/examples/python/plplot_logo.py Modified: trunk/examples/python/CMakeLists.txt =================================================================== --- trunk/examples/python/CMakeLists.txt 2008-10-18 00:17:07 UTC (rev 8919) +++ trunk/examples/python/CMakeLists.txt 2008-10-18 19:33:37 UTC (rev 8920) @@ -68,6 +68,7 @@ prova.py xw14.py xw17.py +plplot_logo.py ) if(ENABLE_pygcw) Added: trunk/examples/python/plplot_logo.py =================================================================== --- trunk/examples/python/plplot_logo.py (rev 0) +++ trunk/examples/python/plplot_logo.py 2008-10-18 19:33:37 UTC (rev 8920) @@ -0,0 +1,106 @@ +#!/usr/bin/env python + +# Copyright (C) 2008 Alan W. Irwin +# +# This file is part of PLplot. +# +# PLplot is free software; you can redistribute it and/or modify +# it under the terms of the GNU Library General Public License as published +# by the Free Software Foundation; version 2 of the License. +# +# PLplot is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Library General Public License for more details. +# +# You should have received a copy of the GNU Library General Public License +# along with the file PLplot; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + + +# Generate PLplot logo. + +# Append to effective python path so that can find plplot modules. +from plplot_python_start import * + +import sys +from plplot import * + +# Parse and process command line arguments +plparseopts(sys.argv, PL_PARSE_FULL) + +# Initialize plplot +plinit() + +from plplot_py_demos import * + +XPTS = 35 # Data points in x +YPTS = 46 # Data points in y + +alt = 60.0 +az = 30.0 +# Routine for defining a specific color map 1 in HLS space. +# if gray is true, use basic grayscale variation from half-dark to light. +# otherwise use false color variation from blue (240 deg) to red (360 deg). +def cmap1_init(gray): + # Independent variable of control points. + i = array((0., 1.)) + if gray: + # Hue for control points. Doesn't matter since saturation is zero. + h = array((0., 0.)) + # Lightness ranging from half-dark (for interest) to light. + l = array((0.5, 1.)) + # Gray scale has zero saturation + s = array((0., 0.)) + else: + # Hue ranges from blue (240 deg) to red (0 or 360 deg) + h = array((240., 0.)) + # Lightness and saturation are constant (values taken from C example). + l = array((0.6, 0.6)) + s = array((0.8, 0.8)) + + # number of cmap1 colours is 256 in this case. + plscmap1n(256) + # Interpolate between control points to set up cmap1. + plscmap1l(0, i, h, l, s) + +def main(): + + rosen = 1 + x = (arange(XPTS) - (XPTS / 2)) / float(XPTS / 2) + y = (arange(YPTS) - (YPTS / 2)) / float(YPTS / 2) + if rosen == 1: + x = 1.5*x + y = 0.5 + y + x.shape = (-1,1) + r2 = (x*x) + (y*y) + z = (1. - x)*(1. - x) + 100 * (x*x - y)*(x*x - y) + # The log argument may be zero for just the right grid. */ + z = log(choose(greater(z,0.), (exp(-5.), z))) + + x.shape = (-1,) + zmin = min(z.flat) + zmax = max(z.flat) + nlevel = 10 + step = (zmax-zmin)/(nlevel+1) + clevel = zmin + step + arange(nlevel)*step + plschr(0., 1.5) + plwid(1) + pladv(0) + plvpor(0.0, 1.0, 0.0, 1.0) + plwind(-0.3, 0.8, 0.05, 0.4) + plcol0(1) + plw3d(1.0, 1.0, 1.0, -1.5, 1.5, -0.5, 1.5, zmin, zmax, + alt, az) + plbox3("bnstu", "x axis", 0.0, 0, + "bnstu", "y axis", 0.0, 0, + "bcdmnstuv", "z axis", 0.0, 0) + + plcol0(2) + # magnitude colored plot with faceted squares + cmap1_init(0) + plsurf3d(x, y, z, MAG_COLOR | FACETED, ()) + +main() +# Terminate plplot +plend() Property changes on: trunk/examples/python/plplot_logo.py ___________________________________________________________________ Added: svn:executable + * Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2008-10-19 07:50:29
|
Revision: 8929 http://plplot.svn.sourceforge.net/plplot/?rev=8929&view=rev Author: airwin Date: 2008-10-19 07:50:20 +0000 (Sun, 19 Oct 2008) Log Message: ----------- Initial commit of README.logo which explains how plplot_logo.py is used to create the logo. Modified Paths: -------------- trunk/examples/python/CMakeLists.txt Added Paths: ----------- trunk/examples/python/README.logo Modified: trunk/examples/python/CMakeLists.txt =================================================================== --- trunk/examples/python/CMakeLists.txt 2008-10-19 06:23:19 UTC (rev 8928) +++ trunk/examples/python/CMakeLists.txt 2008-10-19 07:50:20 UTC (rev 8929) @@ -101,6 +101,7 @@ python_DATA ${python_DATA} README.pythondemos +README.logo qplplot.py ) Added: trunk/examples/python/README.logo =================================================================== --- trunk/examples/python/README.logo (rev 0) +++ trunk/examples/python/README.logo 2008-10-19 07:50:20 UTC (rev 8929) @@ -0,0 +1,90 @@ +N.B. This logo production example is not considered to be one of the +standard examples because it has been excessively fine-tuned, and may +be subject to further fine-tuning (which we do not want to keep propagating +to all the rest of the languages). + +To produce an SVG form of the logo with -dev svg (which is the device which +plplot_logo.py has been explicitly tuned for) execute (only in the installed +examples/python directory!) + +./plplot_logo.py -dev svg -o plplot_logo.svg -geometry 760x120 + +# Patch to apply native SVG gradient. Since this patch is problematic (see +below) use --dry-run first to make sure it will work. + +patch --dry-run <svg_760x120_gradient.patch +patch <svg_760x120_gradient.patch + +N.B. This patch is problematic because it depends on the exact command +above and absolutely no changes to the svg.c device-driver code or +libplplotd code or even platform dependent rounding. So in general it +shouldn't be considered a working patch (unless --dry-run says it will +apply, see above). Instead, it should be considered a method of reminding +human editors of the plplot_logo.svg file of the simple changes that are +necessary to apply a native SVG opacity gradient as a background to the +legend of the logo. + +The patched results look great on konqueror, but they are slow to render. +The patched results also look good for display (for the default compensation +for text shifts) and take very little time to render. + +Partially because of the file-bloating issue discussed on list (lots of +graphical objects outside device boundaries that are still included in the +file, the size of the file is 1.8M. (Of course, another reason for this +large file size is there is incredible detail (many triangles) used to +represent the surface. + +If I compress that file using + +gzip -c <plplot_logo.svg >| plplot_logo.svgz + +then the result is only 97 K (which is mostly reasonable) and a factor of +almost 20 (!) in size over uncompressed. Other results follow: + +(1) The compressed result can still be quickly rendered with "display". + +(2) The compressed result makes no difference to the slow konqueror rendering, +but that is konqueror's problem and not ours because of how quicky "display" +renders the result. + +(3) Firefox 2 does not know what to do with the compressed result. For +the uncompressed result it does not recognize the gradient. These two +issues should be checked for firefox 3. + +(4) scribus-ng quickly imports the compressed result with the same issues (no +clipping of results at the stated boundary of the device) as for the +uncompressed results. + +(5) The compressed result is completely unrecognized by the w3c validator. +However, the uncompressed result (after a long upload) validates properly +at w3c. + +Until the *.svgz compressed form becomes well-recognized (not least by w3c), +it is probably best to convert to jpeg to improve rendering speed/reduce +bandwidth compared to the uncompressed svg file. This convert step also +appears to get rid of everything outside the device boundaries. + +convert plplot_logo.svg.gz plplot_logo.jpeg + +The result has a file size of 34K compared to the original jpeg logo +(www/img/header.jpg) put together by Werner (with external editor?) which +has a file size of 42K and which lacks a legend for the logo. The "z axis" +label is shifted a bit by ImageMagick because of the librsvg-2.22 bug, and +until this bug is fixed I have put a default option into the original +plplot_logo.py file to compensate for this bug. The result looks +essentially the same as the original logo (by design and fine-tuning of +plplot_logo.py), but the *.svgz form looks substantially better (if only it +would be more widely recognized). + +The future prospects of reducing the uncompressed size of the *.svg result +to a reasonable value and the compressed size of the *.svgz result to a +miniscule value are good. First, the solution of the file bloating issue +discussed on list (many graphical objects outside the device boundary +clipping limits are included unnecessarily in the file) should reduce the +file size by roughly a factor of three. An even bigger reduction factor +for file size is expected when native gradients for file formats that +support them become supported by PLplot since that means the triangles used +to represent colour surfaces in PLplot can be made much larger without +compromising how good the result looks. + +Alan W. Irwin 2008-10-19 Property changes on: trunk/examples/python/README.logo ___________________________________________________________________ Added: svn:eol-style + native This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2008-10-19 07:52:10
|
Revision: 8930 http://plplot.svn.sourceforge.net/plplot/?rev=8930&view=rev Author: airwin Date: 2008-10-19 07:52:06 +0000 (Sun, 19 Oct 2008) Log Message: ----------- Initial commit of patch for applying an opacity gradient as background to the legend used for the logo. Modified Paths: -------------- trunk/examples/python/CMakeLists.txt Added Paths: ----------- trunk/examples/python/svg_760x120_gradient.patch Modified: trunk/examples/python/CMakeLists.txt =================================================================== --- trunk/examples/python/CMakeLists.txt 2008-10-19 07:50:20 UTC (rev 8929) +++ trunk/examples/python/CMakeLists.txt 2008-10-19 07:52:06 UTC (rev 8930) @@ -102,6 +102,7 @@ ${python_DATA} README.pythondemos README.logo +svg_760x120_gradient.patch qplplot.py ) Added: trunk/examples/python/svg_760x120_gradient.patch =================================================================== --- trunk/examples/python/svg_760x120_gradient.patch (rev 0) +++ trunk/examples/python/svg_760x120_gradient.patch 2008-10-19 07:52:06 UTC (rev 8930) @@ -0,0 +1,28 @@ +--- plplot_logo.svg 2008-10-18 23:16:48.000000000 -0700 ++++ plplot_logo_edited.svg 2008-10-18 23:17:25.000000000 -0700 +@@ -64209,13 +64209,18 @@ + fill="#000000" + fill-opacity="1.000000" + points="0.00,0.00 0.00,119.98 76.01,119.98 76.01,0.00 0.00,0.00 0.00,0.00 "/> +- <polyline +- stroke-width="1" +- stroke="#000000" +- stroke-opacity="0.300000" +- fill="#000000" +- fill-opacity="0.300000" +- points="76.01,0.00 76.01,119.98 607.96,119.98 607.96,0.00 76.01,0.00 "/> ++ <g> ++ <defs> ++ <linearGradient id="MyGradient"> ++ <stop offset="0%" stop-color="#000" stop-opacity="1." /> ++ <stop offset="100%" stop-color="#000" stop-opacity="0." /> ++ </linearGradient> ++ </defs> ++ <polyline ++ stroke-width="1" ++ fill="url(#MyGradient)" ++ points="76.01,0.00 76.01,119.98 607.96,119.98 607.96,0.00 76.01,0.00 "/> ++ </g> + <clipPath + id="text-clipping19" + > Property changes on: trunk/examples/python/svg_760x120_gradient.patch ___________________________________________________________________ Added: svn:eol-style + native This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2008-12-10 01:55:28
|
Revision: 9066 http://plplot.svn.sourceforge.net/plplot/?rev=9066&view=rev Author: airwin Date: 2008-12-10 01:49:05 +0000 (Wed, 10 Dec 2008) Log Message: ----------- Forgot xw14.py and xw17.py are able to stand on their own so change back x14 and x17 to previous versions which simply include the *.py versions (revision 9063). Revision Links: -------------- http://plplot.svn.sourceforge.net/plplot/?rev=9063&view=rev Modified Paths: -------------- trunk/examples/python/x14 trunk/examples/python/x17 Modified: trunk/examples/python/x14 =================================================================== --- trunk/examples/python/x14 2008-12-10 01:38:06 UTC (rev 9065) +++ trunk/examples/python/x14 2008-12-10 01:49:05 UTC (rev 9066) @@ -19,22 +19,4 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# Run all python plplot examples non-interactively. - -# Append to effective python path so that can find plplot modules. -from plplot_python_start import * - -import sys -from plplot import * - -# Parse and process command line arguments -plparseopts(sys.argv, PL_PARSE_FULL) - -# Initialize plplot -plinit() - import xw14 - -# Terminate plplot -plend() - Modified: trunk/examples/python/x17 =================================================================== --- trunk/examples/python/x17 2008-12-10 01:38:06 UTC (rev 9065) +++ trunk/examples/python/x17 2008-12-10 01:49:05 UTC (rev 9066) @@ -19,22 +19,4 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# Run all python plplot examples non-interactively. - -# Append to effective python path so that can find plplot modules. -from plplot_python_start import * - -import sys -from plplot import * - -# Parse and process command line arguments -plparseopts(sys.argv, PL_PARSE_FULL) - -# Initialize plplot -plinit() - import xw17 - -# Terminate plplot -plend() - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2008-12-10 01:55:34
|
Revision: 9064 http://plplot.svn.sourceforge.net/plplot/?rev=9064&view=rev Author: airwin Date: 2008-12-10 01:35:07 +0000 (Wed, 10 Dec 2008) Log Message: ----------- Bring x14 and x17 in line with other examples. Modified Paths: -------------- trunk/examples/python/x14 trunk/examples/python/x17 Modified: trunk/examples/python/x14 =================================================================== --- trunk/examples/python/x14 2008-12-10 01:00:14 UTC (rev 9063) +++ trunk/examples/python/x14 2008-12-10 01:35:07 UTC (rev 9064) @@ -19,4 +19,22 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +# Run all python plplot examples non-interactively. + +# Append to effective python path so that can find plplot modules. +from plplot_python_start import * + +import sys +from plplot import * + +# Parse and process command line arguments +plparseopts(sys.argv, PL_PARSE_FULL) + +# Initialize plplot +plinit() + import xw14 + +# Terminate plplot +plend() + Modified: trunk/examples/python/x17 =================================================================== --- trunk/examples/python/x17 2008-12-10 01:00:14 UTC (rev 9063) +++ trunk/examples/python/x17 2008-12-10 01:35:07 UTC (rev 9064) @@ -19,4 +19,22 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +# Run all python plplot examples non-interactively. + +# Append to effective python path so that can find plplot modules. +from plplot_python_start import * + +import sys +from plplot import * + +# Parse and process command line arguments +plparseopts(sys.argv, PL_PARSE_FULL) + +# Initialize plplot +plinit() + import xw17 + +# Terminate plplot +plend() + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2008-12-10 04:42:32
|
Revision: 9069 http://plplot.svn.sourceforge.net/plplot/?rev=9069&view=rev Author: airwin Date: 2008-12-10 04:42:26 +0000 (Wed, 10 Dec 2008) Log Message: ----------- Cleanup. For example, random not needed anymore. Modified Paths: -------------- trunk/examples/python/plplot_py_demos.py.numeric trunk/examples/python/plplot_py_demos.py.numpy Modified: trunk/examples/python/plplot_py_demos.py.numeric =================================================================== --- trunk/examples/python/plplot_py_demos.py.numeric 2008-12-10 03:05:19 UTC (rev 9068) +++ trunk/examples/python/plplot_py_demos.py.numeric 2008-12-10 04:42:26 UTC (rev 9069) @@ -1,9 +1,5 @@ - from plplot import * from Numeric import * -# Random Array is only used for example 21, which currently doesn't -# work with Numeric anyway due to griddata problems. -#from RandomArray import random def isnan(x): return (x != x) Modified: trunk/examples/python/plplot_py_demos.py.numpy =================================================================== --- trunk/examples/python/plplot_py_demos.py.numpy 2008-12-10 03:05:19 UTC (rev 9068) +++ trunk/examples/python/plplot_py_demos.py.numpy 2008-12-10 04:42:26 UTC (rev 9069) @@ -1,6 +1,2 @@ - from plplot import * from numpy import * -from numpy.random import random - - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2008-12-10 21:12:24
|
Revision: 9083 http://plplot.svn.sourceforge.net/plplot/?rev=9083&view=rev Author: airwin Date: 2008-12-10 21:12:20 +0000 (Wed, 10 Dec 2008) Log Message: ----------- Fix obvious namespace issues. However, there is a deeper issue with plplotcanvas that these fixes do not address. Modified Paths: -------------- trunk/examples/python/plplotcanvas_animation.py trunk/examples/python/plplotcanvas_demo.py Modified: trunk/examples/python/plplotcanvas_animation.py =================================================================== --- trunk/examples/python/plplotcanvas_animation.py 2008-12-10 18:37:34 UTC (rev 9082) +++ trunk/examples/python/plplotcanvas_animation.py 2008-12-10 21:12:20 UTC (rev 9083) @@ -67,7 +67,7 @@ canvas1=None # Create the x array -x = ${PYTHON_NUMERIC_NAME}.arange(NPTS) +x = plplot_py_demos.arange(NPTS) # Lock on the gtkstate so that we don't try to plot after gtk_main_quit GTKSTATE_CONTINUE=True @@ -108,7 +108,7 @@ Nstream = canvas.get_stream_number() # Generate the sinusoid - y = ${PYTHON_NUMERIC_NAME}.sin(2.*3.14*(x+offset*(Nstream+1))/PERIOD/(Nstream+1)) + y = plplot_py_demos.sin(2.*3.14*(x+offset*(Nstream+1))/PERIOD/(Nstream+1)) # Draw the line canvas.line(x, y) @@ -177,7 +177,7 @@ if __name__ == "__main__": # Parse the options - plplot.plparseopts(sys.argv,plplot.PL_PARSE_FULL); + plplot_py_demos.plparseopts(sys.argv,plplot_py_demos.PL_PARSE_FULL); # Initialize gtk.threads_init() Modified: trunk/examples/python/plplotcanvas_demo.py =================================================================== --- trunk/examples/python/plplotcanvas_demo.py 2008-12-10 18:37:34 UTC (rev 9082) +++ trunk/examples/python/plplotcanvas_demo.py 2008-12-10 21:12:20 UTC (rev 9083) @@ -51,10 +51,10 @@ gtk.main_quit() # Parse the options -plplot.plparseopts(sys.argv,plplot.PL_PARSE_FULL); +plplot_py_demos.plparseopts(sys.argv,plplot_py_demos.PL_PARSE_FULL); # The data to plot -x = ${PYTHON_NUMERIC_NAME}.arange(11) +x = plplot_py_demos.arange(11) y = x**2/10. # Create the canvas and set its size; during the creation process, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2008-12-16 15:11:36
|
Revision: 9136 http://plplot.svn.sourceforge.net/plplot/?rev=9136&view=rev Author: andrewross Date: 2008-12-16 15:11:32 +0000 (Tue, 16 Dec 2008) Log Message: ----------- Update python examples 1, 3, 13 and 29 consistent with recent C example changes. Note example 31 is not yet implemented. Also note that example 1 does not work correctly with pythondemos.py since it now uses plstar rather than plinit and plssub. Modified Paths: -------------- trunk/examples/python/x01 trunk/examples/python/x03 trunk/examples/python/xw01.py trunk/examples/python/xw13.py trunk/examples/python/xw29.py Modified: trunk/examples/python/x01 =================================================================== --- trunk/examples/python/x01 2008-12-16 14:53:20 UTC (rev 9135) +++ trunk/examples/python/x01 2008-12-16 15:11:32 UTC (rev 9136) @@ -33,7 +33,8 @@ print "PLplot library version: " + version # Initialize plplot -plinit() +# Do plots on 4 subwindows of the first page +plstar(2,2) import xw01 Modified: trunk/examples/python/x03 =================================================================== --- trunk/examples/python/x03 2008-12-16 14:53:20 UTC (rev 9135) +++ trunk/examples/python/x03 2008-12-16 15:11:32 UTC (rev 9136) @@ -30,6 +30,10 @@ # Parse and process command line arguments plparseopts(sys.argv, PL_PARSE_FULL) +# Set orientation to landscape - note not all device drivers +# support this, in particular most interactive drivers do not +plsori(1) + # Initialize plplot plinit() Modified: trunk/examples/python/xw01.py =================================================================== --- trunk/examples/python/xw01.py 2008-12-16 14:53:20 UTC (rev 9135) +++ trunk/examples/python/xw01.py 2008-12-16 15:11:32 UTC (rev 9136) @@ -19,9 +19,8 @@ # essentially a nop. However, for the case when other examples are run # first, this call to pladv is absolutely essential to finish the # preceding page. - pladv(0) - # Do plots on 4 subwindows of the first page - plssub(2, 2) + # This is not needed if we use plstar? + #pladv(0) # Do a plot with one range of data Modified: trunk/examples/python/xw13.py =================================================================== --- trunk/examples/python/xw13.py 2008-12-16 14:53:20 UTC (rev 9135) +++ trunk/examples/python/xw13.py 2008-12-16 15:11:32 UTC (rev 9136) @@ -12,7 +12,12 @@ def main(): - plenv(0., 10., 0., 10., 1, -2) + pladv(0) + # Ensure window has aspect ratio of one so circle is + # plotted as a circle. + plvasp(1.0) + plwind(0., 10., 0., 10.) + #plenv(0., 10., 0., 10., 1, -2) plcol0(2) #if these don't add up to 100, the logic adds to the last to make #up the balance. Modified: trunk/examples/python/xw29.py =================================================================== --- trunk/examples/python/xw29.py 2008-12-16 14:53:20 UTC (rev 9135) +++ trunk/examples/python/xw29.py 2008-12-16 15:11:32 UTC (rev 9136) @@ -39,6 +39,8 @@ #-------------------------------------------------------------------------- def main(): + + plsesc('@') plot1() @@ -51,7 +53,7 @@ def plot1(): # Data points every 10 minutes for 1 day - npts = 145; + npts = 73; xmin = 0.0; xmax = 60.0*60.0*24.0; # Number of seconds in a day @@ -60,9 +62,16 @@ x = xmax*arange(npts)/float(npts) y = 15.0 - 5.0*cos(2*pi*x/xmax) + xerr1 = x-60.0*5.0 + xerr2 = x+60.0*5.0 + yerr1 = y-0.1 + yerr2 = y+0.1 pladv(0) + plsmaj(0.0,0.5) + plsmin(0.0,0.5) + plvsta() plwind(xmin, xmax, ymin, ymax) @@ -73,12 +82,18 @@ plbox("bcnstd", 3.0*60*60, 3, "bcnstv", 1, 5) plcol0(3) - pllab("Time (hours:mins)", "Temperature (degC)", "#frPLplot Example 29 - Daily temperature") + pllab("Time (hours:mins)", "Temperature (degC)", "@frPLplot Example 29 - Daily temperature") plcol0(4) plline(x, y) + plcol0(2) + plerrx(xerr1,xerr2,y) + plcol0(3) + plerry(x,yerr1,yerr2) + plsmin(0.0,1.0) + plsmaj(0.0,1.0) # Plot the number of hours of daylight as a function of day for a year def plot2(): @@ -104,16 +119,18 @@ plcol0(1) # Set time format to be abbreviated month name followed by day of month pltimefmt("%b %d") + plprec(1,1) plenv(xmin, xmax, ymin, ymax, 0, 40) plcol0(3) - pllab("Date", "Hours of daylight", "#frPLplot Example 29 - Hours of daylight at 51.5N") + pllab("Date", "Hours of daylight", "@frPLplot Example 29 - Hours of daylight at 51.5N") plcol0(4) plline(x, y) + plprec(0,0) def plot3(): @@ -146,10 +163,11 @@ plbox("bcnstd", 14*24.0*60.0*60.0,14, "bcnstv", 1, 4) plcol0(3) - pllab("Date", "Hours of television watched", "#frPLplot Example 29 - Hours of television watched in Dec 2005 / Jan 2006") + pllab("Date", "Hours of television watched", "@frPLplot Example 29 - Hours of television watched in Dec 2005 / Jan 2006") plcol0(4) + plssym(0.0,0.5) plpoin(x, y, 2) plline(x, y) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fu...@us...> - 2009-06-30 19:38:04
|
Revision: 10102 http://plplot.svn.sourceforge.net/plplot/?rev=10102&view=rev Author: furnish Date: 2009-06-30 19:37:36 +0000 (Tue, 30 Jun 2009) Log Message: ----------- Resuscitation tweaks. Much more work still needed. Modified Paths: -------------- trunk/examples/python/pytkdemo trunk/examples/python/x01.py trunk/examples/python/x02.py trunk/examples/python/x03.py trunk/examples/python/x04.py trunk/examples/python/x05.py trunk/examples/python/x07.py trunk/examples/python/x08.py trunk/examples/python/x09.py trunk/examples/python/x10.py trunk/examples/python/x11.py trunk/examples/python/x12.py trunk/examples/python/x13.py trunk/examples/python/x16.py Modified: trunk/examples/python/pytkdemo =================================================================== --- trunk/examples/python/pytkdemo 2009-06-30 19:37:10 UTC (rev 10101) +++ trunk/examples/python/pytkdemo 2009-06-30 19:37:36 UTC (rev 10102) @@ -6,6 +6,9 @@ from Tkinter import * +from plplot import * +from plplot_widget import * + import Plframe from Plframe import * @@ -38,12 +41,15 @@ s.create_widgets() s.pack( expand=1, fill=BOTH ) - plspause(1) + #plspause(1) def create_widgets(s): s.f = Frame(s) s.make_demo_bar( s.f ) + print "Time to register the plframe with the interp..." + Pltk_init( s.tk.interpaddr() ); + s.plf = PlXframe(s, width="17c", height="17c" ) s.f2 = Frame(s) Modified: trunk/examples/python/x01.py =================================================================== --- trunk/examples/python/x01.py 2009-06-30 19:37:10 UTC (rev 10101) +++ trunk/examples/python/x01.py 2009-06-30 19:37:36 UTC (rev 10102) @@ -16,8 +16,8 @@ sys.path.insert (0, module_dir) -from Numeric import * -from pl import * +from numpy import * +from plplot import * # main # @@ -104,6 +104,7 @@ global x, y, xscale, yscale, xoff, yoff, xs, ys + w.plbop() ## x = [] ## y = [] ## for i in range(60): @@ -159,6 +160,7 @@ global x, y, xscale, yscale, xoff, yoff, xs, ys + w.plbop() # Set up the viewport and window using pl.env. The range in X # is -2.0 to 10.0, and the range in Y is -0.4 to 2.0. The axes # are scaled separately (just = 0), and we draw a box with Modified: trunk/examples/python/x02.py =================================================================== --- trunk/examples/python/x02.py 2009-06-30 19:37:10 UTC (rev 10101) +++ trunk/examples/python/x02.py 2009-06-30 19:37:36 UTC (rev 10102) @@ -19,6 +19,7 @@ def main(w): + w.plbop() # Divide screen into 16 regions w.plssub(4, 4) Modified: trunk/examples/python/x03.py =================================================================== --- trunk/examples/python/x03.py 2009-06-30 19:37:10 UTC (rev 10101) +++ trunk/examples/python/x03.py 2009-06-30 19:37:36 UTC (rev 10102) @@ -4,7 +4,7 @@ # # Polar plot demo. -from Numeric import * +from numpy import * import math #import pl import sys Modified: trunk/examples/python/x04.py =================================================================== --- trunk/examples/python/x04.py 2009-06-30 19:37:10 UTC (rev 10101) +++ trunk/examples/python/x04.py 2009-06-30 19:37:36 UTC (rev 10102) @@ -4,7 +4,7 @@ # # Log plot demo. -from Numeric import * +from numpy import * import math #import pl import sys Modified: trunk/examples/python/x05.py =================================================================== --- trunk/examples/python/x05.py 2009-06-30 19:37:10 UTC (rev 10101) +++ trunk/examples/python/x05.py 2009-06-30 19:37:36 UTC (rev 10102) @@ -4,7 +4,7 @@ # # Histogram demo. -from Numeric import * +from numpy import * import math #import pl import sys Modified: trunk/examples/python/x07.py =================================================================== --- trunk/examples/python/x07.py 2009-06-30 19:37:10 UTC (rev 10101) +++ trunk/examples/python/x07.py 2009-06-30 19:37:36 UTC (rev 10102) @@ -4,7 +4,7 @@ # # Font demo. -import pl +#import pl import sys import os Modified: trunk/examples/python/x08.py =================================================================== --- trunk/examples/python/x08.py 2009-06-30 19:37:10 UTC (rev 10101) +++ trunk/examples/python/x08.py 2009-06-30 19:37:36 UTC (rev 10102) @@ -4,9 +4,8 @@ # # 3-d plot demo. -from Numeric import * +from numpy import * import math -#import pl import sys import os Modified: trunk/examples/python/x09.py =================================================================== --- trunk/examples/python/x09.py 2009-06-30 19:37:10 UTC (rev 10101) +++ trunk/examples/python/x09.py 2009-06-30 19:37:36 UTC (rev 10102) @@ -1,7 +1,7 @@ #!/usr/bin/env python import math -from Numeric import * +from numpy import * from pl import * import sys import os Modified: trunk/examples/python/x10.py =================================================================== --- trunk/examples/python/x10.py 2009-06-30 19:37:10 UTC (rev 10101) +++ trunk/examples/python/x10.py 2009-06-30 19:37:36 UTC (rev 10102) @@ -4,7 +4,6 @@ # # Window positioning demo. -import pl import sys import os Modified: trunk/examples/python/x11.py =================================================================== --- trunk/examples/python/x11.py 2009-06-30 19:37:10 UTC (rev 10101) +++ trunk/examples/python/x11.py 2009-06-30 19:37:36 UTC (rev 10102) @@ -4,7 +4,7 @@ # # Mesh plot demo. -from Numeric import * +from numpy import * import math #import pl import sys Modified: trunk/examples/python/x12.py =================================================================== --- trunk/examples/python/x12.py 2009-06-30 19:37:10 UTC (rev 10101) +++ trunk/examples/python/x12.py 2009-06-30 19:37:36 UTC (rev 10102) @@ -4,7 +4,6 @@ # # Bar chart demo. -import pl import sys import os Modified: trunk/examples/python/x13.py =================================================================== --- trunk/examples/python/x13.py 2009-06-30 19:37:10 UTC (rev 10101) +++ trunk/examples/python/x13.py 2009-06-30 19:37:36 UTC (rev 10102) @@ -5,7 +5,6 @@ # Pie chart demo. import math -#import pl import sys import os Modified: trunk/examples/python/x16.py =================================================================== --- trunk/examples/python/x16.py 2009-06-30 19:37:10 UTC (rev 10101) +++ trunk/examples/python/x16.py 2009-06-30 19:37:36 UTC (rev 10102) @@ -8,7 +8,7 @@ # plshade demo, using color fill. -from Numeric import * +from numpy import * from math import * def main(w): This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <hba...@us...> - 2009-07-02 17:05:22
|
Revision: 10110 http://plplot.svn.sourceforge.net/plplot/?rev=10110&view=rev Author: hbabcock Date: 2009-07-02 17:05:19 +0000 (Thu, 02 Jul 2009) Log Message: ----------- Rename and touch up the (still very simple) PyQt4 example. Modified Paths: -------------- trunk/examples/python/CMakeLists.txt Added Paths: ----------- trunk/examples/python/pyqt4_example.py Modified: trunk/examples/python/CMakeLists.txt =================================================================== --- trunk/examples/python/CMakeLists.txt 2009-07-02 16:57:25 UTC (rev 10109) +++ trunk/examples/python/CMakeLists.txt 2009-07-02 17:05:19 UTC (rev 10110) @@ -103,7 +103,7 @@ set( python_SCRIPTS ${python_SCRIPTS} - pyqt4_test.py + pyqt4_example.py ) endif(ENABLE_pyqt4) Copied: trunk/examples/python/pyqt4_example.py (from rev 10108, trunk/examples/python/pyqt4_test.py) =================================================================== --- trunk/examples/python/pyqt4_example.py (rev 0) +++ trunk/examples/python/pyqt4_example.py 2009-07-02 17:05:19 UTC (rev 10110) @@ -0,0 +1,59 @@ +#!/usr/bin/env python +# +# A simple PLplot/PyQt example +# +# Copyright (C) 2009 Hazen Babcock +# +# This file is part of PLplot. +# +# PLplot is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Library Public License as published +# by the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# PLplot is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Library General Public License for more details. +# +# You should have received a copy of the GNU Library General Public License +# along with PLplot; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +# + + +import sys +from PyQt4 import QtCore, QtGui +import plplot +import plplot_pyqt4 + +class QPlot(QtGui.QMainWindow): + def __init__(self): + QtGui.QMainWindow.__init__(self, None) + + self.plot = plplot_pyqt4.QtExtWidget(800, 800, self) + self.setCentralWidget(self.plot) + + plplot_pyqt4.plsetqtdev(self.plot) + plplot.plsdev("extqt") + plplot.plinit() + + self.resize(400,400) + + def cleanup(self): + plplot.plend() + plplot_pyqt4.plfreeqtdev() + + def paintEvent(self, event): + plplot.pladv(0) + plplot.plenv(0, 10, 0, 10, 0, 0) + plplot.pllab("X", "Y", "X vs Y") + self.plot.show() + + +app = QtGui.QApplication(sys.argv) +plot = QPlot() +plot.show() +app.exec_() +plot.cleanup() + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2009-12-02 00:34:01
|
Revision: 10658 http://plplot.svn.sourceforge.net/plplot/?rev=10658&view=rev Author: airwin Date: 2009-12-02 00:33:49 +0000 (Wed, 02 Dec 2009) Log Message: ----------- Make python examples 25 and 30 produce consistent results (especially plgradient results) with their C counterparts. Modified Paths: -------------- trunk/examples/python/xw25.py trunk/examples/python/xw30.py Modified: trunk/examples/python/xw25.py =================================================================== --- trunk/examples/python/xw25.py 2009-12-02 00:30:21 UTC (rev 10657) +++ trunk/examples/python/xw25.py 2009-12-02 00:33:49 UTC (rev 10658) @@ -51,38 +51,41 @@ [ -80.0, 80.0 ], [ -120.0, 120.0 ] ] - for j in range(4): + for k in range(2): + for j in range(4): + + # Polygon 1: a diamond + if (j == 0): + x0 = [0, -100, 0, 100] + y0 = [-100, 0, 100, 0] + # Polygon 2: a diamond - reverse direction + elif (j == 1): + x0 = [100, 0, -100, 0] + y0 = [0, 100, 0, -100] + # Polygon 3: a square with punctures + elif (j == 2): + x0 = [-100, -100, 80, -100, -100, -80, 0, 80, 100, 100] + y0 = [-100, -80, 0, 80, 100, 100, 80, 100, 100, -100] + # Polygon 4: a square with punctures - reverse direction + elif (j == 3): + x0 = [100, 100, 80, 0, -80, -100, -100, 80, -100, -100] + y0 = [-100, 100, 100, 80, 100, 100, 80, 0, -80, -100] + + for i in range(9): + pladv(0) + plvsta() + plwind(xextreme[i][0], xextreme[i][1], yextreme[i][0], yextreme[i][1]) - # Polygon 1: a diamond - if (j == 0): - x0 = [0, -100, 0, 100] - y0 = [-100, 0, 100, 0] - # Polygon 2: a diamond - reverse direction - elif (j == 1): - x0 = [100, 0, -100, 0] - y0 = [0, 100, 0, -100] - # Polygon 3: a square with punctures - elif (j == 2): - x0 = [-100, -100, 80, -100, -100, -80, 0, 80, 100, 100] - y0 = [-100, -80, 0, 80, 100, 100, 80, 100, 100, -100] - # Polygon 4: a square with punctures - reverse direction - elif (j == 3): - x0 = [100, 100, 80, 0, -80, -100, -100, 80, -100, -100] - y0 = [-100, 100, 100, 80, 100, 100, 80, 0, -80, -100] + plcol0(2) + plbox("bc", 1.0, 0, "bcnv", 10.0, 0) + plcol0(1) + plpsty(0) + if (k == 0): + plfill(x0,y0) + else: + plgradient(x0, y0, 45.) + plcol0(2) + pllsty(1) + plline(x0,y0) - for i in range(9): - pladv(0) - plvsta() - plwind(xextreme[i][0], xextreme[i][1], yextreme[i][0], yextreme[i][1]) - - plcol0(2) - plbox("bc", 1.0, 0, "bcnv", 10.0, 0) - plcol0(1) - plpsty(0) - plfill(x0,y0) - plcol0(2) - pllsty(1) - plline(x0,y0) - - main() Modified: trunk/examples/python/xw30.py =================================================================== --- trunk/examples/python/xw30.py 2009-12-02 00:30:21 UTC (rev 10657) +++ trunk/examples/python/xw30.py 2009-12-02 00:33:49 UTC (rev 10658) @@ -112,27 +112,23 @@ py[3] = py[2] plfill(px, py) - # The overlaid box is drawn using plshades with a color map that is - # the same color but has a linearly varying transparency. - # Create the color map with 128 colors and use plscmap1la to initialize - # the color values with a linear varying transparency (or alpha) + # the color values with a linear varying red transparency (or alpha) plscmap1n(128) plscmap1la(1, pos, rcoord, gcoord, bcoord, acoord, rev) - # Create a 2 x 2 array that contains the z values (0.0 to 1.0) that will - # used for the shade plot. plshades will use linear interpolation to - # calculate the z values of all the intermediate points in this array. - z = reshape(zeros(2*2),(2,2)) - z[0][1] = 1.0 - z[1][1] = 1.0 + # Use that cmap1 to create a transparent red gradient for the whole + # window. + px[0] = 0. + px[1] = 1. + px[2] = 1. + px[3] = 0. + + py[0] = 0. + py[1] = 0. + py[2] = 1. + py[3] = 1. - # Set the color levels array. These levels are also between 0.0 and 1.0 - clevel = 0.01*arange(101) + plgradient(px, py, 90.) - # Draw the shade plot with zmin = 0.0, zmax = 1.0 and x and y coordinate - # ranges such that it fills the entire plotting area. - plshades(z, 0.0, 1.0, 0.0, 1.0, clevel, 0, 1) - - main() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2011-07-01 06:27:27
|
Revision: 11782 http://plplot.svn.sourceforge.net/plplot/?rev=11782&view=rev Author: airwin Date: 2011-07-01 06:27:21 +0000 (Fri, 01 Jul 2011) Log Message: ----------- Implement test_style.py to show all possible line patterns and area fill patterns for display using pllegend. Modified Paths: -------------- trunk/examples/python/CMakeLists.txt Added Paths: ----------- trunk/examples/python/test_style.py Modified: trunk/examples/python/CMakeLists.txt =================================================================== --- trunk/examples/python/CMakeLists.txt 2011-06-22 20:45:39 UTC (rev 11781) +++ trunk/examples/python/CMakeLists.txt 2011-07-01 06:27:21 UTC (rev 11782) @@ -88,6 +88,7 @@ test_gradient.py test_type1.py test_hebrew_diacritic.py + test_style.py ) if(ENABLE_tk) Added: trunk/examples/python/test_style.py =================================================================== --- trunk/examples/python/test_style.py (rev 0) +++ trunk/examples/python/test_style.py 2011-07-01 06:27:21 UTC (rev 11782) @@ -0,0 +1,105 @@ +#!/usr/bin/env python +# Test of all line styles and box styles using pllegend. + +# Append to effective python path so that can find plplot modules. +from plplot_python_start import * + +import sys +from plplot import * +from numpy import * +from math import * + +# Parse and process command line arguments +plparseopts(sys.argv, PL_PARSE_FULL) + +xmin,xmax,ymin,ymax = (0., 1., 0., 1.) +# Initialize plplot +plinit() + +# Set up legend arrays with the correct size, type. +# pllsty takes integers from 1 to 8. +nlegend = 8 + +opt_array = zeros(nlegend, "int") +text_colors = zeros(nlegend, "int") +text = zeros(nlegend, "S200") +box_colors = zeros(nlegend, "int") +box_patterns = zeros(nlegend, "int") +box_scales = zeros(nlegend) +box_line_widths = zeros(nlegend, "int") +line_colors = zeros(nlegend, "int") +line_styles = zeros(nlegend, "int") +line_widths = zeros(nlegend, "int") +symbol_colors = zeros(nlegend, "int") +symbol_scales = zeros(nlegend) +symbol_numbers = zeros(nlegend, "int") +symbols = zeros(nlegend, "S100") + +# 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 | PL_LEGEND_TEXT_LEFT + +pladv(0) +plvpor(0.1, 0.9, 0.1, 0.9) +plwind(xmin, xmax, ymin, ymax) +text_scale = 0.90 + +# Set up line legend entries with various styles +for i in range(nlegend): + opt_array[i] = PL_LEGEND_LINE + text[i] = "%s %d" % ("Line Style",i+1) + text_colors[i] = 2 + line_colors[i] = 2 + line_styles[i] = i+1 + line_widths[i] = 1 + +opt = opt_base +plscol0a( 15, 32, 32, 32, 0.70 ) +(legend_width, legend_height) = \ + pllegend( opt, PL_POSITION_LEFT, 0., 0., + 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 ) + +# Set up legend arrays with the correct size, type. +# plpsty takes integers from 0 to 8. +nlegend = 9 + +opt_array = zeros(nlegend, "int") +text_colors = zeros(nlegend, "int") +text = zeros(nlegend, "S200") +box_colors = zeros(nlegend, "int") +box_patterns = zeros(nlegend, "int") +box_scales = zeros(nlegend) +box_line_widths = zeros(nlegend, "int") +line_colors = zeros(nlegend, "int") +line_styles = zeros(nlegend, "int") +line_widths = zeros(nlegend, "int") +symbol_colors = zeros(nlegend, "int") +symbol_scales = zeros(nlegend) +symbol_numbers = zeros(nlegend, "int") +symbols = zeros(nlegend, "S100") + +# Set up box legend entries with various patterns. +for i in range(nlegend): + opt_array[i] = PL_LEGEND_COLOR_BOX + text[i] = "%s %d" % ("Box Pattern",i) + text_colors[i] = 2 + box_colors[i] = 2 + box_patterns[i] = i + box_scales[i] = 0.8 + box_line_widths[i] = 1 + +opt = opt_base +plscol0a( 15, 32, 32, 32, 0.70 ) +(legend_width, legend_height) = \ + pllegend( opt, PL_POSITION_RIGHT, 0., 0., + 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 ) + +plend() Property changes on: trunk/examples/python/test_style.py ___________________________________________________________________ Added: svn:executable + * Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2012-04-26 23:23:00
|
Revision: 12191 http://plplot.svn.sourceforge.net/plplot/?rev=12191&view=rev Author: airwin Date: 2012-04-26 23:22:53 +0000 (Thu, 26 Apr 2012) Log Message: ----------- Add simple test example that demonstrates what happens for line breaks mixed in with unicode text. Modified Paths: -------------- trunk/examples/python/CMakeLists.txt Added Paths: ----------- trunk/examples/python/test_linebreak.py Modified: trunk/examples/python/CMakeLists.txt =================================================================== --- trunk/examples/python/CMakeLists.txt 2012-04-20 23:12:46 UTC (rev 12190) +++ trunk/examples/python/CMakeLists.txt 2012-04-26 23:22:53 UTC (rev 12191) @@ -90,6 +90,7 @@ test_type1.py test_hebrew_diacritic.py test_style.py + test_linebreak.py ) if(ENABLE_tk) Added: trunk/examples/python/test_linebreak.py =================================================================== --- trunk/examples/python/test_linebreak.py (rev 0) +++ trunk/examples/python/test_linebreak.py 2012-04-26 23:22:53 UTC (rev 12191) @@ -0,0 +1,43 @@ +#!/usr/bin/env python +# -*- coding: utf-8; -*- +# Test whether line breaks work for utf8 "Peace" strings. +# Append to effective python path so that can find plplot modules. +from plplot_python_start import * + +import sys +from plplot import * +from numpy import * + +# Taken from http://www.columbia.edu/~fdc/pace/ + +peace = [ + "(Mandarin) 和平", + "(Hindi) शांति", + "(English) Peace", + "(Hebrew) שלום", + "(Russian) Мир", + "(German) Friede", + "(Korean) 평화", + "(French) Paix", + "(Spanish) Paz", + "(Arabic) ﺳﻼم", + "(Turkish) Barış", + "(Kurdish) Hasîtî", + ] + +# Parse and process command line arguments +plparseopts(sys.argv, PL_PARSE_FULL) + +# Initialize plplot +plinit() +plcol0(2) +pladv(0) +plvpor(0.1, 0.9, 0.1, 0.9) +plwind(0., 1., 0., 1.) +# Just to show edges of viewport +plbox("bc", 0., 0, "bc", 0., 0) +plcol0(1) +plschr(0., 1.5) +for i in arange(6): + plptex(0.05, 0.95 - 0.166*i, 1., 0., 0., peace[2*i] + "\n" + peace[2*i+1]) +plend() Property changes on: trunk/examples/python/test_linebreak.py ___________________________________________________________________ Added: svn:executable + * Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2013-10-03 08:19:34
|
Revision: 12574 http://sourceforge.net/p/plplot/code/12574 Author: andrewross Date: 2013-10-03 08:19:31 +0000 (Thu, 03 Oct 2013) Log Message: ----------- plplot_py_demos.py is not a directly executable script, so don't make it executable. Modified Paths: -------------- trunk/examples/python/CMakeLists.txt Property Changed: ---------------- trunk/examples/python/plplot_py_demos.py Modified: trunk/examples/python/CMakeLists.txt =================================================================== --- trunk/examples/python/CMakeLists.txt 2013-10-02 21:07:51 UTC (rev 12573) +++ trunk/examples/python/CMakeLists.txt 2013-10-03 08:19:31 UTC (rev 12574) @@ -79,7 +79,6 @@ xw17.py xw31.py plplot_logo.py - plplot_py_demos.py test_circle.py test_axis_precision.py test_symbol_clip.py @@ -142,6 +141,7 @@ set( python_DATA ${python_DATA} + plplot_py_demos.py README.pythondemos README.rendering_tests README.logo Index: trunk/examples/python/plplot_py_demos.py =================================================================== --- trunk/examples/python/plplot_py_demos.py 2013-10-02 21:07:51 UTC (rev 12573) +++ trunk/examples/python/plplot_py_demos.py 2013-10-03 08:19:31 UTC (rev 12574) Property changes on: trunk/examples/python/plplot_py_demos.py ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Author Date Id Revision \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2008-12-16 19:43:37
|
Revision: 9149 http://plplot.svn.sourceforge.net/plplot/?rev=9149&view=rev Author: airwin Date: 2008-12-16 19:43:33 +0000 (Tue, 16 Dec 2008) Log Message: ----------- Copyright and license update. Modified Paths: -------------- trunk/examples/python/xw01.py trunk/examples/python/xw02.py trunk/examples/python/xw03.py trunk/examples/python/xw04.py trunk/examples/python/xw05.py trunk/examples/python/xw06.py trunk/examples/python/xw07.py trunk/examples/python/xw09.py trunk/examples/python/xw10.py trunk/examples/python/xw11.py trunk/examples/python/xw12.py trunk/examples/python/xw13.py trunk/examples/python/xw14.py trunk/examples/python/xw15.py trunk/examples/python/xw16.py trunk/examples/python/xw18.py trunk/examples/python/xw30.py Modified: trunk/examples/python/xw01.py =================================================================== --- trunk/examples/python/xw01.py 2008-12-16 19:42:35 UTC (rev 9148) +++ trunk/examples/python/xw01.py 2008-12-16 19:43:33 UTC (rev 9149) @@ -1,5 +1,26 @@ -# Simple line plot and multiple windows demo. +# $Id$ +# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Alan W. Irwin + +# Simple line plot and multiple windows demo. +# +# This file is part of PLplot. +# +# PLplot is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Library Public License as published +# by the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# PLplot is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Library General Public License for more details. +# +# You should have received a copy of the GNU Library General Public License +# along with PLplot; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +# + from plplot_py_demos import * # main Modified: trunk/examples/python/xw02.py =================================================================== --- trunk/examples/python/xw02.py 2008-12-16 19:42:35 UTC (rev 9148) +++ trunk/examples/python/xw02.py 2008-12-16 19:43:33 UTC (rev 9149) @@ -1,3 +1,26 @@ +# $Id$ + +# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Alan W. Irwin + +# Multiple window and color map 0 demo. +# +# This file is part of PLplot. +# +# PLplot is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Library Public License as published +# by the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# PLplot is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Library General Public License for more details. +# +# You should have received a copy of the GNU Library General Public License +# along with PLplot; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +# + from plplot_py_demos import * # Demonstrates multiple windows and default color map 0 palette. Modified: trunk/examples/python/xw03.py =================================================================== --- trunk/examples/python/xw03.py 2008-12-16 19:42:35 UTC (rev 9148) +++ trunk/examples/python/xw03.py 2008-12-16 19:43:33 UTC (rev 9149) @@ -1,3 +1,26 @@ +# $Id$ + +# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Alan W. Irwin + +# Polar plot demo. +# +# This file is part of PLplot. +# +# PLplot is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Library Public License as published +# by the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# PLplot is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Library General Public License for more details. +# +# You should have received a copy of the GNU Library General Public License +# along with PLplot; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +# + from plplot_py_demos import * # main Modified: trunk/examples/python/xw04.py =================================================================== --- trunk/examples/python/xw04.py 2008-12-16 19:42:35 UTC (rev 9148) +++ trunk/examples/python/xw04.py 2008-12-16 19:43:33 UTC (rev 9149) @@ -1,3 +1,26 @@ +# $Id$ + +# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Alan W. Irwin + +# Log plot demo. +# +# This file is part of PLplot. +# +# PLplot is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Library Public License as published +# by the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# PLplot is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Library General Public License for more details. +# +# You should have received a copy of the GNU Library General Public License +# along with PLplot; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +# + from plplot_py_demos import * # main Modified: trunk/examples/python/xw05.py =================================================================== --- trunk/examples/python/xw05.py 2008-12-16 19:42:35 UTC (rev 9148) +++ trunk/examples/python/xw05.py 2008-12-16 19:43:33 UTC (rev 9149) @@ -1,3 +1,26 @@ +# $Id$ + +# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Alan W. Irwin + +# Histogram demo. +# +# This file is part of PLplot. +# +# PLplot is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Library Public License as published +# by the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# PLplot is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Library General Public License for more details. +# +# You should have received a copy of the GNU Library General Public License +# along with PLplot; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +# + from plplot_py_demos import * NPTS = 2047 Modified: trunk/examples/python/xw06.py =================================================================== --- trunk/examples/python/xw06.py 2008-12-16 19:42:35 UTC (rev 9148) +++ trunk/examples/python/xw06.py 2008-12-16 19:43:33 UTC (rev 9149) @@ -1,3 +1,26 @@ +# $Id$ + +# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Alan W. Irwin + +# Font demo. +# +# This file is part of PLplot. +# +# PLplot is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Library Public License as published +# by the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# PLplot is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Library General Public License for more details. +# +# You should have received a copy of the GNU Library General Public License +# along with PLplot; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +# + from plplot_py_demos import * # main Modified: trunk/examples/python/xw07.py =================================================================== --- trunk/examples/python/xw07.py 2008-12-16 19:42:35 UTC (rev 9148) +++ trunk/examples/python/xw07.py 2008-12-16 19:43:33 UTC (rev 9149) @@ -1,3 +1,26 @@ +# $Id$ + +# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Alan W. Irwin + +# Font demo. +# +# This file is part of PLplot. +# +# PLplot is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Library Public License as published +# by the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# PLplot is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Library General Public License for more details. +# +# You should have received a copy of the GNU Library General Public License +# along with PLplot; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +# + from plplot_py_demos import * # main Modified: trunk/examples/python/xw09.py =================================================================== --- trunk/examples/python/xw09.py 2008-12-16 19:42:35 UTC (rev 9148) +++ trunk/examples/python/xw09.py 2008-12-16 19:43:33 UTC (rev 9149) @@ -1,3 +1,26 @@ +# $Id$ + +# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Alan W. Irwin + +# Contour plot demo. +# +# This file is part of PLplot. +# +# PLplot is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Library Public License as published +# by the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# PLplot is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Library General Public License for more details. +# +# You should have received a copy of the GNU Library General Public License +# along with PLplot; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +# + from plplot_py_demos import * XPTS = 35 Modified: trunk/examples/python/xw10.py =================================================================== --- trunk/examples/python/xw10.py 2008-12-16 19:42:35 UTC (rev 9148) +++ trunk/examples/python/xw10.py 2008-12-16 19:43:33 UTC (rev 9149) @@ -1,3 +1,26 @@ +# $Id$ + +# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Alan W. Irwin + +# Window positioning demo. +# +# This file is part of PLplot. +# +# PLplot is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Library Public License as published +# by the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# PLplot is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Library General Public License for more details. +# +# You should have received a copy of the GNU Library General Public License +# along with PLplot; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +# + from plplot_py_demos import * # main Modified: trunk/examples/python/xw11.py =================================================================== --- trunk/examples/python/xw11.py 2008-12-16 19:42:35 UTC (rev 9148) +++ trunk/examples/python/xw11.py 2008-12-16 19:43:33 UTC (rev 9149) @@ -1,3 +1,26 @@ +# $Id$ + +# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Alan W. Irwin + +# Mesh plot demo. +# +# This file is part of PLplot. +# +# PLplot is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Library Public License as published +# by the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# PLplot is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Library General Public License for more details. +# +# You should have received a copy of the GNU Library General Public License +# along with PLplot; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +# + from plplot_py_demos import * XPTS = 35 # Data points in x Modified: trunk/examples/python/xw12.py =================================================================== --- trunk/examples/python/xw12.py 2008-12-16 19:42:35 UTC (rev 9148) +++ trunk/examples/python/xw12.py 2008-12-16 19:43:33 UTC (rev 9149) @@ -1,3 +1,26 @@ +# $Id$ + +# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Alan W. Irwin + +# Bar chart demo. +# +# This file is part of PLplot. +# +# PLplot is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Library Public License as published +# by the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# PLplot is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Library General Public License for more details. +# +# You should have received a copy of the GNU Library General Public License +# along with PLplot; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +# + from plplot_py_demos import * # main Modified: trunk/examples/python/xw13.py =================================================================== --- trunk/examples/python/xw13.py 2008-12-16 19:42:35 UTC (rev 9148) +++ trunk/examples/python/xw13.py 2008-12-16 19:43:33 UTC (rev 9149) @@ -1,3 +1,26 @@ +# $Id$ + +# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Alan W. Irwin + +# Pie chart demo. +# +# This file is part of PLplot. +# +# PLplot is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Library Public License as published +# by the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# PLplot is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Library General Public License for more details. +# +# You should have received a copy of the GNU Library General Public License +# along with PLplot; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +# + from plplot_py_demos import * text = ["Maurice", Modified: trunk/examples/python/xw14.py =================================================================== --- trunk/examples/python/xw14.py 2008-12-16 19:42:35 UTC (rev 9148) +++ trunk/examples/python/xw14.py 2008-12-16 19:43:33 UTC (rev 9149) @@ -1,7 +1,29 @@ #!/usr/bin/env python -# Run 14th python plplot example +# $Id$ +# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Alan W. Irwin + +# Demo of multiple stream/window capability. +# +# This file is part of PLplot. +# +# PLplot is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Library Public License as published +# by the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# PLplot is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Library General Public License for more details. +# +# You should have received a copy of the GNU Library General Public License +# along with PLplot; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +# + + # Append to effective python path so that can find plplot modules. from plplot_python_start import * Modified: trunk/examples/python/xw15.py =================================================================== --- trunk/examples/python/xw15.py 2008-12-16 19:42:35 UTC (rev 9148) +++ trunk/examples/python/xw15.py 2008-12-16 19:43:33 UTC (rev 9149) @@ -1,3 +1,26 @@ +# $Id$ + +# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Alan W. Irwin + +# Shade plot demo. +# +# This file is part of PLplot. +# +# PLplot is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Library Public License as published +# by the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# PLplot is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Library General Public License for more details. +# +# You should have received a copy of the GNU Library General Public License +# along with PLplot; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +# + from plplot_py_demos import * XPTS = 35 # Data points in x Modified: trunk/examples/python/xw16.py =================================================================== --- trunk/examples/python/xw16.py 2008-12-16 19:42:35 UTC (rev 9148) +++ trunk/examples/python/xw16.py 2008-12-16 19:43:33 UTC (rev 9149) @@ -1,3 +1,26 @@ +# $Id$ + +# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Alan W. Irwin + +# plshade demo, using color fill. +# +# This file is part of PLplot. +# +# PLplot is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Library Public License as published +# by the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# PLplot is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Library General Public License for more details. +# +# You should have received a copy of the GNU Library General Public License +# along with PLplot; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +# + from plplot_py_demos import * NS = 20 Modified: trunk/examples/python/xw18.py =================================================================== --- trunk/examples/python/xw18.py 2008-12-16 19:42:35 UTC (rev 9148) +++ trunk/examples/python/xw18.py 2008-12-16 19:43:33 UTC (rev 9149) @@ -1,3 +1,26 @@ +# $Id$ + +# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Alan W. Irwin + +# 3-d line and point plot demo. +# +# This file is part of PLplot. +# +# PLplot is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Library Public License as published +# by the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# PLplot is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Library General Public License for more details. +# +# You should have received a copy of the GNU Library General Public License +# along with PLplot; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +# + from plplot_py_demos import * opt = [1, 0, 1, 0] Modified: trunk/examples/python/xw30.py =================================================================== --- trunk/examples/python/xw30.py 2008-12-16 19:42:35 UTC (rev 9148) +++ trunk/examples/python/xw30.py 2008-12-16 19:43:33 UTC (rev 9149) @@ -1,4 +1,4 @@ -# $Id:$ +# $Id$ # Copyright (C) 2008 Hazen Babcock # Copyright (C) 2008 Andrew Ross This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2008-12-16 20:10:13
|
Revision: 9150 http://plplot.svn.sourceforge.net/plplot/?rev=9150&view=rev Author: airwin Date: 2008-12-16 20:10:07 +0000 (Tue, 16 Dec 2008) Log Message: ----------- Copyright and license update. Modified Paths: -------------- trunk/examples/python/xw20.py trunk/examples/python/xw21.py trunk/examples/python/xw22.py trunk/examples/python/xw23.py trunk/examples/python/xw25.py Modified: trunk/examples/python/xw20.py =================================================================== --- trunk/examples/python/xw20.py 2008-12-16 19:43:33 UTC (rev 9149) +++ trunk/examples/python/xw20.py 2008-12-16 20:10:07 UTC (rev 9150) @@ -1,6 +1,25 @@ -# plimage demo +# $Id: xw30.py 8224 2008-02-07 16:18:26Z andrewross $ + +# Copyright (C) 2007, 2008 Andrew Ross + +# plimage demo # -# Copyright (C) 2007 Andrew Ross +# This file is part of PLplot. +# +# PLplot is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Library Public License as published +# by the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# PLplot is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Library General Public License for more details. +# +# You should have received a copy of the GNU Library General Public License +# along with PLplot; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +# from plplot_py_demos import * Modified: trunk/examples/python/xw21.py =================================================================== --- trunk/examples/python/xw21.py 2008-12-16 19:43:33 UTC (rev 9149) +++ trunk/examples/python/xw21.py 2008-12-16 20:10:07 UTC (rev 9150) @@ -1,6 +1,25 @@ -# Grid data demo +# $Id: xw30.py 8224 2008-02-07 16:18:26Z andrewross $ + +# Copyright (C) 2007, 2008 Andrew Ross + +# Grid data demo. # -# Copyright (C) 2007 Andrew Ross +# This file is part of PLplot. +# +# PLplot is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Library Public License as published +# by the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# PLplot is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Library General Public License for more details. +# +# You should have received a copy of the GNU Library General Public License +# along with PLplot; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +# from plplot_py_demos import * import time Modified: trunk/examples/python/xw22.py =================================================================== --- trunk/examples/python/xw22.py 2008-12-16 19:43:33 UTC (rev 9149) +++ trunk/examples/python/xw22.py 2008-12-16 20:10:07 UTC (rev 9150) @@ -1,3 +1,25 @@ +# $Id$ + +# Copyright (C) 2004, 2005, 2006, 2007, 2008 Andrew Ross + +# Simple vector plot example. +# +# This file is part of PLplot. +# +# PLplot is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Library Public License as published +# by the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# PLplot is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Library General Public License for more details. +# +# You should have received a copy of the GNU Library General Public License +# along with PLplot; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +# from plplot_py_demos import * # Pairs of points making the line segments used to plot the user defined arrow Modified: trunk/examples/python/xw23.py =================================================================== --- trunk/examples/python/xw23.py 2008-12-16 19:43:33 UTC (rev 9149) +++ trunk/examples/python/xw23.py 2008-12-16 20:10:07 UTC (rev 9150) @@ -1,3 +1,25 @@ +# $Id$ + +# Copyright (C) 2005, 2006, 2007, 2008 Alan W. Irwin + +# Displays Greek letters and mathematically interesting Unicode ranges. +# +# This file is part of PLplot. +# +# PLplot is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Library Public License as published +# by the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# PLplot is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Library General Public License for more details. +# +# You should have received a copy of the GNU Library General Public License +# along with PLplot; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +# from plplot_py_demos import * # main Modified: trunk/examples/python/xw25.py =================================================================== --- trunk/examples/python/xw25.py 2008-12-16 19:43:33 UTC (rev 9149) +++ trunk/examples/python/xw25.py 2008-12-16 20:10:07 UTC (rev 9150) @@ -1,3 +1,25 @@ +# $Id: xw30.py 8224 2008-02-07 16:18:26Z andrewross $ + +# Copyright (C) 2007, 2008 Andrew Ross + +# Filling and clipping polygons. +# +# This file is part of PLplot. +# +# PLplot is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Library Public License as published +# by the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# PLplot is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Library General Public License for more details. +# +# You should have received a copy of the GNU Library General Public License +# along with PLplot; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +# from plplot_py_demos import * # main This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2008-12-16 23:41:03
|
Revision: 9157 http://plplot.svn.sourceforge.net/plplot/?rev=9157&view=rev Author: airwin Date: 2008-12-16 23:40:58 +0000 (Tue, 16 Dec 2008) Log Message: ----------- Update 31st python example to be standalone. Also implement some more of the tests (although the list is not completed, yet). Modified Paths: -------------- trunk/examples/python/CMakeLists.txt trunk/examples/python/x31 trunk/examples/python/xw31.py Property Changed: ---------------- trunk/examples/python/xw31.py Modified: trunk/examples/python/CMakeLists.txt =================================================================== --- trunk/examples/python/CMakeLists.txt 2008-12-16 23:01:56 UTC (rev 9156) +++ trunk/examples/python/CMakeLists.txt 2008-12-16 23:40:58 UTC (rev 9157) @@ -48,7 +48,6 @@ "28" "29" "30" -"31" ) set(python_SCRIPTS) @@ -66,9 +65,11 @@ pythondemos.py x14 x17 +x31 prova.py xw14.py xw17.py +xw31.py plplot_logo.py ) Modified: trunk/examples/python/x31 =================================================================== --- trunk/examples/python/x31 2008-12-16 23:01:56 UTC (rev 9156) +++ trunk/examples/python/x31 2008-12-16 23:40:58 UTC (rev 9157) @@ -1,54 +1,9 @@ #!/usr/bin/env python -# Copyright (C) 2004 Alan W. Irwin -# Copyright (C) 2004 Andrew Ross -# -# This file is part of PLplot. -# -# PLplot is free software; you can redistribute it and/or modify -# it under the terms of the GNU Library General Public License as published -# by the Free Software Foundation; version 2 of the License. -# -# PLplot is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Library General Public License for more details. -# -# You should have received a copy of the GNU Library General Public License -# along with the file PLplot; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +# This is a standalone example since at least one of the tests spans +# plinit so must be done in the same module. - -# Run all python plplot examples non-interactively. - -# Append to effective python path so that can find plplot modules. -from plplot_python_start import * - -import sys -from plplot import * - -# Parse and process command line arguments -plparseopts(sys.argv, PL_PARSE_FULL) - -# Test setting / getting page size. -(xp, yp, xleng, yleng, xoff, yoff) = plgpage() -xp2 = xp*0.9 -yp2 = yp*0.9 -xleng2 = int(xleng*0.9) -yleng2 = int(yleng*0.9) -plspage(xp2, yp2, xleng2, yleng2, xoff, yoff) -(xp, yp, xleng, yleng, xoff, yoff) = plgpage() -if xp != xp2*1.1 || yp != yp2 || xleng != xleng2 || yleng != yleng2: - sys.stderr.write("plgpage test failed\n") - plend() - sys.exit(1) - - -# Initialize plplot -plinit() - +# However, provide this wrapper for the standalone module so that it +# can be run just like the other python examples that are not standalone. import xw31 -# Terminate plplot -plend() - Modified: trunk/examples/python/xw31.py =================================================================== --- trunk/examples/python/xw31.py 2008-12-16 23:01:56 UTC (rev 9156) +++ trunk/examples/python/xw31.py 2008-12-16 23:40:58 UTC (rev 9157) @@ -1,3 +1,4 @@ +#!/usr/bin/env python # $Id$ # Copyright (C) 2008 Alan W. Irwin @@ -20,21 +21,85 @@ # along with PLplot; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA # +# Append to effective python path so that can find plplot modules. +from plplot_python_start import * + +import sys +from plplot import * + +# Parse and process command line arguments +plparseopts(sys.argv, PL_PARSE_FULL) + +# Test setting / getting page size across plinit. +xp1 = 200. +yp1 = 200. +xleng1 = 400 +yleng1 = 200 +xoff1 = 10 +yoff1 = 20 +plspage(xp1, yp1, xleng1, yleng1, xoff1, yoff1) + +compression = plgcompression() +compression1 = compression + 100 +plscompression(compression1) +compression2 = plgcompression() +if compression2 != compression1: + sys.stderr.write("plgcompression test failed\n") + plend() + sys.exit(1) +plscompression(compression) + +(fam, num, bmax) = plgfam() +fam1 = fam + 100 +num1 = num + 100 +bmax1 = bmax + 100 +plsfam(fam1, num1, bmax1) +(fam2, num2, bmax2) = plgfam() +if fam2 != fam1 or num2 != num1 or bmax2 != bmax1: + sys.stderr.write("plgfam test failed\n") + plend() + sys.exit(1) +plsfam(fam, num, bmax) + +# Initialize plplot +plinit() + from plplot_py_demos import * def main(): + # Test if device initialization screwed around with any of the + # preset page values. + (xp2, yp2, xleng2, yleng2, xoff2, yoff2) = plgpage() + if xp2 != xp1 or yp2 != yp1 or xleng2 != xleng1 or yleng2 != yleng1 or xoff2 != xoff1 or yoff2 != yoff1: + sys.stderr.write("plgpage test failed\n") + plend() + sys.exit(1) + + # Exercise plscolor, plscol0, plscmap1, and plscmap1a to make sure + # they work without any obvious error messages. + plscolor(1) + plscol0(1, 255, 0, 0) + r1 = [0, 255] + g1 = [255, 0] + b1 = [0, 0] + a1 = [1.0, 1.0] + plscmap1(r1,g1,b1) + plscmap1a(r1,g1,b1,a1) + + level = plglevel() + if level != 1: + sys.stderr.write("plglevel test failed. Level is %d, but 1 expected.\n" % level) + plend(); + sys.exit(1); + pladv(0) plvpor(0.0, 1.0, 0.0, 1.0) - plwind(0.0, 1.0, 0.0, 1.0) - plbox("bc", 0.0, 0, "bc", 0.0, 0) + plwind(0.2, 0.3, 0.4, 0.5) - plsvpa(50.0, 150.0, 50.0, 100.0) - plwind(0.0, 1.0, 0.0, 1.0) - plbox("bc", 0.0, 0, "bc", 0.0, 0) - plptex(0.5, 0.5, 1.0, 0.0, 0.5, "BOX at (50,150,50,100)") - # Restore defaults #plcol0(1) main() +# Terminate plplot +plend() Property changes on: trunk/examples/python/xw31.py ___________________________________________________________________ Added: svn:executable + * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2009-01-18 01:12:21
|
Revision: 9334 http://plplot.svn.sourceforge.net/plplot/?rev=9334&view=rev Author: andrewross Date: 2009-01-18 01:12:11 +0000 (Sun, 18 Jan 2009) Log Message: ----------- Update pythondemos script to include all examples except interactive example 14, 17 and 31 which call plinit directly. Update examples to remove extraneous calls to plend. Modified Paths: -------------- trunk/examples/python/pythondemos.py trunk/examples/python/xw19.py trunk/examples/python/xw21.py trunk/examples/python/xw25.py Modified: trunk/examples/python/pythondemos.py =================================================================== --- trunk/examples/python/pythondemos.py 2009-01-17 21:34:26 UTC (rev 9333) +++ trunk/examples/python/pythondemos.py 2009-01-18 01:12:11 UTC (rev 9334) @@ -33,15 +33,10 @@ # Initialize plplot plinit() -# Skip 14 (must be standalone so cannot be run from pythondemos.py), -# 17 (must be standalone and interactive so cannot be run from pythondemos.py), -# 19 (placeholder without real implementation), -# 20 (no implementation) -# 21 (no implementation), and -# 24 (requires special fonts installed to produce good-looking result). -# 25 (no implementation) +# Exclude interactive demos 14, 17, 31 which call plinit in the xw??.py +# script failed = [] -for i in range(1, 14) + [15, 16, 18, 22, 23, 26]: +for i in range(1, 14)+[15,16]+range(18,31): script = 'xw' + '%02d' % i try: __import__(script, globals(), locals(), []) Modified: trunk/examples/python/xw19.py =================================================================== --- trunk/examples/python/xw19.py 2009-01-17 21:34:26 UTC (rev 9333) +++ trunk/examples/python/xw19.py 2009-01-18 01:12:11 UTC (rev 9334) @@ -84,6 +84,5 @@ pllsty(2) plmeridians(mapform19,10.0, 10.0, 0.0, 360.0, -10.0, 80.0) - plend() main() Modified: trunk/examples/python/xw21.py =================================================================== --- trunk/examples/python/xw21.py 2009-01-17 21:34:26 UTC (rev 9333) +++ trunk/examples/python/xw21.py 2009-01-18 01:12:11 UTC (rev 9334) @@ -166,6 +166,5 @@ plcol0(15) pllab('','',title[alg-1]) plot3dc(xg, yg, zg, DRAW_LINEXY | MAG_COLOR | BASE_CONT, clev) - plend() main() Modified: trunk/examples/python/xw25.py =================================================================== --- trunk/examples/python/xw25.py 2009-01-17 21:34:26 UTC (rev 9333) +++ trunk/examples/python/xw25.py 2009-01-18 01:12:11 UTC (rev 9334) @@ -84,8 +84,5 @@ pllsty(1) plline(x0,y0) - # Don't forget to call plend() to finish off! - plend() - main() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2009-05-05 01:10:09
|
Revision: 9904 http://plplot.svn.sourceforge.net/plplot/?rev=9904&view=rev Author: airwin Date: 2009-05-05 01:09:51 +0000 (Tue, 05 May 2009) Log Message: ----------- Insert $Id line like all other python examples. Modified Paths: -------------- trunk/examples/python/xw08.py trunk/examples/python/xw17.py trunk/examples/python/xw26.py Modified: trunk/examples/python/xw08.py =================================================================== --- trunk/examples/python/xw08.py 2009-05-05 01:07:39 UTC (rev 9903) +++ trunk/examples/python/xw08.py 2009-05-05 01:09:51 UTC (rev 9904) @@ -1,3 +1,4 @@ +# $Id$ # xw08.py PLplot demo for Python # # Copyright (C) 2004 Alan W. Irwin Modified: trunk/examples/python/xw17.py =================================================================== --- trunk/examples/python/xw17.py 2009-05-05 01:07:39 UTC (rev 9903) +++ trunk/examples/python/xw17.py 2009-05-05 01:09:51 UTC (rev 9904) @@ -1,4 +1,5 @@ #!/usr/bin/env python +# $Id$ # Copyright 2002 Gary Bishop # Copyright 2004 Alan W. Irwin # This file is part of PLplot. Modified: trunk/examples/python/xw26.py =================================================================== --- trunk/examples/python/xw26.py 2009-05-05 01:07:39 UTC (rev 9903) +++ trunk/examples/python/xw26.py 2009-05-05 01:09:51 UTC (rev 9904) @@ -1,4 +1,5 @@ # -*- coding: utf-8; -*- +# $Id$ # Copyright (C) 2006 Alan W. Irwin # Multi-lingual version of the first page of example 4. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <hba...@us...> - 2009-05-20 03:45:36
|
Revision: 9983 http://plplot.svn.sourceforge.net/plplot/?rev=9983&view=rev Author: hbabcock Date: 2009-05-20 03:45:25 +0000 (Wed, 20 May 2009) Log Message: ----------- Initial commit of a new PyQt binding based on the qt driver. Added Paths: ----------- trunk/examples/python/plplot_pyqt/ trunk/examples/python/plplot_pyqt/config.py trunk/examples/python/plplot_pyqt/plplot_pyqt.sip trunk/examples/python/plplot_pyqt/test.py Added: trunk/examples/python/plplot_pyqt/config.py =================================================================== --- trunk/examples/python/plplot_pyqt/config.py (rev 0) +++ trunk/examples/python/plplot_pyqt/config.py 2009-05-20 03:45:25 UTC (rev 9983) @@ -0,0 +1,63 @@ +import os +import sipconfig +from PyQt4 import pyqtconfig + +# The name of the SIP build file generated by SIP and used by the build +# system. +build_file = "plplot_pyqt.sbf" + +# Get the PyQt configuration information. +config = pyqtconfig.Configuration() + +# Get the extra SIP flags needed by the imported qt module. Note that +# this normally only includes those flags (-x and -t) that relate to SIP's +# versioning system. +qt_sip_flags = config.pyqt_sip_flags + +# Run SIP to generate the code. Note that we tell SIP where to find the qt +# module's specification files using the -I flag. +os.system(" ".join([config.sip_bin, "-c", ".", "-b", build_file, "-I", config.pyqt_sip_dir, qt_sip_flags, "plplot_pyqt.sip"])) + +# We are going to install the SIP specification file for this module and +# its configuration module. +installs = [] + +installs.append(["plplot_pyqt.sip", os.path.join(config.default_sip_dir, "plplot_pyqt")]) + +installs.append(["plplot_pyqtconfig.py", config.default_mod_dir]) + +# Create the Makefile. The QtModuleMakefile class provided by the +# pyqtconfig module takes care of all the extra preprocessor, compiler and +# linker flags needed by the Qt library. +makefile = pyqtconfig.QtGuiModuleMakefile( + configuration=config, + build_file=build_file, + installs=installs +) + +# Add the library we are wrapping. The name doesn't include any platform +# specific prefixes or extensions (e.g. the "lib" prefix on UNIX, or the +# ".dll" extension on Windows). +makefile.extra_libs = ["plplotd", "qt"] + +# Generate the Makefile itself. +makefile.generate() + +# Now we create the configuration module. This is done by merging a Python +# dictionary (whose values are normally determined dynamically) with a +# (static) template. +content = { + # Publish where the SIP specifications for this module will be + # installed. + "plplot_pyqt_sip_dir": config.default_sip_dir, + + # Publish the set of SIP flags needed by this module. As these are the + # same flags needed by the qt module we could leave it out, but this + # allows us to change the flags at a later date without breaking + # scripts that import the configuration module. + "plplot_pyqt_sip_flags": qt_sip_flags +} + +# This creates the qtermwidgetconfig.py module from the qtermwidgetconfig.py.in +# template and the dictionary. +sipconfig.create_config_module("plplot_pyqtconfig.py", "config.py.in", content) Added: trunk/examples/python/plplot_pyqt/plplot_pyqt.sip =================================================================== --- trunk/examples/python/plplot_pyqt/plplot_pyqt.sip (rev 0) +++ trunk/examples/python/plplot_pyqt/plplot_pyqt.sip 2009-05-20 03:45:25 UTC (rev 9983) @@ -0,0 +1,63 @@ + +%Module plplot_pyqt 0 + +%Import QtCore/QtCoremod.sip +%Import QtGui/QtGuimod.sip + +class QtPLDriver { + +%TypeHeaderCode +#include "plplot/my_qt.h" +%End + + public: + QtPLDriver(int i_iWidth=QT_DEFAULT_X, int i_iHeight=QT_DEFAULT_Y); + virtual ~QtPLDriver(); +}; + +class QtPLWidget: QWidget, QtPLDriver { + +%TypeHeaderCode +#include "plplot/my_qt.h" +%End + + public: + QtPLWidget(int i_iWidth=QT_DEFAULT_X, int i_iHeight=QT_DEFAULT_Y, QWidget* parent=0); + virtual ~QtPLWidget(); + + void clearWidget(); + + protected: + void mouseReleaseEvent(QMouseEvent *event); + void keyPressEvent(QKeyEvent *event); + void closeEvent(QCloseEvent *event); + void nextPage(); + void resizeEvent(QResizeEvent *); + void paintEvent(QPaintEvent *); + void getPlotParameters(double &io_dXFact, double &io_dYFact, double &io_dXOffset, double &io_dYOffset); + + + +}; + +class QtExtWidget: QtPLWidget { + +%TypeHeaderCode +#include "plplot/my_qt.h" +%End + + public: + QtExtWidget(int i_iWidth=QT_DEFAULT_X, int i_iHeight=QT_DEFAULT_Y, QWidget* parent=0); + virtual ~QtExtWidget(); + + void captureMousePlotCoords(double *x, double *y); + void mouseMoveEvent(QMouseEvent *event); + void mousePressEvent(QMouseEvent *event); + void mouseReleaseEvent(QMouseEvent *event); + + protected: + void paintEvent(QPaintEvent *event); +}; + +void plsetqtdev(QtExtWidget* widget); +void plfreeqtdev(); Added: trunk/examples/python/plplot_pyqt/test.py =================================================================== --- trunk/examples/python/plplot_pyqt/test.py (rev 0) +++ trunk/examples/python/plplot_pyqt/test.py 2009-05-20 03:45:25 UTC (rev 9983) @@ -0,0 +1,43 @@ +#!/usr/bin/python +# +# PLplot / PyQt test. +# +# Hazen 5/09 +# + +import sys +from PyQt4 import QtCore, QtGui +import plplot +import plplot_pyqt + +class QPlot(QtGui.QMainWindow): + def __init__(self): + print "init" + QtGui.QMainWindow.__init__(self, None) + + self.plot = plplot_pyqt.QtExtWidget(800, 800, self) + self.setCentralWidget(self.plot) + + plplot_pyqt.plsetqtdev(self.plot) + plplot.plsdev("extqt") + plplot.plinit() + + self.resize(400,400) + + def cleanup(self): + plplot.plend() + plplot_pyqt.plfreeqtdev() + + def paintEvent(self, event): + plplot.pladv(0) + plplot.plenv(0, 10, 0, 10, 0, 0) + plplot.pllab("X", "Y", "X vs Y") + self.plot.show() + + +app = QtGui.QApplication(sys.argv) +plot = QPlot() +plot.show() +app.exec_() +plot.cleanup() + Property changes on: trunk/examples/python/plplot_pyqt/test.py ___________________________________________________________________ Added: svn:executable + * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <hba...@us...> - 2009-06-21 19:35:10
|
Revision: 10057 http://plplot.svn.sourceforge.net/plplot/?rev=10057&view=rev Author: hbabcock Date: 2009-06-21 19:35:06 +0000 (Sun, 21 Jun 2009) Log Message: ----------- Remove plplot_pyqt directory since at least in the near future we'll likely only have a single example. Rename the example from pyqt_test.py to pyqt4_test.py to emphasize its dependence on pyqt4. Added Paths: ----------- trunk/examples/python/pyqt4_test.py Removed Paths: ------------- trunk/examples/python/plplot_pyqt/ Copied: trunk/examples/python/pyqt4_test.py (from rev 10051, trunk/examples/python/plplot_pyqt/pyqt_test.py) =================================================================== --- trunk/examples/python/pyqt4_test.py (rev 0) +++ trunk/examples/python/pyqt4_test.py 2009-06-21 19:35:06 UTC (rev 10057) @@ -0,0 +1,60 @@ +#!/usr/bin/python +# +# A simple PLplot/PyQt example +# +# Copyright (C) 2009 Hazen Babcock +# +# This file is part of PLplot. +# +# PLplot is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Library Public License as published +# by the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# PLplot is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Library General Public License for more details. +# +# You should have received a copy of the GNU Library General Public License +# along with PLplot; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +# + + +import sys +from PyQt4 import QtCore, QtGui +import plplot +import plplot_pyqt + +class QPlot(QtGui.QMainWindow): + def __init__(self): + print "init" + QtGui.QMainWindow.__init__(self, None) + + self.plot = plplot_pyqt.QtExtWidget(800, 800, self) + self.setCentralWidget(self.plot) + + plplot_pyqt.plsetqtdev(self.plot) + plplot.plsdev("extqt") + plplot.plinit() + + self.resize(400,400) + + def cleanup(self): + plplot.plend() + plplot_pyqt.plfreeqtdev() + + def paintEvent(self, event): + plplot.pladv(0) + plplot.plenv(0, 10, 0, 10, 0, 0) + plplot.pllab("X", "Y", "X vs Y") + self.plot.show() + + +app = QtGui.QApplication(sys.argv) +plot = QPlot() +plot.show() +app.exec_() +plot.cleanup() + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2009-07-03 00:57:47
|
Revision: 10115 http://plplot.svn.sourceforge.net/plplot/?rev=10115&view=rev Author: airwin Date: 2009-07-03 00:57:47 +0000 (Fri, 03 Jul 2009) Log Message: ----------- Configure 3rd python location that allows pyqt4_example.py to run within build tree. Modified Paths: -------------- trunk/examples/python/CMakeLists.txt trunk/examples/python/plplot_python_start.py.cmake Modified: trunk/examples/python/CMakeLists.txt =================================================================== --- trunk/examples/python/CMakeLists.txt 2009-07-02 21:23:16 UTC (rev 10114) +++ trunk/examples/python/CMakeLists.txt 2009-07-03 00:57:47 UTC (rev 10115) @@ -189,6 +189,7 @@ set(python_location1 ${CMAKE_SOURCE_DIR}/bindings/python) set(python_location2 ${CMAKE_BINARY_DIR}/bindings/python) +set(python_location3 ${CMAKE_BINARY_DIR}/bindings/qt_gui/pyqt4) configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/plplot_python_start.py.cmake ${CMAKE_CURRENT_BINARY_DIR}/plplot_python_start.py @@ -197,6 +198,7 @@ set(python_location1 ${PYTHON_INSTDIR}) set(python_location2) +set(python_location3) configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/plplot_python_start.py.cmake ${CMAKE_CURRENT_BINARY_DIR}/plplot_python_start.py_install Modified: trunk/examples/python/plplot_python_start.py.cmake =================================================================== --- trunk/examples/python/plplot_python_start.py.cmake 2009-07-02 21:23:16 UTC (rev 10114) +++ trunk/examples/python/plplot_python_start.py.cmake 2009-07-03 00:57:47 UTC (rev 10115) @@ -7,3 +7,4 @@ import sys sys.path.insert (0, "@python_location1@") sys.path.insert (0, "@python_location2@") +sys.path.insert (0, "@python_location3@") This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2009-08-12 21:24:58
|
Revision: 10234 http://plplot.svn.sourceforge.net/plplot/?rev=10234&view=rev Author: airwin Date: 2009-08-12 21:24:48 +0000 (Wed, 12 Aug 2009) Log Message: ----------- Add two additional python scripts for simple device rendering tests to test_circle.py and describe all three such scripts in a README file. Modified Paths: -------------- trunk/examples/python/CMakeLists.txt Added Paths: ----------- trunk/examples/python/README.rendering_tests trunk/examples/python/test_superscript_subscript.py trunk/examples/python/testh.py Modified: trunk/examples/python/CMakeLists.txt =================================================================== --- trunk/examples/python/CMakeLists.txt 2009-08-12 20:56:03 UTC (rev 10233) +++ trunk/examples/python/CMakeLists.txt 2009-08-12 21:24:48 UTC (rev 10234) @@ -71,6 +71,8 @@ xw31.py plplot_logo.py test_circle.py + testh.py + test_superscript_subscript.py ) if(ENABLE_tk) @@ -136,6 +138,7 @@ python_DATA ${python_DATA} README.pythondemos + README.rendering_tests README.logo svg_760x120_gradient.patch ) Added: trunk/examples/python/README.rendering_tests =================================================================== --- trunk/examples/python/README.rendering_tests (rev 0) +++ trunk/examples/python/README.rendering_tests 2009-08-12 21:24:48 UTC (rev 10234) @@ -0,0 +1,68 @@ +We have implemented a number of simple python standalone scripts to test for +rendering issues with our PLplot device drivers. + +N.B. these tests should not be propagated to other languages. python is +ideal for rapid development and evaluation. Given this, it is expected +these tests will change substantially over time and more tests will be +added. Thus, propagating those expected changes to other languages is +largely pointless. + +N.B. the SVG test results for "firefox", "konqueror", and "display" reported +below at this time of writing (2009-08-12) are for Debian Lenny where +firefox is iceweasel Version 2.0.0.14-2, konqueror is Version +4:3.5.9.dfsg.1-6, and by default display (Version 7:6.3.7.9.dfsg2-1~lenny1) +uses the rsvg2 GNOME library to render svg files. Your SVG viewing results +will differ for other versions of firefox, konqueror, and display. They +will also differ for other SVG-aware applications because SVG viewing and +rendering within Linux is still a bit problematic, even though Linux is +probably in better SVG shape than other platforms. + +* test_circle.py (only useful for testing unicode-aware devices) renders a +series of "LARGE CIRCLE" and "BOX DRAWINGS LIGHT DIAGONAL CROSS" unicode +characters from (very) large sizes to small sizes to check there is no +vertical drift in the alignment of the characters, and also to check that +very large versions of characters are rendered correctly. -dev xcairo +results have good alignment and good character rendering. -dev svg results +validate correctly at http://validator.w3.org/, +have good alignment and good character rendering according to the +ImageMagick "display" application and firefox, but those same results cannot +be rendered by konqueror because it cannot find the appropriate system +fonts. -dev qtwidget results have good alignment, but the large character +rendering is not reliable ("squashed" left edge of "LARGE CIRCLE" for the +three largest sizes, but no squashing at the smaller sizes). + +* testh.py renders a vertical line at the left edge of the window, a +horizontal line marking the center of the vertical line, and a centred +string of 7 "H" characters superimposed on top of the vertical line so the +horizontal bar of the "H" is very close to the vertical line and parallel +with it. All drivers we have tested generate correct interactive or file +results for this figure. Also, the -dev svg output file validates at +http://validator.w3.org/, and I get good rendering results for both firefox +and konqueror for that output file. However, those output file results are +_not_ rendered correctly by the GNOME library, librsvg2, which is used in a +number of applications (e.g., all GNOME text rendering applications which +are svg aware such as eog and (depending on how ImageMagick is compiled) the +ImageMagick "display" application). See +http://bugzilla.gnome.org/show_bug.cgi?id=525023 for more details. + +* test_superscript_subscript.py renders a series of nested superscripts and +subscripts for single numbers from 0 to 9 and also tries some simple +superscripts and subscripts for Greek letters and ordinary (Roman) letters. +Devices that use our traditional Hershey fonts (e.g., -dev xwin) have +good results for this example, but there is work to do to get similar +good results for our more modern devices that use other means of +superscripting and subscripting. + +The one current exception to this is -dev svg where the resulting output +file validates at http://validator.w3.org/, and the dy attribute of the +nested span tags is written correctly. Furthermore, I get good rendering +results for this output file using the ImageMagick "display" application. +However, in this case the vertical positioning after the Greek superscript +or subscript letters in the output svg file is not rendered correctly by +mozilla and konqueror. On the other hand, those applications have no +trouble rendering the text after superscript/subscript Roman (ordinary) +letters. It appears those applications are having trouble dealing with a +nested series of span tags when there is a font change (e.g., for Greek +letters) in the middle of the series. The results for the pdf, cairo, and +qt devices for this example are poor (e.g., do not agree with the good +-dev xwin results), but it is planned to deal with those issues soon. Property changes on: trunk/examples/python/README.rendering_tests ___________________________________________________________________ Added: svn:eol-style + native Added: trunk/examples/python/test_superscript_subscript.py =================================================================== --- trunk/examples/python/test_superscript_subscript.py (rev 0) +++ trunk/examples/python/test_superscript_subscript.py 2009-08-12 21:24:48 UTC (rev 10234) @@ -0,0 +1,29 @@ +#!/usr/bin/env python + +# Append to effective python path so that can find plplot modules. +from plplot_python_start import * + +import sys +from plplot import * +from numpy import * + +# Parse and process command line arguments +plparseopts(sys.argv, PL_PARSE_FULL) + +# Initialize plplot +plinit() +# Like yellow lines better. +plcol0(2) +pladv(0) +plvpor(0.1, 0.9, 0.1, 0.9) +plwind(0., 1., 0., 1.) +plptex(0.5, 0.8, 1., 0., 0.5, "X#d0#d1#d2#u3#u4#u5#u6#u7#u8#d9#d0#d1") +plptex(0.5, 0.8, 1., 0., 0.5, "X#u0#u1#u2#d3#d4#d5#d6#d7#d8#u9#u0#u1") +plptex(0.5, 0.7, 1., 0., 0.5, "B#u#gf#d, B#ur#d") +plptex(0.5, 0.6, 1., 0., 0.5, "B#d#gf#u, B#dr#u") +plptex(0.5, 0.5, 1., 0., 0.5, "B#uf#d, B#ur#d") +plptex(0.5, 0.4, 1., 0., 0.5, "B#df#u, B#dr#u") + +# Terminate plplot +plend() + Property changes on: trunk/examples/python/test_superscript_subscript.py ___________________________________________________________________ Added: svn:executable + * Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/examples/python/testh.py =================================================================== --- trunk/examples/python/testh.py (rev 0) +++ trunk/examples/python/testh.py 2009-08-12 21:24:48 UTC (rev 10234) @@ -0,0 +1,32 @@ +#!/usr/bin/env python + +# Append to effective python path so that can find plplot modules. +from plplot_python_start import * + +import sys +from plplot import * +from numpy import * + +# Parse and process command line arguments +plparseopts(sys.argv, PL_PARSE_FULL) + +# Initialize plplot +plinit() +# Like yellow lines better. +plcol0(2) +pladv(0) +plvpor(0.1, 0.9, 0.1, 0.9) +plwind(0., 1., 0., 1.) +x=0.*arange(2) +y=1.*arange(2) +plline(x,y) +x=0.1*arange(2) +y=0.5+0.*arange(2) +plline(x,y) +plschr(0., 4.) +#plmtex("l", 0., 0.5, 0.5, "#[0x00d7]#[0x00d7]#[0x00d7]#[0x00d7]#[0x00d7]#[0x00d7]#[0x00d7]") +plmtex("l", 0., 0.5, 0.5, "HHHHHHH") + +# Terminate plplot +plend() + Property changes on: trunk/examples/python/testh.py ___________________________________________________________________ Added: svn:executable + * Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2009-08-14 21:40:41
|
Revision: 10254 http://plplot.svn.sourceforge.net/plplot/?rev=10254&view=rev Author: andrewross Date: 2009-08-14 21:40:34 +0000 (Fri, 14 Aug 2009) Log Message: ----------- Update python example 16 to give identical results to C version. Modified Paths: -------------- trunk/examples/python/x16 trunk/examples/python/xw16.py Modified: trunk/examples/python/x16 =================================================================== --- trunk/examples/python/x16 2009-08-14 21:30:58 UTC (rev 10253) +++ trunk/examples/python/x16 2009-08-14 21:40:34 UTC (rev 10254) @@ -30,6 +30,11 @@ # Parse and process command line arguments plparseopts(sys.argv, PL_PARSE_FULL) +# Load colour palettes +plspal0("cmap0_black_on_white.pal") +plspal1("cmap1_gray.pal") +plscmap0n(3) + # Initialize plplot plinit() Modified: trunk/examples/python/xw16.py =================================================================== --- trunk/examples/python/xw16.py 2009-08-14 21:30:58 UTC (rev 10253) +++ trunk/examples/python/xw16.py 2009-08-14 21:40:34 UTC (rev 10254) @@ -79,10 +79,6 @@ xg2 = xx + distort*cos((0.5*pi)*xx)*cos((0.5*pi)*yy) yg2 = yy - distort*cos((0.5*pi)*xx)*cos((0.5*pi)*yy) - # Load colour palettes - plspal0("cmap0_black_on_white.pal") - plspal1("cmap1_gray.pal") - # Plot using identity transform pladv(0) @@ -114,6 +110,7 @@ plspal0("cmap0_black_on_white.pal") plspal1("cmap1_blue_yellow.pal") + plscmap0n(3) pladv(0) plvpor(0.1, 0.9, 0.1, 0.9) @@ -132,6 +129,7 @@ plspal0("cmap0_black_on_white.pal") plspal1("cmap1_blue_red.pal") + plscmap0n(3) pladv(0) plvpor(0.1, 0.9, 0.1, 0.9) @@ -151,6 +149,7 @@ plspal0("") plspal1("") + plscmap0n(3) pladv(0) plvpor(0.1, 0.9, 0.1, 0.9) @@ -174,6 +173,7 @@ plspal0("cmap0_black_on_white.pal") plspal1("cmap1_gray.pal") + plscmap0n(3) pladv(0) plvpor(0.1, 0.9, 0.1, 0.9) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2009-11-10 00:05:17
|
Revision: 10568 http://plplot.svn.sourceforge.net/plplot/?rev=10568&view=rev Author: airwin Date: 2009-11-10 00:05:09 +0000 (Tue, 10 Nov 2009) Log Message: ----------- Replace deprecated functionality as per python warning messages. Modified Paths: -------------- trunk/examples/python/plplotcanvas_animation.py trunk/examples/python/plplotcanvas_demo.py Modified: trunk/examples/python/plplotcanvas_animation.py =================================================================== --- trunk/examples/python/plplotcanvas_animation.py 2009-11-07 21:09:12 UTC (rev 10567) +++ trunk/examples/python/plplotcanvas_animation.py 2009-11-10 00:05:09 UTC (rev 10568) @@ -118,7 +118,7 @@ # Delete event callback def delete_event(widget, event, data=None): - return gtk.FALSE + return False # Destroy event calback def destroy(widget, data=None): @@ -135,7 +135,7 @@ # Draw plots in succession for i in range(STEPS): - gtk.threads_enter() + gtk.gdk.threads_enter() # Lock the current gtk state gtk_state_lock.acquire() @@ -143,7 +143,7 @@ # Check to make sure gtk hasn't quit if gtk_state == GTKSTATE_QUIT: gtk_state_lock.release() - gtk.threads_leave() + gtk.gdk.threads_leave() return # Draw the plot @@ -151,7 +151,7 @@ # Release the lock gtk_state_lock.release() - gtk.threads_leave() + gtk.gdk.threads_leave() # Start threads callback from execute button def start_threads(widget,data): @@ -180,7 +180,7 @@ plplot_py_demos.plparseopts(sys.argv,plplot_py_demos.PL_PARSE_FULL); # Initialize - gtk.threads_init() + gtk.gdk.threads_init() # Create the first canvas, set its size, draw some axes on it, and # place it in a frame @@ -232,6 +232,6 @@ window.show_all() # Start the gtk main loop - gtk.threads_enter() + gtk.gdk.threads_enter() gtk.main() - gtk.threads_leave() + gtk.gdk.threads_leave() Modified: trunk/examples/python/plplotcanvas_demo.py =================================================================== --- trunk/examples/python/plplotcanvas_demo.py 2009-11-07 21:09:12 UTC (rev 10567) +++ trunk/examples/python/plplotcanvas_demo.py 2009-11-10 00:05:09 UTC (rev 10568) @@ -44,7 +44,7 @@ # Delete event callback def delete_event(widget, event, data=None): - return gtk.FALSE + return False # Destroy event calback def destroy(widget, data=None): This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |