diff --git a/src/libphigs/f_binding/fb_el.c b/src/libphigs/f_binding/fb_el.c index ce21b04..545e8c3 100644 --- a/src/libphigs/f_binding/fb_el.c +++ b/src/libphigs/f_binding/fb_el.c @@ -257,7 +257,7 @@ FTN_SUBROUTINE(psvwi)( /******************************************************************************* * psici * - * DESCR: set interior colour index + * DESCR: set interior colour index for front face * RETURNS: N/A */ FTN_SUBROUTINE(psici)( diff --git a/src/libphigs/f_binding/fb_extel.c b/src/libphigs/f_binding/fb_extel.c index a7a2454..b9a5cad 100644 --- a/src/libphigs/f_binding/fb_extel.c +++ b/src/libphigs/f_binding/fb_extel.c @@ -902,6 +902,23 @@ FTN_SUBROUTINE(psbici)( pset_back_int_colr_ind(colr_ind); } +/******************************************************************************* + * pbsi + * + * DESCR: set back interior style + * RETURNS: N/A + */ +FTN_SUBROUTINE(pbsi)( + FTN_INTEGER(ints) + ) +{ + Pint_style interior_style = (Pint_style) FTN_INTEGER_GET(ints); +#ifdef DEBUG + printf("DEBUG: PSBIS back interior style called to %d\n", (int)interior_style); +#endif + pset_back_int_style(interior_style); +} + /******************************************************************************* * psbisi * diff --git a/src/test_f/test_f3.f b/src/test_f/test_f3.f index a5352e8..9adb3e7 100644 --- a/src/test_f/test_f3.f +++ b/src/test_f/test_f3.f @@ -29,15 +29,15 @@ SUBROUTINE VFILL(IX, NUM, IWHAT) SUBROUTINE INITCOLS(IWK1) COMMON /KXCCOL/ NCOL, IBLACK, IWHIT, IRED, IGREEN, IBLUE, IYEL, - , IMAG, ICYAN, IORAN, ICOL(7), + , IGREY, IMAG, ICYAN, IORAN, ICOL(7), , COLR(16), COLG(16), COLB(16) INTEGER NCOL, IBLACK, IWHIT, IRED, IGREEN, IBLUE, IYEL, - , IMAG, ICYAN, IORAN, ICOL, ICLTB(16) + , IGREY, IMAG, ICYAN, IORAN, ICOL, ICLTB(16) REAL COLR ,COLG ,COLB EQUIVALENCE (IBLACK, ICLTB) REAL FCOLR(3) INTEGER IWK1 - NCOL = 6 + NCOL = 7 IBLACK = 1 COLR(1) = 0.0 COLG(1) = 0.0 @@ -56,7 +56,7 @@ SUBROUTINE INITCOLS(IWK1) IGREEN = 4 COLR(4) = 0.0 COLG(4) = 1.0 - COLB(4) = 1.0 + COLB(4) = 0.0 IBLUE = 5 COLR(5) = 0.0 @@ -68,6 +68,11 @@ SUBROUTINE INITCOLS(IWK1) COLG(6) = 1.0 COLB(6) = 0.0 + IGREY = 7 + COLR(7) = 0.7 + COLG(7) = 0.7 + COLB(7) = 0.7 + DO I=1, NCOL FCOLR(1) = COLR(I) FCOLR(2) = COLG(I) @@ -136,10 +141,10 @@ SUBROUTINE KYDELP (XORG, YORG, SCAL) * COLOR LOOK UP TABLE DEFINITION * COMMON /KXCCOL/ NCOL, IBLACK, IWHIT, IRED, IGREEN, IBLUE, IYEL, - , IMAG, ICYAN, IORAN, ICOL(7), + , IGREY,IMAG, ICYAN, IORAN, ICOL(7), , COLR(16), COLG(16), COLB(16) INTEGER NCOL, IBLACK, IWHIT, IRED, IGREEN, IBLUE, IYEL, - , IMAG, ICYAN, IORAN, ICOL, ICLTB(16) + , IGREY,IMAG, ICYAN, IORAN, ICOL, ICLTB(16) REAL COLR ,COLG ,COLB EQUIVALENCE (IBLACK, ICLTB) * @@ -359,6 +364,7 @@ SUBROUTINE KYDELP (XORG, YORG, SCAL) IF ( NKPRT ) THEN CALL PSLWSC (1.0) CALL PSIS (PSOLID) + CALL PSBIS (PSOLID) CALL PSEWSC (1.0) CALL PSEDFG (1) * @@ -404,6 +410,7 @@ SUBROUTINE KYDELP (XORG, YORG, SCAL) END DO CALL PSEDCI (IGREEN) CALL PSICI (IGREEN) + CALL PSBICI (IGREEN) CALL PFASD (PFNO, PEVF, PCD, 0, 0, IGREEN, 0., 0., 0., 0., 0, , 0., 1, NPT11, EDATA, XG, YG, VCOLI, 0., VNXY, VNXY, , VNXY, 0, 0.) @@ -433,8 +440,9 @@ SUBROUTINE KYDELP (XORG, YORG, SCAL) * * Draw the Dolphin CALL PSIS(PSOLID) - CALL PSEDCI (IBLUE) - CALL PSICI (153) + CALL PSEDCI(IBLUE) + CALL PSICI(153) + CALL PSBICI(153) CALL VFILL (VCOLI, NPT1, IBLUE) DO I = 1, NPT1 XG(I) = ((FLOAT (X1 (I))+OFFSET)*NORM - X0)*SCALE + XORG @@ -447,6 +455,7 @@ SUBROUTINE KYDELP (XORG, YORG, SCAL) * Dolphin tong CALL PSEDCI (IRED) CALL PSICI (IRED) + CALL PSBICI (IRED) CALL VFILL (VCOLI, NPT2, IRED) DO I = 1, NPT2 XG(I) = ((FLOAT (X2 (I))+OFFSET)*NORM - X0)*SCALE + XORG @@ -459,7 +468,8 @@ SUBROUTINE KYDELP (XORG, YORG, SCAL) * Dolphin eye CALL PSEDCI (IBLACK) CALL PSICI (IBLACK) - CALL PSIS(PISEMP) + CALL PSBICI (IBLACK) +* CALL PSIS(PISEMP) CALL VFILL (VCOLI, MAX (NPT3, NPT4), 0) DO I = 1, NPT3 XG(I) = ((FLOAT (X3 (I))+OFFSET)*NORM - X0)*SCALE + XORG @@ -477,8 +487,11 @@ SUBROUTINE KYDELP (XORG, YORG, SCAL) , 0, 0.) * * Dolphin Z - CALL PSEDCI (IRED) + CALL PSEDCI (IBLACK) + CALL PSIS(PSOLID) + CALL PSBIS(PSOLID) CALL PSICI (IRED) + CALL PSBICI (IRED) CALL VFILL (VCOLI, NPT5, IRED) DO I = 1, NPT5 XG(I) = ((FLOAT (X5 (I))+OFFSET)*NORM - X0)*SCALE + XORG