The R Project SVN – R – Diff – /branches/R-NaString/src/main/plot3d.c

 	    buffer[strlen(buffer)+1] = '\0';
 	    buffer[strlen(buffer)] = ' ';
 	    if (vectorFonts) {
 		/* 1, 1 => sans serif, basic font */
+		labelDistance =
-		labelDistance = GVStrWidth(buffer, typeface, fontindex,
+		    GVStrWidth((unsigned char *)buffer, typeface, fontindex,
-					   INCHES, dd);
+			       INCHES, dd);
+		labelHeight =
-		labelHeight = GVStrHeight(buffer, typeface, fontindex,
+		    GVStrHeight((unsigned char *)buffer, typeface, fontindex,
-					  INCHES, dd);
+				INCHES, dd);
+	    }
 	    else {
 		labelDistance = GStrWidth(buffer, INCHES, dd);
 		labelHeight = GStrHeight(buffer, INCHES, dd);
+	    }
 static void PerspAxis(double *x, double *y, double *z,
 		      int axis, int axisType, int nTicks, int tickType,
 		      char *label, DevDesc *dd) {
     Vector3d u1, u2, u3, v1, v2, v3;
     double tickLength = .03; /* proportion of axis length */
-    double min, max;
+    double min, max, d_frac;
     double *range = NULL; /* -Wall */
     double axp[3];
     int nint, i;
     SEXP at, lab;
     switch (axisType) {
     case 0:
-	min = x[0];
-	max = x[1];
+	min = x[0];	max = x[1];	range = x;	break;
-	range = x;
-	break;
     case 1:
-	min = y[0];
-	max = y[1];
+	min = y[0];	max = y[1];	range = y;	break;
-	range = y;
-	break;
     case 2:
-	min = z[0];
-	max = z[1];
+	min = z[0];	max = z[1];	range = z;	break;
-	range = z;
-	break;
+    }
+    d_frac = 0.1*(max - min);
+    nint = nTicks - 1; if(!nint) nint++;
-    nint = nTicks-1;
+    i = nint;
     GPretty(&min, &max, &nint);
+    /* GPretty() rarely gives values too much outside range ..
+D axis() clip these, we play cheaper */
+    while((min < range[0] - d_frac || range[1] + d_frac < max) && i < 20) {
+	nint = ++i;
+	min = range[0];
+	max = range[1];
+	GPretty(&min, &max, &nint);
+    }
     axp[0] = min;
     axp[1] = max;
     axp[2] = nint;
     /* Do the following calculations for both ticktypes */
     switch (axisType) {
     double ltheta, lphi;
     double expand, xc, yc, zc, xs, ys, zs;
     int i, j, scale, ncol, dobox, doaxes, nTicks, tickType;
     DevDesc *dd;
-    if (length(args) < 18)
+    if (length(args) < 24)
 	errorcall(call, "too few parameters");
     gcall = call;
     originalArgs = args;
     PROTECT(x = coerceVector(CAR(args), REALSXP));
     PROTECT(depth = allocVector(REALSXP, (nrows(z) - 1)*(ncols(z) - 1)));
     PROTECT(indx = allocVector(INTSXP, (nrows(z) - 1)*(ncols(z) - 1)));
     DepthOrder(REAL(z), REAL(x), REAL(y), nrows(z), ncols(z),
 	       REAL(depth), INTEGER(indx));
-    /* Now we order the facets by depth */
+    /* Now we order the facets by depth and then draw them back to front.
-    /* and then draw them back to front. */
-    /* This is the "painters" algorithm. */
+     * This is the "painters" algorithm. */
     GMode(1, dd);
     if (dobox) {
         PerspBox(0, REAL(xlim), REAL(ylim), REAL(zlim), dd);
         recordGraphicOperation(op, originalArgs, dd);
     PROTECT(x = allocVector(REALSXP, 16));
     PROTECT(y = allocVector(INTSXP, 2));
     for (i = 0; i < 4; i++)
-      for (j = 0; j < 4; j++) {
+	for (j = 0; j < 4; j++)
-        REAL(x)[i + j * 4] = VT[i][j];
+	    REAL(x)[i + j * 4] = VT[i][j];
-      }
     INTEGER(y)[0] = 4;
     INTEGER(y)[1] = 4;
     setAttrib(x, R_DimSymbol, y);
     UNPROTECT(2);
     return x;

The R Project SVN R

(root)/branches/R-NaString/src/main/plot3d.c @ 28362 – Rev 11510 → 12256