The R Project SVN – R – Diff – /branches/djm-source/src/gnuwin32/devga.c

     int fast; /* Use fast fixed-width lines? */
     unsigned int pngtrans; /* what PNG_TRANS get mapped to */
     Rboolean buffered;
     int timeafter, timesince;
     SEXP psenv;
+    double res_dpi;
 } gadesc;
 rect getregion(gadesc *xd)
+{
     rect r = getrect(xd->bm);
 static int Load_Rbitmap_Dll();
 void UnLoad_Rbitmap_Dll();
 static void SaveAsPng(NewDevDesc *dd, char *fn);
 static void SaveAsJpeg(NewDevDesc *dd, int quality, char *fn);
 static void SaveAsBmp(NewDevDesc *dd, char *fn);
-static void SaveAsBitmap(NewDevDesc *dd);
+static void SaveAsBitmap(NewDevDesc *dd, int res);
 static void PrivateCopyDevice(NewDevDesc *dd, NewDevDesc *ndd, char *name)
+{
     GEDevDesc* gdd;
     int saveDev = curDevice();
 		       fromDeviceWidth(toDeviceWidth(1.0, GE_NDC, gdd),
 				       GE_INCHES, gdd),
 		       fromDeviceHeight(toDeviceHeight(-1.0, GE_NDC, gdd),
 					GE_INCHES, gdd),
 		       (double)0, ((gadesc*) dd->deviceSpecific)->basefontsize,
-, 1, 0, "", "R Graphics Output"))
+, 1, 0, "", "R Graphics Output", R_NilValue))
 	/* horizontal=F, onefile=F, pagecentre=T, print.it=F */
 	PrivateCopyDevice(dd, ndd, "postscript");
+}
 			fromDeviceWidth(toDeviceWidth(1.0, GE_NDC, gdd),
 					GE_INCHES, gdd),
 			fromDeviceHeight(toDeviceHeight(-1.0, GE_NDC, gdd),
 					 GE_INCHES, gdd),
 			((gadesc*) dd->deviceSpecific)->basefontsize,
-, "R Graphics Output"))
+, "R Graphics Output", R_NilValue, 1, 4))
 	PrivateCopyDevice(dd, ndd, "PDF");
+}
 	xd->kind = PRINTER;
 	xd->gawin = newprinter(MM_PER_INCH * w, MM_PER_INCH * h, &dsp[10]);
 	if (!xd->gawin)
 	    return FALSE;
     } else if (!strncmp(dsp, "png:", 4) || !strncmp(dsp,"bmp:", 4)) {
+	xd->res_dpi = (xpos == NA_INTEGER) ? 0 : xpos;
 	if(R_OPAQUE(canvascolor))
 	    xd->bg = dd->startfill = GArgb(canvascolor, 1.0);
 	else
 	    xd->bg = dd->startfill = canvascolor;
 	/* was R_RGB(255, 255, 255); white */
 	    warning("Unable to open file `%s' for writing", buf);
 	    return FALSE;
+	}
     } else if (!strncmp(dsp, "jpeg:", 5)) {
         char *p = strchr(&dsp[5], ':');
+	xd->res_dpi = (xpos == NA_INTEGER) ? 0 : xpos;
 	xd->bg = dd->startfill = GArgb(canvascolor, 1.0);
         xd->kind = JPEG;
 	if (!p) return FALSE;
 	if (!Load_Rbitmap_Dll()) {
 	    warning("Unable to load Rbitmap.dll");
+	}
+    }
     if ((xd->kind == PNG || xd->kind == JPEG || xd->kind == BMP)
 	&& xd->needsave) {
 	char buf[600];
-	SaveAsBitmap(dd);
+	SaveAsBitmap(dd, xd->res_dpi);
 	snprintf(buf, 600, xd->filename, xd->npage);
 	if ((xd->fp = fopen(buf, "wb")) == NULL)
 	    error("Unable to open file `%s' for writing", buf);
+    }
     if (xd->kind == SCREEN) {
 	DRAW(gfillrect(_d, xd->bgcolor, xd->clip));
+    }
     SH;
+}
+static void deleteGraphMenus(int devnum)
+{
+    char prefix[15];
+    sprintf(prefix, "$Graph%i", devnum);
+    windelmenus(prefix);
+}
 	/********************************************************/
 	/* device_Close is called when the device is killed	*/
 	/* this function is responsible for destroying any 	*/
 	/* device-specific resources that were created in	*/
 	/* device_Open and for FREEing the device-specific	*/
 			      when a windows() device is opened */
+	}
 	hide(xd->gawin);
 	del(xd->bm);
 	if (xd == GA_xd) GA_xd = NULL;
+	deleteGraphMenus(devNumber((DevDesc*) dd) + 1);
     } else if ((xd->kind == PNG) || (xd->kind == JPEG) || (xd->kind == BMP)) {
-      SaveAsBitmap(dd);
+      SaveAsBitmap(dd, xd->res_dpi);
+    }
     del(xd->font);
     del(xd->gawin);
 /*
  * this is needed since the GraphApp delayed clean-up
     c = ((rgb *)d)[i*png_rows + j];
     return c;
+}
 /* This is the device version */
-static void SaveAsBitmap(NewDevDesc *dd)
+static void SaveAsBitmap(NewDevDesc *dd, int res)
+{
     rect r, r2;
     gadesc *xd = (gadesc *) dd->deviceSpecific;
     unsigned char *data;
 	if(data) {
 	    png_rows = r2.width;
 	    if (xd->kind == PNG)
 		R_SaveAsPng(data, xd->windowWidth, xd->windowHeight,
 			    privategetpixel2, 0, xd->fp,
-			    R_OPAQUE(xd->bg) ? 0 : xd->pngtrans) ;
+			    R_OPAQUE(xd->bg) ? 0 : xd->pngtrans, res) ;
 	    else if (xd->kind == JPEG)
 		R_SaveAsJpeg(data, xd->windowWidth, xd->windowHeight,
-			     privategetpixel2, 0, xd->quality, xd->fp) ;
+			     privategetpixel2, 0, xd->quality, xd->fp, res) ;
 	    else
 		R_SaveAsBmp(data, xd->windowWidth, xd->windowHeight,
-			    privategetpixel2, 0, xd->fp);
+			    privategetpixel2, 0, xd->fp, res);
 	    free(data);
 	} else
 	    warning("processing of the plot ran out of memory");
 	fclose(xd->fp);
+    }
     gsetcliprect(xd->bm, r2 = getrect(xd->bm));
     getbitmapdata2(xd->bm, &data);
     if(data) {
 	png_rows = r2.width;
 	R_SaveAsPng(data, xd->windowWidth, xd->windowHeight,
-		    privategetpixel2, 0, fp, 0) ;
+		    privategetpixel2, 0, fp, 0, 0) ;
 	free(data);
     } else
 	warning("processing of the plot ran out of memory");
     /* R_OPAQUE(xd->bg) ? 0 : xd->canvascolor) ; */
     gsetcliprect(xd->bm, r);
     gsetcliprect(xd->bm, r2 = getrect(xd->bm));
     getbitmapdata2(xd->bm, &data);
     if(data) {
 	png_rows = r2.width;
 	R_SaveAsJpeg(data,xd->windowWidth, xd->windowHeight,
-		     privategetpixel2, 0, quality, fp) ;
+		     privategetpixel2, 0, quality, fp, 0) ;
 	free(data);
     } else
 	warning("processing of the plot ran out of memory");
     gsetcliprect(xd->bm, r);
     fclose(fp);
     getbitmapdata2(xd->bm, &data);
     if(data) {
 	png_rows = r2.width;
 	R_SaveAsBmp(data, xd->windowWidth, xd->windowHeight,
-		    privategetpixel2, 0, fp) ;
+		    privategetpixel2, 0, fp, 0) ;
 	free(data);
     } else
 	warning("processing of the plot ran out of memory");
     gsetcliprect(xd->bm, r);
     fclose(fp);
     if (!gdd) return(0);
     xd = (gadesc *) gdd->dev->deviceSpecific;
     if (!xd) return(0);
     return(getHandle(xd->gawin));
+}
+/* This assumes a menuname of the form $Graph<nn>Main, $Graph<nn>Popup, $Graph<nn>LocMain,
+   or $Graph<nn>LocPopup where <nn> is the
+   device number.  We've already checked the $Graph prefix. */
+menu getGraphMenu(char* menuname)
+{
+    int devnum;
+    GEDevDesc *gdd;
+    gadesc *xd;
+    menuname = menuname + 6;
+    devnum = atoi(menuname);
+    if(devnum < 1 || devnum > R_MaxDevices)
+    	error("invalid graph device number");
+    while (('0' <= *menuname) && (*menuname <= '9')) menuname++;
+    gdd = (GEDevDesc*) GetDevice(devnum - 1);
+    if(!gdd) error("invalid device");
+    xd = (gadesc *) gdd->dev->deviceSpecific;
+    if(!xd || xd->kind != SCREEN) error("bad device");
+    if (strcmp(menuname, "Main") == 0) return(xd->mbar);
+    else if (strcmp(menuname, "Popup") == 0) return(xd->grpopup);
+    else return(NULL);
+}

The R Project SVN R

(root)/branches/djm-source/src/gnuwin32/devga.c @ 34412 – Rev 29864 → 30691