Changeset 40124 for branches/eam_branches/ohana.20170822

Timestamp:

Aug 22, 2017, 2:51:11 PM (9 years ago)

Author:

eugene

Message:

fix font size change for super and subscript

Location:

branches/eam_branches/ohana.20170822/src/libkapa/src

Files:

• KapaWindow.c (modified) (1 diff)
• PSRotFont.c (modified) (4 diffs)
• bDrawFuncs.c (modified) (1 diff)

branches/eam_branches/ohana.20170822/src/libkapa/src/KapaWindow.c

@@ -94 +94 @@
   graphdata[0].xmax = graphdata[0].ymax = 1.0;
 
-  graphdata[0].style = graphdata[0].ptype = 2;
+  graphdata[0].style = KAPA_PLOT_POINTS;
+  graphdata[0].ptype = KAPA_POINT_BOX_SOLID;
   graphdata[0].ltype = graphdata[0].color = 0;
   graphdata[0].etype = graphdata[0].ebar = 0;

branches/eam_branches/ohana.20170822/src/libkapa/src/PSRotFont.c

@@ -90 +90 @@
     /* check for special characters */
     if (!code && !protect) {
-      /* superscript character (^) */
+      /* subscript character (_) */
       if (N == 94) {
         PSDumpRotSegment (f, segment, &Nseg);
-        SetRotFont (currentname, (int)(0.8*currentsize));
+        PSSetFont (f, currentname, (int)(0.8*currentsize));
         currentfont = GetRotFontData (&currentscale);
         Yoff = 0.75*currentscale*dY;
         fprintf (f, "0 %d rmoveto\n", Yoff);
         YoffBase += Yoff;
-        PSSetFont (f, currentname, currentsize);
-        continue;
-      }
-      /* subscript character (_) */
+        // PSSetFont (f, currentname, currentsize);
+        continue;
+      }
+      /* superscript character (^) */
       if (N == 95) { 
         PSDumpRotSegment (f, segment, &Nseg);
-        SetRotFont (currentname, (int)(0.8*currentsize));
+        PSSetFont (f, currentname, (int)(0.8*currentsize));
         currentfont = GetRotFontData (&currentscale);
         Yoff = -0.5*currentscale*dY;
         fprintf (f, "0 %d rmoveto\n", Yoff);
         YoffBase += Yoff;
-        PSSetFont (f, currentname, currentsize);
+        // PSSetFont (f, currentname, currentsize);
         continue;
       }
@@ -115 +115 @@
       if (N == 124) {
         PSDumpRotSegment (f, segment, &Nseg);
-        SetRotFont (currentname, basesize);
+        PSSetFont (f, currentname, basesize);
         currentfont = GetRotFontData (&currentscale);
         fprintf (f, "0 %d rmoveto\n", -YoffBase);
         YoffBase = 0;
-        PSSetFont (f, currentname, currentsize);
+        // PSSetFont (f, currentname, currentsize);
         continue;
       }
@@ -145 +145 @@
         PSDumpRotSegment (f, segment, &Nseg);
         if (string[i+1] == 'h') {
-          SetRotFont ("helvetica", currentsize);
-          currentfont = GetRotFontData (&currentscale);
-          PSSetFont (f, currentname, currentsize);
+          PSSetFont (f, "helvetica", currentsize);
+          currentfont = GetRotFontData (&currentscale);
+          // PSSetFont (f, currentname, currentsize);
         }
         if (string[i+1] == 't') {
-          SetRotFont ("times", currentsize);
-          currentfont = GetRotFontData (&currentscale);
-          PSSetFont (f, currentname, currentsize);
+          PSSetFont (f, "times", currentsize);
+          currentfont = GetRotFontData (&currentscale);
+          // PSSetFont (f, currentname, currentsize);
         }
         if (string[i+1] == 'c') {
-          SetRotFont ("courier", currentsize);
-          currentfont = GetRotFontData (&currentscale);
-          PSSetFont (f, currentname, currentsize);
+          PSSetFont (f, "courier", currentsize);
+          currentfont = GetRotFontData (&currentscale);
+          // PSSetFont (f, currentname, currentsize);
         }
         if (string[i+1] == 's') {
-          SetRotFont ("symbol", currentsize);
-          currentfont = GetRotFontData (&currentscale);
-          PSSetFont (f, currentname, currentsize);
+          PSSetFont (f, "symbol", currentsize);
+          currentfont = GetRotFontData (&currentscale);
+          // PSSetFont (f, currentname, currentsize);
         }
         i++;
@@ -176 +176 @@
   fprintf (f, "stroke grestore\n");
   free (segment);
-  SetRotFont (basename, basesize);
+  PSSetFont (f, basename, basesize);
 }
 

branches/eam_branches/ohana.20170822/src/libkapa/src/bDrawFuncs.c

@@ -78 +78 @@
 // "bDrawColor color" is one of the hardwired colors in KapaColors.c
 void bDrawSetColor (bDrawBuffer *buffer, bDrawColor color) {
-  fprintf (stderr, "set color %d\n", color);
   buffer->bColor = color;
   buffer->bColor_R = buffer->palette[color].red;