PLplot

Revision: 8564
          http://plplot.svn.sourceforge.net/plplot/?rev=8564&view=rev
Author:   andrewross
Date:     2008-07-23 14:14:46 +0000 (Wed, 23 Jul 2008)

Log Message:
-----------
Modify example 20 to call plimagefr using pltr2 rather than user defined mypltr. The end 
plot is identical, but this method can be implemented for the other language bindings.

Modified Paths:
--------------
    trunk/examples/c/x20c.c

Modified: trunk/examples/c/x20c.c
===================================================================
--- trunk/examples/c/x20c.c	2008-07-23 08:09:36 UTC (rev 8563)
+++ trunk/examples/c/x20c.c	2008-07-23 14:14:46 UTC (rev 8564)
@@ -95,6 +95,8 @@
   PLFLT img_min;
   PLFLT img_max;
   struct stretch_data stretch;
+  PLcGrid2 cgrid2;
+  PLFLT xx, yy;
 
   /*
     Bugs in plimage():
@@ -258,12 +260,33 @@
   /* Draw a distorted version of the original image, showing its full dynamic range. */
   plenv(0, width, 0, height, 1, -1);
   pllab("", "", "Distorted image example");
+
   stretch.xmin = 0;
   stretch.xmax = width;
   stretch.ymin = 0;
   stretch.ymax = height;
   stretch.stretch = 0.5;
-  plimagefr(img_f, width, height, 0., width, 0., height, 0., 0., img_min, img_max, mypltr, (PLPointer) &stretch);
+
+  /* In C / C++ the following would work, with plimagefr directly calling
+     mypltr. For compatibilty with other language bindings the same effect
+     can be achieved by generating the transformed grid first and then
+     using pltr2. */
+  /* plimagefr(img_f, width, height, 0., width, 0., height, 0., 0., img_min, img_max, mypltr, (PLPointer) &stretch); */
+
+  plAlloc2dGrid(&cgrid2.xg, width+1, height+1);
+  plAlloc2dGrid(&cgrid2.yg, width+1, height+1);
+  cgrid2.nx = width+1;
+  cgrid2.ny = height+1;
+  
+  for (i = 0; i<=width; i++) {
+    for (j = 0; j<=height; j++) {
+      mypltr(i,j,&xx,&yy,(PLPointer) &stretch);
+      cgrid2.xg[i][j] = xx;
+      cgrid2.yg[i][j] = yy;
+    }
+  }
+      
+  plimagefr(img_f, width, height, 0., width, 0., height, 0., 0., img_min, img_max, pltr2, &cgrid2);
   pladv(0);
 
   plFree2dGrid(img_f, width, height);


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

Revision: 8577
          http://plplot.svn.sourceforge.net/plplot/?rev=8577&view=rev
Author:   andrewross
Date:     2008-07-24 13:09:41 +0000 (Thu, 24 Jul 2008)

Log Message:
-----------
Fix some numbers to be PLFLT not integer for completeness.

Modified Paths:
--------------
    trunk/examples/c/x20c.c

Modified: trunk/examples/c/x20c.c
===================================================================
--- trunk/examples/c/x20c.c	2008-07-24 08:32:55 UTC (rev 8576)
+++ trunk/examples/c/x20c.c	2008-07-24 13:09:41 UTC (rev 8577)
@@ -162,8 +162,8 @@
 
     pllab("No, an amplitude clipped \"sombrero\"", "", "Saturn?");
     plptex(2., 2., 3., 4., 0., "Transparent image");
-    plimage(z, XDIM, YDIM, 0., 2.*M_PI, 0, 3.*M_PI, 0.05, 1.,
-	    0., 2.*M_PI, 0, 3.*M_PI); 
+    plimage(z, XDIM, YDIM, 0., 2.*M_PI, 0., 3.*M_PI, 0.05, 1.,
+	    0., 2.*M_PI, 0., 3.*M_PI); 
     plFree2dGrid(r, XDIM, YDIM);
 
     /* save the plot */
@@ -250,11 +250,14 @@
   /* Base the dynamic range on the image contents. */
   plMinMax2dGrid(img_f, width, height, &img_max, &img_min);
 
+  printf("%f %f\n",img_min,img_max);
+
   /* Draw a saturated version of the original image.  Only use the middle 50%
      of the image's full dynamic range. */
   plcol0(2);
   plenv(0, width, 0, height, 1, -1);
   pllab("", "", "Reduced dynamic range image example");
+  printf("%f %f\n",img_max-img_max*0.25,img_min+img_max*0.25);
   plimagefr(img_f, width, height, 0., width, 0., height, 0., 0., img_min + img_max * 0.25, img_max - img_max * 0.25, NULL, NULL);
 
   /* Draw a distorted version of the original image, showing its full dynamic range. */


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

Revision: 8585
          http://plplot.svn.sourceforge.net/plplot/?rev=8585&view=rev
Author:   andrewross
Date:     2008-07-24 14:37:31 +0000 (Thu, 24 Jul 2008)

Log Message:
-----------
Remove debugging messages from example 20. Add in missing calls to free allocated arrays.

Modified Paths:
--------------
    trunk/examples/c/x20c.c

Modified: trunk/examples/c/x20c.c
===================================================================
--- trunk/examples/c/x20c.c	2008-07-24 14:02:07 UTC (rev 8584)
+++ trunk/examples/c/x20c.c	2008-07-24 14:37:31 UTC (rev 8585)
@@ -76,8 +76,6 @@
 {
     struct stretch_data *s = (struct stretch_data *) pltr_data;
     PLFLT x0, y0, dy;
-//    *tx = x + 2.0 * sin(x) + cos(y);
-//    *ty = y + sin(x) + 2.0 * cos(y);
     x0 = (s->xmin + s->xmax)*0.5;
     y0 = (s->ymin + s->ymax)*0.5;
     dy = (s->ymax-s->ymin)*0.5;
@@ -250,14 +248,11 @@
   /* Base the dynamic range on the image contents. */
   plMinMax2dGrid(img_f, width, height, &img_max, &img_min);
 
-  printf("%f %f\n",img_min,img_max);
-
   /* Draw a saturated version of the original image.  Only use the middle 50%
      of the image's full dynamic range. */
   plcol0(2);
   plenv(0, width, 0, height, 1, -1);
   pllab("", "", "Reduced dynamic range image example");
-  printf("%f %f\n",img_max-img_max*0.25,img_min+img_max*0.25);
   plimagefr(img_f, width, height, 0., width, 0., height, 0., 0., img_min + img_max * 0.25, img_max - img_max * 0.25, NULL, NULL);
 
   /* Draw a distorted version of the original image, showing its full dynamic range. */
@@ -292,6 +287,8 @@
   plimagefr(img_f, width, height, 0., width, 0., height, 0., 0., img_min, img_max, pltr2, &cgrid2);
   pladv(0);
 
+  plFree2dGrid(cgrid2.xg, width+1, height+1);
+  plFree2dGrid(cgrid2.yg, width+1, height+1);
   plFree2dGrid(img_f, width, height);
 
   plend();


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

Revision: 8838
          http://plplot.svn.sourceforge.net/plplot/?rev=8838&view=rev
Author:   airwin
Date:     2008-09-30 17:35:26 +0000 (Tue, 30 Sep 2008)

Log Message:
-----------
Remove many of the pladv(0) commands that have been sprinkled around this
example like confetti.  plenv calls pladv(0) so the result of these
extraneous pladv(0) commands was empty pages.  To understand the page
handling now in this example, note that pladv(0) (or plenv) is called before
each page just like in the other examples.  I have checked this new page
handling system works fine for -dev xwin (with and without selecting a
subset of the Lena image to plot using the mouse) and -dev psc without any
of the empty pages that occurred before.  I have also checked this change
works fine for the example options -nosombrero, -nointeractive, -dbg, and
-save filename.

ToDo.  Propagate this change to the rest of the examples.

Modified Paths:
--------------
    trunk/examples/c/x20c.c

Modified: trunk/examples/c/x20c.c
===================================================================
--- trunk/examples/c/x20c.c	2008-09-29 23:10:29 UTC (rev 8837)
+++ trunk/examples/c/x20c.c	2008-09-30 17:35:26 UTC (rev 8838)
@@ -138,7 +138,6 @@
 	    1., (PLFLT) XDIM, 1., (PLFLT) YDIM, 0., 0.,
 	    1., (PLFLT) XDIM, 1., (PLFLT) YDIM);
 
-    pladv(0);
   }
 
   /* sombrero-like demo */
@@ -168,7 +167,6 @@
     if (f_name)
       save_plot(f_name);
 
-    pladv(0);
     }
 
   plFree2dGrid(z, XDIM, YDIM);
@@ -237,12 +235,10 @@
     plimage(img_f, width, height, 1., width, 1., height, 0., 0., xi, xe, ye, yi);
 
     plspause(1);
-    pladv(0);
 
     /* zoom in selection */
     plenv(xi, xe, ye, yi, 1, -1);
     plimage(img_f, width, height, 1., width, 1., height, 0., 0., xi, xe, ye, yi);
-    pladv(0);
   }
 
   /* Base the dynamic range on the image contents. */
@@ -285,7 +281,6 @@
   }
       
   plimagefr(img_f, width, height, 0., width, 0., height, 0., 0., img_min, img_max, pltr2, &cgrid2);
-  pladv(0);
 
   plFree2dGrid(cgrid2.xg, width+1, height+1);
   plFree2dGrid(cgrid2.yg, width+1, height+1);


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

Revision: 9574
          http://plplot.svn.sourceforge.net/plplot/?rev=9574&view=rev
Author:   andrewross
Date:     2009-02-21 17:51:29 +0000 (Sat, 21 Feb 2009)

Log Message:
-----------
Examples should not include plplotP.h.

Modified Paths:
--------------
    trunk/examples/c/x20c.c

Modified: trunk/examples/c/x20c.c
===================================================================
--- trunk/examples/c/x20c.c	2009-02-21 16:34:27 UTC (rev 9573)
+++ trunk/examples/c/x20c.c	2009-02-21 17:51:29 UTC (rev 9574)
@@ -6,7 +6,6 @@
 
 #include "plcdemos.h"
 #include "plevent.h"
-#include "plplotP.h"
 #include <math.h>
 
 #define XDIM 260


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