Index: trunk/doc-rnd/hacking/renames =================================================================== --- trunk/doc-rnd/hacking/renames (revision 5409) +++ trunk/doc-rnd/hacking/renames (revision 5410) @@ -1505,3 +1505,4 @@ GetLayerNumber -> pcb_layer_id GetGroupOfLayer -> pcb_layer_get_group GetLayerGroupNumberByPointer -> pcb_layer_get_group_ +GetLayerGroupNumberByNumber -> pcb_layer_get_group Index: trunk/src/action_helper.c =================================================================== --- trunk/src/action_helper.c (revision 5409) +++ trunk/src/action_helper.c (revision 5410) @@ -900,7 +900,7 @@ pcb_text_t *text; int flag = PCB_FLAG_CLEARLINE; - if (GetLayerGroupNumberByNumber(INDEXOFCURRENT) == GetLayerGroupNumberByNumber(pcb_solder_silk_layer)) + if (pcb_layer_get_group(INDEXOFCURRENT) == pcb_layer_get_group(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/buffer.c =================================================================== --- trunk/src/buffer.c (revision 5409) +++ trunk/src/buffer.c (revision 5410) @@ -474,8 +474,8 @@ Buffer->Data->Layer[pcb_component_silk_layer] = swap; /* swap layer groups when balanced */ - sgroup = GetLayerGroupNumberByNumber(pcb_solder_silk_layer); - cgroup = GetLayerGroupNumberByNumber(pcb_component_silk_layer); + sgroup = pcb_layer_get_group(pcb_solder_silk_layer); + cgroup = pcb_layer_get_group(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; Index: trunk/src/crosshair.c =================================================================== --- trunk/src/crosshair.c (revision 5409) +++ trunk/src/crosshair.c (revision 5410) @@ -1027,8 +1027,8 @@ } /* find layer groups of the component side and solder side */ - SLayer = GetLayerGroupNumberByNumber(pcb_solder_silk_layer); - CLayer = GetLayerGroupNumberByNumber(pcb_component_silk_layer); + SLayer = pcb_layer_get_group(pcb_solder_silk_layer); + CLayer = pcb_layer_get_group(pcb_component_silk_layer); desired_group = PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, pad) ? SLayer : CLayer; GROUP_LOOP(PCB->Data, desired_group); Index: trunk/src/draw.c =================================================================== --- trunk/src/draw.c (revision 5409) +++ trunk/src/draw.c (revision 5410) @@ -140,7 +140,7 @@ */ static void PrintAssembly(int side, const pcb_box_t * drawn_area) { - int side_group = GetLayerGroupNumberByNumber(pcb_max_copper_layer + side); + int side_group = pcb_layer_get_group(pcb_max_copper_layer + side); pcb_draw_doing_assy = pcb_true; pcb_gui->set_draw_faded(Output.fgGC, 1); @@ -188,7 +188,7 @@ memset(do_group, 0, sizeof(do_group)); for (ngroups = 0, i = 0; i < pcb_max_copper_layer; i++) { pcb_layer_t *l = LAYER_ON_STACK(i); - int group = GetLayerGroupNumberByNumber(pcb_layer_stack[i]); + int group = pcb_layer_get_group(pcb_layer_stack[i]); if (l->On && !do_group[group]) { do_group[group] = 1; drawn_groups[ngroups++] = group; @@ -195,8 +195,8 @@ } } - component = GetLayerGroupNumberByNumber(pcb_component_silk_layer); - solder = GetLayerGroupNumberByNumber(pcb_solder_silk_layer); + component = pcb_layer_get_group(pcb_component_silk_layer); + solder = pcb_layer_get_group(pcb_solder_silk_layer); /* * first draw all 'invisible' stuff @@ -301,8 +301,8 @@ */ static void DrawPPV(int group, const pcb_box_t * drawn_area) { - int component_group = GetLayerGroupNumberByNumber(pcb_component_silk_layer); - int solder_group = GetLayerGroupNumberByNumber(pcb_solder_silk_layer); + int component_group = pcb_layer_get_group(pcb_component_silk_layer); + int solder_group = pcb_layer_get_group(pcb_solder_silk_layer); int side; if (PCB->PinOn || !pcb_gui->gui) { Index: trunk/src/hid_helper.c =================================================================== --- trunk/src/hid_helper.c (revision 5409) +++ trunk/src/hid_helper.c (revision 5410) @@ -64,15 +64,15 @@ case SL(ASSY, BOTTOM): return "bottomassembly"; default: - group = GetLayerGroupNumberByNumber(idx); + group = pcb_layer_get_group(idx); nlayers = PCB->LayerGroups.Number[group]; single_name = PCB->Data->Layer[idx].Name; - if (group == GetLayerGroupNumberByNumber(pcb_component_silk_layer)) { + if (group == pcb_layer_get_group(pcb_component_silk_layer)) { if (style == PCB_FNS_first || (style == PCB_FNS_single && nlayers == 2)) return single_name; return "top"; } - else if (group == GetLayerGroupNumberByNumber(pcb_solder_silk_layer)) { + else if (group == pcb_layer_get_group(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 5409) +++ trunk/src/layer.c (revision 5410) @@ -372,38 +372,21 @@ 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 -1; } pcb_layergrp_id_t pcb_layer_get_group_(pcb_layer_t *Layer) { - return GetLayerGroupNumberByNumber(pcb_layer_id(PCB->Data, Layer)); + return pcb_layer_get_group(pcb_layer_id(PCB->Data, Layer)); } /* --------------------------------------------------------------------------- - * returns the layergroup number for the passed layernumber - */ -int GetLayerGroupNumberByNumber(pcb_cardinal_t Layer) -{ - int group, entry; - - 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); - - /* since every layer belongs to a group it is safe to return - * the value without boundary checking - */ - return (group); -} - - -/* --------------------------------------------------------------------------- * resets the layerstack setting */ void ResetStackAndVisibility(void) @@ -424,7 +407,7 @@ PCB->RatOn = pcb_true; /* Bring the component group to the front and make it active. */ - comp_group = GetLayerGroupNumberByNumber(pcb_component_silk_layer); + comp_group = pcb_layer_get_group(pcb_component_silk_layer); ChangeGroupVisibility(PCB->LayerGroups.Entries[comp_group][0], 1, 1); } @@ -512,9 +495,9 @@ if (layer < 0 || layer > pcb_max_copper_layer + 1) return -1; - prev = GetLayerGroupNumberByNumber(layer); - if ((layer == pcb_solder_silk_layer && group == GetLayerGroupNumberByNumber(pcb_component_silk_layer)) - || (layer == pcb_component_silk_layer && group == GetLayerGroupNumberByNumber(pcb_solder_silk_layer)) + prev = pcb_layer_get_group(layer); + if ((layer == pcb_solder_silk_layer && group == pcb_layer_get_group(pcb_component_silk_layer)) + || (layer == pcb_component_silk_layer && group == pcb_layer_get_group(pcb_solder_silk_layer)) || (group < 0 || group >= pcb_max_group) || (prev == group)) return prev; @@ -970,8 +953,8 @@ static int LastLayerInComponentGroup(int layer) { - int cgroup = GetLayerGroupNumberByNumber(pcb_max_group + COMPONENT_LAYER); - int lgroup = GetLayerGroupNumberByNumber(layer); + int cgroup = pcb_layer_get_group(pcb_max_group + COMPONENT_LAYER); + int lgroup = pcb_layer_get_group(layer); if (cgroup == lgroup && PCB->LayerGroups.Number[lgroup] == 2) return 1; return 0; @@ -979,8 +962,8 @@ static int LastLayerInSolderGroup(int layer) { - int sgroup = GetLayerGroupNumberByNumber(pcb_max_group + SOLDER_LAYER); - int lgroup = GetLayerGroupNumberByNumber(layer); + int sgroup = pcb_layer_get_group(pcb_max_group + SOLDER_LAYER); + int lgroup = pcb_layer_get_group(layer); if (sgroup == lgroup && PCB->LayerGroups.Number[lgroup] == 2) return 1; return 0; Index: trunk/src/layer.h =================================================================== --- trunk/src/layer.h (revision 5409) +++ trunk/src/layer.h (revision 5410) @@ -68,9 +68,7 @@ pcb_layergrp_id_t pcb_layer_get_group_(pcb_layer_t *Layer); /************ OLD API - new code should not use these **************/ -int GetLayerGroupNumberByNumber(pcb_cardinal_t); - int ChangeGroupVisibility(int, pcb_bool, pcb_bool); void LayerStringToLayerStack(const char *); Index: trunk/src/obj_elem.c =================================================================== --- trunk/src/obj_elem.c (revision 5409) +++ trunk/src/obj_elem.c (revision 5410) @@ -204,9 +204,9 @@ pcb_via_new(Buffer->Data, pin->X, pin->Y, pin->Thickness, pin->Clearance, pin->Mask, pin->DrillingHole, pin->Number, f); } PCB_END_LOOP; - group = GetLayerGroupNumberByNumber(PCB_SWAP_IDENT ? pcb_solder_silk_layer : pcb_component_silk_layer); + group = pcb_layer_get_group(PCB_SWAP_IDENT ? pcb_solder_silk_layer : pcb_component_silk_layer); clayer = &Buffer->Data->Layer[PCB->LayerGroups.Entries[group][0]]; - group = GetLayerGroupNumberByNumber(PCB_SWAP_IDENT ? pcb_component_silk_layer : pcb_solder_silk_layer); + group = pcb_layer_get_group(PCB_SWAP_IDENT ? pcb_component_silk_layer : pcb_solder_silk_layer); slayer = &Buffer->Data->Layer[PCB->LayerGroups.Entries[group][0]]; PCB_PAD_LOOP(element); { @@ -313,7 +313,7 @@ } \ /* get the component-side SM pads */ - group = GetLayerGroupNumberByNumber(silk_layer); + group = pcb_layer_get_group(silk_layer); GROUP_LOOP(Buffer->Data, group); { char num[8]; Index: trunk/src/obj_line_drcenf.c =================================================================== --- trunk/src/obj_line_drcenf.c (revision 5409) +++ trunk/src/obj_line_drcenf.c (revision 5410) @@ -280,11 +280,11 @@ } group = pcb_layer_get_group(INDEXOFCURRENT); comp = pcb_max_group + 10; /* this out-of-range group might save a call */ - if (GetLayerGroupNumberByNumber(pcb_solder_silk_layer) == group) + if (pcb_layer_get_group(pcb_solder_silk_layer) == group) info.solder = pcb_true; else { info.solder = pcb_false; - comp = GetLayerGroupNumberByNumber(pcb_component_silk_layer); + comp = pcb_layer_get_group(pcb_component_silk_layer); } temp = length; /* assume the worst */ @@ -435,11 +435,11 @@ /* prepare for the intersection search */ group = pcb_layer_get_group(INDEXOFCURRENT); comp = pcb_max_group + 10; /* this out-of-range group might save a call */ - if (GetLayerGroupNumberByNumber(pcb_solder_silk_layer) == group) + if (pcb_layer_get_group(pcb_solder_silk_layer) == group) info.solder = pcb_true; else { info.solder = pcb_false; - comp = GetLayerGroupNumberByNumber(pcb_component_silk_layer); + comp = pcb_layer_get_group(pcb_component_silk_layer); } /* search for intersection */ Index: trunk/src/obj_text.c =================================================================== --- trunk/src/obj_text.c (revision 5409) +++ trunk/src/obj_text.c (revision 5410) @@ -361,7 +361,7 @@ textlist_remove(text); textlist_append(&Destination->Text, text); - if (GetLayerGroupNumberByNumber(pcb_solder_silk_layer) == pcb_layer_get_group_(Destination)) + if (pcb_layer_get_group(pcb_solder_silk_layer) == pcb_layer_get_group_(Destination)) PCB_FLAG_SET(PCB_FLAG_ONSOLDER, text); else PCB_FLAG_CLEAR(PCB_FLAG_ONSOLDER, text); Index: trunk/src/polygon.c =================================================================== --- trunk/src/polygon.c (revision 5409) +++ trunk/src/polygon.c (revision 5410) @@ -1484,7 +1484,7 @@ PCB_END_LOOP; } else { - GROUP_LOOP(Data, GetLayerGroupNumberByNumber(pcb_layer_id(Data, ((pcb_layer_t *) ptr1)))); + GROUP_LOOP(Data, pcb_layer_get_group(pcb_layer_id(Data, ((pcb_layer_t *) ptr1)))); { info.layer = layer; pcb_r_search(layer->polygon_tree, &sb, NULL, plow_callback, &info, &seen); @@ -1502,7 +1502,7 @@ /* silk doesn't plow */ if (pcb_layer_id(Data, (pcb_layer_t *) ptr1) >= pcb_max_copper_layer) return 0; - GROUP_LOOP(Data, GetLayerGroupNumberByNumber(pcb_layer_id(Data, ((pcb_layer_t *) ptr1)))); + GROUP_LOOP(Data, pcb_layer_get_group(pcb_layer_id(Data, ((pcb_layer_t *) ptr1)))); { info.layer = layer; pcb_r_search(layer->polygon_tree, &sb, NULL, plow_callback, &info, &seen); @@ -1512,7 +1512,7 @@ break; case PCB_TYPE_PAD: { - pcb_cardinal_t group = GetLayerGroupNumberByNumber(PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, (pcb_pad_t *) ptr2) ? + pcb_cardinal_t group = pcb_layer_get_group(PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, (pcb_pad_t *) ptr2) ? pcb_solder_silk_layer : pcb_component_silk_layer); GROUP_LOOP(Data, group); { Index: trunk/src/rats.c =================================================================== --- trunk/src/rats.c (revision 5409) +++ trunk/src/rats.c (revision 5410) @@ -195,8 +195,8 @@ badnet = pcb_false; /* find layer groups of the component side and solder side */ - SLayer = GetLayerGroupNumberByNumber(pcb_solder_silk_layer); - CLayer = GetLayerGroupNumberByNumber(pcb_component_silk_layer); + SLayer = pcb_layer_get_group(pcb_solder_silk_layer); + CLayer = pcb_layer_get_group(pcb_component_silk_layer); Wantlist = (pcb_netlist_t *) calloc(1, sizeof(pcb_netlist_t)); if (Wantlist) { @@ -832,7 +832,7 @@ /* will work for pins to since the FLAG is common */ group1 = (PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, (pcb_pad_t *) ptr2) ? - GetLayerGroupNumberByNumber(pcb_solder_silk_layer) : GetLayerGroupNumberByNumber(pcb_component_silk_layer)); + pcb_layer_get_group(pcb_solder_silk_layer) : pcb_layer_get_group(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); @@ -845,7 +845,7 @@ return (NULL); } group2 = (PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, (pcb_pad_t *) ptr2) ? - GetLayerGroupNumberByNumber(pcb_solder_silk_layer) : GetLayerGroupNumberByNumber(pcb_component_silk_layer)); + pcb_layer_get_group(pcb_solder_silk_layer) : pcb_layer_get_group(pcb_component_silk_layer)); name2 = pcb_connection_name(found, ptr1, ptr2); menu = pcb_netnode_to_netname(name1); Index: trunk/src_plugins/autoplace/autoplace.c =================================================================== --- trunk/src_plugins/autoplace/autoplace.c (revision 5409) +++ trunk/src_plugins/autoplace/autoplace.c (revision 5410) @@ -144,8 +144,8 @@ pcb_cardinal_t SLayer, CLayer; pcb_cardinal_t i, j; /* find layer groups of the component side and solder side */ - SLayer = GetLayerGroupNumberByNumber(pcb_solder_silk_layer); - CLayer = GetLayerGroupNumberByNumber(pcb_component_silk_layer); + SLayer = pcb_layer_get_group(pcb_solder_silk_layer); + CLayer = pcb_layer_get_group(pcb_component_silk_layer); /* update all nets */ for (i = 0; i < Nets->NetN; i++) { for (j = 0; j < Nets->Net[i].ConnectionN; j++) { Index: trunk/src_plugins/autoroute/autoroute.c =================================================================== --- trunk/src_plugins/autoroute/autoroute.c (revision 5409) +++ trunk/src_plugins/autoroute/autoroute.c (revision 5410) @@ -728,7 +728,7 @@ static routebox_t *AddPolygon(vtptr_t layergroupboxes[], pcb_cardinal_t layer, pcb_polygon_t *polygon, pcb_route_style_t * style) { int is_not_rectangle = 1; - int layergroup = GetLayerGroupNumberByNumber(layer); + int layergroup = pcb_layer_get_group(layer); routebox_t *rb; assert(0 <= layergroup && layergroup < pcb_max_group); rb = AddIrregularObstacle(layergroupboxes, @@ -870,8 +870,8 @@ } /* if via visibility is turned off, don't use them */ AutoRouteParameters.use_vias = routing_layers > 1 && PCB->ViaOn; - front = GetLayerGroupNumberByNumber(pcb_component_silk_layer); - back = GetLayerGroupNumberByNumber(pcb_solder_silk_layer); + front = pcb_layer_get_group(pcb_component_silk_layer); + back = pcb_layer_get_group(pcb_solder_silk_layer); /* determine preferred routing direction on each group */ for (i = 0; i < pcb_max_group; i++) { if (i != back && i != front) { @@ -1064,7 +1064,7 @@ PCB_END_LOOP; for (i = 0; i < pcb_max_copper_layer; i++) { - int layergroup = GetLayerGroupNumberByNumber(i); + int layergroup = pcb_layer_get_group(i); /* add all (non-rat) lines */ PCB_LINE_LOOP(LAYER_PTR(i)); { Index: trunk/src_plugins/export_bboard/bboard.c =================================================================== --- trunk/src_plugins/export_bboard/bboard.c (revision 5409) +++ trunk/src_plugins/export_bboard/bboard.c (revision 5410) @@ -513,11 +513,11 @@ memset(group_data, 0, sizeof(group_data)); #ifdef SOLDER_LAYER - group_data[GetLayerGroupNumberByNumber(pcb_max_copper_layer + SOLDER_LAYER)].solder = 1; - group_data[GetLayerGroupNumberByNumber(pcb_max_copper_layer + COMPONENT_LAYER)].component = 1; + group_data[pcb_layer_get_group(pcb_max_copper_layer + SOLDER_LAYER)].solder = 1; + group_data[pcb_layer_get_group(pcb_max_copper_layer + COMPONENT_LAYER)].component = 1; #else - group_data[GetLayerGroupNumberByNumber(pcb_max_copper_layer + BOTTOM_SIDE)].solder = 1; - group_data[GetLayerGroupNumberByNumber(pcb_max_copper_layer + TOP_SIDE)].component = 1; + group_data[pcb_layer_get_group(pcb_max_copper_layer + BOTTOM_SIDE)].solder = 1; + group_data[pcb_layer_get_group(pcb_max_copper_layer + TOP_SIDE)].component = 1; #endif @@ -524,7 +524,7 @@ 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; + group_data[pcb_layer_get_group(i)].draw = 1; } bboard_init_board_cairo(PCB->MaxWidth, PCB->MaxHeight, bboard_bgcolor, options[HA_antialias].int_value); @@ -545,7 +545,7 @@ /* draw all wires from all valid layers */ 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)) { + if (bboard_validate_layer(PCB->Data->Layer[i].Name, pcb_layer_get_group(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); PCB_LINE_LOOP(&(PCB->Data->Layer[i])); Index: trunk/src_plugins/export_dxf/dxf.c =================================================================== --- trunk/src_plugins/export_dxf/dxf.c (revision 5409) +++ trunk/src_plugins/export_dxf/dxf.c (revision 5410) @@ -747,7 +747,7 @@ */ static int dxf_group_for_layer(int l) { if ((l < pcb_max_copper_layer + 2) && (l >= 0)) { - return GetLayerGroupNumberByNumber(l); + return pcb_layer_get_group(l); } /* else something unique */ return pcb_max_group + 3 + l; Index: trunk/src_plugins/export_gcode/gcode.c =================================================================== --- trunk/src_plugins/export_gcode/gcode.c (revision 5409) +++ trunk/src_plugins/export_gcode/gcode.c (revision 5410) @@ -270,7 +270,7 @@ if (SL_TYPE(n) == 0) { /* layer is a copper layer */ - m = GetLayerGroupNumberByNumber(n); + m = pcb_layer_get_group(n); /* the export layer */ gcode_export_group[m] = 1; @@ -408,7 +408,7 @@ /* magic */ 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(pcb_solder_silk_layer)) ? 1 : 0; + is_solder = (pcb_layer_get_group(idx) == pcb_layer_get_group(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); Index: trunk/src_plugins/export_gerber/gerber.c =================================================================== --- trunk/src_plugins/export_gerber/gerber.c (revision 5409) +++ trunk/src_plugins/export_gerber/gerber.c (revision 5410) @@ -365,7 +365,7 @@ static int group_for_layer(int l) { if (l < pcb_max_copper_layer + 2 && l >= 0) - return GetLayerGroupNumberByNumber(l); + return pcb_layer_get_group(l); /* else something unique */ return pcb_max_group + 3 + l; } @@ -440,12 +440,12 @@ break; default: - group = GetLayerGroupNumberByNumber(idx); + group = pcb_layer_get_group(idx); nlayers = PCB->LayerGroups.Number[group]; - if (group == GetLayerGroupNumberByNumber(pcb_component_silk_layer)) { + if (group == pcb_layer_get_group(pcb_component_silk_layer)) { suff = "cmp"; } - else if (group == GetLayerGroupNumberByNumber(pcb_solder_silk_layer)) { + else if (group == pcb_layer_get_group(pcb_solder_silk_layer)) { suff = "sol"; } else if (nlayers == 1 @@ -553,12 +553,12 @@ for (i = 0; i < pcb_max_copper_layer; i++) { pcb_layer_t *layer = PCB->Data->Layer + i; if (!PCB_LAYER_IS_EMPTY(layer)) - print_group[GetLayerGroupNumberByNumber(i)] = 1; + print_group[pcb_layer_get_group(i)] = 1; } - print_group[GetLayerGroupNumberByNumber(pcb_solder_silk_layer)] = 1; - print_group[GetLayerGroupNumberByNumber(pcb_component_silk_layer)] = 1; + print_group[pcb_layer_get_group(pcb_solder_silk_layer)] = 1; + print_group[pcb_layer_get_group(pcb_component_silk_layer)] = 1; for (i = 0; i < pcb_max_copper_layer; i++) - if (print_group[GetLayerGroupNumberByNumber(i)]) + if (print_group[pcb_layer_get_group(i)]) print_layer[i] = 1; memcpy(saved_layer_stack, pcb_layer_stack, sizeof(pcb_layer_stack)); Index: trunk/src_plugins/export_nelma/nelma.c =================================================================== --- trunk/src_plugins/export_nelma/nelma.c (revision 5409) +++ trunk/src_plugins/export_nelma/nelma.c (revision 5410) @@ -515,7 +515,7 @@ if (SL_TYPE(n) == 0) { /* layer is a copper layer */ - m = GetLayerGroupNumberByNumber(n); + m = pcb_layer_get_group(n); /* the export layer */ nelma_export_group[m] = 1; Index: trunk/src_plugins/export_openscad/scad.c =================================================================== --- trunk/src_plugins/export_openscad/scad.c (revision 5409) +++ trunk/src_plugins/export_openscad/scad.c (revision 5410) @@ -537,16 +537,16 @@ memset(group_data, 0, sizeof(group_data)); #ifdef SOLDER_LAYER - group_data[GetLayerGroupNumberByNumber(pcb_max_copper_layer + SOLDER_LAYER)].solder = 1; - group_data[GetLayerGroupNumberByNumber(pcb_max_copper_layer + COMPONENT_LAYER)].component = 1; + group_data[pcb_layer_get_group(pcb_max_copper_layer + SOLDER_LAYER)].solder = 1; + group_data[pcb_layer_get_group(pcb_max_copper_layer + COMPONENT_LAYER)].component = 1; #else - group_data[GetLayerGroupNumberByNumber(pcb_max_copper_layer + BOTTOM_SIDE)].solder = 1; - group_data[GetLayerGroupNumberByNumber(pcb_max_copper_layer + TOP_SIDE)].component = 1; + group_data[pcb_layer_get_group(pcb_max_copper_layer + BOTTOM_SIDE)].solder = 1; + group_data[pcb_layer_get_group(pcb_max_copper_layer + TOP_SIDE)].component = 1; #endif for (i = 0; i < pcb_max_copper_layer; i++) { layer = PCB->Data->Layer + i; if (!pcb_layer_is_empty_(layer)) - group_data[GetLayerGroupNumberByNumber(i)].draw = 1; + group_data[pcb_layer_get_group(i)].draw = 1; } inner_layers = 0; Index: trunk/src_plugins/export_png/png.c =================================================================== --- trunk/src_plugins/export_png/png.c (revision 5409) +++ trunk/src_plugins/export_png/png.c (revision 5410) @@ -384,7 +384,7 @@ static int group_for_layer(int l) { if (l < pcb_max_copper_layer + 2 && l >= 0) - return GetLayerGroupNumberByNumber(l); + return pcb_layer_get_group(l); /* else something unique */ return pcb_max_group + 3 + l; } @@ -451,12 +451,12 @@ for (i = 0; i < pcb_max_copper_layer; i++) { pcb_layer_t *layer = PCB->Data->Layer + i; if (!PCB_LAYER_IS_EMPTY(layer)) - print_group[GetLayerGroupNumberByNumber(i)] = 1; + print_group[pcb_layer_get_group(i)] = 1; } - print_group[GetLayerGroupNumberByNumber(pcb_solder_silk_layer)] = 1; - print_group[GetLayerGroupNumberByNumber(pcb_component_silk_layer)] = 1; + print_group[pcb_layer_get_group(pcb_solder_silk_layer)] = 1; + print_group[pcb_layer_get_group(pcb_component_silk_layer)] = 1; for (i = 0; i < pcb_max_copper_layer; i++) - if (print_group[GetLayerGroupNumberByNumber(i)]) + if (print_group[pcb_layer_get_group(i)]) print_layer[i] = 1; memcpy(saved_layer_stack, pcb_layer_stack, sizeof(pcb_layer_stack)); @@ -469,8 +469,8 @@ conf_force_set_bool(conf_core.editor.show_solder_side, 0); conf_force_set_bool(conf_core.editor.show_mask, 0); - comp_layer = GetLayerGroupNumberByNumber(pcb_component_silk_layer); - solder_layer = GetLayerGroupNumberByNumber(pcb_solder_silk_layer); + comp_layer = pcb_layer_get_group(pcb_component_silk_layer); + solder_layer = pcb_layer_get_group(pcb_solder_silk_layer); qsort(pcb_layer_stack, pcb_max_copper_layer, sizeof(pcb_layer_stack[0]), layer_sort); if (photo_mode) { Index: trunk/src_plugins/export_ps/eps.c =================================================================== --- trunk/src_plugins/export_ps/eps.c (revision 5409) +++ trunk/src_plugins/export_ps/eps.c (revision 5410) @@ -150,7 +150,7 @@ static int group_for_layer(int l) { if (l < pcb_max_copper_layer + 2 && l >= 0) - return GetLayerGroupNumberByNumber(l); + return pcb_layer_get_group(l); /* else something unique */ return pcb_max_group + 3 + l; } @@ -208,7 +208,7 @@ pcb_layer_t *layer = PCB->Data->Layer + i; if (layer->On) if (!PCB_LAYER_IS_EMPTY(layer)) - print_group[GetLayerGroupNumberByNumber(i)] = 1; + print_group[pcb_layer_get_group(i)] = 1; } /* Now, if only one layer has real stuff on it, we can use the fast @@ -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(pcb_component_silk_layer)] = 1; + print_group[pcb_layer_get_group(pcb_component_silk_layer)] = 1; fast_erase = 1; } @@ -232,7 +232,7 @@ /* Now, for each group we're printing, mark its layers for printing. */ for (i = 0; i < pcb_max_copper_layer; i++) - if (print_group[GetLayerGroupNumberByNumber(i)]) + if (print_group[pcb_layer_get_group(i)]) print_layer[i] = 1; if (fast_erase) { @@ -247,8 +247,8 @@ memcpy(saved_layer_stack, pcb_layer_stack, sizeof(pcb_layer_stack)); as_shown = options[HA_as_shown].int_value; if (!options[HA_as_shown].int_value) { - comp_layer = GetLayerGroupNumberByNumber(pcb_component_silk_layer); - solder_layer = GetLayerGroupNumberByNumber(pcb_solder_silk_layer); + comp_layer = pcb_layer_get_group(pcb_component_silk_layer); + solder_layer = pcb_layer_get_group(pcb_solder_silk_layer); qsort(pcb_layer_stack, pcb_max_copper_layer, sizeof(pcb_layer_stack[0]), layer_sort); } fprintf(f, "%%!PS-Adobe-3.0 EPSF-3.0\n"); Index: trunk/src_plugins/export_ps/ps.c =================================================================== --- trunk/src_plugins/export_ps/ps.c (revision 5409) +++ trunk/src_plugins/export_ps/ps.c (revision 5410) @@ -431,7 +431,7 @@ static int group_for_layer(int l) { if (l < pcb_max_copper_layer + 2 && l >= 0) - return GetLayerGroupNumberByNumber(l); + return pcb_layer_get_group(l); /* else something unique */ return pcb_max_group + 3 + l; } @@ -652,16 +652,16 @@ for (i = 0; i < pcb_max_copper_layer; i++) { pcb_layer_t *layer = PCB->Data->Layer + i; if (!PCB_LAYER_IS_EMPTY(layer)) - global.print_group[GetLayerGroupNumberByNumber(i)] = 1; + global.print_group[pcb_layer_get_group(i)] = 1; if (strcmp(layer->Name, "outline") == 0 || strcmp(layer->Name, "route") == 0) { global.outline_layer = layer; } } - global.print_group[GetLayerGroupNumberByNumber(pcb_solder_silk_layer)] = 1; - global.print_group[GetLayerGroupNumberByNumber(pcb_component_silk_layer)] = 1; + global.print_group[pcb_layer_get_group(pcb_solder_silk_layer)] = 1; + global.print_group[pcb_layer_get_group(pcb_component_silk_layer)] = 1; for (i = 0; i < pcb_max_copper_layer; i++) - if (global.print_group[GetLayerGroupNumberByNumber(i)]) + if (global.print_group[pcb_layer_get_group(i)]) global.print_layer[i] = 1; memcpy(saved_layer_stack, pcb_layer_stack, sizeof(pcb_layer_stack)); @@ -855,7 +855,7 @@ if (global.mirror) mirror_this = !mirror_this; - if (global.automirror && ((idx >= 0 && group == GetLayerGroupNumberByNumber(pcb_solder_silk_layer)) + if (global.automirror && ((idx >= 0 && group == pcb_layer_get_group(pcb_solder_silk_layer)) || (idx < 0 && SL_SIDE(idx) == SL_BOTTOM_SIDE))) mirror_this = !mirror_this; Index: trunk/src_plugins/export_stat/stat.c =================================================================== --- trunk/src_plugins/export_stat/stat.c (revision 5409) +++ trunk/src_plugins/export_stat/stat.c (revision 5410) @@ -171,7 +171,7 @@ for(lid = 0; lid < pcb_max_copper_layer; lid++) { pcb_layer_t *l = PCB->Data->Layer+lid; int empty = pcb_layer_is_empty_(l); - lgid = GetLayerGroupNumberByNumber(lid); + lgid = pcb_layer_get_group(lid); lgs = lgss + lgid; fprintf(f, " ha:layer_%d {\n", lid); Index: trunk/src_plugins/hid_batch/batch.c =================================================================== --- trunk/src_plugins/hid_batch/batch.c (revision 5409) +++ trunk/src_plugins/hid_batch/batch.c (revision 5410) @@ -85,11 +85,11 @@ } 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(pcb_component_silk_layer); - sg = GetLayerGroupNumberByNumber(pcb_solder_silk_layer); + cg = pcb_layer_get_group(pcb_component_silk_layer); + sg = pcb_layer_get_group(pcb_solder_silk_layer); for (i = 0; i < PCB_MAX_LAYER; i++) { - int lg = GetLayerGroupNumberByNumber(i); + int lg = pcb_layer_get_group(i); for (j = 0; j < PCB_MAX_LAYER; j++) putchar(j == lg ? '#' : '-'); printf(" %c %s\n", lg == cg ? 'c' : lg == sg ? 's' : '-', PCB->Data->Layer[i].Name); Index: trunk/src_plugins/hid_gtk/gtkhid-main.c =================================================================== --- trunk/src_plugins/hid_gtk/gtkhid-main.c (revision 5409) +++ trunk/src_plugins/hid_gtk/gtkhid-main.c (revision 5410) @@ -1348,9 +1348,9 @@ static int SwapSides(int argc, const char **argv, pcb_coord_t x, pcb_coord_t y) { - int active_group = GetLayerGroupNumberByNumber(pcb_layer_stack[0]); - int comp_group = GetLayerGroupNumberByNumber(pcb_component_silk_layer); - int solder_group = GetLayerGroupNumberByNumber(pcb_solder_silk_layer); + int active_group = pcb_layer_get_group(pcb_layer_stack[0]); + int comp_group = pcb_layer_get_group(pcb_component_silk_layer); + int solder_group = pcb_layer_get_group(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_lesstif/main.c =================================================================== --- trunk/src_plugins/hid_lesstif/main.c (revision 5409) +++ trunk/src_plugins/hid_lesstif/main.c (revision 5410) @@ -565,9 +565,9 @@ 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(pcb_component_silk_layer); - int solder_group = GetLayerGroupNumberByNumber(pcb_solder_silk_layer); - int active_group = GetLayerGroupNumberByNumber(pcb_layer_stack[0]); + int comp_group = pcb_layer_get_group(pcb_component_silk_layer); + int solder_group = pcb_layer_get_group(pcb_solder_silk_layer); + int active_group = pcb_layer_get_group(pcb_layer_stack[0]); int comp_layer; int solder_layer; int comp_showing = group_showing(comp_group, &comp_layer); @@ -2820,7 +2820,7 @@ idx = PCB->LayerGroups.Entries[group][idx]; #if 0 if (idx == pcb_layer_stack[0] - || GetLayerGroupNumberByNumber(idx) == GetLayerGroupNumberByNumber(pcb_layer_stack[0])) + || pcb_layer_get_group(idx) == pcb_layer_get_group(pcb_layer_stack[0])) autofade = 0; else autofade = 1; Index: trunk/src_plugins/hid_lesstif/menu.c =================================================================== --- trunk/src_plugins/hid_lesstif/menu.c (revision 5409) +++ trunk/src_plugins/hid_lesstif/menu.c (revision 5410) @@ -252,7 +252,7 @@ show_one_layer_button(layer, set); if (layer < pcb_max_copper_layer) { int i; - int group = GetLayerGroupNumberByNumber(layer); + int group = pcb_layer_get_group(layer); for (i = 0; i < PCB->LayerGroups.Number[group]; i++) { l = PCB->LayerGroups.Entries[group][i]; if (l != layer && l < pcb_max_copper_layer) { Index: trunk/src_plugins/puller/puller.c =================================================================== --- trunk/src_plugins/puller/puller.c (revision 5409) +++ trunk/src_plugins/puller/puller.c (revision 5410) @@ -2283,9 +2283,9 @@ /* pcb_hid_actionl("djopt", "puller", 0); */ current_is_solder = (pcb_layer_get_group_(CURRENT) - == GetLayerGroupNumberByNumber(pcb_solder_silk_layer)); + == pcb_layer_get_group(pcb_solder_silk_layer)); current_is_component = (pcb_layer_get_group_(CURRENT) - == GetLayerGroupNumberByNumber(pcb_component_silk_layer)); + == pcb_layer_get_group(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/rubberband_orig/rubberband.c =================================================================== --- trunk/src_plugins/rubberband_orig/rubberband.c (revision 5409) +++ trunk/src_plugins/rubberband_orig/rubberband.c (revision 5410) @@ -226,7 +226,7 @@ info.line = NULL; info.rbnd = rbnd; i = PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, Pad) ? pcb_solder_silk_layer : pcb_component_silk_layer; - group = GetLayerGroupNumberByNumber(i); + group = pcb_layer_get_group(i); /* check all visible layers in the same group */ GROUP_LOOP(PCB->Data, group); @@ -298,7 +298,7 @@ pcb_cardinal_t i; i = PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, Pad) ? pcb_solder_silk_layer : pcb_component_silk_layer; - info.group = GetLayerGroupNumberByNumber(i); + info.group = pcb_layer_get_group(i); info.pad = Pad; info.type = PCB_TYPE_PAD; info.rbnd = rbnd; Index: trunk/src_plugins/toporouter/toporouter.c =================================================================== --- trunk/src_plugins/toporouter/toporouter.c (revision 5409) +++ trunk/src_plugins/toporouter/toporouter.c (revision 5410) @@ -1804,8 +1804,8 @@ GList *vlist = NULL; toporouter_bbox_t *bbox = NULL; - guint front = GetLayerGroupNumberByNumber(pcb_component_silk_layer); - guint back = GetLayerGroupNumberByNumber(pcb_solder_silk_layer); + guint front = pcb_layer_get_group(pcb_component_silk_layer); + guint back = pcb_layer_get_group(pcb_solder_silk_layer); /* printf("read_pads: front = %d back = %d layer = %d\n", front, back, layer);*/ @@ -2074,7 +2074,7 @@ vlist = g_list_prepend(NULL, gts_vertex_new(vertex_class, xs[0], ys[0], l - r->layers)); vlist = g_list_prepend(vlist, gts_vertex_new(vertex_class, xs[1], ys[1], l - r->layers)); /* TODO: replace this with surface version */ - bbox = toporouter_bbox_create_from_points(GetLayerGroupNumberByNumber(ln), vlist, LINE, line); + bbox = toporouter_bbox_create_from_points(pcb_layer_get_group(ln), vlist, LINE, line); r->bboxes = g_slist_prepend(r->bboxes, bbox); /*new;; //insert_constraints_from_list(r, l, vlist, bbox); */