Changeset 10802

Timestamp:

Dec 17, 2006, 10:09:31 AM (20 years ago)

Author:

eugene

Message:

adding -newpage to kapa capabilities

Location:

trunk/Ohana/src

Files:

• kapa/event/CheckPipe.c (modified) (1 diff)
• kapa/graph/PSObjects.c (modified) (2 diffs)
• kapa/include/constants.h (modified) (1 diff)
• libkapa/include/kapa.h (modified) (1 diff)
• libkapa/src/KiiConvert.c (modified) (2 diffs)
• opihi/cmd.data/ps.c (modified) (2 diffs)
• relastro/src/plotstuff.c (modified) (1 diff)
• relphot/src/plotstuff.c (modified) (1 diff)

trunk/Ohana/src/kapa/event/CheckPipe.c

@@ -46 +46 @@
   if (!strcmp (buffer, "PSNS")) {
     status = PSit (NOSCALE);
+    write (sock, "DONE", 4);
+    return (status);
+  }
+  
+  if (!strcmp (buffer, "PSNP")) {
+    status = PSit (NEWPAGE);
     write (sock, "DONE", 4);
     return (status);

trunk/Ohana/src/kapa/graph/PSObjects.c

@@ -20 +20 @@
   filename[status] = 0; /* make the string easy to parse */
 
-  f = fopen (filename, "w");
+  if (mode == NEWPAGE) {
+    f = fopen (filename, "a");
+  } else {
+    f = fopen (filename, "w");
+  }
+
   if (f == (FILE *) NULL) {
     fprintf (stderr, "can't open output file %s\n", filename);
@@ -34 +39 @@
   }
 
-  if (mode != RAW) {
-    fprintf (f, "%%!PS-Adobe-2.0 EPSF-2.0\n");
-    fprintf (f, "%%%%Title: Kapa Plot\n");
-    fprintf (f, "%%%%Creator: Kapa (0.95)\n");
-    fprintf (f, "%%%%BoundingBox: %d %d %.0f %.0f\n", 
-             XOFFSET, YOFFSET, XOFFSET + scale*graphic.dx, YOFFSET + scale*graphic.dy);
-    fprintf (f, "%%%%Pages: 1\n");
-    fprintf (f, "%%%%DocumentFonts:\n");
-    fprintf (f, "%%%%EndComments\n");
-    fprintf (f, "%%%%EndProlog\n");
-    fprintf (f, "%%%%Page: 1 1\n\n");
+  switch (mode) {
+    case NEWPAGE:
+      fprintf (f, "%%%%Page: foobar\n\n");
+      break;
+
+    case SCALE:
+    case NOSCALE:
+      fprintf (f, "%%!PS-Adobe-2.0 EPSF-2.0\n");
+      fprintf (f, "%%%%Title: Kapa Plot\n");
+      fprintf (f, "%%%%Creator: Kapa (0.95)\n");
+      fprintf (f, "%%%%BoundingBox: %d %d %.0f %.0f\n", 
+               XOFFSET, YOFFSET, XOFFSET + scale*graphic.dx, YOFFSET + scale*graphic.dy);
+      fprintf (f, "%%%%Pages: 1\n");
+      fprintf (f, "%%%%DocumentFonts:\n");
+      fprintf (f, "%%%%EndComments\n");
+      fprintf (f, "%%%%EndProlog\n");
+      fprintf (f, "%%%%Page: foobar\n\n");
+      break;
+
+    case RAW:
+      break;
   } 
   fprintf (f, "gsave %% encloses picture\n");

trunk/Ohana/src/kapa/include/constants.h

@@ -26 +26 @@
 # define LABELLR 7
 
-enum {SCALE, NOSCALE, RAW};
+enum {SCALE, NOSCALE, RAW, NEWPAGE};
 
 /* EVENT_MASK consists of:

trunk/Ohana/src/libkapa/include/kapa.h

@@ -110 +110 @@
 
 /* KiiConvert.c */
-int KiiPS (int fd, int scale, int raw, char *filename);
+int KiiPS (int fd, int scale, int raw, int newpage, char *filename);
 int KiiJPEG (int fd, char *filename);
 int KapaPNG (int fd, char *filename);

trunk/Ohana/src/libkapa/src/KiiConvert.c

@@ -37 +37 @@
 }
 
-int KiiPS (int fd, int scale, int raw, char *filename) {
+int KiiPS (int fd, int scale, int raw, int newpage, char *filename) {
 
   char buffer[20];
@@ -49 +49 @@
     goto name;
   }
-  if (!raw && !scale) {
-    KiiSendCommand (fd, 4, "PSIT");
+  if (newpage) {
+    KiiSendCommand (fd, 4, "PSNP");
     goto name;
   }
+  /* the default operation */
+  KiiSendCommand (fd, 4, "PSIT");
 
 name:

trunk/Ohana/src/opihi/cmd.data/ps.c

@@ -4 +4 @@
 
   char filename[1024];
-  int N, Source, Nsource, RawImage, NoScale, IsImage;
+  int N, Source, Nsource, RawImage, NoScale, NewPage, IsImage;
   
   if ((N = get_argument (argc, argv, "--help"))) goto help;
   if ((N = get_argument (argc, argv, "-h"))) goto help;
 
+  /* raw image? */
+  NewPage = FALSE;
+  if ((N = get_argument (argc, argv, "-newpage"))) {
+    remove_argument (N, &argc, argv);
+    NewPage = TRUE;
+  }
   /* raw image? */
   RawImage = FALSE;
@@ -54 +60 @@
   
   /* tell Ximage/Xgraph to ps the image */
-  KiiPS (Source, NoScale, RawImage, filename);
+  KiiPS (Source, NoScale, RawImage, NewPage, filename);
   return (TRUE);
 

trunk/Ohana/src/relastro/src/plotstuff.c

@@ -49 +49 @@
   if (Xgraph[N] == 0) return;
 
-  KiiPS (Xgraph[N], FALSE, FALSE, filename);
+  KiiPS (Xgraph[N], FALSE, FALSE, FALSE, filename);
   return;
 }

trunk/Ohana/src/relphot/src/plotstuff.c

@@ -49 +49 @@
   if (Xgraph[N] == 0) return;
 
-  KiiPS (Xgraph[N], FALSE, FALSE, filename);
+  KiiPS (Xgraph[N], FALSE, FALSE, FALSE, filename);
   return;
 }