[Plplot-cvs] SF.net SVN: plplot:[8992] trunk/src

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

Revision: 8992
          http://plplot.svn.sourceforge.net/plplot/?rev=8992&view=rev
Author:   andrewross
Date:     2008-11-19 09:34:20 +0000 (Wed, 19 Nov 2008)

Log Message:
-----------
Fix duplicate lines when drawing ticks on the axes.

Modified Paths:
--------------
    trunk/src/plbox.c
    trunk/src/pltick.c

Modified: trunk/src/plbox.c
===================================================================
--- trunk/src/plbox.c	2008-11-18 22:40:34 UTC (rev 8991)
+++ trunk/src/plbox.c	2008-11-19 09:34:20 UTC (rev 8992)
@@ -234,6 +234,7 @@
 
     if (lbx) {
 	plP_movphy(vppxmi, vppymi);
+	plP_draphy(vppxma, vppymi);
 	if (ltx) {
 	    if (ldx) {
 	      pldtfac(vpwxmi, vpwxma, &factor, &tstart);
@@ -265,13 +266,13 @@
 		tp = tn;
 	    }
 	}
-	plP_draphy(vppxma, vppymi);
     }
 
 /* Draw right-hand edge of box */
 
     if (lcy) {
 	plP_movphy(vppxma, vppymi);
+	plP_draphy(vppxma, vppyma);
 	if (lty) {
 	    if (ldy) {
 	      pldtfac(vpwymi, vpwyma, &factor, &tstart);
@@ -303,13 +304,13 @@
 		tp = tn;
 	    }
 	}
-	plP_draphy(vppxma, vppyma);
     }
 
 /* Draw the top edge of the box */
 
     if (lcx) {
 	plP_movphy(vppxma, vppyma);
+	plP_draphy(vppxmi, vppyma);
 	if (ltx) {
 	    if (ldx) {
 	      pldtfac(vpwxmi, vpwxma, &factor, &tstart);
@@ -341,13 +342,13 @@
 		tp = tn;
 	    }
 	}
-	plP_draphy(vppxmi, vppyma);
     }
 
 /* Draw left-hand edge of box */
 
     if (lby) {
 	plP_movphy(vppxmi, vppyma);
+	plP_draphy(vppxmi, vppymi);
 	if (lty) {
 	    if (ldy) {
 	      pldtfac(vpwymi, vpwyma, &factor, &tstart);
@@ -379,13 +380,13 @@
 		tp = tn;
 	    }
 	}
-	plP_draphy(vppxmi, vppymi);
     }
 
 /* Draw the horizontal axis */
 
     if (lax) {
 	plP_movphy(vppxmi, yp0);
+	plP_draphy(vppxma, yp0);
 	if (ltx) {
 	    tp = xtick1 * floor(vpwxmi / xtick1);
 	    for (;;) {
@@ -412,13 +413,13 @@
 		tp = tn;
 	    }
 	}
-	plP_draphy(vppxma, yp0);
     }
 
 /* Draw the vertical axis */
 
     if (lay) {
 	plP_movphy(xp0, vppymi);
+	plP_draphy(xp0, vppyma);
 	if (lty) {
 	    tp = ytick1 * floor(vpwymi / ytick1);
 	    for (;;) {
@@ -445,7 +446,6 @@
 		tp = tn;
 	    }
 	}
-	plP_draphy(xp0, vppyma);
     }
 
 /* Draw grids */
@@ -715,6 +715,7 @@
 /* Draw the line */
 
     plP_movwor(wx1, wy1);
+    plP_drawor(wx2, wy2);
     if (lt) {
 	tp = tick1 * floor(vmin / tick1);
 	for (;;) {
@@ -760,7 +761,6 @@
 	}
     }
 
-    plP_drawor(wx2, wy2);
 
 /* Label the line */
 
@@ -935,6 +935,7 @@
 /* Draw the line */
 
     plP_movwor(wx, wy1);
+    plP_drawor(wx, wy2);
     if (lt) {
 	tp = tick1 * floor(vmin / tick1);
 	for (;;) {
@@ -979,7 +980,6 @@
 	}
     }
 
-    plP_drawor(wx, wy2);
 
 /* Label the line */
 

Modified: trunk/src/pltick.c
===================================================================
--- trunk/src/pltick.c	2008-11-18 22:40:34 UTC (rev 8991)
+++ trunk/src/pltick.c	2008-11-19 09:34:20 UTC (rev 8992)
@@ -32,15 +32,8 @@
 void
 plxtik(PLINT x, PLINT y, PLINT below, PLINT above)
 {
-    plP_draphy(x, y);
-
-    if (below != 0)
-	plP_draphy(x, y - below);
-
-    if (above != 0)
-	plP_draphy(x, y + above);
-
-    plP_draphy(x, y);
+    plP_movphy(x, y-below);
+    plP_draphy(x, y+above);
 }
 
 /*----------------------------------------------------------------------*\
@@ -52,15 +45,8 @@
 void
 plytik(PLINT x, PLINT y, PLINT left, PLINT right)
 {
-    plP_draphy(x, y);
-
-    if (left != 0)
-	plP_draphy(x - left, y);
-
-    if (right != 0)
-	plP_draphy(x + right, y);
-
-    plP_draphy(x, y);
+    plP_movphy(x-left, y);
+    plP_draphy(x+right, y);
 }
 
 /*----------------------------------------------------------------------*\
@@ -73,9 +59,8 @@
 void
 plstik(PLFLT mx, PLFLT my, PLFLT dx, PLFLT dy)
 {
-    plP_draphy(plP_mmpcx(mx), plP_mmpcy(my));
+    plP_movphy(plP_mmpcx(mx), plP_mmpcy(my));
     plP_draphy(plP_mmpcx((PLFLT) (mx + dx)), plP_mmpcy((PLFLT) (my + dy)));
-    plP_draphy(plP_mmpcx(mx), plP_mmpcy(my));
 }
 
 /*----------------------------------------------------------------------*\


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