Changeset 10834

Timestamp:

Dec 27, 2006, 9:10:53 AM (20 years ago)

Author:

eugene

Message:

support for multipage plots; additional PS info now sent after PSIT command

Location:

trunk/Ohana/src/kapa

Files:

• Makefile (modified) (2 diffs)
• event/CheckPipe.c (modified) (1 diff)
• event/Resize.c (modified) (2 diffs)
• graph/PSObjects.c (modified) (6 diffs)
• include/constants.h (modified) (1 diff)
• include/prototypes.h (modified) (1 diff)

trunk/Ohana/src/kapa/Makefile

@@ -15 +15 @@
 
 LDFLAGS :=      -lkapa -ldvo -lFITS -lohana $(LDFLAGS)
+LDDEPS  = $(DESTLIB)/libkapa.a $(DESTLIB)/libdvo.a $(DESTLIB)/libFITS.a $(DESTLIB)/libohana.a
+INDEPS  = $(DESTINC)/kapa.h $(DESTINC)/dvo.h $(DESTINC)/gfitsio.h $(DESTINC)/ohana.h
 
 kapa: $(BIN)/kapa.$(ARCH)
@@ -66 +68 @@
         $(INC)/prototypes.h
 
+$(OBJ): $(INDEPS) $(LDDEPS)
+
 $(BIN)/kapa.$(ARCH): $(OBJ)

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

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

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

@@ -14 +14 @@
   graphic.dy = MAX(NY, 50); 
 
-  XResizeWindow (graphic.display, graphic.window, NX, NY);
+  if (USE_XWINDOW) XResizeWindow (graphic.display, graphic.window, NX, NY);
 
   for (i = 0; i < Nsection; i++) {
@@ -20 +20 @@
   }
 
-  XClearWindow (graphic.display, graphic.window);
+  if (USE_XWINDOW) XClearWindow (graphic.display, graphic.window);
   Refresh (1);
 

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

@@ -5 +5 @@
 void ClipLinePS (double, double, double, double, double, double, double, double, FILE *);
 
-int PSit (int mode) {
-
-  int i;
+static char *name = "$Name: not supported by cvs2svn $";
+
+int PSit () {
+
+  int i, pageMode, scaleMode;
   double scale;
   FILE *f;
-  char filename[1024];
+  char filename[1024], pagename[1024], *version;
   int Nbytes, status;
 
   /* expect a line telling the number of bytes and a filename */
-  status = read (sock, filename, 16);
-  filename[16] = 0;
-  sscanf (filename, "%*s %d", &Nbytes);
-  status = read (sock, filename, Nbytes);
-  filename[status] = 0; /* make the string easy to parse */
-
-  if (mode == NEWPAGE) {
-    f = fopen (filename, "a");
+  KiiScanMessage (sock, "%s %s %d %d", filename, pagename, &scaleMode, &pageMode);
+
+  if (pageMode == KAPA_PS_NEWPAGE) {
+    f = fopen (filename, "a+");
   } else {
     f = fopen (filename, "w");
   }
-
-  if (f == (FILE *) NULL) {
+  if (f == NULL) {
     fprintf (stderr, "can't open output file %s\n", filename);
     return (TRUE);  /* true because otherwise it quits kapa! */
@@ -32 +29 @@
 
   /* two scaling options: expand to fit page / keep absolute size */ 
-  scale = 1;
-  if (mode == SCALE) {
+  if (scaleMode) {
     scale = MIN (fabs(500.0 / graphic.dx), fabs (700.0 / graphic.dy));
   } else {
@@ -39 +35 @@
   }
 
-  switch (mode) {
-    case NEWPAGE:
-      fprintf (f, "%%%%Page: foobar\n\n");
-      break;
-
-    case SCALE:
-    case NOSCALE:
+  switch (pageMode) {
+    case KAPA_PS_NEWPLOT:
       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, "%%%%Title: %s\n", filename);
+      version = strip_version (name);
+      fprintf (f, "%%%%Creator: Kapa (%s)\n", version);
+      free (version);
       fprintf (f, "%%%%BoundingBox: %d %d %.0f %.0f\n", 
                XOFFSET, YOFFSET, XOFFSET + scale*graphic.dx, YOFFSET + scale*graphic.dy);
@@ -55 +48 @@
       fprintf (f, "%%%%EndComments\n");
       fprintf (f, "%%%%EndProlog\n");
-      fprintf (f, "%%%%Page: foobar\n\n");
-      break;
-
-    case RAW:
+      fprintf (f, "%%%%Page: %s\n\n", pagename);
+      break;
+
+    case KAPA_PS_NEWPAGE:
+      fprintf (f, "%%%%Page: %s\n\n", pagename);
+      break;
+
+    case KAPA_PS_RAWPAGE:
       break;
   } 
@@ -73 +70 @@
   fprintf (f, "/TF {newpath moveto lineto lineto fill stroke} def\n\n");
 
-  if (mode != RAW) {
+  if (pageMode != KAPA_PS_RAWPAGE) {
     fprintf (f, " %d %d translate\n", XOFFSET, YOFFSET);
     fprintf (f, "  %f  %f scale\n", scale, scale);
@@ -87 +84 @@
   fprintf (f, "grestore %% end of picture\n");
 
-  if (mode != RAW) fprintf (f, "showpage\n");
+  if (pageMode != KAPA_PS_RAWPAGE) fprintf (f, "showpage\n");
 
   fclose (f);

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

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

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

@@ -44 +44 @@
 void          PSXErrors           PROTO((Layout *, Gobjects *, FILE *));
 void          PSYErrors           PROTO((Layout *, Gobjects *, FILE *));
-int           PSit                PROTO((int));
+int           PSit                PROTO(());
 void          PositionPicture     PROTO((Layout *));
 void          QuitX               PROTO((Display *, char *, char *));