Index: trunk/doc-rnd/hacking/renames =================================================================== --- trunk/doc-rnd/hacking/renames (revision 5035) +++ trunk/doc-rnd/hacking/renames (revision 5036) @@ -957,3 +957,7 @@ Crosshair_Shapes_Number -> pcb_ch_shape_NUM Crosshair -> pcb_crosshair Marked -> pcb_marked +max_group -> pcb_max_group +max_copper_layer -> pcb_max_copper_layer +solder_silk_layer -> pcb_solder_silk_layer +component_silk_layer -> pcb_component_silk_layer Index: trunk/src/action_helper.c =================================================================== --- trunk/src/action_helper.c (revision 5035) +++ trunk/src/action_helper.c (revision 5036) @@ -908,7 +908,7 @@ pcb_text_t *text; int flag = PCB_FLAG_CLEARLINE; - if (GetLayerGroupNumberByNumber(INDEXOFCURRENT) == GetLayerGroupNumberByNumber(solder_silk_layer)) + if (GetLayerGroupNumberByNumber(INDEXOFCURRENT) == GetLayerGroupNumberByNumber(pcb_solder_silk_layer)) flag |= PCB_FLAG_ONSOLDER; if ((text = pcb_text_new(CURRENT, &PCB->Font, Note.X, Note.Y, 0, conf_core.design.text_scale, string, pcb_flag_make(flag))) != NULL) { Index: trunk/src/board.c =================================================================== --- trunk/src/board.c (revision 5035) +++ trunk/src/board.c (revision 5036) @@ -171,11 +171,11 @@ ptr->Data->Layer[i].Color = conf_core.appearance.color.layer[i]; ptr->Data->Layer[i].SelectedColor = conf_core.appearance.color.layer_selected[i]; } - ptr->Data->Layer[component_silk_layer].Color = + ptr->Data->Layer[pcb_component_silk_layer].Color = conf_core.editor.show_solder_side ? conf_core.appearance.color.invisible_objects : conf_core.appearance.color.element; - ptr->Data->Layer[component_silk_layer].SelectedColor = conf_core.appearance.color.element_selected; - ptr->Data->Layer[solder_silk_layer].Color = conf_core.editor.show_solder_side ? conf_core.appearance.color.element : conf_core.appearance.color.invisible_objects; - ptr->Data->Layer[solder_silk_layer].SelectedColor = conf_core.appearance.color.element_selected; + ptr->Data->Layer[pcb_component_silk_layer].SelectedColor = conf_core.appearance.color.element_selected; + ptr->Data->Layer[pcb_solder_silk_layer].Color = conf_core.editor.show_solder_side ? conf_core.appearance.color.element : conf_core.appearance.color.invisible_objects; + ptr->Data->Layer[pcb_solder_silk_layer].SelectedColor = conf_core.appearance.color.element_selected; } typedef struct { Index: trunk/src/buffer.c =================================================================== --- trunk/src/buffer.c (revision 5035) +++ trunk/src/buffer.c (revision 5036) @@ -407,7 +407,7 @@ pcb_message(PCB_MSG_DEFAULT, _("You can't mirror a buffer that has elements!\n")); return; } - for (i = 0; i < max_copper_layer + 2; i++) { + for (i = 0; i < pcb_max_copper_layer + 2; i++) { pcb_layer_t *layer = Buffer->Data->Layer + i; if (textlist_length(&layer->Text)) { pcb_message(PCB_MSG_DEFAULT, _("You can't mirror a buffer that has text!\n")); @@ -529,13 +529,13 @@ } ENDALL_LOOP; /* swap silkscreen layers */ - swap = Buffer->Data->Layer[solder_silk_layer]; - Buffer->Data->Layer[solder_silk_layer] = Buffer->Data->Layer[component_silk_layer]; - Buffer->Data->Layer[component_silk_layer] = swap; + swap = Buffer->Data->Layer[pcb_solder_silk_layer]; + Buffer->Data->Layer[pcb_solder_silk_layer] = Buffer->Data->Layer[pcb_component_silk_layer]; + Buffer->Data->Layer[pcb_component_silk_layer] = swap; /* swap layer groups when balanced */ - sgroup = GetLayerGroupNumberByNumber(solder_silk_layer); - cgroup = GetLayerGroupNumberByNumber(component_silk_layer); + sgroup = GetLayerGroupNumberByNumber(pcb_solder_silk_layer); + cgroup = GetLayerGroupNumberByNumber(pcb_component_silk_layer); if (PCB->LayerGroups.Number[cgroup] == PCB->LayerGroups.Number[sgroup]) { for (j = k = 0; j < PCB->LayerGroups.Number[sgroup]; j++) { int t1, t2; @@ -542,11 +542,11 @@ pcb_cardinal_t cnumber = PCB->LayerGroups.Entries[cgroup][k]; pcb_cardinal_t snumber = PCB->LayerGroups.Entries[sgroup][j]; - if (snumber >= max_copper_layer) + if (snumber >= pcb_max_copper_layer) continue; swap = Buffer->Data->Layer[snumber]; - while (cnumber >= max_copper_layer) { + while (cnumber >= pcb_max_copper_layer) { k++; cnumber = PCB->LayerGroups.Entries[cgroup][k]; } @@ -632,7 +632,7 @@ ctx.copy.DeltaY = Y - PCB_PASTEBUFFER->Y; /* paste all layers */ - for (i = 0; i < max_copper_layer + 2; i++) { + for (i = 0; i < pcb_max_copper_layer + 2; i++) { pcb_layer_t *sourcelayer = &PCB_PASTEBUFFER->Data->Layer[i], *destlayer = LAYER_PTR(i); if (destlayer->On) { Index: trunk/src/crosshair.c =================================================================== --- trunk/src/crosshair.c (revision 5035) +++ trunk/src/crosshair.c (revision 5036) @@ -289,7 +289,7 @@ y = pcb_crosshair.Y - Buffer->Y; /* draw all visible layers */ - for (i = 0; i < max_copper_layer + 2; i++) + for (i = 0; i < pcb_max_copper_layer + 2; i++) if (PCB->Data->Layer[i].On) { pcb_layer_t *layer = &Buffer->Data->Layer[i]; @@ -833,7 +833,7 @@ info.X = X; info.Y = Y; - for (i = 0; i < max_copper_layer; i++) { + for (i = 0; i < pcb_max_copper_layer; i++) { pcb_layer_t *layer = &PCB->Data->Layer[i]; /* Only find points of arcs and lines on currently visible layers. */ if (!layer->On) @@ -1060,8 +1060,8 @@ } /* find layer groups of the component side and solder side */ - SLayer = GetLayerGroupNumberByNumber(solder_silk_layer); - CLayer = GetLayerGroupNumberByNumber(component_silk_layer); + SLayer = GetLayerGroupNumberByNumber(pcb_solder_silk_layer); + CLayer = GetLayerGroupNumberByNumber(pcb_component_silk_layer); desired_group = PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, pad) ? SLayer : CLayer; GROUP_LOOP(PCB->Data, desired_group); Index: trunk/src/data.c =================================================================== --- trunk/src/data.c (revision 5035) +++ trunk/src/data.c (revision 5036) @@ -49,7 +49,7 @@ void pcb_loop_layers(void *ctx, pcb_layer_cb_t lacb, pcb_line_cb_t lcb, pcb_arc_cb_t acb, pcb_text_cb_t tcb, pcb_poly_cb_t pocb) { if ((lacb != NULL) || (lcb != NULL) || (acb != NULL) || (tcb != NULL) || (pocb != NULL)) { - LAYER_LOOP(PCB->Data, max_copper_layer + 2); + LAYER_LOOP(PCB->Data, pcb_max_copper_layer + 2); { if (lacb != NULL) if (lacb(ctx, PCB, layer, 1)) @@ -258,7 +258,7 @@ hasNoObjects = (pinlist_length(&Data->Via) == 0); hasNoObjects &= (elementlist_length(&Data->Element) == 0); - for (i = 0; i < max_copper_layer + 2; i++) + for (i = 0; i < pcb_max_copper_layer + 2; i++) hasNoObjects = hasNoObjects && LAYER_IS_PCB_EMPTY(&(Data->Layer[i])); return (hasNoObjects); } Index: trunk/src/data.h =================================================================== --- trunk/src/data.h (revision 5035) +++ trunk/src/data.h (revision 5036) @@ -53,10 +53,10 @@ }; -#define max_group (PCB->Data->LayerN) -#define max_copper_layer (PCB->Data->LayerN) -#define solder_silk_layer (max_copper_layer + SOLDER_LAYER) -#define component_silk_layer (max_copper_layer + COMPONENT_LAYER) +#define pcb_max_group (PCB->Data->LayerN) +#define pcb_max_copper_layer (PCB->Data->LayerN) +#define pcb_solder_silk_layer (pcb_max_copper_layer + SOLDER_LAYER) +#define pcb_component_silk_layer (pcb_max_copper_layer + COMPONENT_LAYER) extern pcb_buffer_t Buffers[MAX_BUFFER]; Index: trunk/src/draw.c =================================================================== --- trunk/src/draw.c (revision 5035) +++ trunk/src/draw.c (revision 5036) @@ -144,7 +144,7 @@ */ static void PrintAssembly(int side, const pcb_box_t * drawn_area) { - int side_group = GetLayerGroupNumberByNumber(max_copper_layer + side); + int side_group = GetLayerGroupNumberByNumber(pcb_max_copper_layer + side); pcb_draw_doing_assy = pcb_true; gui->set_draw_faded(Output.fgGC, 1); @@ -190,7 +190,7 @@ PCB->Data->BACKSILKLAYER.Color = PCB->InvisibleObjectsColor; memset(do_group, 0, sizeof(do_group)); - for (ngroups = 0, i = 0; i < max_copper_layer; i++) { + for (ngroups = 0, i = 0; i < pcb_max_copper_layer; i++) { pcb_layer_t *l = LAYER_ON_STACK(i); int group = GetLayerGroupNumberByNumber(LayerStack[i]); if (l->On && !do_group[group]) { @@ -199,8 +199,8 @@ } } - component = GetLayerGroupNumberByNumber(component_silk_layer); - solder = GetLayerGroupNumberByNumber(solder_silk_layer); + component = GetLayerGroupNumberByNumber(pcb_component_silk_layer); + solder = GetLayerGroupNumberByNumber(pcb_solder_silk_layer); /* * first draw all 'invisible' stuff @@ -211,7 +211,7 @@ if (PCB->ElementOn) { pcb_r_search(PCB->Data->element_tree, drawn_area, NULL, draw_element_callback, &side, NULL); pcb_r_search(PCB->Data->name_tree[NAME_INDEX()], drawn_area, NULL, draw_element_name_callback, &side, NULL); - pcb_draw_layer(&(PCB->Data->Layer[max_copper_layer + side]), drawn_area); + pcb_draw_layer(&(PCB->Data->Layer[pcb_max_copper_layer + side]), drawn_area); } pcb_r_search(PCB->Data->pad_tree, drawn_area, NULL, draw_pad_callback, &side, NULL); gui->end_layer(); @@ -305,8 +305,8 @@ */ static void DrawPPV(int group, const pcb_box_t * drawn_area) { - int component_group = GetLayerGroupNumberByNumber(component_silk_layer); - int solder_group = GetLayerGroupNumberByNumber(solder_silk_layer); + int component_group = GetLayerGroupNumberByNumber(pcb_component_silk_layer); + int solder_group = GetLayerGroupNumberByNumber(pcb_solder_silk_layer); int side; if (PCB->PinOn || !gui->gui) { @@ -350,7 +350,7 @@ if (gui->poly_before) { gui->use_mask(HID_MASK_BEFORE); #endif - pcb_draw_layer(LAYER_PTR(max_copper_layer + side), drawn_area); + pcb_draw_layer(LAYER_PTR(pcb_max_copper_layer + side), drawn_area); /* draw package */ pcb_r_search(PCB->Data->element_tree, drawn_area, NULL, draw_element_callback, &side, NULL); pcb_r_search(PCB->Data->name_tree[NAME_INDEX()], drawn_area, NULL, draw_element_name_callback, &side, NULL); @@ -364,7 +364,7 @@ if (gui->poly_after) { gui->use_mask(HID_MASK_AFTER); - pcb_draw_layer(LAYER_PTR(max_copper_layer + layer), drawn_area); + pcb_draw_layer(LAYER_PTR(pcb_max_copper_layer + layer), drawn_area); /* draw package */ pcb_r_search(PCB->Data->element_tree, drawn_area, NULL, draw_element_callback, &side, NULL); pcb_r_search(PCB->Data->name_tree[NAME_INDEX()], drawn_area, NULL, draw_element_name_callback, &side, NULL); @@ -481,7 +481,7 @@ Layer = PCB->Data->Layer + layers[i]; if (strcmp(Layer->Name, "outline") == 0 || strcmp(Layer->Name, "route") == 0) rv = 0; - if (layernum < max_copper_layer && Layer->On) + if (layernum < pcb_max_copper_layer && Layer->On) pcb_draw_layer(Layer, drawn_area); } if (n_entries > 1) Index: trunk/src/find_deadcode.c =================================================================== --- trunk/src/find_deadcode.c (revision 5035) +++ trunk/src/find_deadcode.c (revision 5036) @@ -96,7 +96,7 @@ pcb_cardinal_t layer = PCB->LayerGroups.Entries[LayerGroup][entry]; /* handle normal layers */ - if (layer < max_copper_layer) { + if (layer < pcb_max_copper_layer) { gdl_iterator_t it; pcb_polygon_t *polygon; @@ -120,7 +120,7 @@ } else { /* handle special 'pad' layers */ - info.layer = layer - max_copper_layer; + info.layer = layer - pcb_max_copper_layer; if (setjmp(info.env) == 0) pcb_r_search(PCB->Data->pad_tree, &info.line.BoundingBox, NULL, LOT_Padcallback, &info, NULL); else Index: trunk/src/find_lookup.c =================================================================== --- trunk/src/find_lookup.c (revision 5035) +++ trunk/src/find_lookup.c (revision 5036) @@ -170,7 +170,7 @@ { pcb_cardinal_t i; - for (i = 0; i < max_copper_layer; i++) { + for (i = 0; i < pcb_max_copper_layer; i++) { free(LineList[i].Data); LineList[i].Data = NULL; free(ArcList[i].Data); @@ -236,7 +236,7 @@ pcb_cardinal_t i; /* initialize line arc and polygon data */ - for (i = 0; i < max_copper_layer; i++) { + for (i = 0; i < pcb_max_copper_layer; i++) { pcb_layer_t *layer = LAYER_PTR(i); if (linelist_length(&layer->Line)) { @@ -397,7 +397,7 @@ return pcb_true; /* now all lines, arcs and polygons of the several layers */ - for (layer = 0; layer < max_copper_layer; layer++) { + for (layer = 0; layer < pcb_max_copper_layer; layer++) { if (LAYER_PTR(layer)->no_drc) continue; info.layer = layer; @@ -442,7 +442,7 @@ * by 'LookupPVConnectionsToLOList()' which has to check the same * list entries plus the new ones */ - for (i = 0; i < max_copper_layer; i++) { + for (i = 0; i < pcb_max_copper_layer; i++) { lineposition[i] = LineList[i].Location; polyposition[i] = PolygonList[i].Location; arcposition[i] = ArcList[i].Location; @@ -469,16 +469,16 @@ } } /* loop over all layergroups */ - for (group = 0; group < max_group; group++) { + for (group = 0; group < pcb_max_group; group++) { pcb_cardinal_t entry; for (entry = 0; entry < PCB->LayerGroups.Number[group]; entry++) { layer = PCB->LayerGroups.Entries[group][entry]; - /* be aware that the layer number equal max_copper_layer - * and max_copper_layer+1 have a special meaning for pads + /* be aware that the layer number equal pcb_max_copper_layer + * and pcb_max_copper_layer+1 have a special meaning for pads */ - if (layer < max_copper_layer) { + if (layer < pcb_max_copper_layer) { /* try all new lines */ position = &lineposition[layer]; for (; *position < LineList[layer].Number; (*position)++) @@ -499,9 +499,9 @@ } else { /* try all new pads */ - layer -= max_copper_layer; + layer -= pcb_max_copper_layer; if (layer > 1) { - pcb_message(PCB_MSG_DEFAULT, _("bad layer number %d max_copper_layer=%d in find.c\n"), layer, max_copper_layer); + pcb_message(PCB_MSG_DEFAULT, _("bad layer number %d pcb_max_copper_layer=%d in find.c\n"), layer, pcb_max_copper_layer); return pcb_false; } position = &padposition[layer]; @@ -516,13 +516,13 @@ * may have changed the prior lists */ done = !AndRats || ratposition >= RatList.Number; - for (layer = 0; layer < max_copper_layer + 2; layer++) { - if (layer < max_copper_layer) + for (layer = 0; layer < pcb_max_copper_layer + 2; layer++) { + if (layer < pcb_max_copper_layer) done = done && lineposition[layer] >= LineList[layer].Number && arcposition[layer] >= ArcList[layer].Number && polyposition[layer] >= PolygonList[layer].Number; else - done = done && padposition[layer - max_copper_layer] >= PadList[layer - max_copper_layer].Number; + done = done && padposition[layer - pcb_max_copper_layer] >= PadList[layer - pcb_max_copper_layer].Number; } } while (!done); @@ -712,7 +712,7 @@ struct lo_info info; /* loop over all layers */ - for (layer = 0; layer < max_copper_layer; layer++) { + for (layer = 0; layer < pcb_max_copper_layer; layer++) { if (LAYER_PTR(layer)->no_drc) continue; /* do nothing if there are no PV's */ @@ -883,7 +883,7 @@ layer = PCB->LayerGroups.Entries[LayerGroup][entry]; /* handle normal layers */ - if (layer < max_copper_layer) { + if (layer < pcb_max_copper_layer) { pcb_polygon_t *polygon; gdl_iterator_t it; @@ -907,7 +907,7 @@ } } else { - info.layer = layer - max_copper_layer; + info.layer = layer - pcb_max_copper_layer; if (setjmp(info.env) == 0) pcb_r_search(PCB->Data->pad_tree, &info.arc.BoundingBox, NULL, LOCtoArcPad_callback, &info, NULL); else @@ -1002,7 +1002,7 @@ layer = PCB->LayerGroups.Entries[LayerGroup][entry]; /* handle normal layers */ - if (layer < max_copper_layer) { + if (layer < pcb_max_copper_layer) { info.layer = layer; /* add lines */ if (setjmp(info.env) == 0) @@ -1028,7 +1028,7 @@ } else { /* handle special 'pad' layers */ - info.layer = layer - max_copper_layer; + info.layer = layer - pcb_max_copper_layer; if (setjmp(info.env) == 0) pcb_r_search(PCB->Data->pad_tree, &info.line.BoundingBox, NULL, LOCtoLinePad_callback, &info, NULL); else @@ -1112,7 +1112,7 @@ arcs by definition */ - if (layer < max_copper_layer) { + if (layer < pcb_max_copper_layer) { info.layer = layer; if (setjmp(info.env) == 0) r_search_pt(LAYER_PTR(layer)->line_tree, Point, 1, NULL, LOCtoRat_callback, &info, NULL); @@ -1123,7 +1123,7 @@ } else { /* handle special 'pad' layers */ - info.layer = layer - max_copper_layer; + info.layer = layer - pcb_max_copper_layer; if (setjmp(info.env) == 0) r_search_pt(PCB->Data->pad_tree, Point, 1, NULL, LOCtoPad_callback, &info, NULL); else @@ -1278,7 +1278,7 @@ layer = PCB->LayerGroups.Entries[LayerGroup][entry]; /* handle normal layers */ - if (layer < max_copper_layer) { + if (layer < pcb_max_copper_layer) { info.layer = layer; /* add lines */ if (setjmp(info.env) == 0) @@ -1298,7 +1298,7 @@ } else { /* handle special 'pad' layers */ - info.layer = layer - max_copper_layer; + info.layer = layer - pcb_max_copper_layer; if (setjmp(info.env) == 0) pcb_r_search(PCB->Data->pad_tree, (pcb_box_t *) & info.pad, NULL, LOCtoPadPad_callback, &info, NULL); else @@ -1392,7 +1392,7 @@ layer = PCB->LayerGroups.Entries[LayerGroup][entry]; /* handle normal layers */ - if (layer < max_copper_layer) { + if (layer < pcb_max_copper_layer) { gdl_iterator_t it; pcb_polygon_t *polygon; @@ -1417,7 +1417,7 @@ return pcb_true; } else { - info.layer = layer - max_copper_layer; + info.layer = layer - pcb_max_copper_layer; if (setjmp(info.env) == 0) pcb_r_search(PCB->Data->pad_tree, (pcb_box_t *) & info.polygon, NULL, LOCtoPolyPad_callback, &info, NULL); else Index: trunk/src/find_misc.c =================================================================== --- trunk/src/find_misc.c (revision 5035) +++ trunk/src/find_misc.c (revision 5036) @@ -38,7 +38,7 @@ empty = (PVList.Location >= PVList.Number); if (AndRats) empty = empty && (RatList.Location >= RatList.Number); - for (i = 0; i < max_copper_layer && empty; i++) + for (i = 0; i < pcb_max_copper_layer && empty; i++) empty = empty && LineList[i].Location >= LineList[i].Number && ArcList[i].Location >= ArcList[i].Number && PolygonList[i].Location >= PolygonList[i].Number; return (empty); @@ -48,7 +48,7 @@ { int layer; - for (layer = 0; layer < max_copper_layer; layer++) { + for (layer = 0; layer < pcb_max_copper_layer; layer++) { pcb_layer_t *l = LAYER_PTR(layer); l->no_drc = pcb_attrib_get(l, "PCB::skip-drc") != NULL; } @@ -87,7 +87,7 @@ pcb_cardinal_t position; /* decrement 'i' to keep layerstack order */ - for (i = max_copper_layer - 1; i != -1; i--) { + for (i = pcb_max_copper_layer - 1; i != -1; i--) { pcb_cardinal_t layer = LayerStack[i]; if (PCB->Data->Layer[layer].On) { @@ -234,7 +234,7 @@ (pcb_layer_t *) ptr1); /* don't mess with non-conducting objects! */ - if (laynum >= max_copper_layer || ((pcb_layer_t *) ptr1)->no_drc) + if (laynum >= pcb_max_copper_layer || ((pcb_layer_t *) ptr1)->no_drc) return; } } @@ -430,7 +430,7 @@ PVList.Number = 0; PVList.Location = 0; - for (i = 0; i < max_copper_layer; i++) { + for (i = 0; i < pcb_max_copper_layer; i++) { LineList[i].Location = 0; LineList[i].DrawLocation = 0; LineList[i].Number = 0; Index: trunk/src/find_print.c =================================================================== --- trunk/src/find_print.c (revision 5035) +++ trunk/src/find_print.c (revision 5036) @@ -135,7 +135,7 @@ pcb_cardinal_t layer; /* reset found LOs for the next pin */ - for (layer = 0; layer < max_copper_layer; layer++) { + for (layer = 0; layer < pcb_max_copper_layer; layer++) { LineList[layer].Location = LineList[layer].Number = 0; ArcList[layer].Location = ArcList[layer].Number = 0; PolygonList[layer].Location = PolygonList[layer].Number = 0; Index: trunk/src/hid_extents.c =================================================================== --- trunk/src/hid_extents.c (revision 5035) +++ trunk/src/hid_extents.c (revision 5036) @@ -17,10 +17,10 @@ static int extents_set_layer(const char *name, int group, int empty) { int idx = group; - if (idx >= 0 && idx < max_group) { + if (idx >= 0 && idx < pcb_max_group) { idx = PCB->LayerGroups.Entries[idx][0]; } - if (idx >= 0 && idx < max_copper_layer + 2) + if (idx >= 0 && idx < pcb_max_copper_layer + 2) return 1; if (idx < 0) { switch (SL_TYPE(idx)) { Index: trunk/src/hid_flags.c =================================================================== --- trunk/src/hid_flags.c (revision 5035) +++ trunk/src/hid_flags.c (revision 5036) @@ -84,7 +84,7 @@ void pcb_hid_save_and_show_layer_ons(int *save_array) { int i; - for (i = 0; i < max_copper_layer + 2; i++) { + for (i = 0; i < pcb_max_copper_layer + 2; i++) { save_array[i] = PCB->Data->Layer[i].On; PCB->Data->Layer[i].On = 1; } @@ -93,6 +93,6 @@ void pcb_hid_restore_layer_ons(int *save_array) { int i; - for (i = 0; i < max_copper_layer + 2; i++) + for (i = 0; i < pcb_max_copper_layer + 2; i++) PCB->Data->Layer[i].On = save_array[i]; } Index: trunk/src/hid_helper.c =================================================================== --- trunk/src/hid_helper.c (revision 5035) +++ trunk/src/hid_helper.c (revision 5036) @@ -67,12 +67,12 @@ group = GetLayerGroupNumberByNumber(idx); nlayers = PCB->LayerGroups.Number[group]; single_name = PCB->Data->Layer[idx].Name; - if (group == GetLayerGroupNumberByNumber(component_silk_layer)) { + if (group == GetLayerGroupNumberByNumber(pcb_component_silk_layer)) { if (style == PCB_FNS_first || (style == PCB_FNS_single && nlayers == 2)) return single_name; return "top"; } - else if (group == GetLayerGroupNumberByNumber(solder_silk_layer)) { + else if (group == GetLayerGroupNumberByNumber(pcb_solder_silk_layer)) { if (style == PCB_FNS_first || (style == PCB_FNS_single && nlayers == 2)) return single_name; return "bottom"; Index: trunk/src/layer.c =================================================================== --- trunk/src/layer.c (revision 5035) +++ trunk/src/layer.c (revision 5036) @@ -177,9 +177,9 @@ int i; /* ignore silk layers */ - if (NewTop < max_copper_layer) { + if (NewTop < pcb_max_copper_layer) { /* first find position of passed one */ - for (i = 0; i < max_copper_layer; i++) + for (i = 0; i < pcb_max_copper_layer; i++) if (LayerStack[i] == NewTop) break; @@ -207,12 +207,12 @@ printf("ChangeGroupVisibility(Layer=%d, On=%d, ChangeStackOrder=%d)\n", Layer, On, ChangeStackOrder); /* decrement 'i' to keep stack in order of layergroup */ - if ((group = GetGroupOfLayer(Layer)) < max_group) + if ((group = GetGroupOfLayer(Layer)) < pcb_max_group) for (i = PCB->LayerGroups.Number[group]; i;) { int layer = PCB->LayerGroups.Entries[group][--i]; /* don't count the passed member of the group */ - if (layer != Layer && layer < max_copper_layer) { + if (layer != Layer && layer < pcb_max_copper_layer) { PCB->Data->Layer[layer].On = On; /* push layer on top of stack if switched on */ @@ -268,8 +268,8 @@ } } - for (i = 0; i < max_copper_layer + 2; i++) { - if (i < max_copper_layer) + for (i = 0; i < pcb_max_copper_layer + 2; i++) { + if (i < pcb_max_copper_layer) LayerStack[i] = i; PCB->Data->Layer[i].On = pcb_false; } @@ -303,7 +303,7 @@ } else { int found = 0; - for (lno = 0; lno < max_copper_layer; lno++) + for (lno = 0; lno < pcb_max_copper_layer; lno++) if (strcasecmp(args[i], PCB->Data->Layer[lno].Name) == 0) { ChangeGroupVisibility(lno, pcb_true, pcb_true); found = 1; @@ -314,7 +314,7 @@ if (!listed_layers) { fprintf(stderr, "Named layers in this board are:\n"); listed_layers = 1; - for (lno = 0; lno < max_copper_layer; lno++) + for (lno = 0; lno < pcb_max_copper_layer; lno++) fprintf(stderr, "\t%s\n", PCB->Data->Layer[lno].Name); fprintf(stderr, "Also: component, solder, rats, invisible, pins, vias, elements or silk, mask, solderside.\n"); } @@ -325,20 +325,20 @@ /* ---------------------------------------------------------------------- * lookup the group to which a layer belongs to - * returns max_group if no group is found, or is - * passed Layer is equal to max_copper_layer + * returns pcb_max_group if no group is found, or is + * passed Layer is equal to pcb_max_copper_layer */ int GetGroupOfLayer(int Layer) { int group, i; - if (Layer == max_copper_layer) - return max_group; - for (group = 0; group < max_group; group++) + if (Layer == pcb_max_copper_layer) + return pcb_max_group; + for (group = 0; group < pcb_max_group; group++) for (i = 0; i < PCB->LayerGroups.Number[group]; i++) if (PCB->LayerGroups.Entries[group][i] == Layer) return (group); - return max_group; + return pcb_max_group; } @@ -357,7 +357,7 @@ { int group, entry; - for (group = 0; group < max_group; group++) + for (group = 0; group < pcb_max_group; group++) for (entry = 0; entry < PCB->LayerGroups.Number[group]; entry++) if (PCB->LayerGroups.Entries[group][entry] == Layer) return (group); @@ -378,8 +378,8 @@ pcb_cardinal_t i; assert(PCB->Data->LayerN <= MAX_LAYER); - for (i = 0; i < max_copper_layer + 2; i++) { - if (i < max_copper_layer) + for (i = 0; i < pcb_max_copper_layer + 2; i++) { + if (i < pcb_max_copper_layer) LayerStack[i] = i; PCB->Data->Layer[i].On = pcb_true; } @@ -390,7 +390,7 @@ PCB->RatOn = pcb_true; /* Bring the component group to the front and make it active. */ - comp_group = GetLayerGroupNumberByNumber(component_silk_layer); + comp_group = GetLayerGroupNumberByNumber(pcb_component_silk_layer); ChangeGroupVisibility(PCB->LayerGroups.Entries[comp_group][0], 1, 1); } @@ -412,8 +412,8 @@ "SaveStackAndVisibility() layerstack was already saved and not" "yet restored. cnt = %d\n", SavedStack.cnt); } - for (i = 0; i < max_copper_layer + 2; i++) { - if (i < max_copper_layer) + for (i = 0; i < pcb_max_copper_layer + 2; i++) { + if (i < pcb_max_copper_layer) SavedStack.LayerStack[i] = LayerStack[i]; SavedStack.LayerOn[i] = PCB->Data->Layer[i].On; } @@ -440,8 +440,8 @@ fprintf(stderr, "RestoreStackAndVisibility() layerstack save count is" " wrong. cnt = %d\n", SavedStack.cnt); } - for (i = 0; i < max_copper_layer + 2; i++) { - if (i < max_copper_layer) + for (i = 0; i < pcb_max_copper_layer + 2; i++) { + if (i < pcb_max_copper_layer) LayerStack[i] = SavedStack.LayerStack[i]; PCB->Data->Layer[i].On = SavedStack.LayerOn[i]; } @@ -476,12 +476,12 @@ { int prev, i, j; - if (layer < 0 || layer > max_copper_layer + 1) + if (layer < 0 || layer > pcb_max_copper_layer + 1) return -1; prev = GetLayerGroupNumberByNumber(layer); - if ((layer == solder_silk_layer && group == GetLayerGroupNumberByNumber(component_silk_layer)) - || (layer == component_silk_layer && group == GetLayerGroupNumberByNumber(solder_silk_layer)) - || (group < 0 || group >= max_group) || (prev == group)) + if ((layer == pcb_solder_silk_layer && group == GetLayerGroupNumberByNumber(pcb_component_silk_layer)) + || (layer == pcb_component_silk_layer && group == GetLayerGroupNumberByNumber(pcb_solder_silk_layer)) + || (group < 0 || group >= pcb_max_group) || (prev == group)) return prev; /* Remove layer from prev group */ @@ -506,7 +506,7 @@ char *cp = buf; char sep = 0; int group, entry; - for (group = 0; group < max_group; group++) + for (group = 0; group < pcb_max_group; group++) if (PCB->LayerGroups.Number[group]) { if (sep) *cp++ = ':'; @@ -513,10 +513,10 @@ sep = 1; for (entry = 0; entry < PCB->LayerGroups.Number[group]; entry++) { int layer = PCB->LayerGroups.Entries[group][entry]; - if (layer == component_silk_layer) { + if (layer == pcb_component_silk_layer) { *cp++ = 'c'; } - else if (layer == solder_silk_layer) { + else if (layer == pcb_solder_silk_layer) { *cp++ = 's'; } else { @@ -535,20 +535,20 @@ { unsigned int res = 0; - if (layer_idx == solder_silk_layer) + if (layer_idx == pcb_solder_silk_layer) return PCB_LYT_SILK | PCB_LYT_BOTTOM; - if (layer_idx == component_silk_layer) + if (layer_idx == pcb_component_silk_layer) return PCB_LYT_SILK | PCB_LYT_TOP; - if (layer_idx > max_copper_layer+2) + if (layer_idx > pcb_max_copper_layer+2) return 0; - if (layer_idx < max_copper_layer) { + if (layer_idx < pcb_max_copper_layer) { if (!LAYER_IS_OUTLINE(layer_idx)) { /* check whether it's top, bottom or internal */ int group, entry; - for (group = 0; group < max_group; group++) { + for (group = 0; group < pcb_max_group; group++) { if (PCB->LayerGroups.Number[group]) { unsigned int my_group = 0, gf = 0; for (entry = 0; entry < PCB->LayerGroups.Number[group]; entry++) { @@ -555,9 +555,9 @@ int layer = PCB->LayerGroups.Entries[group][entry]; if (layer == layer_idx) my_group = 1; - if (layer == component_silk_layer) + if (layer == pcb_component_silk_layer) gf |= PCB_LYT_TOP; - else if (layer == solder_silk_layer) + else if (layer == pcb_solder_silk_layer) gf |= PCB_LYT_BOTTOM; } if (my_group) { @@ -603,7 +603,7 @@ int pcb_layer_group_list(pcb_layer_type_t mask, int *res, int res_len) { int group, layeri, used = 0; - for (group = 0; group < max_group; group++) { + for (group = 0; group < pcb_max_group; group++) { for (layeri = 0; layeri < PCB->LayerGroups.Number[group]; layeri++) { int layer = PCB->LayerGroups.Entries[group][layeri]; if ((pcb_layer_flags(layer) & mask) == mask) { @@ -619,7 +619,7 @@ int pcb_layer_by_name(const char *name) { int n; - for (n = 0; n < max_copper_layer + 2; n++) + for (n = 0; n < pcb_max_copper_layer + 2; n++) if (strcmp(PCB->Data->Layer[n].Name, name) == 0) return n; return -1; @@ -628,7 +628,7 @@ int pcb_layer_lookup_group(int layer_id) { int group, layeri; - for (group = 0; group < max_group; group++) { + for (group = 0; group < pcb_max_group; group++) { for (layeri = 0; layeri < PCB->LayerGroups.Number[group]; layeri++) { int layer = PCB->LayerGroups.Entries[group][layeri]; if (layer == layer_id) @@ -897,7 +897,7 @@ static int LastLayerInComponentGroup(int layer) { - int cgroup = GetLayerGroupNumberByNumber(max_group + COMPONENT_LAYER); + int cgroup = GetLayerGroupNumberByNumber(pcb_max_group + COMPONENT_LAYER); int lgroup = GetLayerGroupNumberByNumber(layer); if (cgroup == lgroup && PCB->LayerGroups.Number[lgroup] == 2) return 1; @@ -906,7 +906,7 @@ static int LastLayerInSolderGroup(int layer) { - int sgroup = GetLayerGroupNumberByNumber(max_group + SOLDER_LAYER); + int sgroup = GetLayerGroupNumberByNumber(pcb_max_group + SOLDER_LAYER); int lgroup = GetLayerGroupNumberByNumber(layer); if (sgroup == lgroup && PCB->LayerGroups.Number[lgroup] == 2) return 1; @@ -931,12 +931,12 @@ pcb_undo_add_layer_change(old_index, new_index); pcb_undo_inc_serial(); - if (old_index < -1 || old_index >= max_copper_layer) { - pcb_message(PCB_MSG_DEFAULT, "Invalid old layer %d for move: must be -1..%d\n", old_index, max_copper_layer - 1); + if (old_index < -1 || old_index >= pcb_max_copper_layer) { + pcb_message(PCB_MSG_DEFAULT, "Invalid old layer %d for move: must be -1..%d\n", old_index, pcb_max_copper_layer - 1); return 1; } - if (new_index < -1 || new_index > max_copper_layer || new_index >= MAX_LAYER) { - pcb_message(PCB_MSG_DEFAULT, "Invalid new layer %d for move: must be -1..%d\n", new_index, max_copper_layer); + if (new_index < -1 || new_index > pcb_max_copper_layer || new_index >= MAX_LAYER) { + pcb_message(PCB_MSG_DEFAULT, "Invalid new layer %d for move: must be -1..%d\n", new_index, pcb_max_copper_layer); return 1; } if (old_index == new_index) @@ -961,7 +961,7 @@ if (old_index == -1) { pcb_layer_t *lp; - if (max_copper_layer == MAX_LAYER) { + if (pcb_max_copper_layer == MAX_LAYER) { pcb_message(PCB_MSG_DEFAULT, "No room for new layers\n"); return 1; } @@ -968,30 +968,30 @@ /* Create a new layer at new_index. */ lp = &PCB->Data->Layer[new_index]; memmove(&PCB->Data->Layer[new_index + 1], - &PCB->Data->Layer[new_index], (max_copper_layer - new_index + 2) * sizeof(pcb_layer_t)); - memmove(&groups[new_index + 1], &groups[new_index], (max_copper_layer - new_index + 2) * sizeof(int)); - max_copper_layer++; + &PCB->Data->Layer[new_index], (pcb_max_copper_layer - new_index + 2) * sizeof(pcb_layer_t)); + memmove(&groups[new_index + 1], &groups[new_index], (pcb_max_copper_layer - new_index + 2) * sizeof(int)); + pcb_max_copper_layer++; memset(lp, 0, sizeof(pcb_layer_t)); lp->On = 1; lp->Name = pcb_strdup("New Layer"); lp->Color = conf_core.appearance.color.layer[new_index]; lp->SelectedColor = conf_core.appearance.color.layer_selected[new_index]; - for (l = 0; l < max_copper_layer; l++) + for (l = 0; l < pcb_max_copper_layer; l++) if (LayerStack[l] >= new_index) LayerStack[l]++; - LayerStack[max_copper_layer - 1] = new_index; + LayerStack[pcb_max_copper_layer - 1] = new_index; } else if (new_index == -1) { /* Delete the layer at old_index */ memmove(&PCB->Data->Layer[old_index], - &PCB->Data->Layer[old_index + 1], (max_copper_layer - old_index + 2 - 1) * sizeof(pcb_layer_t)); - memset(&PCB->Data->Layer[max_copper_layer + 1], 0, sizeof(pcb_layer_t)); - memmove(&groups[old_index], &groups[old_index + 1], (max_copper_layer - old_index + 2 - 1) * sizeof(int)); - for (l = 0; l < max_copper_layer; l++) + &PCB->Data->Layer[old_index + 1], (pcb_max_copper_layer - old_index + 2 - 1) * sizeof(pcb_layer_t)); + memset(&PCB->Data->Layer[pcb_max_copper_layer + 1], 0, sizeof(pcb_layer_t)); + memmove(&groups[old_index], &groups[old_index + 1], (pcb_max_copper_layer - old_index + 2 - 1) * sizeof(int)); + for (l = 0; l < pcb_max_copper_layer; l++) if (LayerStack[l] == old_index) - memmove(LayerStack + l, LayerStack + l + 1, (max_copper_layer - l - 1) * sizeof(LayerStack[0])); - max_copper_layer--; - for (l = 0; l < max_copper_layer; l++) + memmove(LayerStack + l, LayerStack + l + 1, (pcb_max_copper_layer - l - 1) * sizeof(LayerStack[0])); + pcb_max_copper_layer--; + for (l = 0; l < pcb_max_copper_layer; l++) if (LayerStack[l] > old_index) LayerStack[l]--; } @@ -1015,7 +1015,7 @@ for (g = 0; g < MAX_LAYER; g++) PCB->LayerGroups.Number[g] = 0; - for (l = 0; l < max_copper_layer + 2; l++) { + for (l = 0; l < pcb_max_copper_layer + 2; l++) { int i; g = groups[l]; if (g >= 0) { Index: trunk/src/layer.h =================================================================== --- trunk/src/layer.h (revision 5035) +++ trunk/src/layer.h (revision 5036) @@ -92,17 +92,17 @@ #define LAYER_ON_STACK(n) (&PCB->Data->Layer[LayerStack[(n)]]) #define LAYER_PTR(n) (&PCB->Data->Layer[(n)]) #define CURRENT (PCB->SilkActive ? &PCB->Data->Layer[ \ - (conf_core.editor.show_solder_side ? solder_silk_layer : component_silk_layer)] \ + (conf_core.editor.show_solder_side ? pcb_solder_silk_layer : pcb_component_silk_layer)] \ : LAYER_ON_STACK(0)) #define INDEXOFCURRENT (PCB->SilkActive ? \ - (conf_core.editor.show_solder_side ? solder_silk_layer : component_silk_layer) \ + (conf_core.editor.show_solder_side ? pcb_solder_silk_layer : pcb_component_silk_layer) \ : LayerStack[0]) #define SILKLAYER Layer[ \ - (conf_core.editor.show_solder_side ? solder_silk_layer : component_silk_layer)] + (conf_core.editor.show_solder_side ? pcb_solder_silk_layer : pcb_component_silk_layer)] #define BACKSILKLAYER Layer[ \ - (conf_core.editor.show_solder_side ? component_silk_layer : solder_silk_layer)] + (conf_core.editor.show_solder_side ? pcb_component_silk_layer : pcb_solder_silk_layer)] -#define TEST_SILK_LAYER(layer) (GetLayerNumber (PCB->Data, layer) >= max_copper_layer) +#define TEST_SILK_LAYER(layer) (GetLayerNumber (PCB->Data, layer) >= pcb_max_copper_layer) /* These decode the set_layer index. */ #define SL_TYPE(x) ((x) < 0 ? (x) & 0x0f0 : 0) @@ -134,7 +134,7 @@ pcb_layer_t *layer; \ pcb_cardinal_t number; \ number = ((pcb_board_t *)(data->pcb))->LayerGroups.Entries[(group)][entry]; \ - if (number >= max_copper_layer) \ + if (number >= pcb_max_copper_layer) \ continue; \ layer = &data->Layer[number]; Index: trunk/src/obj_arc.h =================================================================== --- trunk/src/obj_arc.h (revision 5035) +++ trunk/src/obj_arc.h (revision 5036) @@ -77,7 +77,7 @@ #define PCB_ARC_ALL_LOOP(top) do { \ pcb_cardinal_t l; \ pcb_layer_t *layer = (top)->Layer; \ - for (l =0; l < max_copper_layer + 2; l++, layer++) \ + for (l =0; l < pcb_max_copper_layer + 2; l++, layer++) \ { \ PCB_ARC_LOOP(layer) @@ -84,7 +84,7 @@ #define PCB_ARC_COPPER_LOOP(top) do { \ pcb_cardinal_t l; \ pcb_layer_t *layer = (top)->Layer; \ - for (l =0; l < max_copper_layer; l++, layer++) \ + for (l =0; l < pcb_max_copper_layer; l++, layer++) \ { \ PCB_ARC_LOOP(layer) @@ -91,7 +91,7 @@ #define PCB_ARC_SILK_LOOP(top) do { \ pcb_cardinal_t l; \ pcb_layer_t *layer = (top)->Layer; \ - layer += max_copper_layer; \ + layer += pcb_max_copper_layer; \ for (l = 0; l < 2; l++, layer++) \ { \ PCB_ARC_LOOP(layer) @@ -99,7 +99,7 @@ #define PCB_ARC_VISIBLE_LOOP(top) do { \ pcb_cardinal_t l; \ pcb_layer_t *layer = (top)->Layer; \ - for (l = 0; l < max_copper_layer + 2; l++, layer++) \ + for (l = 0; l < pcb_max_copper_layer + 2; l++, layer++) \ { \ if (layer->On) \ PCB_ARC_LOOP(layer) Index: trunk/src/obj_elem.c =================================================================== --- trunk/src/obj_elem.c (revision 5035) +++ trunk/src/obj_elem.c (revision 5036) @@ -204,9 +204,9 @@ pcb_via_new(Buffer->Data, pin->X, pin->Y, pin->Thickness, pin->Clearance, pin->Mask, pin->DrillingHole, pin->Number, f); } END_LOOP; - group = GetLayerGroupNumberByNumber(SWAP_IDENT ? solder_silk_layer : component_silk_layer); + group = GetLayerGroupNumberByNumber(SWAP_IDENT ? pcb_solder_silk_layer : pcb_component_silk_layer); clayer = &Buffer->Data->Layer[PCB->LayerGroups.Entries[group][0]]; - group = GetLayerGroupNumberByNumber(SWAP_IDENT ? component_silk_layer : solder_silk_layer); + group = GetLayerGroupNumberByNumber(SWAP_IDENT ? pcb_component_silk_layer : pcb_solder_silk_layer); slayer = &Buffer->Data->Layer[PCB->LayerGroups.Entries[group][0]]; PCB_PAD_LOOP(element); { @@ -294,11 +294,11 @@ int onsolderflag; if ((!onsolder) == (!SWAP_IDENT)) { - silk_layer = component_silk_layer; + silk_layer = pcb_component_silk_layer; onsolderflag = PCB_FLAG_NO; } else { - silk_layer = solder_silk_layer; + silk_layer = pcb_solder_silk_layer; onsolderflag = PCB_FLAG_ONSOLDER; } Index: trunk/src/obj_line.h =================================================================== --- trunk/src/obj_line.h (revision 5035) +++ trunk/src/obj_line.h (revision 5036) @@ -87,7 +87,7 @@ #define PCB_LINE_ALL_LOOP(top) do { \ pcb_cardinal_t l; \ pcb_layer_t *layer = (top)->Layer; \ - for (l = 0; l < max_copper_layer + 2; l++, layer++) \ + for (l = 0; l < pcb_max_copper_layer + 2; l++, layer++) \ { \ PCB_LINE_LOOP(layer) @@ -94,7 +94,7 @@ #define PCB_LINE_COPPER_LOOP(top) do { \ pcb_cardinal_t l; \ pcb_layer_t *layer = (top)->Layer; \ - for (l = 0; l < max_copper_layer; l++, layer++) \ + for (l = 0; l < pcb_max_copper_layer; l++, layer++) \ { \ PCB_LINE_LOOP(layer) @@ -101,7 +101,7 @@ #define PCB_LINE_SILK_LOOP(top) do { \ pcb_cardinal_t l; \ pcb_layer_t *layer = (top)->Layer; \ - layer += max_copper_layer; \ + layer += pcb_max_copper_layer; \ for (l = 0; l < 2; l++, layer++) \ { \ PCB_LINE_LOOP(layer) @@ -109,7 +109,7 @@ #define PCB_LINE_VISIBLE_LOOP(top) do { \ pcb_cardinal_t l; \ pcb_layer_t *layer = (top)->Layer; \ - for (l = 0; l < max_copper_layer + 2; l++, layer++) \ + for (l = 0; l < pcb_max_copper_layer + 2; l++, layer++) \ { \ if (layer->On) \ PCB_LINE_LOOP(layer) Index: trunk/src/obj_line_drcenf.c =================================================================== --- trunk/src/obj_line_drcenf.c (revision 5035) +++ trunk/src/obj_line_drcenf.c (revision 5036) @@ -279,12 +279,12 @@ length = coord_abs(dy); } group = GetGroupOfLayer(INDEXOFCURRENT); - comp = max_group + 10; /* this out-of-range group might save a call */ - if (GetLayerGroupNumberByNumber(solder_silk_layer) == group) + comp = pcb_max_group + 10; /* this out-of-range group might save a call */ + if (GetLayerGroupNumberByNumber(pcb_solder_silk_layer) == group) info.solder = pcb_true; else { info.solder = pcb_false; - comp = GetLayerGroupNumberByNumber(component_silk_layer); + comp = GetLayerGroupNumberByNumber(pcb_component_silk_layer); } temp = length; /* assume the worst */ @@ -434,12 +434,12 @@ /* prepare for the intersection search */ group = GetGroupOfLayer(INDEXOFCURRENT); - comp = max_group + 10; /* this out-of-range group might save a call */ - if (GetLayerGroupNumberByNumber(solder_silk_layer) == group) + comp = pcb_max_group + 10; /* this out-of-range group might save a call */ + if (GetLayerGroupNumberByNumber(pcb_solder_silk_layer) == group) info.solder = pcb_true; else { info.solder = pcb_false; - comp = GetLayerGroupNumberByNumber(component_silk_layer); + comp = GetLayerGroupNumberByNumber(pcb_component_silk_layer); } /* search for intersection */ @@ -478,7 +478,7 @@ /* Silence a bogus compiler warning by storing this in a variable */ int layer_idx = INDEXOFCURRENT; - if (gui->mod1_is_pressed() || gui->control_is_pressed() || PCB->RatDraw || layer_idx >= max_copper_layer) + if (gui->mod1_is_pressed() || gui->control_is_pressed() || PCB->RatDraw || layer_idx >= pcb_max_copper_layer) return; rs.X = r45.X = pcb_crosshair.X; Index: trunk/src/obj_poly.h =================================================================== --- trunk/src/obj_poly.h (revision 5035) +++ trunk/src/obj_poly.h (revision 5036) @@ -83,7 +83,7 @@ #define PCB_POLY_ALL_LOOP(top) do { \ pcb_cardinal_t l; \ pcb_layer_t *layer = (top)->Layer; \ - for (l = 0; l < max_copper_layer + 2; l++, layer++) \ + for (l = 0; l < pcb_max_copper_layer + 2; l++, layer++) \ { \ PCB_POLY_LOOP(layer) @@ -90,7 +90,7 @@ #define PCB_POLY_COPPER_LOOP(top) do { \ pcb_cardinal_t l; \ pcb_layer_t *layer = (top)->Layer; \ - for (l = 0; l < max_copper_layer; l++, layer++) \ + for (l = 0; l < pcb_max_copper_layer; l++, layer++) \ { \ PCB_POLY_LOOP(layer) @@ -97,7 +97,7 @@ #define PCB_POLY_SILK_LOOP(top) do { \ pcb_cardinal_t l; \ pcb_layer_t *layer = (top)->Layer; \ - layer += max_copper_layer; \ + layer += pcb_max_copper_layer; \ for (l = 0; l < 2; l++, layer++) \ { \ PCB_POLY_LOOP(layer) @@ -105,7 +105,7 @@ #define PCB_POLY_VISIBLE_LOOP(top) do { \ pcb_cardinal_t l; \ pcb_layer_t *layer = (top)->Layer; \ - for (l = 0; l < max_copper_layer + 2; l++, layer++) \ + for (l = 0; l < pcb_max_copper_layer + 2; l++, layer++) \ { \ if (layer->On) \ PCB_POLY_LOOP(layer) Index: trunk/src/obj_text.c =================================================================== --- trunk/src/obj_text.c (revision 5035) +++ trunk/src/obj_text.c (revision 5036) @@ -361,7 +361,7 @@ textlist_remove(text); textlist_append(&Destination->Text, text); - if (GetLayerGroupNumberByNumber(solder_silk_layer) == GetLayerGroupNumberByPointer(Destination)) + if (GetLayerGroupNumberByNumber(pcb_solder_silk_layer) == GetLayerGroupNumberByPointer(Destination)) PCB_FLAG_SET(PCB_FLAG_ONSOLDER, text); else PCB_FLAG_CLEAR(PCB_FLAG_ONSOLDER, text); Index: trunk/src/obj_text.h =================================================================== --- trunk/src/obj_text.h (revision 5035) +++ trunk/src/obj_text.h (revision 5036) @@ -73,7 +73,7 @@ #define PCB_TEXT_ALL_LOOP(top) do { \ pcb_cardinal_t l; \ pcb_layer_t *layer = (top)->Layer; \ - for (l = 0; l < max_copper_layer + 2; l++, layer++) \ + for (l = 0; l < pcb_max_copper_layer + 2; l++, layer++) \ { \ PCB_TEXT_LOOP(layer) @@ -80,7 +80,7 @@ #define PCB_TEXT_VISIBLE_LOOP(board) do { \ pcb_cardinal_t l; \ pcb_layer_t *layer = (board)->Data->Layer; \ - for (l = 0; l < max_copper_layer + 2; l++, layer++) \ + for (l = 0; l < pcb_max_copper_layer + 2; l++, layer++) \ { \ PCB_TEXT_LOOP(layer); \ if (pcb_text_is_visible((board), layer, text)) Index: trunk/src/object_act.c =================================================================== --- trunk/src/object_act.c (revision 5035) +++ trunk/src/object_act.c (revision 5036) @@ -125,7 +125,7 @@ if (layername) { int i; layer = NULL; - for (i = 0; i < max_copper_layer; i++) + for (i = 0; i < pcb_max_copper_layer; i++) if (strcmp(PCB->Data->Layer[i].Name, layername) == 0) { layer = &(PCB->Data->Layer[i]); break; @@ -1069,7 +1069,7 @@ } else if (strcmp(argv[1], "down") == 0) { new_index = INDEXOFCURRENT + 1; - if (new_index >= max_copper_layer) + if (new_index >= pcb_max_copper_layer) return 1; new_top = new_index; } @@ -1081,7 +1081,7 @@ if (new_index == -1) { new_top = old_index; - if (new_top >= max_copper_layer) + if (new_top >= pcb_max_copper_layer) new_top--; new_index = new_top; } Index: trunk/src/polygon.c =================================================================== --- trunk/src/polygon.c (revision 5035) +++ trunk/src/polygon.c (revision 5036) @@ -990,7 +990,7 @@ static int Group(pcb_data_t *Data, pcb_cardinal_t layer) { pcb_cardinal_t i, j; - for (i = 0; i < max_group; i++) + for (i = 0; i < pcb_max_group; i++) for (j = 0; j < ((pcb_board_t *) (Data->pcb))->LayerGroups.Number[i]; j++) if (layer == ((pcb_board_t *) (Data->pcb))->LayerGroups.Entries[i][j]) return i; @@ -1005,10 +1005,10 @@ pcb_cardinal_t group; if (!PCB_FLAG_TEST(PCB_FLAG_CLEARPOLY, polygon) - || GetLayerNumber(Data, Layer) >= max_copper_layer) + || GetLayerNumber(Data, Layer) >= pcb_max_copper_layer) return 0; group = Group(Data, GetLayerNumber(Data, Layer)); - info.solder = (group == Group(Data, solder_silk_layer)); + info.solder = (group == Group(Data, pcb_solder_silk_layer)); info.data = Data; info.other = here; info.layer = Layer; @@ -1023,7 +1023,7 @@ r = 0; info.accumulate = NULL; info.batch_size = 0; - if (info.solder || group == Group(Data, component_silk_layer)) { + if (info.solder || group == Group(Data, pcb_component_silk_layer)) { pcb_r_search(Data->pad_tree, ®ion, NULL, pad_sub_callback, &info, &seen); r += seen; } @@ -1472,7 +1472,7 @@ case PCB_TYPE_PIN: case PCB_TYPE_VIA: if (type == PCB_TYPE_PIN || ptr1 == ptr2 || ptr1 == NULL) { - LAYER_LOOP(Data, max_copper_layer); + LAYER_LOOP(Data, pcb_max_copper_layer); { info.layer = layer; pcb_r_search(layer->polygon_tree, &sb, NULL, plow_callback, &info, &seen); @@ -1497,7 +1497,7 @@ if (!PCB_FLAG_TEST(PCB_FLAG_CLEARLINE, (pcb_line_t *) ptr2)) return 0; /* silk doesn't plow */ - if (GetLayerNumber(Data, (pcb_layer_t *) ptr1) >= max_copper_layer) + if (GetLayerNumber(Data, (pcb_layer_t *) ptr1) >= pcb_max_copper_layer) return 0; GROUP_LOOP(Data, GetLayerGroupNumberByNumber(GetLayerNumber(Data, ((pcb_layer_t *) ptr1)))); { @@ -1510,7 +1510,7 @@ case PCB_TYPE_PAD: { pcb_cardinal_t group = GetLayerGroupNumberByNumber(PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, (pcb_pad_t *) ptr2) ? - solder_silk_layer : component_silk_layer); + pcb_solder_silk_layer : pcb_component_silk_layer); GROUP_LOOP(Data, group); { info.layer = layer; Index: trunk/src/rats.c =================================================================== --- trunk/src/rats.c (revision 5035) +++ trunk/src/rats.c (revision 5036) @@ -198,8 +198,8 @@ badnet = pcb_false; /* find layer groups of the component side and solder side */ - SLayer = GetLayerGroupNumberByNumber(solder_silk_layer); - CLayer = GetLayerGroupNumberByNumber(component_silk_layer); + SLayer = GetLayerGroupNumberByNumber(pcb_solder_silk_layer); + CLayer = GetLayerGroupNumberByNumber(pcb_component_silk_layer); Wantlist = (pcb_netlist_t *) calloc(1, sizeof(pcb_netlist_t)); if (Wantlist) { @@ -835,7 +835,7 @@ /* will work for pins to since the FLAG is common */ group1 = (PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, (pcb_pad_t *) ptr2) ? - GetLayerGroupNumberByNumber(solder_silk_layer) : GetLayerGroupNumberByNumber(component_silk_layer)); + GetLayerGroupNumberByNumber(pcb_solder_silk_layer) : GetLayerGroupNumberByNumber(pcb_component_silk_layer)); strcpy(name1, pcb_connection_name(found, ptr1, ptr2)); found = pcb_search_obj_by_location(PCB_TYPE_PAD | PCB_TYPE_PIN, &ptr1, &ptr2, &ptr3, pcb_crosshair.AttachedLine.Point2.X, pcb_crosshair.AttachedLine.Point2.Y, 5); @@ -848,7 +848,7 @@ return (NULL); } group2 = (PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, (pcb_pad_t *) ptr2) ? - GetLayerGroupNumberByNumber(solder_silk_layer) : GetLayerGroupNumberByNumber(component_silk_layer)); + GetLayerGroupNumberByNumber(pcb_solder_silk_layer) : GetLayerGroupNumberByNumber(pcb_component_silk_layer)); name2 = pcb_connection_name(found, ptr1, ptr2); menu = pcb_netnode_to_netname(name1); Index: trunk/src/rubberband.c =================================================================== --- trunk/src/rubberband.c (revision 5035) +++ trunk/src/rubberband.c (revision 5036) @@ -187,7 +187,7 @@ info.box.Y2 = MAX(Pad->Point1.Y, Pad->Point2.Y) + half; info.radius = 0; info.line = NULL; - i = PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, Pad) ? solder_silk_layer : component_silk_layer; + i = PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, Pad) ? pcb_solder_silk_layer : pcb_component_silk_layer; group = GetLayerGroupNumberByNumber(i); /* check all visible layers in the same group */ @@ -257,7 +257,7 @@ struct rinfo info; pcb_cardinal_t i; - i = PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, Pad) ? solder_silk_layer : component_silk_layer; + i = PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, Pad) ? pcb_solder_silk_layer : pcb_component_silk_layer; info.group = GetLayerGroupNumberByNumber(i); info.pad = Pad; info.type = PCB_TYPE_PAD; @@ -311,7 +311,7 @@ info.Y = Pin->Y; } - for (n = 0; n < max_copper_layer; n++) { + for (n = 0; n < pcb_max_copper_layer; n++) { info.layer = LAYER_PTR(n); pcb_r_search(info.layer->line_tree, &info.box, NULL, rubber_callback, &info, NULL); } @@ -425,7 +425,7 @@ { pcb_layer_t *layer = (pcb_layer_t *) Ptr1; pcb_line_t *line = (pcb_line_t *) Ptr2; - if (GetLayerNumber(PCB->Data, layer) < max_copper_layer) { + if (GetLayerNumber(PCB->Data, layer) < pcb_max_copper_layer) { CheckLinePointForRubberbandConnection(layer, line, &line->Point1, pcb_false); CheckLinePointForRubberbandConnection(layer, line, &line->Point2, pcb_false); } @@ -433,7 +433,7 @@ } case PCB_TYPE_LINE_POINT: - if (GetLayerNumber(PCB->Data, (pcb_layer_t *) Ptr1) < max_copper_layer) + if (GetLayerNumber(PCB->Data, (pcb_layer_t *) Ptr1) < pcb_max_copper_layer) CheckLinePointForRubberbandConnection((pcb_layer_t *) Ptr1, (pcb_line_t *) Ptr2, (pcb_point_t *) Ptr3, pcb_true); break; @@ -442,7 +442,7 @@ break; case PCB_TYPE_POLYGON: - if (GetLayerNumber(PCB->Data, (pcb_layer_t *) Ptr1) < max_copper_layer) + if (GetLayerNumber(PCB->Data, (pcb_layer_t *) Ptr1) < pcb_max_copper_layer) CheckPolygonForRubberbandConnection((pcb_layer_t *) Ptr1, (pcb_polygon_t *) Ptr2); break; } Index: trunk/src/search.c =================================================================== --- trunk/src/search.c (revision 5035) +++ trunk/src/search.c (revision 5036) @@ -1024,10 +1024,10 @@ HigherAvail = PCB_TYPE_ELEMENT; } - for (i = -1; i < max_copper_layer + 1; i++) { + for (i = -1; i < pcb_max_copper_layer + 1; i++) { if (i < 0) SearchLayer = &PCB->Data->SILKLAYER; - else if (i < max_copper_layer) + else if (i < pcb_max_copper_layer) SearchLayer = LAYER_ON_STACK(i); else { SearchLayer = &PCB->Data->BACKSILKLAYER; Index: trunk/src/select.c =================================================================== --- trunk/src/select.c (revision 5035) +++ trunk/src/select.c (revision 5036) @@ -296,7 +296,7 @@ END_LOOP; /* check layers */ - LAYER_LOOP(PCB->Data, max_copper_layer + 2); + LAYER_LOOP(PCB->Data, pcb_max_copper_layer + 2); { if (layer == &PCB->Data->SILKLAYER) { if (!(PCB->ElementOn || !Flag)) Index: trunk/src_plugins/autoplace/autoplace.c =================================================================== --- trunk/src_plugins/autoplace/autoplace.c (revision 5035) +++ trunk/src_plugins/autoplace/autoplace.c (revision 5036) @@ -146,8 +146,8 @@ pcb_cardinal_t SLayer, CLayer; pcb_cardinal_t i, j; /* find layer groups of the component side and solder side */ - SLayer = GetLayerGroupNumberByNumber(solder_silk_layer); - CLayer = GetLayerGroupNumberByNumber(component_silk_layer); + SLayer = GetLayerGroupNumberByNumber(pcb_solder_silk_layer); + CLayer = GetLayerGroupNumberByNumber(pcb_component_silk_layer); /* update all nets */ for (i = 0; i < Nets->NetN; i++) { for (j = 0; j < Nets->Net[i].ConnectionN; j++) { @@ -194,7 +194,7 @@ static void showboxes(pcb_box_list_t *blist) { pcb_cardinal_t i; - pcb_layer_t *SLayer = &(PCB->Data->Layer[solder_silk_layer]); + pcb_layer_t *SLayer = &(PCB->Data->Layer[pcb_solder_silk_layer]); for (i = 0; i < blist->BoxN; i++) { pcb_line_new(SLayer, blist->Box[i].X1, blist->Box[i].Y1, blist->Box[i].X2, blist->Box[i].Y1, 1, 1, 0); pcb_line_new(SLayer, blist->Box[i].X1, blist->Box[i].Y2, blist->Box[i].X2, blist->Box[i].Y2, 1, 1, 0); Index: trunk/src_plugins/autoroute/autoroute.c =================================================================== --- trunk/src_plugins/autoroute/autoroute.c (revision 5035) +++ trunk/src_plugins/autoroute/autoroute.c (revision 5036) @@ -415,7 +415,7 @@ #ifndef NDEBUG static int __routepcb_box_is_good(routebox_t * rb) { - assert(rb && (rb->group < max_group) && + assert(rb && (rb->group < pcb_max_group) && (rb->box.X1 <= rb->box.X2) && (rb->box.Y1 <= rb->box.Y2) && (rb->flags.homeless ? (rb->box.X1 != rb->box.X2) || (rb->box.Y1 != rb->box.Y2) : (rb->box.X1 != rb->box.X2) && (rb->box.Y1 != rb->box.Y2))); @@ -588,7 +588,7 @@ routebox_t **rbpp, *lastrb = NULL; int i, ht; /* a pin cuts through every layer group */ - for (i = 0; i < max_group; i++) { + for (i = 0; i < pcb_max_group; i++) { rbpp = (routebox_t **) GetPointerMemory(&layergroupboxes[i]); *rbpp = (routebox_t *) malloc(sizeof(**rbpp)); memset((void *) *rbpp, 0, sizeof(**rbpp)); @@ -630,7 +630,7 @@ pcb_coord_t halfthick; routebox_t **rbpp; int layergroup = (PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, pad) ? back : front); - assert(0 <= layergroup && layergroup < max_group); + assert(0 <= layergroup && layergroup < pcb_max_group); assert(PCB->LayerGroups.Number[layergroup] > 0); rbpp = (routebox_t **) GetPointerMemory(&layergroupboxes[layergroup]); assert(rbpp); @@ -664,7 +664,7 @@ { routebox_t **rbpp; assert(layergroupboxes && line); - assert(0 <= layergroup && layergroup < max_group); + assert(0 <= layergroup && layergroup < pcb_max_group); assert(PCB->LayerGroups.Number[layergroup] > 0); rbpp = (routebox_t **) GetPointerMemory(&layergroupboxes[layergroup]); @@ -708,7 +708,7 @@ pcb_coord_t keep = style->Clearance; assert(layergroupboxes && parent); assert(X1 <= X2 && Y1 <= Y2); - assert(0 <= layergroup && layergroup < max_group); + assert(0 <= layergroup && layergroup < pcb_max_group); assert(PCB->LayerGroups.Number[layergroup] > 0); rbpp = (routebox_t **) GetPointerMemory(&layergroupboxes[layergroup]); @@ -731,7 +731,7 @@ int is_not_rectangle = 1; int layergroup = GetLayerGroupNumberByNumber(layer); routebox_t *rb; - assert(0 <= layergroup && layergroup < max_group); + assert(0 <= layergroup && layergroup < pcb_max_group); rb = AddIrregularObstacle(layergroupboxes, polygon->BoundingBox.X1, polygon->BoundingBox.Y1, @@ -858,10 +858,10 @@ /* check which layers are active first */ routing_layers = 0; - for (group = 0; group < max_group; group++) { + for (group = 0; group < pcb_max_group; group++) { for (i = 0; i < PCB->LayerGroups.Number[group]; i++) - /* layer must be 1) not silk (ie, < max_copper_layer) and 2) on */ - if ((PCB->LayerGroups.Entries[group][i] < max_copper_layer) && PCB->Data->Layer[PCB->LayerGroups.Entries[group][i]].On) { + /* layer must be 1) not silk (ie, < pcb_max_copper_layer) and 2) on */ + if ((PCB->LayerGroups.Entries[group][i] < pcb_max_copper_layer) && PCB->Data->Layer[PCB->LayerGroups.Entries[group][i]].On) { routing_layers++; is_layer_group_active[group] = pcb_true; break; @@ -871,10 +871,10 @@ } /* if via visibility is turned off, don't use them */ AutoRouteParameters.use_vias = routing_layers > 1 && PCB->ViaOn; - front = GetLayerGroupNumberByNumber(component_silk_layer); - back = GetLayerGroupNumberByNumber(solder_silk_layer); + front = GetLayerGroupNumberByNumber(pcb_component_silk_layer); + back = GetLayerGroupNumberByNumber(pcb_solder_silk_layer); /* determine preferred routing direction on each group */ - for (i = 0; i < max_group; i++) { + for (i = 0; i < pcb_max_group; i++) { if (i != back && i != front) { x_cost[i] = (i & 1) ? 2 : 1; y_cost[i] = (i & 1) ? 1 : 2; @@ -913,7 +913,7 @@ } /* initialize pointerlisttype */ - for (i = 0; i < max_group; i++) { + for (i = 0; i < pcb_max_group; i++) { layergroupboxes[i].Ptr = NULL; layergroupboxes[i].PtrN = 0; layergroupboxes[i].PtrMax = 0; @@ -1066,7 +1066,7 @@ } END_LOOP; - for (i = 0; i < max_copper_layer; i++) { + for (i = 0; i < pcb_max_copper_layer; i++) { int layergroup = GetLayerGroupNumberByNumber(i); /* add all (non-rat) lines */ PCB_LINE_LOOP(LAYER_PTR(i)); @@ -1125,7 +1125,7 @@ } /* create r-trees from pointer lists */ - for (i = 0; i < max_group; i++) { + for (i = 0; i < pcb_max_group; i++) { /* create the r-tree */ rd->layergrouptree[i] = pcb_r_create_tree((const pcb_box_t **) layergroupboxes[i].Ptr, layergroupboxes[i].PtrN, 1); } @@ -1135,7 +1135,7 @@ /* create "empty-space" structures for via placement (now that we know * appropriate clearances for all the fixed elements) */ - for (i = 0; i < max_group; i++) { + for (i = 0; i < pcb_max_group; i++) { POINTER_LOOP(&layergroupboxes[i]); { routebox_t *rb = (routebox_t *) * ptr; @@ -1146,7 +1146,7 @@ } } /* free pointer lists */ - for (i = 0; i < max_group; i++) + for (i = 0; i < pcb_max_group; i++) FreePointerListMemory(&layergroupboxes[i]); /* done! */ return rd; @@ -1155,7 +1155,7 @@ void DestroyRouteData(routedata_t ** rd) { int i; - for (i = 0; i < max_group; i++) + for (i = 0; i < pcb_max_group; i++) pcb_r_destroy_tree(&(*rd)->layergrouptree[i]); if (AutoRouteParameters.use_vias) mtspace_destroy(&(*rd)->mtspace); @@ -1282,7 +1282,7 @@ if ((p2.X - p->X) * (p2.Y - p->Y) != 0) trial += AutoRouteParameters.JogPenalty; /* special case for defered via searching */ - if (point_layer > max_group || point_layer == rb->group) + if (point_layer > pcb_max_group || point_layer == rb->group) return trial + PCB_ABS(p2.X - p->X) + PCB_ABS(p2.Y - p->Y); /* if this target is only a via away, then the via is cheaper than the congestion */ if (p->X == p2.X && p->Y == p2.Y) @@ -1338,17 +1338,17 @@ #if 1 if (b.Y1 == b.Y2 || b.X1 == b.X2) thickness = 5; - line = pcb_line_new(LAYER_PTR(component_silk_layer), b.X1, b.Y1, b.X2, b.Y1, thickness, 0, pcb_flag_make(0)); - pcb_undo_add_obj_to_create(PCB_TYPE_LINE, LAYER_PTR(component_silk_layer), line, line); + line = pcb_line_new(LAYER_PTR(pcb_component_silk_layer), b.X1, b.Y1, b.X2, b.Y1, thickness, 0, pcb_flag_make(0)); + pcb_undo_add_obj_to_create(PCB_TYPE_LINE, LAYER_PTR(pcb_component_silk_layer), line, line); if (b.Y1 != b.Y2) { - line = pcb_line_new(LAYER_PTR(component_silk_layer), b.X1, b.Y2, b.X2, b.Y2, thickness, 0, pcb_flag_make(0)); - pcb_undo_add_obj_to_create(PCB_TYPE_LINE, LAYER_PTR(component_silk_layer), line, line); + line = pcb_line_new(LAYER_PTR(pcb_component_silk_layer), b.X1, b.Y2, b.X2, b.Y2, thickness, 0, pcb_flag_make(0)); + pcb_undo_add_obj_to_create(PCB_TYPE_LINE, LAYER_PTR(pcb_component_silk_layer), line, line); } - line = pcb_line_new(LAYER_PTR(component_silk_layer), b.X1, b.Y1, b.X1, b.Y2, thickness, 0, pcb_flag_make(0)); - pcb_undo_add_obj_to_create(PCB_TYPE_LINE, LAYER_PTR(component_silk_layer), line, line); + line = pcb_line_new(LAYER_PTR(pcb_component_silk_layer), b.X1, b.Y1, b.X1, b.Y2, thickness, 0, pcb_flag_make(0)); + pcb_undo_add_obj_to_create(PCB_TYPE_LINE, LAYER_PTR(pcb_component_silk_layer), line, line); if (b.X1 != b.X2) { - line = pcb_line_new(LAYER_PTR(component_silk_layer), b.X2, b.Y1, b.X2, b.Y2, thickness, 0, pcb_flag_make(0)); - pcb_undo_add_obj_to_create(PCB_TYPE_LINE, LAYER_PTR(component_silk_layer), line, line); + line = pcb_line_new(LAYER_PTR(pcb_component_silk_layer), b.X2, b.Y1, b.X2, b.Y2, thickness, 0, pcb_flag_make(0)); + pcb_undo_add_obj_to_create(PCB_TYPE_LINE, LAYER_PTR(pcb_component_silk_layer), line, line); } #endif } @@ -1388,7 +1388,7 @@ #if defined(ROUTE_DEBUG) static void showroutebox(routebox_t * rb) { - showbox(rb->sbox, rb->flags.source ? 20 : (rb->flags.target ? 10 : 1), rb->flags.is_via ? component_silk_layer : rb->group); + showbox(rb->sbox, rb->flags.source ? 20 : (rb->flags.target ? 10 : 1), rb->flags.is_via ? pcb_component_silk_layer : rb->group); } #endif @@ -2864,7 +2864,7 @@ } /* a via cuts through every layer group */ - for (i = 0; i < max_group; i++) { + for (i = 0; i < pcb_max_group; i++) { if (!is_layer_group_active[i]) continue; rb = (routebox_t *) malloc(sizeof(*rb)); @@ -3276,7 +3276,7 @@ assert(__routepcb_box_is_good(rb)); /* find the cheapest target */ #if 0 - target = minpcb_cost_target_to_point(&parent->cost_point, max_group + 1, targets, parent->minpcb_cost_target); + target = minpcb_cost_target_to_point(&parent->cost_point, pcb_max_group + 1, targets, parent->minpcb_cost_target); #else target = parent->minpcb_cost_target; #endif @@ -3408,7 +3408,7 @@ free(area); assert(pcb_box_is_good(&cliparea)); count++; - for (j = 0; j < max_group; j++) { + for (j = 0; j < pcb_max_group; j++) { edge_t *ne; if (j == within->group || !is_layer_group_active[j]) continue; @@ -4033,7 +4033,7 @@ AutoRouteParameters.JogPenalty = 1000 * (is_smoothing ? 20 : 4); AutoRouteParameters.CongestionPenalty = 1e6; AutoRouteParameters.MinPenalty = EXPENSIVE; - for (i = 0; i < max_group; i++) { + for (i = 0; i < pcb_max_group; i++) { if (is_layer_group_active[i]) { AutoRouteParameters.MinPenalty = MIN(x_cost[i], AutoRouteParameters.MinPenalty); AutoRouteParameters.MinPenalty = MIN(y_cost[i], AutoRouteParameters.MinPenalty); @@ -4067,7 +4067,7 @@ big.X2 = MAX_COORD; big.Y1 = 0; big.Y2 = MAX_COORD; - for (i = 0; i < max_group; i++) { + for (i = 0; i < pcb_max_group; i++) { if (pcb_r_search(rd->layergrouptree[i], &big, NULL, bad_boy, NULL, NULL)) return pcb_false; } @@ -4688,7 +4688,7 @@ if (conf_core.editor.live_routing) { int i; pcb_box_t big = { 0, 0, MAX_COORD, MAX_COORD }; - for (i = 0; i < max_group; i++) { + for (i = 0; i < pcb_max_group; i++) { pcb_r_search(rd->layergrouptree[i], &big, NULL, ripout_livedraw_obj_cb, NULL, NULL); } } Index: trunk/src_plugins/boardflip/boardflip.c =================================================================== --- trunk/src_plugins/boardflip/boardflip.c (revision 5035) +++ trunk/src_plugins/boardflip/boardflip.c (revision 5036) @@ -66,7 +66,7 @@ if (argc > 0 && strcasecmp(argv[0], "sides") == 0) sides = 1; printf("argc %d argv %s sides %d\n", argc, argc > 0 ? argv[0] : "", sides); - LAYER_LOOP(PCB->Data, max_copper_layer + 2); + LAYER_LOOP(PCB->Data, pcb_max_copper_layer + 2); { PCB_LINE_LOOP(layer); { Index: trunk/src_plugins/diag/diag.c =================================================================== --- trunk/src_plugins/diag/diag.c (revision 5035) +++ trunk/src_plugins/diag/diag.c (revision 5036) @@ -148,7 +148,7 @@ { int g, n, used, arr[128]; /* WARNING: this assumes we won't have more than 128 layers */ - printf("Max: theoretical=%d current_board=%d\n", MAX_LAYER+2, max_copper_layer); + printf("Max: theoretical=%d current_board=%d\n", MAX_LAYER+2, pcb_max_copper_layer); for(n = 0; n < MAX_LAYER+2; n++) { int grp = GetGroupOfLayer(n); printf(" [%d] %04x group=%d %s\n", n, pcb_layer_flags(n), grp, PCB->Data->Layer[n].Name); Index: trunk/src_plugins/djopt/djopt.c =================================================================== --- trunk/src_plugins/djopt/djopt.c (revision 5035) +++ trunk/src_plugins/djopt/djopt.c (revision 5036) @@ -471,7 +471,7 @@ { line_s *ls; - if (layer >= max_copper_layer) + if (layer >= pcb_max_copper_layer) dj_abort("layer %d\n", layer); if (example == NULL) @@ -1739,7 +1739,7 @@ counts[c->lines[i]->layer]++; directions[c->lines[i]->layer] |= o; } - for (o = 0, i = 0; i < max_copper_layer; i++) + for (o = 0, i = 0; i < pcb_max_copper_layer; i++) if (counts[i] == 1) { o = directions[i]; break; @@ -1756,7 +1756,7 @@ default: continue; } - for (i = 0; i < max_copper_layer; i++) + for (i = 0; i < pcb_max_copper_layer; i++) if (counts[i] && directions[i] != o && directions[i] != oboth) goto vianudge_continue; @@ -2290,7 +2290,7 @@ } dprintf("%s x %#mS-%#mS y %#mS-%#mS\n", corner_name(c), left, right, bottom, top); - for (l = 0; l <= max_copper_layer; l++) { + for (l = 0; l <= pcb_max_copper_layer; l++) { best_dist[l] = close * 2; best_c[l] = 0; } @@ -2323,10 +2323,10 @@ } } if (!got_one && c->n_lines == (c->pad ? 1 : 0)) { - for (l = 0; l <= max_copper_layer; l++) + for (l = 0; l <= pcb_max_copper_layer; l++) if (best_c[l]) dprintf("best[%d] = %s\n", l, corner_name(best_c[l])); - for (l = 0; l <= max_copper_layer; l++) + for (l = 0; l <= pcb_max_copper_layer; l++) if (best_c[l]) { dprintf("move %s to %s\n", corner_name(best_c[l]), corner_name(c)); connect_corners(best_c[l], c); @@ -2466,20 +2466,20 @@ pcb_layer_group_t *l = &(PCB->LayerGroups); solder_layer = component_layer = -1; - for (i = 0; i < max_copper_layer; i++) { + for (i = 0; i < pcb_max_copper_layer; i++) { layer_type[i] = 0; layer_groupings[i] = 0; } - for (i = 0; i < max_group; i++) { + for (i = 0; i < pcb_max_group; i++) { f = 0; for (j = 0; j < l->Number[i]; j++) { - if (l->Entries[i][j] == solder_silk_layer) + if (l->Entries[i][j] == pcb_solder_silk_layer) f |= LT_SOLDER; - if (l->Entries[i][j] == component_silk_layer) + if (l->Entries[i][j] == pcb_component_silk_layer) f |= LT_COMPONENT; } for (j = 0; j < l->Number[i]; j++) { - if (l->Entries[i][j] < max_copper_layer) { + if (l->Entries[i][j] < pcb_max_copper_layer) { layer_type[l->Entries[i][j]] |= f; layer_groupings[l->Entries[i][j]] = i; if (solder_layer == -1 && f == LT_SOLDER) @@ -2607,7 +2607,7 @@ return 0; } - for (layn = 0; layn < max_copper_layer; layn++) { + for (layn = 0; layn < pcb_max_copper_layer; layn++) { pcb_layer_t *layer = LAYER_PTR(layn); PCB_LINE_LOOP(layer); Index: trunk/src_plugins/draw_fab/draw_fab.c =================================================================== --- trunk/src_plugins/draw_fab/draw_fab.c (revision 5035) +++ trunk/src_plugins/draw_fab/draw_fab.c (revision 5036) @@ -237,7 +237,7 @@ strftime(utcTime, sizeof utcTime, fmt, gmtime(¤ttime)); } yoff = -TEXT_LINE; - for (i = 0; i < max_copper_layer; i++) { + for (i = 0; i < pcb_max_copper_layer; i++) { pcb_layer_t *l = LAYER_PTR(i); if (l->Name && (linelist_length(&l->Line) || arclist_length(&l->Arc))) { if (strcmp("route", l->Name) == 0) @@ -246,7 +246,7 @@ break; } } - if (i == max_copper_layer) { + if (i == pcb_max_copper_layer) { gui->set_line_width(gc, PCB_MIL_TO_COORD(10)); gui->draw_line(gc, 0, 0, PCB->MaxWidth, 0); gui->draw_line(gc, 0, 0, 0, PCB->MaxHeight); Index: trunk/src_plugins/export_bboard/bboard.c =================================================================== --- trunk/src_plugins/export_bboard/bboard.c (revision 5035) +++ trunk/src_plugins/export_bboard/bboard.c (revision 5036) @@ -174,7 +174,7 @@ static int bboard_validate_layer(const char *name, int group, int skipsolder) { - int idx = (group >= 0 && group < max_group) ? PCB->LayerGroups.Entries[group][0] : group; + int idx = (group >= 0 && group < pcb_max_group) ? PCB->LayerGroups.Entries[group][0] : group; if (name == 0) name = PCB->Data->Layer[idx].Name; @@ -195,7 +195,7 @@ return 0; - if (group >= 0 && group < max_group) { + if (group >= 0 && group < pcb_max_group) { if (!group_data[group].draw) return 0; group_data[group].exp = 1; @@ -515,15 +515,15 @@ memset(group_data, 0, sizeof(group_data)); #ifdef SOLDER_LAYER - group_data[GetLayerGroupNumberByNumber(max_copper_layer + SOLDER_LAYER)].solder = 1; - group_data[GetLayerGroupNumberByNumber(max_copper_layer + COMPONENT_LAYER)].component = 1; + group_data[GetLayerGroupNumberByNumber(pcb_max_copper_layer + SOLDER_LAYER)].solder = 1; + group_data[GetLayerGroupNumberByNumber(pcb_max_copper_layer + COMPONENT_LAYER)].component = 1; #else - group_data[GetLayerGroupNumberByNumber(max_copper_layer + BOTTOM_SIDE)].solder = 1; - group_data[GetLayerGroupNumberByNumber(max_copper_layer + TOP_SIDE)].component = 1; + group_data[GetLayerGroupNumberByNumber(pcb_max_copper_layer + BOTTOM_SIDE)].solder = 1; + group_data[GetLayerGroupNumberByNumber(pcb_max_copper_layer + TOP_SIDE)].component = 1; #endif - for (i = 0; i < max_copper_layer; i++) { + for (i = 0; i < pcb_max_copper_layer; i++) { layer = PCB->Data->Layer + i; if (linelist_length(&layer->Line) > 0) group_data[GetLayerGroupNumberByNumber(i)].draw = 1; @@ -546,7 +546,7 @@ END_LOOP; /* draw all wires from all valid layers */ - for (i = max_copper_layer - 1; i >= 0; i--) { + for (i = pcb_max_copper_layer - 1; i >= 0; i--) { if (bboard_validate_layer(PCB->Data->Layer[i].Name, GetLayerGroupNumberByNumber(i), options[HA_skipsolder].int_value)) { bboard_get_layer_color(&(PCB->Data->Layer[i]), &clr_r, &clr_g, &clr_b); bboard_set_color_cairo(clr_r, clr_g, clr_b); Index: trunk/src_plugins/export_dsn/dsn.c =================================================================== --- trunk/src_plugins/export_dsn/dsn.c (revision 5035) +++ trunk/src_plugins/export_dsn/dsn.c (revision 5036) @@ -167,7 +167,7 @@ "Router will consider an inner layer to be the \"top\" layer.\n"); } - for (group = 0; group < max_group; group++) { + for (group = 0; group < pcb_max_group; group++) { pcb_layer_t *first_layer; if (group == top_group || group == bot_group) continue; Index: trunk/src_plugins/export_dxf/dxf.c =================================================================== --- trunk/src_plugins/export_dxf/dxf.c (revision 5035) +++ trunk/src_plugins/export_dxf/dxf.c (revision 5036) @@ -744,11 +744,11 @@ * \brief Find a group for a given layer ??. */ static int dxf_group_for_layer(int l) { - if ((l < max_copper_layer + 2) && (l >= 0)) { + if ((l < pcb_max_copper_layer + 2) && (l >= 0)) { return GetLayerGroupNumberByNumber(l); } /* else something unique */ - return max_group + 3 + l; + return pcb_max_group + 3 + l; } /*! @@ -4303,7 +4303,7 @@ print_layer[tmp[i]] = 1; memcpy(saved_layer_stack, LayerStack, sizeof(LayerStack)); - qsort(LayerStack, max_copper_layer, sizeof(LayerStack[0]), dxf_layer_sort); + qsort(LayerStack, pcb_max_copper_layer, sizeof(LayerStack[0]), dxf_layer_sort); linewidth = -1; lastcap = -1; lastgroup = -1; @@ -4405,7 +4405,7 @@ #if DEBUG fprintf(stderr, "[File: %s: line: %d] Entering dxf_set_layer () function.\n", __FILE__, __LINE__); #endif - idx = (group >= 0 && group < max_group) ? PCB->LayerGroups.Entries[group][0] : group; + idx = (group >= 0 && group < pcb_max_group) ? PCB->LayerGroups.Entries[group][0] : group; if (name == 0) { /* if none given, get the layer name from pcb */ @@ -4418,7 +4418,7 @@ /* do nothing here to export all layers */ } else { - if (idx >= 0 && idx < max_copper_layer && !print_layer[idx]) { + if (idx >= 0 && idx < pcb_max_copper_layer && !print_layer[idx]) { /* do not export empty layers */ if (dxf_verbose) { fprintf(stderr, "DXF: Warning, Layer %s contains no exportable items and is not set.\n", name); Index: trunk/src_plugins/export_gcode/gcode.c =================================================================== --- trunk/src_plugins/export_gcode/gcode.c (revision 5035) +++ trunk/src_plugins/export_gcode/gcode.c (revision 5036) @@ -257,7 +257,7 @@ /* Set entire array to 0 (don't export any layer groups by default */ memset(gcode_export_group, 0, sizeof(gcode_export_group)); - for (n = 0; n < max_copper_layer; n++) { + for (n = 0; n < pcb_max_copper_layer; n++) { layer = &PCB->Data->Layer[n]; if (!LAYER_IS_PCB_EMPTY(layer)) { @@ -406,9 +406,9 @@ gcode_cur_group = i; /* magic */ - idx = (i >= 0 && i < max_group) ? PCB->LayerGroups.Entries[i][0] : i; + idx = (i >= 0 && i < pcb_max_group) ? PCB->LayerGroups.Entries[i][0] : i; printf("idx=%d %s\n", idx, pcb_layer_type_to_file_name(idx, PCB_FNS_fixed)); - is_solder = (GetLayerGroupNumberByNumber(idx) == GetLayerGroupNumberByNumber(solder_silk_layer)) ? 1 : 0; + is_solder = (GetLayerGroupNumberByNumber(idx) == GetLayerGroupNumberByNumber(pcb_solder_silk_layer)) ? 1 : 0; save_drill = is_solder; /* save drills for one layer only */ gcode_start_png(gcode_basename, pcb_layer_type_to_file_name(idx, PCB_FNS_fixed)); pcb_hid_save_and_show_layer_ons(save_ons); @@ -538,7 +538,7 @@ static int gcode_set_layer(const char *name, int group, int empty) { - int idx = (group >= 0 && group < max_group) ? PCB->LayerGroups.Entries[group][0] : group; + int idx = (group >= 0 && group < pcb_max_group) ? PCB->LayerGroups.Entries[group][0] : group; if (name == 0) { name = PCB->Data->Layer[idx].Name; Index: trunk/src_plugins/export_gerber/gerber.c =================================================================== --- trunk/src_plugins/export_gerber/gerber.c (revision 5035) +++ trunk/src_plugins/export_gerber/gerber.c (revision 5036) @@ -364,10 +364,10 @@ static int group_for_layer(int l) { - if (l < max_copper_layer + 2 && l >= 0) + if (l < pcb_max_copper_layer + 2 && l >= 0) return GetLayerGroupNumberByNumber(l); /* else something unique */ - return max_group + 3 + l; + return pcb_max_group + 3 + l; } static int layer_sort(const void *va, const void *vb) @@ -442,10 +442,10 @@ default: group = GetLayerGroupNumberByNumber(idx); nlayers = PCB->LayerGroups.Number[group]; - if (group == GetLayerGroupNumberByNumber(component_silk_layer)) { + if (group == GetLayerGroupNumberByNumber(pcb_component_silk_layer)) { suff = "cmp"; } - else if (group == GetLayerGroupNumberByNumber(solder_silk_layer)) { + else if (group == GetLayerGroupNumberByNumber(pcb_solder_silk_layer)) { suff = "sol"; } else if (nlayers == 1 @@ -527,7 +527,7 @@ outline_layer = NULL; - for (i = 0; i < max_copper_layer; i++) { + for (i = 0; i < pcb_max_copper_layer; i++) { pcb_layer_t *layer = PCB->Data->Layer + i; if (strcmp(layer->Name, "outline") == 0 || strcmp(layer->Name, "route") == 0) { outline_layer = layer; @@ -550,19 +550,19 @@ } pcb_hid_save_and_show_layer_ons(save_ons); - for (i = 0; i < max_copper_layer; i++) { + for (i = 0; i < pcb_max_copper_layer; i++) { pcb_layer_t *layer = PCB->Data->Layer + i; if (!LAYER_IS_PCB_EMPTY(layer)) print_group[GetLayerGroupNumberByNumber(i)] = 1; } - print_group[GetLayerGroupNumberByNumber(solder_silk_layer)] = 1; - print_group[GetLayerGroupNumberByNumber(component_silk_layer)] = 1; - for (i = 0; i < max_copper_layer; i++) + print_group[GetLayerGroupNumberByNumber(pcb_solder_silk_layer)] = 1; + print_group[GetLayerGroupNumberByNumber(pcb_component_silk_layer)] = 1; + for (i = 0; i < pcb_max_copper_layer; i++) if (print_group[GetLayerGroupNumberByNumber(i)]) print_layer[i] = 1; memcpy(saved_layer_stack, LayerStack, sizeof(LayerStack)); - qsort(LayerStack, max_copper_layer, sizeof(LayerStack[0]), layer_sort); + qsort(LayerStack, pcb_max_copper_layer, sizeof(LayerStack[0]), layer_sort); linewidth = -1; lastcap = -1; lastgroup = -1; @@ -614,12 +614,12 @@ { int want_outline; char *cp; - int idx = (group >= 0 && group < max_group) ? PCB->LayerGroups.Entries[group][0] : group; + int idx = (group >= 0 && group < pcb_max_group) ? PCB->LayerGroups.Entries[group][0] : group; if (name == NULL) name = PCB->Data->Layer[idx].Name; - if (idx >= 0 && idx < max_copper_layer && !print_layer[idx]) + if (idx >= 0 && idx < pcb_max_copper_layer && !print_layer[idx]) return 0; if (strcmp(name, "invisible") == 0) Index: trunk/src_plugins/export_nelma/nelma.c =================================================================== --- trunk/src_plugins/export_nelma/nelma.c (revision 5035) +++ trunk/src_plugins/export_nelma/nelma.c (revision 5036) @@ -259,7 +259,7 @@ z = 10; for (i = 0; i < MAX_LAYER; i++) if (nelma_export_group[i]) { - idx = (i >= 0 && i < max_group) ? PCB->LayerGroups.Entries[i][0] : i; + idx = (i >= 0 && i < pcb_max_group) ? PCB->LayerGroups.Entries[i][0] : i; ext = pcb_layer_type_to_file_name(idx, PCB_FNS_fixed); if (z != 10) { @@ -324,7 +324,7 @@ for (i = 0; i < MAX_LAYER; i++) if (nelma_export_group[i]) { - idx = (i >= 0 && i < max_group) ? PCB->LayerGroups.Entries[i][0] : i; + idx = (i >= 0 && i < pcb_max_group) ? PCB->LayerGroups.Entries[i][0] : i; ext = pcb_layer_type_to_file_name(idx, PCB_FNS_fixed); if (m != 0 || i != 0) @@ -395,7 +395,7 @@ z = 10; for (i = 0; i < MAX_LAYER; i++) if (nelma_export_group[i]) { - idx = (i >= 0 && i < max_group) ? PCB->LayerGroups.Entries[i][0] : i; + idx = (i >= 0 && i < pcb_max_group) ? PCB->LayerGroups.Entries[i][0] : i; ext = pcb_layer_type_to_file_name(idx, PCB_FNS_fixed); if (z != 10) { @@ -429,7 +429,7 @@ for (i = 0; i < MAX_LAYER; i++) if (nelma_export_group[i]) { - idx = (i >= 0 && i < max_group) ? PCB->LayerGroups.Entries[i][0] : i; + idx = (i >= 0 && i < pcb_max_group) ? PCB->LayerGroups.Entries[i][0] : i; ext = pcb_layer_type_to_file_name(idx, PCB_FNS_fixed); fprintf(out, "object %s-%s {\n", pin->ListEntry, ext); @@ -502,7 +502,7 @@ /* Set entire array to 0 (don't export any layer groups by default */ memset(nelma_export_group, 0, sizeof(nelma_export_group)); - for (n = 0; n < max_copper_layer; n++) { + for (n = 0; n < pcb_max_copper_layer; n++) { layer = &PCB->Data->Layer[n]; if (!LAYER_IS_PCB_EMPTY(layer)) { @@ -632,7 +632,7 @@ nelma_cur_group = i; /* magic */ - idx = (i >= 0 && i < max_group) ? PCB->LayerGroups.Entries[i][0] : i; + idx = (i >= 0 && i < pcb_max_group) ? PCB->LayerGroups.Entries[i][0] : i; nelma_start_png(nelma_basename, pcb_layer_type_to_file_name(idx, PCB_FNS_fixed)); @@ -669,7 +669,7 @@ static int nelma_set_layer(const char *name, int group, int empty) { - int idx = (group >= 0 && group < max_group) ? PCB->LayerGroups.Entries[group][0] : group; + int idx = (group >= 0 && group < pcb_max_group) ? PCB->LayerGroups.Entries[group][0] : group; if (name == 0) { name = PCB->Data->Layer[idx].Name; Index: trunk/src_plugins/export_openscad/scad.c =================================================================== --- trunk/src_plugins/export_openscad/scad.c (revision 5035) +++ trunk/src_plugins/export_openscad/scad.c (revision 5036) @@ -537,13 +537,13 @@ memset(group_data, 0, sizeof(group_data)); #ifdef SOLDER_LAYER - group_data[GetLayerGroupNumberByNumber(max_copper_layer + SOLDER_LAYER)].solder = 1; - group_data[GetLayerGroupNumberByNumber(max_copper_layer + COMPONENT_LAYER)].component = 1; + group_data[GetLayerGroupNumberByNumber(pcb_max_copper_layer + SOLDER_LAYER)].solder = 1; + group_data[GetLayerGroupNumberByNumber(pcb_max_copper_layer + COMPONENT_LAYER)].component = 1; #else - group_data[GetLayerGroupNumberByNumber(max_copper_layer + BOTTOM_SIDE)].solder = 1; - group_data[GetLayerGroupNumberByNumber(max_copper_layer + TOP_SIDE)].component = 1; + group_data[GetLayerGroupNumberByNumber(pcb_max_copper_layer + BOTTOM_SIDE)].solder = 1; + group_data[GetLayerGroupNumberByNumber(pcb_max_copper_layer + TOP_SIDE)].component = 1; #endif - for (i = 0; i < max_copper_layer; i++) { + for (i = 0; i < pcb_max_copper_layer; i++) { layer = PCB->Data->Layer + i; if (!IsLayerEmpty(layer)) group_data[GetLayerGroupNumberByNumber(i)].draw = 1; @@ -550,7 +550,7 @@ } inner_layers = 0; - for (i = 0; i < max_group; i++) { + for (i = 0; i < pcb_max_group; i++) { if (group_data[i].draw && !(group_data[i].component || group_data[i].solder)) { inner_layers++; } @@ -558,7 +558,7 @@ layer_spacing = BOARD_THICKNESS / ((float) inner_layers + 1); layer_offset = BOARD_THICKNESS / 2. - layer_spacing; - for (i = 0; i < max_group; i++) { + for (i = 0; i < pcb_max_group; i++) { if (group_data[i].component) { group_data[i].z_offset = (BOARD_THICKNESS / 2.) + (OUTER_COPPER_THICKNESS / 2.); } @@ -634,7 +634,7 @@ } if (opt_exp_copper) { - for (i = 0; i < max_group; i++) { + for (i = 0; i < pcb_max_group; i++) { if (group_data[i].exp) { /* printf("%d\n",i); */ @@ -727,7 +727,7 @@ static int scad_set_layer(const char *name, int group, int empty) { - int idx = (group >= 0 && group < max_group) ? PCB->LayerGroups.Entries[group][0] : group; + int idx = (group >= 0 && group < pcb_max_group) ? PCB->LayerGroups.Entries[group][0] : group; int layer_ok; if (layer_open) { @@ -756,7 +756,7 @@ if (strcmp(name, "route") == 0) return 0; - if (group >= 0 && group < max_group) { + if (group >= 0 && group < pcb_max_group) { layer_ok = (opt_exp_inner_layers || group_data[group].component || group_data[group].solder) && opt_exp_copper; } else { @@ -778,7 +778,7 @@ if (!layer_ok) return 0; - if (group >= 0 && group < max_group) { + if (group >= 0 && group < pcb_max_group) { if (!group_data[group].draw) return 0; scaled_layer_thickness = (group_data[group].solder Index: trunk/src_plugins/export_png/png.c =================================================================== --- trunk/src_plugins/export_png/png.c (revision 5035) +++ trunk/src_plugins/export_png/png.c (revision 5036) @@ -383,10 +383,10 @@ static int group_for_layer(int l) { - if (l < max_copper_layer + 2 && l >= 0) + if (l < pcb_max_copper_layer + 2 && l >= 0) return GetLayerGroupNumberByNumber(l); /* else something unique */ - return max_group + 3 + l; + return pcb_max_group + 3 + l; } static int layer_sort(const void *va, const void *vb) @@ -397,7 +397,7 @@ int bl = group_for_layer(b); int d = bl - al; - if (a >= 0 && a <= max_copper_layer + 1) { + if (a >= 0 && a <= pcb_max_copper_layer + 1) { int aside = (al == solder_layer ? 0 : al == comp_layer ? 2 : 1); int bside = (bl == solder_layer ? 0 : bl == comp_layer ? 2 : 1); if (bside != aside) @@ -448,14 +448,14 @@ memset(print_group, 0, sizeof(print_group)); memset(print_layer, 0, sizeof(print_layer)); - for (i = 0; i < max_copper_layer; i++) { + for (i = 0; i < pcb_max_copper_layer; i++) { pcb_layer_t *layer = PCB->Data->Layer + i; if (!LAYER_IS_PCB_EMPTY(layer)) print_group[GetLayerGroupNumberByNumber(i)] = 1; } - print_group[GetLayerGroupNumberByNumber(solder_silk_layer)] = 1; - print_group[GetLayerGroupNumberByNumber(component_silk_layer)] = 1; - for (i = 0; i < max_copper_layer; i++) + print_group[GetLayerGroupNumberByNumber(pcb_solder_silk_layer)] = 1; + print_group[GetLayerGroupNumberByNumber(pcb_component_silk_layer)] = 1; + for (i = 0; i < pcb_max_copper_layer; i++) if (print_group[GetLayerGroupNumberByNumber(i)]) print_layer[i] = 1; @@ -469,9 +469,9 @@ conf_force_set_bool(conf_core.editor.show_solder_side, 0); conf_force_set_bool(conf_core.editor.show_mask, 0); - comp_layer = GetLayerGroupNumberByNumber(component_silk_layer); - solder_layer = GetLayerGroupNumberByNumber(solder_silk_layer); - qsort(LayerStack, max_copper_layer, sizeof(LayerStack[0]), layer_sort); + comp_layer = GetLayerGroupNumberByNumber(pcb_component_silk_layer); + solder_layer = GetLayerGroupNumberByNumber(pcb_solder_silk_layer); + qsort(LayerStack, pcb_max_copper_layer, sizeof(LayerStack[0]), layer_sort); if (photo_mode) { int i, n = 0; @@ -514,7 +514,7 @@ if (!photo_mode && conf_core.editor.show_solder_side) { int i, j; - for (i = 0, j = max_copper_layer - 1; i < j; i++, j--) { + for (i = 0, j = pcb_max_copper_layer - 1; i < j; i++, j--) { int k = LayerStack[i]; LayerStack[i] = LayerStack[j]; LayerStack[j] = k; @@ -946,13 +946,13 @@ static int png_set_layer(const char *name, int group, int empty) { - int idx = (group >= 0 && group < max_group) ? PCB->LayerGroups.Entries[group][0] : group; + int idx = (group >= 0 && group < pcb_max_group) ? PCB->LayerGroups.Entries[group][0] : group; if (name == 0) name = PCB->Data->Layer[idx].Name; doing_outline = 0; - if (idx >= 0 && idx < max_copper_layer && !print_layer[idx]) + if (idx >= 0 && idx < pcb_max_copper_layer && !print_layer[idx]) return 0; if (SL_TYPE(idx) == SL_ASSY || SL_TYPE(idx) == SL_FAB) return 0; Index: trunk/src_plugins/export_ps/eps.c =================================================================== --- trunk/src_plugins/export_ps/eps.c (revision 5035) +++ trunk/src_plugins/export_ps/eps.c (revision 5036) @@ -149,10 +149,10 @@ static int group_for_layer(int l) { - if (l < max_copper_layer + 2 && l >= 0) + if (l < pcb_max_copper_layer + 2 && l >= 0) return GetLayerGroupNumberByNumber(l); /* else something unique */ - return max_group + 3 + l; + return pcb_max_group + 3 + l; } static int layer_sort(const void *va, const void *vb) @@ -163,7 +163,7 @@ int bl = group_for_layer(b); int d = bl - al; - if (a >= 0 && a <= max_copper_layer + 1) { + if (a >= 0 && a <= pcb_max_copper_layer + 1) { int aside = (al == solder_layer ? 0 : al == comp_layer ? 2 : 1); int bside = (bl == solder_layer ? 0 : bl == comp_layer ? 2 : 1); if (bside != aside) @@ -204,7 +204,7 @@ memset(print_layer, 0, sizeof(print_layer)); /* Figure out which layers actually have stuff on them. */ - for (i = 0; i < max_copper_layer; i++) { + for (i = 0; i < pcb_max_copper_layer; i++) { pcb_layer_t *layer = PCB->Data->Layer + i; if (layer->On) if (!LAYER_IS_PCB_EMPTY(layer)) @@ -215,7 +215,7 @@ erase logic. Otherwise, we have to use the expensive multi-mask erase. */ fast_erase = 0; - for (i = 0; i < max_group; i++) + for (i = 0; i < pcb_max_group; i++) if (print_group[i]) fast_erase++; @@ -222,7 +222,7 @@ /* If NO layers had anything on them, at least print the component layer to get the pins. */ if (fast_erase == 0) { - print_group[GetLayerGroupNumberByNumber(component_silk_layer)] = 1; + print_group[GetLayerGroupNumberByNumber(pcb_component_silk_layer)] = 1; fast_erase = 1; } @@ -231,7 +231,7 @@ /* Now, for each group we're printing, mark its layers for printing. */ - for (i = 0; i < max_copper_layer; i++) + for (i = 0; i < pcb_max_copper_layer; i++) if (print_group[GetLayerGroupNumberByNumber(i)]) print_layer[i] = 1; @@ -247,9 +247,9 @@ memcpy(saved_layer_stack, LayerStack, sizeof(LayerStack)); as_shown = options[HA_as_shown].int_value; if (!options[HA_as_shown].int_value) { - comp_layer = GetLayerGroupNumberByNumber(component_silk_layer); - solder_layer = GetLayerGroupNumberByNumber(solder_silk_layer); - qsort(LayerStack, max_copper_layer, sizeof(LayerStack[0]), layer_sort); + comp_layer = GetLayerGroupNumberByNumber(pcb_component_silk_layer); + solder_layer = GetLayerGroupNumberByNumber(pcb_solder_silk_layer); + qsort(LayerStack, pcb_max_copper_layer, sizeof(LayerStack[0]), layer_sort); } fprintf(f, "%%!PS-Adobe-3.0 EPSF-3.0\n"); linewidth = -1; @@ -346,11 +346,11 @@ static int eps_set_layer(const char *name, int group, int empty) { - int idx = (group >= 0 && group < max_group) ? PCB->LayerGroups.Entries[group][0] : group; + int idx = (group >= 0 && group < pcb_max_group) ? PCB->LayerGroups.Entries[group][0] : group; if (name == 0) name = PCB->Data->Layer[idx].Name; - if (idx >= 0 && idx < max_copper_layer && !print_layer[idx]) + if (idx >= 0 && idx < pcb_max_copper_layer && !print_layer[idx]) return 0; if (SL_TYPE(idx) == SL_ASSY || SL_TYPE(idx) == SL_FAB) return 0; Index: trunk/src_plugins/export_ps/ps.c =================================================================== --- trunk/src_plugins/export_ps/ps.c (revision 5035) +++ trunk/src_plugins/export_ps/ps.c (revision 5036) @@ -430,10 +430,10 @@ static int group_for_layer(int l) { - if (l < max_copper_layer + 2 && l >= 0) + if (l < pcb_max_copper_layer + 2 && l >= 0) return GetLayerGroupNumberByNumber(l); /* else something unique */ - return max_group + 3 + l; + return pcb_max_group + 3 + l; } static int layer_sort(const void *va, const void *vb) @@ -649,7 +649,7 @@ global.outline_layer = NULL; - for (i = 0; i < max_copper_layer; i++) { + for (i = 0; i < pcb_max_copper_layer; i++) { pcb_layer_t *layer = PCB->Data->Layer + i; if (!LAYER_IS_PCB_EMPTY(layer)) global.print_group[GetLayerGroupNumberByNumber(i)] = 1; @@ -658,14 +658,14 @@ global.outline_layer = layer; } } - global.print_group[GetLayerGroupNumberByNumber(solder_silk_layer)] = 1; - global.print_group[GetLayerGroupNumberByNumber(component_silk_layer)] = 1; - for (i = 0; i < max_copper_layer; i++) + global.print_group[GetLayerGroupNumberByNumber(pcb_solder_silk_layer)] = 1; + global.print_group[GetLayerGroupNumberByNumber(pcb_component_silk_layer)] = 1; + for (i = 0; i < pcb_max_copper_layer; i++) if (global.print_group[GetLayerGroupNumberByNumber(i)]) global.print_layer[i] = 1; memcpy(saved_layer_stack, LayerStack, sizeof(LayerStack)); - qsort(LayerStack, max_copper_layer, sizeof(LayerStack[0]), layer_sort); + qsort(LayerStack, pcb_max_copper_layer, sizeof(LayerStack[0]), layer_sort); global.linewidth = -1; /* reset static vars */ @@ -773,7 +773,7 @@ { static int lastgroup = -1; time_t currenttime; - int idx = (group >= 0 && group < max_group) + int idx = (group >= 0 && group < pcb_max_group) ? PCB->LayerGroups.Entries[group][0] : group; if (name == 0) @@ -784,7 +784,7 @@ if (empty) return 0; - if (idx >= 0 && idx < max_copper_layer && !global.print_layer[idx]) + if (idx >= 0 && idx < pcb_max_copper_layer && !global.print_layer[idx]) return 0; if (strcmp(name, "invisible") == 0) @@ -855,7 +855,7 @@ if (global.mirror) mirror_this = !mirror_this; - if (global.automirror && ((idx >= 0 && group == GetLayerGroupNumberByNumber(solder_silk_layer)) + if (global.automirror && ((idx >= 0 && group == GetLayerGroupNumberByNumber(pcb_solder_silk_layer)) || (idx < 0 && SL_SIDE(idx) == SL_BOTTOM_SIDE))) mirror_this = !mirror_this; Index: trunk/src_plugins/fontmode/fontmode.c =================================================================== --- trunk/src_plugins/fontmode/fontmode.c (revision 5035) +++ trunk/src_plugins/fontmode/fontmode.c (revision 5036) @@ -83,8 +83,8 @@ conf_set_design("design/min_wid", "%s", "1"); PCB->minWid = 1; conf_set_design("design/min_slk", "%s", "1"); PCB->minSlk = 1; - MoveLayerToGroup(max_copper_layer + COMPONENT_LAYER, 0); - MoveLayerToGroup(max_copper_layer + SOLDER_LAYER, 1); + MoveLayerToGroup(pcb_max_copper_layer + COMPONENT_LAYER, 0); + MoveLayerToGroup(pcb_max_copper_layer + SOLDER_LAYER, 1); while (PCB->Data->LayerN > 4) pcb_layer_move(4, -1); Index: trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/layers.c =================================================================== --- trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/layers.c (revision 5035) +++ trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/layers.c (revision 5036) @@ -42,12 +42,12 @@ int layout_get_max_copper_layer() { - return max_copper_layer; + return pcb_max_copper_layer; } int layout_get_max_layer() { - return max_copper_layer+2; + return pcb_max_copper_layer+2; } Index: trunk/src_plugins/hid_batch/batch.c =================================================================== --- trunk/src_plugins/hid_batch/batch.c (revision 5035) +++ trunk/src_plugins/hid_batch/batch.c (revision 5036) @@ -85,8 +85,8 @@ } printf("Filename: %s\n", PCB->Filename); pcb_printf("Size: %ml x %ml mils, %mm x %mm mm\n", PCB->MaxWidth, PCB->MaxHeight, PCB->MaxWidth, PCB->MaxHeight); - cg = GetLayerGroupNumberByNumber(component_silk_layer); - sg = GetLayerGroupNumberByNumber(solder_silk_layer); + cg = GetLayerGroupNumberByNumber(pcb_component_silk_layer); + sg = GetLayerGroupNumberByNumber(pcb_solder_silk_layer); for (i = 0; i < MAX_LAYER; i++) { int lg = GetLayerGroupNumberByNumber(i); Index: trunk/src_plugins/hid_gtk/ghid-propedit.c =================================================================== --- trunk/src_plugins/hid_gtk/ghid-propedit.c (revision 5035) +++ trunk/src_plugins/hid_gtk/ghid-propedit.c (revision 5036) @@ -319,7 +319,7 @@ pcb_font_create_default(&preview_pcb); preview_pcb.ViaOn = 1; - for(n = 0; n < max_copper_layer+2; n++) { + for(n = 0; n < pcb_max_copper_layer+2; n++) { preview_pcb.Data->Layer[n].On = 1; preview_pcb.Data->Layer[n].Color = pcb_strdup(PCB->Data->Layer[n].Color); preview_pcb.Data->Layer[n].Name = pcb_strdup("preview dummy"); @@ -326,7 +326,7 @@ } memcpy(&preview_pcb.LayerGroups, &PCB->LayerGroups, sizeof(PCB->LayerGroups)); - preview_pcb.Data->LayerN = max_copper_layer; + preview_pcb.Data->LayerN = pcb_max_copper_layer; preview_pcb.Data->pcb = &preview_pcb; #warning TODO: preview_pcb is never freed Index: trunk/src_plugins/hid_gtk/gtkhid-gdk.c =================================================================== --- trunk/src_plugins/hid_gtk/gtkhid-gdk.c (revision 5035) +++ trunk/src_plugins/hid_gtk/gtkhid-gdk.c (revision 5036) @@ -61,17 +61,17 @@ int ghid_set_layer(const char *name, int group, int empty) { int idx = group; - if (idx >= 0 && idx < max_group) { + if (idx >= 0 && idx < pcb_max_group) { int n = PCB->LayerGroups.Number[group]; for (idx = 0; idx < n - 1; idx++) { int ni = PCB->LayerGroups.Entries[group][idx]; - if (ni >= 0 && ni < max_copper_layer + 2 && PCB->Data->Layer[ni].On) + if (ni >= 0 && ni < pcb_max_copper_layer + 2 && PCB->Data->Layer[ni].On) break; } idx = PCB->LayerGroups.Entries[group][idx]; } - if (idx >= 0 && idx < max_copper_layer + 2) + if (idx >= 0 && idx < pcb_max_copper_layer + 2) return /*pinout ? 1 : */ PCB->Data->Layer[idx].On; if (idx < 0) { switch (SL_TYPE(idx)) { Index: trunk/src_plugins/hid_gtk/gtkhid-gl.c =================================================================== --- trunk/src_plugins/hid_gtk/gtkhid-gl.c (revision 5035) +++ trunk/src_plugins/hid_gtk/gtkhid-gl.c (revision 5036) @@ -107,11 +107,11 @@ { render_priv *priv = gport->render_priv; int idx = group; - if (idx >= 0 && idx < max_group) { + if (idx >= 0 && idx < pcb_max_group) { int n = PCB->LayerGroups.Number[group]; for (idx = 0; idx < n - 1; idx++) { int ni = PCB->LayerGroups.Entries[group][idx]; - if (ni >= 0 && ni < max_copper_layer + 2 && PCB->Data->Layer[ni].On) + if (ni >= 0 && ni < pcb_max_copper_layer + 2 && PCB->Data->Layer[ni].On) break; } idx = PCB->LayerGroups.Entries[group][idx]; @@ -120,7 +120,7 @@ end_subcomposite(); start_subcomposite(); - if (idx >= 0 && idx < max_copper_layer + 2) { + if (idx >= 0 && idx < pcb_max_copper_layer + 2) { priv->trans_lines = pcb_true; return PCB->Data->Layer[idx].On; } Index: trunk/src_plugins/hid_gtk/gtkhid-main.c =================================================================== --- trunk/src_plugins/hid_gtk/gtkhid-main.c (revision 5035) +++ trunk/src_plugins/hid_gtk/gtkhid-main.c (revision 5036) @@ -1323,8 +1323,8 @@ static int SwapSides(int argc, const char **argv, pcb_coord_t x, pcb_coord_t y) { int active_group = GetLayerGroupNumberByNumber(LayerStack[0]); - int comp_group = GetLayerGroupNumberByNumber(component_silk_layer); - int solder_group = GetLayerGroupNumberByNumber(solder_silk_layer); + int comp_group = GetLayerGroupNumberByNumber(pcb_component_silk_layer); + int solder_group = GetLayerGroupNumberByNumber(pcb_solder_silk_layer); pcb_bool comp_on = LAYER_PTR(PCB->LayerGroups.Entries[comp_group][0])->On; pcb_bool solder_on = LAYER_PTR(PCB->LayerGroups.Entries[solder_group][0])->On; Index: trunk/src_plugins/hid_gtk/gui-config.c =================================================================== --- trunk/src_plugins/hid_gtk/gui-config.c (revision 5035) +++ trunk/src_plugins/hid_gtk/gui-config.c (revision 5036) @@ -1266,14 +1266,14 @@ string = g_string_new(""); - for (group = 0; group < max_group; group++) { + for (group = 0; group < pcb_max_group; group++) { if (lg->Number[group] == 0) continue; for (entry = 0; entry < lg->Number[group]; entry++) { layer = lg->Entries[group][entry]; - if (layer == component_silk_layer) + if (layer == pcb_component_silk_layer) string = g_string_append(string, "c"); - else if (layer == solder_silk_layer) + else if (layer == pcb_solder_silk_layer) string = g_string_append(string, "s"); else g_string_append_printf(string, "%d", layer + 1); @@ -1281,7 +1281,7 @@ if (entry != lg->Number[group] - 1) string = g_string_append(string, ","); } - if (group != max_group - 1) + if (group != pcb_max_group - 1) string = g_string_append(string, ":"); } return g_string_free(string, FALSE); /* Don't free string->str */ @@ -1298,7 +1298,7 @@ /* Get each layer name entry and dup if modified into the PCB layer names | and, if to use as default, the Settings layer names. */ - for (i = 0; i < max_copper_layer; ++i) { + for (i = 0; i < pcb_max_copper_layer; ++i) { layer = &PCB->Data->Layer[i]; s = ghid_entry_get_text(layer_entry[i]); if (dup_string((char**)&layer->Name, s)) @@ -1315,16 +1315,16 @@ if (groups_modified) { /* If any group radio buttons were toggled. */ /* clear all entries and read layer by layer */ - for (group = 0; group < max_group; group++) + for (group = 0; group < pcb_max_group; group++) layer_groups.Number[group] = 0; - for (i = 0; i < max_copper_layer + 2; i++) { + for (i = 0; i < pcb_max_copper_layer + 2; i++) { group = config_layer_group[i] - 1; layer_groups.Entries[group][layer_groups.Number[group]++] = i; - if (i == component_silk_layer) + if (i == pcb_component_silk_layer) componentgroup = group; - else if (i == solder_silk_layer) + else if (i == pcb_solder_silk_layer) soldergroup = group; } @@ -1353,7 +1353,7 @@ /* Set button active corresponding to layer group state. */ groups_holdoff = TRUE; - for (g = 0; g < max_group; g++) + for (g = 0; g < pcb_max_group; g++) for (i = 0; i < layer_groups.Number[g]; i++) { /* printf("layer %d in group %d\n", layer_groups.Entries[g][i], g +1); */ config_layer_group[layer_groups.Entries[g][i]] = g + 1; @@ -1392,7 +1392,7 @@ gtk_widget_destroy(config_groups_window); config_groups_window = scrolled_window = gtk_scrolled_window_new(NULL, NULL); - gtk_widget_set_size_request(scrolled_window, (max_group + 1)*34, 300); + gtk_widget_set_size_request(scrolled_window, (pcb_max_group + 1)*34, 300); gtk_container_set_border_width(GTK_CONTAINER(scrolled_window), 3); gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled_window), GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS); gtk_box_pack_start(GTK_BOX(vbox), scrolled_window, TRUE, TRUE, 0); @@ -1399,7 +1399,7 @@ gtk_widget_show(scrolled_window); - table = gtk_table_new(max_copper_layer + 3, max_group + 1, FALSE); + table = gtk_table_new(pcb_max_copper_layer + 3, pcb_max_group + 1, FALSE); config_groups_table = table; gtk_table_set_row_spacings(GTK_TABLE(table), 3); gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrolled_window), table); @@ -1412,7 +1412,7 @@ gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 0, 1); gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5); - for (i = 1; i < max_group + 1; ++i) { + for (i = 1; i < pcb_max_group + 1; ++i) { pcb_snprintf(buf, sizeof(buf), "% 3d", i); label = gtk_label_new(buf); gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); @@ -1422,15 +1422,15 @@ /* Create a row of radio toggle buttons for layer. So each layer | can have an active radio button set for the group it needs to be in. */ - for (layer = 0; layer < max_copper_layer + 2; ++layer) { - if (layer == component_silk_layer) + for (layer = 0; layer < pcb_max_copper_layer + 2; ++layer) { + if (layer == pcb_component_silk_layer) name = _("component side"); - else if (layer == solder_silk_layer) + else if (layer == pcb_solder_silk_layer) name = _("solder side"); else name = (gchar *) PCB_UNKNOWN(PCB->Data->Layer[layer].Name); - if (layer >= max_copper_layer) { + if (layer >= pcb_max_copper_layer) { label = gtk_label_new(name); gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, layer + 1, layer + 2); @@ -1443,7 +1443,7 @@ } group = NULL; - for (i = 0; i < max_group; ++i) { + for (i = 0; i < pcb_max_group; ++i) { button = gtk_radio_button_new(group); group = gtk_radio_button_get_group(GTK_RADIO_BUTTON(button)); @@ -1485,7 +1485,7 @@ s = make_layer_group_string(&PCB->LayerGroups); /* change default layer names to the current ones in dest */ - for (n = 0; n < max_copper_layer; n++) { + for (n = 0; n < pcb_max_copper_layer; n++) { pcb_layer_t *layer; char lnp[128]; lht_node_t *nd; Index: trunk/src_plugins/hid_gtk/gui-output-events.c =================================================================== --- trunk/src_plugins/hid_gtk/gui-output-events.c (revision 5035) +++ trunk/src_plugins/hid_gtk/gui-output-events.c (revision 5036) @@ -307,7 +307,7 @@ return NULL; /* don't mess with silk objects! */ - if (type & SILK_TYPE && GetLayerNumber(PCB->Data, (pcb_layer_t *) ptr1) >= max_copper_layer) + if (type & SILK_TYPE && GetLayerNumber(PCB->Data, (pcb_layer_t *) ptr1) >= pcb_max_copper_layer) return NULL; if (type == PCB_TYPE_PIN || type == PCB_TYPE_PAD) Index: trunk/src_plugins/hid_gtk/gui-top-window.c =================================================================== --- trunk/src_plugins/hid_gtk/gui-top-window.c (revision 5035) +++ trunk/src_plugins/hid_gtk/gui-top-window.c (revision 5036) @@ -432,7 +432,7 @@ PCB->RatOn = pcb_true; pcb_hid_action("LayersChanged"); } - else if (layer < max_copper_layer) + else if (layer < pcb_max_copper_layer) ChangeGroupVisibility(layer, TRUE, pcb_true); ignore_layer_update = pcb_false; @@ -667,7 +667,7 @@ const gchar *color_string; gboolean active = TRUE; - for (i = 0; i < max_copper_layer; ++i) { + for (i = 0; i < pcb_max_copper_layer; ++i) { layer_process(&color_string, &text, &active, i); ghid_layer_selector_add_layer(GHID_LAYER_SELECTOR(layersel), i, text, color_string, active, TRUE); } @@ -677,7 +677,7 @@ /*! \brief callback for ghid_layer_selector_delete_layers */ gboolean get_layer_delete(gint layer) { - return layer >= max_copper_layer; + return layer >= pcb_max_copper_layer; } /*! \brief Synchronize layer selector widget with current PCB state @@ -1597,7 +1597,7 @@ l = LAYER_BUTTON_FARSIDE; else { l = -1; - for (i = 0; i < max_copper_layer + 2; i++) + for (i = 0; i < pcb_max_copper_layer + 2; i++) if (strcmp(argv[0], PCB->Data->Layer[i].Name) == 0) { l = i; break; Index: trunk/src_plugins/hid_lesstif/dialogs.c =================================================================== --- trunk/src_plugins/hid_lesstif/dialogs.c (revision 5035) +++ trunk/src_plugins/hid_lesstif/dialogs.c (revision 5036) @@ -1243,10 +1243,10 @@ { int layer, group, k; - layer = ij / max_group; - group = ij % max_group; + layer = ij / pcb_max_group; + group = ij % pcb_max_group; group = MoveLayerToGroup(layer, group); - for (k = 0; k < max_group; k++) { + for (k = 0; k < pcb_max_group; k++) { if (k == group) XmToggleButtonSetState(lgbuttons[layer][k], 1, 0); else @@ -1272,19 +1272,19 @@ XSetForeground(display, lg_gc, lgr.bg); XFillRectangle(display, win, lg_gc, 0, 0, lg_width, lg_height); XSetForeground(display, lg_gc, lgr.fg); - for (i = 0; i < max_group; i++) + for (i = 0; i < pcb_max_group; i++) XDrawLine(display, win, lg_gc, lg_c[i], 0, lg_c[i], lg_height); - for (i = 1; i < max_copper_layer + 2; i++) + for (i = 1; i < pcb_max_copper_layer + 2; i++) XDrawLine(display, win, lg_gc, lg_label_width, lg_r[i], lg_width, lg_r[i]); - for (i = 0; i < max_copper_layer + 2; i++) { + for (i = 0; i < pcb_max_copper_layer + 2; i++) { int dir; XCharStruct size; int swidth; const char *name; - if (i == solder_silk_layer) + if (i == pcb_solder_silk_layer) name = SOLDER_SIDE_NAME; - else if (i == component_silk_layer) + else if (i == pcb_component_silk_layer) name = COMPONENT_SIDE_NAME; else name = PCB->Data->Layer[i].Name; @@ -1295,7 +1295,7 @@ (lg_r[i] + lg_r[i + 1] + lg_fd + lg_fa) / 2 - 1, name, strlen(name)); } XSetForeground(display, lg_gc, lgr.sel); - for (i = 0; i < max_copper_layer + 2; i++) { + for (i = 0; i < pcb_max_copper_layer + 2; i++) { int c = lg_setcol[i]; int x1 = lg_c[c] + 2; int x2 = lg_c[c + 1] - 2; @@ -1310,8 +1310,8 @@ int layer, group; if (cbs->event->type != ButtonPress) return; - layer = cbs->event->xbutton.y * (max_copper_layer + 2) / lg_height; - group = (cbs->event->xbutton.x - lg_label_width) * max_group / (lg_width - lg_label_width); + layer = cbs->event->xbutton.y * (pcb_max_copper_layer + 2) / lg_height; + group = (cbs->event->xbutton.x - lg_label_width) * pcb_max_group / (lg_width - lg_label_width); group = MoveLayerToGroup(layer, group); lg_setcol[layer] = group; lgbutton_expose(w, 0, 0); @@ -1329,10 +1329,10 @@ lg_width = width; lg_height = height; - for (i = 0; i <= max_group; i++) - lg_c[i] = lg_label_width + (lg_width - lg_label_width) * i / max_group; - for (i = 0; i <= max_copper_layer + 2; i++) - lg_r[i] = lg_height * i / (max_copper_layer + 2); + for (i = 0; i <= pcb_max_group; i++) + lg_c[i] = lg_label_width + (lg_width - lg_label_width) * i / pcb_max_group; + for (i = 0; i <= pcb_max_copper_layer + 2; i++) + lg_r[i] = lg_height * i / (pcb_max_copper_layer + 2); lgbutton_expose(w, 0, 0); } @@ -1347,7 +1347,7 @@ memset(sets, 0, sizeof(sets)); - for (i = 0; i < max_group; i++) + for (i = 0; i < pcb_max_group; i++) for (j = 0; j < l->Number[i]; j++) { sets[l->Entries[i][j]][i] = 1; lg_setcol[l->Entries[i][j]] = i; @@ -1354,15 +1354,15 @@ } lg_label_width = 0; - for (i = 0; i < max_copper_layer + 2; i++) { + for (i = 0; i < pcb_max_copper_layer + 2; i++) { int dir; XCharStruct size; int swidth; const char *name; - if (i == solder_silk_layer) + if (i == pcb_solder_silk_layer) name = SOLDER_SIDE_NAME; - else if (i == component_silk_layer) + else if (i == pcb_component_silk_layer) name = COMPONENT_SIDE_NAME; else name = PCB->Data->Layer[i].Name; @@ -1374,24 +1374,24 @@ lg_label_width += 4; stdarg_n = 0; - stdarg(XmNwidth, lg_label_width + (lg_fa + lg_fd) * max_group); - stdarg(XmNheight, (lg_fa + lg_fd) * (max_copper_layer + 2)); + stdarg(XmNwidth, lg_label_width + (lg_fa + lg_fd) * pcb_max_group); + stdarg(XmNheight, (lg_fa + lg_fd) * (pcb_max_copper_layer + 2)); XtSetValues(lg_buttonform, stdarg_args, stdarg_n); lgbutton_expose(lg_buttonform, 0, 0); #if 0 - for (i = 0; i < max_copper_layer + 2; i++) { + for (i = 0; i < pcb_max_copper_layer + 2; i++) { char *name = "unknown"; stdarg_n = 0; - if (i < max_copper_layer) + if (i < pcb_max_copper_layer) name = PCB->Data->Layer[i].Name; - else if (i == solder_silk_layer) + else if (i == pcb_solder_silk_layer) name = SOLDER_SIDE_NAME; - else if (i == component_silk_layer) + else if (i == pcb_component_silk_layer) name = COMPONENT_SIDE_NAME; stdarg(XmNlabelString, XmStringCreatePCB(name)); XtSetValues(lglabels[i], stdarg_args, stdarg_n); - for (j = 0; j < max_group; j++) { + for (j = 0; j < pcb_max_group; j++) { if (sets[i][j] != XmToggleButtonGetState(lgbuttons[i][j])) { XmToggleButtonSetState(lgbuttons[i][j], sets[i][j], 0); } @@ -1400,13 +1400,13 @@ XtUnmanageChild(lg_buttonform); for (i = 0; i < MAX_LAYER + 2; i++) for (j = 0; j < MAX_LAYER; j++) { - if (i < max_copper_layer + 2 && j < max_group) { + if (i < pcb_max_copper_layer + 2 && j < pcb_max_group) { XtManageChild(lgbuttons[i][j]); stdarg_n = 0; - stdarg(XmNleftPosition, j * (max_copper_layer + 2)); - stdarg(XmNrightPosition, (j + 1) * (max_copper_layer + 2)); - stdarg(XmNtopPosition, i * max_group); - stdarg(XmNbottomPosition, (i + 1) * max_group); + stdarg(XmNleftPosition, j * (pcb_max_copper_layer + 2)); + stdarg(XmNrightPosition, (j + 1) * (pcb_max_copper_layer + 2)); + stdarg(XmNtopPosition, i * pcb_max_group); + stdarg(XmNbottomPosition, (i + 1) * pcb_max_group); XtSetValues(lgbuttons[i][j], stdarg_args, stdarg_n); } else @@ -1413,10 +1413,10 @@ XtUnmanageChild(lgbuttons[i][j]); } stdarg_n = 0; - stdarg(XmNfractionBase, max_copper_layer + 2); + stdarg(XmNfractionBase, pcb_max_copper_layer + 2); XtSetValues(layer_groups_form, stdarg_args, stdarg_n); stdarg_n = 0; - stdarg(XmNfractionBase, max_group * (max_copper_layer + 2)); + stdarg(XmNfractionBase, pcb_max_group * (pcb_max_copper_layer + 2)); XtSetValues(lg_buttonform, stdarg_args, stdarg_n); XtManageChild(lg_buttonform); #endif @@ -1443,7 +1443,7 @@ if (!layer_groups_form) { stdarg_n = 0; - stdarg(XmNfractionBase, max_copper_layer + 2); + stdarg(XmNfractionBase, pcb_max_copper_layer + 2); stdarg(XmNtitle, "Layer Groups"); layer_groups_form = XmCreateFormDialog(mainwind, XmStrCast("layers"), stdarg_args, stdarg_n); @@ -1461,7 +1461,7 @@ XtGetSubresources(layer_groups_form, &lgr, "layergroups", "LayerGroups", lg_resources, XtNumber(lg_resources), 0, 0); #if 0 - stdarg(XmNfractionBase, max_group * (MAX_LAYER + 2)); + stdarg(XmNfractionBase, pcb_max_group * (MAX_LAYER + 2)); lg_buttonform = XmCreateForm(layer_groups_form, "lgbutton", stdarg_args, stdarg_n); for (i = 0; i < MAX_LAYER + 2; i++) { @@ -1497,7 +1497,7 @@ lgbuttons[i][j] = XmCreateToggleButton(lg_buttonform, "label", stdarg_args, stdarg_n); XtManageChild(lgbuttons[i][j]); - XtAddCallback(lgbuttons[i][j], XmNvalueChangedCallback, (XtCallbackProc) lgbutton_cb, (XtPointer) (i * max_group + j)); + XtAddCallback(lgbuttons[i][j], XmNvalueChangedCallback, (XtCallbackProc) lgbutton_cb, (XtPointer) (i * pcb_max_group + j)); } } #endif Index: trunk/src_plugins/hid_lesstif/main.c =================================================================== --- trunk/src_plugins/hid_lesstif/main.c (revision 5035) +++ trunk/src_plugins/hid_lesstif/main.c (revision 5036) @@ -553,7 +553,7 @@ *c = PCB->LayerGroups.Entries[g][0]; for (i = 0; i < PCB->LayerGroups.Number[g]; i++) { l = PCB->LayerGroups.Entries[g][i]; - if (l >= 0 && l < max_copper_layer) { + if (l >= 0 && l < pcb_max_copper_layer) { *c = l; if (PCB->Data->Layer[l].On) return 1; @@ -565,8 +565,8 @@ static int SwapSides(int argc, const char **argv, pcb_coord_t x, pcb_coord_t y) { int old_shown_side = conf_core.editor.show_solder_side; - int comp_group = GetLayerGroupNumberByNumber(component_silk_layer); - int solder_group = GetLayerGroupNumberByNumber(solder_silk_layer); + int comp_group = GetLayerGroupNumberByNumber(pcb_component_silk_layer); + int solder_group = GetLayerGroupNumberByNumber(pcb_solder_silk_layer); int active_group = GetLayerGroupNumberByNumber(LayerStack[0]); int comp_layer; int solder_layer; @@ -2810,11 +2810,11 @@ static int lesstif_set_layer(const char *name, int group, int empty) { int idx = group; - if (idx >= 0 && idx < max_group) { + if (idx >= 0 && idx < pcb_max_group) { int n = PCB->LayerGroups.Number[group]; for (idx = 0; idx < n - 1; idx++) { int ni = PCB->LayerGroups.Entries[group][idx]; - if (ni >= 0 && ni < max_copper_layer + 2 && PCB->Data->Layer[ni].On) + if (ni >= 0 && ni < pcb_max_copper_layer + 2 && PCB->Data->Layer[ni].On) break; } idx = PCB->LayerGroups.Entries[group][idx]; @@ -2830,7 +2830,7 @@ else autofade = 0; #endif - if (idx >= 0 && idx < max_copper_layer + 2) + if (idx >= 0 && idx < pcb_max_copper_layer + 2) return pinout ? 1 : PCB->Data->Layer[idx].On; if (idx < 0) { switch (SL_TYPE(idx)) { Index: trunk/src_plugins/hid_lesstif/menu.c =================================================================== --- trunk/src_plugins/hid_lesstif/menu.c (revision 5035) +++ trunk/src_plugins/hid_lesstif/menu.c (revision 5036) @@ -167,7 +167,7 @@ } XtSetValues(lb->w[i], stdarg_args, stdarg_n); - if (i >= max_copper_layer && i < MAX_LAYER) + if (i >= pcb_max_copper_layer && i < MAX_LAYER) XtUnmanageChild(lb->w[i]); else XtManageChild(lb->w[i]); @@ -250,12 +250,12 @@ } show_one_layer_button(layer, set); - if (layer < max_copper_layer) { + if (layer < pcb_max_copper_layer) { int i; int group = GetLayerGroupNumberByNumber(layer); for (i = 0; i < PCB->LayerGroups.Number[group]; i++) { l = PCB->LayerGroups.Entries[group][i]; - if (l != layer && l < max_copper_layer) { + if (l != layer && l < pcb_max_copper_layer) { show_one_layer_button(l, set); PCB->Data->Layer[l].On = set; } @@ -270,7 +270,7 @@ const char *name; PCB->RatDraw = (layer == LB_RATS); PCB->SilkActive = (layer == LB_SILK); - if (layer < max_copper_layer) + if (layer < pcb_max_copper_layer) ChangeGroupVisibility(layer, 1, 1); for (l = 0; l < num_layer_buttons; l++) { LayerButtons *lb = layer_button_list + l; @@ -366,7 +366,7 @@ layer_button_callback(0, LB_BACK, 0); else { l = -1; - for (i = 0; i < max_copper_layer + 2; i++) + for (i = 0; i < pcb_max_copper_layer + 2; i++) if (strcmp(argv[0], PCB->Data->Layer[i].Name) == 0) { l = i; break; @@ -400,11 +400,11 @@ switch (i) { case LB_SILK: name = "Silk"; - /*accel_idx = max_copper_layer;*/ + /*accel_idx = pcb_max_copper_layer;*/ break; case LB_RATS: name = "Rat Lines"; - /*accel_idx = max_copper_layer + 1;*/ + /*accel_idx = pcb_max_copper_layer + 1;*/ break; case LB_PINS: name = "Pins/Pads"; @@ -455,12 +455,12 @@ switch (i) { case LB_SILK: name = "Silk"; - /*accel_idx = max_copper_layer;*/ + /*accel_idx = pcb_max_copper_layer;*/ strcpy(av, "SelectLayer(Silk)"); break; case LB_RATS: name = "Rat Lines"; - /*accel_idx = max_copper_layer + 1;*/ + /*accel_idx = pcb_max_copper_layer + 1;*/ strcpy(av, "SelectLayer(Rats)"); break; default: Index: trunk/src_plugins/import_dsn/dsn.c =================================================================== --- trunk/src_plugins/import_dsn/dsn.c (revision 5035) +++ trunk/src_plugins/import_dsn/dsn.c (revision 5036) @@ -128,7 +128,7 @@ ret = sscanf(str, " (path %s %ld", lname, &dim1); if (ret == 2) { rlayer = 0; - LAYER_LOOP(PCB->Data, max_group) { + LAYER_LOOP(PCB->Data, pcb_max_group) { if (!strcmp(layer->Name, lname)) rlayer = layer; } Index: trunk/src_plugins/io_kicad/write.c =================================================================== --- trunk/src_plugins/io_kicad/write.c (revision 5035) +++ trunk/src_plugins/io_kicad/write.c (revision 5036) @@ -70,7 +70,7 @@ pcb_write_element_data(FP, buff->Data, "kicadl"); /* - for (i = 0; i < max_copper_layer + 2; i++) + for (i = 0; i < pcb_max_copper_layer + 2; i++) WriteLayerData(FP, i, &(buff->Data->Layer[i])); */ return (STATUS_OK); Index: trunk/src_plugins/io_kicad_legacy/write.c =================================================================== --- trunk/src_plugins/io_kicad_legacy/write.c (revision 5035) +++ trunk/src_plugins/io_kicad_legacy/write.c (revision 5036) @@ -67,7 +67,7 @@ pcb_write_element_data(FP, buff->Data, "kicadl"); /* - for (i = 0; i < max_copper_layer + 2; i++) + for (i = 0; i < pcb_max_copper_layer + 2; i++) WriteLayerData(FP, i, &(buff->Data->Layer[i])); */ return (STATUS_OK); Index: trunk/src_plugins/io_lihata/write.c =================================================================== --- trunk/src_plugins/io_lihata/write.c (revision 5035) +++ trunk/src_plugins/io_lihata/write.c (revision 5036) @@ -171,7 +171,7 @@ /* thermal flags per layer */ lst = lht_dom_node_alloc(LHT_HASH, "thermal"); - for(layer = 0; layer < max_copper_layer; layer++) { + for(layer = 0; layer < pcb_max_copper_layer; layer++) { if (PCB_FLAG_THERM_TEST_ANY(&fh)) { int t = PCB_FLAG_THERM_GET(layer, &fh); if (t != 0) { @@ -474,7 +474,7 @@ layers = lht_dom_node_alloc(LHT_LIST, "layers"); - for(n = 0; n < max_copper_layer + 2; n++) + for(n = 0; n < pcb_max_copper_layer + 2; n++) lht_dom_list_append(layers, build_data_layer(data, data->Layer+n, pcb_layer_lookup_group(n))); return layers; Index: trunk/src_plugins/io_pcb/file.c =================================================================== --- trunk/src_plugins/io_pcb/file.c (revision 5035) +++ trunk/src_plugins/io_pcb/file.c (revision 5036) @@ -505,7 +505,7 @@ pcb_printf_slot[0] = ((io_pcb_ctx_t *)(ctx->plugin_data))->write_coord_fmt; WriteViaData(FP, buff->Data); io_pcb_WriteElementData(ctx, FP, buff->Data); - for (i = 0; i < max_copper_layer + 2; i++) + for (i = 0; i < pcb_max_copper_layer + 2; i++) WriteLayerData(FP, i, &(buff->Data->Layer[i])); return (STATUS_OK); } @@ -527,7 +527,7 @@ WriteViaData(FP, PCB->Data); io_pcb_WriteElementData(ctx, FP, PCB->Data); WritePCBRatData(FP); - for (i = 0; i < max_copper_layer + 2; i++) + for (i = 0; i < pcb_max_copper_layer + 2; i++) WriteLayerData(FP, i, &(PCB->Data->Layer[i])); WritePCBNetlistData(FP); WritePCBNetlistPatchData(FP); Index: trunk/src_plugins/puller/puller.c =================================================================== --- trunk/src_plugins/puller/puller.c (revision 5035) +++ trunk/src_plugins/puller/puller.c (revision 5036) @@ -2283,9 +2283,9 @@ /* pcb_hid_actionl("djopt", "puller", 0); */ current_is_solder = (GetLayerGroupNumberByPointer(CURRENT) - == GetLayerGroupNumberByNumber(solder_silk_layer)); + == GetLayerGroupNumberByNumber(pcb_solder_silk_layer)); current_is_component = (GetLayerGroupNumberByPointer(CURRENT) - == GetLayerGroupNumberByNumber(component_silk_layer)); + == GetLayerGroupNumberByNumber(pcb_component_silk_layer)); lines = g_hash_table_new_full(NULL, NULL, NULL, (GDestroyNotify) FreeExtra); arcs = g_hash_table_new_full(NULL, NULL, NULL, (GDestroyNotify) FreeExtra); Index: trunk/src_plugins/teardrops/teardrops.c =================================================================== --- trunk/src_plugins/teardrops/teardrops.c (revision 5035) +++ trunk/src_plugins/teardrops/teardrops.c (revision 5036) @@ -214,7 +214,7 @@ PCB_COORD_TO_MM(pin->X), PCB_COORD_TO_MM(pin->Y), PCB_EMPTY(NAMEONPCB_NAME(element)), PCB_EMPTY(VALUE_NAME(element)), PCB_EMPTY(DESCRIPTION_NAME(element))); - for (layer = 0; layer < max_copper_layer; layer++) { + for (layer = 0; layer < pcb_max_copper_layer; layer++) { pcb_layer_t *l = &(PCB->Data->Layer[layer]); pcb_r_search(l->line_tree, &spot, NULL, check_line_callback, l, NULL); } @@ -236,7 +236,7 @@ fprintf(stderr, "Via at %.6f, %.6f\n", PCB_COORD_TO_MM(pin->X), PCB_COORD_TO_MM(pin->Y)); - for (layer = 0; layer < max_copper_layer; layer++) { + for (layer = 0; layer < pcb_max_copper_layer; layer++) { pcb_layer_t *l = &(PCB->Data->Layer[layer]); pcb_r_search(l->line_tree, &spot, NULL, check_line_callback, l, NULL); } @@ -272,7 +272,7 @@ /* PCB_EMPTY(VALUE_NAME (element)), */ /* PCB_EMPTY(DESCRIPTION_NAME (element))); */ - for (layer = 0; layer < max_copper_layer; layer++) { + for (layer = 0; layer < pcb_max_copper_layer; layer++) { pcb_layer_t *l = &(PCB->Data->Layer[layer]); pcb_r_search(l->line_tree, &(pad->BoundingBox), NULL, check_line_callback, l, NULL); } Index: trunk/src_plugins/toporouter/toporouter.c =================================================================== --- trunk/src_plugins/toporouter/toporouter.c (revision 5035) +++ trunk/src_plugins/toporouter/toporouter.c (revision 5036) @@ -1178,7 +1178,7 @@ int group; guint count = 0; - for (group = 0; group < max_group; group++) { + for (group = 0; group < pcb_max_group; group++) { if (PCB->LayerGroups.Number[group] > 0) count++; } @@ -1804,8 +1804,8 @@ GList *vlist = NULL; toporouter_bbox_t *bbox = NULL; - guint front = GetLayerGroupNumberByNumber(component_silk_layer); - guint back = GetLayerGroupNumberByNumber(solder_silk_layer); + guint front = GetLayerGroupNumberByNumber(pcb_component_silk_layer); + guint back = GetLayerGroupNumberByNumber(pcb_solder_silk_layer); /* printf("read_pads: front = %d back = %d layer = %d\n", front, back, layer);*/ @@ -2789,7 +2789,7 @@ int group; #ifdef DEBUG_IMPORT - for (group = 0; group < max_group; group++) { + for (group = 0; group < pcb_max_group; group++) { printf("Group %d: Number %d:\n", group, PCB->LayerGroups.Number[group]); for (int entry = 0; entry < PCB->LayerGroups.Number[group]; entry++) { @@ -2801,7 +2801,7 @@ cur_layer = r->layers = (toporouter_layer_t *) malloc(groupcount() * sizeof(toporouter_layer_t)); /* Foreach layer, read in pad vertices and constraints, and build CDT */ - for (group = 0; group < max_group; group++) { + for (group = 0; group < pcb_max_group; group++) { #ifdef DEBUG_IMPORT printf("*** LAYER GROUP %d ***\n", group); #endif @@ -8007,9 +8007,9 @@ } } - for (group = 0; group < max_group; group++) + for (group = 0; group < pcb_max_group; group++) for (i = 0; i < PCB->LayerGroups.Number[group]; i++) - if ((PCB->LayerGroups.Entries[group][i] < max_copper_layer) && !(PCB->Data->Layer[PCB->LayerGroups.Entries[group][i]].On)) { + if ((PCB->LayerGroups.Entries[group][i] < pcb_max_copper_layer) && !(PCB->Data->Layer[PCB->LayerGroups.Entries[group][i]].On)) { gdouble *layer = (gdouble *) malloc(sizeof(gdouble)); *layer = (double) group; r->keepoutlayers = g_list_prepend(r->keepoutlayers, layer);