Index: trunk/doc/conf/tree/editor.html =================================================================== --- trunk/doc/conf/tree/editor.html (revision 25154) +++ trunk/doc/conf/tree/editor.html (revision 25155) @@ -3,9 +3,6 @@

subtree: editor

node name type flags description -
grid coord 0 grid in pcb-units -
grids list 0 grid in grid-string format -
grids_idx integer 0 the index of the currently active grid from grids
zoom real 0 default zoom
mode integer 0 currently active mode
buffer_number integer 0 number of the current buffer @@ -56,6 +53,9 @@
undo_warning_size integer 0 warn the user when undo list exceeds this amount of kilobytes in memory
subc_conv_refdes string 0 automatic refdes value assigned to new subcircuits on conversion from objects - if empty, no refdes text or attribute is added; if the value is , the refdes text object is added but no refdes attribute is created
grid_unit unit 0 [hidlib] select whether you draw in mm or mil +
grid coord 0 [hidlib] grid in pcb-units +
grids list 0 [hidlib] grid in grid-string format +
grids_idx integer 0 [hidlib] the index of the currently active grid from grids
draw_grid boolean 0 [hidlib] draw grid points
auto_place boolean 0 [hidlib] force placement of GUI windows (dialogs), trying to override the window manager
fullscreen boolean 0 [hidlib] hide widgets to make more room for the drawing Index: trunk/src/board.c =================================================================== --- trunk/src/board.c (revision 25154) +++ trunk/src/board.c (revision 25155) @@ -89,7 +89,7 @@ ptr->RatDraw = pcb_false; /* 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 = conf_core.editor.grid; + ptr->hidlib.grid = pcbhl_conf.editor.grid; ptr->hidlib.size_y = ptr->hidlib.size_x = PCB_MM_TO_COORD(20); /* should be overriden by the default design */ ptr->ID = pcb_create_ID_get(); Index: trunk/src/conf_core.h =================================================================== --- trunk/src/conf_core.h (revision 25154) +++ trunk/src/conf_core.h (revision 25155) @@ -18,9 +18,6 @@ } temp; const struct { /* editor */ - CFT_COORD grid; /* grid in pcb-units */ - CFT_LIST grids; /* grid in grid-string format */ - CFT_INTEGER grids_idx; /* the index of the currently active grid from grids */ CFT_REAL zoom; /* default zoom */ CFT_INTEGER mode; /* currently active mode */ CFT_INTEGER buffer_number; /* number of the current buffer */ Index: trunk/src/grid.c =================================================================== --- trunk/src/grid.c (revision 25154) +++ trunk/src/grid.c (revision 25155) @@ -39,7 +39,7 @@ #include "grid.h" #include "board.h" #include "conf.h" -#include "conf_core.h" +#include "hidlib_conf.h" #include "conf_hid.h" #include "compat_misc.h" #include "misc_util.h" @@ -183,7 +183,7 @@ { const conf_listitem_t *li; pcb_grid_t g; - int max = conflist_length((conflist_t *)&conf_core.editor.grids); + int max = conflist_length((conflist_t *)&pcbhl_conf.editor.grids); if (dst < 0) dst = 0; @@ -194,7 +194,7 @@ conf_setf(CFR_DESIGN, "editor/grids_idx", -1, "%d", dst); - li = conflist_nth((conflist_t *)&conf_core.editor.grids, dst); + li = conflist_nth((conflist_t *)&pcbhl_conf.editor.grids, dst); /* clamp */ if (li == NULL) return pcb_false; @@ -209,7 +209,7 @@ pcb_bool_t pcb_grid_list_step(int stp) { - int dst = conf_core.editor.grids_idx; + int dst = pcbhl_conf.editor.grids_idx; if (dst < 0) dst = -dst-1; return pcb_grid_list_jump(dst + stp); @@ -217,7 +217,7 @@ void pcb_grid_inval(void) { - if (conf_core.editor.grids_idx > 0) - conf_setf(CFR_DESIGN, "editor/grids_idx", -1, "%d", -1 - conf_core.editor.grids_idx); + if (pcbhl_conf.editor.grids_idx > 0) + conf_setf(CFR_DESIGN, "editor/grids_idx", -1, "%d", -1 - pcbhl_conf.editor.grids_idx); } Index: trunk/src/hidlib_conf.h =================================================================== --- trunk/src/hidlib_conf.h (revision 25154) +++ trunk/src/hidlib_conf.h (revision 25155) @@ -72,6 +72,9 @@ const struct { CFT_UNIT grid_unit; /* select whether you draw in mm or mil */ + CFT_COORD grid; /* grid in pcb-units */ + CFT_LIST grids; /* grid in grid-string format */ + CFT_INTEGER grids_idx; /* the index of the currently active grid from grids */ CFT_BOOLEAN draw_grid; /* draw grid points */ CFT_BOOLEAN auto_place; /* force placement of GUI windows (dialogs), trying to override the window manager */ CFT_BOOLEAN fullscreen; /* hide widgets to make more room for the drawing */ Index: trunk/src_plugins/djopt/djopt.c =================================================================== --- trunk/src_plugins/djopt/djopt.c (revision 25154) +++ trunk/src_plugins/djopt/djopt.c (revision 25155) @@ -33,6 +33,7 @@ #include "config.h" #include "conf_core.h" +#include "hidlib_conf.h" #include "board.h" #include @@ -240,7 +241,7 @@ { if (n <= 0) return 0; - return n - n % (conf_core.editor.grid); + return n - n % (pcbhl_conf.editor.grid); } /* Avoid commonly used names. */ @@ -1362,9 +1363,9 @@ len = c->x + max; break; } - if (snap && max > conf_core.editor.grid) { + if (snap && max > pcbhl_conf.editor.grid) { if (pull < 0) - len += conf_core.editor.grid - 1; + len += pcbhl_conf.editor.grid - 1; len = gridsnap(len); } if ((fdir == RIGHT && len == cs[0]->y) || (fdir == DOWN && len == cs[0]->x)) @@ -2000,13 +2001,13 @@ } #if 0 - if (dist < conf_core.editor.grid) { + if (dist < pcbhl_conf.editor.grid) { c->miter = 0; progress = 1; continue; } - dist -= dist % conf_core.editor.grid; + dist -= dist % pcbhl_conf.editor.grid; #endif if (dist <= 0) { c->miter = 0;