Changeset 38917

Timestamp:

Oct 20, 2015, 8:26:50 PM (11 years ago)

Author:

eugene

Message:

adding PS dX to the font description to get PS string length right

Location:

branches/eam_branches/ipp-20150625/Ohana/src/libkapa

Files:

• Makefile (modified) (1 diff)
• include/alphabet.h (modified) (2 diffs)
• include/kapa.h (modified) (2 diffs)
• src/DrawRotString.c (modified) (1 diff)
• src/PSRotFont.c (modified) (3 diffs)

branches/eam_branches/ipp-20150625/Ohana/src/libkapa/Makefile

@@ -18 +18 @@
 FULL_LDFLAGS  = $(BASE_LDFLAGS) -ldvo -lFITS -lohana
 
-install: $(DESTINC)/kapa.h $(DESTLIB)/libkapa.a $(DESTLIB)/libkapa.$(DLLTYPE)
-libkapa: $(LIB)/libkapa.$(ARCH).a $(LIB)/libkapa.$(ARCH).$(DLLTYPE)
+install: ROTFONT $(DESTINC)/kapa.h $(DESTLIB)/libkapa.a $(DESTLIB)/libkapa.$(DLLTYPE)
+libkapa: ROTFONT $(LIB)/libkapa.$(ARCH).a $(LIB)/libkapa.$(ARCH).$(DLLTYPE)
+
+ROTFONT:
+        cd rotfont && make all
 
 INCS = $(DESTINC)/kapa.h

branches/eam_branches/ipp-20150625/Ohana/src/libkapa/include/alphabet.h

@@ +1 @@
+
+# if (0) 
+# include "../rotfont/times8.h"
+
+# define DEFFONT 1
+static FontSet HardwiredFonts[] = {
+  {times8font,  "times", 8}
+};
+# endif
+
+# if (1)
 # include "../rotfont/times8.h"
 # include "../rotfont/times12.h"
@@ -49 +60 @@
   {symbol24font, "symbol", 24}
 };
+# endif
 
 /* put these as static in RotFont.c with accessor functions */

branches/eam_branches/ipp-20150625/Ohana/src/libkapa/include/kapa.h

@@ -109 +109 @@
 
 typedef struct {
-  int dx, dy, ascent;
+  int dx;
+  int dy;
+  float dXps;
+  int ascent;
   unsigned char *bits;
 } RotFont;
@@ -233 +236 @@
 void PSDumpRotSegment PROTO((FILE *f, char *segment, int *Nseg));
 void PSSetFont PROTO((FILE *f, char *name, int size));
+int PSRotStrlen PROTO((char *c));
 
 /* bDrawFuncs.c */

branches/eam_branches/ipp-20150625/Ohana/src/libkapa/src/DrawRotString.c

@@ -22 +22 @@
     return (TRUE);
 }
+
+/* position can be one of 9 values center the text in the following way 
+   0 1 2
+   3 4 5
+   6 7 8
+
+   e.g., 4 has the center of the string at the x,y position
+         0 has the lower-right corner at the position (left & up justified)
+*/
 
 int DrawRotText (int x, int y, char *string, int pos, double angle) {

branches/eam_branches/ipp-20150625/Ohana/src/libkapa/src/PSRotFont.c

@@ -9 +9 @@
   int i, N, code, protect;
   int dX, dY, Xoff, Yoff, X, Y, Nseg, NSEG, YoffBase;
-  double cs, sn, fscale, currentscale;
+  double cs, sn, currentscale;
   int basesize, currentsize;
   RotFont *currentfont;
@@ -23 +23 @@
   
   /* compute string length */
-  /* PS fonts are somewhat different scales from bitmap font equivalents */
-  fscale = 1.0;
-  if (!strcmp (currentname, "times")) fscale = 1.07;
-  if (!strcmp (currentname, "courier")) fscale = 1.5;
-  if (!strcmp (currentname, "helvetica")) fscale = 0.9;
-  if (!strcmp (currentname, "symbol")) fscale = 1.2;
-  dX = fscale*RotStrlen (string);
+  dX = PSRotStrlen (string);
   dY = currentfont[65].ascent;
   
@@ -201 +195 @@
 }
 
+# define NROT 256
+int PSRotStrlen (char *c) {
+
+  int i, N, dX, code;
+  double currentscale, scale; 
+
+  RotFont *currentfont = GetRotFontData (&currentscale);
+  scale = currentscale;
+
+  /* find string length */
+  dX = 0;
+
+  code = FALSE;
+  for (i = 0; i < strlen (c); i++) {
+    N = (int)(c[i]);
+    /* skip non-printing characters */
+    if ((N < 0) || (N >= NROT)) continue;
+
+    /* check for special characters */
+    if (!code) {
+      if (N == 94) { /* super-script */
+        scale *= 0.8;
+        continue;
+      }
+      if (N == 95) { /* sub-script */
+        scale *= 0.8;
+        continue;
+      }
+      if (N == 124) { /* normal-script */
+        scale = currentscale;
+        continue;
+      }
+      if (N == 92) { /* backslash */
+        code = TRUE;
+        continue;
+      } 
+      if (N == 38) { /* font-code */
+        i++;
+        continue;
+      }
+    }
+    code = FALSE;
+    dX += scale*currentfont[N].dXps + 1;
+  }
+  return (dX);
+}