changed layer constants XXX_CU and XXXX_CMP to XXX_BACK and XXX_FRONT
This commit is contained in:
charras
parent
bd5018ddbf
commit
703420baac
|
|
@ -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;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,102 +1,232 @@
|
|||
/* Automatically converted font */
|
||||
|
||||
/* Hershey Simplex Roman (sans) definition
|
||||
* First shape has unicode (or ascii) value 0x20 (space)
|
||||
*/
|
||||
const static char* hershey_simplex[] =
|
||||
{
|
||||
"JZ",
|
||||
"MWRFRT RRYQZR[SZRY",
|
||||
"JZNFNM 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",
|
||||
"MWRHQGRFSGSIRKQL",
|
||||
"KYVBTDRGPKOPOTPYR]T`Vb",
|
||||
"KYNBPDRGTKUPUTTYR]P`Nb",
|
||||
"JZRFRR RMIWO RWIMO",
|
||||
"E_RIR[ RIR[R",
|
||||
"MWSZR[QZRYSZS\\R^Q_",
|
||||
"E_IR[R",
|
||||
"MWRYQZR[SZRY",
|
||||
"G][BIb",
|
||||
"H\\QFNGLJKOKRLWNZQ[S[VZXWYRYOXJVGSFQF",
|
||||
"H\\NJPISFS[",
|
||||
"H\\LKLJMHNGPFTFVGWHXJXLWNUQK[Y[",
|
||||
"H\\MFXFRNUNWOXPYSYUXXVZS[P[MZLYKW",
|
||||
"H\\UFKTZT RUFU[",
|
||||
"H\\WFMFLOMNPMSMVNXPYSYUXXVZS[P[MZLYKW",
|
||||
"H\\XIWGTFRFOGMJLOLTMXOZR[S[VZXXYUYTXQVOSNRNOOMQLT",
|
||||
"H\\YFO[ RKFYF",
|
||||
"H\\PFMGLILKMMONSOVPXRYTYWXYWZT[P[MZLYKWKTLRNPQOUNWMXKXIWGTFPF",
|
||||
"H\\XMWPURRSQSNRLPKMKLLINGQFRFUGWIXMXRWWUZR[P[MZLX",
|
||||
"MWRMQNROSNRM RRYQZR[SZRY",
|
||||
"MWRMQNROSNRM RSZR[QZRYSZS\\R^Q_",
|
||||
"F^ZIJRZ[",
|
||||
"E_IO[O RIU[U",
|
||||
"F^JIZRJ[",
|
||||
"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[",
|
||||
"HZLFL[ RLFYF RLPTP",
|
||||
"H]ZKYIWGUFQFOGMILKKNKSLVMXOZQ[U[WZYXZVZS RUSZS",
|
||||
"G]KFK[ RYFY[ RKPYP",
|
||||
"NVRFR[",
|
||||
"JZVFVVUYTZR[P[NZMYLVLT",
|
||||
"G\\KFK[ RYFKT RPOY[",
|
||||
"HYLFL[ RL[X[",
|
||||
"F^JFJ[ RJFR[ RZFR[ RZFZ[",
|
||||
"G]KFK[ RKFY[ RYFY[",
|
||||
"G]PFNGLIKKJNJSKVLXNZP[T[VZXXYVZSZNYKXIVGTFPF",
|
||||
"G\\KFK[ RKFTFWGXHYJYMXOWPTQKQ",
|
||||
"G]PFNGLIKKJNJSKVLXNZP[T[VZXXYVZSZNYKXIVGTFPF RSWY]",
|
||||
"G\\KFK[ RKFTFWGXHYJYLXNWOTPKP RRPY[",
|
||||
"H\\YIWGTFPFMGKIKKLMMNOOUQWRXSYUYXWZT[P[MZKX",
|
||||
"JZRFR[ RKFYF",
|
||||
"G]KFKULXNZQ[S[VZXXYUYF",
|
||||
"I[JFR[ RZFR[",
|
||||
"F^HFM[ RRFM[ RRFW[ R\\FW[",
|
||||
"H\\KFY[ RYFK[",
|
||||
"I[JFRPR[ RZFRP",
|
||||
"H\\YFK[ RKFYF RK[Y[",
|
||||
"KYOBOb RPBPb ROBVB RObVb",
|
||||
"KYKFY^",
|
||||
"KYTBTb RUBUb RNBUB RNbUb",
|
||||
"JZPLRITL RMORJWO RRJR[",
|
||||
"JZ", // ' '
|
||||
"MWRFRT RQZR[Q[QZRZR[",
|
||||
"JZNFNL RVFVL",
|
||||
"H]LM[M RRDL_ RYVJV RS_YD",
|
||||
"H\\RDR] RLZO[T[VZWYXWXUWSVRTQPPNOMNLLLJMHNGPFUFXG",
|
||||
"F^J[ZF RMFOGPIOKMLKKJIKGMF RYZZXYVWUUVTXUZW[YZ",
|
||||
"E_[[Z[XZUWPQNNMKMINGPFQFSGTITJSLRMLQKRJTJWKYLZN[Q[SZTYWUXRXP",
|
||||
"MWRFRL",
|
||||
"KYVbUaS^R\\QYPTPPQKRHSFUCVB",
|
||||
"KYNbOaQ^R\\SYTTTPSKRHQFOCNB",
|
||||
"JZRFRK RMIRKWI ROORKUO",
|
||||
"E_JQZQ RRYRI",
|
||||
"MWRZR\\Q^P_",
|
||||
"E_JQZQ",
|
||||
"MWQZR[Q[QZRZR[",
|
||||
"G][DI_",
|
||||
"H\\QFSFUGVHWJXNXSWWVYUZS[Q[OZNYMWLSLNMJNHOGQF",
|
||||
"H\\N[W[ RS[SFQIOKML",
|
||||
"H\\LHMGOFTFVGWHXJXLWOK[X[",
|
||||
"H\\KFXFQNTNVOWPXRXWWYVZT[N[LZKY",
|
||||
"H\\VMV[ RQELTYT",
|
||||
"H\\WFMFLPMOONTNVOWPXRXWWYVZT[O[MZLY",
|
||||
"H\\VFRFPGOHMKLOLWMYNZP[T[VZWYXWXRWPVOTNPNNOMPLR",
|
||||
"H\\KFYFP[",
|
||||
"H\\PONNMMLKLJMHNGPFTFVGWHXJXKWMVNTOPONPMQLSLWMYNZP[T[VZWYXWXSWQVPTO",
|
||||
"H\\N[R[TZUYWVXRXJWHVGTFPFNGMHLJLOMQNRPSTSVRWQXO",
|
||||
"MWQZR[Q[QZRZR[ RQNROQOQNRNRO",
|
||||
"MWRZR\\Q^P_ RQNROQOQNRNRO",
|
||||
"F^YWJQYK",
|
||||
"E_JNZN RZTJT",
|
||||
"F^JWYQJK",
|
||||
"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",
|
||||
"HZMPTP RTPMP RM[MFWF",
|
||||
"H]XGVFSFPGNIMKLOLRMVNXPZS[U[XZYYYRUR",
|
||||
"G]L[LF RLPXP RX[XF",
|
||||
"NVR[RF",
|
||||
"JZUFUUTXRZO[M[",
|
||||
"G\\L[LF RX[OO RXFLR",
|
||||
"HYV[M[MF",
|
||||
"F^K[KFRUYFY[",
|
||||
"G]L[LFX[XF",
|
||||
"G]P[NZLXKTKMLINGPFTFVGXIYMYTXXVZT[P[",
|
||||
"G\\L[LFTFVGWHXJXMWOVPTQLQ",
|
||||
"G]Z]X\\VZSWQVOV RP[NZLXKTKMLINGPFTFVGXIYMYTXXVZT[P[",
|
||||
"G\\X[QQ RL[LFTFVGWHXJXMWOVPTQLQ",
|
||||
"H\\LZO[T[VZWYXWXUWSVRTQPPNOMNLLLJMHNGPFUFXG",
|
||||
"JZLFXF RR[RF",
|
||||
"G]LGLWMYNZP[T[VZWYXWXG",
|
||||
"I[KFR[YF",
|
||||
"F^IFN[RLV[[F",
|
||||
"H\\L[XF RLFX[",
|
||||
"I[RQR[ RKFRQYF",
|
||||
"H\\X[L[XFLF",
|
||||
"KYVaQaQCVC",
|
||||
"KYID[_",
|
||||
"KYNaSaSCNC",
|
||||
"JZNIREVI",
|
||||
"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!
|
||||
};
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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:
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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 );
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
|
|
|
|||
|
|
@ -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 );
|
||||
|
|
|
|||
|
|
@ -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. */
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
|
|
@ -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 );
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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 =
|
||||
|
|
|
|||
Loading…
Reference in New Issue