| default_layer_name | string | 0 |
| fab_author | string | 0 | Full name of author for FAB drawings
- | | initial_layer_stack | string | 0 | If set, the initial layer stack is set to this
+ | | initial_layer_stack | string | 0 | deprecated.
| | groups | string | 0 | string with layergroups
| | routes | string | 0 | string with route styles
| | paste_adjust | coord | 0 | Adjust paste thickness
Index: trunk/src/conf_core.h
===================================================================
--- trunk/src/conf_core.h (revision 8310)
+++ trunk/src/conf_core.h (revision 8311)
@@ -143,7 +143,7 @@
CFT_REAL poly_isle_area; /* polygon min area */
CFT_STRING default_layer_name[PCB_MAX_LAYER];
CFT_STRING fab_author; /* Full name of author for FAB drawings */
- CFT_STRING initial_layer_stack; /* If set, the initial layer stack is set to this */
+ CFT_STRING initial_layer_stack; /* deprecated. */
CFT_STRING groups; /* string with layergroups */
CFT_STRING routes; /* string with route styles */
Index: trunk/src/layer_vis.c
===================================================================
--- trunk/src/layer_vis.c (revision 8310)
+++ trunk/src/layer_vis.c (revision 8311)
@@ -49,100 +49,6 @@
} SavedStack;
-/* ----------------------------------------------------------------------
- * Given a string description of a layer stack, adjust the layer stack
- * to correspond.
-*/
-
-void pcb_layervis_parse_string(const char *layer_string)
-{
- static int listed_layers = 0;
- int l = strlen(layer_string);
- char **args;
- int i, argn, lno;
- int prev_sep = 1;
- char *s;
-
- s = pcb_strdup(layer_string);
- args = (char **) malloc(l * sizeof(char *));
- argn = 0;
-
- for (i = 0; i < l; i++) {
- switch (s[i]) {
- case ' ':
- case '\t':
- case ',':
- case ';':
- case ':':
- prev_sep = 1;
- s[i] = '\0';
- break;
- default:
- if (prev_sep)
- args[argn++] = s + i;
- prev_sep = 0;
- break;
- }
- }
-
- for (i = 0; i < pcb_max_layer; i++) {
- if (!(pcb_layer_flags(i) & PCB_LYT_SILK))
- pcb_layer_stack[i] = i;
- PCB->Data->Layer[i].On = pcb_false;
- }
- PCB->ElementOn = pcb_false;
- PCB->InvisibleObjectsOn = pcb_false;
- PCB->PinOn = pcb_false;
- PCB->ViaOn = pcb_false;
- PCB->RatOn = pcb_false;
-
- conf_set_editor(show_mask, 0);
- conf_set_editor(show_paste, 0);
- conf_set_editor(show_solder_side, 0);
-
- for (i = argn - 1; i >= 0; i--) {
- if (pcb_strcasecmp(args[i], "rats") == 0)
- PCB->RatOn = pcb_true;
- else if (pcb_strcasecmp(args[i], "invisible") == 0)
- PCB->InvisibleObjectsOn = pcb_true;
- else if (pcb_strcasecmp(args[i], "pins") == 0)
- PCB->PinOn = pcb_true;
- else if (pcb_strcasecmp(args[i], "vias") == 0)
- PCB->ViaOn = pcb_true;
- else if (pcb_strcasecmp(args[i], "elements") == 0 || pcb_strcasecmp(args[i], "silk") == 0)
- PCB->ElementOn = pcb_true;
- else if (pcb_strcasecmp(args[i], "mask") == 0)
- conf_set_editor(show_mask, 1);
- else if (pcb_strcasecmp(args[i], "paste") == 0)
- conf_set_editor(show_paste, 1);
- else if (pcb_strcasecmp(args[i], "solderside") == 0)
- conf_set_editor(show_solder_side, 1);
- else if (isdigit((int) args[i][0])) {
- lno = atoi(args[i]);
- pcb_layervis_change_group_vis(lno, pcb_true, pcb_true);
- }
- else {
- int found = 0;
- for (lno = 0; lno < pcb_max_layer; lno++)
- if (pcb_strcasecmp(args[i], PCB->Data->Layer[lno].Name) == 0) {
- pcb_layervis_change_group_vis(lno, pcb_true, pcb_true);
- found = 1;
- break;
- }
- if (!found) {
- fprintf(stderr, "Warning: layer \"%s\" not known\n", args[i]);
- if (!listed_layers) {
- fprintf(stderr, "Named layers in this board are:\n");
- listed_layers = 1;
- for (lno = 0; lno < pcb_max_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");
- }
- }
- }
- }
-}
-
/* ---------------------------------------------------------------------------
* move layer (number is passed in) to top of layerstack
*/
Index: trunk/src/layer_vis.h
===================================================================
--- trunk/src/layer_vis.h (revision 8310)
+++ trunk/src/layer_vis.h (revision 8311)
@@ -32,10 +32,6 @@
#include "layer.h"
-/* Given a string description of a layer visibility stack, adjust the layer
- visibility to correspond */
-void pcb_layervis_parse_string(const char *layer_string);
-
/* changes the visibility of all layers in a group; returns the number of
changed layers */
int pcb_layervis_change_group_vis(int Layer, pcb_bool On, pcb_bool ChangeStackOrder);
Index: trunk/src/main.c
===================================================================
--- trunk/src/main.c (revision 8310)
+++ trunk/src/main.c (revision 8311)
@@ -539,9 +539,8 @@
PCB->Filename = pcb_strdup(command_line_pcb);
}
- if (conf_core.design.initial_layer_stack && conf_core.design.initial_layer_stack[0]) {
- pcb_layervis_parse_string(conf_core.design.initial_layer_stack);
- }
+ if (conf_core.design.initial_layer_stack && conf_core.design.initial_layer_stack[0])
+ pcb_message(PCB_MSG_ERROR, "Config setting desgin/initial_layer_stack is set but is deprecated and ignored. Please edit your config files to remove it.\n");
/* read the library file and display it if it's not empty
*/
Index: trunk/src/pcb-conf.lht
===================================================================
--- trunk/src/pcb-conf.lht (revision 8310)
+++ trunk/src/pcb-conf.lht (revision 8311)
@@ -140,7 +140,6 @@
# li:default_layer_name = {layername1; layername2}
# background_image = {}
# fab_author = {}
-# initial_layer_stack = {}
groups = {}
routes = {}
paste_adjust = 0
| |