IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 40628 for trunk


Ignore:
Timestamp:
Feb 23, 2019, 10:46:32 AM (7 years ago)
Author:
eugene
Message:

add a little padding to the textline (1/2 character)

Location:
trunk/Ohana/src/libkapa/src
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/Ohana/src/libkapa/src/DrawRotString.c

    r40419 r40628  
    5757  dX = RotStrlen (string);
    5858  dY = currentfont[65].ascent;
     59  int dP = ceil(0.25 * dY);
    5960
    6061  /* apply appropriate offset */
    6162  Xoff = Yoff = 0;
    6263  switch (pos) {
    63   case 0: Xoff =     -dX; Yoff = dY; break;
    64   case 1: Xoff = -0.5*dX; Yoff = dY; break;
    65   case 2: Xoff =       0; Yoff = dY; break;
    66   case 3: Xoff =     -dX; Yoff = 0.5*dY; break;
    67   case 4: Xoff = -0.5*dX; Yoff = 0.5*dY; break;
    68   case 5: Xoff =       0; Yoff = 0.5*dY; break;
    69   case 6: Xoff =     -dX; Yoff = 0; break;
    70   case 7: Xoff = -0.5*dX; Yoff = 0; break;
    71   case 8: Xoff =       0; Yoff = 0; break;
     64    case 0: Xoff =  -dX-dP; Yoff = dY+dP; break;
     65    case 1: Xoff = -0.5*dX; Yoff = dY+dP; break;
     66    case 2: Xoff =      dP; Yoff = dY+dP; break;
     67    case 3: Xoff =  -dX-dP; Yoff = 0.5*dY; break;
     68    case 4: Xoff = -0.5*dX; Yoff = 0.5*dY; break;
     69    case 5: Xoff =      dP; Yoff = 0.5*dY; break;
     70    case 6: Xoff =  -dX-dP; Yoff = -dP; break;
     71    case 7: Xoff = -0.5*dX; Yoff = -dP; break;
     72    case 8: Xoff =      dP; Yoff = -dP; break;
    7273  }
    7374

  • trunk/Ohana/src/libkapa/src/PSRotFont.c

    r40165 r40628  
    2525  dX = PSRotStrlen (string);
    2626  dY = currentfont[65].ascent;
     27  int dP = ceil(0.25 * dY);
    2728 
    2829  /***
    … …  
    4950  Xoff = Yoff = 0;
    5051  switch (pos) {
    51   case 0: Xoff =     -dX; Yoff = -dY; break;
    52   case 1: Xoff = -0.5*dX; Yoff = -dY; break;
    53   case 2: Xoff =       0; Yoff = -dY; break;
    54   case 3: Xoff =     -dX; Yoff = -0.5*dY; break;
    55   case 4: Xoff = -0.5*dX; Yoff = -0.5*dY; break;
    56   case 5: Xoff =       0; Yoff = -0.5*dY; break;
    57   case 6: Xoff =     -dX; Yoff = 0; break;
    58   case 7: Xoff = -0.5*dX; Yoff = 0; break;
    59   case 8: Xoff =       0; Yoff = 0; break;
     52  // case 0: Xoff =     -dX; Yoff = -dY; break;
     53  // case 1: Xoff = -0.5*dX; Yoff = -dY; break;
     54  // case 2: Xoff =       0; Yoff = -dY; break;
     55  // case 3: Xoff =     -dX; Yoff = -0.5*dY; break;
     56  // case 4: Xoff = -0.5*dX; Yoff = -0.5*dY; break;
     57  // case 5: Xoff =       0; Yoff = -0.5*dY; break;
     58  // case 6: Xoff =     -dX; Yoff = 0; break;
     59  // case 7: Xoff = -0.5*dX; Yoff = 0; break;
     60  // case 8: Xoff =       0; Yoff = 0; break;
     61    case 0: Xoff =  -dX-dP; Yoff = -(dY+dP); break;
     62    case 1: Xoff = -0.5*dX; Yoff = -(dY+dP); break;
     63    case 2: Xoff =      dP; Yoff = -(dY+dP); break;
     64    case 3: Xoff =  -dX-dP; Yoff = -0.5*dY; break;
     65    case 4: Xoff = -0.5*dX; Yoff = -0.5*dY; break;
     66    case 5: Xoff =      dP; Yoff = -0.5*dY; break;
     67    case 6: Xoff =  -dX-dP; Yoff = dP; break;
     68    case 7: Xoff = -0.5*dX; Yoff = dP; break;
     69    case 8: Xoff =      dP; Yoff = dP; break;
    6070  }
    6171  cs = cos(angle*RAD_DEG);

  • trunk/Ohana/src/libkapa/src/bDrawRotFont.c

    r40558 r40628  
    3737  dX = RotStrlen (string);
    3838  dY = currentfont[65].ascent;
     39  int dP = ceil(0.25 * dY);
    3940
    4041  /* apply appropriate offset */
    4142  Xoff = Yoff = 0;
    4243  switch (pos) {
    43   case 0: Xoff =     -dX; Yoff = dY; break;
    44   case 1: Xoff = -0.5*dX; Yoff = dY; break;
    45   case 2: Xoff =       0; Yoff = dY; break;
    46   case 3: Xoff =     -dX; Yoff = 0.5*dY; break;
    47   case 4: Xoff = -0.5*dX; Yoff = 0.5*dY; break;
    48   case 5: Xoff =       0; Yoff = 0.5*dY; break;
    49   case 6: Xoff =     -dX; Yoff = 0; break;
    50   case 7: Xoff = -0.5*dX; Yoff = 0; break;
    51   case 8: Xoff =       0; Yoff = 0; break;
     44    case 0: Xoff =  -dX-dP; Yoff = dY+dP; break;
     45    case 1: Xoff = -0.5*dX; Yoff = dY+dP; break;
     46    case 2: Xoff =      dP; Yoff = dY+dP; break;
     47    case 3: Xoff =  -dX-dP; Yoff = 0.5*dY; break;
     48    case 4: Xoff = -0.5*dX; Yoff = 0.5*dY; break;
     49    case 5: Xoff =      dP; Yoff = 0.5*dY; break;
     50    case 6: Xoff =  -dX-dP; Yoff = -dP; break;
     51    case 7: Xoff = -0.5*dX; Yoff = -dP; break;
     52    case 8: Xoff =      dP; Yoff = -dP; break;
    5253  }
    5354
Note: See TracChangeset for help on using the changeset viewer.