GitLab was upgraded during the server migration. If you cannot sign in, use "Forgot your password?" to reset it — passwords could not be carried over.

Commit 703420ba authored Dec 21, 2009 by charras

changed layer constants XXX_CU and XXXX_CMP to XXX_BACK and XXX_FRONT

parent bd5018dd

3d-viewer/3d_draw.cpp

+8 −8

Original line number	Diff line number	Diff line
		@@ -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

+225 −95

Original line number	Diff line number	Diff line
		/* 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!
		};

include/pcbstruct.h

+17 −17

Original line number	Diff line number	Diff line
		@@ -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

+8 −8

Original line number	Diff line number	Diff line
		@@ -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

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}