The R Project SVN R

Rev

Rev 25661 | Rev 26479 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 25661 Rev 26007
Line 1047... Line 1047...
1047 
	    if (R_FINITE(pos))
 1047 
	    if (R_FINITE(pos))
1048 
		axis_base = GConvertY(pos, USER, NFC, dd);
 1048 
		axis_base = GConvertY(pos, USER, NFC, dd);
1049 
	    else
 1049 
	    else
1050 
		axis_base = GConvertY(0.0, outer, NFC, dd)
 1050 
		axis_base = GConvertY(0.0, outer, NFC, dd)
1051 
		    - GConvertYUnits(line, LINES, NFC, dd);
 1051 
		    - GConvertYUnits(line, LINES, NFC, dd);
1052 
	    if (R_FINITE(Rf_gpptr(dd)->tck))
 1052 
	    if (R_FINITE(Rf_gpptr(dd)->tck)) {
1053 
		axis_tick = axis_base +
 1053 
		double len, xu, yu;
- 
 
 1054 
		if(Rf_gpptr(dd)->tck > 0.5)
1054 
			GConvertYUnits(Rf_gpptr(dd)->tck, NPC, NFC, dd);
 1055 
		    len = GConvertYUnits(Rf_gpptr(dd)->tck, NPC, NFC, dd);
- 
 
 1056 
		else {
- 
 
 1057 
		    xu = GConvertXUnits(Rf_gpptr(dd)->tck, NPC, INCHES, dd);
- 
 
 1058 
		    yu = GConvertYUnits(Rf_gpptr(dd)->tck, NPC, INCHES, dd);
- 
 
 1059 
		    xu = (fabs(xu) < fabs(yu)) ? xu : yu;
- 
 
 1060 
		    len = GConvertYUnits(xu, INCHES, NFC, dd);
- 
 
 1061 
		}
- 
 
 1062 
		axis_tick = axis_base + len;
- 
 
 1063 
 
1055 
	    else
 1064 
	    } else
1056 
		axis_tick = axis_base +
 1065 
		axis_tick = axis_base +
1057 
			GConvertYUnits(Rf_gpptr(dd)->tcl, LINES, NFC, dd);
 1066 
			GConvertYUnits(Rf_gpptr(dd)->tcl, LINES, NFC, dd);
1058 
	}
 1067 
	}
1059 
	else {
 1068 
	else {
1060 
	    if (R_FINITE(pos))
 1069 
	    if (R_FINITE(pos))
1061 
		axis_base = GConvertY(pos, USER, NFC, dd);
 1070 
		axis_base = GConvertY(pos, USER, NFC, dd);
1062 
	    else
 1071 
	    else
1063 
		axis_base =  GConvertY(1.0, outer, NFC, dd)
 1072 
		axis_base =  GConvertY(1.0, outer, NFC, dd)
1064 
		    + GConvertYUnits(line, LINES, NFC, dd);
 1073 
		    + GConvertYUnits(line, LINES, NFC, dd);
1065 
	    if (R_FINITE(Rf_gpptr(dd)->tck))
 1074 
	    if (R_FINITE(Rf_gpptr(dd)->tck)) {
- 
 
 1075 
		double len, xu, yu;
- 
 
 1076 
		if(Rf_gpptr(dd)->tck > 0.5)
1066 
		axis_tick = axis_base - GConvertYUnits(Rf_gpptr(dd)->tck, NPC, NFC, dd);
 1077 
		    len = GConvertYUnits(Rf_gpptr(dd)->tck, NPC, NFC, dd);
- 
 
 1078 
		else {
- 
 
 1079 
		    xu = GConvertXUnits(Rf_gpptr(dd)->tck, NPC, INCHES, dd);
- 
 
 1080 
		    yu = GConvertYUnits(Rf_gpptr(dd)->tck, NPC, INCHES, dd);
- 
 
 1081 
		    xu = (fabs(xu) < fabs(yu)) ? xu : yu;
- 
 
 1082 
		    len = GConvertYUnits(xu, INCHES, NFC, dd);
- 
 
 1083 
		}
- 
 
 1084 
		axis_tick = axis_base - len;
1067 
	    else
 1085 
	    } else
- 
 
 1086 
		axis_tick = axis_base -
1068 
		axis_tick = axis_base - GConvertYUnits(Rf_gpptr(dd)->tcl, LINES, NFC, dd);
 1087 
		    GConvertYUnits(Rf_gpptr(dd)->tcl, LINES, NFC, dd);
1069 
	}
 1088 
	}
1070 
	if (doticks) {
 1089 
	if (doticks) {
1071 
	    Rf_gpptr(dd)->col = col;/*was fg */
 1090 
	    Rf_gpptr(dd)->col = col;/*was fg */
1072 
	    GLine(axis_low, axis_base, axis_high, axis_base, NFC, dd);
 1091 
	    GLine(axis_low, axis_base, axis_high, axis_base, NFC, dd);
1073 
	    for (i = 0; i < n; i++) {
 1092 
	    for (i = 0; i < n; i++) {
Line 1153... Line 1172...
1153 
	    if (R_FINITE(pos))
 1172 
	    if (R_FINITE(pos))
1154 
		axis_base = GConvertX(pos, USER, NFC, dd);
 1173 
		axis_base = GConvertX(pos, USER, NFC, dd);
1155 
	    else
 1174 
	    else
1156 
		axis_base =  GConvertX(0.0, outer, NFC, dd)
 1175 
		axis_base =  GConvertX(0.0, outer, NFC, dd)
1157 
		    - GConvertXUnits(line, LINES, NFC, dd);
 1176 
		    - GConvertXUnits(line, LINES, NFC, dd);
1158 
	    if (R_FINITE(Rf_gpptr(dd)->tck))
 1177 
	    if (R_FINITE(Rf_gpptr(dd)->tck)) {
- 
 
 1178 
		double len, xu, yu;
- 
 
 1179 
		if(Rf_gpptr(dd)->tck > 0.5)
1159 
		axis_tick = axis_base + GConvertXUnits(Rf_gpptr(dd)->tck, NPC, NFC, dd);
 1180 
		    len = GConvertXUnits(Rf_gpptr(dd)->tck, NPC, NFC, dd);
- 
 
 1181 
		else {
- 
 
 1182 
		    xu = GConvertXUnits(Rf_gpptr(dd)->tck, NPC, INCHES, dd);
- 
 
 1183 
		    yu = GConvertYUnits(Rf_gpptr(dd)->tck, NPC, INCHES, dd);
- 
 
 1184 
		    xu = (fabs(xu) < fabs(yu)) ? xu : yu;
- 
 
 1185 
		    len = GConvertXUnits(xu, INCHES, NFC, dd);
- 
 
 1186 
		}
- 
 
 1187 
		axis_tick = axis_base + len;
1160 
	    else
 1188 
	    } else
- 
 
 1189 
		axis_tick = axis_base +
1161 
		axis_tick = axis_base + GConvertXUnits(Rf_gpptr(dd)->tcl, LINES, NFC, dd);
 1190 
		    GConvertXUnits(Rf_gpptr(dd)->tcl, LINES, NFC, dd);
1162 
	}
 1191 
	}
1163 
	else {
 1192 
	else {
1164 
	    if (R_FINITE(pos))
 1193 
	    if (R_FINITE(pos))
1165 
		axis_base = GConvertX(pos, USER, NFC, dd);
 1194 
		axis_base = GConvertX(pos, USER, NFC, dd);
1166 
	    else
 1195 
	    else
1167 
		axis_base =  GConvertX(1.0, outer, NFC, dd)
 1196 
		axis_base =  GConvertX(1.0, outer, NFC, dd)
1168 
		    + GConvertXUnits(line, LINES, NFC, dd);
 1197 
		    + GConvertXUnits(line, LINES, NFC, dd);
1169 
	    if (R_FINITE(Rf_gpptr(dd)->tck))
 1198 
	    if (R_FINITE(Rf_gpptr(dd)->tck)) {
- 
 
 1199 
		double len, xu, yu;
- 
 
 1200 
		if(Rf_gpptr(dd)->tck > 0.5)
1170 
		axis_tick = axis_base - GConvertXUnits(Rf_gpptr(dd)->tck, NPC, NFC, dd);
 1201 
		    len = GConvertXUnits(Rf_gpptr(dd)->tck, NPC, NFC, dd);
- 
 
 1202 
		else {
- 
 
 1203 
		    xu = GConvertXUnits(Rf_gpptr(dd)->tck, NPC, INCHES, dd);
- 
 
 1204 
		    yu = GConvertYUnits(Rf_gpptr(dd)->tck, NPC, INCHES, dd);
- 
 
 1205 
		    xu = (fabs(xu) < fabs(yu)) ? xu : yu;
- 
 
 1206 
		    len = GConvertXUnits(xu, INCHES, NFC, dd);
- 
 
 1207 
		}
- 
 
 1208 
		axis_tick = axis_base - len;
1171 
	    else
 1209 
	    } else
- 
 
 1210 
		axis_tick = axis_base -
1172 
		axis_tick = axis_base - GConvertXUnits(Rf_gpptr(dd)->tcl, LINES, NFC, dd);
 1211 
		    GConvertXUnits(Rf_gpptr(dd)->tcl, LINES, NFC, dd);
1173 
	}
 1212 
	}
1174 
	if (doticks) {
 1213 
	if (doticks) {
1175 
	    Rf_gpptr(dd)->col = col;/*was fg */
 1214 
	    Rf_gpptr(dd)->col = col;/*was fg */
1176 
	    GLine(axis_base, axis_low, axis_base, axis_high, NFC, dd);
 1215 
	    GLine(axis_base, axis_low, axis_base, axis_high, NFC, dd);
1177 
	    for (i = 0; i < n; i++) {
 1216 
	    for (i = 0; i < n; i++) {