Index: trunk/doc-rnd/hacking/renames =================================================================== --- trunk/doc-rnd/hacking/renames (revision 5404) +++ trunk/doc-rnd/hacking/renames (revision 5405) @@ -1503,3 +1503,4 @@ IsLayerGroupEmpty -> pcb_is_layergrp_empty ParseGroupString -> pcb_layer_parse_group_string GetLayerNumber -> pcb_layer_id +GetGroupOfLayer -> pcb_layer_get_group Index: trunk/src/layer.c =================================================================== --- trunk/src/layer.c (revision 5404) +++ trunk/src/layer.c (revision 5405) @@ -246,7 +246,7 @@ 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)) < pcb_max_group) + if ((group = pcb_layer_get_group(Layer)) < pcb_max_group) for (i = PCB->LayerGroups.Number[group]; i;) { int layer = PCB->LayerGroups.Entries[group][--i]; @@ -362,12 +362,7 @@ } } -/* ---------------------------------------------------------------------- - * lookup the group to which a layer belongs to - * 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 pcb_layer_get_group(int Layer) { int group, i; Index: trunk/src/layer.h =================================================================== --- trunk/src/layer.h (revision 5404) +++ trunk/src/layer.h (revision 5405) @@ -63,12 +63,16 @@ /* returns the layer number for the passed copper or silk layer pointer */ pcb_layer_id_t pcb_layer_id(pcb_data_t *Data, pcb_layer_t *Layer); +/* lookup the group to which a layer belongs to returns -1 if no group is found */ +int pcb_layer_get_group(int); + /************ OLD API - new code should not use these **************/ int GetLayerGroupNumberByPointer(pcb_layer_t *); int GetLayerGroupNumberByNumber(pcb_cardinal_t); -int GetGroupOfLayer(int); + + int ChangeGroupVisibility(int, pcb_bool, pcb_bool); void LayerStringToLayerStack(const char *); Index: trunk/src/obj_line_drcenf.c =================================================================== --- trunk/src/obj_line_drcenf.c (revision 5404) +++ trunk/src/obj_line_drcenf.c (revision 5405) @@ -278,7 +278,7 @@ x_is_long = pcb_false; length = coord_abs(dy); } - group = GetGroupOfLayer(INDEXOFCURRENT); + 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) info.solder = pcb_true; @@ -433,7 +433,7 @@ line.Point2 = aline.Point2; /* prepare for the intersection search */ - group = GetGroupOfLayer(INDEXOFCURRENT); + 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) info.solder = pcb_true; Index: trunk/src_plugins/diag/diag.c =================================================================== --- trunk/src_plugins/diag/diag.c (revision 5404) +++ trunk/src_plugins/diag/diag.c (revision 5405) @@ -155,7 +155,7 @@ used = pcb_layer_list_any(PCB_LYT_ANYTHING | PCB_LYT_ANYWHERE | PCB_LYT_VIRTUAL, arr, sizeof(arr)/sizeof(arr[0])); for(n = 0; n < used; n++) { pcb_layer_id_t layer_id = arr[n]; - pcb_layergrp_id_t grp = GetGroupOfLayer(layer_id); + pcb_layergrp_id_t grp = pcb_layer_get_group(layer_id); printf(" [%lx] %04x group=%d %s\n", layer_id, pcb_layer_flags(layer_id), grp, pcb_layer_name(layer_id)); } Index: trunk/src_plugins/hid_remote/remote.c =================================================================== --- trunk/src_plugins/hid_remote/remote.c (revision 5404) +++ trunk/src_plugins/hid_remote/remote.c (revision 5405) @@ -87,7 +87,7 @@ used = pcb_layer_list_any(PCB_LYT_ANYTHING | PCB_LYT_ANYWHERE | PCB_LYT_VIRTUAL, arr, sizeof(arr)/sizeof(arr[0])); for(n = 0; n < used; n++) { pcb_layer_id_t layer_id = arr[n]; - pcb_layergrp_id_t grp = GetGroupOfLayer(layer_id); + pcb_layergrp_id_t grp = pcb_layer_get_group(layer_id); pcb_remote_new_layer(pcb_layer_name(layer_id), layer_id, pcb_layer_flags(layer_id), grp); } }