Index: trunk/scconfig/Rev.h =================================================================== --- trunk/scconfig/Rev.h (revision 31019) +++ trunk/scconfig/Rev.h (revision 31020) @@ -1 +1 @@ -static const int myrev = 31017; +static const int myrev = 31020; Index: trunk/scconfig/Rev.tab =================================================================== --- trunk/scconfig/Rev.tab (revision 31019) +++ trunk/scconfig/Rev.tab (revision 31020) @@ -1,4 +1,4 @@ -31017 configure pcb_ -> rnd_ renames in librnd +31020 configure pcb_ -> rnd_ renames in librnd 30779 configure remove distaligntext - all cases handled by distalign properly 30754 configure remove the old import_sch plugin (in favor of import_sch2) 30753 configure disable the old drc, enable the new drc Index: trunk/src/board.c =================================================================== --- trunk/src/board.c (revision 31019) +++ trunk/src/board.c (revision 31020) @@ -93,7 +93,7 @@ /* NOTE: we used to set all the pcb flags on ptr here, but we don't need to do that anymore due to the new conf system */ ptr->hidlib.grid = rnd_conf.editor.grid; - ptr->hidlib.size_y = ptr->hidlib.size_x = PCB_MM_TO_COORD(20); /* should be overriden by the default design */ + ptr->hidlib.size_y = ptr->hidlib.size_x = RND_MM_TO_COORD(20); /* should be overriden by the default design */ ptr->ID = pcb_create_ID_get(); ptr->ThermScale = 0.5; Index: trunk/src/conf_core.c =================================================================== --- trunk/src/conf_core.c (revision 31019) +++ trunk/src/conf_core.c (revision 31020) @@ -63,7 +63,7 @@ { htpp_entry_t *e; - conf_clamp_to(RND_CFT_COORD, conf_core.design.line_thickness, PCB_MIN_THICKNESS, PCB_MAX_THICKNESS, PCB_MIL_TO_COORD(10)); + conf_clamp_to(RND_CFT_COORD, conf_core.design.line_thickness, PCB_MIN_THICKNESS, PCB_MAX_THICKNESS, RND_MIL_TO_COORD(10)); rnd_conf_force_set_bool(conf_core.rc.have_regex, 1); rnd_conf_ro("rc/have_regex"); Index: trunk/src/find_geo.c =================================================================== --- trunk/src/find_geo.c (revision 31019) +++ trunk/src/find_geo.c (revision 31020) @@ -102,7 +102,7 @@ } if (*d > 360) /* full circle */ *d = 360; - *sa = pcb_normalize_angle(*sa); + *sa = rnd_normalize_angle(*sa); } static int radius_crosses_arc(double x, double y, pcb_arc_t *arc) Index: trunk/src/font.c =================================================================== --- trunk/src/font.c (revision 31019) +++ trunk/src/font.c (revision 31020) @@ -70,16 +70,16 @@ embf_line_t *lines = embf_font[n].lines; for(l = 0; l < embf_font[n].num_lines; l++) { - rnd_coord_t x1 = PCB_MIL_TO_COORD(lines[l].x1); - rnd_coord_t y1 = PCB_MIL_TO_COORD(lines[l].y1); - rnd_coord_t x2 = PCB_MIL_TO_COORD(lines[l].x2); - rnd_coord_t y2 = PCB_MIL_TO_COORD(lines[l].y2); - rnd_coord_t th = PCB_MIL_TO_COORD(lines[l].th); + rnd_coord_t x1 = RND_MIL_TO_COORD(lines[l].x1); + rnd_coord_t y1 = RND_MIL_TO_COORD(lines[l].y1); + rnd_coord_t x2 = RND_MIL_TO_COORD(lines[l].x2); + rnd_coord_t y2 = RND_MIL_TO_COORD(lines[l].y2); + rnd_coord_t th = RND_MIL_TO_COORD(lines[l].th); pcb_font_new_line_in_sym(s, x1, y1, x2, y2, th); } s->Valid = 1; - s->Delta = PCB_MIL_TO_COORD(embf_font[n].delta); + s->Delta = RND_MIL_TO_COORD(embf_font[n].delta); } } pcb_font_set_info(font); Index: trunk/src/globalconst.h =================================================================== --- trunk/src/globalconst.h (revision 31019) +++ trunk/src/globalconst.h (revision 31020) @@ -40,23 +40,23 @@ #define PCB_MAX_ARCRADIUS RND_MAX_COORD #define PCB_MIN_TEXTSCALE 1 /* scaling of text objects in percent (must be an integer greater than 0) */ #define PCB_MAX_TEXTSCALE 10000 -#define PCB_MIN_PINORVIASIZE PCB_MIL_TO_COORD(20) /* size of a pin or via */ -#define PCB_MIN_PINORVIAHOLE PCB_MIL_TO_COORD(4) /* size of a pins or vias drilling hole */ +#define PCB_MIN_PINORVIASIZE RND_MIL_TO_COORD(20) /* size of a pin or via */ +#define PCB_MIN_PINORVIAHOLE RND_MIL_TO_COORD(4) /* size of a pins or vias drilling hole */ #define PCB_MAX_PINORVIASIZE ((rnd_coord_t)RND_LARGE_VALUE) -#define PCB_MIN_PINORVIACOPPER PCB_MIL_TO_COORD(4) /* min difference outer-inner diameter */ +#define PCB_MIN_PINORVIACOPPER RND_MIL_TO_COORD(4) /* min difference outer-inner diameter */ #define PCB_MIN_GRID 1 #define PCB_MAX_FONTPOSITION 255 /* upper limit of characters in my font */ #define PCB_MAX_BUFFER 5 /* number of pastebuffers additional changes in menu.c are also required to select more buffers */ -#define PCB_EMARK_SIZE PCB_MIL_TO_COORD(10) /* size of diamond element mark */ -#define PCB_SUBC_AUX_UNIT PCB_MM_TO_COORD(1) /* size of the unit vector for the subc-aux layer */ +#define PCB_EMARK_SIZE RND_MIL_TO_COORD(10) /* size of diamond element mark */ +#define PCB_SUBC_AUX_UNIT RND_MM_TO_COORD(1) /* size of the unit vector for the subc-aux layer */ /**** Font ***/ /* These are used in debug draw font rendering (e.g. pin names) and reverse scale calculations (e.g. when report is trying to figure how the font is scaled. Changing these values is not really supported. */ -#define PCB_FONT_CAPHEIGHT PCB_MIL_TO_COORD (45) /* (Approximate) capheight size of the default PCB font */ +#define PCB_FONT_CAPHEIGHT RND_MIL_TO_COORD (45) /* (Approximate) capheight size of the default PCB font */ #define PCB_DEFAULT_CELLSIZE 50 /* default cell size for symbols */ #endif Index: trunk/src/librnd/config.h.in =================================================================== --- trunk/src/librnd/config.h.in (revision 31019) +++ trunk/src/librnd/config.h.in (revision 31020) @@ -197,7 +197,7 @@ /* Coordinate type and properties, as detected by scconfig */ typedef @/local/pcb/coord_type@ rnd_coord_t; #define RND_COORD_MAX @/local/pcb/coord_max@ -#define coord_abs pcb_coord_abs +#define coord_abs rnd_coord_abs /* Other autodetected types */ typedef @/local/pcb/long64@ pcb_long64_t; Index: trunk/src/librnd/core/conf.c =================================================================== --- trunk/src/librnd/core/conf.c (revision 31019) +++ trunk/src/librnd/core/conf.c (revision 31020) @@ -563,7 +563,7 @@ } break; case RND_CFN_UNIT: - u = get_unit_struct(text); + u = rnd_get_unit_struct(text); if (u == NULL) rnd_hid_cfg_error(err_node, "Invalid unit: %s\n", text); else Index: trunk/src/librnd/core/conf_act.c =================================================================== --- trunk/src/librnd/core/conf_act.c (revision 31019) +++ trunk/src/librnd/core/conf_act.c (revision 31020) @@ -342,7 +342,7 @@ RND_PCB_ACT_CONVARG(1, FGW_STR, setunits, name = argv[1].val.str); RND_ACT_IRES(0); - new_unit = get_unit_struct(name); + new_unit = rnd_get_unit_struct(name); rnd_hidlib_set_unit(RND_ACT_HIDLIB, new_unit); return 0; Index: trunk/src/librnd/core/grid.c =================================================================== --- trunk/src/librnd/core/grid.c (revision 31019) +++ trunk/src/librnd/core/grid.c (revision 31020) @@ -115,7 +115,7 @@ dst->oy = 0; if (unit != NULL) { - dst->unit = get_unit_struct(unit); + dst->unit = rnd_get_unit_struct(unit); if (dst->unit == NULL) goto error; } Index: trunk/src/librnd/core/hid_attrib.c =================================================================== --- trunk/src/librnd/core/hid_attrib.c (revision 31019) +++ trunk/src/librnd/core/hid_attrib.c (revision 31020) @@ -198,7 +198,7 @@ (*argv)++; break; case RND_HATT_UNIT: - unit = get_unit_struct((*argv)[1]); + unit = rnd_get_unit_struct((*argv)[1]); if (unit == NULL) { fprintf(stderr, "ERROR: unit \"%s\" is unknown to pcb (option --%s)\n", (*argv)[1], a->name); exit(1); Index: trunk/src/librnd/core/hid_dad.h =================================================================== --- trunk/src/librnd/core/hid_dad.h (revision 31019) +++ trunk/src/librnd/core/hid_dad.h (revision 31020) @@ -685,10 +685,10 @@ break; \ case RND_HATT_UNIT: \ { \ - int __n__, __v__ = pcb_get_n_units(0); \ + int __n__, __v__ = rnd_get_n_units(0); \ if (val_ != NULL) { \ for(__n__ = 0; __n__ < __v__; __n__++) { \ - if (&pcb_units[__n__] == (rnd_unit_t *)(val_)) { \ + if (&rnd_units[__n__] == (rnd_unit_t *)(val_)) { \ table[table ## _len - 1].field.lng = __n__; \ break; \ } \ Index: trunk/src/librnd/core/hid_dad_spin.c =================================================================== --- trunk/src/librnd/core/hid_dad_spin.c (revision 31019) +++ trunk/src/librnd/core/hid_dad_spin.c (revision 31020) @@ -139,15 +139,15 @@ int is_globbing = &su->dlg[su->wglob] == attr; if (!can_glob) - unit = &pcb_units[unum]; - else if ((!is_globbing) && (unum >= 0) && (unum < pcb_get_n_units(0))) - unit = &pcb_units[unum]; + unit = &rnd_units[unum]; + else if ((!is_globbing) && (unum >= 0) && (unum < rnd_get_n_units(0))) + unit = &rnd_units[unum]; else unit = rnd_conf.editor.grid_unit; if (is_globbing && su->dlg[su->wglob].val.lng) { /* global ticked in: also set the unit by force */ - unum = rnd_conf.editor.grid_unit - pcb_units; + unum = rnd_conf.editor.grid_unit - rnd_units; hv.lng = unum; rnd_gui->attr_dlg_set_value(hid_ctx, su->wunit, &hv); } @@ -233,9 +233,9 @@ int can_glob = (spin->unit_family == (PCB_UNIT_METRIC | PCB_UNIT_IMPERIAL)); if (!can_glob) - spin->unit = &pcb_units[unum]; - else if ((!ctx.dlg[ctx.wglob].val.lng) && (unum >= 0) && (unum < pcb_get_n_units(0))) - spin->unit = &pcb_units[unum]; + spin->unit = &rnd_units[unum]; + else if ((!ctx.dlg[ctx.wglob].val.lng) && (unum >= 0) && (unum < rnd_get_n_units(0))) + spin->unit = &rnd_units[unum]; else spin->unit = NULL; @@ -281,11 +281,11 @@ } else unit = spin->unit; - v = pcb_coord_to_unit(unit, end->val.crd); + v = rnd_coord_to_unit(unit, end->val.crd); step = pow(10, floor(log10(fabs(v)) - 1.0)); if (step <= 0.0) step = 1; - step = pcb_unit_to_coord(unit, step); + step = rnd_unit_to_coord(unit, step); break; } return step; Index: trunk/src/librnd/core/hid_dad_unit.c =================================================================== --- trunk/src/librnd/core/hid_dad_unit.c (revision 31019) +++ trunk/src/librnd/core/hid_dad_unit.c (revision 31020) @@ -40,7 +40,7 @@ rnd_hid_attribute_t *end = attr - unit->wenum + unit->cmp.wend; const char **vals = enu->wdata; const rnd_unit_t *u = get_unit_by_suffix(vals[enu->val.lng]); - int unit_id = u == NULL ? -1 : u - pcb_units; + int unit_id = u == NULL ? -1 : u - rnd_units; end->val.lng = unit_id; end->changed = 1; @@ -53,7 +53,7 @@ int l; rnd_hid_dad_unit_t *unit = attr->wdata; rnd_hid_attribute_t *enu = attr - unit->cmp.wend + unit->wenum; - const char *target = pcb_units[unit_id].suffix; + const char *target = rnd_units[unit_id].suffix; const char **vals = enu->wdata; for(l = 0; vals[l] != NULL; l++) { @@ -67,10 +67,10 @@ void rnd_dad_unit_set_val_ptr(rnd_hid_attribute_t *end, void *val_) { const rnd_unit_t *val = val_; - int __n__, __v__ = pcb_get_n_units(1); + int __n__, __v__ = rnd_get_n_units(1); if (val != NULL) { for(__n__ = 0; __n__ < __v__; __n__++) { - if (&pcb_units[__n__] == val) { + if (&rnd_units[__n__] == val) { rnd_dad_unit_set_num(end, __n__, 0, 0); return; } @@ -119,11 +119,11 @@ if (rnd_dad_unit_enum != NULL) return; - len = pcb_get_n_units(0); + len = rnd_get_n_units(0); rnd_dad_unit_enum = malloc(sizeof(char *) * (len+1)); for(n = i = 0; i < len; i++) { - if (pcb_units[i].family & family) - rnd_dad_unit_enum[n++] = pcb_units[i].suffix; + if (rnd_units[i].family & family) + rnd_dad_unit_enum[n++] = rnd_units[i].suffix; } rnd_dad_unit_enum[n] = NULL; } Index: trunk/src/librnd/core/hid_init.c =================================================================== --- trunk/src/librnd/core/hid_init.c (revision 31019) +++ trunk/src/librnd/core/hid_init.c (revision 31020) @@ -364,7 +364,7 @@ pup_autoload_dir(&rnd_pup, NULL, NULL); rnd_conf_load_extra(NULL, NULL); - pcb_units_init(); + rnd_units_init(); pcb_funchash_init(); /* actions */ Index: trunk/src/librnd/core/hidlib_conf.c =================================================================== --- trunk/src/librnd/core/hidlib_conf.c (revision 31019) +++ trunk/src/librnd/core/hidlib_conf.c (revision 31020) @@ -34,7 +34,7 @@ #include -#define PCB_MAX_GRID PCB_MIL_TO_COORD(1000) +#define PCB_MAX_GRID RND_MIL_TO_COORD(1000) rnd_conf_t rnd_conf; Index: trunk/src/librnd/core/misc_util.c =================================================================== --- trunk/src/librnd/core/misc_util.c (revision 31019) +++ trunk/src/librnd/core/misc_util.c (revision 31020) @@ -97,7 +97,7 @@ goto err; } - u = get_unit_struct_(unit, unit_strict); + u = rnd_get_unit_struct_(unit, unit_strict); if (u != NULL) { rnd_bool succ; double crd; @@ -155,9 +155,9 @@ if (units && *units) { int i, unit_ok = 0; - const rnd_unit_t *unit = get_unit_struct(units); + const rnd_unit_t *unit = rnd_get_unit_struct(units); if (unit != NULL) { - value = pcb_unit_to_coord(unit, value); + value = rnd_unit_to_coord(unit, value); scaled = 1; unit_ok = 1; } @@ -179,7 +179,7 @@ /* Apply default unit */ if (!scaled && default_unit && *default_unit) { int i; - const rnd_unit_t *unit = get_unit_struct(default_unit); + const rnd_unit_t *unit = rnd_get_unit_struct(default_unit); if (extra_units) for (i = 0; *extra_units[i].suffix; ++i) if (strcmp(extra_units[i].suffix, default_unit) == 0) { @@ -189,7 +189,7 @@ scaled = 1; } if (!scaled && unit != NULL) - value = pcb_unit_to_coord(unit, value); + value = rnd_unit_to_coord(unit, value); } if (success != NULL) Index: trunk/src/librnd/core/rnd_printf.c =================================================================== --- trunk/src/librnd/core/rnd_printf.c (revision 31019) +++ trunk/src/librnd/core/rnd_printf.c (revision 31020) @@ -141,7 +141,7 @@ * * return 0 on success, -1 on error */ -static int CoordsToString(gds_t *dest, rnd_coord_t coord[], int n_coords, const gds_t *printf_spec_, enum pcb_allow_e allow, +static int CoordsToString(gds_t *dest, rnd_coord_t coord[], int n_coords, const gds_t *printf_spec_, enum rnd_allow_e allow, enum pcb_suffix_e suffix_type) { char filemode_buff[128]; /* G_ASCII_DTOSTR_BUF_SIZE */ @@ -179,7 +179,7 @@ int met_votes = 0, imp_votes = 0; for (i = 0; i < n_coords; ++i) - if (min_sig_figs(PCB_COORD_TO_MIL(coord[i])) < min_sig_figs(PCB_COORD_TO_MM(coord[i]))) + if (min_sig_figs(RND_COORD_TO_MIL(coord[i])) < min_sig_figs(RND_COORD_TO_MM(coord[i]))) ++imp_votes; else ++met_votes; @@ -194,10 +194,10 @@ for (i = 0; i < n_coords; ++i) { switch (family) { case PCB_UNIT_METRIC: - value[i] = PCB_COORD_TO_MM(coord[i]); + value[i] = RND_COORD_TO_MM(coord[i]); break; case PCB_UNIT_IMPERIAL: - value[i] = PCB_COORD_TO_MIL(coord[i]); + value[i] = RND_COORD_TO_MIL(coord[i]); break; default: value[i] = 0; @@ -206,12 +206,12 @@ /* Determine scale factor -- find smallest unit that brings * the whole group above unity */ - for (n = 0; n < pcb_get_n_units(0); ++n) { - if ((pcb_units[n].allow & allow) != 0 && (pcb_units[n].family == family)) { + for (n = 0; n < rnd_get_n_units(0); ++n) { + if ((rnd_units[n].allow & allow) != 0 && (rnd_units[n].family == family)) { int n_above_one = 0; for (i = 0; i < n_coords; ++i) - if (fabs(value[i] * pcb_units[n].scale_factor) > 1) + if (fabs(value[i] * rnd_units[n].scale_factor) > 1) ++n_above_one; if (n_above_one == n_coords) break; @@ -218,18 +218,18 @@ } } /* If nothing worked, wind back to the smallest allowable unit */ - if (n == pcb_get_n_units(0)) { + if (n == rnd_get_n_units(0)) { do { --n; - } while ((n>=0) && ((pcb_units[n].allow & allow) == 0 || pcb_units[n].family != family)); + } while ((n>=0) && ((rnd_units[n].allow & allow) == 0 || rnd_units[n].family != family)); } /* Apply scale factor */ - suffix = pcb_units[n].suffix; + suffix = rnd_units[n].suffix; for (i = 0; i < n_coords; ++i) - value[i] = value[i] * pcb_units[n].scale_factor; + value[i] = value[i] * rnd_units[n].scale_factor; - make_printf_spec(printf_spec_new, printf_spec, pcb_units[n].default_prec, &trunc0); + make_printf_spec(printf_spec_new, printf_spec, rnd_units[n].default_prec, &trunc0); /* Actually sprintf the values in place * (+ 2 skips the ", " for first value) */ @@ -268,11 +268,11 @@ typedef struct { int score_factor; - enum pcb_allow_e base; + enum rnd_allow_e base; double down_limit; - enum pcb_allow_e down; + enum rnd_allow_e down; double up_limit; - enum pcb_allow_e up; + enum rnd_allow_e up; /* persistent, calculated once */ const rnd_unit_t *base_unit, *down_unit, *up_unit; @@ -293,9 +293,9 @@ /* convert the value to the proposed unit */ if (unit->family == PCB_UNIT_METRIC) - v = PCB_COORD_TO_MM(coord); + v = RND_COORD_TO_MM(coord); else - v = PCB_COORD_TO_MIL(coord); + v = RND_COORD_TO_MIL(coord); save = v = v * unit->scale_factor; if (v < 0) v = -v; @@ -349,9 +349,9 @@ /* cache unit lookup */ if (human_coord[0].base_unit == NULL) { for(i = 0; i < NUM_HUMAN_COORD; i++) { - human_coord[i].base_unit = get_unit_struct_by_allow(human_coord[i].base); - human_coord[i].down_unit = get_unit_struct_by_allow(human_coord[i].down); - human_coord[i].up_unit = get_unit_struct_by_allow(human_coord[i].up); + human_coord[i].base_unit = rnd_get_unit_struct_by_allow(human_coord[i].base); + human_coord[i].down_unit = rnd_get_unit_struct_by_allow(human_coord[i].down); + human_coord[i].up_unit = rnd_get_unit_struct_by_allow(human_coord[i].up); } } @@ -427,7 +427,7 @@ char tmp[128]; /* large enough for rendering a long long int */ int tmplen, retval = -1, slot_recursion = 0, mq_has_spec; char *dot, *free_fmt = NULL; - enum pcb_allow_e mask = PCB_UNIT_ALLOW_ALL_SANE; + enum rnd_allow_e mask = PCB_UNIT_ALLOW_ALL_SANE; unsigned long maxfmts; if ((safe & PCB_SAFEPRINT_arg_max) > 0) @@ -682,9 +682,9 @@ case '*': { int found = 0; - for (i = 0; i < pcb_get_n_units(1); ++i) { - if (strcmp(ext_unit, pcb_units[i].suffix) == 0) { - if (CoordsToString(string, value, 1, &spec, pcb_units[i].allow, suffix) != 0) goto err; + for (i = 0; i < rnd_get_n_units(1); ++i) { + if (strcmp(ext_unit, rnd_units[i].suffix) == 0) { + if (CoordsToString(string, value, 1, &spec, rnd_units[i].allow, suffix) != 0) goto err; found = 1; break; } @@ -722,14 +722,14 @@ if (gds_append_len(string, tmp, tmplen) != 0) goto err; break; case '+': - mask = va_arg(args, enum pcb_allow_e); + mask = va_arg(args, enum rnd_allow_e); break; default: { int found = 0; - for (i = 0; i < pcb_get_n_units(1); ++i) { - if (*fmt == pcb_units[i].printf_code) { - if (CoordsToString(string, value, 1, &spec, pcb_units[i].allow, suffix) != 0) goto err; + for (i = 0; i < rnd_get_n_units(1); ++i) { + if (*fmt == rnd_units[i].printf_code) { + if (CoordsToString(string, value, 1, &spec, rnd_units[i].allow, suffix) != 0) goto err; found = 1; break; } Index: trunk/src/librnd/core/unit.c =================================================================== --- trunk/src/librnd/core/unit.c (revision 31019) +++ trunk/src/librnd/core/unit.c (revision 31020) @@ -40,7 +40,7 @@ /* Should be kept in order of smallest scale_factor to largest -- the code uses this ordering for finding the best scale to use for a group of units */ -rnd_unit_t pcb_units[] = { +rnd_unit_t rnd_units[] = { {"km", 'k', 0.000001, PCB_UNIT_METRIC, PCB_UNIT_ALLOW_KM, 5}, {"m", 'f', 0.001, PCB_UNIT_METRIC, PCB_UNIT_ALLOW_M, 5}, {"cm", 'e', 0.1, PCB_UNIT_METRIC, PCB_UNIT_ALLOW_CM, 5}, @@ -64,16 +64,16 @@ {"pcb", 0, 100, PCB_UNIT_IMPERIAL, PCB_UNIT_ALLOW_CMIL, 0} /* old io_pcb unit */ }; -#define N_UNITS ((int) (sizeof pcb_units / sizeof pcb_units[0])) +#define N_UNITS ((int) (sizeof rnd_units / sizeof rnd_units[0])) -void pcb_units_init(void) +void rnd_units_init(void) { int i; for (i = 0; i < N_UNITS; ++i) - pcb_units[i].index = i; + rnd_units[i].index = i; } -const rnd_unit_t *get_unit_struct_(const char *suffix, int strict) +const rnd_unit_t *rnd_get_unit_struct_(const char *suffix, int strict) { int i; int s_len = 0; @@ -98,30 +98,30 @@ if (strict) { for (i = 0; i < N_UNITS; ++i) - if (strcmp(suffix, pcb_units[i].suffix) == 0) - return &pcb_units[i]; + if (strcmp(suffix, rnd_units[i].suffix) == 0) + return &rnd_units[i]; } else { for (i = 0; i < N_UNITS; ++i) - if (strncmp(suffix, pcb_units[i].suffix, s_len) == 0) - return &pcb_units[i]; + if (strncmp(suffix, rnd_units[i].suffix, s_len) == 0) + return &rnd_units[i]; } return NULL; } -const rnd_unit_t *get_unit_struct(const char *suffix) +const rnd_unit_t *rnd_get_unit_struct(const char *suffix) { - return get_unit_struct_(suffix, 0); + return rnd_get_unit_struct_(suffix, 0); } -const rnd_unit_t *get_unit_struct_by_allow(enum pcb_allow_e allow) +const rnd_unit_t *rnd_get_unit_struct_by_allow(enum rnd_allow_e allow) { int i; for (i = 0; i < N_UNITS; ++i) - if (pcb_units[i].allow == allow) - return &pcb_units[i]; + if (rnd_units[i].allow == allow) + return &rnd_units[i]; return NULL; } @@ -130,7 +130,7 @@ { if ((idx < 0) || (idx >= N_UNITS)) return NULL; - return pcb_units + idx; + return rnd_units + idx; } const rnd_unit_t *get_unit_by_suffix(const char *suffix) @@ -137,35 +137,35 @@ { int i; for (i = 0; i < N_UNITS; ++i) - if (strcmp(pcb_units[i].suffix, suffix) == 0) - return &pcb_units[i]; + if (strcmp(rnd_units[i].suffix, suffix) == 0) + return &rnd_units[i]; return NULL; } -int pcb_get_n_units(int aliases_too) +int rnd_get_n_units(int aliases_too) { static int num_base = -1; if (aliases_too) return N_UNITS; if (num_base < 0) - for(num_base = 0; pcb_units[num_base].printf_code != 0; num_base++) ; + for(num_base = 0; rnd_units[num_base].printf_code != 0; num_base++) ; return num_base; } -double pcb_coord_to_unit(const rnd_unit_t *unit, rnd_coord_t x) +double rnd_coord_to_unit(const rnd_unit_t *unit, rnd_coord_t x) { double base; if (unit == NULL) return -1; switch(unit->family) { - case PCB_UNIT_METRIC: base = PCB_COORD_TO_MM(1); break; - case PCB_UNIT_IMPERIAL: base = PCB_COORD_TO_MIL(1); break; + case PCB_UNIT_METRIC: base = RND_COORD_TO_MM(1); break; + case PCB_UNIT_IMPERIAL: base = RND_COORD_TO_MIL(1); break; case PCB_UNIT_FREQ: base = 1.0; break; } return x * unit->scale_factor * base; } -rnd_coord_t pcb_unit_to_coord(const rnd_unit_t *unit, double x) +rnd_coord_t rnd_unit_to_coord(const rnd_unit_t *unit, double x) { double base, res; @@ -173,8 +173,8 @@ return -1; switch(unit->family) { - case PCB_UNIT_METRIC: base = PCB_MM_TO_COORD(x); break; - case PCB_UNIT_IMPERIAL: base = PCB_MIL_TO_COORD(x); break; + case PCB_UNIT_METRIC: base = RND_MM_TO_COORD(x); break; + case PCB_UNIT_IMPERIAL: base = RND_MIL_TO_COORD(x); break; case PCB_UNIT_FREQ: base = x; break; } res = rnd_round(base/unit->scale_factor); @@ -194,12 +194,12 @@ return res; } -double pcb_unit_to_factor(const rnd_unit_t *unit) +double rnd_unit_to_factor(const rnd_unit_t *unit) { - return 1.0 / pcb_coord_to_unit(unit, 1); + return 1.0 / rnd_coord_to_unit(unit, 1); } -rnd_angle_t pcb_normalize_angle(rnd_angle_t a) +rnd_angle_t rnd_normalize_angle(rnd_angle_t a) { while (a < 0) a += 360.0; Index: trunk/src/librnd/core/unit.h =================================================================== --- trunk/src/librnd/core/unit.h (revision 31019) +++ trunk/src/librnd/core/unit.h (revision 31020) @@ -32,12 +32,12 @@ * */ -#ifndef PCB_UNIT_H -#define PCB_UNIT_H +#ifndef RND_UNIT_H +#define RND_UNIT_H #include -enum pcb_allow_e { +enum rnd_allow_e { PCB_UNIT_NO_PRINT = 0, /* suffixes we can read but not print (i.e., "inch") */ PCB_UNIT_ALLOW_NM = 1, PCB_UNIT_ALLOW_UM = 2, @@ -88,7 +88,7 @@ char printf_code; /* 0 means the unit is an alias and should not be used in printf */ double scale_factor; enum pcb_family_e family; - enum pcb_allow_e allow; + enum rnd_allow_e allow; int default_prec; /* autogenerated */ @@ -95,20 +95,20 @@ int index; /* Index into Unit[] list */ }; -extern rnd_unit_t pcb_units[]; +extern rnd_unit_t rnd_units[]; /* Look up a given suffix in the units array. Pluralized units are supported. The _ version allows strict (full name match) lookup if strict iz non-zero. */ -const rnd_unit_t *get_unit_struct(const char *suffix); -const rnd_unit_t *get_unit_struct_(const char *suffix, int strict); +const rnd_unit_t *rnd_get_unit_struct(const char *suffix); +const rnd_unit_t *rnd_get_unit_struct_(const char *suffix, int strict); /* Return the furst unit that matches allow */ -const rnd_unit_t *get_unit_struct_by_allow(enum pcb_allow_e allow); +const rnd_unit_t *rnd_get_unit_struct_by_allow(enum rnd_allow_e allow); /* Return the list of units and number of units (use only when listing units); Normally returns basic units only (aliases_too==0); if aliases_too is non-zero, also include redundant (less favorable) units */ -int pcb_get_n_units(int aliases_too); +int rnd_get_n_units(int aliases_too); /* Return the idxth unit or NULL (bounds check) */ const rnd_unit_t *get_unit_by_idx(int idx); @@ -117,35 +117,35 @@ const rnd_unit_t *get_unit_by_suffix(const char *suffix); /* Convert x to the given unit */ -double pcb_coord_to_unit(const rnd_unit_t *unit, rnd_coord_t x); +double rnd_coord_to_unit(const rnd_unit_t *unit, rnd_coord_t x); /* Return how many PCB-internal-Coord-unit a unit translates to */ -double pcb_unit_to_factor(const rnd_unit_t *unit); +double rnd_unit_to_factor(const rnd_unit_t *unit); /* Convert a given unit to pcb coords; clamp at the end of the ranges */ -rnd_coord_t pcb_unit_to_coord(const rnd_unit_t *unit, double x); +rnd_coord_t rnd_unit_to_coord(const rnd_unit_t *unit, double x); /* Bring an angle into [0, 360) range */ -rnd_angle_t pcb_normalize_angle(rnd_angle_t a); +rnd_angle_t rnd_normalize_angle(rnd_angle_t a); /* Initialize non-static unit data: assigns each unit its index for quick access through the main units array, and internationalize the units for GUI display. */ -void pcb_units_init(void); +void rnd_units_init(void); /* PCB/physical unit conversions */ -#define PCB_COORD_TO_MIL(n) ((n) / 25400.0) -#define PCB_MIL_TO_COORD(n) ((n) * 25400.0) -#define PCB_COORD_TO_MM(n) ((n) / 1000000.0) -#define PCB_MM_TO_COORD(n) ((n) * 1000000.0) -#define PCB_COORD_TO_INCH(n) (PCB_COORD_TO_MIL(n) / 1000.0) -#define PCB_INCH_TO_COORD(n) (PCB_MIL_TO_COORD(n) * 1000.0) +#define RND_COORD_TO_MIL(n) ((n) / 25400.0) +#define RND_MIL_TO_COORD(n) ((n) * 25400.0) +#define RND_COORD_TO_MM(n) ((n) / 1000000.0) +#define RND_MM_TO_COORD(n) ((n) * 1000000.0) +#define RND_COORD_TO_INCH(n) (RND_COORD_TO_MIL(n) / 1000.0) +#define RND_INCH_TO_COORD(n) (RND_MIL_TO_COORD(n) * 1000.0) -#define PCB_SWAP_ANGLE(a) (-(a)) -#define PCB_SWAP_DELTA(d) (-(d)) +#define RND_SWAP_ANGLE(a) (-(a)) +#define RND_SWAP_DELTA(d) (-(d)) -RND_INLINE rnd_coord_t pcb_coord_abs(rnd_coord_t c) +RND_INLINE rnd_coord_t rnd_coord_abs(rnd_coord_t c) { if (c < 0) return -c; return c; Index: trunk/src/librnd/pcb_compat.h =================================================================== --- trunk/src/librnd/pcb_compat.h (revision 31019) +++ trunk/src/librnd/pcb_compat.h (revision 31020) @@ -1140,3 +1140,23 @@ #define pcb_tool_redo_act rnd_tool_redo_act #define pcb_tool_do_press rnd_tool_do_press #define pcb_tool_get rnd_tool_get +#define pcb_allow_e rnd_allow_e +#define pcb_units rnd_units +#define get_unit_struct rnd_get_unit_struct +#define get_unit_struct_ rnd_get_unit_struct_ +#define get_unit_struct_by_allow rnd_get_unit_struct_by_allow +#define pcb_get_n_units rnd_get_n_units +#define pcb_coord_to_unit rnd_coord_to_unit +#define pcb_unit_to_factor rnd_unit_to_factor +#define pcb_unit_to_coord rnd_unit_to_coord +#define pcb_normalize_angle rnd_normalize_angle +#define pcb_units_init rnd_units_init +#define PCB_COORD_TO_MIL RND_COORD_TO_MIL +#define PCB_MIL_TO_COORD RND_MIL_TO_COORD +#define PCB_COORD_TO_MM RND_COORD_TO_MM +#define PCB_MM_TO_COORD RND_MM_TO_COORD +#define PCB_COORD_TO_INCH RND_COORD_TO_INCH +#define PCB_INCH_TO_COORD RND_INCH_TO_COORD +#define PCB_SWAP_ANGLE RND_SWAP_ANGLE +#define PCB_SWAP_DELTA RND_SWAP_DELTA +#define pcb_coord_abs rnd_coord_abs Index: trunk/src/librnd/poly/polyarea.c =================================================================== --- trunk/src/librnd/poly/polyarea.c (revision 31019) +++ trunk/src/librnd/poly/polyarea.c (revision 31020) @@ -3070,7 +3070,7 @@ while ((v = v->next) != pl); if ((chk != NULL) && (chk->marks > 0)) { - int n, MR=PCB_MM_TO_COORD(0.05); + int n, MR=RND_MM_TO_COORD(0.05); fprintf(stderr, "color #770000\n"); for(n = 0; n < chk->marks; n++) { rnd_fprintf(stderr, "line %#mm %#mm %#mm %#mm\n", chk->x[n]-MR, chk->y[n]-MR, chk->x[n]+MR, chk->y[n]+MR); Index: trunk/src/librnd/poly/polygon1_gen.c =================================================================== --- trunk/src/librnd/poly/polygon1_gen.c (revision 31019) +++ trunk/src/librnd/poly/polygon1_gen.c (revision 31020) @@ -158,7 +158,7 @@ edy = (v[1] - v2[1]); if (edx < 0) edx = -edx; if (edy < 0) edy = -edy; - if (edx+edy > PCB_MM_TO_COORD(0.001)) + if (edx+edy > RND_MM_TO_COORD(0.001)) pcb_poly_vertex_include(contour->head->prev, pcb_poly_node_create(v2)); Index: trunk/src/obj_arc.c =================================================================== --- trunk/src/obj_arc.c (revision 31019) +++ trunk/src/obj_arc.c (revision 31020) @@ -113,12 +113,12 @@ delta = RND_CLAMP(Arc->Delta, -360, 360); if (delta > 0) { - ang1 = pcb_normalize_angle(Arc->StartAngle); - ang2 = pcb_normalize_angle(Arc->StartAngle + delta); + ang1 = rnd_normalize_angle(Arc->StartAngle); + ang2 = rnd_normalize_angle(Arc->StartAngle + delta); } else { - ang1 = pcb_normalize_angle(Arc->StartAngle + delta); - ang2 = pcb_normalize_angle(Arc->StartAngle); + ang1 = rnd_normalize_angle(Arc->StartAngle + delta); + ang2 = rnd_normalize_angle(Arc->StartAngle); } if (ang1 > ang2) ang2 += 360; @@ -230,7 +230,7 @@ for(o = rnd_rtree_first(&it, Layer->arc_tree, (rnd_rtree_box_t *)&b); o != NULL; o = rnd_rtree_next(&it)) { pcb_arc_t *arc = (pcb_arc_t *)o; TODO(": this does not catch all cases; there are more ways two arcs can be the same because of the angles") - if (arc->X == X1 && arc->Y == Y1 && arc->Width == width && pcb_normalize_angle(arc->StartAngle) == pcb_normalize_angle(sa) && arc->Delta == dir) + if (arc->X == X1 && arc->Y == Y1 && arc->Width == width && rnd_normalize_angle(arc->StartAngle) == rnd_normalize_angle(sa) && arc->Delta == dir) return NULL; /* prevent stacked arcs */ } } @@ -309,7 +309,7 @@ if (!PCB_FLAG_TEST(PCB_FLAG_FLOATER, a1) && !PCB_FLAG_TEST(PCB_FLAG_FLOATER, a2)) { if (pcb_neq_tr_coords(tr1, a1->X, a1->Y, tr2, a2->X, a2->Y)) return 0; - if (pcb_normalize_angle(rnd_round(a1->StartAngle * sgn1 + tr1->rot * sgn1)) != pcb_normalize_angle(rnd_round(a2->StartAngle * sgn2 + tr2->rot * sgn2))) return 0; + if (rnd_normalize_angle(rnd_round(a1->StartAngle * sgn1 + tr1->rot * sgn1)) != rnd_normalize_angle(rnd_round(a2->StartAngle * sgn2 + tr2->rot * sgn2))) return 0; if (rnd_round(a1->Delta * sgn1) != rnd_round(a2->Delta * sgn2)) return 0; } @@ -325,7 +325,7 @@ rnd_coord_t x, y; pcb_hash_tr_coords(tr, &x, &y, a->X, a->Y); crd = pcb_hash_coord(x) ^ pcb_hash_coord(y) ^ - pcb_hash_coord(pcb_normalize_angle(rnd_round(a->StartAngle*sgn + tr->rot*sgn))) ^ pcb_hash_coord(rnd_round(a->Delta * sgn)); + pcb_hash_coord(rnd_normalize_angle(rnd_round(a->StartAngle*sgn + tr->rot*sgn))) ^ pcb_hash_coord(rnd_round(a->Delta * sgn)); } return @@ -781,7 +781,7 @@ rnd_coord_t save; /* add Number*90 degrees (i.e., Number quarter-turns) */ - Arc->StartAngle = pcb_normalize_angle(Arc->StartAngle + Number * 90); + Arc->StartAngle = rnd_normalize_angle(Arc->StartAngle + Number * 90); RND_COORD_ROTATE90(Arc->X, Arc->Y, X, Y, Number); /* now change width and height */ @@ -800,7 +800,7 @@ if (layer->arc_tree != NULL) pcb_r_delete_entry(layer->arc_tree, (rnd_rnd_box_t *) arc); rnd_rotate(&arc->X, &arc->Y, X, Y, cosa, sina); - arc->StartAngle = pcb_normalize_angle(arc->StartAngle + angle); + arc->StartAngle = rnd_normalize_angle(arc->StartAngle + angle); if (layer->arc_tree != NULL) pcb_r_insert_entry(layer->arc_tree, (rnd_rnd_box_t *) arc); } @@ -818,8 +818,8 @@ g->Height = arc->Height; g->X = PCB_SWAP_X(arc->X); g->Y = PCB_SWAP_Y(arc->Y) + y_offs; - g->StartAngle = PCB_SWAP_ANGLE(arc->StartAngle); - g->Delta = PCB_SWAP_DELTA(arc->Delta); + g->StartAngle = RND_SWAP_ANGLE(arc->StartAngle); + g->Delta = RND_SWAP_DELTA(arc->Delta); undo_arc_geo_swap(g); if (undoable) pcb_undo_inc_serial(); @@ -830,8 +830,8 @@ pcb_r_delete_entry(layer->arc_tree, (rnd_rnd_box_t *) arc); arc->X = PCB_SWAP_X(arc->X); arc->Y = PCB_SWAP_Y(arc->Y); - arc->StartAngle = PCB_SWAP_ANGLE(arc->StartAngle); - arc->Delta = PCB_SWAP_DELTA(arc->Delta); + arc->StartAngle = RND_SWAP_ANGLE(arc->StartAngle); + arc->Delta = RND_SWAP_DELTA(arc->Delta); pcb_arc_bbox(arc); pcb_r_insert_entry(layer->arc_tree, (rnd_rnd_box_t *) arc); } @@ -986,7 +986,7 @@ } if (res == 0) - res = PCB_MM_TO_COORD(-1); + res = RND_MM_TO_COORD(-1); if (res < 0) { double arclen, delta; Index: trunk/src/obj_arc_ui.c =================================================================== --- trunk/src/obj_arc_ui.c (revision 31019) +++ trunk/src/obj_arc_ui.c (revision 31020) @@ -37,7 +37,7 @@ static void draw_mark(rnd_hid_gc_t gc, const pcb_arc_t *arc) { - const rnd_coord_t mark = PCB_MM_TO_COORD(0.2); + const rnd_coord_t mark = RND_MM_TO_COORD(0.2); rnd_render->draw_line(gc, arc->X-mark, arc->Y, arc->X+mark, arc->Y); rnd_render->draw_line(gc, arc->X, arc->Y-mark, arc->X, arc->Y+mark); } Index: trunk/src/obj_common.h =================================================================== --- trunk/src/obj_common.h (revision 31019) +++ trunk/src/obj_common.h (revision 31020) @@ -318,7 +318,7 @@ #define pcb_obj_noexport_mark(obj, cx, cy) \ do { \ - rnd_coord_t radius = PCB_MM_TO_COORD(0.2); \ + rnd_coord_t radius = RND_MM_TO_COORD(0.2); \ int selected = PCB_FLAG_TEST(PCB_FLAG_SELECTED, obj); \ rnd_render->set_color(pcb_draw_out.fgGC, selected ? &conf_core.appearance.color.selected : &conf_core.appearance.color.subc); \ rnd_hid_set_line_cap(pcb_draw_out.fgGC, rnd_cap_round); \ Index: trunk/src/obj_gfx.c =================================================================== --- trunk/src/obj_gfx.c (revision 31019) +++ trunk/src/obj_gfx.c (revision 31020) @@ -211,7 +211,7 @@ if (a1->sx != a2->sx) return 0; if (a1->sy != a2->sy) return 0; if (pcb_neq_tr_coords(tr1, a1->cx, a1->cy, tr2, a2->cx, a2->cy)) return 0; - if (pcb_normalize_angle(rnd_round(a1->rot * sgn1)) != pcb_normalize_angle(rnd_round(a2->rot * sgn2))) return 0; + if (rnd_normalize_angle(rnd_round(a1->rot * sgn1)) != rnd_normalize_angle(rnd_round(a2->rot * sgn2))) return 0; TODO("compare pixmaps"); return 1; } @@ -225,7 +225,7 @@ rnd_coord_t x, y; pcb_hash_tr_coords(tr, &x, &y, a->cx, a->cy); crd = pcb_hash_coord(x) ^ pcb_hash_coord(y) ^ pcb_hash_coord(a->sx) ^ pcb_hash_coord(a->sy) ^ - pcb_hash_coord(pcb_normalize_angle(rnd_round(a->rot*sgn + tr->rot*sgn))); + pcb_hash_coord(rnd_normalize_angle(rnd_round(a->rot*sgn + tr->rot*sgn))); } TODO("hash pixmaps"); @@ -471,7 +471,7 @@ /* rotates a gfx */ void pcb_gfx_rotate90(pcb_gfx_t *gfx, rnd_coord_t X, rnd_coord_t Y, unsigned Number) { - gfx->rot = pcb_normalize_angle(gfx->rot + Number * 90); + gfx->rot = rnd_normalize_angle(gfx->rot + Number * 90); TODO("rotate content") pcb_gfx_update(gfx); pcb_gfx_bbox(gfx); @@ -482,7 +482,7 @@ if (layer->gfx_tree != NULL) pcb_r_delete_entry(layer->gfx_tree, (rnd_rnd_box_t *) gfx); - gfx->rot = pcb_normalize_angle(gfx->rot + angle); + gfx->rot = rnd_normalize_angle(gfx->rot + angle); TODO("rotate content") pcb_gfx_update(gfx); pcb_gfx_bbox(gfx); @@ -514,7 +514,7 @@ pcb_r_delete_entry(layer->gfx_tree, (rnd_rnd_box_t *)gfx); gfx->cx = PCB_SWAP_X(gfx->cx); gfx->cy = PCB_SWAP_Y(gfx->cy); - gfx->rot = PCB_SWAP_ANGLE(gfx->rot); + gfx->rot = RND_SWAP_ANGLE(gfx->rot); pcb_gfx_update(gfx); pcb_gfx_bbox(gfx); pcb_r_insert_entry(layer->gfx_tree, (rnd_rnd_box_t *)gfx); @@ -647,7 +647,7 @@ if ((gfx->pxm_neutral == NULL) || (rnd_render->draw_pixmap == NULL)) { rnd_render->set_color(pcb_draw_out.fgGC, &conf_core.appearance.color.warn); rnd_hid_set_line_cap(pcb_draw_out.fgGC, rnd_cap_round); - rnd_hid_set_line_width(pcb_draw_out.fgGC, PCB_MM_TO_COORD(0.1)); + rnd_hid_set_line_width(pcb_draw_out.fgGC, RND_MM_TO_COORD(0.1)); rnd_render->draw_line(pcb_draw_out.fgGC, gfx->cox[0], gfx->coy[0], gfx->cox[2], gfx->coy[2]); rnd_render->draw_line(pcb_draw_out.fgGC, gfx->cox[1], gfx->coy[1], gfx->cox[3], gfx->coy[3]); } Index: trunk/src/obj_poly_draw_helper.c =================================================================== --- trunk/src/obj_poly_draw_helper.c (revision 31019) +++ trunk/src/obj_poly_draw_helper.c (revision 31020) @@ -97,7 +97,7 @@ while ((v = v->next) != pl->head->next); if (i < 3) { - rnd_hid_set_line_width(gc, PCB_MM_TO_COORD(0.01)); + rnd_hid_set_line_width(gc, RND_MM_TO_COORD(0.01)); rnd_hid_set_line_cap(gc, rnd_cap_round); rnd_render->draw_line(gc, last_x, last_y, this_x, this_y); } Index: trunk/src/obj_pstk.h =================================================================== --- trunk/src/obj_pstk.h (revision 31019) +++ trunk/src/obj_pstk.h (revision 31020) @@ -283,7 +283,7 @@ rnd_coord_t auto_bloat; } pcb_proto_layer_t; -#define PCB_PROTO_MASK_BLOAT PCB_MIL_TO_COORD(2*3) +#define PCB_PROTO_MASK_BLOAT RND_MIL_TO_COORD(2*3) #define pcb_proto_num_layers 8 extern const pcb_proto_layer_t pcb_proto_layers[pcb_proto_num_layers]; Index: trunk/src/obj_subc.c =================================================================== --- trunk/src/obj_subc.c (revision 31019) +++ trunk/src/obj_subc.c (revision 31020) @@ -184,7 +184,7 @@ static pcb_line_t *add_aux_line(pcb_layer_t *aux, const char *key, const char *val, rnd_coord_t x1, rnd_coord_t y1, rnd_coord_t x2, rnd_coord_t y2) { - pcb_line_t *l = pcb_line_new(aux, x1, y1, x2, y2, PCB_MM_TO_COORD(0.1), 0, pcb_no_flags()); + pcb_line_t *l = pcb_line_new(aux, x1, y1, x2, y2, RND_MM_TO_COORD(0.1), 0, pcb_no_flags()); rnd_attribute_put(&l->Attributes, key, val); return l; } @@ -769,14 +769,14 @@ arclist_foreach(&ly->Arc, &it, arc) { if(arc->Width != arc->Height) { TODO(": The wireframe arc drawing code cannot draw ellipses yet so draw the elliptical arc with a thin line ") - double sa = mirr ? PCB_SWAP_ANGLE(arc->StartAngle) : arc->StartAngle; - double da = mirr ? PCB_SWAP_DELTA(arc->Delta) : arc->Delta; + double sa = mirr ? RND_SWAP_ANGLE(arc->StartAngle) : arc->StartAngle; + double da = mirr ? RND_SWAP_DELTA(arc->Delta) : arc->Delta; rnd_render->draw_arc(pcb_crosshair.GC, DX + PCB_CSWAP_X(arc->X, w, mirr), DY + PCB_CSWAP_Y(arc->Y, h, mirr), arc->Width, arc->Height, sa, da); } else { pcb_arc_t temp_arc; - temp_arc.StartAngle = mirr ? PCB_SWAP_ANGLE(arc->StartAngle) : arc->StartAngle; - temp_arc.Delta = mirr ? PCB_SWAP_DELTA(arc->Delta) : arc->Delta; + temp_arc.StartAngle = mirr ? RND_SWAP_ANGLE(arc->StartAngle) : arc->StartAngle; + temp_arc.Delta = mirr ? RND_SWAP_DELTA(arc->Delta) : arc->Delta; temp_arc.X = DX + PCB_CSWAP_X(arc->X, w, mirr); temp_arc.Y = DY + PCB_CSWAP_Y(arc->Y, h, mirr); temp_arc.Width = arc->Width; Index: trunk/src/obj_text.c =================================================================== --- trunk/src/obj_text.c (revision 31019) +++ trunk/src/obj_text.c (revision 31020) @@ -515,8 +515,8 @@ /* changes the scaling factor of a text object */ void *pcb_textop_change_size(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_text_t *Text) { - int value = ctx->chgsize.is_absolute ? PCB_COORD_TO_MIL(ctx->chgsize.value) - : Text->Scale + PCB_COORD_TO_MIL(ctx->chgsize.value); + int value = ctx->chgsize.is_absolute ? RND_COORD_TO_MIL(ctx->chgsize.value) + : Text->Scale + RND_COORD_TO_MIL(ctx->chgsize.value); if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Text)) return NULL; @@ -1230,8 +1230,8 @@ newarc.Thickness = PCB_SCALE_TEXT(newarc.Thickness, scale / 2); newarc.StartAngle += rotdeg; if (mirror) { - newarc.StartAngle = PCB_SWAP_ANGLE(newarc.StartAngle); - newarc.Delta = PCB_SWAP_DELTA(newarc.Delta); + newarc.StartAngle = RND_SWAP_ANGLE(newarc.StartAngle); + newarc.Delta = RND_SWAP_DELTA(newarc.Delta); } if (newarc.Thickness < min_line_width) newarc.Thickness = min_line_width; Index: trunk/src/object_act.c =================================================================== --- trunk/src/object_act.c (revision 31019) +++ trunk/src/object_act.c (revision 31020) @@ -158,7 +158,7 @@ static const char pcb_acts_DisperseElements[] = "DisperseElements(All|Selected)"; static const char pcb_acth_DisperseElements[] = "Disperses subcircuits."; -#define GAP PCB_MIL_TO_COORD(100) +#define GAP RND_MIL_TO_COORD(100) /* DOC: disperseelements.html */ Index: trunk/src/plug_io.c =================================================================== --- trunk/src/plug_io.c (revision 31019) +++ trunk/src/plug_io.c (revision 31020) @@ -579,7 +579,7 @@ if (unit_suffix && *unit_suffix) { lht_node_t *nat = rnd_conf_lht_get_at(RND_CFR_DESIGN, "editor/grid_unit", 0); if (nat == NULL) { - const rnd_unit_t *new_unit = get_unit_struct(unit_suffix); + const rnd_unit_t *new_unit = rnd_get_unit_struct(unit_suffix); if (new_unit) rnd_conf_set(settings_dest, "editor/grid_unit", -1, unit_suffix, RND_POL_OVERWRITE); } Index: trunk/src/polygon.c =================================================================== --- trunk/src/polygon.c (revision 31019) +++ trunk/src/polygon.c (revision 31020) @@ -445,7 +445,7 @@ /* new method: detailed clearance */ sctx.poly = p; - sctx.clearance = text->clearance + PCB_MM_TO_COORD(0.5); + sctx.clearance = text->clearance + RND_MM_TO_COORD(0.5); pcb_text_decompose_text(NULL, text, poly_sub_text_cb, &sctx); return 1; } Index: trunk/src/route_style.c =================================================================== --- trunk/src/route_style.c (revision 31019) +++ trunk/src/route_style.c (revision 31020) @@ -117,7 +117,7 @@ /* for backwards-compatibility, we use a 10-mil default * for styles which omit the clearance specification. */ if (*s != ',') - routeStyle->Clearance = PCB_MIL_TO_COORD(10); + routeStyle->Clearance = RND_MIL_TO_COORD(10); else { s++; while (*s && isspace((int) *s)) Index: trunk/src/search.c =================================================================== --- trunk/src/search.c (revision 31019) +++ trunk/src/search.c (revision 31020) @@ -1075,12 +1075,12 @@ /* Convert StartAngle, Delta into bounding angles in [0, 720) */ if (Arc->Delta > 0) { - ang1 = pcb_normalize_angle(Arc->StartAngle); - ang2 = pcb_normalize_angle(Arc->StartAngle + Arc->Delta); + ang1 = rnd_normalize_angle(Arc->StartAngle); + ang2 = rnd_normalize_angle(Arc->StartAngle + Arc->Delta); } else { - ang1 = pcb_normalize_angle(Arc->StartAngle + Arc->Delta); - ang2 = pcb_normalize_angle(Arc->StartAngle); + ang1 = rnd_normalize_angle(Arc->StartAngle + Arc->Delta); + ang2 = rnd_normalize_angle(Arc->StartAngle); } if (ang1 > ang2) ang2 += 360; @@ -1111,7 +1111,7 @@ return rnd_false; } - if ((Arc->Width == Arc->Height) || (fabs(Arc->Width - Arc->Height) < PCB_MM_TO_COORD(0.1))) { + if ((Arc->Width == Arc->Height) || (fabs(Arc->Width - Arc->Height) < RND_MM_TO_COORD(0.1))) { /* Simple circular case: if point is inside the arc range, just compare it to the arc */ return fabs(rnd_distance(X, Y, Arc->X, Arc->Y) - Arc->Width) < Radius + Arc->Thickness / 2; } Index: trunk/src_plugins/acompnet/acompnet.c =================================================================== --- trunk/src_plugins/acompnet/acompnet.c (revision 31019) +++ trunk/src_plugins/acompnet/acompnet.c (revision 31020) @@ -182,11 +182,11 @@ { /* temporary hack for testing: fixed, off-mesh start/end */ rnd_rnd_box_t bbox; - bbox.X1 = PCB_MM_TO_COORD(6.35); bbox.X2 = bbox.X1+1; - bbox.Y1 = PCB_MM_TO_COORD(21.5); bbox.Y2 = bbox.Y1+1; + bbox.X1 = RND_MM_TO_COORD(6.35); bbox.X2 = bbox.X1+1; + bbox.Y1 = RND_MM_TO_COORD(21.5); bbox.Y2 = bbox.Y1+1; is = pcb_msgr_add_node(&gr, &bbox, 0); - bbox.X1 = PCB_MM_TO_COORD(12); bbox.X2 = bbox.X1+1; - bbox.Y1 = PCB_MM_TO_COORD(3.8); bbox.Y2 = bbox.Y1+1; + bbox.X1 = RND_MM_TO_COORD(12); bbox.X2 = bbox.X1+1; + bbox.Y1 = RND_MM_TO_COORD(3.8); bbox.Y2 = bbox.Y1+1; ie = pcb_msgr_add_node(&gr, &bbox, 0); } Index: trunk/src_plugins/acompnet/meshgraph.c =================================================================== --- trunk/src_plugins/acompnet/meshgraph.c (revision 31019) +++ trunk/src_plugins/acompnet/meshgraph.c (revision 31020) @@ -36,7 +36,7 @@ #include "route.h" #define INF_SCORE 9000000000.0 -#define SEARCHR PCB_MM_TO_COORD(5) +#define SEARCHR RND_MM_TO_COORD(5) void pcb_msgr_init(pcb_meshgraph_t *gr) { Index: trunk/src_plugins/ar_cpcb/ar_cpcb.c =================================================================== --- trunk/src_plugins/ar_cpcb/ar_cpcb.c (revision 31019) +++ trunk/src_plugins/ar_cpcb/ar_cpcb.c (revision 31020) @@ -146,9 +146,9 @@ break; case 6: /* tracks */ nid = gsxl_nth(rn, 1); - ntr = gsxl_next(nid); thick = 2*PCB_MM_TO_COORD(strtod(ntr->str, NULL)); - nvr = gsxl_next(ntr); via_dia = 2*PCB_MM_TO_COORD(strtod(nvr->str, NULL)); - ngap = gsxl_next(nvr); clear = PCB_MM_TO_COORD(strtod(ngap->str, NULL)); + ntr = gsxl_next(nid); thick = 2*RND_MM_TO_COORD(strtod(ntr->str, NULL)); + nvr = gsxl_next(ntr); via_dia = 2*RND_MM_TO_COORD(strtod(nvr->str, NULL)); + ngap = gsxl_next(nvr); clear = RND_MM_TO_COORD(strtod(ngap->str, NULL)); npads = gsxl_next(ngap); npaths = gsxl_next(npads); @@ -158,8 +158,8 @@ for(p = gsxl_children(n); p != NULL; p = gsxl_next(p)) { /* iterate over all points of the path */ pcb_line_t *line; - nx = gsxl_children(p); x = PCB_MM_TO_COORD(strtod(nx->str, NULL)); - ny = gsxl_next(nx); y = PCB_MM_TO_COORD(strtod(ny->str, NULL)); + nx = gsxl_children(p); x = RND_MM_TO_COORD(strtod(nx->str, NULL)); + ny = gsxl_next(nx); y = RND_MM_TO_COORD(strtod(ny->str, NULL)); nl = gsxl_next(ny); lidx = strtol(nl->str, &end, 10); @@ -256,7 +256,7 @@ htpp_entry_t *e; /* print dims */ - rnd_fprintf(f, "(%d %d %d)\n", (int)(PCB_COORD_TO_MM(pcb->hidlib.size_x)+0.5), (int)(PCB_COORD_TO_MM(pcb->hidlib.size_y)+0.5), stack->maxlayer); + rnd_fprintf(f, "(%d %d %d)\n", (int)(RND_COORD_TO_MM(pcb->hidlib.size_x)+0.5), (int)(RND_COORD_TO_MM(pcb->hidlib.size_y)+0.5), stack->maxlayer); /* print tracks */ for(e = htpp_first(&nmap->netmap.n2o); e != NULL; e = htpp_next(&nmap->netmap.n2o, e)) { Index: trunk/src_plugins/autoplace/autoplace.c =================================================================== --- trunk/src_plugins/autoplace/autoplace.c (revision 31019) +++ trunk/src_plugins/autoplace/autoplace.c (revision 31020) @@ -111,8 +111,8 @@ 0.75, /* annealing schedule constant: 0.85 */ 40, /* halt when there are 60 times as many moves as good moves */ rnd_false, /* don't ignore SMD/pin conflicts */ - PCB_MIL_TO_COORD(100), /* coarse grid is 100 mils */ - PCB_MIL_TO_COORD(10), /* fine grid is 10 mils */ + RND_MIL_TO_COORD(100), /* coarse grid is 100 mils */ + RND_MIL_TO_COORD(10), /* fine grid is 10 mils */ }; enum ewhich { SHIFT, ROTATE, EXCHANGE }; @@ -363,7 +363,7 @@ allsameside = rnd_false; } /* okay, add half-perimeter to cost! */ - W += PCB_COORD_TO_MIL(maxx - minx) + PCB_COORD_TO_MIL(maxy - miny) + ((allpads && !allsameside) ? CostParameter.via_cost : 0); + W += RND_COORD_TO_MIL(maxx - minx) + RND_COORD_TO_MIL(maxy - miny) + ((allpads && !allsameside) ? CostParameter.via_cost : 0); } } @@ -548,7 +548,7 @@ } PCB_END_LOOP; if (minX < maxX && minY < maxY) - delta5 = CostParameter.overall_area_penalty * sqrt(PCB_COORD_TO_MIL(maxX - minX) * PCB_COORD_TO_MIL(maxY - minY)); + delta5 = CostParameter.overall_area_penalty * sqrt(RND_COORD_TO_MIL(maxX - minX) * RND_COORD_TO_MIL(maxY - minY)); } if (T == 5) { T = W + delta1 + delta2 + delta3 - delta4 + delta5; @@ -603,13 +603,13 @@ case 0: { /* shift! */ rnd_coord_t grid; - double scaleX = RND_CLAMP(sqrt(T), PCB_MIL_TO_COORD(2.5), PCB->hidlib.size_x / 3); - double scaleY = RND_CLAMP(sqrt(T), PCB_MIL_TO_COORD(2.5), PCB->hidlib.size_y / 3); + double scaleX = RND_CLAMP(sqrt(T), RND_MIL_TO_COORD(2.5), PCB->hidlib.size_x / 3); + double scaleY = RND_CLAMP(sqrt(T), RND_MIL_TO_COORD(2.5), PCB->hidlib.size_y / 3); pt.which = SHIFT; pt.DX = scaleX * 2 * ((((double) rnd_rand()) / RAND_MAX) - 0.5); pt.DY = scaleY * 2 * ((((double) rnd_rand()) / RAND_MAX) - 0.5); /* snap to grid. different grids for "high" and "low" T */ - grid = (T > PCB_MIL_TO_COORD(10)) ? CostParameter.large_grid_size : CostParameter.small_grid_size; + grid = (T > RND_MIL_TO_COORD(10)) ? CostParameter.large_grid_size : CostParameter.small_grid_size; /* (round away from zero) */ pt.DX = ((pt.DX / grid) + SGN(pt.DX)) * grid; pt.DY = ((pt.DY / grid) + SGN(pt.DY)) * grid; @@ -749,12 +749,12 @@ /* simulated annealing */ { /* compute T0 by doing a random series of moves. */ const int TRIALS = 10; - const double Tx = PCB_MIL_TO_COORD(300), P = 0.95; + const double Tx = RND_MIL_TO_COORD(300), P = 0.95; double Cs = 0.0; int i; C00 = C0 = ComputeCost(Tx, Tx); for (i = 0; i < TRIALS; i++) { - pt = createPerturbation(&Selected, PCB_INCH_TO_COORD(1)); + pt = createPerturbation(&Selected, RND_INCH_TO_COORD(1)); doPerturb(&Selected, &pt, rnd_false); Cs += fabs(ComputeCost(Tx, Tx) - C0); doPerturb(&Selected, &pt, rnd_true); Index: trunk/src_plugins/autoroute/autoroute.c =================================================================== --- trunk/src_plugins/autoroute/autoroute.c (revision 31019) +++ trunk/src_plugins/autoroute/autoroute.c (revision 31020) @@ -4088,7 +4088,7 @@ AutoRouteParameters.style = style; AutoRouteParameters.bloat = style->Clearance + HALF_THICK(style->Thick); /* costs */ - AutoRouteParameters.ViaCost = PCB_INCH_TO_COORD(3.5) + style->Diameter * (is_smoothing ? 80 : 30); + AutoRouteParameters.ViaCost = RND_INCH_TO_COORD(3.5) + style->Diameter * (is_smoothing ? 80 : 30); AutoRouteParameters.LastConflictPenalty = (400 * pass / passes + 2) / (pass + 1); AutoRouteParameters.ConflictPenalty = 4 * AutoRouteParameters.LastConflictPenalty; AutoRouteParameters.JogPenalty = 1000 * (is_smoothing ? 20 : 4); Index: trunk/src_plugins/ddraft/centgeo.c =================================================================== --- trunk/src_plugins/ddraft/centgeo.c (revision 31019) +++ trunk/src_plugins/ddraft/centgeo.c (revision 31020) @@ -328,7 +328,7 @@ } if (*d > 360) /* full circle */ *d = 360; - *sa = pcb_normalize_angle(*sa); + *sa = rnd_normalize_angle(*sa); } static int radius_crosses_arc(double x, double y, pcb_arc_t *arc) Index: trunk/src_plugins/ddraft/constraint_gui.c =================================================================== --- trunk/src_plugins/ddraft/constraint_gui.c (revision 31019) +++ trunk/src_plugins/ddraft/constraint_gui.c (revision 31020) @@ -246,7 +246,7 @@ RND_DAD_COORD(cnstgui_ctx.dlg, ""); cnstgui_ctx.line_length_mod = RND_DAD_CURRENT(cnstgui_ctx.dlg); RND_DAD_MINVAL(cnstgui_ctx.dlg, 0); - RND_DAD_MAXVAL(cnstgui_ctx.dlg, PCB_MM_TO_COORD(1000)); + RND_DAD_MAXVAL(cnstgui_ctx.dlg, RND_MM_TO_COORD(1000)); RND_DAD_CHANGE_CB(cnstgui_ctx.dlg, gui2cons); RND_DAD_HELP(cnstgui_ctx.dlg, "if non-zero:\nline length must be an integer multiply of this value"); RND_DAD_END(cnstgui_ctx.dlg); @@ -306,7 +306,7 @@ RND_DAD_COORD(cnstgui_ctx.dlg, ""); cnstgui_ctx.move_length_mod = RND_DAD_CURRENT(cnstgui_ctx.dlg); RND_DAD_MINVAL(cnstgui_ctx.dlg, 0); - RND_DAD_MAXVAL(cnstgui_ctx.dlg, PCB_MM_TO_COORD(1000)); + RND_DAD_MAXVAL(cnstgui_ctx.dlg, RND_MM_TO_COORD(1000)); RND_DAD_CHANGE_CB(cnstgui_ctx.dlg, gui2cons); RND_DAD_HELP(cnstgui_ctx.dlg, "if non-zero:\nmove distance must be an integer multiply of this value"); RND_DAD_END(cnstgui_ctx.dlg); Index: trunk/src_plugins/diag/diag.c =================================================================== --- trunk/src_plugins/diag/diag.c (revision 31019) +++ trunk/src_plugins/diag/diag.c (revision 31020) @@ -413,7 +413,7 @@ pcb_board_t *pcb = PCB_ACT_BOARD; rnd_pixmap_t *pxm; pcb_gfx_t *g = pcb_gfx_new(PCB_CURRLAYER(pcb), - PCB_MIL_TO_COORD(500), PCB_MIL_TO_COORD(500), PCB_MIL_TO_COORD(233), PCB_MIL_TO_COORD(233), 15, pcb_flag_make(0)); + RND_MIL_TO_COORD(500), RND_MIL_TO_COORD(500), RND_MIL_TO_COORD(233), RND_MIL_TO_COORD(233), 15, pcb_flag_make(0)); pxm = rnd_pixmap_load(RND_ACT_HIDLIB, "A.pnm"); rnd_trace("pxm=%p\n", pxm); Index: trunk/src_plugins/dialogs/dlg_fontsel.c =================================================================== --- trunk/src_plugins/dialogs/dlg_fontsel.c (revision 31019) +++ trunk/src_plugins/dialogs/dlg_fontsel.c (revision 31020) @@ -145,7 +145,7 @@ static void pcb_dlg_fontsel(pcb_board_t *pcb, int modal, int global, pcb_text_t *txt_obj) { - rnd_rnd_box_t vbox = {0, 0, PCB_MM_TO_COORD(55), PCB_MM_TO_COORD(55)}; + rnd_rnd_box_t vbox = {0, 0, RND_MM_TO_COORD(55), RND_MM_TO_COORD(55)}; rnd_hid_dad_buttons_t clbtn[] = {{"Close", 0}, {NULL, 0}}; fontsel_ctx_t *c, *ctx = NULL; Index: trunk/src_plugins/dialogs/dlg_lib_pstk.c =================================================================== --- trunk/src_plugins/dialogs/dlg_lib_pstk.c (revision 31019) +++ trunk/src_plugins/dialogs/dlg_lib_pstk.c (revision 31020) @@ -206,10 +206,10 @@ return; pcb_pstk_bbox(ps); - ps->BoundingBox.X1 -= PCB_MM_TO_COORD(0.5); - ps->BoundingBox.Y1 -= PCB_MM_TO_COORD(0.5); - ps->BoundingBox.X2 += PCB_MM_TO_COORD(0.5); - ps->BoundingBox.Y2 += PCB_MM_TO_COORD(0.5); + ps->BoundingBox.X1 -= RND_MM_TO_COORD(0.5); + ps->BoundingBox.Y1 -= RND_MM_TO_COORD(0.5); + ps->BoundingBox.X2 += RND_MM_TO_COORD(0.5); + ps->BoundingBox.Y2 += RND_MM_TO_COORD(0.5); memcpy(&ctx->drawbox, &ps->BoundingBox, sizeof(rnd_rnd_box_t)); rnd_dad_preview_zoomto(&ctx->dlg[ctx->wprev], &ctx->drawbox); } @@ -571,8 +571,8 @@ RND_DAD_LABEL(ctx->dlg, "Grid:"); RND_DAD_COORD(ctx->dlg, ""); ctx->wgrid = RND_DAD_CURRENT(ctx->dlg); - RND_DAD_MINMAX(ctx->dlg, PCB_MM_TO_COORD(0.01), PCB_MM_TO_COORD(10)); - RND_DAD_DEFAULT_NUM(ctx->dlg, (rnd_coord_t)PCB_MM_TO_COORD(1)); + RND_DAD_MINMAX(ctx->dlg, RND_MM_TO_COORD(0.01), RND_MM_TO_COORD(10)); + RND_DAD_DEFAULT_NUM(ctx->dlg, (rnd_coord_t)RND_MM_TO_COORD(1)); RND_DAD_CHANGE_CB(ctx->dlg, pstklib_update_prv); RND_DAD_LABEL(ctx->dlg, ""); Index: trunk/src_plugins/dialogs/dlg_library_param.c =================================================================== --- trunk/src_plugins/dialogs/dlg_library_param.c (revision 31019) +++ trunk/src_plugins/dialogs/dlg_library_param.c (revision 31020) @@ -148,7 +148,7 @@ case RND_HATT_END: \ RND_DAD_COORD(library_ctx.pdlg, ""); \ ctx->pwid[curr] = RND_DAD_CURRENT(library_ctx.pdlg); \ - RND_DAD_MINMAX(library_ctx.pdlg, 0, PCB_MM_TO_COORD(512)); \ + RND_DAD_MINMAX(library_ctx.pdlg, 0, RND_MM_TO_COORD(512)); \ RND_DAD_CHANGE_CB(library_ctx.pdlg, library_param_cb); \ break; \ case RND_HATT_STRING: \ Index: trunk/src_plugins/dialogs/dlg_padstack.c =================================================================== --- trunk/src_plugins/dialogs/dlg_padstack.c (revision 31019) +++ trunk/src_plugins/dialogs/dlg_padstack.c (revision 31020) @@ -621,7 +621,7 @@ RND_DAD_HELP(dlg, "Make the shape smaller by the selected amount"); RND_DAD_COORD(dlg, ""); pse->amount = RND_DAD_CURRENT(dlg); - RND_DAD_MINMAX(dlg, 1, PCB_MM_TO_COORD(100)); + RND_DAD_MINMAX(dlg, 1, RND_MM_TO_COORD(100)); RND_DAD_BUTTON(dlg, "Grow"); pse->grow = RND_DAD_CURRENT(dlg); RND_DAD_CHANGE_CB(dlg, pse_shape_grow); @@ -786,7 +786,7 @@ RND_DAD_COORD(dlg, ""); pse->clearance = RND_DAD_CURRENT(dlg); RND_DAD_MINVAL(dlg, 0); - RND_DAD_MAXVAL(dlg, PCB_MM_TO_COORD(1000)); + RND_DAD_MAXVAL(dlg, RND_MM_TO_COORD(1000)); RND_DAD_CHANGE_CB(dlg, pse_chg_instance); RND_DAD_HELP(dlg, "global clearance (affects all layers)"); RND_DAD_LABEL(dlg, "Rotation"); @@ -879,7 +879,7 @@ RND_DAD_COORD(dlg, ""); pse->proto_clr[n] = RND_DAD_CURRENT(dlg); RND_DAD_MINVAL(dlg, 1); - RND_DAD_MAXVAL(dlg, PCB_MM_TO_COORD(1000)); + RND_DAD_MAXVAL(dlg, RND_MM_TO_COORD(1000)); RND_DAD_CHANGE_CB(dlg, pse_chg_proto_clr); RND_DAD_WIDTH_CHR(dlg, 8); RND_DAD_HELP(dlg, "local, per layer type clearance\n(only when global padstack clearance is 0)"); @@ -897,7 +897,7 @@ RND_DAD_COORD(dlg, ""); pse->hdia = RND_DAD_CURRENT(dlg); RND_DAD_MINVAL(dlg, 0); - RND_DAD_MAXVAL(dlg, PCB_MM_TO_COORD(1000)); + RND_DAD_MAXVAL(dlg, RND_MM_TO_COORD(1000)); RND_DAD_CHANGE_CB(dlg, pse_chg_hole); RND_DAD_WIDTH_CHR(dlg, 10); spring(dlg); @@ -956,13 +956,13 @@ RND_DAD_COORD(dlg, ""); pse->gen_size = RND_DAD_CURRENT(dlg); RND_DAD_MINVAL(dlg, 1); - RND_DAD_MAXVAL(dlg, PCB_MM_TO_COORD(1000)); + RND_DAD_MAXVAL(dlg, RND_MM_TO_COORD(1000)); RND_DAD_LABEL(dlg, "Drill diameter (0 means no hole):"); RND_DAD_COORD(dlg, ""); pse->gen_drill = RND_DAD_CURRENT(dlg); RND_DAD_MINVAL(dlg, 1); - RND_DAD_MAXVAL(dlg, PCB_MM_TO_COORD(1000)); + RND_DAD_MAXVAL(dlg, RND_MM_TO_COORD(1000)); RND_DAD_LABEL(dlg, "Copper shapes on:"); RND_DAD_ENUM(dlg, sides); Index: trunk/src_plugins/dialogs/dlg_pinout.c =================================================================== --- trunk/src_plugins/dialogs/dlg_pinout.c (revision 31019) +++ trunk/src_plugins/dialogs/dlg_pinout.c (revision 31020) @@ -74,10 +74,10 @@ rnd_rnd_box_t bbox; sprintf(tmp, "Subcircuit #%ld not found.", ctx->subc_id); bbox.X1 = bbox.Y1 = 0; - bbox.X2 = bbox.Y2 = PCB_MM_TO_COORD(10); + bbox.X2 = bbox.Y2 = RND_MM_TO_COORD(10); rnd_dad_preview_zoomto(attrib, &bbox); rnd_render->set_color(gc, rnd_color_red); - pcb_text_draw_string_simple(NULL, tmp, PCB_MM_TO_COORD(1), PCB_MM_TO_COORD(20), 100, 0, 0, 0, 0, 0, 0); + pcb_text_draw_string_simple(NULL, tmp, RND_MM_TO_COORD(1), RND_MM_TO_COORD(20), 100, 0, 0, 0, 0, 0, 0); } } Index: trunk/src_plugins/dialogs/dlg_pref_confedit.c =================================================================== --- trunk/src_plugins/dialogs/dlg_pref_confedit.c (revision 31019) +++ trunk/src_plugins/dialogs/dlg_pref_confedit.c (revision 31020) @@ -84,9 +84,9 @@ break; case RND_CFN_UNIT: { - const rnd_unit_t *u = get_unit_struct(val); + const rnd_unit_t *u = rnd_get_unit_struct(val); if (u != NULL) - hv.lng = u - pcb_units; + hv.lng = u - rnd_units; else hv.lng = -1; rnd_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wnewval, &hv); @@ -142,9 +142,9 @@ case RND_CFN_REAL: sprintf(buf, "%f", attr->val.dbl); break; case RND_CFN_COORD: rnd_snprintf(buf, sizeof(buf), "%.08$mH", attr->val.crd); break; case RND_CFN_UNIT: - if ((attr->val.lng < 0) || (attr->val.lng >= pcb_get_n_units(0))) + if ((attr->val.lng < 0) || (attr->val.lng >= rnd_get_n_units(0))) return; - val = pcb_units[attr->val.lng].suffix; + val = rnd_units[attr->val.lng].suffix; break; case RND_CFN_COLOR: val = attr->val.clr.str; break; case RND_CFN_LIST: @@ -325,7 +325,7 @@ case RND_CFN_COORD: RND_DAD_COORD(ctx->dlg, ""); ctx->wnewval = RND_DAD_CURRENT(ctx->dlg); - RND_DAD_MINMAX(ctx->dlg, -PCB_MM_TO_COORD(1000), +PCB_MM_TO_COORD(1000)); + RND_DAD_MINMAX(ctx->dlg, -RND_MM_TO_COORD(1000), +RND_MM_TO_COORD(1000)); RND_DAD_BUTTON(ctx->dlg, "apply"); RND_DAD_CHANGE_CB(ctx->dlg, pref_conf_editval_cb); b[0] = RND_DAD_CURRENT(ctx->dlg); Index: trunk/src_plugins/dialogs/dlg_pref_layer.c =================================================================== --- trunk/src_plugins/dialogs/dlg_pref_layer.c (revision 31019) +++ trunk/src_plugins/dialogs/dlg_pref_layer.c (revision 31020) @@ -50,7 +50,7 @@ void pcb_dlg_pref_layer_create(pref_ctx_t *ctx) { - rnd_rnd_box_t vbox = {0, 0, PCB_MM_TO_COORD(150), PCB_MM_TO_COORD(150)}; + rnd_rnd_box_t vbox = {0, 0, RND_MM_TO_COORD(150), RND_MM_TO_COORD(150)}; RND_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL); RND_DAD_BEGIN_VBOX(ctx->dlg); Index: trunk/src_plugins/dialogs/dlg_pref_sizes.c =================================================================== --- trunk/src_plugins/dialogs/dlg_pref_sizes.c (revision 31019) +++ trunk/src_plugins/dialogs/dlg_pref_sizes.c (revision 31020) @@ -106,13 +106,13 @@ RND_DAD_LABEL(ctx->dlg, "Width="); RND_DAD_COORD(ctx->dlg, ""); ctx->sizes.wwidth = RND_DAD_CURRENT(ctx->dlg); - RND_DAD_MINMAX(ctx->dlg, PCB_MM_TO_COORD(1), RND_MAX_COORD); + RND_DAD_MINMAX(ctx->dlg, RND_MM_TO_COORD(1), RND_MAX_COORD); RND_DAD_DEFAULT_NUM(ctx->dlg, PCB->hidlib.size_x); RND_DAD_CHANGE_CB(ctx->dlg, pref_sizes_dlg2brd); RND_DAD_LABEL(ctx->dlg, "Height="); RND_DAD_COORD(ctx->dlg, ""); ctx->sizes.wheight = RND_DAD_CURRENT(ctx->dlg); - RND_DAD_MINMAX(ctx->dlg, PCB_MM_TO_COORD(1), RND_MAX_COORD); + RND_DAD_MINMAX(ctx->dlg, RND_MM_TO_COORD(1), RND_MAX_COORD); RND_DAD_DEFAULT_NUM(ctx->dlg, PCB->hidlib.size_y); RND_DAD_CHANGE_CB(ctx->dlg, pref_sizes_dlg2brd); RND_DAD_END(ctx->dlg); Index: trunk/src_plugins/dialogs/dlg_test.c =================================================================== --- trunk/src_plugins/dialogs/dlg_test.c (revision 31019) +++ trunk/src_plugins/dialogs/dlg_test.c (revision 31020) @@ -149,7 +149,7 @@ RND_DAD_LABEL(ctx.dlg, "CRD:"); RND_DAD_SPIN_COORD(ctx.dlg); ctx.wspin_coord = RND_DAD_CURRENT(ctx.dlg); - RND_DAD_DEFAULT_NUM(ctx.dlg, PCB_MM_TO_COORD(42)); + RND_DAD_DEFAULT_NUM(ctx.dlg, RND_MM_TO_COORD(42)); RND_DAD_CHANGE_CB(ctx.dlg, pcb_act_spin_upd); RND_DAD_LABEL(ctx.dlg, "->"); RND_DAD_LABEL(ctx.dlg, "n/a"); @@ -305,7 +305,7 @@ hv.lng = 42; hv.dbl = 42.0; - hv.crd = PCB_MM_TO_COORD(42); + hv.crd = RND_MM_TO_COORD(42); rnd_gui->attr_dlg_set_value(hid_ctx, ctx->wspin_int, &hv); rnd_gui->attr_dlg_set_value(hid_ctx, ctx->wspin_double, &hv); @@ -511,7 +511,7 @@ static void prv_expose(rnd_hid_attribute_t *attrib, rnd_hid_preview_t *prv, rnd_hid_gc_t gc, const rnd_hid_expose_ctx_t *e) { rnd_render->set_color(gc, rnd_color_red); - pcb_text_draw_string_simple(NULL, "foo", PCB_MM_TO_COORD(1), PCB_MM_TO_COORD(20), 500, 10.0, 0, 0, 0, 0, 0); + pcb_text_draw_string_simple(NULL, "foo", RND_MM_TO_COORD(1), RND_MM_TO_COORD(20), 500, 10.0, 0, 0, 0, 0, 0); printf("expose in dlg_test!\n"); } Index: trunk/src_plugins/draw_csect/draw_csect.c =================================================================== --- trunk/src_plugins/draw_csect/draw_csect.c (revision 31019) +++ trunk/src_plugins/draw_csect/draw_csect.c (revision 31020) @@ -76,8 +76,8 @@ memset(&t, 0, sizeof(t)); - t.X = PCB_MM_TO_COORD(x); - t.Y = PCB_MM_TO_COORD(y); + t.X = RND_MM_TO_COORD(x); + t.Y = RND_MM_TO_COORD(y); t.TextString = (char *)txt; t.rot = 90.0*dir; t.Scale = scale; @@ -112,8 +112,8 @@ memset(&t, 0, sizeof(t)); - t.X = PCB_MM_TO_COORD(x); - t.Y = PCB_MM_TO_COORD(y); + t.X = RND_MM_TO_COORD(x); + t.Y = RND_MM_TO_COORD(y); t.TextString = (char *)txt; t.rot = 90.0 * dir; t.Scale = scale; @@ -136,11 +136,11 @@ { pcb_line_t l; memset(&l, 0, sizeof(l)); - l.Point1.X = PCB_MM_TO_COORD(x1); - l.Point1.Y = PCB_MM_TO_COORD(y1); - l.Point2.X = PCB_MM_TO_COORD(x2); - l.Point2.Y = PCB_MM_TO_COORD(y2); - l.Thickness = PCB_MM_TO_COORD(thick); + l.Point1.X = RND_MM_TO_COORD(x1); + l.Point1.Y = RND_MM_TO_COORD(y1); + l.Point2.X = RND_MM_TO_COORD(x2); + l.Point2.Y = RND_MM_TO_COORD(y2); + l.Thickness = RND_MM_TO_COORD(thick); if (l.Thickness == 0) l.Thickness = 1; pcb_line_draw_(&def_info, &l, 0); @@ -155,7 +155,7 @@ l.Point1.Y = y1; l.Point2.X = x2; l.Point2.Y = y2; - l.Thickness = PCB_MM_TO_COORD(thick); + l.Thickness = RND_MM_TO_COORD(thick); if (l.Thickness == 0) l.Thickness = 1; pcb_line_draw_(&def_info, &l, 0); @@ -322,12 +322,12 @@ pcb_text_t *t; t = dtext_bg(gc, x, y, 200, 0, label, &COLOR_BG, &COLOR_ANNOT); pcb_text_bbox(pcb_font(PCB, 0, 1), t); - dhrect(PCB_COORD_TO_MM(t->BoundingBox.X1), y, PCB_COORD_TO_MM(t->BoundingBox.X2)+1, y+4, 0.25, 0, 0, 0, OMIT_NONE); + dhrect(RND_COORD_TO_MM(t->BoundingBox.X1), y, RND_COORD_TO_MM(t->BoundingBox.X2)+1, y+4, 0.25, 0, 0, 0, OMIT_NONE); box->X1 = t->BoundingBox.X1; - box->Y1 = PCB_MM_TO_COORD(y); - box->X2 = t->BoundingBox.X2+PCB_MM_TO_COORD(1); - box->Y2 = PCB_MM_TO_COORD(y+4); - return PCB_COORD_TO_MM(box->X2); + box->Y1 = RND_MM_TO_COORD(y); + box->X2 = t->BoundingBox.X2+RND_MM_TO_COORD(1); + box->Y2 = RND_MM_TO_COORD(y+4); + return RND_COORD_TO_MM(box->X2); } static int is_button(int x, int y, const rnd_rnd_box_t *box) @@ -355,7 +355,7 @@ static void mark_grp(rnd_coord_t y, unsigned int accept_mask, mark_grp_loc_t loc) { - rnd_coord_t y1, y2, x0 = -PCB_MM_TO_COORD(5); + rnd_coord_t y1, y2, x0 = -RND_MM_TO_COORD(5); rnd_layergrp_id_t g; g = get_group_coords(y, &y1, &y2); @@ -364,14 +364,14 @@ gactive = g; switch(loc) { case MARK_GRP_FRAME: - dline_(x0, y1, PCB_MM_TO_COORD(200), y1, 0.1); - dline_(x0, y2, PCB_MM_TO_COORD(200), y2, 0.1); + dline_(x0, y1, RND_MM_TO_COORD(200), y1, 0.1); + dline_(x0, y2, RND_MM_TO_COORD(200), y2, 0.1); break; case MARK_GRP_MIDDLE: - dline_(x0, (y1+y2)/2, PCB_MM_TO_COORD(200), (y1+y2)/2, 0.1); + dline_(x0, (y1+y2)/2, RND_MM_TO_COORD(200), (y1+y2)/2, 0.1); break; case MARK_GRP_TOP: - dline_(x0, y1, PCB_MM_TO_COORD(200), y1, 0.1); + dline_(x0, y1, RND_MM_TO_COORD(200), y1, 0.1); break; } } @@ -395,8 +395,8 @@ lactive = get_layer_coords(x, y); if (lactive >= 0) { dhrect( - PCB_COORD_TO_MM(layer_crd[lactive].X1)-1, PCB_COORD_TO_MM(layer_crd[lactive].Y1)-1, - PCB_COORD_TO_MM(layer_crd[lactive].X2)+1, PCB_COORD_TO_MM(layer_crd[lactive].Y2)+1, + RND_COORD_TO_MM(layer_crd[lactive].X1)-1, RND_COORD_TO_MM(layer_crd[lactive].Y1)-1, + RND_COORD_TO_MM(layer_crd[lactive].X2)+1, RND_COORD_TO_MM(layer_crd[lactive].Y2)+1, 0.1, 0.1, 3, 3, 0 ); } @@ -413,7 +413,7 @@ g = &PCB->LayerGroups.grp[gactive]; - tx = layer_crd[g->lid[0]].X1 - PCB_MM_TO_COORD(1.5); + tx = layer_crd[g->lid[0]].X1 - RND_MM_TO_COORD(1.5); ty1 = layer_crd[g->lid[0]].Y1; ty2 = layer_crd[g->lid[0]].Y2; @@ -424,16 +424,16 @@ break; } } - dline_(tx, ty1-PCB_MM_TO_COORD(1.5), tx-PCB_MM_TO_COORD(0.75), ty2+PCB_MM_TO_COORD(1.5), 0.1); - dline_(tx, ty1-PCB_MM_TO_COORD(1.5), tx+PCB_MM_TO_COORD(0.75), ty2+PCB_MM_TO_COORD(1.5), 0.1); + dline_(tx, ty1-RND_MM_TO_COORD(1.5), tx-RND_MM_TO_COORD(0.75), ty2+RND_MM_TO_COORD(1.5), 0.1); + dline_(tx, ty1-RND_MM_TO_COORD(1.5), tx+RND_MM_TO_COORD(0.75), ty2+RND_MM_TO_COORD(1.5), 0.1); lactive_idx++; } static void draw_hover_label(rnd_hid_gc_t gc, const char *str) { - int x0 = PCB_MM_TO_COORD(2.5); /* compensate for the mouse cursor (sort of random) */ + int x0 = RND_MM_TO_COORD(2.5); /* compensate for the mouse cursor (sort of random) */ rnd_render->set_color(gc, &COLOR_ANNOT); - dtext_(cx+x0, cy, 250, 0, str, PCB_MM_TO_COORD(0.01)); + dtext_(cx+x0, cy, 250, 0, str, RND_MM_TO_COORD(0.01)); } /* Draw the cross-section layer */ @@ -502,7 +502,7 @@ rnd_render->set_color(gc, color); dhrect(0, y, GROUP_WIDTH_MM, y+th, 1, 0.5, stepf, stepb, OMIT_LEFT | OMIT_RIGHT); dtext_bg(gc, 5, y, 200, 0, g->name, &COLOR_BG, &COLOR_ANNOT); - reg_group_coords(gid, PCB_MM_TO_COORD(y), PCB_MM_TO_COORD(y+th)); + reg_group_coords(gid, RND_MM_TO_COORD(y), RND_MM_TO_COORD(y+th)); /* draw layer names */ @@ -519,7 +519,7 @@ t = dtext_bg(gc, x, y, 200, 0, l->name, &COLOR_BG, &l->meta.real.color); pcb_text_bbox(pcb_font(PCB, 0, 1), t); if (l->comb & PCB_LYC_SUB) { - dhrect(PCB_COORD_TO_MM(t->BoundingBox.X1), y, PCB_COORD_TO_MM(t->BoundingBox.X2)+1, y+4, 1.2, 0, 0, 0, OMIT_NONE); + dhrect(RND_COORD_TO_MM(t->BoundingBox.X1), y, RND_COORD_TO_MM(t->BoundingBox.X2)+1, y+4, 1.2, 0, 0, 0, OMIT_NONE); redraw_text = 1; } @@ -528,13 +528,13 @@ pcb_text_bbox(pcb_font(PCB, 0, 1), t); } else - dhrect(PCB_COORD_TO_MM(t->BoundingBox.X1), y, PCB_COORD_TO_MM(t->BoundingBox.X2)+1, y+4, 0.25, 0, 0, 0, OMIT_NONE); + dhrect(RND_COORD_TO_MM(t->BoundingBox.X1), y, RND_COORD_TO_MM(t->BoundingBox.X2)+1, y+4, 0.25, 0, 0, 0, OMIT_NONE); if (l->comb & PCB_LYC_AUTO) - dhrect(PCB_COORD_TO_MM(t->BoundingBox.X1), y, PCB_COORD_TO_MM(t->BoundingBox.X2)+1, y+4, 0.0, 0, 3, 0, OMIT_ALL); + dhrect(RND_COORD_TO_MM(t->BoundingBox.X1), y, RND_COORD_TO_MM(t->BoundingBox.X2)+1, y+4, 0.0, 0, 3, 0, OMIT_ALL); - reg_layer_coords(lid, t->BoundingBox.X1, PCB_MM_TO_COORD(y), t->BoundingBox.X2+PCB_MM_TO_COORD(1), PCB_MM_TO_COORD(y+4)); - x += PCB_COORD_TO_MM(t->BoundingBox.X2 - t->BoundingBox.X1) + 3; + reg_layer_coords(lid, t->BoundingBox.X1, RND_MM_TO_COORD(y), t->BoundingBox.X2+RND_MM_TO_COORD(1), RND_MM_TO_COORD(y+4)); + x += RND_COORD_TO_MM(t->BoundingBox.X2 - t->BoundingBox.X1) + 3; } } @@ -552,19 +552,19 @@ rnd_render->set_color(gc, &l->meta.real.color); t = dtext_bg(gc, 1, y, 200, 0, l->name, &COLOR_BG, &l->meta.real.color); pcb_text_bbox(pcb_font(PCB, 0, 1), t); - dhrect(PCB_COORD_TO_MM(t->BoundingBox.X1), y, PCB_COORD_TO_MM(t->BoundingBox.X2)+1, y+4, 1, 0, 0, 0, OMIT_NONE); + dhrect(RND_COORD_TO_MM(t->BoundingBox.X1), y, RND_COORD_TO_MM(t->BoundingBox.X2)+1, y+4, 1, 0, 0, 0, OMIT_NONE); dtext_bg(gc, 1, y, 200, 0, l->name, &COLOR_BG, &l->meta.real.color); - reg_layer_coords(g->lid[0], t->BoundingBox.X1, PCB_MM_TO_COORD(y), t->BoundingBox.X2+PCB_MM_TO_COORD(1), PCB_MM_TO_COORD(y+4)); + reg_layer_coords(g->lid[0], t->BoundingBox.X1, RND_MM_TO_COORD(y), t->BoundingBox.X2+RND_MM_TO_COORD(1), RND_MM_TO_COORD(y+4)); } else { rnd_render->set_color(gc, &COLOR_OUTLINE); t = dtext_bg(gc, 1, y, 200, 0, "", &COLOR_BG, &COLOR_OUTLINE); pcb_text_bbox(pcb_font(PCB, 0, 1), t); - dhrect(PCB_COORD_TO_MM(t->BoundingBox.X1), y, PCB_COORD_TO_MM(t->BoundingBox.X2)+1, y+4, 1, 0, 0, 0, OMIT_NONE); + dhrect(RND_COORD_TO_MM(t->BoundingBox.X1), y, RND_COORD_TO_MM(t->BoundingBox.X2)+1, y+4, 1, 0, 0, 0, OMIT_NONE); dtext_bg(gc, 1, y, 200, 0, "", &COLOR_BG, &COLOR_OUTLINE); } dline(0, ystart, 0, y+4, 1); - reg_outline_coords(t->BoundingBox.X1, PCB_MM_TO_COORD(y), t->BoundingBox.X2, PCB_MM_TO_COORD(y+4)); + reg_outline_coords(t->BoundingBox.X1, RND_MM_TO_COORD(y), t->BoundingBox.X2, RND_MM_TO_COORD(y+4)); } else { create_button(gc, 2, y, "Create outline", &btn_addoutline); @@ -721,7 +721,7 @@ break; } - if ((x > 0) && (x < PCB_MM_TO_COORD(GROUP_WIDTH_MM))) { + if ((x > 0) && (x < RND_MM_TO_COORD(GROUP_WIDTH_MM))) { rnd_coord_t tmp; rnd_layergrp_id_t gid; gid = get_group_coords(y, &tmp, &tmp); @@ -878,7 +878,7 @@ pcb_layervis_change_group_vis(&PCB->hidlib, lid, 1, 1); rnd_actionva(&PCB->hidlib, "Popup", "layer", NULL); } - else if ((x > 0) && (x < PCB_MM_TO_COORD(GROUP_WIDTH_MM))) { + else if ((x > 0) && (x < RND_MM_TO_COORD(GROUP_WIDTH_MM))) { rnd_coord_t tmp; pcb_actd_EditGroup_gid = get_group_coords(y, &tmp, &tmp); if (pcb_actd_EditGroup_gid >= 0) Index: trunk/src_plugins/draw_fab/draw_fab.c =================================================================== --- trunk/src_plugins/draw_fab/draw_fab.c (revision 31019) +++ trunk/src_plugins/draw_fab/draw_fab.c (revision 31020) @@ -55,10 +55,10 @@ * prints a FAB drawing. */ -#define TEXT_SIZE PCB_MIL_TO_COORD(150) -#define TEXT_LINE PCB_MIL_TO_COORD(150) -#define DRILL_MARK_SIZE PCB_MIL_TO_COORD(16) -#define FAB_LINE_W PCB_MIL_TO_COORD(8) +#define TEXT_SIZE RND_MIL_TO_COORD(150) +#define TEXT_LINE RND_MIL_TO_COORD(150) +#define DRILL_MARK_SIZE RND_MIL_TO_COORD(16) +#define FAB_LINE_W RND_MIL_TO_COORD(8) static void fab_line(rnd_hid_gc_t gc, int x1, int y1, int x2, int y2) { @@ -84,7 +84,7 @@ va_end(a); memset(&t, 0, sizeof(t)); t.TextString = tmp; - t.Scale = PCB_COORD_TO_MIL(TEXT_SIZE); /* pcnt of 100mil base height */ + t.Scale = RND_COORD_TO_MIL(TEXT_SIZE); /* pcnt of 100mil base height */ t.Flags = pcb_no_flags(); t.fid = 0; /* use the default font */ t.X = x; @@ -98,8 +98,8 @@ pcb_text_draw_(info, &t, 0,0, PCB_TXT_TINY_ACCURATE); if (align & 8) fab_line(gc, t.X, - t.Y + PCB_SCALE_TEXT(font->MaxHeight, t.Scale) + PCB_MIL_TO_COORD(10), - t.X + w, t.Y + PCB_SCALE_TEXT(font->MaxHeight, t.Scale) + PCB_MIL_TO_COORD(10)); + t.Y + PCB_SCALE_TEXT(font->MaxHeight, t.Scale) + RND_MIL_TO_COORD(10), + t.X + w, t.Y + PCB_SCALE_TEXT(font->MaxHeight, t.Scale) + RND_MIL_TO_COORD(10)); } /* Y, +, X, circle, square */ @@ -178,7 +178,7 @@ static void draw_fab_layer(pcb_draw_info_t *info, rnd_hid_gc_t gc, const rnd_hid_expose_ctx_t *e, pcb_layer_t *layer, int found) { - rnd_hid_set_line_width(gc, PCB_MIL_TO_COORD(10)); + rnd_hid_set_line_width(gc, RND_MIL_TO_COORD(10)); PCB_LINE_LOOP(layer); { rnd_render->draw_line(gc, line->Point1.X, line->Point1.Y, line->Point2.X, line->Point2.Y); @@ -196,7 +196,7 @@ PCB_END_LOOP; if (!found) { rnd_hid_set_line_width(gc, FAB_LINE_W); - text_at(info, gc, PCB->hidlib.size_x / 2, PCB->hidlib.size_y + PCB_MIL_TO_COORD(20), 1, "Board outline is the centerline of this path"); + text_at(info, gc, PCB->hidlib.size_x / 2, PCB->hidlib.size_y + RND_MIL_TO_COORD(20), 1, "Board outline is the centerline of this path"); } } @@ -208,9 +208,9 @@ AllDrills = drill_get_info(PCB->Data); if (rnd_conf.editor.grid_unit->family == PCB_UNIT_IMPERIAL) - drill_round_info(AllDrills, PCB_MIL_TO_COORD(1)); + drill_round_info(AllDrills, RND_MIL_TO_COORD(1)); else - drill_round_info(AllDrills, PCB_MM_TO_COORD(0.01)); + drill_round_info(AllDrills, RND_MM_TO_COORD(0.01)); yoff = -TEXT_LINE; /* count how many drill description lines will be needed */ @@ -251,8 +251,8 @@ } if (plated_sym != -1) { drill_sym(gc, plated_sym, TEXT_SIZE, yoff + TEXT_SIZE / 4); - text_at(info, gc, PCB_MIL_TO_COORD(1350), yoff, PCB_MIL_TO_COORD(2), "YES"); - text_at(info, gc, PCB_MIL_TO_COORD(980), yoff, PCB_MIL_TO_COORD(2), "%d", drill->PinCount + drill->ViaCount - drill->UnplatedCount); + text_at(info, gc, RND_MIL_TO_COORD(1350), yoff, RND_MIL_TO_COORD(2), "YES"); + text_at(info, gc, RND_MIL_TO_COORD(980), yoff, RND_MIL_TO_COORD(2), "%d", drill->PinCount + drill->ViaCount - drill->UnplatedCount); if (unplated_sym != -1) yoff -= TEXT_LINE; @@ -259,19 +259,19 @@ } if (unplated_sym != -1) { drill_sym(gc, unplated_sym, TEXT_SIZE, yoff + TEXT_SIZE / 4); - text_at(info, gc, PCB_MIL_TO_COORD(1400), yoff, PCB_MIL_TO_COORD(2), "NO"); - text_at(info, gc, PCB_MIL_TO_COORD(980), yoff, PCB_MIL_TO_COORD(2), "%d", drill->UnplatedCount); + text_at(info, gc, RND_MIL_TO_COORD(1400), yoff, RND_MIL_TO_COORD(2), "NO"); + text_at(info, gc, RND_MIL_TO_COORD(980), yoff, RND_MIL_TO_COORD(2), "%d", drill->UnplatedCount); } rnd_render->set_color(gc, &conf_core.appearance.color.element); if (rnd_conf.editor.grid_unit->family == PCB_UNIT_IMPERIAL) - text_at(info, gc, PCB_MIL_TO_COORD(450), yoff, PCB_MIL_TO_COORD(2), "%0.3f", PCB_COORD_TO_INCH(drill->DrillSize)); + text_at(info, gc, RND_MIL_TO_COORD(450), yoff, RND_MIL_TO_COORD(2), "%0.3f", RND_COORD_TO_INCH(drill->DrillSize)); else - text_at(info, gc, PCB_MIL_TO_COORD(450), yoff, PCB_MIL_TO_COORD(2), "%1.2f", PCB_COORD_TO_MM(drill->DrillSize)); + text_at(info, gc, RND_MIL_TO_COORD(450), yoff, RND_MIL_TO_COORD(2), "%1.2f", RND_COORD_TO_MM(drill->DrillSize)); if (plated_sym != -1 && unplated_sym != -1) { if (rnd_conf.editor.grid_unit->family == PCB_UNIT_IMPERIAL) - text_at(info, gc, PCB_MIL_TO_COORD(450), yoff + TEXT_LINE, PCB_MIL_TO_COORD(2), "%0.3f", PCB_COORD_TO_INCH(drill->DrillSize)); + text_at(info, gc, RND_MIL_TO_COORD(450), yoff + TEXT_LINE, RND_MIL_TO_COORD(2), "%0.3f", RND_COORD_TO_INCH(drill->DrillSize)); else - text_at(info, gc, PCB_MIL_TO_COORD(450), yoff + TEXT_LINE, PCB_MIL_TO_COORD(2), "%1.2f", PCB_COORD_TO_MM(drill->DrillSize)); + text_at(info, gc, RND_MIL_TO_COORD(450), yoff + TEXT_LINE, RND_MIL_TO_COORD(2), "%1.2f", RND_COORD_TO_MM(drill->DrillSize)); } yoff -= TEXT_LINE; total_drills += drill->PinCount; @@ -279,13 +279,13 @@ } rnd_render->set_color(gc, &conf_core.appearance.color.element); - text_at(info, gc, 0, yoff, PCB_MIL_TO_COORD(9), "Symbol"); + text_at(info, gc, 0, yoff, RND_MIL_TO_COORD(9), "Symbol"); if (rnd_conf.editor.grid_unit->family == PCB_UNIT_IMPERIAL) - text_at(info, gc, PCB_MIL_TO_COORD(410), yoff, PCB_MIL_TO_COORD(9), "Diam. (Inch)"); + text_at(info, gc, RND_MIL_TO_COORD(410), yoff, RND_MIL_TO_COORD(9), "Diam. (Inch)"); else - text_at(info, gc, PCB_MIL_TO_COORD(410), yoff, PCB_MIL_TO_COORD(9), "Diam. (mm)"); - text_at(info, gc, PCB_MIL_TO_COORD(950), yoff, PCB_MIL_TO_COORD(9), "Count"); - text_at(info, gc, PCB_MIL_TO_COORD(1300), yoff, PCB_MIL_TO_COORD(9), "Plated?"); + text_at(info, gc, RND_MIL_TO_COORD(410), yoff, RND_MIL_TO_COORD(9), "Diam. (mm)"); + text_at(info, gc, RND_MIL_TO_COORD(950), yoff, RND_MIL_TO_COORD(9), "Count"); + text_at(info, gc, RND_MIL_TO_COORD(1300), yoff, RND_MIL_TO_COORD(9), "Plated?"); yoff -= TEXT_LINE; text_at(info, gc, 0, yoff, 0, "There are %d different drill sizes used in this layout, %d holes total", AllDrills->DrillN, total_drills); @@ -307,7 +307,7 @@ } } if (!found) { - rnd_hid_set_line_width(gc, PCB_MIL_TO_COORD(10)); + rnd_hid_set_line_width(gc, RND_MIL_TO_COORD(10)); rnd_render->draw_line(gc, 0, 0, PCB->hidlib.size_x, 0); rnd_render->draw_line(gc, 0, 0, 0, PCB->hidlib.size_y); rnd_render->draw_line(gc, PCB->hidlib.size_x, 0, PCB->hidlib.size_x, PCB->hidlib.size_y); @@ -314,20 +314,20 @@ rnd_render->draw_line(gc, 0, PCB->hidlib.size_y, PCB->hidlib.size_x, PCB->hidlib.size_y); /*FPrintOutline (); */ rnd_hid_set_line_width(gc, FAB_LINE_W); - text_at(info, gc, PCB_MIL_TO_COORD(2000), yoff, 0, - "Maximum Dimensions: %f mils wide, %f mils high", PCB_COORD_TO_MIL(PCB->hidlib.size_x), PCB_COORD_TO_MIL(PCB->hidlib.size_y)); - text_at(info, gc, PCB->hidlib.size_x / 2, PCB->hidlib.size_y + PCB_MIL_TO_COORD(20), 1, + text_at(info, gc, RND_MIL_TO_COORD(2000), yoff, 0, + "Maximum Dimensions: %f mils wide, %f mils high", RND_COORD_TO_MIL(PCB->hidlib.size_x), RND_COORD_TO_MIL(PCB->hidlib.size_y)); + text_at(info, gc, PCB->hidlib.size_x / 2, PCB->hidlib.size_y + RND_MIL_TO_COORD(20), 1, "Board outline is the centerline of this %f mil" " rectangle - 0,0 to %f,%f mils", - PCB_COORD_TO_MIL(FAB_LINE_W), PCB_COORD_TO_MIL(PCB->hidlib.size_x), PCB_COORD_TO_MIL(PCB->hidlib.size_y)); + RND_COORD_TO_MIL(FAB_LINE_W), RND_COORD_TO_MIL(PCB->hidlib.size_x), RND_COORD_TO_MIL(PCB->hidlib.size_y)); } yoff -= TEXT_LINE; - text_at(info, gc, PCB_MIL_TO_COORD(2000), yoff, 0, "Date: %s", utcTime); + text_at(info, gc, RND_MIL_TO_COORD(2000), yoff, 0, "Date: %s", utcTime); yoff -= TEXT_LINE; - text_at(info, gc, PCB_MIL_TO_COORD(2000), yoff, 0, "Author: %s", pcb_author()); + text_at(info, gc, RND_MIL_TO_COORD(2000), yoff, 0, "Author: %s", pcb_author()); yoff -= TEXT_LINE; - text_at(info, gc, PCB_MIL_TO_COORD(2000), yoff, 0, "Title: %s - Fabrication Drawing", RND_UNKNOWN(PCB->hidlib.name)); + text_at(info, gc, RND_MIL_TO_COORD(2000), yoff, 0, "Title: %s - Fabrication Drawing", RND_UNKNOWN(PCB->hidlib.name)); } int pplg_check_ver_draw_fab(int ver_needed) { return 0; } Index: trunk/src_plugins/draw_fontsel/draw_fontsel.c =================================================================== --- trunk/src_plugins/draw_fontsel/draw_fontsel.c (revision 31019) +++ trunk/src_plugins/draw_fontsel/draw_fontsel.c (revision 31020) @@ -56,8 +56,8 @@ if (dinfo.xform == NULL) dinfo.xform = &dxform; - t.X = PCB_MM_TO_COORD(x); - t.Y = PCB_MM_TO_COORD(y); + t.X = RND_MM_TO_COORD(x); + t.Y = RND_MM_TO_COORD(y); t.TextString = (char *)txt; t.rot = 0; t.Scale = scale; @@ -74,11 +74,11 @@ if (dinfo.xform == NULL) dinfo.xform = &dxform; - l.Point1.X = PCB_MM_TO_COORD(x1); - l.Point1.Y = PCB_MM_TO_COORD(y1); - l.Point2.X = PCB_MM_TO_COORD(x2); - l.Point2.Y = PCB_MM_TO_COORD(y2); - l.Thickness = PCB_MM_TO_COORD(thick); + l.Point1.X = RND_MM_TO_COORD(x1); + l.Point1.Y = RND_MM_TO_COORD(y1); + l.Point2.X = RND_MM_TO_COORD(x2); + l.Point2.Y = RND_MM_TO_COORD(y2); + l.Thickness = RND_MM_TO_COORD(thick); pcb_line_draw_(&dinfo, &l, 0); } @@ -125,7 +125,7 @@ t = dtext(x, *y, 200, f->id, buf); pcb_text_bbox(pcb_font(PCB, f->id, 1), t); - *y += rnd_round(PCB_COORD_TO_MM(t->BoundingBox.Y2 - t->BoundingBox.Y1) + 0.5); + *y += rnd_round(RND_COORD_TO_MM(t->BoundingBox.Y2 - t->BoundingBox.Y1) + 0.5); if (font_coords < MAX_FONT) { font_coord[font_coords].y1 = y_old; @@ -167,7 +167,7 @@ switch(kind) { case RND_HID_MOUSE_PRESS: - ymm = PCB_COORD_TO_MM(y); + ymm = RND_COORD_TO_MM(y); fid = lookup_fid_for_coord(ymm); if (fid >= 0) { if (txt == NULL) { Index: trunk/src_plugins/export_dsn/dsn.c =================================================================== --- trunk/src_plugins/export_dsn/dsn.c (revision 31019) +++ trunk/src_plugins/export_dsn/dsn.c (revision 31020) @@ -83,17 +83,17 @@ RND_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0}, #define HA_dsnfile 0 {"trackwidth", "track width in mils", - RND_HATT_COORD, PCB_MIL_TO_COORD(0), PCB_MIL_TO_COORD(100), {0, 0, 0, PCB_MIL_TO_COORD(8)}, 0, 0}, + RND_HATT_COORD, RND_MIL_TO_COORD(0), RND_MIL_TO_COORD(100), {0, 0, 0, RND_MIL_TO_COORD(8)}, 0, 0}, #define HA_trackwidth 1 {"clearance", "clearance in mils", - RND_HATT_COORD, PCB_MIL_TO_COORD(0), PCB_MIL_TO_COORD(100), {0, 0, 0, PCB_MIL_TO_COORD(8)}, 0, 0}, + RND_HATT_COORD, RND_MIL_TO_COORD(0), RND_MIL_TO_COORD(100), {0, 0, 0, RND_MIL_TO_COORD(8)}, 0, 0}, #define HA_clearance 2 {"viawidth", "via width in mils", - RND_HATT_COORD, PCB_MIL_TO_COORD(0), PCB_MIL_TO_COORD(100), {0, 0, 0, PCB_MIL_TO_COORD(27)}, 0, + RND_HATT_COORD, RND_MIL_TO_COORD(0), RND_MIL_TO_COORD(100), {0, 0, 0, RND_MIL_TO_COORD(27)}, 0, 0}, #define HA_viawidth 3 {"viadrill", "via drill diameter in mils", - RND_HATT_COORD, PCB_MIL_TO_COORD(0), PCB_MIL_TO_COORD(100), {0, 0, 0, PCB_MIL_TO_COORD(15)}, 0, + RND_HATT_COORD, RND_MIL_TO_COORD(0), RND_MIL_TO_COORD(100), {0, 0, 0, RND_MIL_TO_COORD(15)}, 0, 0}, #define HA_viadrill 4 {"cam", "CAM instruction", Index: trunk/src_plugins/export_dxf/dxf_draw.c =================================================================== --- trunk/src_plugins/export_dxf/dxf_draw.c (revision 31019) +++ trunk/src_plugins/export_dxf/dxf_draw.c (revision 31020) @@ -45,7 +45,7 @@ if (ctx->enable_force_thin && ctx->force_thin) fprintf(ctx->f, "370\n1\n"); else - fprintf(ctx->f, "370\n%d\n", (int)rnd_round(PCB_COORD_TO_MM(gc->width)*100.0)); + fprintf(ctx->f, "370\n%d\n", (int)rnd_round(RND_COORD_TO_MM(gc->width)*100.0)); } static void dxf_hatch_pre(dxf_ctx_t *ctx, rnd_hid_gc_t gc, int n_coords) Index: trunk/src_plugins/export_fidocadj/fidocadj.c =================================================================== --- trunk/src_plugins/export_fidocadj/fidocadj.c (revision 31019) +++ trunk/src_plugins/export_fidocadj/fidocadj.c (revision 31020) @@ -129,7 +129,7 @@ static long int crd(rnd_coord_t c) { - return rnd_round((double)PCB_COORD_TO_MIL(c) / 5.0); + return rnd_round((double)RND_COORD_TO_MIL(c) / 5.0); } static int layer_map(unsigned int lflg, int *fidoly_next, const char *lyname) Index: trunk/src_plugins/export_gcode/gcode.c =================================================================== --- trunk/src_plugins/export_gcode/gcode.c (revision 31019) +++ trunk/src_plugins/export_gcode/gcode.c (revision 31020) @@ -77,19 +77,19 @@ #define HA_mech_script 3 {"mill-depth", "Milling depth on layers", - RND_HATT_COORD, PCB_MM_TO_COORD(-10), PCB_MM_TO_COORD(100), {0, 0, 0, PCB_MM_TO_COORD(-0.05)}, 0}, + RND_HATT_COORD, RND_MM_TO_COORD(-10), RND_MM_TO_COORD(100), {0, 0, 0, RND_MM_TO_COORD(-0.05)}, 0}, #define HA_layerdepth 4 {"total-cut-depth", "Total milling depth when cutting through the board (if 0, use pcb thickness)", - RND_HATT_COORD, PCB_MM_TO_COORD(-10), PCB_MM_TO_COORD(100), {0, 0, 0, PCB_MM_TO_COORD(-1.6)}, 0}, + RND_HATT_COORD, RND_MM_TO_COORD(-10), RND_MM_TO_COORD(100), {0, 0, 0, RND_MM_TO_COORD(-1.6)}, 0}, #define HA_totalcutdepth 5 {"cut-depth", "Milling depth increment in each pass", - RND_HATT_COORD, PCB_MM_TO_COORD(-10), PCB_MM_TO_COORD(100), {0, 0, 0, PCB_MM_TO_COORD(0.5)}, 0}, + RND_HATT_COORD, RND_MM_TO_COORD(-10), RND_MM_TO_COORD(100), {0, 0, 0, RND_MM_TO_COORD(0.5)}, 0}, #define HA_cutdepth 6 {"safe-Z", "Safe Z (above the board) for traverse move", - RND_HATT_COORD, PCB_MM_TO_COORD(-10), PCB_MM_TO_COORD(100), {0, 0, 0, PCB_MM_TO_COORD(0.5)}, 0}, + RND_HATT_COORD, RND_MM_TO_COORD(-10), RND_MM_TO_COORD(100), {0, 0, 0, RND_MM_TO_COORD(0.5)}, 0}, #define HA_safeZ 7 {"cam", "CAM instruction", @@ -256,8 +256,8 @@ pcb_layergrp_t *grp = &gctx.pcb->LayerGroups.grp[group]; static pcb_tlp_session_t tctx; static rnd_coord_t tool_dias[] = { - PCB_MM_TO_COORD(0.2), - PCB_MM_TO_COORD(3) + RND_MM_TO_COORD(0.2), + RND_MM_TO_COORD(3) }; static pcb_tlp_tools_t tools = { sizeof(tool_dias)/sizeof(tool_dias[0]), tool_dias}; @@ -311,7 +311,7 @@ script = gcode_values[script_ha].str; memset(&tctx, 0, sizeof(tctx)); - tctx.edge_clearance = PCB_MM_TO_COORD(0.05); + tctx.edge_clearance = RND_MM_TO_COORD(0.05); tctx.tools = &tools; pcb_tlp_mill_script(gctx.pcb, &tctx, grp, script); Index: trunk/src_plugins/export_gerber/gerber.c =================================================================== --- trunk/src_plugins/export_gerber/gerber.c (revision 31019) +++ trunk/src_plugins/export_gerber/gerber.c (revision 31020) @@ -110,7 +110,7 @@ } } -#define AUTO_OUTLINE_WIDTH PCB_MIL_TO_COORD(8) /* Auto-geneated outline width of 8 mils */ +#define AUTO_OUTLINE_WIDTH RND_MIL_TO_COORD(8) /* Auto-geneated outline width of 8 mils */ /* Set the aperture list for the current layer, * expanding the list buffer if needed */ Index: trunk/src_plugins/export_openems/export_openems.c =================================================================== --- trunk/src_plugins/export_openems/export_openems.c (revision 31019) +++ trunk/src_plugins/export_openems/export_openems.c (revision 31020) @@ -91,7 +91,7 @@ static wctx_t *ems_ctx; static int openems_ovr; -#define THMAX PCB_MM_TO_COORD(100) +#define THMAX RND_MM_TO_COORD(100) rnd_export_opt_t openems_attribute_list[] = { {"outfile", "Graphics output file", @@ -99,11 +99,11 @@ #define HA_openemsfile 0 {"def-copper-thick", "Default copper thickness", - RND_HATT_COORD, 0, THMAX, {0, 0, 0, PCB_MM_TO_COORD(0.035)}, 0, 0}, + RND_HATT_COORD, 0, THMAX, {0, 0, 0, RND_MM_TO_COORD(0.035)}, 0, 0}, #define HA_def_copper_thick 1 {"def-substrate-thick", "Default substrate thickness", - RND_HATT_COORD, 0, THMAX, {0, 0, 0, PCB_MM_TO_COORD(0.8)}, 0, 0}, + RND_HATT_COORD, 0, THMAX, {0, 0, 0, RND_MM_TO_COORD(0.8)}, 0, 0}, #define HA_def_substrate_thick 2 {"def-copper-cond", "Default copper conductivity", Index: trunk/src_plugins/export_openems/mesh.c =================================================================== --- trunk/src_plugins/export_openems/mesh.c (revision 31019) +++ trunk/src_plugins/export_openems/mesh.c (revision 31020) @@ -61,13 +61,13 @@ subst_thick = pcb_board_thickness(PCB, "openems", PCB_BRDTHICK_PRINT_ERROR); if (subst_thick <= 0) { rnd_message(RND_MSG_ERROR, "Assuming 1.5mm thick substrate because of the missing thickness attributes.\nFeel free to change it in the mesh dialog or add the attributes to the substrate groups."); - subst_thick = PCB_MM_TO_COORD(1.5); + subst_thick = RND_MM_TO_COORD(1.5); } RND_DAD_SET_VALUE(ia.dlg_hid_ctx, ia.pml, lng, mesh.pml); - RND_DAD_SET_VALUE(ia.dlg_hid_ctx, ia.dens_obj, crd, PCB_MM_TO_COORD(0.15)); - RND_DAD_SET_VALUE(ia.dlg_hid_ctx, ia.dens_gap, crd, PCB_MM_TO_COORD(0.5)); - RND_DAD_SET_VALUE(ia.dlg_hid_ctx, ia.min_space, crd, PCB_MM_TO_COORD(0.1)); + RND_DAD_SET_VALUE(ia.dlg_hid_ctx, ia.dens_obj, crd, RND_MM_TO_COORD(0.15)); + RND_DAD_SET_VALUE(ia.dlg_hid_ctx, ia.dens_gap, crd, RND_MM_TO_COORD(0.5)); + RND_DAD_SET_VALUE(ia.dlg_hid_ctx, ia.min_space, crd, RND_MM_TO_COORD(0.1)); RND_DAD_SET_VALUE(ia.dlg_hid_ctx, ia.smooth, lng, 1); RND_DAD_SET_VALUE(ia.dlg_hid_ctx, ia.noimpl, lng, 0); RND_DAD_SET_VALUE(ia.dlg_hid_ctx, ia.hor, lng, 1); @@ -75,12 +75,12 @@ TODO("enum lookup"); RND_DAD_SET_VALUE(ia.dlg_hid_ctx, ia.subslines, lng, 3); RND_DAD_SET_VALUE(ia.dlg_hid_ctx, ia.def_subs_thick, crd, subst_thick); -/* RND_DAD_SET_VALUE(ia.dlg_hid_ctx, ia.def_copper_thick, crd, PCB_MM_TO_COORD(1.5));*/ +/* RND_DAD_SET_VALUE(ia.dlg_hid_ctx, ia.def_copper_thick, crd, RND_MM_TO_COORD(1.5));*/ RND_DAD_SET_VALUE(ia.dlg_hid_ctx, ia.air_top, lng, 1); RND_DAD_SET_VALUE(ia.dlg_hid_ctx, ia.air_bot, lng, 1); - RND_DAD_SET_VALUE(ia.dlg_hid_ctx, ia.dens_air, crd, PCB_MM_TO_COORD(0.7)); + RND_DAD_SET_VALUE(ia.dlg_hid_ctx, ia.dens_air, crd, RND_MM_TO_COORD(0.7)); RND_DAD_SET_VALUE(ia.dlg_hid_ctx, ia.smoothz, lng, 1); - RND_DAD_SET_VALUE(ia.dlg_hid_ctx, ia.max_air, crd, PCB_MM_TO_COORD(4)); + RND_DAD_SET_VALUE(ia.dlg_hid_ctx, ia.max_air, crd, RND_MM_TO_COORD(4)); for(n = 0; n < 6; n++) { const char **a; int i; @@ -523,7 +523,7 @@ for(n = 0; n < vtc0_len(&mesh->line[dir].edge)-1; n++) { rnd_coord_t c1 = mesh->line[dir].edge.array[n], c2 = mesh->line[dir].edge.array[n+1]; if (c2 - c1 < mesh->min_space) { - if ((c2 - c1) < PCB_MM_TO_COORD(0.1)) { + if ((c2 - c1) < RND_MM_TO_COORD(0.1)) { mesh->line[dir].edge.array[n] = (c1 + c2) / 2; vtc0_remove(&mesh->line[dir].edge, n+1, 1); } @@ -709,7 +709,7 @@ static void mesh_draw_label(pcb_mesh_t *mesh, pcb_mesh_dir_t dir, rnd_coord_t aux, const char *label) { - aux -= PCB_MM_TO_COORD(0.6); + aux -= RND_MM_TO_COORD(0.6); if (dir == PCB_MESH_HORIZONTAL) pcb_text_new(mesh->ui_layer_xy, pcb_font(PCB, 0, 0), aux, 0, 90, 75, 0, label, pcb_no_flags()); else @@ -722,22 +722,22 @@ size_t n; rnd_coord_t end; - mesh_draw_label(mesh, dir, PCB_MM_TO_COORD(0.1), "object edge"); + mesh_draw_label(mesh, dir, RND_MM_TO_COORD(0.1), "object edge"); mesh_trace("%s edges:\n", dir == PCB_MESH_HORIZONTAL ? "horizontal" : "vertical"); for(n = 0; n < vtc0_len(&mesh->line[dir].edge); n++) { mesh_trace(" %mm", mesh->line[dir].edge.array[n]); - mesh_draw_line(mesh, dir, mesh->line[dir].edge.array[n], PCB_MM_TO_COORD(0.1), PCB_MM_TO_COORD(0.5), PCB_MM_TO_COORD(0.1)); + mesh_draw_line(mesh, dir, mesh->line[dir].edge.array[n], RND_MM_TO_COORD(0.1), RND_MM_TO_COORD(0.5), RND_MM_TO_COORD(0.1)); } mesh_trace("\n"); - mesh_draw_label(mesh, dir, PCB_MM_TO_COORD(2), "density ranges"); + mesh_draw_label(mesh, dir, RND_MM_TO_COORD(2), "density ranges"); mesh_trace("%s ranges:\n", dir == PCB_MESH_HORIZONTAL ? "horizontal" : "vertical"); for(n = 0; n < vtr0_len(&mesh->line[dir].dens); n++) { pcb_range_t *r = &mesh->line[dir].dens.array[n]; mesh_trace(" [%mm..%mm=%mm]", r->begin, r->end, r->data[0].c); - mesh_draw_range(mesh, dir, r->begin, r->end, PCB_MM_TO_COORD(2)+r->data[0].c/2, PCB_MM_TO_COORD(0.05)); + mesh_draw_range(mesh, dir, r->begin, r->end, RND_MM_TO_COORD(2)+r->data[0].c/2, RND_MM_TO_COORD(0.05)); } mesh_trace("\n"); @@ -745,7 +745,7 @@ end = (dir == PCB_MESH_HORIZONTAL) ? PCB->hidlib.size_x : PCB->hidlib.size_y; for(n = 0; n < vtc0_len(&mesh->line[dir].result); n++) { mesh_trace(" %mm", mesh->line[dir].result.array[n]); - mesh_draw_line(mesh, dir, mesh->line[dir].result.array[n], 0, end, PCB_MM_TO_COORD(0.03)); + mesh_draw_line(mesh, dir, mesh->line[dir].result.array[n], 0, end, RND_MM_TO_COORD(0.03)); } mesh_trace("\n"); @@ -759,7 +759,7 @@ rnd_coord_t y0 = PCB->hidlib.size_y/3, y = y0, y2; rnd_coord_t xl = PCB->hidlib.size_x/5; /* board left */ rnd_coord_t xr = PCB->hidlib.size_x/5*3; /* board right */ - rnd_coord_t spen = PCB_MM_TO_COORD(0.3), cpen = PCB_MM_TO_COORD(0.2), mpen = PCB_MM_TO_COORD(0.03); + rnd_coord_t spen = RND_MM_TO_COORD(0.3), cpen = RND_MM_TO_COORD(0.2), mpen = RND_MM_TO_COORD(0.03); int mag = 2; for(gid = 0; gid < PCB->LayerGroups.len; gid++) { @@ -766,8 +766,8 @@ pcb_layergrp_t *grp = &PCB->LayerGroups.grp[gid]; if (grp->ltype & PCB_LYT_COPPER) { y2 = y + mesh->def_copper_thick * mag / 2; - pcb_line_new(mesh->ui_layer_z, xr, y2, xr+PCB_MM_TO_COORD(2), y2, cpen, 0, pcb_no_flags()); - pcb_text_new(mesh->ui_layer_z, pcb_font(PCB, 0, 0), xr+PCB_MM_TO_COORD(3), y2 - PCB_MM_TO_COORD(1), 0, 100, 0, grp->name, pcb_no_flags()); + pcb_line_new(mesh->ui_layer_z, xr, y2, xr+RND_MM_TO_COORD(2), y2, cpen, 0, pcb_no_flags()); + pcb_text_new(mesh->ui_layer_z, pcb_font(PCB, 0, 0), xr+RND_MM_TO_COORD(3), y2 - RND_MM_TO_COORD(1), 0, 100, 0, grp->name, pcb_no_flags()); y += mesh->def_copper_thick * mag; } else if (grp->ltype & PCB_LYT_SUBSTRATE) { @@ -1066,7 +1066,7 @@ RND_DAD_BEGIN_HBOX(ia.dlg); RND_DAD_COORD(ia.dlg, ""); ia.dens_obj = RND_DAD_CURRENT(ia.dlg); - RND_DAD_MINMAX(ia.dlg, 0, PCB_MM_TO_COORD(5)); + RND_DAD_MINMAX(ia.dlg, 0, RND_MM_TO_COORD(5)); RND_DAD_LABEL(ia.dlg, "copper dens."); RND_DAD_HELP(ia.dlg, "mesh density over copper"); RND_DAD_END(ia.dlg); @@ -1074,7 +1074,7 @@ RND_DAD_BEGIN_HBOX(ia.dlg); RND_DAD_COORD(ia.dlg, ""); ia.dens_gap = RND_DAD_CURRENT(ia.dlg); - RND_DAD_MINMAX(ia.dlg, 0, PCB_MM_TO_COORD(5)); + RND_DAD_MINMAX(ia.dlg, 0, RND_MM_TO_COORD(5)); RND_DAD_LABEL(ia.dlg, "gap dens."); RND_DAD_HELP(ia.dlg, "mesh density over gaps"); RND_DAD_END(ia.dlg); @@ -1082,7 +1082,7 @@ RND_DAD_BEGIN_HBOX(ia.dlg); RND_DAD_COORD(ia.dlg, ""); ia.min_space = RND_DAD_CURRENT(ia.dlg); - RND_DAD_MINMAX(ia.dlg, 0, PCB_MM_TO_COORD(5)); + RND_DAD_MINMAX(ia.dlg, 0, RND_MM_TO_COORD(5)); RND_DAD_LABEL(ia.dlg, "min. spacing"); RND_DAD_HELP(ia.dlg, "minimum distance between mesh lines"); RND_DAD_END(ia.dlg); @@ -1130,7 +1130,7 @@ RND_DAD_BEGIN_HBOX(ia.dlg); RND_DAD_COORD(ia.dlg, ""); ia.def_subs_thick = RND_DAD_CURRENT(ia.dlg); - RND_DAD_MINMAX(ia.dlg, 0, PCB_MM_TO_COORD(5)); + RND_DAD_MINMAX(ia.dlg, 0, RND_MM_TO_COORD(5)); RND_DAD_LABEL(ia.dlg, "def. subst. thick"); RND_DAD_HELP(ia.dlg, "default substrate thickness\n(for substrate layer groups without\nthickness specified in attribute)"); RND_DAD_END(ia.dlg); @@ -1138,7 +1138,7 @@ RND_DAD_BEGIN_HBOX(ia.dlg); RND_DAD_COORD(ia.dlg, ""); ia.def_copper_thick = RND_DAD_CURRENT(ia.dlg); - RND_DAD_MINMAX(ia.dlg, 0, PCB_MM_TO_COORD(5)); + RND_DAD_MINMAX(ia.dlg, 0, RND_MM_TO_COORD(5)); RND_DAD_LABEL(ia.dlg, "def. copper thick"); RND_DAD_HELP(ia.dlg, "default copper thickness\n(for copper layer groups without\nthickness specified in attribute)"); RND_DAD_END(ia.dlg); @@ -1161,7 +1161,7 @@ RND_DAD_BEGIN_HBOX(ia.dlg); RND_DAD_COORD(ia.dlg, ""); ia.dens_air = RND_DAD_CURRENT(ia.dlg); - RND_DAD_MINMAX(ia.dlg, 0, PCB_MM_TO_COORD(5)); + RND_DAD_MINMAX(ia.dlg, 0, RND_MM_TO_COORD(5)); RND_DAD_LABEL(ia.dlg, "dens. air"); RND_DAD_HELP(ia.dlg, "mesh line density (spacing) in air"); RND_DAD_END(ia.dlg); @@ -1169,7 +1169,7 @@ RND_DAD_BEGIN_HBOX(ia.dlg); RND_DAD_COORD(ia.dlg, ""); ia.max_air = RND_DAD_CURRENT(ia.dlg); - RND_DAD_MINMAX(ia.dlg, 0, PCB_MM_TO_COORD(5)); + RND_DAD_MINMAX(ia.dlg, 0, RND_MM_TO_COORD(5)); RND_DAD_LABEL(ia.dlg, "air thickness"); RND_DAD_HELP(ia.dlg, "how far out to mesh in air"); RND_DAD_END(ia.dlg); Index: trunk/src_plugins/export_png/png.c =================================================================== --- trunk/src_plugins/export_png/png.c (revision 31019) +++ trunk/src_plugins/export_png/png.c (revision 31020) @@ -679,7 +679,7 @@ if (dpi > 0) { /* a scale of 1 means 1 pixel is 1 inch a scale of 10 means 1 pixel is 10 inches */ - scale = PCB_INCH_TO_COORD(1) / dpi; + scale = RND_INCH_TO_COORD(1) / dpi; w = rnd_round(w / scale) - PNG_SCALE_HACK1; h = rnd_round(h / scale) - PNG_SCALE_HACK1; } @@ -1288,8 +1288,8 @@ /* make sure we start between 0 and 360 otherwise gd does strange things */ - sa = pcb_normalize_angle(sa); - ea = pcb_normalize_angle(ea); + sa = rnd_normalize_angle(sa); + ea = rnd_normalize_angle(ea); } have_outline |= doing_outline; Index: trunk/src_plugins/export_ps/eps.c =================================================================== --- trunk/src_plugins/export_ps/eps.c (revision 31019) +++ trunk/src_plugins/export_ps/eps.c (revision 31020) @@ -171,7 +171,7 @@ fprintf(f, "%%!PS-Adobe-3.0 EPSF-3.0\n"); -#define pcb2em(x) 1 + PCB_COORD_TO_INCH (x) * 72.0 * options_[HA_scale].dbl +#define pcb2em(x) 1 + RND_COORD_TO_INCH (x) * 72.0 * options_[HA_scale].dbl fprintf(f, "%%%%BoundingBox: 0 0 %f %f\n", pcb2em(bounds->X2 - bounds->X1), pcb2em(bounds->Y2 - bounds->Y1)); #undef pcb2em fprintf(f, "%%%%Pages: 1\n"); @@ -188,7 +188,7 @@ if (options_[HA_as_shown].lng && conf_core.editor.show_solder_side) rnd_fprintf(f, "-1 1 scale %mi 0 translate\n", bounds->X1 - bounds->X2); -#define Q (rnd_coord_t) PCB_MIL_TO_COORD(10) +#define Q (rnd_coord_t) RND_MIL_TO_COORD(10) rnd_fprintf(f, "/nclip { %mi %mi moveto %mi %mi lineto %mi %mi lineto %mi %mi lineto %mi %mi lineto eoclip newpath } def\n", bounds->X1 - Q, bounds->Y1 - Q, bounds->X1 - Q, bounds->Y2 + Q, Index: trunk/src_plugins/export_ps/ps.c =================================================================== --- trunk/src_plugins/export_ps/ps.c (revision 31019) +++ trunk/src_plugins/export_ps/ps.c (revision 31020) @@ -281,7 +281,7 @@ %end-doc */ {"drill-helper-size", "Diameter of the small hole when drill-helper is on", - RND_HATT_COORD, 0, PCB_MM_TO_COORD(10), {0, 0, 0, PCB_MIN_PINORVIAHOLE}, 0, 0}, + RND_HATT_COORD, 0, RND_MM_TO_COORD(10), {0, 0, 0, PCB_MIN_PINORVIAHOLE}, 0, 0}, #define HA_drillhelpersize 19 @@ -446,8 +446,8 @@ */ rnd_fprintf(f, "%%%%DocumentMedia: %s %f %f 0 \"\" \"\"\n", pcb_media_data[global.media_idx].name, - 72 * PCB_COORD_TO_INCH(pcb_media_data[global.media_idx].width), - 72 * PCB_COORD_TO_INCH(pcb_media_data[global.media_idx].height)); + 72 * RND_COORD_TO_INCH(pcb_media_data[global.media_idx].width), + 72 * RND_COORD_TO_INCH(pcb_media_data[global.media_idx].height)); rnd_fprintf(f, "%%%%DocumentPaperSizes: %s\n", pcb_media_data[global.media_idx].name); /* End General Header Comments. */ @@ -678,8 +678,8 @@ static void corner(FILE * fh, rnd_coord_t x, rnd_coord_t y, int dx, int dy) { - rnd_coord_t len = PCB_MIL_TO_COORD(2000); - rnd_coord_t len2 = PCB_MIL_TO_COORD(200); + rnd_coord_t len = RND_MIL_TO_COORD(2000); + rnd_coord_t len2 = RND_MIL_TO_COORD(200); rnd_coord_t thick = 0; /* * Originally 'thick' used thicker lines. Currently is uses @@ -873,7 +873,7 @@ * If users don't want to make smaller boards, or use fewer drill * sizes, they can always ignore this sheet. */ if (PCB_LAYER_IS_FAB(flags, purpi)) { - rnd_coord_t natural = boffset - PCB_MIL_TO_COORD(500) - PCB->hidlib.size_y / 2; + rnd_coord_t natural = boffset - RND_MIL_TO_COORD(500) - PCB->hidlib.size_y / 2; rnd_coord_t needed = pcb_stub_draw_fab_overhang(); rnd_fprintf(global.f, "%% PrintFab overhang natural %mi, needed %mi\n", natural, needed); if (needed > natural) Index: trunk/src_plugins/export_stat/stat.c =================================================================== --- trunk/src_plugins/export_stat/stat.c (revision 31019) +++ trunk/src_plugins/export_stat/stat.c (revision 31020) @@ -244,7 +244,7 @@ fprintf(f, " arcs=%lu\n", ls.arcs); fprintf(f, " polys=%lu\n", ls.polys); rnd_fprintf(f, " trace_len=%$mm\n", ls.trace_len); - fprintf(f, " copper_area={%f mm^2}\n", (double)ls.copper_area / (double)PCB_MM_TO_COORD(1) / (double)PCB_MM_TO_COORD(1)); + fprintf(f, " copper_area={%f mm^2}\n", (double)ls.copper_area / (double)RND_MM_TO_COORD(1) / (double)RND_MM_TO_COORD(1)); } fprintf(f, " }\n"); } @@ -260,7 +260,7 @@ fprintf(f, " arcs=%lu\n", lgss[lgid].arcs); fprintf(f, " polys=%lu\n", lgss[lgid].polys); rnd_fprintf(f, " trace_len=%$mm\n", lgss[lgid].trace_len); - fprintf(f, " copper_area={%f mm^2}\n", (double)lgss[lgid].copper_area / (double)PCB_MM_TO_COORD(1) / (double)PCB_MM_TO_COORD(1)); + fprintf(f, " copper_area={%f mm^2}\n", (double)lgss[lgid].copper_area / (double)RND_MM_TO_COORD(1) / (double)RND_MM_TO_COORD(1)); fprintf(f, " }\n"); } } @@ -350,7 +350,7 @@ fprintf(f, " format={%s}\n", PCB->Data->loader == NULL ? "unknown" : PCB->Data->loader->description); rnd_fprintf(f, " width=%$mm\n", width); rnd_fprintf(f, " height=%$mm\n", height); - fprintf(f, " gross_area={%.4f mm^2}\n", (double)PCB_COORD_TO_MM(width) * (double)PCB_COORD_TO_MM(height)); + fprintf(f, " gross_area={%.4f mm^2}\n", (double)RND_COORD_TO_MM(width) * (double)RND_COORD_TO_MM(height)); fprintf(f, " holes_plated=%d\n", hp); fprintf(f, " holes_unplated=%d\n", hup); fprintf(f, " physical_copper_layers=%d\n", phg); Index: trunk/src_plugins/export_stl/export_stl.c =================================================================== --- trunk/src_plugins/export_stl/export_stl.c (revision 31019) +++ trunk/src_plugins/export_stl/export_stl.c (revision 31020) @@ -213,7 +213,7 @@ else thick = pcb_board_thickness(PCB, "stl", PCB_BRDTHICK_PRINT_ERROR); if (thick <= 0) { rnd_message(RND_MSG_WARNING, "STL: can not determine board thickness - falling back to hardwired 1.6mm\n"); - thick = PCB_MM_TO_COORD(1.6); + thick = RND_MM_TO_COORD(1.6); } if (options[HA_zcent].lng) Index: trunk/src_plugins/export_svg/svg.c =================================================================== --- trunk/src_plugins/export_svg/svg.c (revision 31019) +++ trunk/src_plugins/export_svg/svg.c (revision 31020) @@ -119,10 +119,10 @@ const char *dark; rnd_coord_t offs; } photo_palette[] = { - /* MASK */ { "#00ff00", "#00ff00", "#00ff00", PCB_MM_TO_COORD(0) }, - /* SILK */ { "#ffffff", "#eeeeee", "#aaaaaa", PCB_MM_TO_COORD(0) }, - /* COPPER */ { "#bbbbbb", "#707090", "#555555", PCB_MM_TO_COORD(0.05) }, - /* INNER */ { "#222222", "#111111", "#000000", PCB_MM_TO_COORD(0) } + /* MASK */ { "#00ff00", "#00ff00", "#00ff00", RND_MM_TO_COORD(0) }, + /* SILK */ { "#ffffff", "#eeeeee", "#aaaaaa", RND_MM_TO_COORD(0) }, + /* COPPER */ { "#bbbbbb", "#707090", "#555555", RND_MM_TO_COORD(0.05) }, + /* INNER */ { "#222222", "#111111", "#000000", RND_MM_TO_COORD(0) } }; rnd_export_opt_t svg_attribute_list[] = { @@ -293,17 +293,17 @@ fprintf(f, "\n"); w = PCB->hidlib.size_x; h = PCB->hidlib.size_y; - while((w < PCB_MM_TO_COORD(1024)) && (h < PCB_MM_TO_COORD(1024))) { + while((w < RND_MM_TO_COORD(1024)) && (h < RND_MM_TO_COORD(1024))) { w *= 2; h *= 2; } - x1 = PCB_MM_TO_COORD(2); - y1 = PCB_MM_TO_COORD(2); + x1 = RND_MM_TO_COORD(2); + y1 = RND_MM_TO_COORD(2); x2 = PCB->hidlib.size_x; y2 = PCB->hidlib.size_y; - x2 += PCB_MM_TO_COORD(5); - y2 += PCB_MM_TO_COORD(5); + x2 += RND_MM_TO_COORD(5); + y2 += RND_MM_TO_COORD(5); rnd_fprintf(f, "\n", w, h, x1, y1, x2, y2); } @@ -563,7 +563,7 @@ static void svg_set_line_width(rnd_hid_gc_t gc, rnd_coord_t width) { - gc->width = width < PCB_MM_TO_COORD(0.01) ? PCB_MM_TO_COORD(0.01) : width; + gc->width = width < RND_MM_TO_COORD(0.01) ? RND_MM_TO_COORD(0.01) : width; } static void indent(gds_t *s) Index: trunk/src_plugins/export_xy/xy.c =================================================================== --- trunk/src_plugins/export_xy/xy.c (revision 31019) +++ trunk/src_plugins/export_xy/xy.c (revision 31020) @@ -142,7 +142,7 @@ if (rnd_conf.editor.grid_unit) xy_options[HA_unit].default_val.lng = rnd_conf.editor.grid_unit->index; else - xy_options[HA_unit].default_val.lng = get_unit_struct("mil")->index; + xy_options[HA_unit].default_val.lng = rnd_get_unit_struct("mil")->index; last_unit_value = xy_options[HA_unit].default_val.lng; } if ((PCB != NULL) && (xy_options[HA_xyfile].default_val.str == NULL)) @@ -813,9 +813,9 @@ pcb_cam_begin_nolayer(PCB, &cam, NULL, options[HA_cam].str, &xy_filename); if (options[HA_unit].lng == -1) - xy_unit = get_unit_struct("mil"); + xy_unit = rnd_get_unit_struct("mil"); else - xy_unit = &pcb_units[options[HA_unit].lng]; + xy_unit = &rnd_units[options[HA_unit].lng]; tid = vts0_get(&fmt_ids, options[HA_format].lng, 0); if ((tid == NULL) || (*tid == NULL)) { Index: trunk/src_plugins/exto_std/bus.c =================================================================== --- trunk/src_plugins/exto_std/bus.c (revision 31019) +++ trunk/src_plugins/exto_std/bus.c (revision 31020) @@ -236,7 +236,7 @@ bus_seg_calc(l); x = l->Point1.X; y = l->Point1.Y; - for(o = 0; o < len; o += PCB_MM_TO_COORD(5), x += vx*PCB_MM_TO_COORD(5), y += vy*PCB_MM_TO_COORD(5)) + for(o = 0; o < len; o += RND_MM_TO_COORD(5), x += vx*RND_MM_TO_COORD(5), y += vy*RND_MM_TO_COORD(5)) rnd_render->draw_line(pcb_draw_out.fgGC, x + nx * bus->vthickness/2, y + ny * bus->vthickness/2, x - nx * bus->vthickness/2, y - ny * bus->vthickness/2); Index: trunk/src_plugins/exto_std/cord.c =================================================================== --- trunk/src_plugins/exto_std/cord.c (revision 31019) +++ trunk/src_plugins/exto_std/cord.c (revision 31020) @@ -151,7 +151,7 @@ y = rnd_round(it3*e1->y + 3*it2*t*a1->Y + 3*it*t2*a2->Y + t3*e2->y); l = pcb_line_new(lyr, lx, ly, x, y, - PCB_MM_TO_COORD(0.25), 0, pcb_flag_make(0)); + RND_MM_TO_COORD(0.25), 0, pcb_flag_make(0)); rnd_attribute_put(&l->Attributes, "extobj::role", "gfx"); set_grp((pcb_any_obj_t *)l, group); @@ -161,7 +161,7 @@ } else { l = pcb_line_new(lyr, e1->x, e1->y, e2->x, e2->y, - PCB_MM_TO_COORD(0.25), 0, pcb_flag_make(0)); + RND_MM_TO_COORD(0.25), 0, pcb_flag_make(0)); rnd_attribute_put(&l->Attributes, "extobj::role", "gfx"); set_grp((pcb_any_obj_t *)l, group); } @@ -209,7 +209,7 @@ if ((floater->type == PCB_OBJ_LINE) && (rnd_attribute_get(&subc->Attributes, "extobj::fixed_origin") == NULL)) { pcb_pstk_t *ps = (pcb_pstk_t *)floater; - pcb_subc_move_origin_to(subc, ps->x + PCB_MM_TO_COORD(0.3), ps->y + PCB_MM_TO_COORD(0.3), 0); + pcb_subc_move_origin_to(subc, ps->x + RND_MM_TO_COORD(0.3), ps->y + RND_MM_TO_COORD(0.3), 0); } } @@ -259,7 +259,7 @@ proto.tr.array = &tshp; shape.shape = PCB_PSSH_CIRC; - shape.data.circ.dia = PCB_MM_TO_COORD(0.5); + shape.data.circ.dia = RND_MM_TO_COORD(0.5); shape.data.circ.x = shape.data.circ.y = 0; shape.layer_mask = lyt; @@ -276,7 +276,7 @@ static pcb_pstk_t *endpt_pstk(pcb_subc_t *subc, const char *ptidx, rnd_cardinal_t pid, rnd_coord_t x, rnd_coord_t y, rnd_coord_t ox, rnd_coord_t oy, const char *term, const char *grp, int floater) { pcb_pstk_t *ps; - rnd_coord_t dx = ox-x, dy = oy-y, cpx = x+dx/4, cpy = y+dy/4, cpr = PCB_MM_TO_COORD(0.5); + rnd_coord_t dx = ox-x, dy = oy-y, cpx = x+dx/4, cpy = y+dy/4, cpr = RND_MM_TO_COORD(0.5); pcb_layer_t *ely = &subc->data->Layer[LID_EDIT]; @@ -310,7 +310,7 @@ static void conv_pstk(pcb_subc_t *subc, pcb_pstk_t *ps, long *grp, long *term, int *has_origin) { char sgrp[16], sterm[16]; - rnd_coord_t d = PCB_MM_TO_COORD(0.75); + rnd_coord_t d = RND_MM_TO_COORD(0.75); sprintf(sgrp, "%ld", (*grp)++); @@ -320,7 +320,7 @@ endpt_pstk(subc, "1", SILK_END, ps->x, ps->y, ps->x+d, ps->x+d, ps->term, sgrp, 0); if (!*has_origin) { - pcb_subc_move_origin_to(subc, ps->x + PCB_MM_TO_COORD(0.3), ps->y + PCB_MM_TO_COORD(0.3), 0); + pcb_subc_move_origin_to(subc, ps->x + RND_MM_TO_COORD(0.3), ps->y + RND_MM_TO_COORD(0.3), 0); *has_origin = 1; } @@ -360,8 +360,8 @@ layers[1].lyt = pcb_layer_flags_(l->parent.layer); pcb_layer_purpose_(l->parent.layer, &layers[1].purpose); if (!has_origin) { - ox = l->Point1.X + PCB_MM_TO_COORD(0.3); - oy = l->Point1.Y + PCB_MM_TO_COORD(0.3); + ox = l->Point1.X + RND_MM_TO_COORD(0.3); + oy = l->Point1.Y + RND_MM_TO_COORD(0.3); has_origin = 1; } break; Index: trunk/src_plugins/exto_std/dimension.c =================================================================== --- trunk/src_plugins/exto_std/dimension.c (revision 31019) +++ trunk/src_plugins/exto_std/dimension.c (revision 31020) @@ -150,7 +150,7 @@ pcb_layer_t *ly; pcb_line_t *flt; double ang, deg, dispe, rotsign; - double arrx = PCB_MM_TO_COORD(2), arry = PCB_MM_TO_COORD(0.5); + double arrx = RND_MM_TO_COORD(2), arry = RND_MM_TO_COORD(0.5); rnd_coord_t x1, y1, x2, y2, x1e, y1e, x2e, y2e, tx, ty, x, y, ex, ey; pcb_text_t *t; char ttmp[128]; @@ -174,7 +174,7 @@ y2 = rnd_round(dim->y2 + dim->displace * +dim->dx); /* endpoints of the extended-displaced baseline */ - dispe = PCB_MM_TO_COORD(0.5); + dispe = RND_MM_TO_COORD(0.5); if (dim->displace < 0) dispe = -dispe; dispe = dim->displace + dispe; @@ -190,7 +190,7 @@ flt = pcb_line_new(ly, x1 + arrx * dim->dx, y1 + arrx * dim->dy, x2 - arrx * dim->dx, y2 - arrx * dim->dy, - PCB_MM_TO_COORD(0.25), 0, pcb_flag_make(PCB_FLAG_FLOATER)); + RND_MM_TO_COORD(0.25), 0, pcb_flag_make(PCB_FLAG_FLOATER)); rnd_attribute_put(&flt->Attributes, "extobj::role", "dimline"); } else { /* modify the floater if it exists */ @@ -206,8 +206,8 @@ } /* guide lines */ - pcb_line_new(ly, dim->x1, dim->y1, x1e, y1e, PCB_MM_TO_COORD(0.25), 0, pcb_flag_make(0)); - pcb_line_new(ly, dim->x2, dim->y2, x2e, y2e, PCB_MM_TO_COORD(0.25), 0, pcb_flag_make(0)); + pcb_line_new(ly, dim->x1, dim->y1, x1e, y1e, RND_MM_TO_COORD(0.25), 0, pcb_flag_make(0)); + pcb_line_new(ly, dim->x2, dim->y2, x2e, y2e, RND_MM_TO_COORD(0.25), 0, pcb_flag_make(0)); /* arrows */ draw_arrow(dim, subc->data, ly, x1, y1, arrx, arry); @@ -290,7 +290,7 @@ rnd_trace("new disp: %mm f=%mm;%mm\n", (rnd_coord_t)d, fx, fy); - if ((d > -PCB_MM_TO_COORD(0.1)) && (d < PCB_MM_TO_COORD(0.1))) + if ((d > -RND_MM_TO_COORD(0.1)) && (d < RND_MM_TO_COORD(0.1))) return; rnd_trace("let's do it!\n"); Index: trunk/src_plugins/exto_std/line_of_vias.c =================================================================== --- trunk/src_plugins/exto_std/line_of_vias.c (revision 31019) +++ trunk/src_plugins/exto_std/line_of_vias.c (revision 31020) @@ -134,7 +134,7 @@ line_of_vias_unpack(subc); lov = subc->extobj_data; - if (lov->pitch < PCB_MM_TO_COORD(0.001)) { + if (lov->pitch < RND_MM_TO_COORD(0.001)) { rnd_message(RND_MSG_ERROR, "line_of_vias_gen(): can not generate line-of-vias, pitch value is too small\n"); return -1; } @@ -158,8 +158,8 @@ static void draw_mark_line(pcb_draw_info_t *info, pcb_subc_t *subc, pcb_line_t *line) { int selected; - double disp = PCB_MM_TO_COORD(0.05); - double arrow = PCB_MM_TO_COORD(0.2); + double disp = RND_MM_TO_COORD(0.05); + double arrow = RND_MM_TO_COORD(0.2); double ax, ay, ax1, ay1, ax2, ay2; line_geo_def; rnd_coord_t x1 = line->Point1.X, y1 = line->Point1.Y, x2 = line->Point2.X, y2 = line->Point2.Y; Index: trunk/src_plugins/fontmode/fontmode.c =================================================================== --- trunk/src_plugins/fontmode/fontmode.c (revision 31019) +++ trunk/src_plugins/fontmode/fontmode.c (revision 31020) @@ -64,7 +64,7 @@ should search the grid for the gridlines and use them to figure out where the symbols are. */ -#define CELL_SIZE ((rnd_coord_t)(PCB_MIL_TO_COORD (100))) +#define CELL_SIZE ((rnd_coord_t)(RND_MIL_TO_COORD (100))) #define XYtoSym(x,y) (((x) / CELL_SIZE - 1) + (16 * ((y) / CELL_SIZE - 1))) @@ -123,7 +123,7 @@ PCB->hidlib.size_x = CELL_SIZE * 18; PCB->hidlib.size_y = CELL_SIZE * ((PCB_MAX_FONTPOSITION + 15) / 16 + 2); - PCB->hidlib.grid = PCB_MIL_TO_COORD(5); + PCB->hidlib.grid = RND_MIL_TO_COORD(5); /* create the layer stack and logical layers */ pcb_layergrp_inhibit_inc(); @@ -156,7 +156,7 @@ symbol = &font->Symbol[s]; - miny = PCB_MIL_TO_COORD(5); + miny = RND_MIL_TO_COORD(5); maxy = font->MaxHeight; if ((s > 32) && (s < 127)) { @@ -210,16 +210,16 @@ } w = maxx + symbol->Delta + ox; - pcb_line_new_merge(lwidth, w, miny + oy, w, maxy + oy, PCB_MIL_TO_COORD(1), PCB_MIL_TO_COORD(1), pcb_no_flags()); + pcb_line_new_merge(lwidth, w, miny + oy, w, maxy + oy, RND_MIL_TO_COORD(1), RND_MIL_TO_COORD(1), pcb_no_flags()); } for (l = 0; l < 16; l++) { int x = (l + 1) * CELL_SIZE; - pcb_line_new_merge(lgrid, x, 0, x, PCB->hidlib.size_y, PCB_MIL_TO_COORD(1), PCB_MIL_TO_COORD(1), pcb_no_flags()); + pcb_line_new_merge(lgrid, x, 0, x, PCB->hidlib.size_y, RND_MIL_TO_COORD(1), RND_MIL_TO_COORD(1), pcb_no_flags()); } for (l = 0; l <= PCB_MAX_FONTPOSITION / 16 + 1; l++) { int y = (l + 1) * CELL_SIZE; - pcb_line_new_merge(lgrid, 0, y, PCB->hidlib.size_x, y, PCB_MIL_TO_COORD(1), PCB_MIL_TO_COORD(1), pcb_no_flags()); + pcb_line_new_merge(lgrid, 0, y, PCB->hidlib.size_x, y, RND_MIL_TO_COORD(1), RND_MIL_TO_COORD(1), pcb_no_flags()); } RND_ACT_IRES(0); return 0; Index: trunk/src_plugins/hid_gtk2_gdk/gtkhid-gdk.c =================================================================== --- trunk/src_plugins/hid_gtk2_gdk/gtkhid-gdk.c (revision 31019) +++ trunk/src_plugins/hid_gtk2_gdk/gtkhid-gdk.c (revision 31020) @@ -701,7 +701,7 @@ delta_angle = -delta_angle; } /* make sure we fall in the -180 to +180 range */ - start_angle = pcb_normalize_angle(start_angle); + start_angle = rnd_normalize_angle(start_angle); if (start_angle >= 180) start_angle -= 360; Index: trunk/src_plugins/hid_lesstif/dlg_attr_misc.c =================================================================== --- trunk/src_plugins/hid_lesstif/dlg_attr_misc.c (revision 31019) +++ trunk/src_plugins/hid_lesstif/dlg_attr_misc.c (revision 31020) @@ -190,8 +190,8 @@ else { pd->x1 = 0; pd->y1 = 0; - pd->x2 = PCB_MM_TO_COORD(100); - pd->y2 = PCB_MM_TO_COORD(100); + pd->x2 = RND_MM_TO_COORD(100); + pd->y2 = RND_MM_TO_COORD(100); } stdarg(XmNwidth, prv->min_sizex_px); Index: trunk/src_plugins/hid_lesstif/main.c =================================================================== --- trunk/src_plugins/hid_lesstif/main.c (revision 31019) +++ trunk/src_plugins/hid_lesstif/main.c (revision 31020) @@ -139,7 +139,7 @@ /* Denotes PCB units per screen pixel. Larger numbers mean zooming out - the largest value means you are looking at the whole board. */ -static double view_zoom = PCB_MIL_TO_COORD(10); +static double view_zoom = RND_MIL_TO_COORD(10); static rnd_bool autofade = 0; static rnd_bool crosshair_on = rnd_true; @@ -2420,7 +2420,7 @@ start_angle = -start_angle; delta_angle = -delta_angle; } - start_angle = pcb_normalize_angle(start_angle); + start_angle = rnd_normalize_angle(start_angle); if (start_angle >= 180) start_angle -= 360; #if 0 Index: trunk/src_plugins/import_dsn/dsn.c =================================================================== --- trunk/src_plugins/import_dsn/dsn.c (revision 31019) +++ trunk/src_plugins/import_dsn/dsn.c (revision 31020) @@ -123,7 +123,7 @@ rnd_message(RND_MSG_ERROR, "import_dsn: skipping polyline segment because x coord is invalid: %s\n", sy); return; } - if (workaround0 && ((y < PCB_MM_TO_COORD(0.01)) || (x < PCB_MM_TO_COORD(0.01)))) /* workaround for broken polyline coords */ + if (workaround0 && ((y < RND_MM_TO_COORD(0.01)) || (x < RND_MM_TO_COORD(0.01)))) /* workaround for broken polyline coords */ return; (*nlines)++; if (pn > 0) { Index: trunk/src_plugins/import_hpgl/hpgl.c =================================================================== --- trunk/src_plugins/import_hpgl/hpgl.c (revision 31019) +++ trunk/src_plugins/import_hpgl/hpgl.c (revision 31020) @@ -49,9 +49,9 @@ static const char *hpgl_cookie = "hpgl importer"; -#define HPGL2CRD_D(crd) (PCB_MM_TO_COORD((double)crd*0.025)) -#define HPGL2CRD_X(crd) (PCB_MM_TO_COORD((double)crd*0.025)) -#define HPGL2CRD_Y(crd) (PCB_MM_TO_COORD((double)crd*(-0.025))) +#define HPGL2CRD_D(crd) (RND_MM_TO_COORD((double)crd*0.025)) +#define HPGL2CRD_X(crd) (RND_MM_TO_COORD((double)crd*0.025)) +#define HPGL2CRD_Y(crd) (RND_MM_TO_COORD((double)crd*(-0.025))) static pcb_layer_t *get_pen_layer(pcb_data_t *data, int pen) { Index: trunk/src_plugins/import_ipcd356/ipcd356.c =================================================================== --- trunk/src_plugins/import_ipcd356/ipcd356.c (revision 31019) +++ trunk/src_plugins/import_ipcd356/ipcd356.c (revision 31020) @@ -232,7 +232,7 @@ { pcb_pstk_t *ps; pcb_pstk_shape_t sh[6]; - rnd_coord_t msk = PCB_MIL_TO_COORD(4), y; + rnd_coord_t msk = RND_MIL_TO_COORD(4), y; int i = 0, thru = (tf->hole > 0) && (tf->is_plated); memset(sh, 0, sizeof(sh)); Index: trunk/src_plugins/import_mucs/mucs.c =================================================================== --- trunk/src_plugins/import_mucs/mucs.c (revision 31019) +++ trunk/src_plugins/import_mucs/mucs.c (revision 31020) @@ -114,7 +114,7 @@ y2 = (getc(fi) + (getc(fi) * 256)); rnd_trace("Line(%d %d %d %d 20 \" \")\n", x1, y1, x2, y2); /* consider a bounds checking function to censor absurd coord sizes */ - pcb_line_new(PCB_CURRLAYER(PCB), PCB_MIL_TO_COORD(x1), PCB_MIL_TO_COORD(y1), PCB_MIL_TO_COORD(x2), PCB_MIL_TO_COORD(y2), PCB_MIL_TO_COORD(10), PCB_MIL_TO_COORD(10), pcb_flag_make(PCB_FLAG_AUTO)); + pcb_line_new(PCB_CURRLAYER(PCB), RND_MIL_TO_COORD(x1), RND_MIL_TO_COORD(y1), RND_MIL_TO_COORD(x2), RND_MIL_TO_COORD(y2), RND_MIL_TO_COORD(10), RND_MIL_TO_COORD(10), pcb_flag_make(PCB_FLAG_AUTO)); break; case 'c': x1 = (getc(fi) + (getc(fi) * 256)); @@ -121,7 +121,7 @@ y1 = (getc(fi) + (getc(fi) * 256)); r = (getc(fi) + (getc(fi) * 256)); rnd_trace("Via(%d %d 60 25 \"\" \" \")\n", x1, y1); - ps = pcb_pstk_new_compat_via(PCB->Data, -1, PCB_MIL_TO_COORD(x1), PCB_MIL_TO_COORD(y1), conf_core.design.via_drilling_hole, conf_core.design.via_thickness, conf_core.design.clearance, 0, PCB_PSTK_COMPAT_ROUND, 1); + ps = pcb_pstk_new_compat_via(PCB->Data, -1, RND_MIL_TO_COORD(x1), RND_MIL_TO_COORD(y1), conf_core.design.via_drilling_hole, conf_core.design.via_thickness, conf_core.design.clearance, 0, PCB_PSTK_COMPAT_ROUND, 1); PCB_FLAG_SET(PCB_FLAG_AUTO, ps); break; case 'n': @@ -128,7 +128,7 @@ x1 = (getc(fi) + (getc(fi) * 256)); y1 = (getc(fi) + (getc(fi) * 256)); rnd_trace("Line(%d %d %d %d 20 \" \")\n", x1, y1, x2, y2); - pcb_line_new(PCB_CURRLAYER(PCB), PCB_MIL_TO_COORD(x1), PCB_MIL_TO_COORD(y1), PCB_MIL_TO_COORD(x2), PCB_MIL_TO_COORD(y2), PCB_MIL_TO_COORD(10), PCB_MIL_TO_COORD(10), pcb_flag_make(PCB_FLAG_AUTO)); + pcb_line_new(PCB_CURRLAYER(PCB), RND_MIL_TO_COORD(x1), RND_MIL_TO_COORD(y1), RND_MIL_TO_COORD(x2), RND_MIL_TO_COORD(y2), RND_MIL_TO_COORD(10), RND_MIL_TO_COORD(10), pcb_flag_make(PCB_FLAG_AUTO)); x2 = x1; y2 = y1; break; Index: trunk/src_plugins/io_autotrax/read.c =================================================================== --- trunk/src_plugins/io_autotrax/read.c (revision 31019) +++ trunk/src_plugins/io_autotrax/read.c (revision 31020) @@ -445,7 +445,7 @@ Thickness = 0; Clearance = st->copper_clearance; /* start with sane default */ - Drill = PCB_MM_TO_COORD(0.300); /* start with something sane */ + Drill = RND_MM_TO_COORD(0.300); /* start with something sane */ name = rnd_strdup("unnamed"); @@ -505,7 +505,7 @@ Thickness = 0; Clearance = st->copper_clearance; /* start with sane default */ - Drill = PCB_MM_TO_COORD(0.300); /* start with something sane */ + Drill = RND_MM_TO_COORD(0.300); /* start with something sane */ if (fgetline(line, sizeof(line), FP, st->lineno) != NULL) { int argc; @@ -1095,8 +1095,8 @@ st.Filename = Filename; st.settings_dest = settings_dest; st.lineno = 0; - st.mask_clearance = st.copper_clearance = PCB_MIL_TO_COORD(10); /* sensible default values */ - st.minimum_comp_pin_drill = PCB_MIL_TO_COORD(30); /* Easytrax PCB FILE 5 uses zero in COMP pins */ + st.mask_clearance = st.copper_clearance = RND_MIL_TO_COORD(10); /* sensible default values */ + st.minimum_comp_pin_drill = RND_MIL_TO_COORD(30); /* Easytrax PCB FILE 5 uses zero in COMP pins */ st.trax_version = 4; /* assume autotrax, not easytrax */ st.ignored_keepout_element = 0; st.ignored_layer_zero_element = 0; Index: trunk/src_plugins/io_autotrax/write.c =================================================================== --- trunk/src_plugins/io_autotrax/write.c (revision 31019) +++ trunk/src_plugins/io_autotrax/write.c (revision 31020) @@ -501,14 +501,14 @@ rnd_coord_t xPos, yPos, yPos2, yPos3; TODO("do not hardcode things like this, especially when actual data is available") - rnd_coord_t text_offset = PCB_MIL_TO_COORD(400); /* this gives good placement of refdes relative to element */ + rnd_coord_t text_offset = RND_MIL_TO_COORD(400); /* this gives good placement of refdes relative to element */ TODO("rename these variables to something more expressive") TODO("instead of hardwiring coords, just read existing dyntex coords") xPos = (box->X1 + box->X2) / 2; yPos = PCB->hidlib.size_y - (box->Y1 - text_offset); - yPos2 = yPos - PCB_MIL_TO_COORD(200); - yPos3 = yPos2 - PCB_MIL_TO_COORD(200); + yPos2 = yPos - RND_MIL_TO_COORD(200); + yPos3 = yPos2 - RND_MIL_TO_COORD(200); pcb_subc_get_side(subc, &on_bottom); @@ -591,7 +591,7 @@ } else { rnd_coord_t Thickness; - Thickness = PCB_MIL_TO_COORD(10); + Thickness = RND_MIL_TO_COORD(10); autotrax_cpoly_hatch_lines(ctx, polygon, PCB_CPOLY_HATCH_HORIZONTAL | PCB_CPOLY_HATCH_VERTICAL, Thickness * 3, Thickness, current_layer, dx, dy); TODO("do we really need to reimplement this, can not cpoly_hatch_lines handle it?") for(pa = pcb_poly_island_first(polygon, &poly_it); pa != NULL; pa = pcb_poly_island_next(&poly_it)) { @@ -680,7 +680,7 @@ fputs("PCB FILE 4\r\n", FP); /*autotrax header */ /* we sort out if the layout dimensions exceed the autotrax maxima */ - if (PCB_COORD_TO_MIL(PCB->hidlib.size_x) > max_width_mil || PCB_COORD_TO_MIL(PCB->hidlib.size_y) > max_height_mil) { + if (RND_COORD_TO_MIL(PCB->hidlib.size_x) > max_width_mil || RND_COORD_TO_MIL(PCB->hidlib.size_y) > max_height_mil) { rnd_message(RND_MSG_ERROR, "Layout size exceeds protel autotrax 32000 mil x 32000 mil maximum."); return -1; } Index: trunk/src_plugins/io_bxl/bxl_gram.c =================================================================== --- trunk/src_plugins/io_bxl/bxl_gram.c (revision 31019) +++ trunk/src_plugins/io_bxl/bxl_gram.c (revision 31020) @@ -604,7 +604,7 @@ break; case 16: #line 124 "bxl_gram.y" - { yyctx->val.un.c = PCB_MIL_TO_COORD(yyctx->stack.l_mark[0].un.d); } + { yyctx->val.un.c = RND_MIL_TO_COORD(yyctx->stack.l_mark[0].un.d); } break; case 17: #line 128 "bxl_gram.y" Index: trunk/src_plugins/io_bxl/bxl_gram.y =================================================================== --- trunk/src_plugins/io_bxl/bxl_gram.y (revision 31019) +++ trunk/src_plugins/io_bxl/bxl_gram.y (revision 31020) @@ -121,7 +121,7 @@ ; coord: - real { $$ = PCB_MIL_TO_COORD($1); } + real { $$ = RND_MIL_TO_COORD($1); } ; common_attr_text: Index: trunk/src_plugins/io_bxl/read.c =================================================================== --- trunk/src_plugins/io_bxl/read.c (revision 31019) +++ trunk/src_plugins/io_bxl/read.c (revision 31020) @@ -355,7 +355,7 @@ ps = pcb_pstk_new_tr(ctx->subc->data, -1, ctx->state.pstk_proto_id, ctx->state.origin_x, ctx->state.origin_y, - PCB_MM_TO_COORD(0.2), pcb_flag_make(PCB_FLAG_CLEARLINE), + RND_MM_TO_COORD(0.2), pcb_flag_make(PCB_FLAG_CLEARLINE), ctx->state.rot, xmirror, smirror); if (ps != NULL) { @@ -445,7 +445,7 @@ if (ctx->state.text_style != NULL) { TODO("need to figure how text is scaled and justified in bxl"); scale = ctx->state.text_style->height; - thickness = PCB_MIL_TO_COORD(ctx->state.text_style->width); + thickness = RND_MIL_TO_COORD(ctx->state.text_style->width); } else { scale = 100; Index: trunk/src_plugins/io_dsn/read.c =================================================================== --- trunk/src_plugins/io_dsn/read.c (revision 31019) +++ trunk/src_plugins/io_dsn/read.c (revision 31020) @@ -100,8 +100,8 @@ } v /= ctx->unit->scale_factor; if (ctx->unit->family == PCB_UNIT_METRIC) - return PCB_MM_TO_COORD(v); - return PCB_MIL_TO_COORD(v); + return RND_MM_TO_COORD(v); + return RND_MIL_TO_COORD(v); } #define COORDX(ctx, n) COORD(ctx, n) @@ -140,7 +140,7 @@ for(su = s = STRE(gsxl_children(nu)); *s != '\0'; s++) *s = tolower(*s); - ctx->unit = get_unit_struct(su); + ctx->unit = rnd_get_unit_struct(su); if (ctx->unit == NULL) { rnd_message(RND_MSG_ERROR, "Invalid unit: '%s' (at %ld:%ld)\n", su, (long)nu->line, (long)nu->col); return NULL; @@ -1227,7 +1227,7 @@ DSN_LOAD_COORDS_FMT(cent, n, (subc == NULL) ? "xy" : "XY", goto err_cent); poly = pcb_poly_new(ly, conf_core.design.clearance, pcb_flag_make(PCB_FLAG_CLEARPOLYPOLY)); - astep = 2*M_PI / (8 + r / PCB_MM_TO_COORD(0.1)); + astep = 2*M_PI / (8 + r / RND_MM_TO_COORD(0.1)); for(a = 0; a < 2*M_PI; a += astep) { rnd_coord_t x, y; @@ -1676,7 +1676,7 @@ gsxl_node_t *n, *nunit = NULL, *nstructure = NULL, *nplacement = NULL, *nlibrary = NULL, *nnetwork = NULL, *nwiring = NULL, *ncolors = NULL, *nresolution = NULL; /* default unit in case the file does not specify one */ - ctx->unit = get_unit_struct("inch"); + ctx->unit = rnd_get_unit_struct("inch"); free(ctx->pcb->hidlib.name); ctx->pcb->hidlib.name = rnd_strdup(STRE(root->children)); @@ -1700,7 +1700,7 @@ for(su = s = STRE(gsxl_children(nresolution)); *s != '\0'; s++) *s = tolower(*s); - ctx->unit = get_unit_struct(su); + ctx->unit = rnd_get_unit_struct(su); if (ctx->unit == NULL) { rnd_message(RND_MSG_ERROR, "Invalid resolution unit: '%s'\n", su); return -1; Index: trunk/src_plugins/io_eagle/read.c =================================================================== --- trunk/src_plugins/io_eagle/read.c (revision 31019) +++ trunk/src_plugins/io_eagle/read.c (revision 31020) @@ -54,7 +54,7 @@ #include "../src_plugins/shape/shape.h" /* coordinates that corresponds to pcb-rnd 100% text size in height */ -#define EAGLE_TEXT_SIZE_100 PCB_MIL_TO_COORD(50) +#define EAGLE_TEXT_SIZE_100 RND_MIL_TO_COORD(50) #define PARENT(node) st->parser.calls->parent(&st->parser, node) #define CHILDREN(node) st->parser.calls->children(&st->parser, node) @@ -1565,7 +1565,7 @@ st->rv_pad_top = 0.25; st->rv_pad_inner = 0.25; st->rv_pad_bottom = 0.25; - st->md_wire_wire = PCB_MIL_TO_COORD(10); /* default minimum wire to wire spacing */ + st->md_wire_wire = RND_MIL_TO_COORD(10); /* default minimum wire to wire spacing */ dr = eagle_trpath(st, st->parser.root, "drawing", "board", "designrules", NULL); if (dr == NULL) { @@ -1709,7 +1709,7 @@ }; /* have not read design rules section yet but need this for rectangle parsing */ - st.ms_width = PCB_MIL_TO_COORD(10); /* default minimum feature width */ + st.ms_width = RND_MIL_TO_COORD(10); /* default minimum feature width */ st.parser.calls = &trparse_xml_calls; Index: trunk/src_plugins/io_hyp/parser.c =================================================================== --- trunk/src_plugins/io_hyp/parser.c (revision 31019) +++ trunk/src_plugins/io_hyp/parser.c (revision 31020) @@ -41,8 +41,8 @@ #include "../src_plugins/lib_compat_help/subc_help.h" #include -#define MASK_OFFS +PCB_MIL_TO_COORD(10) -#define PASTE_OFFS -PCB_MIL_TO_COORD(10) +#define MASK_OFFS +RND_MIL_TO_COORD(10) +#define PASTE_OFFS -RND_MIL_TO_COORD(10) #undef min @@ -216,7 +216,7 @@ static rnd_coord_t m2coord(double m) { - return ((rnd_coord_t) PCB_MM_TO_COORD(1000.0 * m)); + return ((rnd_coord_t) RND_MM_TO_COORD(1000.0 * m)); } /* xy coordinates to rnd_coord_t, without offset */ @@ -618,7 +618,7 @@ { rnd_coord_t x_max, x_min, y_max, y_min; rnd_coord_t width, height; - rnd_coord_t slack = PCB_MM_TO_COORD(1); + rnd_coord_t slack = RND_MM_TO_COORD(1); outline_t *i; if (PCB == NULL) @@ -962,8 +962,8 @@ start_angle = 180 + 180 * atan2(YC - Y1, X1 - XC) / M_PI; end_angle = 180 + 180 * atan2(YC - Y2, X2 - XC) / M_PI; } - start_angle = pcb_normalize_angle(start_angle); - end_angle = pcb_normalize_angle(end_angle); + start_angle = rnd_normalize_angle(start_angle); + end_angle = rnd_normalize_angle(end_angle); if (Clockwise) while (start_angle < end_angle) @@ -986,7 +986,7 @@ void hyp_arc2contour(pcb_pline_t * contour, rnd_coord_t x1, rnd_coord_t y1, rnd_coord_t x2, rnd_coord_t y2, rnd_coord_t xc, rnd_coord_t yc, rnd_coord_t r, rnd_bool_t clockwise) { - rnd_coord_t arc_precision = PCB_MM_TO_COORD(0.254); /* mm */ + rnd_coord_t arc_precision = RND_MM_TO_COORD(0.254); /* mm */ int min_circle_segments = 8; /* 8 seems minimal, 16 seems more than sufficient. */ int segments; int poly_points = 0; Index: trunk/src_plugins/io_kicad/read.c =================================================================== --- trunk/src_plugins/io_kicad/read.c (revision 31019) +++ trunk/src_plugins/io_kicad/read.c (revision 31020) @@ -675,7 +675,7 @@ do { \ double __dtmp__; \ PARSE_DOUBLE(__dtmp__, missnode, node, errmsg); \ - (res) = rnd_round(PCB_MM_TO_COORD(__dtmp__)); \ + (res) = rnd_round(RND_MM_TO_COORD(__dtmp__)); \ } while(0) \ /* parse nd->str into a pcb_layer_t in ly, either as a subc layer or if subc @@ -993,7 +993,7 @@ static int kicad_parse_target(read_state_t *st, gsxl_node_t *subtree) { unsigned long tally = 0, required; - rnd_coord_t x, y, thick = PCB_MM_TO_COORD(0.15); + rnd_coord_t x, y, thick = RND_MM_TO_COORD(0.15); double size = 5.0; pcb_layer_t *ly = NULL; pcb_subc_t *subc; @@ -1048,14 +1048,14 @@ /* draw the target within the subc */ if (is_plus) { - pcb_line_new(ly, x-PCB_MM_TO_COORD(size/2), y, x+PCB_MM_TO_COORD(size/2), y, thick, 0, flg); - pcb_line_new(ly, x, y-PCB_MM_TO_COORD(size/2), x, y+PCB_MM_TO_COORD(size/2), thick, 0, flg); + pcb_line_new(ly, x-RND_MM_TO_COORD(size/2), y, x+RND_MM_TO_COORD(size/2), y, thick, 0, flg); + pcb_line_new(ly, x, y-RND_MM_TO_COORD(size/2), x, y+RND_MM_TO_COORD(size/2), thick, 0, flg); } else { - pcb_line_new(ly, x-PCB_MM_TO_COORD(size/2), y-PCB_MM_TO_COORD(size/2), x+PCB_MM_TO_COORD(size/2), y+PCB_MM_TO_COORD(size/2), thick, 0, flg); - pcb_line_new(ly, x+PCB_MM_TO_COORD(size/2), y-PCB_MM_TO_COORD(size/2), x-PCB_MM_TO_COORD(size/2), y+PCB_MM_TO_COORD(size/2), thick, 0, flg); + pcb_line_new(ly, x-RND_MM_TO_COORD(size/2), y-RND_MM_TO_COORD(size/2), x+RND_MM_TO_COORD(size/2), y+RND_MM_TO_COORD(size/2), thick, 0, flg); + pcb_line_new(ly, x+RND_MM_TO_COORD(size/2), y-RND_MM_TO_COORD(size/2), x-RND_MM_TO_COORD(size/2), y+RND_MM_TO_COORD(size/2), thick, 0, flg); } - pcb_arc_new(ly, x, y, PCB_MM_TO_COORD(size*0.325), PCB_MM_TO_COORD(size*0.325), 0,360, thick, 0, flg, 0); + pcb_arc_new(ly, x, y, RND_MM_TO_COORD(size*0.325), RND_MM_TO_COORD(size*0.325), 0,360, thick, 0, flg, 0); /* finish registration of the subc */ pcb_subc_bbox(subc); @@ -1088,7 +1088,7 @@ TODO("this workaround is for segment - remove it when clearance is figured CUCP#39"); if (flag & PCB_FLAG_CLEARLINE) - clearance = PCB_MM_TO_COORD(0.250); + clearance = RND_MM_TO_COORD(0.250); for(n = subtree; n != NULL; n = n->next) { if (n->str == NULL) @@ -1192,9 +1192,9 @@ TODO("apply poly clearance as in pool/io_kicad (CUCP#39)"); if (subc == NULL) - clearance = thickness = PCB_MM_TO_COORD(0.250); /* start with sane defaults */ + clearance = thickness = RND_MM_TO_COORD(0.250); /* start with sane defaults */ else - clearance = thickness = PCB_MM_TO_COORD(0); + clearance = thickness = RND_MM_TO_COORD(0); for(n = subtree; n != NULL; n = n->next) { if (n->str == NULL) @@ -1305,8 +1305,8 @@ pcb_pstk_t *ps; TODO("apply poly clearance as in pool/io_kicad (CUCP#39)"); - clearance = mask = PCB_MM_TO_COORD(0.250); /* start with something bland here */ - drill = PCB_MM_TO_COORD(0.300); /* start with something sane */ + clearance = mask = RND_MM_TO_COORD(0.250); /* start with something bland here */ + drill = RND_MM_TO_COORD(0.300); /* start with something sane */ for(n = subtree; n != NULL; n = n->next) { if (n->str == NULL) @@ -1665,7 +1665,7 @@ padstack and add the custom shapes as heavy terminal together with the padstack */ pcb_pstk_shape_t sh[9]; - rnd_coord_t dy = PCB_MM_TO_COORD(shape_arg), dx = PCB_MM_TO_COORD(shape_arg2); /* x;y and 1;2 swapped intentionally - kicad does it like that */ + rnd_coord_t dy = RND_MM_TO_COORD(shape_arg), dx = RND_MM_TO_COORD(shape_arg2); /* x;y and 1;2 swapped intentionally - kicad does it like that */ memset(sh, 0, sizeof(sh)); if (LYSHT(TOP, MASK)) {sh[len].layer_mask = PCB_LYT_TOP | PCB_LYT_MASK; sh[len].comb = PCB_LYC_SUB | PCB_LYC_AUTO; pcb_shape_rect_trdelta(&sh[len++], padXsize+mask*2, padYsize+mask*2, dx, dy);} if (LYSHT(BOTTOM, MASK)) {sh[len].layer_mask = PCB_LYT_BOTTOM | PCB_LYT_MASK; sh[len].comb = PCB_LYC_SUB | PCB_LYC_AUTO; pcb_shape_rect_trdelta(&sh[len++], padXsize+mask*2, padYsize+mask*2, dx, dy);} @@ -1743,7 +1743,7 @@ if ((strcmp(pad_shape, "rect") == 0) || (strcmp(pad_shape, "trapezoid") == 0) || (strcmp(pad_shape, "custom") == 0)) { /* "custom" pads: see comment in kicad_make_pad_thr() */ pcb_pstk_shape_t sh[4]; - rnd_coord_t dy = PCB_MM_TO_COORD(shape_arg), dx = PCB_MM_TO_COORD(shape_arg2); /* x;y and 1;2 swapped intentionally - kicad does it like that */ + rnd_coord_t dy = RND_MM_TO_COORD(shape_arg), dx = RND_MM_TO_COORD(shape_arg2); /* x;y and 1;2 swapped intentionally - kicad does it like that */ memset(sh, 0, sizeof(sh)); if (LYSHS(side, MASK)) {sh[len].layer_mask = side | PCB_LYT_MASK; sh[len].comb = PCB_LYC_SUB | PCB_LYC_AUTO; pcb_shape_rect_trdelta(&sh[len++], padXsize+mask*2, padYsize+mask*2, dx, dy);} if (LYSHS(side, PASTE)) {sh[len].layer_mask = side | PCB_LYT_PASTE; sh[len].comb = PCB_LYC_AUTO; pcb_shape_rect_trdelta(&sh[len++], padXsize * paste_ratio + paste*2, padYsize * paste_ratio + paste*2, dx, dy);} @@ -1806,7 +1806,7 @@ if ((*featureTally & required) != required) return kicad_error(subtree, "malformed module pad/pin definition."); if ((*featureTally & BV(3)) == 0) - drillx = drilly = PCB_MIL_TO_COORD(30); /* CUCP#63: default size is hardwired in pcbnew/class_pad.cpp */ + drillx = drilly = RND_MIL_TO_COORD(30); /* CUCP#63: default size is hardwired in pcbnew/class_pad.cpp */ ps = kicad_make_pad_thr(st, subtree, subc, X, Y, padXsize, padYsize, clearance, mask, paste, paste_ratio, drillx, drilly, pad_shape, plated, layers, shape_arg, shape_arg2); } else { @@ -2096,7 +2096,7 @@ double shape_arg = 0.0, shape_arg2 = 0.0; double rot = 0.0; - sx = sy = PCB_MIL_TO_COORD(60); /* CUCP#63: default size matching pcbnew/class_pad.cpp */ + sx = sy = RND_MIL_TO_COORD(60); /* CUCP#63: default size matching pcbnew/class_pad.cpp */ /* Kicad clearance hierarchy (top overrides bottom): - pad clearance @@ -2741,8 +2741,8 @@ st.poly2net_inited = 1; /* A0 */ - st.width[DIM_FALLBACK] = PCB_MM_TO_COORD(1189.0); - st.height[DIM_FALLBACK] = PCB_MM_TO_COORD(841.0); + st.width[DIM_FALLBACK] = RND_MM_TO_COORD(1189.0); + st.height[DIM_FALLBACK] = RND_MM_TO_COORD(841.0); st.dim_valid[DIM_FALLBACK] = 1; /* load the file into the dom */ Index: trunk/src_plugins/io_kicad/write.c =================================================================== --- trunk/src_plugins/io_kicad/write.c (revision 31019) +++ trunk/src_plugins/io_kicad/write.c (revision 31020) @@ -45,7 +45,7 @@ static int force_center = 0; /* if implicit outline needs to be drawn, use lines of this thickness */ -#define KICAD_OUTLINE_THICK (PCB_MIL_TO_COORD(10)) +#define KICAD_OUTLINE_THICK (RND_MIL_TO_COORD(10)) #define KICAD_MAX_LAYERS 64 typedef struct { @@ -910,22 +910,22 @@ TODO(": rewrite this: rather have a table and a loop that hardwired calculations in code") /* we sort out the needed kicad sheet size here, using A4, A3, A2, A1 or A0 size as needed */ - if (PCB_COORD_TO_MIL(PCB->hidlib.size_x) > A4WidthMil || PCB_COORD_TO_MIL(PCB->hidlib.size_y) > A4HeightMil) { + if (RND_COORD_TO_MIL(PCB->hidlib.size_x) > A4WidthMil || RND_COORD_TO_MIL(PCB->hidlib.size_y) > A4HeightMil) { sheetHeight = A4WidthMil; /* 11.7" */ sheetWidth = 2 * A4HeightMil; /* 16.5" */ paperSize = 3; /* this is A3 size */ } - if (PCB_COORD_TO_MIL(PCB->hidlib.size_x) > sheetWidth || PCB_COORD_TO_MIL(PCB->hidlib.size_y) > sheetHeight) { + if (RND_COORD_TO_MIL(PCB->hidlib.size_x) > sheetWidth || RND_COORD_TO_MIL(PCB->hidlib.size_y) > sheetHeight) { sheetHeight = 2 * A4HeightMil; /* 16.5" */ sheetWidth = 2 * A4WidthMil; /* 23.4" */ paperSize = 2; /* this is A2 size */ } - if (PCB_COORD_TO_MIL(PCB->hidlib.size_x) > sheetWidth || PCB_COORD_TO_MIL(PCB->hidlib.size_y) > sheetHeight) { + if (RND_COORD_TO_MIL(PCB->hidlib.size_x) > sheetWidth || RND_COORD_TO_MIL(PCB->hidlib.size_y) > sheetHeight) { sheetHeight = 2 * A4WidthMil; /* 23.4" */ sheetWidth = 4 * A4HeightMil; /* 33.1" */ paperSize = 1; /* this is A1 size */ } - if (PCB_COORD_TO_MIL(PCB->hidlib.size_x) > sheetWidth || PCB_COORD_TO_MIL(PCB->hidlib.size_y) > sheetHeight) { + if (RND_COORD_TO_MIL(PCB->hidlib.size_x) > sheetWidth || RND_COORD_TO_MIL(PCB->hidlib.size_y) > sheetHeight) { sheetHeight = 4 * A4HeightMil; /* 33.1" */ sheetWidth = 4 * A4WidthMil; /* 46.8" */ paperSize = 0; /* this is A0 size; where would you get it made ?!?! */ @@ -937,17 +937,17 @@ rnd_coord_t LayoutYOffset; /* we now sort out the offsets for centring the layout in the chosen sheet size here */ - if (sheetWidth > PCB_COORD_TO_MIL(PCB->hidlib.size_x)) { /* usually A4, bigger if needed */ + if (sheetWidth > RND_COORD_TO_MIL(PCB->hidlib.size_x)) { /* usually A4, bigger if needed */ /* fprintf(ctx->f, "%d ", sheetWidth); legacy kicad: elements decimils, sheet size mils */ - LayoutXOffset = PCB_MIL_TO_COORD(sheetWidth) / 2 - PCB->hidlib.size_x / 2; + LayoutXOffset = RND_MIL_TO_COORD(sheetWidth) / 2 - PCB->hidlib.size_x / 2; } else { /* the layout is bigger than A0; most unlikely, but... */ /* rnd_fprintf(ctx->f, "%.0ml ", PCB->hidlib.size_x); */ LayoutXOffset = 0; } - if (sheetHeight > PCB_COORD_TO_MIL(PCB->hidlib.size_y)) { + if (sheetHeight > RND_COORD_TO_MIL(PCB->hidlib.size_y)) { /* fprintf(ctx->f, "%d", sheetHeight); */ - LayoutYOffset = PCB_MIL_TO_COORD(sheetHeight) / 2 - PCB->hidlib.size_y / 2; + LayoutYOffset = RND_MIL_TO_COORD(sheetHeight) / 2 - PCB->hidlib.size_y / 2; } else { /* the layout is bigger than A0; most unlikely, but... */ /* rnd_fprintf(ctx->f, "%.0ml", PCB->hidlib.size_y); */ Index: trunk/src_plugins/io_kicad_legacy/write.c =================================================================== --- trunk/src_plugins/io_kicad_legacy/write.c (revision 31019) +++ trunk/src_plugins/io_kicad_legacy/write.c (revision 31020) @@ -711,7 +711,7 @@ int layer = 0; int currentKicadLayer = 0; int currentGroup = 0; - rnd_coord_t outlineThickness = PCB_MIL_TO_COORD(10); + rnd_coord_t outlineThickness = RND_MIL_TO_COORD(10); int bottomCount; rnd_layer_id_t *bottomLayers; @@ -747,22 +747,22 @@ TODO(": se this from io_kicad, do not duplicate the code here") /* we sort out the needed kicad sheet size here, using A4, A3, A2, A1 or A0 size as needed */ - if (PCB_COORD_TO_MIL(PCB->hidlib.size_x) > A4WidthMil || PCB_COORD_TO_MIL(PCB->hidlib.size_y) > A4HeightMil) { + if (RND_COORD_TO_MIL(PCB->hidlib.size_x) > A4WidthMil || RND_COORD_TO_MIL(PCB->hidlib.size_y) > A4HeightMil) { sheetHeight = A4WidthMil; /* 11.7" */ sheetWidth = 2 * A4HeightMil; /* 16.5" */ paperSize = 3; /* this is A3 size */ } - if (PCB_COORD_TO_MIL(PCB->hidlib.size_x) > sheetWidth || PCB_COORD_TO_MIL(PCB->hidlib.size_y) > sheetHeight) { + if (RND_COORD_TO_MIL(PCB->hidlib.size_x) > sheetWidth || RND_COORD_TO_MIL(PCB->hidlib.size_y) > sheetHeight) { sheetHeight = 2 * A4HeightMil; /* 16.5" */ sheetWidth = 2 * A4WidthMil; /* 23.4" */ paperSize = 2; /* this is A2 size */ } - if (PCB_COORD_TO_MIL(PCB->hidlib.size_x) > sheetWidth || PCB_COORD_TO_MIL(PCB->hidlib.size_y) > sheetHeight) { + if (RND_COORD_TO_MIL(PCB->hidlib.size_x) > sheetWidth || RND_COORD_TO_MIL(PCB->hidlib.size_y) > sheetHeight) { sheetHeight = 2 * A4WidthMil; /* 23.4" */ sheetWidth = 4 * A4HeightMil; /* 33.1" */ paperSize = 1; /* this is A1 size */ } - if (PCB_COORD_TO_MIL(PCB->hidlib.size_x) > sheetWidth || PCB_COORD_TO_MIL(PCB->hidlib.size_y) > sheetHeight) { + if (RND_COORD_TO_MIL(PCB->hidlib.size_x) > sheetWidth || RND_COORD_TO_MIL(PCB->hidlib.size_y) > sheetHeight) { sheetHeight = 4 * A4HeightMil; /* 33.1" */ sheetWidth = 4 * A4WidthMil; /* 46.8" */ paperSize = 0; /* this is A0 size; where would you get it made ?!?! */ @@ -770,17 +770,17 @@ fprintf(FP, "Sheet A%d ", paperSize); /* we now sort out the offsets for centring the layout in the chosen sheet size here */ - if (sheetWidth > PCB_COORD_TO_MIL(PCB->hidlib.size_x)) { /* usually A4, bigger if needed */ + if (sheetWidth > RND_COORD_TO_MIL(PCB->hidlib.size_x)) { /* usually A4, bigger if needed */ fprintf(FP, "%d ", sheetWidth); /* legacy kicad: elements decimils, sheet size mils */ - LayoutXOffset = PCB_MIL_TO_COORD(sheetWidth) / 2 - PCB->hidlib.size_x / 2; + LayoutXOffset = RND_MIL_TO_COORD(sheetWidth) / 2 - PCB->hidlib.size_x / 2; } else { /* the layout is bigger than A0; most unlikely, but... */ rnd_fprintf(FP, "%.0ml ", PCB->hidlib.size_x); LayoutXOffset = 0; } - if (sheetHeight > PCB_COORD_TO_MIL(PCB->hidlib.size_y)) { + if (sheetHeight > RND_COORD_TO_MIL(PCB->hidlib.size_y)) { fprintf(FP, "%d", sheetHeight); - LayoutYOffset = PCB_MIL_TO_COORD(sheetHeight) / 2 - PCB->hidlib.size_y / 2; + LayoutYOffset = RND_MIL_TO_COORD(sheetHeight) / 2 - PCB->hidlib.size_y / 2; } else { /* the layout is bigger than A0; most unlikely, but... */ rnd_fprintf(FP, "%.0ml", PCB->hidlib.size_y); Index: trunk/src_plugins/io_mentor_cell/font.c =================================================================== --- trunk/src_plugins/io_mentor_cell/font.c (revision 31019) +++ trunk/src_plugins/io_mentor_cell/font.c (revision 31020) @@ -76,9 +76,9 @@ } LINE_END; - *width = PCB_MM_TO_COORD(tw); - *height = PCB_MM_TO_COORD((double)lines * (pcb_mentor_font_ymax[font_id] - pcb_mentor_font_ymin[font_id])); - *yoffs = PCB_MM_TO_COORD(pcb_mentor_font_ymin[font_id]); + *width = RND_MM_TO_COORD(tw); + *height = RND_MM_TO_COORD((double)lines * (pcb_mentor_font_ymax[font_id] - pcb_mentor_font_ymin[font_id])); + *yoffs = RND_MM_TO_COORD(pcb_mentor_font_ymin[font_id]); return bad_glyph ? FSR_INVALID_GLYPH_ID : FSR_SUCCESS; } Index: trunk/src_plugins/io_mentor_cell/read.c =================================================================== --- trunk/src_plugins/io_mentor_cell/read.c (revision 31019) +++ trunk/src_plugins/io_mentor_cell/read.c (revision 31020) @@ -338,7 +338,7 @@ filled = (strcmp(tmp->argv[1], "FILLED") == 0); } else { - th = PCB_MM_TO_COORD(0.5); + th = RND_MM_TO_COORD(0.5); tmp = find_nth(pp->first_child, "WIDTH", 0); if (tmp != NULL) parse_coord(ctx, tmp->argv[1], &th); @@ -388,9 +388,9 @@ srx = -(sx - cx); sry = sy - cy; /* Since angle = 0 is towards -x, change sign to x part */ erx = -(ex - cx); ery = ey - cy; /* Since angle = 0 is towards -x, change sign to x part */ *sa = atan2(sry, srx) * RND_RAD_TO_DEG; - *sa = pcb_normalize_angle(360 + *sa); /* normalize angle between 0 and 359 */ + *sa = rnd_normalize_angle(360 + *sa); /* normalize angle between 0 and 359 */ ea = atan2(ery, erx) * RND_RAD_TO_DEG; - ea = pcb_normalize_angle(360 + ea); /* normalize angle between 0 and 359 */ + ea = rnd_normalize_angle(360 + ea); /* normalize angle between 0 and 359 */ if (*r < 0) { /* counterclockwise */ @@ -427,7 +427,7 @@ filled = (strcmp(tmp->argv[1], "FILLED") == 0); } else { - th = PCB_MM_TO_COORD(0.5); + th = RND_MM_TO_COORD(0.5); tmp = find_nth(pp->first_child, "WIDTH", 0); if (tmp != NULL) parse_coord(ctx, tmp->argv[1], &th); @@ -597,9 +597,9 @@ return; } - width = width * PCB_COORD_TO_MM(h) + thickness; - height = height * PCB_COORD_TO_MM(h) + thickness; - ymin = ymin * PCB_COORD_TO_MM(h); + width = width * RND_COORD_TO_MM(h) + thickness; + height = height * RND_COORD_TO_MM(h) + thickness; + ymin = ymin * RND_COORD_TO_MM(h); tmp = find_nth(attr->first_child, "HORZ_JUST", 0); if (tmp != NULL) { @@ -1160,10 +1160,10 @@ static const rnd_unit_t *parse_units(const char *ust) { - if (strcmp(ust, "MIL") == 0) return get_unit_struct("mil"); - if (strcmp(ust, "TH") == 0) return get_unit_struct("mil"); - if (strcmp(ust, "MM") == 0) return get_unit_struct("mm"); - if (strcmp(ust, "IN") == 0) return get_unit_struct("inch"); + if (strcmp(ust, "MIL") == 0) return rnd_get_unit_struct("mil"); + if (strcmp(ust, "TH") == 0) return rnd_get_unit_struct("mil"); + if (strcmp(ust, "MM") == 0) return rnd_get_unit_struct("mm"); + if (strcmp(ust, "IN") == 0) return rnd_get_unit_struct("inch"); return NULL; } @@ -1430,7 +1430,7 @@ } ctx.pcb = pcb; - ctx.unit = get_unit_struct("mm"); + ctx.unit = rnd_get_unit_struct("mm"); Index: trunk/src_plugins/io_mentor_cell/read_net.c =================================================================== --- trunk/src_plugins/io_mentor_cell/read_net.c (revision 31019) +++ trunk/src_plugins/io_mentor_cell/read_net.c (revision 31020) @@ -32,7 +32,7 @@ { if ((lid < 0) || (lid >= PCB_MAX_LAYER)) { hkp_error(errnode, "failed to determine clearance, falling back to default value\n"); - return PCB_MIL_TO_COORD(12); + return RND_MIL_TO_COORD(12); } return ctx->nc_dflt.clearance[lid][type]; } Index: trunk/src_plugins/io_pcb/file.c =================================================================== --- trunk/src_plugins/io_pcb/file.c (revision 31019) +++ trunk/src_plugins/io_pcb/file.c (revision 31020) @@ -295,7 +295,7 @@ rnd_fprintf(FP, "Grid[%[0] %[0] %[0] %d]\n", PCB->hidlib.grid, PCB->hidlib.grid_ox, PCB->hidlib.grid_oy, rnd_conf.editor.draw_grid); rnd_fprintf(FP, "Cursor[%[0] %[0] 1000]\n", pcb_crosshair.X, pcb_crosshair.Y); /* PolyArea should be output in square cmils, no suffix */ - fprintf(FP, "PolyArea[%s]\n", c_dtostr(PCB_COORD_TO_MIL(PCB_COORD_TO_MIL(conf_core.design.poly_isle_area) * 100) * 100)); + fprintf(FP, "PolyArea[%s]\n", c_dtostr(RND_COORD_TO_MIL(RND_COORD_TO_MIL(conf_core.design.poly_isle_area) * 100) * 100)); rnd_fprintf(FP, "Thermal[%s]\n", c_dtostr(PCB->ThermScale)); rnd_fprintf(FP, "DRC[%[0] %[0] %[0] %[0] %[0] %[0]]\n", conf_core.design.bloat, conf_core.design.shrink, conf_core.design.min_wid, conf_core.design.min_slk, conf_core.design.min_drill, conf_core.design.min_ring); Index: trunk/src_plugins/io_pcb/parse_y.c =================================================================== --- trunk/src_plugins/io_pcb/parse_y.c (revision 31019) +++ trunk/src_plugins/io_pcb/parse_y.c (revision 31020) @@ -130,8 +130,8 @@ /* frame between the groundplane and the copper or mask - noone seems to remember what these two are for; changing them may have unforeseen side effects. */ -#define PCB_GROUNDPLANEFRAME PCB_MIL_TO_COORD(15) -#define PCB_MASKFRAME PCB_MIL_TO_COORD(3) +#define PCB_GROUNDPLANEFRAME RND_MIL_TO_COORD(15) +#define PCB_MASKFRAME RND_MIL_TO_COORD(3) /* default inner/outer ratio for pins/vias in percent */ #define PCB_DEFAULT_DRILLINGHOLE 40 @@ -2064,7 +2064,7 @@ #line 392 "parse_y.y" /* yacc.c:1652 */ { /* Read in cmil^2 for now; in future this should be a noop. */ - load_meta_float("design/poly_isle_area", PCB_MIL_TO_COORD(PCB_MIL_TO_COORD ((yyvsp[-1].number)) / 100.0) / 100.0); + load_meta_float("design/poly_isle_area", RND_MIL_TO_COORD(RND_MIL_TO_COORD ((yyvsp[-1].number)) / 100.0) / 100.0); } #line 2070 "parse_y.c" /* yacc.c:1652 */ break; @@ -2967,61 +2967,61 @@ case 205: #line 1345 "parse_y.y" /* yacc.c:1652 */ - { do_measure(&(yyval.measure), (yyvsp[0].number), PCB_MIL_TO_COORD ((yyvsp[0].number)) / 100.0, 0); } + { do_measure(&(yyval.measure), (yyvsp[0].number), RND_MIL_TO_COORD ((yyvsp[0].number)) / 100.0, 0); } #line 2972 "parse_y.c" /* yacc.c:1652 */ break; case 206: #line 1346 "parse_y.y" /* yacc.c:1652 */ - { M ((yyval.measure), (yyvsp[-1].number), PCB_MIL_TO_COORD ((yyvsp[-1].number)) / 100000.0); pcb_io_pcb_usty_seen |= PCB_USTY_UNITS; } + { M ((yyval.measure), (yyvsp[-1].number), RND_MIL_TO_COORD ((yyvsp[-1].number)) / 100000.0); pcb_io_pcb_usty_seen |= PCB_USTY_UNITS; } #line 2978 "parse_y.c" /* yacc.c:1652 */ break; case 207: #line 1347 "parse_y.y" /* yacc.c:1652 */ - { M ((yyval.measure), (yyvsp[-1].number), PCB_MIL_TO_COORD ((yyvsp[-1].number)) / 100.0); pcb_io_pcb_usty_seen |= PCB_USTY_UNITS; } + { M ((yyval.measure), (yyvsp[-1].number), RND_MIL_TO_COORD ((yyvsp[-1].number)) / 100.0); pcb_io_pcb_usty_seen |= PCB_USTY_UNITS; } #line 2984 "parse_y.c" /* yacc.c:1652 */ break; case 208: #line 1348 "parse_y.y" /* yacc.c:1652 */ - { M ((yyval.measure), (yyvsp[-1].number), PCB_MIL_TO_COORD ((yyvsp[-1].number))); pcb_io_pcb_usty_seen |= PCB_USTY_UNITS; } + { M ((yyval.measure), (yyvsp[-1].number), RND_MIL_TO_COORD ((yyvsp[-1].number))); pcb_io_pcb_usty_seen |= PCB_USTY_UNITS; } #line 2990 "parse_y.c" /* yacc.c:1652 */ break; case 209: #line 1349 "parse_y.y" /* yacc.c:1652 */ - { M ((yyval.measure), (yyvsp[-1].number), PCB_INCH_TO_COORD ((yyvsp[-1].number))); pcb_io_pcb_usty_seen |= PCB_USTY_UNITS; } + { M ((yyval.measure), (yyvsp[-1].number), RND_INCH_TO_COORD ((yyvsp[-1].number))); pcb_io_pcb_usty_seen |= PCB_USTY_UNITS; } #line 2996 "parse_y.c" /* yacc.c:1652 */ break; case 210: #line 1350 "parse_y.y" /* yacc.c:1652 */ - { M ((yyval.measure), (yyvsp[-1].number), PCB_MM_TO_COORD ((yyvsp[-1].number)) / 1000000.0); pcb_io_pcb_usty_seen |= PCB_USTY_NANOMETER; } + { M ((yyval.measure), (yyvsp[-1].number), RND_MM_TO_COORD ((yyvsp[-1].number)) / 1000000.0); pcb_io_pcb_usty_seen |= PCB_USTY_NANOMETER; } #line 3002 "parse_y.c" /* yacc.c:1652 */ break; case 211: #line 1351 "parse_y.y" /* yacc.c:1652 */ - { M ((yyval.measure), (yyvsp[-1].number), PCB_MM_TO_COORD ((yyvsp[-1].number)) / 1000.0); pcb_io_pcb_usty_seen |= PCB_USTY_UNITS; } + { M ((yyval.measure), (yyvsp[-1].number), RND_MM_TO_COORD ((yyvsp[-1].number)) / 1000.0); pcb_io_pcb_usty_seen |= PCB_USTY_UNITS; } #line 3008 "parse_y.c" /* yacc.c:1652 */ break; case 212: #line 1352 "parse_y.y" /* yacc.c:1652 */ - { M ((yyval.measure), (yyvsp[-1].number), PCB_MM_TO_COORD ((yyvsp[-1].number))); pcb_io_pcb_usty_seen |= PCB_USTY_UNITS; } + { M ((yyval.measure), (yyvsp[-1].number), RND_MM_TO_COORD ((yyvsp[-1].number))); pcb_io_pcb_usty_seen |= PCB_USTY_UNITS; } #line 3014 "parse_y.c" /* yacc.c:1652 */ break; case 213: #line 1353 "parse_y.y" /* yacc.c:1652 */ - { M ((yyval.measure), (yyvsp[-1].number), PCB_MM_TO_COORD ((yyvsp[-1].number)) * 1000.0); pcb_io_pcb_usty_seen |= PCB_USTY_UNITS; } + { M ((yyval.measure), (yyvsp[-1].number), RND_MM_TO_COORD ((yyvsp[-1].number)) * 1000.0); pcb_io_pcb_usty_seen |= PCB_USTY_UNITS; } #line 3020 "parse_y.c" /* yacc.c:1652 */ break; case 214: #line 1354 "parse_y.y" /* yacc.c:1652 */ - { M ((yyval.measure), (yyvsp[-1].number), PCB_MM_TO_COORD ((yyvsp[-1].number)) * 1000000.0); pcb_io_pcb_usty_seen |= PCB_USTY_UNITS; } + { M ((yyval.measure), (yyvsp[-1].number), RND_MM_TO_COORD ((yyvsp[-1].number)) * 1000000.0); pcb_io_pcb_usty_seen |= PCB_USTY_UNITS; } #line 3026 "parse_y.c" /* yacc.c:1652 */ break; @@ -3317,7 +3317,7 @@ return m.bval; if (m.ival != 0) pcb_io_pcb_usty_seen |= PCB_USTY_CMIL; /* ... because we can't save in mil */ - return rnd_round(PCB_MIL_TO_COORD (m.ival)); + return rnd_round(RND_MIL_TO_COORD (m.ival)); } static rnd_coord_t Index: trunk/src_plugins/io_pcb/parse_y.y =================================================================== --- trunk/src_plugins/io_pcb/parse_y.y (revision 31019) +++ trunk/src_plugins/io_pcb/parse_y.y (revision 31020) @@ -53,8 +53,8 @@ /* frame between the groundplane and the copper or mask - noone seems to remember what these two are for; changing them may have unforeseen side effects. */ -#define PCB_GROUNDPLANEFRAME PCB_MIL_TO_COORD(15) -#define PCB_MASKFRAME PCB_MIL_TO_COORD(3) +#define PCB_GROUNDPLANEFRAME RND_MIL_TO_COORD(15) +#define PCB_MASKFRAME RND_MIL_TO_COORD(3) /* default inner/outer ratio for pins/vias in percent */ #define PCB_DEFAULT_DRILLINGHOLE 40 @@ -391,7 +391,7 @@ | T_AREA '[' number ']' { /* Read in cmil^2 for now; in future this should be a noop. */ - load_meta_float("design/poly_isle_area", PCB_MIL_TO_COORD(PCB_MIL_TO_COORD ($3) / 100.0) / 100.0); + load_meta_float("design/poly_isle_area", RND_MIL_TO_COORD(RND_MIL_TO_COORD ($3) / 100.0) / 100.0); } ; @@ -1342,16 +1342,16 @@ measure /* Default unit (no suffix) is cmil */ - : number { do_measure(&$$, $1, PCB_MIL_TO_COORD ($1) / 100.0, 0); } - | number T_UMIL { M ($$, $1, PCB_MIL_TO_COORD ($1) / 100000.0); pcb_io_pcb_usty_seen |= PCB_USTY_UNITS; } - | number T_CMIL { M ($$, $1, PCB_MIL_TO_COORD ($1) / 100.0); pcb_io_pcb_usty_seen |= PCB_USTY_UNITS; } - | number T_MIL { M ($$, $1, PCB_MIL_TO_COORD ($1)); pcb_io_pcb_usty_seen |= PCB_USTY_UNITS; } - | number T_IN { M ($$, $1, PCB_INCH_TO_COORD ($1)); pcb_io_pcb_usty_seen |= PCB_USTY_UNITS; } - | number T_NM { M ($$, $1, PCB_MM_TO_COORD ($1) / 1000000.0); pcb_io_pcb_usty_seen |= PCB_USTY_NANOMETER; } - | number T_UM { M ($$, $1, PCB_MM_TO_COORD ($1) / 1000.0); pcb_io_pcb_usty_seen |= PCB_USTY_UNITS; } - | number T_MM { M ($$, $1, PCB_MM_TO_COORD ($1)); pcb_io_pcb_usty_seen |= PCB_USTY_UNITS; } - | number T_M { M ($$, $1, PCB_MM_TO_COORD ($1) * 1000.0); pcb_io_pcb_usty_seen |= PCB_USTY_UNITS; } - | number T_KM { M ($$, $1, PCB_MM_TO_COORD ($1) * 1000000.0); pcb_io_pcb_usty_seen |= PCB_USTY_UNITS; } + : number { do_measure(&$$, $1, RND_MIL_TO_COORD ($1) / 100.0, 0); } + | number T_UMIL { M ($$, $1, RND_MIL_TO_COORD ($1) / 100000.0); pcb_io_pcb_usty_seen |= PCB_USTY_UNITS; } + | number T_CMIL { M ($$, $1, RND_MIL_TO_COORD ($1) / 100.0); pcb_io_pcb_usty_seen |= PCB_USTY_UNITS; } + | number T_MIL { M ($$, $1, RND_MIL_TO_COORD ($1)); pcb_io_pcb_usty_seen |= PCB_USTY_UNITS; } + | number T_IN { M ($$, $1, RND_INCH_TO_COORD ($1)); pcb_io_pcb_usty_seen |= PCB_USTY_UNITS; } + | number T_NM { M ($$, $1, RND_MM_TO_COORD ($1) / 1000000.0); pcb_io_pcb_usty_seen |= PCB_USTY_NANOMETER; } + | number T_UM { M ($$, $1, RND_MM_TO_COORD ($1) / 1000.0); pcb_io_pcb_usty_seen |= PCB_USTY_UNITS; } + | number T_MM { M ($$, $1, RND_MM_TO_COORD ($1)); pcb_io_pcb_usty_seen |= PCB_USTY_UNITS; } + | number T_M { M ($$, $1, RND_MM_TO_COORD ($1) * 1000.0); pcb_io_pcb_usty_seen |= PCB_USTY_UNITS; } + | number T_KM { M ($$, $1, RND_MM_TO_COORD ($1) * 1000000.0); pcb_io_pcb_usty_seen |= PCB_USTY_UNITS; } ; %% @@ -1413,7 +1413,7 @@ return m.bval; if (m.ival != 0) pcb_io_pcb_usty_seen |= PCB_USTY_CMIL; /* ... because we can't save in mil */ - return rnd_round(PCB_MIL_TO_COORD (m.ival)); + return rnd_round(RND_MIL_TO_COORD (m.ival)); } static rnd_coord_t Index: trunk/src_plugins/io_tedax/tetest.c =================================================================== --- trunk/src_plugins/io_tedax/tetest.c (revision 31019) +++ trunk/src_plugins/io_tedax/tetest.c (revision 31020) @@ -92,7 +92,7 @@ } if (accept) { TODO("calculate dia"); - dia = PCB_MM_TO_COORD(0.5); + dia = RND_MM_TO_COORD(0.5); if ((minshp == NULL) || (dia < mindia)) { minshp = shp; shx = 0; shy = 0; Index: trunk/src_plugins/lib_compat_help/media.c =================================================================== --- trunk/src_plugins/lib_compat_help/media.c (revision 31019) +++ trunk/src_plugins/lib_compat_help/media.c (revision 31020) @@ -68,45 +68,45 @@ * {A,B,C,D,E}-Size here are the ANSI sizes and not the architectural sizes. */ -#define MARGINX PCB_MIL_TO_COORD(500) -#define MARGINY PCB_MIL_TO_COORD(500) +#define MARGINX RND_MIL_TO_COORD(500) +#define MARGINY RND_MIL_TO_COORD(500) pcb_media_t pcb_media_data[] = { - {"A0", PCB_MM_TO_COORD(841), PCB_MM_TO_COORD(1189), MARGINX, MARGINY}, - {"A1", PCB_MM_TO_COORD(594), PCB_MM_TO_COORD(841), MARGINX, MARGINY}, - {"A2", PCB_MM_TO_COORD(420), PCB_MM_TO_COORD(594), MARGINX, MARGINY}, - {"A3", PCB_MM_TO_COORD(297), PCB_MM_TO_COORD(420), MARGINX, MARGINY}, - {"A4", PCB_MM_TO_COORD(210), PCB_MM_TO_COORD(297), MARGINX, MARGINY}, - {"A5", PCB_MM_TO_COORD(148), PCB_MM_TO_COORD(210), MARGINX, MARGINY}, - {"A6", PCB_MM_TO_COORD(105), PCB_MM_TO_COORD(148), MARGINX, MARGINY}, - {"A7", PCB_MM_TO_COORD(74), PCB_MM_TO_COORD(105), MARGINX, MARGINY}, - {"A8", PCB_MM_TO_COORD(52), PCB_MM_TO_COORD(74), MARGINX, MARGINY}, - {"A9", PCB_MM_TO_COORD(37), PCB_MM_TO_COORD(52), MARGINX, MARGINY}, - {"A10", PCB_MM_TO_COORD(26), PCB_MM_TO_COORD(37), MARGINX, MARGINY}, - {"B0", PCB_MM_TO_COORD(1000), PCB_MM_TO_COORD(1414), MARGINX, MARGINY}, - {"B1", PCB_MM_TO_COORD(707), PCB_MM_TO_COORD(1000), MARGINX, MARGINY}, - {"B2", PCB_MM_TO_COORD(500), PCB_MM_TO_COORD(707), MARGINX, MARGINY}, - {"B3", PCB_MM_TO_COORD(353), PCB_MM_TO_COORD(500), MARGINX, MARGINY}, - {"B4", PCB_MM_TO_COORD(250), PCB_MM_TO_COORD(353), MARGINX, MARGINY}, - {"B5", PCB_MM_TO_COORD(176), PCB_MM_TO_COORD(250), MARGINX, MARGINY}, - {"B6", PCB_MM_TO_COORD(125), PCB_MM_TO_COORD(176), MARGINX, MARGINY}, - {"B7", PCB_MM_TO_COORD(88), PCB_MM_TO_COORD(125), MARGINX, MARGINY}, - {"B8", PCB_MM_TO_COORD(62), PCB_MM_TO_COORD(88), MARGINX, MARGINY}, - {"B9", PCB_MM_TO_COORD(44), PCB_MM_TO_COORD(62), MARGINX, MARGINY}, - {"B10", PCB_MM_TO_COORD(31), PCB_MM_TO_COORD(44), MARGINX, MARGINY}, - {"Letter", PCB_INCH_TO_COORD(8.5), PCB_INCH_TO_COORD(11), MARGINX, MARGINY}, - {"USLetter", PCB_INCH_TO_COORD(8.5), PCB_INCH_TO_COORD(11), MARGINX, MARGINY}, /* kicad */ - {"11x17", PCB_INCH_TO_COORD(11), PCB_INCH_TO_COORD(17), MARGINX, MARGINY}, - {"Ledger", PCB_INCH_TO_COORD(17), PCB_INCH_TO_COORD(11), MARGINX, MARGINY}, - {"Legal", PCB_INCH_TO_COORD(8.5), PCB_INCH_TO_COORD(14), MARGINX, MARGINY}, - {"Executive", PCB_INCH_TO_COORD(7.5), PCB_INCH_TO_COORD(10), MARGINX, MARGINY}, - {"A-size", PCB_INCH_TO_COORD(8.5), PCB_INCH_TO_COORD(11), MARGINX, MARGINY}, - {"B-size", PCB_INCH_TO_COORD(11), PCB_INCH_TO_COORD(17), MARGINX, MARGINY}, - {"C-size", PCB_INCH_TO_COORD(17), PCB_INCH_TO_COORD(22), MARGINX, MARGINY}, - {"D-size", PCB_INCH_TO_COORD(22), PCB_INCH_TO_COORD(34), MARGINX, MARGINY}, - {"E-size", PCB_INCH_TO_COORD(34), PCB_INCH_TO_COORD(44), MARGINX, MARGINY}, - {"US-Business_Card", PCB_INCH_TO_COORD(3.5), PCB_INCH_TO_COORD(2.0), 0, 0}, - {"Intl-Business_Card", PCB_INCH_TO_COORD(3.375), PCB_INCH_TO_COORD(2.125), 0, 0}, + {"A0", RND_MM_TO_COORD(841), RND_MM_TO_COORD(1189), MARGINX, MARGINY}, + {"A1", RND_MM_TO_COORD(594), RND_MM_TO_COORD(841), MARGINX, MARGINY}, + {"A2", RND_MM_TO_COORD(420), RND_MM_TO_COORD(594), MARGINX, MARGINY}, + {"A3", RND_MM_TO_COORD(297), RND_MM_TO_COORD(420), MARGINX, MARGINY}, + {"A4", RND_MM_TO_COORD(210), RND_MM_TO_COORD(297), MARGINX, MARGINY}, + {"A5", RND_MM_TO_COORD(148), RND_MM_TO_COORD(210), MARGINX, MARGINY}, + {"A6", RND_MM_TO_COORD(105), RND_MM_TO_COORD(148), MARGINX, MARGINY}, + {"A7", RND_MM_TO_COORD(74), RND_MM_TO_COORD(105), MARGINX, MARGINY}, + {"A8", RND_MM_TO_COORD(52), RND_MM_TO_COORD(74), MARGINX, MARGINY}, + {"A9", RND_MM_TO_COORD(37), RND_MM_TO_COORD(52), MARGINX, MARGINY}, + {"A10", RND_MM_TO_COORD(26), RND_MM_TO_COORD(37), MARGINX, MARGINY}, + {"B0", RND_MM_TO_COORD(1000), RND_MM_TO_COORD(1414), MARGINX, MARGINY}, + {"B1", RND_MM_TO_COORD(707), RND_MM_TO_COORD(1000), MARGINX, MARGINY}, + {"B2", RND_MM_TO_COORD(500), RND_MM_TO_COORD(707), MARGINX, MARGINY}, + {"B3", RND_MM_TO_COORD(353), RND_MM_TO_COORD(500), MARGINX, MARGINY}, + {"B4", RND_MM_TO_COORD(250), RND_MM_TO_COORD(353), MARGINX, MARGINY}, + {"B5", RND_MM_TO_COORD(176), RND_MM_TO_COORD(250), MARGINX, MARGINY}, + {"B6", RND_MM_TO_COORD(125), RND_MM_TO_COORD(176), MARGINX, MARGINY}, + {"B7", RND_MM_TO_COORD(88), RND_MM_TO_COORD(125), MARGINX, MARGINY}, + {"B8", RND_MM_TO_COORD(62), RND_MM_TO_COORD(88), MARGINX, MARGINY}, + {"B9", RND_MM_TO_COORD(44), RND_MM_TO_COORD(62), MARGINX, MARGINY}, + {"B10", RND_MM_TO_COORD(31), RND_MM_TO_COORD(44), MARGINX, MARGINY}, + {"Letter", RND_INCH_TO_COORD(8.5), RND_INCH_TO_COORD(11), MARGINX, MARGINY}, + {"USLetter", RND_INCH_TO_COORD(8.5), RND_INCH_TO_COORD(11), MARGINX, MARGINY}, /* kicad */ + {"11x17", RND_INCH_TO_COORD(11), RND_INCH_TO_COORD(17), MARGINX, MARGINY}, + {"Ledger", RND_INCH_TO_COORD(17), RND_INCH_TO_COORD(11), MARGINX, MARGINY}, + {"Legal", RND_INCH_TO_COORD(8.5), RND_INCH_TO_COORD(14), MARGINX, MARGINY}, + {"Executive", RND_INCH_TO_COORD(7.5), RND_INCH_TO_COORD(10), MARGINX, MARGINY}, + {"A-size", RND_INCH_TO_COORD(8.5), RND_INCH_TO_COORD(11), MARGINX, MARGINY}, + {"B-size", RND_INCH_TO_COORD(11), RND_INCH_TO_COORD(17), MARGINX, MARGINY}, + {"C-size", RND_INCH_TO_COORD(17), RND_INCH_TO_COORD(22), MARGINX, MARGINY}, + {"D-size", RND_INCH_TO_COORD(22), RND_INCH_TO_COORD(34), MARGINX, MARGINY}, + {"E-size", RND_INCH_TO_COORD(34), RND_INCH_TO_COORD(44), MARGINX, MARGINY}, + {"US-Business_Card", RND_INCH_TO_COORD(3.5), RND_INCH_TO_COORD(2.0), 0, 0}, + {"Intl-Business_Card", RND_INCH_TO_COORD(3.375), RND_INCH_TO_COORD(2.125), 0, 0}, {NULL, 0, 0, 0, 0}, }; Index: trunk/src_plugins/lib_gtk_common/dlg_attr_misc.c =================================================================== --- trunk/src_plugins/lib_gtk_common/dlg_attr_misc.c (revision 31019) +++ trunk/src_plugins/lib_gtk_common/dlg_attr_misc.c (revision 31020) @@ -120,10 +120,10 @@ TODO("TODO make these configurable:") p->x_min = 0; p->y_min = 0; - p->x_max = PCB_MM_TO_COORD(100); - p->y_max = PCB_MM_TO_COORD(100); - p->w_pixels = PCB_MM_TO_COORD(10); - p->h_pixels = PCB_MM_TO_COORD(10); + p->x_max = RND_MM_TO_COORD(100); + p->y_max = RND_MM_TO_COORD(100); + p->w_pixels = RND_MM_TO_COORD(10); + p->h_pixels = RND_MM_TO_COORD(10); p->redraw_with_board = !!(attr->hatt_flags & RND_HATF_PRV_BOARD); gtk_widget_set_size_request(prv, hp->min_sizex_px, hp->min_sizey_px); Index: trunk/src_plugins/lib_gtk_common/wt_preview.c =================================================================== --- trunk/src_plugins/lib_gtk_common/wt_preview.c (revision 31019) +++ trunk/src_plugins/lib_gtk_common/wt_preview.c (revision 31020) @@ -528,12 +528,12 @@ TODO(": maybe expose these through the object API so the caller can set it up?") memset(&prv->view, 0, sizeof(prv->view)); - prv->view.width = PCB_MM_TO_COORD(110); - prv->view.height = PCB_MM_TO_COORD(110); + prv->view.width = RND_MM_TO_COORD(110); + prv->view.height = RND_MM_TO_COORD(110); prv->view.use_max_pcb = 0; prv->view.max_width = RND_MAX_COORD; prv->view.max_height = RND_MAX_COORD; - prv->view.coord_per_px = PCB_MM_TO_COORD(0.25); + prv->view.coord_per_px = RND_MM_TO_COORD(0.25); prv->view.ctx = ctx; update_expose_data(prv); Index: trunk/src_plugins/lib_hid_common/act_dad.c =================================================================== --- trunk/src_plugins/lib_hid_common/act_dad.c (revision 31019) +++ trunk/src_plugins/lib_hid_common/act_dad.c (revision 31020) @@ -506,13 +506,13 @@ txt = NULL; rnd_PCB_ACT_MAY_CONVARG(4, FGW_STR, dad, txt = argv[4].val.str); if (txt != NULL) { - const rnd_unit_t *u = get_unit_struct(txt); + const rnd_unit_t *u = rnd_get_unit_struct(txt); if (u == NULL) { rnd_message(RND_MSG_ERROR, "Invalid unit %s (get ignored)\n", txt); return FGW_ERR_NOT_FOUND; } res->type = FGW_DOUBLE; - res->val.nat_double = pcb_coord_to_unit(u, dad->dlg[wid].val.crd); + res->val.nat_double = rnd_coord_to_unit(u, dad->dlg[wid].val.crd); } else { res->type = FGW_COORD; Index: trunk/src_plugins/lib_hid_common/lead_user.c =================================================================== --- trunk/src_plugins/lib_hid_common/lead_user.c (revision 31019) +++ trunk/src_plugins/lib_hid_common/lead_user.c (revision 31020) @@ -32,9 +32,9 @@ #include #include -#define LEAD_ARROW_LEN PCB_MM_TO_COORD(3) -#define LEAD_CENTER_RAD PCB_MM_TO_COORD(0.5) -#define LEAD_ANIM_AMP PCB_MM_TO_COORD(2) +#define LEAD_ARROW_LEN RND_MM_TO_COORD(3) +#define LEAD_CENTER_RAD RND_MM_TO_COORD(0.5) +#define LEAD_ANIM_AMP RND_MM_TO_COORD(2) #define LEAD_ANIM_SPEED 0.6 #define LEAD_PERIOD_MS 100 Index: trunk/src_plugins/lib_hid_pcbui/routest_dlg.c =================================================================== --- trunk/src_plugins/lib_hid_pcbui/routest_dlg.c (revision 31019) +++ trunk/src_plugins/lib_hid_pcbui/routest_dlg.c (revision 31020) @@ -45,7 +45,7 @@ pcb_route_style_t *rst = vtroutestyle_get(&PCB->RouteStyle, ctx->curr, 0); if (rst->Diameter <= rst->Hole) { rnd_message(RND_MSG_ERROR, "had to increase the via ring diameter - can not be smaller than the hole"); - rst->Diameter = rst->Hole+PCB_MIL_TO_COORD(1); + rst->Diameter = rst->Hole+RND_MIL_TO_COORD(1); } } Index: trunk/src_plugins/lib_hid_pcbui/status.c =================================================================== --- trunk/src_plugins/lib_hid_pcbui/status.c (revision 31019) +++ trunk/src_plugins/lib_hid_pcbui/status.c (revision 31020) @@ -108,8 +108,8 @@ const rnd_unit_t *unit_inv; if (unit_mm == NULL) { /* cache mm and mil units to save on the lookups */ - unit_mm = get_unit_struct("mm"); - unit_mil = get_unit_struct("mil"); + unit_mm = rnd_get_unit_struct("mm"); + unit_mil = rnd_get_unit_struct("mil"); } if (rnd_conf.editor.grid_unit == unit_mm) unit_inv = unit_mil; @@ -241,7 +241,7 @@ static void unit_change_cb(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr) { - if (rnd_conf.editor.grid_unit == get_unit_struct("mm")) + if (rnd_conf.editor.grid_unit == rnd_get_unit_struct("mm")) rnd_actionva(&PCB->hidlib, "SetUnits", "mil", NULL); else rnd_actionva(&PCB->hidlib, "SetUnits", "mm", NULL); Index: trunk/src_plugins/lib_polyhelp/polyhelp.c =================================================================== --- trunk/src_plugins/lib_polyhelp/polyhelp.c (revision 31019) +++ trunk/src_plugins/lib_polyhelp/polyhelp.c (revision 31020) @@ -67,7 +67,7 @@ /* debug helper */ static void cross(FILE *f, rnd_coord_t x, rnd_coord_t y) { - static rnd_coord_t cs = PCB_MM_TO_COORD(0.2); + static rnd_coord_t cs = RND_MM_TO_COORD(0.2); rnd_fprintf(f, "line %#mm %#mm %#mm %#mm\n", x - cs, y, x + cs, y); rnd_fprintf(f, "line %#mm %#mm %#mm %#mm\n", x, y - cs, x, y + cs); } @@ -384,7 +384,7 @@ RND_DAD_COORD(dlg, ""); RND_DAD_HELP(dlg, "Distance between centerlines of adjacent hatch lines for vertical and horizontal hatching"); RND_DAD_DEFAULT_NUM(dlg, conf_core.design.line_thickness * 2); - RND_DAD_MINMAX(dlg, 1, PCB_MM_TO_COORD(100)); + RND_DAD_MINMAX(dlg, 1, RND_MM_TO_COORD(100)); wspc = RND_DAD_CURRENT(dlg); RND_DAD_LABEL(dlg, "Draw contour"); Index: trunk/src_plugins/millpath/millpath.c =================================================================== --- trunk/src_plugins/millpath/millpath.c (revision 31019) +++ trunk/src_plugins/millpath/millpath.c (revision 31020) @@ -37,8 +37,8 @@ static pcb_tlp_session_t ctx; static rnd_coord_t tool_dias[] = { - PCB_MM_TO_COORD(0.5), - PCB_MM_TO_COORD(3) + RND_MM_TO_COORD(0.5), + RND_MM_TO_COORD(3) }; static pcb_tlp_tools_t tools = { sizeof(tool_dias)/sizeof(tool_dias[0]), tool_dias}; @@ -48,7 +48,7 @@ { const char *script = NULL; pcb_board_t *pcb = (pcb_board_t *)RND_ACT_HIDLIB; - ctx.edge_clearance = PCB_MM_TO_COORD(0.05); + ctx.edge_clearance = RND_MM_TO_COORD(0.05); ctx.tools = &tools; rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, mill, script = argv[1].val.str); Index: trunk/src_plugins/order/order.c =================================================================== --- trunk/src_plugins/order/order.c (revision 31019) +++ trunk/src_plugins/order/order.c (revision 31020) @@ -137,7 +137,7 @@ switch(f->type) { case RND_HATT_INTEGER: f->val.lng = l; break; - case RND_HATT_COORD: f->val.crd = PCB_MM_TO_COORD(l); break; + case RND_HATT_COORD: f->val.crd = RND_MM_TO_COORD(l); break; case RND_HATT_STRING: free((char *)f->val.str); f->val.str = rnd_strdup_printf("%ld", l); Index: trunk/src_plugins/order_pcbway/pcbway.c =================================================================== --- trunk/src_plugins/order_pcbway/pcbway.c (revision 31019) +++ trunk/src_plugins/order_pcbway/pcbway.c (revision 31020) @@ -249,7 +249,7 @@ else if (strcmp(type, "mm") == 0) { f->type = RND_HATT_COORD; if (dflt != NULL) - f->val.crd = PCB_MM_TO_COORD(strtod(dflt, NULL)); + f->val.crd = RND_MM_TO_COORD(strtod(dflt, NULL)); } else if (strcmp(type, "string") == 0) { f->type = RND_HATT_STRING; Index: trunk/src_plugins/propedit/propdlg.c =================================================================== --- trunk/src_plugins/propedit/propdlg.c (revision 31019) +++ trunk/src_plugins/propedit/propdlg.c (revision 31020) @@ -584,7 +584,7 @@ const char *hdr[] = {"property", "common", "min", "max", "avg", NULL}; const char *hdr_val[] = {"use", "values"}; rnd_hid_dad_buttons_t clbtn[] = {{"Close", 0}, {NULL, 0}}; - static rnd_rnd_box_t prvbb = {0, 0, PCB_MM_TO_COORD(10), PCB_MM_TO_COORD(10)}; + static rnd_rnd_box_t prvbb = {0, 0, RND_MM_TO_COORD(10), RND_MM_TO_COORD(10)}; int n; rnd_hid_attr_val_t hv; Index: trunk/src_plugins/propedit/propsel.c =================================================================== --- trunk/src_plugins/propedit/propsel.c (revision 31019) +++ trunk/src_plugins/propedit/propsel.c (revision 31020) @@ -636,7 +636,7 @@ pcb_opctx_t op; if (st->c_valid && (strcmp(pn, "scale") == 0) && - pcb_chg_obj_size(PCB_OBJ_TEXT, text->parent.layer, text, text, PCB_MIL_TO_COORD(st->c), st->c_absolute)) DONE; + pcb_chg_obj_size(PCB_OBJ_TEXT, text->parent.layer, text, text, RND_MIL_TO_COORD(st->c), st->c_absolute)) DONE; if (st->c_valid && (strcmp(pn, "fid") == 0)) { pcb_text_set_font(text, st->c); Index: trunk/src_plugins/query/query_l.c =================================================================== --- trunk/src_plugins/query/query_l.c (revision 31019) +++ trunk/src_plugins/query/query_l.c (revision 31020) @@ -1438,37 +1438,37 @@ case 52: YY_RULE_SETUP #line 102 "query_l.l" -{ qry_lval.u = get_unit_struct_by_allow(PCB_UNIT_ALLOW_MM); return T_UNIT; } +{ qry_lval.u = rnd_get_unit_struct_by_allow(PCB_UNIT_ALLOW_MM); return T_UNIT; } YY_BREAK case 53: YY_RULE_SETUP #line 103 "query_l.l" -{ qry_lval.u = get_unit_struct_by_allow(PCB_UNIT_ALLOW_M); return T_UNIT; } +{ qry_lval.u = rnd_get_unit_struct_by_allow(PCB_UNIT_ALLOW_M); return T_UNIT; } YY_BREAK case 54: YY_RULE_SETUP #line 104 "query_l.l" -{ qry_lval.u = get_unit_struct_by_allow(PCB_UNIT_ALLOW_UM); return T_UNIT; } +{ qry_lval.u = rnd_get_unit_struct_by_allow(PCB_UNIT_ALLOW_UM); return T_UNIT; } YY_BREAK case 55: YY_RULE_SETUP #line 105 "query_l.l" -{ qry_lval.u = get_unit_struct_by_allow(PCB_UNIT_ALLOW_CM); return T_UNIT; } +{ qry_lval.u = rnd_get_unit_struct_by_allow(PCB_UNIT_ALLOW_CM); return T_UNIT; } YY_BREAK case 56: YY_RULE_SETUP #line 106 "query_l.l" -{ qry_lval.u = get_unit_struct_by_allow(PCB_UNIT_ALLOW_NM); return T_UNIT; } +{ qry_lval.u = rnd_get_unit_struct_by_allow(PCB_UNIT_ALLOW_NM); return T_UNIT; } YY_BREAK case 57: YY_RULE_SETUP #line 107 "query_l.l" -{ qry_lval.u = get_unit_struct_by_allow(PCB_UNIT_ALLOW_MIL); return T_UNIT; } +{ qry_lval.u = rnd_get_unit_struct_by_allow(PCB_UNIT_ALLOW_MIL); return T_UNIT; } YY_BREAK case 58: YY_RULE_SETUP #line 108 "query_l.l" -{ qry_lval.u = get_unit_struct_by_allow(PCB_UNIT_ALLOW_IN); return T_UNIT; } +{ qry_lval.u = rnd_get_unit_struct_by_allow(PCB_UNIT_ALLOW_IN); return T_UNIT; } YY_BREAK case 59: YY_RULE_SETUP Index: trunk/src_plugins/query/query_l.l =================================================================== --- trunk/src_plugins/query/query_l.l (revision 31019) +++ trunk/src_plugins/query/query_l.l (revision 31020) @@ -99,13 +99,13 @@ "$dwg_area_x" { qry_lval.c = PCB->hidlib.size_x; return T_INT; } "$dwg_area_y" { qry_lval.c = PCB->hidlib.size_y; return T_INT; } -mm { qry_lval.u = get_unit_struct_by_allow(PCB_UNIT_ALLOW_MM); return T_UNIT; } -m { qry_lval.u = get_unit_struct_by_allow(PCB_UNIT_ALLOW_M); return T_UNIT; } -um { qry_lval.u = get_unit_struct_by_allow(PCB_UNIT_ALLOW_UM); return T_UNIT; } -cm { qry_lval.u = get_unit_struct_by_allow(PCB_UNIT_ALLOW_CM); return T_UNIT; } -nm { qry_lval.u = get_unit_struct_by_allow(PCB_UNIT_ALLOW_NM); return T_UNIT; } -mil { qry_lval.u = get_unit_struct_by_allow(PCB_UNIT_ALLOW_MIL); return T_UNIT; } -inch { qry_lval.u = get_unit_struct_by_allow(PCB_UNIT_ALLOW_IN); return T_UNIT; } +mm { qry_lval.u = rnd_get_unit_struct_by_allow(PCB_UNIT_ALLOW_MM); return T_UNIT; } +m { qry_lval.u = rnd_get_unit_struct_by_allow(PCB_UNIT_ALLOW_M); return T_UNIT; } +um { qry_lval.u = rnd_get_unit_struct_by_allow(PCB_UNIT_ALLOW_UM); return T_UNIT; } +cm { qry_lval.u = rnd_get_unit_struct_by_allow(PCB_UNIT_ALLOW_CM); return T_UNIT; } +nm { qry_lval.u = rnd_get_unit_struct_by_allow(PCB_UNIT_ALLOW_NM); return T_UNIT; } +mil { qry_lval.u = rnd_get_unit_struct_by_allow(PCB_UNIT_ALLOW_MIL); return T_UNIT; } +inch { qry_lval.u = rnd_get_unit_struct_by_allow(PCB_UNIT_ALLOW_IN); return T_UNIT; } thus { return T_THUS; } [|][|] { return T_OR; } Index: trunk/src_plugins/query/query_y.c =================================================================== --- trunk/src_plugins/query/query_y.c (revision 31019) +++ trunk/src_plugins/query/query_y.c (revision 31020) @@ -120,9 +120,9 @@ dst = -dst; \ if (unit != NULL) { \ if (unit->family == PCB_UNIT_IMPERIAL) \ - dst = PCB_MIL_TO_COORD(dst); \ + dst = RND_MIL_TO_COORD(dst); \ else if (unit->family == PCB_UNIT_METRIC) \ - dst = PCB_MM_TO_COORD(dst); \ + dst = RND_MM_TO_COORD(dst); \ dst /= unit->scale_factor; \ } \ } while(0) Index: trunk/src_plugins/query/query_y.y =================================================================== --- trunk/src_plugins/query/query_y.y (revision 31019) +++ trunk/src_plugins/query/query_y.y (revision 31020) @@ -43,9 +43,9 @@ dst = -dst; \ if (unit != NULL) { \ if (unit->family == PCB_UNIT_IMPERIAL) \ - dst = PCB_MIL_TO_COORD(dst); \ + dst = RND_MIL_TO_COORD(dst); \ else if (unit->family == PCB_UNIT_METRIC) \ - dst = PCB_MM_TO_COORD(dst); \ + dst = RND_MM_TO_COORD(dst); \ dst /= unit->scale_factor; \ } \ } while(0) Index: trunk/src_plugins/report/report.c =================================================================== --- trunk/src_plugins/report/report.c (revision 31019) +++ trunk/src_plugins/report/report.c (revision 31020) @@ -270,9 +270,9 @@ aunit = rnd_conf.editor.grid_unit->suffix; if (aunit[1] == 'm') - u = PCB_MM_TO_COORD(1); + u = RND_MM_TO_COORD(1); else - u = PCB_MIL_TO_COORD(1); + u = RND_MIL_TO_COORD(1); area = pcb_poly_area(poly); area = area / u; @@ -655,7 +655,7 @@ return -1; } -#define MINDIST PCB_MIL_TO_COORD(40) +#define MINDIST RND_MIL_TO_COORD(40) if ((rnd_distance(l->Point1.X, l->Point1.Y, x, y) < MINDIST) || (rnd_distance(l->Point2.X, l->Point2.Y, x, y) < MINDIST)) { rnd_message(RND_MSG_ERROR, "Can not split near the endpoint of a line\n"); return -1; Index: trunk/src_plugins/shape/shape.c =================================================================== --- trunk/src_plugins/shape/shape.c (revision 31019) +++ trunk/src_plugins/shape/shape.c (revision 31020) @@ -160,7 +160,7 @@ else need_rot = 0; - segs = sqrt((double)(rx+ry) / (double)PCB_MM_TO_COORD(0.1)); + segs = sqrt((double)(rx+ry) / (double)RND_MM_TO_COORD(0.1)); if (segs < 3) segs = 3; if (segs > 15) segs = 15; Index: trunk/src_plugins/shape/shape_dialog.c =================================================================== --- trunk/src_plugins/shape/shape_dialog.c (revision 31019) +++ trunk/src_plugins/shape/shape_dialog.c (revision 31020) @@ -140,8 +140,8 @@ void pcb_shape_dialog(pcb_board_t *pcb, pcb_data_t *data, pcb_layer_t *layer, rnd_bool modal) { ctx_t *shp = calloc(sizeof(ctx_t), 1); - rnd_coord_t mm2 = PCB_MM_TO_COORD(2); - rnd_coord_t maxr = PCB_MM_TO_COORD(1000); + rnd_coord_t mm2 = RND_MM_TO_COORD(2); + rnd_coord_t maxr = RND_MM_TO_COORD(1000); const char *tabs[] = {"Regular polygon", "Round rectangle", "Filled circle", NULL}; rnd_hid_dad_buttons_t clbtn[] = {{"Close", 0}, {NULL, 0}}; @@ -382,7 +382,7 @@ RND_DAD_END(shp->dlg); RND_DAD_NEW("shape", shp->dlg, "dlg_shape", shp, modal, shp_close_cb); - RND_DAD_SET_VALUE(shp->dlg_hid_ctx, shp->dia, crd, PCB_MM_TO_COORD(25.4)); /* suppress a runtime warning on invalid dia (zero) */ + RND_DAD_SET_VALUE(shp->dlg_hid_ctx, shp->dia, crd, RND_MM_TO_COORD(25.4)); /* suppress a runtime warning on invalid dia (zero) */ shp_chg_circle(shp->dlg_hid_ctx, shp, NULL); shp_chg_roundrect(shp->dlg_hid_ctx, shp, NULL); shp_chg_regpoly(shp->dlg_hid_ctx, shp, NULL); /* has to be the last */ Index: trunk/src_plugins/teardrops/teardrops.c =================================================================== --- trunk/src_plugins/teardrops/teardrops.c (revision 31019) +++ trunk/src_plugins/teardrops/teardrops.c (revision 31020) @@ -53,7 +53,7 @@ pcb_arc_t *arc; fprintf(stderr, "...Line ((%.6f, %.6f), (%.6f, %.6f)): ", - PCB_COORD_TO_MM(l->Point1.X), PCB_COORD_TO_MM(l->Point1.Y), PCB_COORD_TO_MM(l->Point2.X), PCB_COORD_TO_MM(l->Point2.Y)); + RND_COORD_TO_MM(l->Point1.X), RND_COORD_TO_MM(l->Point1.Y), RND_COORD_TO_MM(l->Point2.X), RND_COORD_TO_MM(l->Point2.Y)); /* if our line is to short ignore it */ if (rnd_distance2(l->Point1.X, l->Point1.Y, l->Point2.X, l->Point2.Y) < MIN_LINE_LENGTH2) { @@ -61,7 +61,7 @@ return 1; } - fprintf(stderr, "......Point (%.6f, %.6f): ", PCB_COORD_TO_MM(px), PCB_COORD_TO_MM(py)); + fprintf(stderr, "......Point (%.6f, %.6f): ", RND_COORD_TO_MM(px), RND_COORD_TO_MM(py)); if (rnd_distance2(l->Point1.X, l->Point1.Y, px, py) < MAX_DISTANCE2) { x1 = l->Point1.X; @@ -85,7 +85,7 @@ t = l->Thickness / 2.0; if (t > r) { - fprintf(stderr, "t > r: t = %3.6f, r = %3.6f\n", PCB_COORD_TO_MM(t), PCB_COORD_TO_MM(r)); + fprintf(stderr, "t > r: t = %3.6f, r = %3.6f\n", RND_COORD_TO_MM(t), RND_COORD_TO_MM(r)); return 1; } @@ -105,7 +105,7 @@ if (radius < r || radius < t) { fprintf(stderr, "(radius < r || radius < t): radius = %3.6f, r = %3.6f, t = %3.6f\n", - PCB_COORD_TO_MM(radius), PCB_COORD_TO_MM(r), PCB_COORD_TO_MM(t)); + RND_COORD_TO_MM(radius), RND_COORD_TO_MM(r), RND_COORD_TO_MM(t)); return 1; } } @@ -208,7 +208,7 @@ px /= shp->data.poly.len; py /= shp->data.poly.len; - mindist = PCB_MM_TO_COORD(8); + mindist = RND_MM_TO_COORD(8); mindist *= mindist; for(n = 0; n < shp->data.poly.len; n++) { double dist = rnd_distance2(px, py, shp->data.poly.x[n], shp->data.poly.y[n]); Index: trunk/src_plugins/vendordrill/vendor.c =================================================================== --- trunk/src_plugins/vendordrill/vendor.c (revision 31019) +++ trunk/src_plugins/vendordrill/vendor.c (revision 31020) @@ -179,20 +179,20 @@ /* figure out the units, if specified */ sval = rnd_hid_cfg_text_value(doc, "/units"); if (sval == NULL) { - sf = PCB_MIL_TO_COORD(1); + sf = RND_MIL_TO_COORD(1); } else if ((RND_NSTRCMP(sval, "mil") == 0) || (RND_NSTRCMP(sval, "mils") == 0)) { - sf = PCB_MIL_TO_COORD(1); + sf = RND_MIL_TO_COORD(1); } else if ((RND_NSTRCMP(sval, "inch") == 0) || (RND_NSTRCMP(sval, "inches") == 0)) { - sf = PCB_INCH_TO_COORD(1); + sf = RND_INCH_TO_COORD(1); } else if (RND_NSTRCMP(sval, "mm") == 0) { - sf = PCB_MM_TO_COORD(1); + sf = RND_MM_TO_COORD(1); } else { rnd_message(RND_MSG_ERROR, "\"%s\" is not a supported units. Defaulting to inch\n", sval); - sf = PCB_INCH_TO_COORD(1); + sf = RND_INCH_TO_COORD(1); } /* default to ROUND_UP */