Index: export_openems.c =================================================================== --- export_openems.c (revision 26941) +++ export_openems.c (revision 26942) @@ -166,8 +166,8 @@ pcb_derive_default_filename(PCB->hidlib.filename, &openems_attribute_list[HA_openemsfile], suffix); if (mesh != NULL) { - openems_attribute_list[HA_def_substrate_thick].default_val.coord_value = mesh->def_subs_thick; - openems_attribute_list[HA_def_copper_thick].default_val.coord_value = mesh->def_copper_thick; + openems_attribute_list[HA_def_substrate_thick].default_val.crd = mesh->def_subs_thick; + openems_attribute_list[HA_def_copper_thick].default_val.crd = mesh->def_copper_thick; } TODO(": when export dialogs change into DAD, this hack to convert the strings to allocated ones will not be needed anymore") @@ -252,7 +252,7 @@ if (is_str) pcb_fprintf(ctx->f, "%s", ctx->options[opt].str); else - pcb_fprintf(ctx->f, "%mm", ctx->options[opt].coord_value); + pcb_fprintf(ctx->f, "%mm", ctx->options[opt].crd); } static void openems_write_layers(wctx_t *ctx) Index: mesh.c =================================================================== --- mesh.c (revision 26941) +++ mesh.c (revision 26942) @@ -57,9 +57,9 @@ { int n; PCB_DAD_SET_VALUE(ia.dlg_hid_ctx, ia.pml, lng, mesh.pml); - PCB_DAD_SET_VALUE(ia.dlg_hid_ctx, ia.dens_obj, coord_value, PCB_MM_TO_COORD(0.15)); - PCB_DAD_SET_VALUE(ia.dlg_hid_ctx, ia.dens_gap, coord_value, PCB_MM_TO_COORD(0.5)); - PCB_DAD_SET_VALUE(ia.dlg_hid_ctx, ia.min_space, coord_value, PCB_MM_TO_COORD(0.1)); + PCB_DAD_SET_VALUE(ia.dlg_hid_ctx, ia.dens_obj, crd, PCB_MM_TO_COORD(0.15)); + PCB_DAD_SET_VALUE(ia.dlg_hid_ctx, ia.dens_gap, crd, PCB_MM_TO_COORD(0.5)); + PCB_DAD_SET_VALUE(ia.dlg_hid_ctx, ia.min_space, crd, PCB_MM_TO_COORD(0.1)); PCB_DAD_SET_VALUE(ia.dlg_hid_ctx, ia.smooth, lng, 1); PCB_DAD_SET_VALUE(ia.dlg_hid_ctx, ia.noimpl, lng, 0); PCB_DAD_SET_VALUE(ia.dlg_hid_ctx, ia.hor, lng, 1); @@ -66,13 +66,13 @@ PCB_DAD_SET_VALUE(ia.dlg_hid_ctx, ia.ver, lng, 1); TODO("enum lookup"); PCB_DAD_SET_VALUE(ia.dlg_hid_ctx, ia.subslines, lng, 3); - PCB_DAD_SET_VALUE(ia.dlg_hid_ctx, ia.def_subs_thick, coord_value, PCB_MM_TO_COORD(1.5)); -/* PCB_DAD_SET_VALUE(ia.dlg_hid_ctx, ia.def_copper_thick, coord_value, PCB_MM_TO_COORD(1.5));*/ + PCB_DAD_SET_VALUE(ia.dlg_hid_ctx, ia.def_subs_thick, crd, PCB_MM_TO_COORD(1.5)); +/* PCB_DAD_SET_VALUE(ia.dlg_hid_ctx, ia.def_copper_thick, crd, PCB_MM_TO_COORD(1.5));*/ PCB_DAD_SET_VALUE(ia.dlg_hid_ctx, ia.air_top, lng, 1); PCB_DAD_SET_VALUE(ia.dlg_hid_ctx, ia.air_bot, lng, 1); - PCB_DAD_SET_VALUE(ia.dlg_hid_ctx, ia.dens_air, coord_value, PCB_MM_TO_COORD(0.7)); + PCB_DAD_SET_VALUE(ia.dlg_hid_ctx, ia.dens_air, crd, PCB_MM_TO_COORD(0.7)); PCB_DAD_SET_VALUE(ia.dlg_hid_ctx, ia.smoothz, lng, 1); - PCB_DAD_SET_VALUE(ia.dlg_hid_ctx, ia.max_air, coord_value, PCB_MM_TO_COORD(4)); + PCB_DAD_SET_VALUE(ia.dlg_hid_ctx, ia.max_air, crd, PCB_MM_TO_COORD(4)); for(n = 0; n < 6; n++) { const char **a; int i; @@ -87,9 +87,9 @@ { int n; mesh.pml = ia.dlg[ia.pml].val.lng; - mesh.dens_obj = ia.dlg[ia.dens_obj].val.coord_value; - mesh.dens_gap = ia.dlg[ia.dens_gap].val.coord_value; - mesh.min_space = ia.dlg[ia.min_space].val.coord_value; + mesh.dens_obj = ia.dlg[ia.dens_obj].val.crd; + mesh.dens_gap = ia.dlg[ia.dens_gap].val.crd; + mesh.min_space = ia.dlg[ia.min_space].val.crd; mesh.smooth = ia.dlg[ia.smooth].val.lng; mesh.noimpl = ia.dlg[ia.noimpl].val.lng; mesh.hor = ia.dlg[ia.hor].val.lng; @@ -96,13 +96,13 @@ mesh.ver = ia.dlg[ia.ver].val.lng; TODO("enum lookup"); mesh.subslines = ia.dlg[ia.subslines].val.lng; - mesh.def_subs_thick = ia.dlg[ia.def_subs_thick].val.coord_value; - mesh.def_copper_thick = ia.dlg[ia.def_copper_thick].val.coord_value; + mesh.def_subs_thick = ia.dlg[ia.def_subs_thick].val.crd; + mesh.def_copper_thick = ia.dlg[ia.def_copper_thick].val.crd; mesh.air_top = ia.dlg[ia.air_top].val.lng; mesh.air_bot = ia.dlg[ia.air_top].val.lng; - mesh.dens_air = ia.dlg[ia.dens_air].val.coord_value; + mesh.dens_air = ia.dlg[ia.dens_air].val.crd; mesh.smoothz = ia.dlg[ia.smoothz].val.lng; - mesh.max_air = ia.dlg[ia.max_air].val.coord_value; + mesh.max_air = ia.dlg[ia.max_air].val.crd; for(n = 0; n < 6; n++) mesh.bnd[n] = bnds[ia.dlg[ia.bnd[n]].val.lng]; } @@ -119,7 +119,7 @@ #define SAVE_INT(name) \ pcb_append_printf(dst, "%s " #name" = %d\n", prefix, (int)me->dlg[me->name].val.lng); #define SAVE_COORD(name) \ - pcb_append_printf(dst, "%s " #name" = %.08$$mm\n", prefix, (pcb_coord_t)me->dlg[me->name].val.coord_value); + pcb_append_printf(dst, "%s " #name" = %.08$$mm\n", prefix, (pcb_coord_t)me->dlg[me->name].val.crd); void pcb_mesh_save(const mesh_dlg_t *me, gds_t *dst, const char *prefix) { int n; @@ -205,7 +205,7 @@ pcb_message(PCB_MSG_ERROR, "Invalid mesh coord: " #name "\n"); \ return -1; \ } \ - PCB_DAD_SET_VALUE(me->dlg_hid_ctx, me->name, coord_value, (pcb_coord_t)v); \ + PCB_DAD_SET_VALUE(me->dlg_hid_ctx, me->name, crd, (pcb_coord_t)v); \ } \ } while(0) @@ -654,11 +654,11 @@ if (ia.dlg[ia.air_top].val.lng) { if (ia.dlg[ia.smoothz].val.lng) { - mesh_auto_add_smooth(&mesh->line[PCB_MESH_Z].result, ytop - ia.dlg[ia.max_air].val.coord_value, ytop, - ia.dlg[ia.dens_air].val.coord_value, ia.dlg[ia.dens_air].val.coord_value, top_dens); + mesh_auto_add_smooth(&mesh->line[PCB_MESH_Z].result, ytop - ia.dlg[ia.max_air].val.crd, ytop, + ia.dlg[ia.dens_air].val.crd, ia.dlg[ia.dens_air].val.crd, top_dens); } else { - for(y = ytop; y > ytop - ia.dlg[ia.max_air].val.coord_value ; y -= ia.dlg[ia.dens_air].val.coord_value) + for(y = ytop; y > ytop - ia.dlg[ia.max_air].val.crd ; y -= ia.dlg[ia.dens_air].val.crd) mesh_add_result(mesh, PCB_MESH_Z, y); } } @@ -665,11 +665,11 @@ if (ia.dlg[ia.air_bot].val.lng) { if (ia.dlg[ia.smoothz].val.lng) { - mesh_auto_add_smooth(&mesh->line[PCB_MESH_Z].result, ybottom, ybottom + ia.dlg[ia.max_air].val.coord_value, - bottom_dens, ia.dlg[ia.dens_air].val.coord_value, ia.dlg[ia.dens_air].val.coord_value); + mesh_auto_add_smooth(&mesh->line[PCB_MESH_Z].result, ybottom, ybottom + ia.dlg[ia.max_air].val.crd, + bottom_dens, ia.dlg[ia.dens_air].val.crd, ia.dlg[ia.dens_air].val.crd); } else { - for(y = ybottom; y < ybottom + ia.dlg[ia.max_air].val.coord_value ; y += ia.dlg[ia.dens_air].val.coord_value) + for(y = ybottom; y < ybottom + ia.dlg[ia.max_air].val.crd ; y += ia.dlg[ia.dens_air].val.crd) mesh_add_result(mesh, PCB_MESH_Z, y); } }