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