--- capa/capa51/pProj/capaUnit.c 2000/09/14 20:25:12 1.9 +++ capa/capa51/pProj/capaUnit.c 2000/09/20 17:20:33 1.10 @@ -914,6 +914,8 @@ u_copy_unit(Unit_t *a_p, Unit_t *b_p, do /* derived units but without any units elements (scalar) */ /* do nothing, ignore this units WE REALLY MEAN THIS DON'T DO THE NEXT LINE!*/ /*a_p->u_count++;*/ + scale = pow(b_p->u_scale, exp_scale); + a_p->u_scale = a_p->u_scale * scale; } else if( b_p->u_type == U_CONSTANT ) { scale = pow(b_p->u_scale, exp_scale); a_p->u_scale = a_p->u_scale * scale; @@ -1407,10 +1409,10 @@ u_insert_derived(n_p,s_p,c_p,u_p)char * strcpy(new_p->u_comment,c_p); simplify_unit(new_p); - /* +#ifdef UNIT_DBUG printf("Derived Unit:%s\n",new_p->u_name); print_unit_t(new_p); - */ +#endif if (c_result < 0 ) { new_p->u_left = t->u_left; new_p->u_right = t; t->u_left = NULL;