Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
K
kicad-source-mirror
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
Elphel
kicad-source-mirror
Commits
703420ba
Commit
703420ba
authored
Dec 21, 2009
by
charras
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
changed layer constants XXX_CU and XXXX_CMP to XXX_BACK and XXX_FRONT
parent
bd5018dd
Changes
17
Hide whitespace changes
Inline
Side-by-side
Showing
17 changed files
with
356 additions
and
241 deletions
+356
-241
3d_draw.cpp
3d-viewer/3d_draw.cpp
+8
-8
HersheySimplexRoman_sans_normal.h
include/HersheySimplexRoman_sans_normal.h
+225
-95
pcbstruct.h
include/pcbstruct.h
+17
-17
class_board.cpp
pcbnew/class_board.cpp
+8
-8
class_edge_mod.cpp
pcbnew/class_edge_mod.cpp
+1
-1
class_module_transform_functions.cpp
pcbnew/class_module_transform_functions.cpp
+28
-28
class_pad.cpp
pcbnew/class_pad.cpp
+8
-8
class_pad_draw_functions.cpp
pcbnew/class_pad_draw_functions.cpp
+12
-12
class_text_mod.cpp
pcbnew/class_text_mod.cpp
+10
-10
dialog_layers_setup.cpp
pcbnew/dialog_layers_setup.cpp
+8
-8
edgemod.cpp
pcbnew/edgemod.cpp
+3
-3
export_gencad.cpp
pcbnew/export_gencad.cpp
+1
-1
gpcb_exchange.cpp
pcbnew/gpcb_exchange.cpp
+2
-2
locate.cpp
pcbnew/locate.cpp
+2
-2
plot_rtn.cpp
pcbnew/plot_rtn.cpp
+4
-4
set_color.cpp
pcbnew/set_color.cpp
+3
-18
set_color.h
pcbnew/set_color.h
+16
-16
No files found.
3d-viewer/3d_draw.cpp
View file @
703420ba
...
...
@@ -147,10 +147,10 @@ GLuint Pcb3D_GLCanvas::CreateDrawGL_List()
GLfloat
zpos_cu
=
10
*
g_Parm_3D_Visu
.
m_BoardScale
;
GLfloat
zpos_cmp
=
g_Parm_3D_Visu
.
m_Epoxy_Width
+
zpos_cu
;
g_Parm_3D_Visu
.
m_LayerZcoord
[
ADHESIVE_N_
CU
]
=
-
zpos_cu
*
2
;
g_Parm_3D_Visu
.
m_LayerZcoord
[
ADHESIVE_N_
CMP
]
=
zpos_cmp
+
zpos_cu
;
g_Parm_3D_Visu
.
m_LayerZcoord
[
SILKSCREEN_N_
CU
]
=
-
zpos_cu
;
g_Parm_3D_Visu
.
m_LayerZcoord
[
SILKSCREEN_N_
CMP
]
=
zpos_cmp
;
g_Parm_3D_Visu
.
m_LayerZcoord
[
ADHESIVE_N_
BACK
]
=
-
zpos_cu
*
2
;
g_Parm_3D_Visu
.
m_LayerZcoord
[
ADHESIVE_N_
FRONT
]
=
zpos_cmp
+
zpos_cu
;
g_Parm_3D_Visu
.
m_LayerZcoord
[
SILKSCREEN_N_
BACK
]
=
-
zpos_cu
;
g_Parm_3D_Visu
.
m_LayerZcoord
[
SILKSCREEN_N_
FRONT
]
=
zpos_cmp
;
g_Parm_3D_Visu
.
m_LayerZcoord
[
DRAW_N
]
=
zpos_cmp
+
zpos_cu
;
g_Parm_3D_Visu
.
m_LayerZcoord
[
COMMENT_N
]
=
zpos_cmp
+
zpos_cu
;
g_Parm_3D_Visu
.
m_LayerZcoord
[
ECO1_N
]
=
zpos_cmp
+
zpos_cu
;
...
...
@@ -1270,10 +1270,10 @@ static GLfloat Get3DLayerSide( int act_layer )
nZ
=
1.0
;
if
(
(
act_layer
<=
LAST_COPPER_LAYER
-
1
)
||
(
act_layer
==
ADHESIVE_N_
CU
)
||
(
act_layer
==
SOLDERPASTE_N_
CU
)
||
(
act_layer
==
SILKSCREEN_N_
CU
)
||
(
act_layer
==
SOLDERMASK_N_
CU
)
)
||
(
act_layer
==
ADHESIVE_N_
BACK
)
||
(
act_layer
==
SOLDERPASTE_N_
BACK
)
||
(
act_layer
==
SILKSCREEN_N_
BACK
)
||
(
act_layer
==
SOLDERMASK_N_
BACK
)
)
nZ
=
-
1.0
;
return
nZ
;
}
...
...
include/HersheySimplexRoman_sans_normal.h
View file @
703420ba
/* Automatically converted font */
/* Hershey Simplex Roman (sans) definition
* First shape has unicode (or ascii) value 0x20 (space)
*/
const
static
char
*
hershey_simplex
[]
=
{
"JZ"
,
"MWRFRT R
RYQZR[SZRY
"
,
"JZNFN
M RVFVM
"
,
"H]
SBLb RYBRb RLOZO RKUYU
"
,
"H
\\
PBP_ RTBT_ RYIWGTFPFMGKIKKLMMNOOUQWRXSYUYXWZT[P[MZKX
"
,
"F^
[FI[ RNFPHPJOLMMKMIKIIJGLFNFPGSHVHYG[F RWTUUTWTYV[X[ZZ[X[VYTWT
"
,
"E_
\\
O
\\
N[MZMYNXPVUTXRZP[L[JZIYHWHUISJRQNRMSKSIRGPFNGMIMKNNPQUXWZY[[[
\\
Z
\\
Y
"
,
"MWR
HQGRFSGSIRKQ
L"
,
"KYV
BTDRGPKOPOTPYR]T`Vb
"
,
"KYN
BPDRGTKUPUTTYR]P`Nb
"
,
"JZRFR
R RMIWO RWIM
O"
,
"E_
RIR[ RIR[R
"
,
"MW
SZR[QZRYSZS
\\
R^Q
_"
,
"E_
IR[R
"
,
"MW
RYQZR[SZRY
"
,
"G][
BIb
"
,
"H
\\
QF
NGLJKOKRLWNZQ[S[VZXWYRYOXJVGSF
QF"
,
"H
\\
N
JPISFS[
"
,
"H
\\
L
KLJMHNGPFTFVGWHXJXLWNUQK[Y
["
,
"H
\\
MFXFRNUNWOXPYSYUXXVZS[P[MZLYKW
"
,
"H
\\
UFKTZT RUFU[
"
,
"H
\\
WFMFL
OMNPMSMVNXPYSYUXXVZS[P[MZLYKW
"
,
"H
\\
XIWGTFRFOGMJLOLTMXOZR[S[VZXXYUYTXQVOSNRNOOMQLT
"
,
"H
\\
YFO[ RKFYF
"
,
"H
\\
P
FMGLILKMMONSOVPXRYTYWXYWZT[P[MZLYKWKTLRNPQOUNWMXKXIWGTFPF
"
,
"H
\\
XMWPURRSQSNRLPKMKLLINGQFRFUGWIXMXRWWUZR[P[MZLX
"
,
"MW
RMQNROSNRM RRYQZR[SZRY
"
,
"MWR
MQNROSNRM RSZR[QZRYSZS
\\
R^Q_
"
,
"F^
ZIJRZ[
"
,
"E_
IO[O RIU[U
"
,
"F^J
IZRJ[
"
,
"I[
LKLJMHNGPFTFVGWHXJXLWNVORQRT RRYQZR[SZRY
"
,
"
E`WNVLTKQKOLNMMPMSNUPVSVUUVS RQKOMNPNSOUPV RWKVSVUXVZV
\\
T]Q]O
\\
L[JYHWGTFQFNGLHJJILHOHRIUJWLYNZQ[T[WZYYZX RXKWSWUXV
"
,
"I[
RFJ[ RRFZ[ RMTWT
"
,
"G
\\
KFK[ RKFTFWGXHYJYLXNWOTP RKPTPWQXRYTYWXYWZT[K[
"
,
"H]
ZKYIWGUFQFOGMILKKNKSLVMXOZQ[U[WZYXZV
"
,
"G
\\
KFK[ RKFRFUGWIXKYNYSXVWXUZR[K
["
,
"H[
LFL[ RLFYF RLPTP RL[Y[
"
,
"HZ
LFL[ RLFYF RLPTP
"
,
"H]
ZKYIWGUFQFOGMILKKNKSLVMXOZQ[U[WZYXZVZS RUSZS
"
,
"G]
KFK[ RYFY[ RKPYP
"
,
"NVR
FR[
"
,
"JZ
VFVVUYTZR[P[NZMYLVLT
"
,
"G
\\
KFK[ RYFKT RPOY[
"
,
"HY
LFL[ RL[X[
"
,
"F^
JFJ[ RJFR[ RZFR[ RZFZ
["
,
"G]
KFK[ RKFY[ RYFY[
"
,
"G]P
FNGLIKKJNJSKVLXNZP[T[VZXXYVZSZNYKXIVGTFPF
"
,
"G
\\
KFK[ RKFTFWGXHYJYMXOWPTQK
Q"
,
"G]
PFNGLIKKJNJSKVLXNZP[T[VZXXYVZSZNYKXIVGTFPF RSWY]
"
,
"G
\\
KFK[ RKFTFWGXHYJYLXNWOTPKP RRPY[
"
,
"H
\\
YIWGTFPFMGKIKKLMMNOOUQWRXSYUYXWZT[P[MZKX
"
,
"JZ
RFR[ RKFY
F"
,
"G]
KFKULXNZQ[S[VZXXYUYF
"
,
"I[
JFR[ RZFR[
"
,
"F^
HFM[ RRFM[ RRFW[ R
\\
FW[
"
,
"H
\\
KFY[ RYFK
["
,
"I[
JFRPR[ RZFRP
"
,
"H
\\
YFK[ RKFYF RK[Y[
"
,
"KY
OBOb RPBPb ROBVB RObVb
"
,
"KY
KFY^
"
,
"KY
TBTb RUBUb RNBUB RNbUb
"
,
"JZ
PLRITL RMORJWO RRJR[
"
,
"JZ"
,
// ' '
"MWRFRT R
QZR[Q[QZRZR[
"
,
"JZNFN
L RVFVL
"
,
"H]
LM[M RRDL_ RYVJV RS_YD
"
,
"H
\\
RDR] RLZO[T[VZWYXWXUWSVRTQPPNOMNLLLJMHNGPFUFXG
"
,
"F^
J[ZF RMFOGPIOKMLKKJIKGMF RYZZXYVWUUVTXUZW[YZ
"
,
"E_
[[Z[XZUWPQNNMKMINGPFQFSGTITJSLRMLQKRJTJWKYLZN[Q[SZTYWUXRXP
"
,
"MWR
FR
L"
,
"KYV
bUaS^R
\\
QYPTPPQKRHSFUCVB
"
,
"KYN
bOaQ^R
\\
SYTTTPSKRHQFOCNB
"
,
"JZRFR
K RMIRKWI ROORKU
O"
,
"E_
JQZQ RRYRI
"
,
"MW
RZR
\\
Q^P
_"
,
"E_
JQZQ
"
,
"MW
QZR[Q[QZRZR[
"
,
"G][
DI_
"
,
"H
\\
QF
SFUGVHWJXNXSWWVYUZS[Q[OZNYMWLSLNMJNHOG
QF"
,
"H
\\
N
[W[ RS[SFQIOKML
"
,
"H
\\
L
HMGOFTFVGWHXJXLWOK[X
["
,
"H
\\
KFXFQNTNVOWPXRXWWYVZT[N[LZKY
"
,
"H
\\
VMV[ RQELTYT
"
,
"H
\\
WFMFL
PMOONTNVOWPXRXWWYVZT[O[MZLY
"
,
"H
\\
VFRFPGOHMKLOLWMYNZP[T[VZWYXWXRWPVOTNPNNOMPLR
"
,
"H
\\
KFYFP[
"
,
"H
\\
P
ONNMMLKLJMHNGPFTFVGWHXJXKWMVNTOPONPMQLSLWMYNZP[T[VZWYXWXSWQVPTO
"
,
"H
\\
N[R[TZUYWVXRXJWHVGTFPFNGMHLJLOMQNRPSTSVRWQXO
"
,
"MW
QZR[Q[QZRZR[ RQNROQOQNRNRO
"
,
"MWR
ZR
\\
Q^P_ RQNROQOQNRNRO
"
,
"F^
YWJQYK
"
,
"E_
JNZN RZTJT
"
,
"F^J
WYQJK
"
,
"I[
Q[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT
"
,
"
D_VQUPSOQOOPNQMSMUNWOXQYSYUXVW RVOVWWXXXZW[U[PYMVKRJNKKMIPHTIXK[N]R^V]Y[
"
,
"I[
MUWU RK[RFY[
"
,
"G
\\
SPVQWRXTXWWYVZT[L[LFSFUGVHWJWLVNUOSPLP
"
,
"H]
YYXZU[S[PZNXMVLRLOMKNIPGSFUFXGYH
"
,
"G
\\
L[LFQFTGVIWKXOXRWVVXTZQ[L
["
,
"H[
MPTP RW[M[MFWF
"
,
"HZ
MPTP RTPMP RM[MFWF
"
,
"H]
XGVFSFPGNIMKLOLRMVNXPZS[U[XZYYYRUR
"
,
"G]
L[LF RLPXP RX[XF
"
,
"NVR
[RF
"
,
"JZ
UFUUTXRZO[M[
"
,
"G
\\
L[LF RX[OO RXFLR
"
,
"HY
V[M[MF
"
,
"F^
K[KFRUYFY
["
,
"G]
L[LFX[XF
"
,
"G]P
[NZLXKTKMLINGPFTFVGXIYMYTXXVZT[P[
"
,
"G
\\
L[LFTFVGWHXJXMWOVPTQL
Q"
,
"G]
Z]X
\\
VZSWQVOV RP[NZLXKTKMLINGPFTFVGXIYMYTXXVZT[P[
"
,
"G
\\
X[QQ RL[LFTFVGWHXJXMWOVPTQLQ
"
,
"H
\\
LZO[T[VZWYXWXUWSVRTQPPNOMNLLLJMHNGPFUFXG
"
,
"JZ
LFXF RR[R
F"
,
"G]
LGLWMYNZP[T[VZWYXWXG
"
,
"I[
KFR[YF
"
,
"F^
IFN[RLV[[F
"
,
"H
\\
L[XF RLFX
["
,
"I[
RQR[ RKFRQYF
"
,
"H
\\
X[L[XFLF
"
,
"KY
VaQaQCVC
"
,
"KY
ID[_
"
,
"KY
NaSaSCNC
"
,
"JZ
NIREVI
"
,
"JZJ]Z]"
,
"MWSFRGQIQKRLSKRJ"
,
"I
\\
XMX[ RXPVNTMQMONMPLSLUMXOZQ[T[VZXX"
,
"H[LFL[ RLPNNPMSMUNWPXSXUWXUZS[P[NZLX"
,
"I[XPVNTMQMONMPLSLUMXOZQ[T[VZXX"
,
"I
\\
XFX[ RXPVNTMQMONMPLSLUMXOZQ[T[VZXX"
,
"I[LSXSXQWOVNTMQMONMPLSLUMXOZQ[T[VZXX"
,
"MYWFUFSGRJR[ ROMVM"
,
"I
\\
XMX]W`VaTbQbOa RXPVNTMQMONMPLSLUMXOZQ[T[VZXX"
,
"I
\\
MFM[ RMQPNRMUMWNXQX["
,
"NVQFRGSFREQF RRMR["
,
"MWRFSGTFSERF RSMS^RaPbNb"
,
"IZMFM[ RWMMW RQSX["
,
"NVRFR["
,
"CaGMG[ RGQJNLMOMQNRQR[ RRQUNWMZM
\\
N]Q]["
,
"I
\\
MMM[ RMQPNRMUMWNXQX["
,
"I
\\
QMONMPLSLUMXOZQ[T[VZXXYUYSXPVNTMQM"
,
"H[LMLb RLPNNPMSMUNWPXSXUWXUZS[P[NZLX"
,
"I
\\
XMXb RXPVNTMQMONMPLSLUMXOZQ[T[VZXX"
,
"KXOMO[ ROSPPRNTMWM"
,
"J[XPWNTMQMNNMPNRPSUTWUXWXXWZT[Q[NZMX"
,
"MYRFRWSZU[W[ ROMVM"
,
"I
\\
MMMWNZP[S[UZXW RXMX["
,
"JZLMR[ RXMR["
,
"G]JMN[ RRMN[ RRMV[ RZMV["
,
"J[MMX[ RXMM["
,
"JZLMR[ RXMR[P_NaLbKb"
,
"J[XMM[ RMMXM RM[X["
,
"KYTBRCQDPFPHQJRKSMSOQQ RRCQEQGRISJTLTNSPORSTTVTXSZR[Q]Q_Ra RQSSUSWRYQZP
\\
P^Q`RaTb"
,
"NVRBRb"
,
"KYPBRCSDTFTHSJRKQMQOSQ RRCSESGRIQJPLPNQPURQTPVPXQZR[S]S_Ra RSSQUQWRYSZT
\\
T^S`RaPb"
,
"F^IUISJPLONOPPTSVTXTZS[Q RISJQLPNPPQTTVUXUZT[Q[O"
,
"KYQFOGNINKOMQNSNUMVKVIUGSFQF"
"MWPERH"
,
"I
\\
W[WPVNTMPMNN RWZU[P[NZMXMVNTPSUSWR"
,
"H[M[MF RMNOMSMUNVOWQWWVYUZS[O[MZ"
,
"I[WZU[Q[OZNYMWMQNOONQMUMWN"
,
"I
\\
W[WF RWZU[Q[OZNYMWMQNOONQMUMWN"
,
"I[VZT[P[NZMXMPNNPMTMVNWPWRMT"
,
"MYPMVM RR[RISGUFWF"
,
"I
\\
WMW^V`UaSbPbNa RWZU[Q[OZNYMWMQNOONQMUMWN"
,
"H[M[MF RMNOMSMUNVOWQW["
,
"NVR[RM RQFRGQGQFRFRG"
,
"LVRMR_QaObNb RQFRGQGQFRFRG"
,
"IZN[NF RV[OT RVMNU"
,
"NVU[SZRXRF"
,
"CaH[HM RR[ROQNOMKMINHO R][]Q
\\
O[NYMUMSNRO"
,
"H[MMM[ RW[WQVOUNSMOMMN"
,
"H[P[NZMYLWLQMONNPMSMUNVOWQWWVYUZS[P["
,
"H[MMMb RMNOMSMUNVOWQWWVYUZS[O[MZ"
,
"I
\\
WMWb RWZU[Q[OZNYMWMQNOONQMUMWN"
,
"KXP[PM RPOQNSMUMWN"
,
"IZMZO[S[UZVXVWUUSTPTNSMQMPNNPMSMUN"
,
"MYPMVM RV[U[SZRXRF"
,
"I
\\
WMW[ RMMMWNYOZQ[U[WZ"
,
"JZMMR[WM"
,
"G]JMN[RQV[ZM"
,
"IZL[WM RLMW["
,
"JZMMR[ RWMR[P`OaMb"
,
"IZMMVMM[V["
,
"KYVbUbSaR_RUQSORQQRORESCUBVB"
,
"NVRbRB"
,
"KYNbObQaR_RUSSURSQROREQCOBNB"
,
"F^KHLGNFOFQGRHTIUIWHXG"
,
"F^K[KFYFY[K["
,
"RR"
,
"RR"
,
"RR"
,
"RR"
,
"RR"
,
"RR"
,
"RR"
,
"RR"
,
"RR"
,
"RR"
,
"RR"
,
"RR"
,
"RR"
,
"RR"
,
"RR"
,
"RR"
,
"RR"
,
"RR"
,
"RR"
,
"RR"
,
"RR"
,
"RR"
,
"RR"
,
"RR"
,
"RR"
,
"RR"
,
"RR"
,
"RR"
,
"RR"
,
"RR"
,
"RR"
,
"RR"
,
"JZ"
,
"I[Q[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT"
,
// EXCLAM_DOWN not found!
"I[Q[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT"
,
// CENT not found!
"I[Q[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT"
,
// POUND not found!
"I[Q[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT"
,
// CURRENCY not found!
"I[Q[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT"
,
// YEN not found!
"I[Q[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT"
,
// BROKEN not found!
"I[Q[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT"
,
// SECTION not found!
"I[Q[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT"
,
// DIAERESIS not found!
"I[Q[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT"
,
// COPYRIGHT not found!
"I[Q[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT"
,
// SUP_SMALL_A not found!
"I[Q[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT"
,
// GUILLEMET_DBL_LEFT not found!
"I[Q[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT"
,
// NOT not found!
"RR"
,
"I[Q[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT"
,
// REGISTERED not found!
"I[Q[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT"
,
// MACRON not found!
"I[Q[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT"
,
// DEGREE not found!
"I[Q[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT"
,
// PLUS_MINUS not found!
"I[Q[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT"
,
// SUP_DIGIT_2 not found!
"I[Q[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT"
,
// SUP_DIGIT_3 not found!
"I[Q[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT"
,
// ACUTE not found!
"I[Q[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT"
,
// SMALL_MU not found!
"I[Q[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT"
,
// PILCROW not found!
"I[Q[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT"
,
// MIDDLE_DOT not found!
"I[Q[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT"
,
// CEDILLA not found!
"I[Q[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT"
,
// SUP_DIGIT_1 not found!
"I[Q[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT"
,
// SUP_SMALL_O not found!
"I[Q[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT"
,
// GUILLEMET_DBL_RIGHT not found!
"I[Q[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT"
,
// FRAC_1_4 not found!
"I[Q[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT"
,
// FRAC_1_2 not found!
"I[Q[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT"
,
// FRAC_3_4 not found!
"I[Q[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT"
,
// QUESTION_DOWN not found!
"I[MUWU RK[RFY[ RQ[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT"
,
// accent GRAVE_CAP not found!
"I[MUWU RK[RFY[ RQ[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT"
,
// accent ACUTE_CAP not found!
"I[MUWU RK[RFY[ RQ[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT"
,
// accent CIRCUMFLEX_CAP not found!
"I[MUWU RK[RFY[ RQ[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT"
,
// accent TILDE_CAP not found!
"I[MUWU RK[RFY[ RQ[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT"
,
// accent DIAERESIS_CAP not found!
"I[MUWU RK[RFY[ RQ[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT"
,
// accent RING_ABOVE_CAP not found!
"I[Q[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT"
,
// CAPITAL_AE not found!
"H]YYXZU[S[PZNXMVLRLOMKNIPGSFUFXGYH RQ[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT"
,
// accent CEDILLA not found!
"H[MPTP RW[M[MFWF RQ[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT"
,
// accent GRAVE_CAP not found!
"H[MPTP RW[M[MFWF RQ[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT"
,
// accent ACUTE_CAP not found!
"H[MPTP RW[M[MFWF RQ[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT"
,
// accent CURCUMFLEX_CAP not found!
"H[MPTP RW[M[MFWF RQ[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT"
,
// accent DIAERESIS_CAP not found!
"NVR[RF RQ[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT"
,
// accent GRAVE_CAP not found!
"NVR[RF RQ[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT"
,
// accent ACUTE_CAP not found!
"NVR[RF RQ[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT"
,
// accent CURCUMFLEX_CAP not found!
"NVR[RF RQ[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT"
,
// accent DIAERESIS_CAP not found!
"I[Q[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT"
,
// CAPITAL_ETH not found!
"G]L[LFX[XF RQ[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT"
,
// accent TILDE_CAP not found!
"G]P[NZLXKTKMLINGPFTFVGXIYMYTXXVZT[P[ RQ[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT"
,
// accent GRAVE_CAP not found!
"G]P[NZLXKTKMLINGPFTFVGXIYMYTXXVZT[P[ RQ[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT"
,
// accent ACUTE_CAP not found!
"G]P[NZLXKTKMLINGPFTFVGXIYMYTXXVZT[P[ RQ[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT"
,
// accent CIRCUMFLEX_CAP not found!
"G]P[NZLXKTKMLINGPFTFVGXIYMYTXXVZT[P[ RQ[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT"
,
// accent TILDE_CAP not found!
"G]P[NZLXKTKMLINGPFTFVGXIYMYTXXVZT[P[ RQ[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT"
,
// accent DIAERESIS_CAP not found!
"I[Q[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT"
,
// MULTIPLY not found!
"G]P[NZLXKTKMLINGPFTFVGXIYMYTXXVZT[P[ R[DI_"
,
"G]LGLWMYNZP[T[VZWYXWXG RQ[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT"
,
// accent GRAVE_CAP not found!
"G]LGLWMYNZP[T[VZWYXWXG RQ[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT"
,
// accent ACUTE_CAP not found!
"G]LGLWMYNZP[T[VZWYXWXG RQ[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT"
,
// accent CURCUMFLEX_CAP not found!
"G]LGLWMYNZP[T[VZWYXWXG RQ[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT"
,
// accent DIAERESIS_CAP not found!
"I[RQR[ RKFRQYF RQ[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT"
,
// accent ACUTE_CAP not found!
"I[Q[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT"
,
// CAPITAL_THORN not found!
"I[Q[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT"
,
// ESZETT not found!
"I
\\
W[WPVNTMPMNN RWZU[P[NZMXMVNTPSUSWR RPERH"
,
"I
\\
W[WPVNTMPMNN RWZU[P[NZMXMVNTPSUSWR RQ[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT"
,
// accent ACUTE not found!
"I
\\
W[WPVNTMPMNN RWZU[P[NZMXMVNTPSUSWR RNIREVI"
,
"I
\\
W[WPVNTMPMNN RWZU[P[NZMXMVNTPSUSWR RKHLGNFOFQGRHTIUIWHXG"
,
"I
\\
W[WPVNTMPMNN RWZU[P[NZMXMVNTPSUSWR RQ[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT"
,
// accent DIAERESIS not found!
"I
\\
W[WPVNTMPMNN RWZU[P[NZMXMVNTPSUSWR RQ[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT"
,
// accent RING_ABOVE not found!
"I[Q[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT"
,
// SMALL_AE not found!
"I[WZU[Q[OZNYMWMQNOONQMUMWN RQ[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT"
,
// accent CEDILLA not found!
"I[VZT[P[NZMXMPNNPMTMVNWPWRMT RPERH"
,
"I[VZT[P[NZMXMPNNPMTMVNWPWRMT RQ[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT"
,
// accent ACUTE not found!
"I[VZT[P[NZMXMPNNPMTMVNWPWRMT RQ[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT"
,
// accent CURCUMFLEX not found!
"I[VZT[P[NZMXMPNNPMTMVNWPWRMT RQ[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT"
,
// accent DIAERESIS not found!
"NVR[RM RPERH"
,
"NVR[RM RQ[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT"
,
// accent ACUTE not found!
"NVR[RM RQ[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT"
,
// accent CURCUMFLEX not found!
"NVR[RM RQ[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT"
,
// accent DIAERESIS not found!
"I[Q[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT"
,
// SMALL_ETH not found!
"H[MMM[ RW[WQVOUNSMOMMN RKHLGNFOFQGRHTIUIWHXG"
,
"H[P[NZMYLWLQMONNPMSMUNVOWQWWVYUZS[P[ RPERH"
,
"H[P[NZMYLWLQMONNPMSMUNVOWQWWVYUZS[P[ RQ[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT"
,
// accent ACUTE not found!
"H[P[NZMYLWLQMONNPMSMUNVOWQWWVYUZS[P[ RNIREVI"
,
"H[P[NZMYLWLQMONNPMSMUNVOWQWWVYUZS[P[ RKHLGNFOFQGRHTIUIWHXG"
,
"H[P[NZMYLWLQMONNPMSMUNVOWQWWVYUZS[P[ RQ[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT"
,
// accent DIAERESIS not found!
"I[Q[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT"
,
// DIVIDE not found!
"H[P[NZMYLWLQMONNPMSMUNVOWQWWVYUZS[P[ R[DI_"
,
"I
\\
WMW[ RMMMWNYOZQ[U[WZ RPERH"
,
"I
\\
WMW[ RMMMWNYOZQ[U[WZ RQ[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT"
,
// accent ACUTE not found!
"I
\\
WMW[ RMMMWNYOZQ[U[WZ RQ[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT"
,
// accent CURCUMFLEX not found!
"I
\\
WMW[ RMMMWNYOZQ[U[WZ RQ[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT"
,
// accent DIAERESIS not found!
"JZMMR[ RWMR[P`OaMb RQ[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT"
,
// accent ACUTE not found!
"I[Q[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT"
,
// SMALL_THORN not found!
"JZMMR[ RWMR[P`OaMb RQ[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT"
,
// accent DIAERESIS not found!
};
include/pcbstruct.h
View file @
703420ba
...
...
@@ -55,14 +55,14 @@
#define NB_COPPER_LAYERS (LAST_COPPER_LAYER + 1)
#define FIRST_NO_COPPER_LAYER 16
#define ADHESIVE_N_
CU
16
#define ADHESIVE_N_
CMP
17
#define SOLDERPASTE_N_
CU
18
#define SOLDERPASTE_N_
CMP
19
#define SILKSCREEN_N_
CU
20
#define SILKSCREEN_N_
CMP
21
#define SOLDERMASK_N_
CU
22
#define SOLDERMASK_N_
CMP
23
#define ADHESIVE_N_
BACK
16
#define ADHESIVE_N_
FRONT
17
#define SOLDERPASTE_N_
BACK
18
#define SOLDERPASTE_N_
FRONT
19
#define SILKSCREEN_N_
BACK
20
#define SILKSCREEN_N_
FRONT
21
#define SOLDERMASK_N_
BACK
22
#define SOLDERMASK_N_
FRONT
23
#define DRAW_N 24
#define COMMENT_N 25
#define ECO1_N 26
...
...
@@ -90,21 +90,21 @@
#define LAYER_14 (1 << LAYER_N_14) ///< bit mask for layer 14
#define LAYER_15 (1 << LAYER_N_15) ///< bit mask for layer 15
#define LAYER_FRONT (1 << LAYER_N_FRONT) ///< bit mask for component layer
#define ADHESIVE_LAYER_CU (1 << ADHESIVE_N_
CU
)
#define ADHESIVE_LAYER_CMP (1 << ADHESIVE_N_
CMP
)
#define SOLDERPASTE_LAYER_CU (1 << SOLDERPASTE_N_
CU
)
#define SOLDERPASTE_LAYER_CMP (1 << SOLDERPASTE_N_
CMP
)
#define SILKSCREEN_LAYER_CU (1 << SILKSCREEN_N_
CU
)
#define SILKSCREEN_LAYER_CMP (1 << SILKSCREEN_N_
CMP
)
#define SOLDERMASK_LAYER_CU (1 << SOLDERMASK_N_
CU
)
#define SOLDERMASK_LAYER_CMP (1 << SOLDERMASK_N_
CMP
)
#define ADHESIVE_LAYER_CU (1 << ADHESIVE_N_
BACK
)
#define ADHESIVE_LAYER_CMP (1 << ADHESIVE_N_
FRONT
)
#define SOLDERPASTE_LAYER_CU (1 << SOLDERPASTE_N_
BACK
)
#define SOLDERPASTE_LAYER_CMP (1 << SOLDERPASTE_N_
FRONT
)
#define SILKSCREEN_LAYER_CU (1 << SILKSCREEN_N_
BACK
)
#define SILKSCREEN_LAYER_CMP (1 << SILKSCREEN_N_
FRONT
)
#define SOLDERMASK_LAYER_CU (1 << SOLDERMASK_N_
BACK
)
#define SOLDERMASK_LAYER_CMP (1 << SOLDERMASK_N_
FRONT
)
#define DRAW_LAYER (1 << DRAW_N)
#define COMMENT_LAYER (1 << COMMENT_N)
#define ECO1_LAYER (1 << ECO1_N)
#define ECO2_LAYER (1 << ECO2_N)
#define EDGE_LAYER (1 << EDGE_N)
#define FIRST_NON_COPPER_LAYER ADHESIVE_N_
CU
#define FIRST_NON_COPPER_LAYER ADHESIVE_N_
BACK
#define LAST_NON_COPPER_LAYER EDGE_N
// extra bits 0xE0000000
...
...
pcbnew/class_board.cpp
View file @
703420ba
...
...
@@ -225,14 +225,14 @@ wxString BOARD::GetDefaultLayerName( int aLayerNumber )
case
LAYER_N_14
:
txt
=
_
(
"Inner14"
);
break
;
case
LAYER_N_15
:
txt
=
_
(
"Inner15"
);
break
;
case
LAYER_N_BACK
:
txt
=
_
(
"Back"
);
break
;
case
ADHESIVE_N_
CU
:
txt
=
_
(
"Adhes_Back"
);
break
;
case
ADHESIVE_N_
CMP
:
txt
=
_
(
"Adhes_Front"
);
break
;
case
SOLDERPASTE_N_
CU
:
txt
=
_
(
"SoldP_Back"
);
break
;
case
SOLDERPASTE_N_
CMP
:
txt
=
_
(
"SoldP_Front"
);
break
;
case
SILKSCREEN_N_
CU
:
txt
=
_
(
"SilkS_Back"
);
break
;
case
SILKSCREEN_N_
CMP
:
txt
=
_
(
"SilkS_Front"
);
break
;
case
SOLDERMASK_N_
CU
:
txt
=
_
(
"Mask_Back"
);
break
;
case
SOLDERMASK_N_
CMP
:
txt
=
_
(
"Mask_Front"
);
break
;
case
ADHESIVE_N_
BACK
:
txt
=
_
(
"Adhes_Back"
);
break
;
case
ADHESIVE_N_
FRONT
:
txt
=
_
(
"Adhes_Front"
);
break
;
case
SOLDERPASTE_N_
BACK
:
txt
=
_
(
"SoldP_Back"
);
break
;
case
SOLDERPASTE_N_
FRONT
:
txt
=
_
(
"SoldP_Front"
);
break
;
case
SILKSCREEN_N_
BACK
:
txt
=
_
(
"SilkS_Back"
);
break
;
case
SILKSCREEN_N_
FRONT
:
txt
=
_
(
"SilkS_Front"
);
break
;
case
SOLDERMASK_N_
BACK
:
txt
=
_
(
"Mask_Back"
);
break
;
case
SOLDERMASK_N_
FRONT
:
txt
=
_
(
"Mask_Front"
);
break
;
case
DRAW_N
:
txt
=
_
(
"Drawings"
);
break
;
case
COMMENT_N
:
txt
=
_
(
"Comments"
);
break
;
case
ECO1_N
:
txt
=
_
(
"Eco1"
);
break
;
...
...
pcbnew/class_edge_mod.cpp
View file @
703420ba
...
...
@@ -489,7 +489,7 @@ int EDGE_MODULE::ReadDescr( char* Line, FILE* File,
// can use the copper layers m_Layer < FIRST_NON_COPPER_LAYER is allowed.
// @todo: changes use of EDGE_MODULE these footprints and allows only m_Layer >= FIRST_NON_COPPER_LAYER
if
(
(
m_Layer
<
0
)
||
(
m_Layer
>
LAST_NON_COPPER_LAYER
)
)
m_Layer
=
SILKSCREEN_N_
CMP
;
m_Layer
=
SILKSCREEN_N_
FRONT
;
return
error
;
}
...
...
pcbnew/class_module_transform_functions.cpp
View file @
703420ba
...
...
@@ -31,36 +31,36 @@ int ChangeSideNumLayer( int oldlayer )
newlayer
=
LAYER_N_BACK
;
break
;
case
SILKSCREEN_N_
CU
:
newlayer
=
SILKSCREEN_N_
CMP
;
case
SILKSCREEN_N_
BACK
:
newlayer
=
SILKSCREEN_N_
FRONT
;
break
;
case
SILKSCREEN_N_
CMP
:
newlayer
=
SILKSCREEN_N_
CU
;
case
SILKSCREEN_N_
FRONT
:
newlayer
=
SILKSCREEN_N_
BACK
;
break
;
case
ADHESIVE_N_
CU
:
newlayer
=
ADHESIVE_N_
CMP
;
case
ADHESIVE_N_
BACK
:
newlayer
=
ADHESIVE_N_
FRONT
;
break
;
case
ADHESIVE_N_
CMP
:
newlayer
=
ADHESIVE_N_
CU
;
case
ADHESIVE_N_
FRONT
:
newlayer
=
ADHESIVE_N_
BACK
;
break
;
case
SOLDERMASK_N_
CU
:
newlayer
=
SOLDERMASK_N_
CMP
;
case
SOLDERMASK_N_
BACK
:
newlayer
=
SOLDERMASK_N_
FRONT
;
break
;
case
SOLDERMASK_N_
CMP
:
newlayer
=
SOLDERMASK_N_
CU
;
case
SOLDERMASK_N_
FRONT
:
newlayer
=
SOLDERMASK_N_
BACK
;
break
;
case
SOLDERPASTE_N_
CU
:
newlayer
=
SOLDERPASTE_N_
CMP
;
case
SOLDERPASTE_N_
BACK
:
newlayer
=
SOLDERPASTE_N_
FRONT
;
break
;
case
SOLDERPASTE_N_
CMP
:
newlayer
=
SOLDERPASTE_N_
CU
;
case
SOLDERPASTE_N_
FRONT
:
newlayer
=
SOLDERPASTE_N_
BACK
;
break
;
default:
...
...
@@ -199,13 +199,13 @@ void MODULE::Flip(const wxPoint& aCentre )
pt_texte
->
SetLayer
(
ChangeSideNumLayer
(
pt_texte
->
GetLayer
()
)
);
if
(
GetLayer
()
==
LAYER_N_BACK
)
pt_texte
->
SetLayer
(
SILKSCREEN_N_
CU
);
pt_texte
->
SetLayer
(
SILKSCREEN_N_
BACK
);
if
(
GetLayer
()
==
LAYER_N_FRONT
)
pt_texte
->
SetLayer
(
SILKSCREEN_N_
CMP
);
pt_texte
->
SetLayer
(
SILKSCREEN_N_
FRONT
);
if
(
(
GetLayer
()
==
SILKSCREEN_N_
CU
)
||
(
GetLayer
()
==
ADHESIVE_N_
CU
)
||
(
GetLayer
()
==
LAYER_N_BACK
)
)
if
(
(
GetLayer
()
==
SILKSCREEN_N_
BACK
)
||
(
GetLayer
()
==
ADHESIVE_N_
BACK
)
||
(
GetLayer
()
==
LAYER_N_BACK
)
)
pt_texte
->
m_Mirror
=
true
;
/* Mirror value. */
...
...
@@ -220,13 +220,13 @@ void MODULE::Flip(const wxPoint& aCentre )
pt_texte
->
SetLayer
(
ChangeSideNumLayer
(
pt_texte
->
GetLayer
()
)
);
if
(
GetLayer
()
==
LAYER_N_BACK
)
pt_texte
->
SetLayer
(
SILKSCREEN_N_
CU
);
pt_texte
->
SetLayer
(
SILKSCREEN_N_
BACK
);
if
(
GetLayer
()
==
LAYER_N_FRONT
)
pt_texte
->
SetLayer
(
SILKSCREEN_N_
CMP
);
pt_texte
->
SetLayer
(
SILKSCREEN_N_
FRONT
);
if
(
(
GetLayer
()
==
SILKSCREEN_N_
CU
)
||
(
GetLayer
()
==
ADHESIVE_N_
CU
)
||
(
GetLayer
()
==
LAYER_N_BACK
)
)
if
(
(
GetLayer
()
==
SILKSCREEN_N_
BACK
)
||
(
GetLayer
()
==
ADHESIVE_N_
BACK
)
||
(
GetLayer
()
==
LAYER_N_BACK
)
)
pt_texte
->
m_Mirror
=
true
;
/* Reverse mirror footprints. */
...
...
@@ -267,13 +267,13 @@ void MODULE::Flip(const wxPoint& aCentre )
pt_texte
->
SetLayer
(
ChangeSideNumLayer
(
pt_texte
->
GetLayer
()
)
);
if
(
GetLayer
()
==
LAYER_N_BACK
)
pt_texte
->
SetLayer
(
SILKSCREEN_N_
CU
);
pt_texte
->
SetLayer
(
SILKSCREEN_N_
BACK
);
if
(
GetLayer
()
==
LAYER_N_FRONT
)
pt_texte
->
SetLayer
(
SILKSCREEN_N_
CMP
);
pt_texte
->
SetLayer
(
SILKSCREEN_N_
FRONT
);
if
(
GetLayer
()
==
SILKSCREEN_N_
CU
||
GetLayer
()
==
ADHESIVE_N_
CU
if
(
GetLayer
()
==
SILKSCREEN_N_
BACK
||
GetLayer
()
==
ADHESIVE_N_
BACK
||
GetLayer
()
==
LAYER_N_BACK
)
{
pt_texte
->
m_Mirror
=
true
;
...
...
pcbnew/class_pad.cpp
View file @
703420ba
...
...
@@ -585,35 +585,35 @@ void D_PAD::DisplayInfo( WinEDA_DrawFrame* frame )
switch
(
m_Masque_Layer
&
~
ALL_CU_LAYERS
)
{
case
ADHESIVE_LAYER_CU
:
layerInfo
=
board
->
GetLayerName
(
ADHESIVE_N_
CU
);
layerInfo
=
board
->
GetLayerName
(
ADHESIVE_N_
BACK
);
break
;
case
ADHESIVE_LAYER_CMP
:
layerInfo
=
board
->
GetLayerName
(
ADHESIVE_N_
CMP
);
layerInfo
=
board
->
GetLayerName
(
ADHESIVE_N_
FRONT
);
break
;
case
SOLDERPASTE_LAYER_CU
:
layerInfo
=
board
->
GetLayerName
(
SOLDERPASTE_N_
CU
);
layerInfo
=
board
->
GetLayerName
(
SOLDERPASTE_N_
BACK
);
break
;
case
SOLDERPASTE_LAYER_CMP
:
layerInfo
=
board
->
GetLayerName
(
SOLDERPASTE_N_
CMP
);
layerInfo
=
board
->
GetLayerName
(
SOLDERPASTE_N_
FRONT
);
break
;
case
SILKSCREEN_LAYER_CU
:
layerInfo
=
board
->
GetLayerName
(
SILKSCREEN_N_
CU
);
layerInfo
=
board
->
GetLayerName
(
SILKSCREEN_N_
BACK
);
break
;
case
SILKSCREEN_LAYER_CMP
:
layerInfo
=
board
->
GetLayerName
(
SILKSCREEN_N_
CMP
);
layerInfo
=
board
->
GetLayerName
(
SILKSCREEN_N_
FRONT
);
break
;
case
SOLDERMASK_LAYER_CU
:
layerInfo
=
board
->
GetLayerName
(
SOLDERMASK_N_
CU
);
layerInfo
=
board
->
GetLayerName
(
SOLDERMASK_N_
BACK
);
break
;
case
SOLDERMASK_LAYER_CMP
:
layerInfo
=
board
->
GetLayerName
(
SOLDERMASK_N_
CMP
);
layerInfo
=
board
->
GetLayerName
(
SOLDERMASK_N_
FRONT
);
break
;
case
DRAW_LAYER
:
...
...
pcbnew/class_pad_draw_functions.cpp
View file @
703420ba
...
...
@@ -61,35 +61,35 @@ void D_PAD::Draw( WinEDA_DrawPanel* panel, wxDC* DC, int draw_mode,
switch
(
m_Masque_Layer
&
~
ALL_CU_LAYERS
)
{
case
ADHESIVE_LAYER_CU
:
color
=
g_DesignSettings
.
m_LayerColor
[
ADHESIVE_N_
CU
];
color
=
g_DesignSettings
.
m_LayerColor
[
ADHESIVE_N_
BACK
];
break
;
case
ADHESIVE_LAYER_CMP
:
color
=
g_DesignSettings
.
m_LayerColor
[
ADHESIVE_N_
CMP
];
color
=
g_DesignSettings
.
m_LayerColor
[
ADHESIVE_N_
FRONT
];
break
;
case
SOLDERPASTE_LAYER_CU
:
color
=
g_DesignSettings
.
m_LayerColor
[
SOLDERPASTE_N_
CU
];
color
=
g_DesignSettings
.
m_LayerColor
[
SOLDERPASTE_N_
BACK
];
break
;
case
SOLDERPASTE_LAYER_CMP
:
color
=
g_DesignSettings
.
m_LayerColor
[
SOLDERPASTE_N_
CMP
];
color
=
g_DesignSettings
.
m_LayerColor
[
SOLDERPASTE_N_
FRONT
];
break
;
case
SILKSCREEN_LAYER_CU
:
color
=
g_DesignSettings
.
m_LayerColor
[
SILKSCREEN_N_
CU
];
color
=
g_DesignSettings
.
m_LayerColor
[
SILKSCREEN_N_
BACK
];
break
;
case
SILKSCREEN_LAYER_CMP
:
color
=
g_DesignSettings
.
m_LayerColor
[
SILKSCREEN_N_
CMP
];
color
=
g_DesignSettings
.
m_LayerColor
[
SILKSCREEN_N_
FRONT
];
break
;
case
SOLDERMASK_LAYER_CU
:
color
=
g_DesignSettings
.
m_LayerColor
[
SOLDERMASK_N_
CU
];
color
=
g_DesignSettings
.
m_LayerColor
[
SOLDERMASK_N_
BACK
];
break
;
case
SOLDERMASK_LAYER_CMP
:
color
=
g_DesignSettings
.
m_LayerColor
[
SOLDERMASK_N_
CMP
];
color
=
g_DesignSettings
.
m_LayerColor
[
SOLDERMASK_N_
FRONT
];
break
;
case
DRAW_LAYER
:
...
...
@@ -180,13 +180,13 @@ void D_PAD::Draw( WinEDA_DrawPanel* panel, wxDC* DC, int draw_mode,
// layer shows the pad size with the mask clearance
switch
(
screen
->
m_Active_Layer
)
{
case
SOLDERMASK_N_
CU
:
case
SOLDERMASK_N_
CMP
:
case
SOLDERMASK_N_
BACK
:
case
SOLDERMASK_N_
FRONT
:
mask_margin
.
x
=
mask_margin
.
y
=
GetSolderMaskMargin
();
break
;
case
SOLDERPASTE_N_
CU
:
case
SOLDERPASTE_N_
CMP
:
case
SOLDERPASTE_N_
BACK
:
case
SOLDERPASTE_N_
FRONT
:
mask_margin
=
GetSolderPasteMargin
();
break
;
...
...
pcbnew/class_text_mod.cpp
View file @
703420ba
...
...
@@ -31,7 +31,7 @@ TEXTE_MODULE::TEXTE_MODULE( MODULE* parent, int text_type ) :
m_Size
.
x
=
m_Size
.
y
=
400
;
m_Width
=
120
;
/* Set default dimension to a reasonable value. */
SetLayer
(
SILKSCREEN_N_
CMP
);
SetLayer
(
SILKSCREEN_N_
FRONT
);
if
(
Module
&&
(
Module
->
Type
()
==
TYPE_MODULE
)
)
{
m_Pos
=
Module
->
m_Pos
;
...
...
@@ -39,14 +39,14 @@ TEXTE_MODULE::TEXTE_MODULE( MODULE* parent, int text_type ) :
int
moduleLayer
=
Module
->
GetLayer
();
if
(
moduleLayer
==
LAYER_N_BACK
)
SetLayer
(
SILKSCREEN_N_
CU
);
SetLayer
(
SILKSCREEN_N_
BACK
);
else
if
(
moduleLayer
==
LAYER_N_FRONT
)
SetLayer
(
SILKSCREEN_N_
CMP
);
SetLayer
(
SILKSCREEN_N_
FRONT
);
else
SetLayer
(
moduleLayer
);
if
(
moduleLayer
==
SILKSCREEN_N_
CU
||
moduleLayer
==
ADHESIVE_N_
CU
if
(
moduleLayer
==
SILKSCREEN_N_
BACK
||
moduleLayer
==
ADHESIVE_N_
BACK
||
moduleLayer
==
LAYER_N_BACK
)
{
m_Mirror
=
true
;
...
...
@@ -106,7 +106,7 @@ int TEXTE_MODULE::ReadDescr( char* aLine, FILE* aFile, int* aLineNum )
int
layer
;
char
BufCar1
[
128
],
BufCar2
[
128
],
BufCar3
[
128
],
BufLine
[
256
];
layer
=
SILKSCREEN_N_
CMP
;
layer
=
SILKSCREEN_N_
FRONT
;
BufCar1
[
0
]
=
0
;
BufCar2
[
0
]
=
0
;
BufCar3
[
0
]
=
0
;
...
...
@@ -145,9 +145,9 @@ int TEXTE_MODULE::ReadDescr( char* aLine, FILE* aFile, int* aLineNum )
if
(
layer
>
LAST_NO_COPPER_LAYER
)
layer
=
LAST_NO_COPPER_LAYER
;
if
(
layer
==
LAYER_N_BACK
)
layer
=
SILKSCREEN_N_
CU
;
layer
=
SILKSCREEN_N_
BACK
;
else
if
(
layer
==
LAYER_N_FRONT
)
layer
=
SILKSCREEN_N_
CMP
;
layer
=
SILKSCREEN_N_
FRONT
;
SetLayer
(
layer
);
...
...
@@ -501,12 +501,12 @@ bool TEXTE_MODULE::IsOnLayer( int aLayer ) const
if
(
aLayer
==
LAYER_N_BACK
)
{
if
(
m_Layer
==
ADHESIVE_N_
CU
||
m_Layer
==
SILKSCREEN_N_CU
)
if
(
m_Layer
==
ADHESIVE_N_
BACK
||
m_Layer
==
SILKSCREEN_N_BACK
)
return
true
;
}
else
if
(
aLayer
==
LAYER_N_FRONT
)
{
if
(
m_Layer
==
ADHESIVE_N_
CMP
||
m_Layer
==
SILKSCREEN_N_CMP
)
if
(
m_Layer
==
ADHESIVE_N_
FRONT
||
m_Layer
==
SILKSCREEN_N_FRONT
)
return
true
;
}
...
...
pcbnew/dialog_layers_setup.cpp
View file @
703420ba
...
...
@@ -201,10 +201,10 @@ CTLs DIALOG_LAYERS_SETUP::getCTLs( int aLayerNumber )
switch
(
aLayerNumber
)
{
case
ADHESIVE_N_
CMP
:
RETAUX
(
m_AdhesFront
);
case
SOLDERPASTE_N_
CMP
:
RETAUX
(
m_SoldPFront
);
case
SILKSCREEN_N_
CMP
:
RETAUX
(
m_SilkSFront
);
case
SOLDERMASK_N_
CMP
:
RETAUX
(
m_MaskFront
);
case
ADHESIVE_N_
FRONT
:
RETAUX
(
m_AdhesFront
);
case
SOLDERPASTE_N_
FRONT
:
RETAUX
(
m_SoldPFront
);
case
SILKSCREEN_N_
FRONT
:
RETAUX
(
m_SilkSFront
);
case
SOLDERMASK_N_
FRONT
:
RETAUX
(
m_MaskFront
);
case
LAYER_N_FRONT
:
RETCOP
(
m_Front
);
case
LAYER_N_2
:
RETCOP
(
m_Inner2
);
case
LAYER_N_3
:
RETCOP
(
m_Inner3
);
...
...
@@ -221,10 +221,10 @@ CTLs DIALOG_LAYERS_SETUP::getCTLs( int aLayerNumber )
case
LAYER_N_14
:
RETCOP
(
m_Inner14
);
case
LAYER_N_15
:
RETCOP
(
m_Inner15
);
case
LAYER_N_BACK
:
RETCOP
(
m_Back
);
case
SOLDERMASK_N_
CU
:
RETAUX
(
m_MaskBack
);
case
SILKSCREEN_N_
CU
:
RETAUX
(
m_SilkSBack
);
case
SOLDERPASTE_N_
CU
:
RETAUX
(
m_SoldPBack
);
case
ADHESIVE_N_
CU
:
RETAUX
(
m_AdhesBack
);
case
SOLDERMASK_N_
BACK
:
RETAUX
(
m_MaskBack
);
case
SILKSCREEN_N_
BACK
:
RETAUX
(
m_SilkSBack
);
case
SOLDERPASTE_N_
BACK
:
RETAUX
(
m_SoldPBack
);
case
ADHESIVE_N_
BACK
:
RETAUX
(
m_AdhesBack
);
case
EDGE_N
:
RETAUX
(
m_PCBEdges
);
case
ECO2_N
:
RETAUX
(
m_Eco2
);
case
ECO1_N
:
RETAUX
(
m_Eco1
);
...
...
pcbnew/edgemod.cpp
View file @
703420ba
...
...
@@ -158,7 +158,7 @@ void WinEDA_ModuleEditFrame::Edit_Edge_Width( EDGE_MODULE* Edge )
void
WinEDA_ModuleEditFrame
::
Edit_Edge_Layer
(
EDGE_MODULE
*
Edge
)
{
MODULE
*
Module
=
GetBoard
()
->
m_Modules
;
int
new_layer
=
SILKSCREEN_N_
CMP
;
int
new_layer
=
SILKSCREEN_N_
FRONT
;
if
(
Edge
!=
NULL
)
new_layer
=
Edge
->
GetLayer
();
...
...
@@ -331,9 +331,9 @@ EDGE_MODULE* WinEDA_ModuleEditFrame::Begin_Edge_Module( EDGE_MODULE* Edge,
Edge
->
SetLayer
(
module
->
GetLayer
()
);
if
(
module
->
GetLayer
()
==
LAYER_N_FRONT
)
Edge
->
SetLayer
(
SILKSCREEN_N_
CMP
);
Edge
->
SetLayer
(
SILKSCREEN_N_
FRONT
);
if
(
module
->
GetLayer
()
==
LAYER_N_BACK
)
Edge
->
SetLayer
(
SILKSCREEN_N_
CU
);
Edge
->
SetLayer
(
SILKSCREEN_N_
BACK
);
/* Initialise the starting point of the new segment or arc */
Edge
->
m_Start
=
GetScreen
()
->
m_Curseur
;
...
...
pcbnew/export_gencad.cpp
View file @
703420ba
...
...
@@ -440,7 +440,7 @@ void CreateComponentsSection( FILE* file, BOARD* pcb )
for
(
ii
=
0
;
ii
<
2
;
ii
++
)
{
int
orient
=
PtTexte
->
m_Orient
;
wxString
layer
=
GenCAD_Layer_Name
[
SILKSCREEN_N_
CMP
];
wxString
layer
=
GenCAD_Layer_Name
[
SILKSCREEN_N_
FRONT
];
fprintf
(
file
,
"TEXT %d %d %d %d.%d %s %s
\"
%s
\"
"
,
PtTexte
->
m_Pos0
.
x
,
-
PtTexte
->
m_Pos0
.
y
,
PtTexte
->
m_Size
.
x
,
...
...
pcbnew/gpcb_exchange.cpp
View file @
703420ba
...
...
@@ -247,7 +247,7 @@ bool MODULE::Read_GPCB_Descr( const wxString& CmpFullFileName )
if
(
params
[
0
].
CmpNoCase
(
wxT
(
"ElementLine"
)
)
==
0
)
// line descr
{
// Format: ElementLine [X1 Y1 X2 Y2 Thickness]
DrawSegm
=
new
EDGE_MODULE
(
this
);
DrawSegm
->
SetLayer
(
SILKSCREEN_N_
CMP
);
DrawSegm
->
SetLayer
(
SILKSCREEN_N_
FRONT
);
DrawSegm
->
m_Shape
=
S_SEGMENT
;
m_Drawings
.
PushBack
(
DrawSegm
);
...
...
@@ -276,7 +276,7 @@ bool MODULE::Read_GPCB_Descr( const wxString& CmpFullFileName )
{
// format: ElementArc [X Y Width Height StartAngle DeltaAngle Thickness]
// pcbnew does know ellipse so we must have Width = Height
DrawSegm
=
new
EDGE_MODULE
(
this
);
DrawSegm
->
SetLayer
(
SILKSCREEN_N_
CMP
);
DrawSegm
->
SetLayer
(
SILKSCREEN_N_
FRONT
);
DrawSegm
->
m_Shape
=
S_ARC
;
m_Drawings
.
PushBack
(
DrawSegm
);
...
...
pcbnew/locate.cpp
View file @
703420ba
...
...
@@ -240,10 +240,10 @@ MODULE* Locate_Prefered_Module( BOARD* Pcb, int typeloc )
*/
layer
=
pt_module
->
GetLayer
();
if
(
layer
==
ADHESIVE_N_
CU
||
layer
==
SILKSCREEN_N_CU
)
if
(
layer
==
ADHESIVE_N_
BACK
||
layer
==
SILKSCREEN_N_BACK
)
layer
=
LAYER_N_BACK
;
else
if
(
layer
==
ADHESIVE_N_
CMP
||
layer
==
SILKSCREEN_N_CMP
)
else
if
(
layer
==
ADHESIVE_N_
FRONT
||
layer
==
SILKSCREEN_N_FRONT
)
layer
=
LAYER_N_FRONT
;
/* Test of minimum size to choosing the best candidate. */
...
...
pcbnew/plot_rtn.cpp
View file @
703420ba
...
...
@@ -757,14 +757,14 @@ void WinEDA_BasePcbFrame::Plot_Layer( PLOTTER* plotter, int Layer,
}
break
;
case
SOLDERMASK_N_
CU
:
case
SOLDERMASK_N_
CMP
:
case
SOLDERMASK_N_
BACK
:
case
SOLDERMASK_N_
FRONT
:
Plot_Standard_Layer
(
plotter
,
layer_mask
,
g_pcb_plot_options
.
DrawViaOnMaskLayer
,
trace_mode
);
break
;
case
SOLDERPASTE_N_
CU
:
case
SOLDERPASTE_N_
CMP
:
case
SOLDERPASTE_N_
BACK
:
case
SOLDERPASTE_N_
FRONT
:
Plot_Standard_Layer
(
plotter
,
layer_mask
,
false
,
trace_mode
);
break
;
...
...
pcbnew/set_color.cpp
View file @
703420ba
...
...
@@ -241,6 +241,7 @@ void WinEDA_SetColorsFrame::CreateControls()
{
case
type_layer
:
CheckBox
->
SetValue
(
g_DesignSettings
.
IsLayerVisible
(
laytool_list
[
lyr
]
->
m_LayerNumber
));
CheckBox
->
Enable
(
g_DesignSettings
.
IsLayerEnabled
(
laytool_list
[
lyr
]
->
m_LayerNumber
)
);
break
;
case
type_via
:
...
...
@@ -379,24 +380,6 @@ bool WinEDA_SetColorsFrame::ShowToolTips()
}
/**********************************************************/
wxBitmap
WinEDA_SetColorsFrame
::
GetBitmapResource
(
const
wxString
&
name
)
/**********************************************************/
{
wxUnusedVar
(
name
);
return
wxNullBitmap
;
}
/**********************************************************/
wxIcon
WinEDA_SetColorsFrame
::
GetIconResource
(
const
wxString
&
name
)
/**********************************************************/
{
wxUnusedVar
(
name
);
return
wxNullIcon
;
}
/**********************************************************************/
void
WinEDA_SetColorsFrame
::
OnOkClick
(
wxCommandEvent
&
WXUNUSED
(
event
)
)
/**********************************************************************/
...
...
@@ -508,6 +491,8 @@ void WinEDA_SetColorsFrame::ResetDisplayLayersCu( wxCommandEvent& event )
for
(
int
lyr
=
0
;
lyr
<
16
;
lyr
++
)
{
if
(
!
laytool_list
[
lyr
]
->
m_CheckBox
->
IsEnabled
()
)
continue
;
laytool_list
[
lyr
]
->
m_CheckBox
->
SetValue
(
NewState
);
}
}
pcbnew/set_color.h
View file @
703420ba
...
...
@@ -229,64 +229,64 @@ static ColorButton Layer_17_Butt =
{
type_layer
,
// Toggle ITEM_NOT_SHOW bit of the color variable
wxEmptyString
,
ADHESIVE_N_
CU
,
// Layer
ADR
(
ADHESIVE_N_
CU
)
// Address of optional parameter
ADHESIVE_N_
BACK
,
// Layer
ADR
(
ADHESIVE_N_
BACK
)
// Address of optional parameter
};
static
ColorButton
Layer_18_Butt
=
{
type_layer
,
// Toggle ITEM_NOT_SHOW bit of the color variable
wxEmptyString
,
ADHESIVE_N_
CMP
,
// Layer
ADR
(
ADHESIVE_N_
CMP
)
// Address of optional parameter
ADHESIVE_N_
FRONT
,
// Layer
ADR
(
ADHESIVE_N_
FRONT
)
// Address of optional parameter
};
static
ColorButton
Layer_19_Butt
=
{
type_layer
,
// Toggle ITEM_NOT_SHOW bit of the color variable
wxEmptyString
,
SOLDERPASTE_N_
CU
,
// Layer
ADR
(
SOLDERPASTE_N_
CU
)
// Address of optional parameter
SOLDERPASTE_N_
BACK
,
// Layer
ADR
(
SOLDERPASTE_N_
BACK
)
// Address of optional parameter
};
static
ColorButton
Layer_20_Butt
=
{
type_layer
,
// Toggle ITEM_NOT_SHOW bit of the color variable
wxEmptyString
,
SOLDERPASTE_N_
CMP
,
// Layer
ADR
(
SOLDERPASTE_N_
CMP
),
// Address of optional parameter
SOLDERPASTE_N_
FRONT
,
// Layer
ADR
(
SOLDERPASTE_N_
FRONT
),
// Address of optional parameter
};
static
ColorButton
Layer_21_Butt
=
{
type_layer
,
// Toggle ITEM_NOT_SHOW bit of the color variable
wxEmptyString
,
SILKSCREEN_N_
CU
,
// Layer
ADR
(
SILKSCREEN_N_
CU
)
// Address of optional parameter
SILKSCREEN_N_
BACK
,
// Layer
ADR
(
SILKSCREEN_N_
BACK
)
// Address of optional parameter
};
static
ColorButton
Layer_22_Butt
=
{
type_layer
,
// Toggle ITEM_NOT_SHOW bit of the color variable
wxEmptyString
,
SILKSCREEN_N_
CMP
,
// Layer
ADR
(
SILKSCREEN_N_
CMP
)
// Address of optional parameter
SILKSCREEN_N_
FRONT
,
// Layer
ADR
(
SILKSCREEN_N_
FRONT
)
// Address of optional parameter
};
static
ColorButton
Layer_23_Butt
=
{
type_layer
,
// Toggle ITEM_NOT_SHOW bit of the color variable
wxEmptyString
,
SOLDERMASK_N_
CU
,
// Layer
ADR
(
SOLDERMASK_N_
CU
)
// Address of optional parameter
SOLDERMASK_N_
BACK
,
// Layer
ADR
(
SOLDERMASK_N_
BACK
)
// Address of optional parameter
};
static
ColorButton
Layer_24_Butt
=
{
type_layer
,
// Toggle ITEM_NOT_SHOW bit of the color variable
wxEmptyString
,
SOLDERMASK_N_
CMP
,
// Layer
ADR
(
SOLDERMASK_N_
CMP
)
// Address of optional parameter
SOLDERMASK_N_
FRONT
,
// Layer
ADR
(
SOLDERMASK_N_
FRONT
)
// Address of optional parameter
};
static
ColorButton
Layer_25_Butt
=
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment