ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/Development/ray/src/cv/arch2rad.c

Comparing ray/src/cv/arch2rad.c (file contents):
Revision 1.1 by greg, Tue Dec 11 08:45:46 1990 UTC vs.
Revision 1.5 by greg, Thu Feb 14 13:18:30 1991 UTC

#	Line 194 | Line 194 | FILE   *fp;
194		{
195		char    buf[MAXSTR];
196		int     i, n;
197	+	register int    c;
198		/* get file name */
199		if (fgets(buf, MAXSTR, fp) == NULL)
200		goto readerr;
201	<	if ((n = strlen(buf)) < 1)
201	<	goto readerr;
202	<	buf[n-1] = '\0';
201	>	buf[strlen(buf)-1] = '\0';
202		fhead.filename = savestr(buf);
203		/* get layers */
204		fhead.layer[0] = "Worksheet";
205		for (i = 1; i <= 8; i++) {
206	<	if (fscanf(fp, "Layer No.%d", &n) != 1 || n != i)
206	>	if (fscanf(fp, "L%*[^0-8]%d", &n) != 1 || n != i)
207		goto readerr;
208	<	while ((n = getc(fp)) != EOF && (n == ' ' || n == '\t'))
208	>	while ((c = getc(fp)) != EOF && (c == ' ' || c == '\t'))
209		;
210	<	if (n == EOF)
210	>	if (c == EOF)
211		goto readerr;
212	<	ungetc(n, fp);
212	>	ungetc(c, fp);
213		if (fgets(buf, MAXSTR, fp) == NULL)
214		goto readerr;
215		buf[strlen(buf)-1] = '\0';
#	Line 488 | Line 487 | FILE   *fp;
487		}
488		/* put out faces */
489		sprintf(buf, "op%d", ++nopens);
490	<	putface(openmod, buf, "ref", &newp, 0, 4, 7, 3, fp);
491	<	putface(openmod, buf, "opp", &newp, 1, 2, 6, 5, fp);
492	<	putface(openmod, buf, "end1", &newp, 3, 7, 6, 2, fp);
493	<	putface(openmod, buf, "end2", &newp, 0, 1, 5, 4, fp);
494	<	putface(openmod, buf, "bot", &newp, 0, 3, 2, 1, fp);
495	<	putface(openmod, buf, "top", &newp, 4, 5, 6, 7, fp);
490	>	putface(openmod, buf, "ref", &newp, 4, 5, 1, 0, fp);
491	>	putface(openmod, buf, "opp", &newp, 2, 6, 7, 3, fp);
492	>	putface(openmod, buf, "end1", &newp, 5, 6, 2, 1, fp);
493	>	putface(openmod, buf, "end2", &newp, 3, 7, 4, 0, fp);
494	>	putface(openmod, buf, "bot", &newp, 1, 2, 3, 0, fp);
495	>	putface(openmod, buf, "top", &newp, 7, 6, 5, 4, fp);
496		}
497
498
#	Line 506 | Line 505 | register RULEHD        *rp;
505		ID      tmpid;
506
507		if (rp->qflg & FL(Q_LAY)) {             /* check layer */
508	<	tmpid.name = NULL;
508	>	tmpid.name = fhead.layer[bp->layer];
509		tmpid.number = bp->layer;
510		if (!matchid(&tmpid, &idm(rp)[Q_LAY]))
511		return(0);
#	Line 543 | Line 542 | FILE   *fp;
542		return;
543		bn = blkname(bp);
544		if (ff & 1<<F_REF)
545	<	putface(m, bn, "ref", &bp->p, 3, 7, 4, 0, fp);
545	>	putface(m, bn, "ref", &bp->p, 4, 5, 1, 0, fp);
546		if (ff & 1<<F_OPP)
547	<	putface(m, bn, "opp", &bp->p, 5, 6, 2, 1, fp);
547	>	putface(m, bn, "opp", &bp->p, 2, 6, 7, 3, fp);
548		if (ff & 1<<F_END) {
549	<	putface(m, bn, "end1", &bp->p, 2, 6, 7, 3, fp);
550	<	putface(m, bn, "end2", &bp->p, 4, 5, 1, 0, fp);
549	>	putface(m, bn, "end1", &bp->p, 5, 6, 2, 1, fp);
550	>	putface(m, bn, "end2", &bp->p, 3, 7, 4, 0, fp);
551		}
552		if (ff & 1<<F_BOT)
553		putface(m, bn, "bot", &bp->p, 1, 2, 3, 0, fp);
#	Line 564 | Line 563 | register BLOCK *bp;
563		static char     nambuf[32];
564		static int      blkcnt = 0;
565		register char   *nam;
566	<	register int    i;
566	>	register int    i, j;
567
568	+	sprintf(nambuf, "l%d.", bp->layer);
569	+	i = strlen(nambuf);
570		nam = bp->refid.name;
570	–	if (nam == NULL)
571	–	nam = fhead.layer[bp->layer];
571		if (nam == NULL) {
572	<	sprintf(nambuf, "l%d.", bp->layer);
573	<	i = strlen(nambuf);
574	<	} else {
575	<	for (i = 0; i < 12 && nam[i]; i++) {
576	<	if (nam[i] == ' ' || nam[i] == '\t')
577	<	nambuf[i] = '_';
572	>	nam = fhead.layer[bp->layer];
573	>	if (nam != NULL)
574	>	i = 0;
575	>	}
576	>	if (nam != NULL) {
577	>	for (j = 0; j < 12 && nam[j]; j++) {
578	>	if (nam[j] == ' ' || nam[j] == '\t')
579	>	nambuf[i++] = '_';
580		else
581	<	nambuf[i] = nam[i];
581	>	nambuf[i++] = nam[j];
582		}
583		nambuf[i++] = '.';
584		}

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)