Index: trunk/src/hid_attrib.c =================================================================== --- trunk/src/hid_attrib.c (revision 26940) +++ trunk/src/hid_attrib.c (revision 26941) @@ -141,7 +141,7 @@ break; case PCB_HATT_REAL: if (a->value) - *(double *) a->value = a->default_val.real_value; + *(double *) a->value = a->default_val.dbl; break; case PCB_HATT_STRING: if (a->value) @@ -198,7 +198,7 @@ if (a->value) *(double *) a->value = strtod((*argv)[1], 0); else - a->default_val.real_value = strtod((*argv)[1], 0); + a->default_val.dbl = strtod((*argv)[1], 0); (*argc)--; (*argv)++; break; Index: trunk/src/hid_attrib.h =================================================================== --- trunk/src/hid_attrib.h (revision 26940) +++ trunk/src/hid_attrib.h (revision 26941) @@ -12,7 +12,7 @@ struct pcb_hid_attr_val_s { long lng; const char *str; - double real_value; + double dbl; pcb_coord_t coord_value; pcb_color_t clr_value; void (*func)(); @@ -46,7 +46,7 @@ PCB_HATT_COORD, PCB_HATT_BUTTON, /* push button; default value is the label */ PCB_HATT_TREE, /* tree/list/table view; number of columns: pcb_hatt_table_cols; data is in field 'enumerations' */ - PCB_HATT_PROGRESS, /* progress bar; displays real_value between 0 and 1 */ + PCB_HATT_PROGRESS, /* progress bar; displays dbl between 0 and 1 */ PCB_HATT_PREVIEW, /* preview/render widget; callbacks in 'enumerations' */ PCB_HATT_PICTURE, /* static picture from xpm - picture data in enumerations */ PCB_HATT_PICBUTTON, /* button with static picture from xpm - picture data in enumerations */ @@ -56,8 +56,8 @@ /* groups (e.g. boxes) */ PCB_HATT_BEGIN_HBOX, /* NOTE: PCB_HATT_IS_COMPOSITE() depends on it */ PCB_HATT_BEGIN_VBOX, - PCB_HATT_BEGIN_HPANE, /* horizontal split and offer two vboxes; the split ratio is real_value between 0 and 1, that describes the left side's size */ - PCB_HATT_BEGIN_VPANE, /* vertical split and offer two vboxes; the split ratio is real_value between 0 and 1, that describes the left side's size */ + PCB_HATT_BEGIN_HPANE, /* horizontal split and offer two vboxes; the split ratio is dbl between 0 and 1, that describes the left side's size */ + PCB_HATT_BEGIN_VPANE, /* vertical split and offer two vboxes; the split ratio is dbl between 0 and 1, that describes the left side's size */ PCB_HATT_BEGIN_TABLE, /* min_val is the number of columns */ PCB_HATT_BEGIN_TABBED, /* tabbed view (e.g. notebook); ->enumerations stores the tab names and a NULL; default_val's integer value is the index of the current tab */ PCB_HATT_BEGIN_COMPOUND, /* subtree emulating a single widget; (pcb_hid_compound_t *) stored in END's enumerations */ Index: trunk/src/hid_dad.h =================================================================== --- trunk/src/hid_dad.h (revision 26940) +++ trunk/src/hid_dad.h (revision 26941) @@ -298,13 +298,13 @@ #define PCB_DAD_BEGIN_HPANE(table) \ do { \ PCB_DAD_BEGIN(table, PCB_HATT_BEGIN_HPANE); \ - table[table ## _len - 1].val.real_value = 0.5; \ + table[table ## _len - 1].val.dbl = 0.5; \ } while(0) #define PCB_DAD_BEGIN_VPANE(table) \ do { \ PCB_DAD_BEGIN(table, PCB_HATT_BEGIN_VPANE); \ - table[table ## _len - 1].val.real_value = 0.5; \ + table[table ## _len - 1].val.dbl = 0.5; \ } while(0) #define PCB_DAD_TREE(table, cols, first_col_is_tree, opt_header) \ @@ -489,7 +489,7 @@ case PCB_HATT_PROGRESS: \ case PCB_HATT_BEGIN_HPANE: \ case PCB_HATT_BEGIN_VPANE: \ - table[table ## _len - 1].field.real_value = (double)val; \ + table[table ## _len - 1].field.dbl = (double)val; \ break; \ case PCB_HATT_STRING: \ case PCB_HATT_TEXT: \ @@ -531,7 +531,7 @@ case PCB_HATT_PROGRESS: \ case PCB_HATT_BEGIN_HPANE: \ case PCB_HATT_BEGIN_VPANE: \ - table[table ## _len - 1].field.real_value = (double)val_; \ + table[table ## _len - 1].field.dbl = (double)val_; \ break; \ case PCB_HATT_STRING: \ case PCB_HATT_TEXT: \ Index: trunk/src/hid_dad_spin.c =================================================================== --- trunk/src/hid_dad_spin.c (revision 26940) +++ trunk/src/hid_dad_spin.c (revision 26941) @@ -238,7 +238,7 @@ step = 1; break; case PCB_DAD_SPIN_DOUBLE: - step = pow(10, floor(log10(fabs((double)end->val.real_value)) - 1.0)); + step = pow(10, floor(log10(fabs((double)end->val.dbl)) - 1.0)); break; case PCB_DAD_SPIN_COORD: if (spin->unit == NULL) { @@ -287,9 +287,9 @@ sprintf(buf, "%ld", end->val.lng); break; case PCB_DAD_SPIN_DOUBLE: - end->val.real_value += step; - SPIN_CLAMP(end->val.real_value); - sprintf(buf, "%f", end->val.real_value); + end->val.dbl += step; + SPIN_CLAMP(end->val.dbl); + sprintf(buf, "%f", end->val.dbl); break; case PCB_DAD_SPIN_COORD: end->val.coord_value += step; @@ -358,7 +358,7 @@ SPIN_CLAMP(d); if (*ends != '\0') warn = "Invalid numeric - result is truncated"; - end->val.real_value = d; + end->val.dbl = d; break; case PCB_DAD_SPIN_COORD: succ = pcb_get_value_unit(str->val.str, &absolute, 0, &d, &unit); @@ -468,7 +468,7 @@ str->val.str = pcb_strdup_printf("%ld", l); break; case PCB_DAD_SPIN_DOUBLE: - attr->val.real_value = d; + attr->val.dbl = d; free((char *)str->val.str); str->val.str = pcb_strdup_printf("%f", d); break; @@ -517,9 +517,9 @@ end->val.lng = val->lng; break; case PCB_DAD_SPIN_DOUBLE: - if (val->real_value == end->val.real_value) + if (val->dbl == end->val.dbl) return 0; - end->val.real_value = val->real_value; + end->val.dbl = val->dbl; break; case PCB_DAD_SPIN_COORD: if (val->coord_value == end->val.coord_value) Index: trunk/src/hid_dlg.c =================================================================== --- trunk/src/hid_dlg.c (revision 26940) +++ trunk/src/hid_dlg.c (revision 26941) @@ -233,7 +233,7 @@ closing = 0; } - val.real_value = (double)so_far / (double)total; + val.dbl = (double)so_far / (double)total; now = pcb_dtime(); if (now >= (last + (REFRESH_RATE / 1000.0))) { Index: trunk/src_plugins/ddraft/constraint_gui.c =================================================================== --- trunk/src_plugins/ddraft/constraint_gui.c (revision 26940) +++ trunk/src_plugins/ddraft/constraint_gui.c (revision 26941) @@ -71,7 +71,7 @@ #define c2g_float(name) \ do { \ - PCB_DAD_SET_VALUE(cnstgui_ctx.dlg_hid_ctx, cnstgui_ctx.name, real_value, cons.name); \ + PCB_DAD_SET_VALUE(cnstgui_ctx.dlg_hid_ctx, cnstgui_ctx.name, dbl, cons.name); \ } while(0) #define c2g_coord(name) \ @@ -128,12 +128,12 @@ pcb_bool succ; g2c_array(line_angle, strtod(curr, &end)); - g2c_scalar(line_angle_mod, real_value); + g2c_scalar(line_angle_mod, dbl); g2c_array(line_length, pcb_get_value(curr, NULL, NULL, &succ)); g2c_scalar(line_length_mod, coord_value); g2c_array(move_angle, strtod(curr, &end)); - g2c_scalar(move_angle_mod, real_value); + g2c_scalar(move_angle_mod, dbl); g2c_array(move_length, pcb_get_value(curr, NULL, NULL, &succ)); g2c_scalar(move_length_mod, coord_value); } @@ -141,7 +141,7 @@ static void reset_line(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr) { PCB_DAD_SET_VALUE(cnstgui_ctx.dlg_hid_ctx, cnstgui_ctx.line_angle, str, pcb_strdup("")); - PCB_DAD_SET_VALUE(cnstgui_ctx.dlg_hid_ctx, cnstgui_ctx.line_angle_mod, real_value, 0); + PCB_DAD_SET_VALUE(cnstgui_ctx.dlg_hid_ctx, cnstgui_ctx.line_angle_mod, dbl, 0); PCB_DAD_SET_VALUE(cnstgui_ctx.dlg_hid_ctx, cnstgui_ctx.line_length, str, pcb_strdup("")); PCB_DAD_SET_VALUE(cnstgui_ctx.dlg_hid_ctx, cnstgui_ctx.line_length_mod, coord_value, 0); gui2cons(hid_ctx, caller_data, attr); @@ -150,7 +150,7 @@ static void reset_move(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr) { PCB_DAD_SET_VALUE(cnstgui_ctx.dlg_hid_ctx, cnstgui_ctx.move_angle, str, pcb_strdup("")); - PCB_DAD_SET_VALUE(cnstgui_ctx.dlg_hid_ctx, cnstgui_ctx.move_angle_mod, real_value, 0); + PCB_DAD_SET_VALUE(cnstgui_ctx.dlg_hid_ctx, cnstgui_ctx.move_angle_mod, dbl, 0); PCB_DAD_SET_VALUE(cnstgui_ctx.dlg_hid_ctx, cnstgui_ctx.move_length, str, pcb_strdup("")); PCB_DAD_SET_VALUE(cnstgui_ctx.dlg_hid_ctx, cnstgui_ctx.move_length_mod, coord_value, 0); gui2cons(hid_ctx, caller_data, attr); Index: trunk/src_plugins/dialogs/dlg_export.c =================================================================== --- trunk/src_plugins/dialogs/dlg_export.c (revision 26940) +++ trunk/src_plugins/dialogs/dlg_export.c (revision 26941) @@ -210,7 +210,7 @@ case PCB_HATT_REAL: PCB_DAD_REAL(export_ctx.dlg, opts[i].name); PCB_DAD_MINMAX(export_ctx.dlg, opts[i].min_val, opts[i].max_val); - PCB_DAD_DEFAULT_NUM(export_ctx.dlg, opts[i].default_val.real_value); + PCB_DAD_DEFAULT_NUM(export_ctx.dlg, opts[i].default_val.dbl); break; case PCB_HATT_UNIT: PCB_DAD_UNIT(export_ctx.dlg, PCB_UNIT_METRIC | PCB_UNIT_IMPERIAL); Index: trunk/src_plugins/dialogs/dlg_netlist.c =================================================================== --- trunk/src_plugins/dialogs/dlg_netlist.c (revision 26940) +++ trunk/src_plugins/dialogs/dlg_netlist.c (revision 26941) @@ -420,7 +420,7 @@ { pcb_hid_attr_val_t hv; - hv.real_value = 0.33; + hv.dbl = 0.33; pcb_gui->attr_dlg_set_value(netlist_ctx.dlg_hid_ctx, wvpan, &hv); } Index: trunk/src_plugins/dialogs/dlg_padstack.c =================================================================== --- trunk/src_plugins/dialogs/dlg_padstack.c (revision 26940) +++ trunk/src_plugins/dialogs/dlg_padstack.c (revision 26941) @@ -85,7 +85,7 @@ pcb_snprintf(tmp, sizeof(tmp), "#%ld:%d (%s)", (long int)pse->ps->proto, pse->ps->protoi, prn); PCB_DAD_SET_VALUE(hid_ctx, pse->proto_id, str, tmp); PCB_DAD_SET_VALUE(hid_ctx, pse->clearance, coord_value, pse->ps->Clearance); - PCB_DAD_SET_VALUE(hid_ctx, pse->rot, real_value, pse->ps->rot); + PCB_DAD_SET_VALUE(hid_ctx, pse->rot, dbl, pse->ps->rot); PCB_DAD_SET_VALUE(hid_ctx, pse->xmirror, lng, pse->ps->xmirror); PCB_DAD_SET_VALUE(hid_ctx, pse->smirror, lng, pse->ps->smirror); @@ -262,7 +262,7 @@ pcb_pstk_change_instance(pse->ps, NULL, &pse->attrs[pse->clearance].val.coord_value, - &pse->attrs[pse->rot].val.real_value, + &pse->attrs[pse->rot].val.dbl, &xm, &sm); pse->attrs[pse->xmirror].val.lng = xm; pse->attrs[pse->smirror].val.lng = sm; Index: trunk/src_plugins/dialogs/dlg_pref.c =================================================================== --- trunk/src_plugins/dialogs/dlg_pref.c (revision 26940) +++ trunk/src_plugins/dialogs/dlg_pref.c (revision 26941) @@ -69,7 +69,7 @@ PCB_DAD_SET_VALUE(pref_ctx.dlg_hid_ctx, item->wid, lng, cn->val.integer[0]); break; case CFN_REAL: - PCB_DAD_SET_VALUE(pref_ctx.dlg_hid_ctx, item->wid, real_value, cn->val.real[0]); + PCB_DAD_SET_VALUE(pref_ctx.dlg_hid_ctx, item->wid, dbl, cn->val.real[0]); break; case CFN_STRING: PCB_DAD_SET_VALUE(pref_ctx.dlg_hid_ctx, item->wid, str, cn->val.string[0]); @@ -98,8 +98,8 @@ conf_setf(ctx->role, item->confpath, -1, "%d", attr->val.lng); break; case CFN_REAL: - if (cn->val.real[0] != attr->val.real_value) - conf_setf(ctx->role, item->confpath, -1, "%f", attr->val.real_value); + if (cn->val.real[0] != attr->val.dbl) + conf_setf(ctx->role, item->confpath, -1, "%f", attr->val.dbl); break; case CFN_STRING: if (strcmp(cn->val.string[0], attr->val.str) != 0) @@ -166,7 +166,7 @@ PCB_DAD_REAL(ctx->dlg, ""); item->wid = PCB_DAD_CURRENT(ctx->dlg); PCB_DAD_MINMAX(ctx->dlg, 0, INT_MAX); - ctx->dlg[item->wid].val.real_value = cn->val.real[0]; + ctx->dlg[item->wid].val.dbl = cn->val.real[0]; PCB_DAD_HELP(ctx->dlg, cn->description); PCB_DAD_CHANGE_CB(ctx->dlg, change_cb); break; Index: trunk/src_plugins/dialogs/dlg_pref_board.c =================================================================== --- trunk/src_plugins/dialogs/dlg_pref_board.c (revision 26940) +++ trunk/src_plugins/dialogs/dlg_pref_board.c (revision 26941) @@ -36,7 +36,7 @@ static void pref_board_brd2dlg(pref_ctx_t *ctx) { PCB_DAD_SET_VALUE(ctx->dlg_hid_ctx, ctx->board.wname, str, PCB_EMPTY(PCB->hidlib.name)); - PCB_DAD_SET_VALUE(ctx->dlg_hid_ctx, ctx->board.wthermscale, real_value, PCB->ThermScale); + PCB_DAD_SET_VALUE(ctx->dlg_hid_ctx, ctx->board.wthermscale, dbl, PCB->ThermScale); PCB_DAD_SET_VALUE(ctx->dlg_hid_ctx, ctx->board.wtype, str, (PCB->is_footprint ? "footprint" : "PCB board")); } @@ -56,7 +56,7 @@ changed = 1; } - newtherm = ctx->dlg[ctx->board.wthermscale].val.real_value; + newtherm = ctx->dlg[ctx->board.wthermscale].val.dbl; if (PCB->ThermScale != newtherm) { PCB->ThermScale = newtherm; changed = 1; @@ -91,7 +91,7 @@ PCB_DAD_REAL(ctx->dlg, ""); ctx->board.wthermscale = PCB_DAD_CURRENT(ctx->dlg); PCB_DAD_MINMAX(ctx->dlg, 0.01, 100); - ctx->dlg[ctx->board.wthermscale].val.real_value = PCB->ThermScale; + ctx->dlg[ctx->board.wthermscale].val.dbl = PCB->ThermScale; PCB_DAD_CHANGE_CB(ctx->dlg, pref_board_dlg2brd); PCB_DAD_LABEL(ctx->dlg, "Type"); PCB_DAD_LABEL(ctx->dlg, ""); Index: trunk/src_plugins/dialogs/dlg_pref_conf.c =================================================================== --- trunk/src_plugins/dialogs/dlg_pref_conf.c (revision 26940) +++ trunk/src_plugins/dialogs/dlg_pref_conf.c (revision 26941) @@ -467,7 +467,7 @@ void pcb_dlg_pref_conf_open(pref_ctx_t *ctx, const char *tabarg) { pcb_hid_attr_val_t hv; - hv.real_value = 0.25; + hv.dbl = 0.25; pcb_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->conf.wmainp, &hv); if (tabarg != NULL) { Index: trunk/src_plugins/dialogs/dlg_pref_confedit.c =================================================================== --- trunk/src_plugins/dialogs/dlg_pref_confedit.c (revision 26940) +++ trunk/src_plugins/dialogs/dlg_pref_confedit.c (revision 26941) @@ -70,7 +70,7 @@ pcb_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wnewval, &hv); break; case CFN_REAL: - hv.real_value = strtod(val, NULL); + hv.dbl = strtod(val, NULL); pcb_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wnewval, &hv); break; case CFN_COORD: @@ -129,7 +129,7 @@ case CFN_STRING: val = attr->val.str; break; case CFN_BOOLEAN: case CFN_INTEGER: sprintf(buf, "%ld", attr->val.lng); break; - case CFN_REAL: sprintf(buf, "%f", attr->val.real_value); break; + case CFN_REAL: sprintf(buf, "%f", attr->val.dbl); break; case CFN_COORD: pcb_snprintf(buf, sizeof(buf), "%.08$mH", attr->val.coord_value); break; case CFN_UNIT: if ((attr->val.lng < 0) || (attr->val.lng >= pcb_get_n_units(0))) Index: trunk/src_plugins/dialogs/dlg_pref_sizes.c =================================================================== --- trunk/src_plugins/dialogs/dlg_pref_sizes.c (revision 26940) +++ trunk/src_plugins/dialogs/dlg_pref_sizes.c (revision 26941) @@ -71,13 +71,13 @@ { if ((pref_ctx.sizes.lock) || (!pref_ctx.active)) return; - PCB_DAD_SET_VALUE(pref_ctx.dlg_hid_ctx, pref_ctx.sizes.wisle, real_value, conf_core.design.poly_isle_area / 1000000.0); + PCB_DAD_SET_VALUE(pref_ctx.dlg_hid_ctx, pref_ctx.sizes.wisle, dbl, conf_core.design.poly_isle_area / 1000000.0); } static void pref_isle_dlg2brd(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr) { pref_ctx_t *ctx = caller_data; - double v = ctx->dlg[ctx->sizes.wisle].val.real_value * 1000000.0; + double v = ctx->dlg[ctx->sizes.wisle].val.dbl * 1000000.0; ctx->sizes.lock++; conf_setf(ctx->role, "design/poly_isle_area", -1, "%f", v); @@ -126,7 +126,7 @@ PCB_DAD_REAL(ctx->dlg, ""); ctx->sizes.wisle = PCB_DAD_CURRENT(ctx->dlg); PCB_DAD_MINMAX(ctx->dlg, 0, PCB_MAX_COORD); - ctx->dlg[ctx->sizes.wisle].val.real_value = (conf_core.design.poly_isle_area / 1000000.0); + ctx->dlg[ctx->sizes.wisle].val.dbl = (conf_core.design.poly_isle_area / 1000000.0); PCB_DAD_CHANGE_CB(ctx->dlg, pref_isle_dlg2brd); PCB_DAD_END(ctx->dlg); PCB_DAD_END(ctx->dlg); Index: trunk/src_plugins/dialogs/dlg_printcalib.c =================================================================== --- trunk/src_plugins/dialogs/dlg_printcalib.c (revision 26940) +++ trunk/src_plugins/dialogs/dlg_printcalib.c (revision 26941) @@ -55,7 +55,7 @@ if (pcb_attribute_dialog("printer_calibrate", printer_calibrate_attrs, 3, printer_calibrate_values, "Printer Calibration Values", NULL)) return 1; - printer->calibrate(printer, printer_calibrate_values[1].real_value, printer_calibrate_values[2].real_value); + printer->calibrate(printer, printer_calibrate_values[1].dbl, printer_calibrate_values[2].dbl); PCB_ACT_IRES(0); return 0; } Index: trunk/src_plugins/dialogs/dlg_search_edit.c =================================================================== --- trunk/src_plugins/dialogs/dlg_search_edit.c (revision 26940) +++ trunk/src_plugins/dialogs/dlg_search_edit.c (revision 26941) @@ -56,7 +56,7 @@ ctx->se.right = pcb_strdup_printf("%d", attr->val.lng); break; case RIGHT_DOUBLE: - ctx->se.right = pcb_strdup_printf("%f", attr->val.real_value); + ctx->se.right = pcb_strdup_printf("%f", attr->val.dbl); break; case RIGHT_COORD: ctx->se.right = pcb_strdup_printf("%$mm", attr->val.coord_value); @@ -170,7 +170,7 @@ set_right(ctx, &ctx->dlg[ctx->wright[s->expr->rtype]]); break; case RIGHT_DOUBLE: - hv.real_value = strtod(hv.str, NULL); + hv.dbl = strtod(hv.str, NULL); pcb_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wright[s->expr->rtype], &hv); if (empty) set_right(ctx, &ctx->dlg[ctx->wright[s->expr->rtype]]); Index: trunk/src_plugins/dialogs/dlg_test.c =================================================================== --- trunk/src_plugins/dialogs/dlg_test.c (revision 26940) +++ trunk/src_plugins/dialogs/dlg_test.c (revision 26941) @@ -304,7 +304,7 @@ pcb_hid_attr_val_t hv; hv.lng = 42; - hv.real_value = 42.0; + hv.dbl = 42.0; hv.coord_value = PCB_MM_TO_COORD(42); pcb_gui->attr_dlg_set_value(hid_ctx, ctx->wspin_int, &hv); @@ -322,7 +322,7 @@ sprintf(tmp, "%ld", ctx->dlg[ctx->wspin_int].val.lng); pcb_gui->attr_dlg_set_value(hid_ctx, ctx->wspout_int, &hv); - sprintf(tmp, "%f", ctx->dlg[ctx->wspin_double].val.real_value); + sprintf(tmp, "%f", ctx->dlg[ctx->wspin_double].val.dbl); pcb_gui->attr_dlg_set_value(hid_ctx, ctx->wspout_double, &hv); pcb_snprintf(tmp, sizeof(tmp), "%mm\n%ml", ctx->dlg[ctx->wspin_coord].val.coord_value, ctx->dlg[ctx->wspin_coord].val.coord_value); pcb_gui->attr_dlg_set_value(hid_ctx, ctx->wspout_coord, &hv); @@ -357,7 +357,7 @@ new_row = pcb_dad_tree_insert(treea, row, rowdata); new_row->user_data2.lng = 1; - val.real_value = (double)ctx->ttctr / 20.0; + val.dbl = (double)ctx->ttctr / 20.0; pcb_gui->attr_dlg_set_value(hid_ctx, ctx->wprog, &val); } @@ -373,7 +373,7 @@ new_row = pcb_dad_tree_append(treea, row, rowdata); new_row->user_data2.lng = 1; - val.real_value = (double)ctx->ttctr / 20.0; + val.dbl = (double)ctx->ttctr / 20.0; pcb_gui->attr_dlg_set_value(hid_ctx, ctx->wprog, &val); } @@ -436,7 +436,7 @@ test_t *ctx = caller_data; pcb_hid_attr_val_t val; - val.real_value = 0.3; + val.dbl = 0.3; pcb_gui->attr_dlg_set_value(hid_ctx, ctx->whpane, &val); pcb_gui->attr_dlg_set_value(hid_ctx, ctx->wvpane, &val); } Index: trunk/src_plugins/export_gcode/gcode.c =================================================================== --- trunk/src_plugins/export_gcode/gcode.c (revision 26940) +++ trunk/src_plugins/export_gcode/gcode.c (revision 26941) @@ -402,11 +402,11 @@ scale = metric ? 1.0 / pcb_coord_to_unit(unit, PCB_MM_TO_COORD(1.0)) : 1.0 / pcb_coord_to_unit(unit, PCB_INCH_TO_COORD(1.0)); - gcode_cutdepth = options[HA_cutdepth].real_value * scale; - gcode_drilldepth = options[HA_drilldepth].real_value * scale; - gcode_safeZ = options[HA_safeZ].real_value * scale; - gcode_toolradius = metric ? PCB_MM_TO_COORD(options[HA_toolradius].real_value * scale) - : PCB_INCH_TO_COORD(options[HA_toolradius].real_value * scale); + gcode_cutdepth = options[HA_cutdepth].dbl * scale; + gcode_drilldepth = options[HA_drilldepth].dbl * scale; + gcode_safeZ = options[HA_safeZ].dbl * scale; + gcode_toolradius = metric ? PCB_MM_TO_COORD(options[HA_toolradius].dbl * scale) + : PCB_INCH_TO_COORD(options[HA_toolradius].dbl * scale); gcode_choose_groups(); for (i = 0; i < PCB_MAX_LAYERGRP; i++) { Index: trunk/src_plugins/export_openems/excitation.c =================================================================== --- trunk/src_plugins/export_openems/excitation.c (revision 26940) +++ trunk/src_plugins/export_openems/excitation.c (revision 26941) @@ -102,7 +102,7 @@ { if (save) { char tmp[128]; - sprintf(tmp, "%f Hz", exc_ctx.dlg[widx].val.real_value); + sprintf(tmp, "%f Hz", exc_ctx.dlg[widx].val.dbl); ser_save(tmp, attrkey); } else { @@ -111,17 +111,17 @@ const char *orig = ser_load(attrkey); if (orig != NULL) { - hv.real_value = strtod(orig, &end); + hv.dbl = strtod(orig, &end); if (*end != '\0') { while(isspace(*end)) end++; if (pcb_strcasecmp(end, "hz") != 0) { pcb_message(PCB_MSG_ERROR, "Invalid real value (Hz) in board attribute '%s': '%s'\n", attrkey, orig); - hv.real_value = 0; + hv.dbl = 0; } } } else - hv.real_value = 0; + hv.dbl = 0; pcb_gui->attr_dlg_set_value(exc_ctx.dlg_hid_ctx, widx, &hv); } Index: trunk/src_plugins/export_openems/export_openems.c =================================================================== --- trunk/src_plugins/export_openems/export_openems.c (revision 26940) +++ trunk/src_plugins/export_openems/export_openems.c (revision 26941) @@ -215,8 +215,8 @@ fprintf(ctx->f, "%% void is the material used for: fill holes, cutouts in substrate, etc\n"); fprintf(ctx->f, "void.name = '%s';\n", ctx->options[HA_void_name].str); - fprintf(ctx->f, "void.epsilon = %f;\n", ctx->options[HA_void_epsilon].real_value); - fprintf(ctx->f, "void.mue = %f;\n", ctx->options[HA_void_mue].real_value); + fprintf(ctx->f, "void.epsilon = %f;\n", ctx->options[HA_void_epsilon].dbl); + fprintf(ctx->f, "void.mue = %f;\n", ctx->options[HA_void_mue].dbl); fprintf(ctx->f, "%% void.kappa = kappa;\n"); fprintf(ctx->f, "%% void.sigma = sigma;\n"); fprintf(ctx->f, "\n"); @@ -363,7 +363,7 @@ { char *end, *s, *safe_name = pcb_strdup(port_name); const char *att; - double resistance = ctx->options[HA_def_port_res].real_value; + double resistance = ctx->options[HA_def_port_res].dbl; int act = 1; ctx->port_id++; Index: trunk/src_plugins/export_ps/eps.c =================================================================== --- trunk/src_plugins/export_ps/eps.c (revision 26940) +++ trunk/src_plugins/export_ps/eps.c (revision 26941) @@ -172,7 +172,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].real_value +#define pcb2em(x) 1 + PCB_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"); @@ -184,7 +184,7 @@ fprintf(f, "72 72 scale\n"); fprintf(f, "1 dup neg scale\n"); - fprintf(f, "%g dup scale\n", options_[HA_scale].real_value); + fprintf(f, "%g dup scale\n", options_[HA_scale].dbl); pcb_fprintf(f, "%mi %mi translate\n", -bounds->X1, -bounds->Y2); if (options_[HA_as_shown].lng && conf_core.editor.show_solder_side) pcb_fprintf(f, "-1 1 scale %mi 0 translate\n", bounds->X1 - bounds->X2); Index: trunk/src_plugins/export_ps/ps.c =================================================================== --- trunk/src_plugins/export_ps/ps.c (revision 26940) +++ trunk/src_plugins/export_ps/ps.c (revision 26941) @@ -538,15 +538,15 @@ global.automirror = options[HA_automirror].lng; global.incolor = options[HA_color].lng; global.invert = options[HA_psinvert].lng; - global.fade_ratio = PCB_CLAMP(options[HA_psfade].real_value, 0, 1); + global.fade_ratio = PCB_CLAMP(options[HA_psfade].dbl, 0, 1); global.media_idx = options[HA_media].lng; global.media_width = pcb_media_data[global.media_idx].width; global.media_height = pcb_media_data[global.media_idx].height; global.ps_width = global.media_width - 2.0 * pcb_media_data[global.media_idx].margin_x; global.ps_height = global.media_height - 2.0 * pcb_media_data[global.media_idx].margin_y; - global.scale_factor = options[HA_scale].real_value; - global.calibration_x = options[HA_xcalib].real_value; - global.calibration_y = options[HA_ycalib].real_value; + global.scale_factor = options[HA_scale].dbl; + global.calibration_x = options[HA_xcalib].dbl; + global.calibration_y = options[HA_ycalib].dbl; global.drillcopper = options[HA_drillcopper].lng; global.legend = options[HA_legend].lng; global.single_page = options[HA_single_page].lng; @@ -1339,7 +1339,7 @@ if (guess(xval, 15, &global.calibration_x)) if (guess(xval, 7.5, &global.calibration_x)) { if (xval < 2) - ps_attribute_list[HA_xcalib].default_val.real_value = global.calibration_x = xval; + ps_attribute_list[HA_xcalib].default_val.dbl = global.calibration_x = xval; else pcb_message(PCB_MSG_ERROR, "X value of %g is too far off.\n" "Expecting it near: 1.0, 4.0, 15.0, 7.5\n", xval); } @@ -1347,7 +1347,7 @@ if (guess(yval, 20, &global.calibration_y)) if (guess(yval, 10, &global.calibration_y)) { if (yval < 2) - ps_attribute_list[HA_ycalib].default_val.real_value = global.calibration_y = yval; + ps_attribute_list[HA_ycalib].default_val.dbl = global.calibration_y = yval; else pcb_message(PCB_MSG_ERROR, "Y value of %g is too far off.\n" "Expecting it near: 1.0, 4.0, 20.0, 10.0\n", yval); } Index: trunk/src_plugins/hid_lesstif/dialogs.c =================================================================== --- trunk/src_plugins/hid_lesstif/dialogs.c (revision 26940) +++ trunk/src_plugins/hid_lesstif/dialogs.c (revision 26941) @@ -540,13 +540,13 @@ case PCB_HATT_REAL: goto err; case PCB_HATT_PROGRESS: - ltf_progress_set(ctx, idx, val->real_value); + ltf_progress_set(ctx, idx, val->dbl); break; case PCB_HATT_COLOR: ltf_colorbtn_set(ctx, idx, &val->clr_value); break; case PCB_HATT_PREVIEW: - ltf_preview_set(ctx, idx, val->real_value); + ltf_preview_set(ctx, idx, val->dbl); break; case PCB_HATT_TEXT: ltf_text_set(ctx, idx, val->str); Index: trunk/src_plugins/hid_lesstif/main.c =================================================================== --- trunk/src_plugins/hid_lesstif/main.c (revision 26940) +++ trunk/src_plugins/hid_lesstif/main.c (revision 26941) @@ -1730,7 +1730,7 @@ r->resource_type = XmStrCast(XtRDouble); r->default_type = XmStrCast(XtRDouble); r->resource_size = sizeof(double); - r->default_addr = &(a->default_val.real_value); + r->default_addr = &(a->default_val.dbl); rcount++; break; case PCB_HATT_STRING: @@ -1818,7 +1818,7 @@ if (a->value) *(double *) a->value = v->f; else - a->default_val.real_value = v->f; + a->default_val.dbl = v->f; rcount++; break; case PCB_HATT_STRING: Index: trunk/src_plugins/lib_gtk_common/dlg_attr_box.c =================================================================== --- trunk/src_plugins/lib_gtk_common/dlg_attr_box.c (revision 26940) +++ trunk/src_plugins/lib_gtk_common/dlg_attr_box.c (revision 26941) @@ -30,7 +30,7 @@ { GtkWidget *pane = ctx->wl[idx]; GtkAllocation a; - double ratio = val->real_value; + double ratio = val->dbl; gint p, minp, maxp; if (ratio < 0.0) ratio = 0.0; Index: trunk/src_plugins/lib_gtk_common/dlg_attr_misc.c =================================================================== --- trunk/src_plugins/lib_gtk_common/dlg_attr_misc.c (revision 26940) +++ trunk/src_plugins/lib_gtk_common/dlg_attr_misc.c (revision 26941) @@ -33,7 +33,7 @@ static int ghid_progress_set(attr_dlg_t *ctx, int idx, const pcb_hid_attr_val_t *val) { GtkWidget *prg = ctx->wl[idx]; - double pos = val->real_value; + double pos = val->dbl; if (pos < 0.0) pos = 0.0; else if (pos > 1.0) pos = 1.0; Index: trunk/src_plugins/lib_hid_common/act_dad.c =================================================================== --- trunk/src_plugins/lib_hid_common/act_dad.c (revision 26940) +++ trunk/src_plugins/lib_hid_common/act_dad.c (revision 26941) @@ -463,7 +463,7 @@ case PCB_HATT_REAL: case PCB_HATT_PROGRESS: PCB_ACT_CONVARG(4, FGW_DOUBLE, dad, d = argv[4].val.nat_double); - PCB_DAD_SET_VALUE(dad->dlg_hid_ctx, wid, real_value, d); + PCB_DAD_SET_VALUE(dad->dlg_hid_ctx, wid, dbl, d); break; case PCB_HATT_INTEGER: PCB_ACT_CONVARG(4, FGW_INT, dad, i = argv[4].val.nat_int); Index: trunk/src_plugins/propedit/propdlg.c =================================================================== --- trunk/src_plugins/propedit/propdlg.c (revision 26940) +++ trunk/src_plugins/propedit/propdlg.c (revision 26941) @@ -224,7 +224,7 @@ switch(p->type) { case PCB_PROPT_STRING: hv.str = pcb_strdup(pv->string == NULL ? "" : pv->string); break; case PCB_PROPT_COORD: hv.coord_value = pv->coord; break; - case PCB_PROPT_ANGLE: hv.real_value = pv->angle; break; + case PCB_PROPT_ANGLE: hv.dbl = pv->angle; break; case PCB_PROPT_BOOL: case PCB_PROPT_INT: hv.lng = pv->i; break; case PCB_PROPT_COLOR: hv.clr_value = pv->clr; break; @@ -327,7 +327,7 @@ sctx.c_valid = 1; break; case PCB_PROPT_ANGLE: - sctx.d = ctx->dlg[ctx->wedit[p->type]].val.real_value; + sctx.d = ctx->dlg[ctx->wedit[p->type]].val.dbl; sctx.d_absolute = ctx->dlg[ctx->wabs[p->type]].val.lng; sctx.d_valid = 1; break; Index: trunk/src_plugins/shape/shape_dialog.c =================================================================== --- trunk/src_plugins/shape/shape_dialog.c (revision 26940) +++ trunk/src_plugins/shape/shape_dialog.c (revision 26941) @@ -59,7 +59,7 @@ shp->obj = (pcb_any_obj_t *)regpoly_place( shp->data, shp->layer, shp->dlg[shp->corners].val.lng, shp->dlg[shp->prx].val.coord_value, shp->dlg[shp->pry].val.coord_value, - shp->dlg[shp->prot].val.real_value, + shp->dlg[shp->prot].val.dbl, shp->dlg[shp->pcx].val.coord_value, shp->dlg[shp->pcy].val.coord_value); } @@ -93,9 +93,9 @@ shp->data, shp->layer, shp->dlg[shp->w].val.coord_value, shp->dlg[shp->h].val.coord_value, shp->dlg[shp->rx].val.coord_value, shp->dlg[shp->ry].val.coord_value, - shp->dlg[shp->rrot].val.real_value, + shp->dlg[shp->rrot].val.dbl, shp->dlg[shp->rcx].val.coord_value, shp->dlg[shp->rcy].val.coord_value, - corner, shp->dlg[shp->rres].val.real_value); + corner, shp->dlg[shp->rres].val.dbl); } static void shp_chg_circle(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr)