From 98aeb92aeb97b21616daf62ec44fb5856697294a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C2=A8Rene=20Richarz?= <¨rene.richarz@bluewin.ch¨> Date: Fri, 29 Mar 2019 15:13:56 +0100 Subject: [PATCH] fixed another bug when using plotlib --- tek4010 | Bin 24540 -> 24540 bytes tek4010.c | 2 +- tek4010.h | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tek4010 b/tek4010 index fa85911053554a61668f876fa8e275194b005003..1ff160d9367f5a8f205e301371423521d403e849 100755 GIT binary patch delta 2517 zcmb_eZA_C_6uze)Dku&j45ZE$D2leo+lrZJGZmZ`0VPTd&N9j5hd3AUV-Yi#c7WNI zXo6nNbTcU~Wa{EFvX>t$nek&J1Gi;aW|nQyq=mi{K^SIcqIP4?ZEv+BoBr9G9L{;p zdCs}_p8G+sU!?07sdaHeqm!{lC$YvOE4CV209uZmyO*ksR_0dv_w23>E;{c%OmAHd zcl@DtQl5cA>J8(UNeKakSX~A&pL%Y_L(=J8>PKmr2A$r{ugu(@HHv6M8nH2G12l6G zyY?)xROoL~iCNW(%zH#>>Wj1bbrps1RzfT*bgUY>1#$@D0j`BqLFyo_@STP1fZYup zfE<7whPGe{dtqDE*UfK7=JS{3Dp4=*%{I{$u4Vt=ttU3H;WVKNSKWKfP-28%d4-Ioiu8sP5O>PN&&rj!?ykB7v8H!0` zY(sxHvBXr^W<}rE>}(6BW|=jnG-+W)Xs(gc+&4w~K1W`RyIA_Hj>kMj`aX-}iJA@4 zUm4|kBSk&Zc_xm0O#0dc(ZaQMSzNC)1y0FWr;K&Q#X4l{3+ZcJGI`|Y8(kyaF^+3% zU+a=dBfq}dHL}X&?HE}-wPPfYnY6By}N4B;SHQE4Y@ner9RbI$)Euld*-Ql=LMlQ?>30hig6j z##~cENTSgQGAxXCb_%CFQ-W0@MWFmDfw1M(IYKvS9*Juut^+p8@vOWwZ-e)N%|CqK zK_&@vB}o>pnpf~E@F3N%nD!6LjR-LUlKM(6RqmX5q6W-85f_<*kC)bS&o

$e1|Y7R2>;{O=uvug6YINUQC? zC5-F6az5hoy~L6wQF%hblZsW!yjti6h!4{46kX!ld7(vzl;S{ZcC8xlf)0P8jtWT=USCaieTh4JKBQ!3 z-GJQ~i~bzXbn#nu^ZXg8uvFg88)M@`0~5x-9;<5S&isujH$f2t zZ$+BWoB7H7oZLhphVvt~)rf7~7akv4B&Npv+Kv36r zLF%{42V@)zjC)Dl0U7(Vf% zLwtIc9ML}hZt-{2$TyXk={DbAvXesmR!IR3s54it)6u9}zp8+!ke^(AvA7ZUIQk_q zY$Fr*I)>daPT(DgVG$SaLJW&ITfpCU&rVSmJa!jj`xo!uFwtPpvQALRdlXnjGp>hu4%5DZHq>0L!T__rp%8*hvlQ z{tB=v`Oj;&Py;Vow~Tyz|GG~ppw6o_C(&MBT4Oef7KZq1H91DnyxaUZtjKRQexW8O TL5%Ff4>kiovU!FYt_jfJl8l4K delta 2397 zcmb_ee@v8h82^6nhk}X0JOM$ylRM<_?%=)CmT1WdXs1B1w8E5eO=eg&ZxyidJi>`qGTRXD3n=PaNeo&A98x(n4Kb21FN?tJ=Y?&}K&5Dm=X>^igo zdJMWR6}FqR3ntD?YI(+8&QsOZ^M-WgHh8@d%PJl7LDxg}KsE#WAsZmIkVg1gA=_b} zfbNCtfjt79j49N^HmPr!-;0drZ%Ys7-_rT4O#T&VSw980a&~jG4TFI!&F0Jx>41zt zOp7@4LaK8Ae<`y^YG(as@n>kG&B0CduI*{Qj85Bj@*CvNcJN=RI=h(vK!>w4gWq8i zCM8odEBe7^PkT6Fp;==}lQyOZO&V942PZ61-^nf5Rvi6gg2;(kH2kk%>_^h(n}NX9y4>{wi^L&lCvUugOCTi14X-RhFKn{GSO=7;W2 z4quj3Q{|ttmWoiizCWkGa=)_{R>=KJwvq{M@%&!N#Y6{Cgl{NPySWeU&fj%Un zmi8fLY1TSuZ%$fbSHwfwDLR~!nRrQ}s}XchqKODfUlLst8ztE@T|R-ZJ!Mv*o3u)a zH%MFsY?Pg>^rC%z@PVUk^nPaB==c+DqhgMEa<0wLcM$s%vEOAZ2fhnS+8&Petgz9o zyKu|kDXXxXw63`LEXHnj0-I&W8NjV^@o9`Lzu6M!(1E~Md-#Ub*PtV(kgXpYVk~2G z9QQYRH8(BzwUaX;?>HVWW4LU~79$QZNFFZ0zveuyUWv@x0A1_gK~@i=(<9b|wBtf! zJ@iV^!2Yc0dVC;bt+5z;A>7H>r!5k1m%NWLRlo3gNvo1M5sZ4x?)I=gxjn4I((K}F zm@B}Rk^!$L7;P9K;4)ZbF+#CMT1dvkZEcb9HxO@(#H0CpB*!n~TM+ld zw?Hn*5^na)Dc>q%=NCS&)mATpjPKn>T_C*&;B);v6RN0=EZ3!utMI&@IAb>ru6TZ z7+=RC*GnnGpoqS&Ax-ESI_k1!&jMmNKw@8w*w@_?lfwn@d0Crw85!t3bdhemR`3$l zl~=0cd#OQj@IUAiWr@)~3!hK*it-URCWI%0T;1z&%%qUVM8{S(;+yR%bm-lE_zH_h z&+r1k)Bh0Ttl<&A0pig!%oR_7-Y>ey>u6)KnfFse@ebZcH;VK5C3S8|g^mxX+t%cB zZle#MJ5#hBcRBhbu~Hb~ZpW|>MhNeM7#4ByZirzKA9K+`-+~lN-XnJr&VZfH`|`P; z#(ieG=bJf4P|wL>GZt;tO9gAqDFHcn#!}cWWCql2Yil^heSV#lcc`Q5N;$VsL0LW~ zv8}8Pc4GMs?pGVi!Sd2C&)1+$K}8`CP(#J%yjRVwG$-*|T3c;4iiPW=H><5iv1I*p c09NFmiB4Br6Gi6$ew+-nZ_{jbqI!V;19H_-cK`qY diff --git a/tek4010.c b/tek4010.c index 95718f6..e4be4d0 100644 --- a/tek4010.c +++ b/tek4010.c @@ -363,7 +363,7 @@ void tek4010_draw(cairo_t *cr, cairo_t *cr2, int width, int height, int first) if (DEBUG) printf("***** Moving to (%d,%d)\n",x0,y0); break; case 5: if (ch == 29) mode = 1; - else { + else if (tag != 0) { yh = 32 * (ch & 31); mode++; } break; diff --git a/tek4010.h b/tek4010.h index 19f4c57..7474ba9 100644 --- a/tek4010.h +++ b/tek4010.h @@ -1,6 +1,6 @@ #define WINDOW_WIDTH 1024 // proposed width of main window -#define WINDOW_HEIGHT 780 // proposed height of main window +#define WINDOW_HEIGHT 768 // proposed height of main window (as per Tektronix manual) #define WINDOW_NAME "Tektronix 4010" // name of main window #define ICON_NAME "" // path to icon for window