Skip to content

K
kicad-source-mirror
Commit 813d303c authored by CHARRAS's avatar CHARRAS
Browse files
Options

remove eeconfig.h error, and wxWidget version dependent trivial compile warning

parent abd7e400
Show whitespace changes
Inline Side-by-side
Showing with 315 additions and 308 deletions
eeschema/eeconfig.h
View file @ 813d303c
/************************************************************/
/** eeconfig.h : configuration: definition des structures **/
/************************************************************/
/************************************************************/
/** eeconfig.h : configuration: definition des structures **/
/************************************************************/
#ifndef eda_global
#define eda_global extern
#endif
#define GROUP wxT("/eeschema")
#define GROUPCOMMON wxT("/common")
#define GROUPLIB wxT("libraries")
#define GROUP wxT( "/eeschema" )
#define GROUPCOMMON wxT( "/common" )
#define GROUPLIB wxT( "libraries" )
#include "netlist.h" /* Definitions generales liees au calcul de netliste */
......@@ -21,32 +21,32 @@ extern int g_PenMinWidth;
/* Liste des parametres */
static PARAM_CFG_WXSTRING UserLibDirBufCfg
(
wxT("LibDir"), /* Ident String */
(
wxT( "LibDir" ), /* Ident String */
&g_UserLibDirBuffer /* Parameter address */
);
);
static PARAM_CFG_LIBNAME_LIST LibNameBufCfg
(
wxT("LibName"), /* Ident String */
wxT( "LibName" ), /* Ident String */
&g_LibName_List, /* Parameter address */
GROUPLIB /* Groupe */
);
static PARAM_CFG_INT NetFormatCfg
(
wxT("NetFmt"), /* Ident String */
wxT( "NetFmt" ), /* Ident String */
&g_NetFormat, /* Parameter address */
NET_TYPE_PCBNEW, /* Default value */
NET_TYPE_UNINIT, NET_TYPE_CUSTOM1 /* Min and Max values for the parameter */
/*NET_TYPE_NOT_INIT, NET_TYPE_MAX-1*/
NET_TYPE_PCBNEW, /* Min value for the parameter */
NET_TYPE_CUSTOM_MAX /* Max value for the parameter */
);
static PARAM_CFG_INT UnitCfg
(
INSETUP,
wxT("Unite"), /* Ident String */
wxT( "Unite" ), /* Ident String */
&g_UnitMetric, /* Parameter address */
0, /* Default value */
0, 1 /* Min and Max values for the parameter */
......@@ -55,7 +55,7 @@ static PARAM_CFG_INT UnitCfg
static PARAM_CFG_INT CursorShapeCfg
(
INSETUP,
wxT("CuShape"), /* Ident String */
wxT( "CuShape" ), /* Ident String */
&g_CursorShape, /* Parameter address */
0, /* Default value */
0, 1 /* Min and Max values for the parameter */
......@@ -64,7 +64,7 @@ static PARAM_CFG_INT CursorShapeCfg
static PARAM_CFG_INT ShowGridCfg
(
INSETUP,
wxT("ShGrid"), /* Ident String */
wxT( "ShGrid" ), /* Ident String */
&g_ShowGrid, /* Parameter address */
0, 1, /* Min and Max values for the parameter */
1 /* Default value */
......@@ -73,7 +73,7 @@ static PARAM_CFG_INT ShowGridCfg
static PARAM_CFG_SETCOLOR DrawBgColorCfg
(
INSETUP,
wxT("BgColor"), /* Ident String */
wxT( "BgColor" ), /* Ident String */
&g_DrawBgColor, /* Parameter address */
WHITE /* Default value */
);
......@@ -81,7 +81,7 @@ static PARAM_CFG_SETCOLOR DrawBgColorCfg
static PARAM_CFG_SETCOLOR ColorLayerWireCfg
(
INSETUP,
wxT("ColWire"), /* Ident String */
wxT( "ColWire" ), /* Ident String */
&g_LayerDescr.LayerColor[LAYER_WIRE], /* Parameter address */
GREEN /* Default value */
);
......@@ -89,7 +89,7 @@ static PARAM_CFG_SETCOLOR ColorLayerWireCfg
static PARAM_CFG_SETCOLOR ColorLayerBusCfg
(
INSETUP,
wxT("ColorBus"), /* Ident String */
wxT( "ColorBus" ), /* Ident String */
&g_LayerDescr.LayerColor[LAYER_BUS], /* Parameter address */
BLUE /* Default value */
);
......@@ -97,7 +97,7 @@ static PARAM_CFG_SETCOLOR ColorLayerBusCfg
static PARAM_CFG_SETCOLOR ColorLayerJunctionCfg
(
INSETUP,
wxT("ColorConn"), /* Ident String */
wxT( "ColorConn" ), /* Ident String */
&g_LayerDescr.LayerColor[LAYER_JUNCTION], /* Parameter address */
GREEN /* Default value */
);
......@@ -105,7 +105,7 @@ static PARAM_CFG_SETCOLOR ColorLayerJunctionCfg
static PARAM_CFG_SETCOLOR ColorLayerLLabelCfg
(
INSETUP,
wxT("ColorLlab"), /* Ident String */
wxT( "ColorLlab" ), /* Ident String */
&g_LayerDescr.LayerColor[LAYER_LOCLABEL], /* Parameter address */
BLACK /* Default value */
);
......@@ -113,7 +113,7 @@ static PARAM_CFG_SETCOLOR ColorLayerLLabelCfg
static PARAM_CFG_SETCOLOR ColorLayerGLabelCfg
(
INSETUP,
wxT("ColorGlab"), /* Ident String */
wxT( "ColorGlab" ), /* Ident String */
&g_LayerDescr.LayerColor[LAYER_GLOBLABEL], /* Parameter address */
BROWN /* Default value */
);
......@@ -121,7 +121,7 @@ static PARAM_CFG_SETCOLOR ColorLayerGLabelCfg
static PARAM_CFG_SETCOLOR ColorLayerPinFunCfg
(
INSETUP,
wxT("ColorPinF"), /* Ident String */
wxT( "ColorPinF" ), /* Ident String */
&g_LayerDescr.LayerColor[LAYER_PINFUN], /* Parameter address */
MAGENTA /* Default value */
);
......@@ -129,7 +129,7 @@ static PARAM_CFG_SETCOLOR ColorLayerPinFunCfg
static PARAM_CFG_SETCOLOR ColorLayerPinNumCfg
(
INSETUP,
wxT("ColPinN"), /* Ident String */
wxT( "ColPinN" ), /* Ident String */
&g_LayerDescr.LayerColor[LAYER_PINNUM], /* Parameter address */
RED /* Default value */
);
......@@ -137,7 +137,7 @@ static PARAM_CFG_SETCOLOR ColorLayerPinNumCfg
static PARAM_CFG_SETCOLOR ColorLayerPinNamCfg
(
INSETUP,
wxT("ColorPNam"), /* Ident String */
wxT( "ColorPNam" ), /* Ident String */
&g_LayerDescr.LayerColor[LAYER_PINNAM], /* Parameter address */
CYAN /* Default value */
);
......@@ -145,7 +145,7 @@ static PARAM_CFG_SETCOLOR ColorLayerPinNamCfg
static PARAM_CFG_SETCOLOR ColorLayerFieldsCfg
(
INSETUP,
wxT("ColorField"), /* Ident String */
wxT( "ColorField" ), /* Ident String */
&g_LayerDescr.LayerColor[LAYER_FIELDS], /* Parameter address */
MAGENTA /* Default value */
);
......@@ -153,7 +153,7 @@ static PARAM_CFG_SETCOLOR ColorLayerFieldsCfg
static PARAM_CFG_SETCOLOR ColorLayerReferenceCfg
(
INSETUP,
wxT("ColorRef"), /* Ident String */
wxT( "ColorRef" ), /* Ident String */
&g_LayerDescr.LayerColor[LAYER_REFERENCEPART], /* Parameter address */
CYAN /* Default value */
);
......@@ -161,7 +161,7 @@ static PARAM_CFG_SETCOLOR ColorLayerReferenceCfg
static PARAM_CFG_SETCOLOR ColorLayerValueCfg
(
INSETUP,
wxT("ColorValue"), /* Ident String */
wxT( "ColorValue" ), /* Ident String */
&g_LayerDescr.LayerColor[LAYER_VALUEPART], /* Parameter address */
CYAN /* Default value */
);
......@@ -169,7 +169,7 @@ static PARAM_CFG_SETCOLOR ColorLayerValueCfg
static PARAM_CFG_SETCOLOR ColorLayerNotesCfg
(
INSETUP,
wxT("ColorNote"), /* Ident String */
wxT( "ColorNote" ), /* Ident String */
&g_LayerDescr.LayerColor[LAYER_NOTES], /* Parameter address */
LIGHTBLUE /* Default value */
);
......@@ -177,7 +177,7 @@ static PARAM_CFG_SETCOLOR ColorLayerNotesCfg
static PARAM_CFG_SETCOLOR ColorLayerBodyCfg
(
INSETUP,
wxT("ColorBody"), /* Ident String */
wxT( "ColorBody" ), /* Ident String */
&g_LayerDescr.LayerColor[LAYER_DEVICE], /* Parameter address */
RED /* Default value */
);
......@@ -185,7 +185,7 @@ static PARAM_CFG_SETCOLOR ColorLayerBodyCfg
static PARAM_CFG_SETCOLOR ColorLayerBodyBackgroundCfg
(
INSETUP,
wxT("ColorBodyBg"), /* Ident String */
wxT( "ColorBodyBg" ), /* Ident String */
&g_LayerDescr.LayerColor[LAYER_DEVICE_BACKGROUND], /* Parameter address */
LIGHTYELLOW /* Default value */
);
......@@ -193,7 +193,7 @@ static PARAM_CFG_SETCOLOR ColorLayerBodyBackgroundCfg
static PARAM_CFG_SETCOLOR ColorLayerNetNameCfg
(
INSETUP,
wxT("ColorNetN"), /* Ident String */
wxT( "ColorNetN" ), /* Ident String */
&g_LayerDescr.LayerColor[LAYER_NETNAM], /* Parameter address */
DARKGRAY /* Default value */
);
......@@ -201,7 +201,7 @@ static PARAM_CFG_SETCOLOR ColorLayerNetNameCfg
static PARAM_CFG_SETCOLOR ColorLayerPinCfg
(
INSETUP,
wxT("ColorPin"), /* Ident String */
wxT( "ColorPin" ), /* Ident String */
&g_LayerDescr.LayerColor[LAYER_PIN], /* Parameter address */
RED /* Default value */
);
......@@ -210,7 +210,7 @@ static PARAM_CFG_SETCOLOR ColorLayerPinCfg
static PARAM_CFG_SETCOLOR ColorLayerSheetCfg
(
INSETUP,
wxT("ColorSheet"), /* Ident String */
wxT( "ColorSheet" ), /* Ident String */
&g_LayerDescr.LayerColor[LAYER_SHEET], /* Parameter address */
MAGENTA /* Default value */
);
......@@ -218,7 +218,7 @@ static PARAM_CFG_SETCOLOR ColorLayerSheetCfg
static PARAM_CFG_SETCOLOR ColorLayerSheetFileNameCfg
(
INSETUP,
wxT("ColorSheetFileName"), /* Ident String */
wxT( "ColorSheetFileName" ), /* Ident String */
&g_LayerDescr.LayerColor[LAYER_SHEETFILENAME], /* Parameter address */
BROWN /* Default value */
);
......@@ -226,7 +226,7 @@ static PARAM_CFG_SETCOLOR ColorLayerSheetFileNameCfg
static PARAM_CFG_SETCOLOR ColorLayerSheetNameCfg
(
INSETUP,
wxT("ColorSheetName"), /* Ident String */
wxT( "ColorSheetName" ), /* Ident String */
&g_LayerDescr.LayerColor[LAYER_SHEETNAME], /* Parameter address */
CYAN /* Default value */
);
......@@ -234,7 +234,7 @@ static PARAM_CFG_SETCOLOR ColorLayerSheetNameCfg
static PARAM_CFG_SETCOLOR ColorLayerSheetLabelCfg
(
INSETUP,
wxT("ColorSheetLab"), /* Ident String */
wxT( "ColorSheetLab" ), /* Ident String */
&g_LayerDescr.LayerColor[LAYER_SHEETLABEL], /* Parameter address */
BROWN /* Default value */
);
......@@ -242,7 +242,7 @@ static PARAM_CFG_SETCOLOR ColorLayerSheetLabelCfg
static PARAM_CFG_SETCOLOR ColorLayerNoConnectCfg
(
INSETUP,
wxT("ColorNoCo"), /* Ident String */
wxT( "ColorNoCo" ), /* Ident String */
&g_LayerDescr.LayerColor[LAYER_NOCONNECT], /* Parameter address */
BLUE /* Default value */
);
......@@ -250,7 +250,7 @@ static PARAM_CFG_SETCOLOR ColorLayerNoConnectCfg
static PARAM_CFG_SETCOLOR ColorLayerErcWarnCfg
(
INSETUP,
wxT("ColorErcW"), /* Ident String */
wxT( "ColorErcW" ), /* Ident String */
&g_LayerDescr.LayerColor[LAYER_ERC_WARN], /* Parameter address */
GREEN /* Default value */
);
......@@ -258,7 +258,7 @@ static PARAM_CFG_SETCOLOR ColorLayerErcWarnCfg
static PARAM_CFG_SETCOLOR ColorLayerErcErrCfg
(
INSETUP,
wxT("ColorErcE"), /* Ident String */
wxT( "ColorErcE" ), /* Ident String */
&g_LayerDescr.LayerColor[LAYER_ERC_ERR], /* Parameter address */
RED /* Default value */
);
......@@ -266,196 +266,196 @@ static PARAM_CFG_SETCOLOR ColorLayerErcErrCfg
static PARAM_CFG_INT PlotMarginCfg
(
INSETUP,
wxT("Pltmarg"), /* Ident String */
wxT( "Pltmarg" ), /* Ident String */
&g_PlotMargin, /* Parameter address */
300, /* Default value */
0,10000 /* Min and Max values for the parameter */
0, 10000 /* Min and Max values for the parameter */
);
static PARAM_CFG_INT HPGLSpeed
(
wxT("HPGLSpd"), /* Ident String */
wxT( "HPGLSpd" ), /* Ident String */
&g_HPGL_Pen_Descr.m_Pen_Speed, /* Parameter address */
20, /* Default value */
2,45 /* Min and Max values for the parameter */
2, 45 /* Min and Max values for the parameter */
);
static PARAM_CFG_INT HPGLDiam
(
wxT("HPGLDm"), /* Ident String */
wxT( "HPGLDm" ), /* Ident String */
&g_HPGL_Pen_Descr.m_Pen_Diam, /* Parameter address */
15, /* Default value */
1,150 /* Min and Max values for the parameter */
1, 150 /* Min and Max values for the parameter */
);
static PARAM_CFG_INT HPGLPenNum
(
wxT("HPGLNum"), /* Ident String */
wxT( "HPGLNum" ), /* Ident String */
&g_HPGL_Pen_Descr.m_Pen_Num, /* Parameter address */
1, /* Default value */
1,8 /* Min and Max values for the parameter */
1, 8 /* Min and Max values for the parameter */
);
static PARAM_CFG_INT PlotSheetOffsetX_A4
(
wxT("offX_A4"), /* Ident String */
wxT( "offX_A4" ), /* Ident String */
&g_Sheet_A4.m_Offset.x /* Parameter address */
);
static PARAM_CFG_INT PlotSheetOffsetY_A4
(
wxT("offY_A4"), /* Ident String */
wxT( "offY_A4" ), /* Ident String */
&g_Sheet_A4.m_Offset.y /* Parameter address */
);
static PARAM_CFG_INT PlotSheetOffsetX_A3
(
wxT("offX_A3"), /* Ident String */
wxT( "offX_A3" ), /* Ident String */
&g_Sheet_A3.m_Offset.x /* Parameter address */
);
static PARAM_CFG_INT PlotSheetOffsetY_A3
(
wxT("offY_A3"), /* Ident String */
wxT( "offY_A3" ), /* Ident String */
&g_Sheet_A3.m_Offset.y /* Parameter address */
);
static PARAM_CFG_INT PlotSheetOffsetX_A2
(
wxT("offX_A2"), /* Ident String */
wxT( "offX_A2" ), /* Ident String */
&g_Sheet_A2.m_Offset.x /* Parameter address */
);
static PARAM_CFG_INT PlotSheetOffsetY_A2
(
wxT("offY_A2"), /* Ident String */
wxT( "offY_A2" ), /* Ident String */
&g_Sheet_A2.m_Offset.y /* Parameter address */
);
static PARAM_CFG_INT PlotSheetOffsetX_A1
(
wxT("offX_A1"), /* Ident String */
wxT( "offX_A1" ), /* Ident String */
&g_Sheet_A1.m_Offset.x /* Parameter address */
);
static PARAM_CFG_INT PlotSheetOffsetY_A1
(
wxT("offY_A1"), /* Ident String */
wxT( "offY_A1" ), /* Ident String */
&g_Sheet_A1.m_Offset.y /* Parameter address */
);
static PARAM_CFG_INT PlotSheetOffsetX_A0
(
wxT("offX_A0"), /* Ident String */
wxT( "offX_A0" ), /* Ident String */
&g_Sheet_A0.m_Offset.x /* Parameter address */
);
static PARAM_CFG_INT PlotSheetOffsetY_A0
(
wxT("offY_A0"), /* Ident String */
wxT( "offY_A0" ), /* Ident String */
&g_Sheet_A0.m_Offset.y /* Parameter address */
);
static PARAM_CFG_INT PlotSheetOffsetX_A
(
wxT("offX_A"), /* Ident String */
wxT( "offX_A" ), /* Ident String */
&g_Sheet_A.m_Offset.x /* Parameter address */
);
static PARAM_CFG_INT PlotSheetOffsetY_A
(
wxT("offY_A"), /* Ident String */
wxT( "offY_A" ), /* Ident String */
&g_Sheet_A.m_Offset.y /* Parameter address */
);
static PARAM_CFG_INT PlotSheetOffsetX_B
(
wxT("offX_B"), /* Ident String */
wxT( "offX_B" ), /* Ident String */
&g_Sheet_B.m_Offset.x /* Parameter address */
);
static PARAM_CFG_INT PlotSheetOffsetY_B
(
wxT("offY_B"), /* Ident String */
wxT( "offY_B" ), /* Ident String */
&g_Sheet_B.m_Offset.y /* Parameter address */
);
static PARAM_CFG_INT PlotSheetOffsetX_C
(
wxT("offX_C"), /* Ident String */
wxT( "offX_C" ), /* Ident String */
&g_Sheet_C.m_Offset.x /* Parameter address */
);
static PARAM_CFG_INT PlotSheetOffsetY_C
(
wxT("offY_C"), /* Ident String */
wxT( "offY_C" ), /* Ident String */
&g_Sheet_C.m_Offset.y /* Parameter address */
);
static PARAM_CFG_INT PlotSheetOffsetX_D
(
wxT("offX_D"), /* Ident String */
wxT( "offX_D" ), /* Ident String */
&g_Sheet_D.m_Offset.x /* Parameter address */
);
static PARAM_CFG_INT PlotSheetOffsetY_D
(
wxT("offY_D"), /* Ident String */
wxT( "offY_D" ), /* Ident String */
&g_Sheet_D.m_Offset.y /* Parameter address */
);
static PARAM_CFG_INT PlotSheetOffsetX_E
(
wxT("offX_E"), /* Ident String */
wxT( "offX_E" ), /* Ident String */
&g_Sheet_E.m_Offset.x /* Parameter address */
);
static PARAM_CFG_INT PlotSheetOffsetY_E
(
wxT("offY_E"), /* Ident String */
wxT( "offY_E" ), /* Ident String */
&g_Sheet_E.m_Offset.y /* Parameter address */
);
static PARAM_CFG_INT CfgRepeatDeltaX
(
wxT("RptD_X"), /* Ident String */
wxT( "RptD_X" ), /* Ident String */
&g_RepeatStep.x, /* parameter address */
0, /* Default value */
-1000,+1000 /* Min and Max values for the parameter */
-1000, +1000 /* Min and Max values for the parameter */
);
static PARAM_CFG_INT CfgRepeatDeltaY
(
wxT("RptD_Y"), /* Ident String */
wxT( "RptD_Y" ), /* Ident String */
&g_RepeatStep.y, /* Parameter address */
100, /* Default value */
-1000,+1000 /* Min and Max values for the parameter */
-1000, +1000 /* Min and Max values for the parameter */
);
static PARAM_CFG_INT CfgRepeatDeltaLabel
(
wxT("RptLab"), /* Ident String */
wxT( "RptLab" ), /* Ident String */
&g_RepeatDeltaLabel, /* Parameter address */
1, /* Default value */
-10,+10 /* Min and Max values for the parameter */
-10, +10 /* Min and Max values for the parameter */
);
static PARAM_CFG_WXSTRING CfgSimulatorCommandLine
(
wxT("SimCmd"), /* Ident String */
wxT( "SimCmd" ), /* Ident String */
&g_SimulatorCommandLine /* Parameter address */
);
static PARAM_CFG_INT OptNetListUseNamesCfg
(
wxT("UseNetN"), /* Ident String */
wxT( "UseNetN" ), /* Ident String */
&g_OptNetListUseNames, /* Parameter address */
0, /* Default value */
0, 1 /* Min and Max values for the parameter */
......@@ -463,77 +463,77 @@ static PARAM_CFG_INT OptNetListUseNamesCfg
static PARAM_CFG_INT OptDefaultLabelSizeCfg
(
wxT("LabSize"), /* Ident String */
wxT( "LabSize" ), /* Ident String */
&g_DefaultTextLabelSize, /* Parameter address */
DEFAULT_SIZE_TEXT, /* Default value */
0, 1000 /* Min and Max values for the parameter */
);
PARAM_CFG_BASE * ParamCfgList[] =
PARAM_CFG_BASE* ParamCfgList[] =
{
& UserLibDirBufCfg,
& LibNameBufCfg,
& NetFormatCfg,
& UnitCfg,
& CursorShapeCfg,
& ShowGridCfg,
& DrawBgColorCfg,
& ColorLayerWireCfg,
& ColorLayerBusCfg,
& ColorLayerJunctionCfg,
& ColorLayerLLabelCfg,
& ColorLayerGLabelCfg,
& ColorLayerPinFunCfg,
& ColorLayerPinNumCfg,
& ColorLayerPinNamCfg,
& ColorLayerFieldsCfg,
& ColorLayerReferenceCfg,
& ColorLayerValueCfg,
& ColorLayerNotesCfg,
& ColorLayerBodyCfg,
& ColorLayerBodyBackgroundCfg,
& ColorLayerNetNameCfg,
& ColorLayerPinCfg,
& ColorLayerSheetCfg,
& ColorLayerSheetFileNameCfg,
& ColorLayerSheetNameCfg,
& ColorLayerSheetLabelCfg,
& ColorLayerNoConnectCfg,
& ColorLayerErcWarnCfg,
& ColorLayerErcErrCfg,
& PlotMarginCfg,
& HPGLSpeed,
& HPGLDiam,
& HPGLPenNum,
& PlotSheetOffsetX_A4,
& PlotSheetOffsetY_A4,
& PlotSheetOffsetX_A3,
& PlotSheetOffsetY_A3,
& PlotSheetOffsetX_A2,
& PlotSheetOffsetY_A2,
& PlotSheetOffsetX_A1,
& PlotSheetOffsetY_A1,
& PlotSheetOffsetX_A0,
& PlotSheetOffsetY_A0,
& PlotSheetOffsetX_A,
& PlotSheetOffsetY_A,
& PlotSheetOffsetX_B,
& PlotSheetOffsetY_B,
& PlotSheetOffsetX_C,
& PlotSheetOffsetY_C,
& PlotSheetOffsetX_D,
& PlotSheetOffsetY_D,
& PlotSheetOffsetX_E,
& PlotSheetOffsetY_E,
& CfgRepeatDeltaX,
& CfgRepeatDeltaY,
& CfgRepeatDeltaLabel,
& CfgSimulatorCommandLine,
& OptNetListUseNamesCfg,
& OptDefaultLabelSizeCfg,
&UserLibDirBufCfg,
&LibNameBufCfg,
&NetFormatCfg,
&UnitCfg,
&CursorShapeCfg,
&ShowGridCfg,
&DrawBgColorCfg,
&ColorLayerWireCfg,
&ColorLayerBusCfg,
&ColorLayerJunctionCfg,
&ColorLayerLLabelCfg,
&ColorLayerGLabelCfg,
&ColorLayerPinFunCfg,
&ColorLayerPinNumCfg,
&ColorLayerPinNamCfg,
&ColorLayerFieldsCfg,
&ColorLayerReferenceCfg,
&ColorLayerValueCfg,
&ColorLayerNotesCfg,
&ColorLayerBodyCfg,
&ColorLayerBodyBackgroundCfg,
&ColorLayerNetNameCfg,
&ColorLayerPinCfg,
&ColorLayerSheetCfg,
&ColorLayerSheetFileNameCfg,
&ColorLayerSheetNameCfg,
&ColorLayerSheetLabelCfg,
&ColorLayerNoConnectCfg,
&ColorLayerErcWarnCfg,
&ColorLayerErcErrCfg,
&PlotMarginCfg,
&HPGLSpeed,
&HPGLDiam,
&HPGLPenNum,
&PlotSheetOffsetX_A4,
&PlotSheetOffsetY_A4,
&PlotSheetOffsetX_A3,
&PlotSheetOffsetY_A3,
&PlotSheetOffsetX_A2,
&PlotSheetOffsetY_A2,
&PlotSheetOffsetX_A1,
&PlotSheetOffsetY_A1,
&PlotSheetOffsetX_A0,
&PlotSheetOffsetY_A0,
&PlotSheetOffsetX_A,
&PlotSheetOffsetY_A,
&PlotSheetOffsetX_B,
&PlotSheetOffsetY_B,
&PlotSheetOffsetX_C,
&PlotSheetOffsetY_C,
&PlotSheetOffsetX_D,
&PlotSheetOffsetY_D,
&PlotSheetOffsetX_E,
&PlotSheetOffsetY_E,
&CfgRepeatDeltaX,
&CfgRepeatDeltaY,
&CfgRepeatDeltaLabel,
&CfgSimulatorCommandLine,
&OptNetListUseNamesCfg,
&OptDefaultLabelSizeCfg,
NULL
};
eeschema/netlist.h
View file @ 813d303c
......@@ -13,7 +13,7 @@
#define ISBUS 1
#define CUSTOMPANEL_COUNTMAX 8 // Max number of netlist plugins
/* Id to select netlist type */
typedef enum {
NET_TYPE_UNINIT = 0,
......@@ -21,8 +21,13 @@ typedef enum {
NET_TYPE_ORCADPCB2,
NET_TYPE_CADSTAR,
NET_TYPE_SPICE,
NET_TYPE_CUSTOM1 // NET_TYPE_CUSTOM1 is the first id for user netlist format
} TypeNetForm;
NET_TYPE_CUSTOM1, /* NET_TYPE_CUSTOM1
* is the first id for user netlist format
* NET_TYPE_CUSTOM1+CUSTOMPANEL_COUNTMAX-1
* is the last id for user netlist format
*/
NET_TYPE_CUSTOM_MAX = NET_TYPE_CUSTOM1+CUSTOMPANEL_COUNTMAX-1
} TypeNetForm;
/* Max pin number per component and footprint */
......@@ -75,8 +80,9 @@ public:
const wxString* m_Label; /* Tous types Labels:pointeur sur la wxString definissant le label */
wxPoint m_Start, m_End;
#if defined(DEBUG)
#if defined (DEBUG)
void Show( std::ostream& out, int ndx );
#endif
void SetNet( int aNetCode ) { m_NetCode = aNetCode; }
......@@ -108,7 +114,9 @@ eda_global int g_NbrObjNet;
eda_global ObjetNetListStruct* g_TabObjNet;
/* Prototypes: */
void WriteNetList( WinEDA_SchematicFrame* frame, const wxString& FileNameNL, bool use_netnames );
void WriteNetList( WinEDA_SchematicFrame* frame,
const wxString& FileNameNL,
bool use_netnames );
void FreeTabNetList( ObjetNetListStruct* TabNetItems, int NbrNetItems );
/** Function ReturnUserNetlistTypeName
......@@ -118,7 +126,6 @@ void FreeTabNetList( ObjetNetListStruct* TabNetItems, int NbrNetItems );
* this function must be called first with "first_item" = true
* and after with "first_item" = false to get all the other existing netlist names
*/
#define CUSTOMPANEL_COUNTMAX 8 // Max number of netlist plugins
wxString ReturnUserNetlistTypeName( bool first_item );
......
pcbnew/zones.cpp
View file @ 813d303c
......@@ -249,7 +249,7 @@ void WinEDA_ZoneFrame::CreateControls()
static const int GridList[4] = { 50, 100, 250, 500 };
int selection = 0;
for( int ii = 0; ii < m_GridCtrl->GetCount(); ii++ )
for( unsigned ii = 0; ii < (unsigned)m_GridCtrl->GetCount(); ii++ )
{
wxString msg = ReturnStringFromValue( g_UnitMetric,
GridList[ii],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment