diff options
Diffstat (limited to 'src/graph/view2D/write2d.c')
| -rw-r--r-- | src/graph/view2D/write2d.c | 46 |
1 files changed, 22 insertions, 24 deletions
diff --git a/src/graph/view2D/write2d.c b/src/graph/view2D/write2d.c index 4431da08..395b821a 100644 --- a/src/graph/view2D/write2d.c +++ b/src/graph/view2D/write2d.c @@ -47,33 +47,31 @@ #include "Gfun.H1" -#define numBits (8*sizeof(int)) +#define numBits ((int)(8*sizeof(int))) int writeViewport(int thingsToWrite) { FILE *viewDataFile; - char viewDirName[80], - viewBitmapFilename[80],viewDataFilename[80],command[80]; + char buf[1024]; int i,j,k,ii; pointListStruct *aList; pointStruct *aPoint; XWindowAttributes vwInfo; XGetWindowAttributes(dsply,viewport->titleWindow,&vwInfo); - sprintf(viewDirName,"%s%s",filename,".VIEW"); - sprintf(command,"%s%s%s","rm -r ",viewDirName," > /dev/null 2>&1"); - system(command); - sprintf(command,"%s%s%s","mkdir ",viewDirName," > /dev/null 2>&1"); - if (system(command)) { - fprintf(stderr," Error: Cannot create %s\n",viewDirName); + sprintf(buf, "rm -f %s.VIEW", filename); + system(buf); + sprintf(buf, "mkdir %s.VIEW", filename); + if (system(buf)) { + fprintf(stderr," Error: Cannot create %s.VIEW\n", filename); return(-1); } else { /*** Create the data file ***/ - sprintf(viewDataFilename,"%s%s",viewDirName,"/data"); - if ((viewDataFile = fopen(viewDataFilename,"w")) == NULL) { - fprintf(stderr," Error: Cannot create %s\n",viewDataFilename); + sprintf(buf,"%s.VIEW/data", filename); + if ((viewDataFile = fopen(buf,"w")) == NULL) { + fprintf(stderr," Error: Cannot create %s\n", buf); perror("fopen"); return(-1); } else { @@ -101,9 +99,9 @@ writeViewport(int thingsToWrite) fclose(viewDataFile); for (i=0; i<maxGraphs; i++) { if (graphArray[i].key) { - sprintf(viewDataFilename,"%s%s%d",viewDirName,"/graph",i); - if ((viewDataFile = fopen(viewDataFilename,"w")) == NULL) { - fprintf(stderr," Error: Cannot create %s\n",viewDataFilename); + sprintf(buf,"%s.VIEW/graph%d", filename, i); + if ((viewDataFile = fopen(buf,"w")) == NULL) { + fprintf(stderr," Error: Cannot create %s\n", buf); perror("fopen"); return(-1); } else { @@ -143,37 +141,37 @@ writeViewport(int thingsToWrite) switch (ii) { case Pixmap: /*** Create the pixmap (bitmaps need leaf name) ***/ - sprintf(viewBitmapFilename,"%s%s",viewDirName,"/image.xpm"); + sprintf(buf,"%s.VIEW/image.xpm", filename); XGetWindowAttributes(dsply,viewport->viewWindow,&vwInfo); - write_pixmap_file(dsply,scrn,viewBitmapFilename, + write_pixmap_file(dsply,scrn,buf, viewport->titleWindow,0,0,vwInfo.width, vwInfo.height+titleHeight); break; case Bitmap: /*** Create the bitmap (bitmaps need leaf name) ***/ - sprintf(viewBitmapFilename,"%s%s",viewDirName,"/image.bm"); + sprintf(buf,"%s.VIEW/image.bm", filename); XGetWindowAttributes(dsply,viewport->viewWindow,&vwInfo); - XWriteBitmapFile(dsply,viewBitmapFilename, + XWriteBitmapFile(dsply,buf, viewport->titleWindow,vwInfo.width, vwInfo.height+vwInfo.border_width+20,-1,-1); break; case Image: /*** Create the pixmap (bitmaps need leaf name) ***/ - sprintf(viewBitmapFilename,"%s%s",viewDirName,"/image.xpm"); + sprintf(buf,"%s.VIEW/image.xpm", filename); XResizeWindow(dsply,viewport->titleWindow,300,300+titleHeight); XResizeWindow(dsply,viewport->viewWindow,300,300); XGetWindowAttributes(dsply,viewport->viewWindow,&vwInfo); drawViewport(Xoption); writeTitle(); - write_pixmap_file(dsply,scrn,viewBitmapFilename, + write_pixmap_file(dsply,scrn,buf, viewport->titleWindow,0,0,vwInfo.width, vwInfo.height+titleHeight); /*** Create the bitmap (bitmaps need leaf name) ***/ mono = 1; drawViewport(Xoption); writeTitle(); - sprintf(viewBitmapFilename,"%s%s%s",viewDirName,"/","image.bm"); - XWriteBitmapFile(dsply,viewBitmapFilename, + sprintf(buf,"%s.VIEW/image.bm", filename); + XWriteBitmapFile(dsply,buf, viewport->titleWindow,vwInfo.width, vwInfo.height+vwInfo.border_width+20,-1,-1); mono = 0; @@ -181,7 +179,7 @@ writeViewport(int thingsToWrite) case Postscript: /*** Create postscript output for viewport (in axiom2D.ps) ***/ - sprintf(PSfilename,"%s%s",viewDirName,"/axiom2D.ps"); + sprintf(PSfilename,"%s.VIEW/axiom2D.ps", filename); if (PSInit(viewport->viewWindow,viewport->titleWindow) == psError) return (-1); drawViewport(PSoption); /* write new script file in /tmp */ |