From c9b8083056d616672f57decafd93b4033495081e Mon Sep 17 00:00:00 2001 From: Rene Richarz Date: Fri, 19 Apr 2019 13:58:32 +0200 Subject: [PATCH] version 1.2.5, see versions.txt --- ards.c | 21 +++++++++++++-------- tek4010 | Bin 40784 -> 40816 bytes tube.c | 2 +- versions.txt | 5 +++++ 4 files changed, 19 insertions(+), 9 deletions(-) diff --git a/ards.c b/ards.c index e5e88bb..be29f90 100755 --- a/ards.c +++ b/ards.c @@ -49,6 +49,8 @@ static long startPaintTime; static int mode; +static double efactor; + static int args; static unsigned char data[4]; @@ -56,19 +58,19 @@ static int x0 = -485, y0 = 450, x2, y2; static void draw_char (cairo_t *cr, cairo_t *cr2, char ch) { - tube_x0 = (x0 + 540)/2; - tube_y0 = (y0 + 707)/2; + tube_x0 = (int)(efactor * (x0 + 540)); + tube_y0 = (int)(efactor * (y0 + 707)) - vDotsPerChar/2; //fprintf (stderr, "[tube: %d,%d]", tube_x0, tube_y0); tube_drawCharacter(cr, cr2, ch); - x0 += 9; + x0 += (int)(hDotsPerChar / efactor); } static void draw_vector (cairo_t *cr, cairo_t *cr2) { - tube_x0 = (x0 + 540)/2; - tube_y0 = (y0 + 707)/2; - tube_x2 = (x2 + 540)/2; - tube_y2 = (y2 + 707)/2; + tube_x0 = (int)(efactor * (x0 + 540)); + tube_y0 = (int)(efactor * (y0 + 707)); + tube_x2 = (int)(efactor * (x2 + 540)); + tube_y2 = (int)(efactor * (y2 + 707)); //fprintf (stderr, "[tube: %d,%d - %d,%d]", tube_x0, tube_y0, tube_x2, tube_y2); tube_drawVector(cr, cr2); } @@ -84,8 +86,11 @@ void ards_draw(cairo_t *cr, cairo_t *cr2, int first) if (first) { first = 0; + efactor = windowWidth / 1080.0; + // fprintf (stderr, "efactor: %0.2f\n", efactor); refresh_interval = 30; - tube_changeCharacterSize(cr, cr2, 74, 35, 10); + tube_changeCharacterSize(cr, cr2, 80, 50, (int)(efactor * 20)); + } startPaintTime = tube_mSeconds(); // start to measure time for this draw operation diff --git a/tek4010 b/tek4010 index feb5c9f4b56409391c271956db4effe25c824743..6bb838e7e1eec9bb747537cc16aa6fea92866926 100755 GIT binary patch delta 4308 zcmbVQeNa@_6~FiGvMvY;0}Hc z5BOad7jLad{Y~a&KBodc?g(Q~f!2ZsfT;k_*KWD@+jE8>_RQfd44w-<3jX<*IJ*lT zzl9r9($omaD4lriR|_t3o-Ot+dY>0-s}@J>yh>ZOG|Lvu20R{+Lhx!(6UdKj+Q7Gg z9|HI7QrHpjF3@pMFX$xbG-xL<1K?E21#qh568Ke+eJf`wC=ZkmDhBm*fPkS2v+I>C z=7Ta9LOpnhKp6Le4}$VBzO+?~Q`hp@cgPOM6l~-%@O<#lbFL&M0!&4# zAP>kT#w*jbL2n+uUREhBdP?`3X+*fS(MLdBuaEal^A_?S3 z!N^(F#`6M75~*lvQbql@JRY&lyAKId8>S%GA#jRUDGn68%QuQ|6=v}Yv8(X0BswcD z5TPj1LhZMOReTOjXPPKqRhpe5r>KCZXuFDjtZ+?BUA5VsLs$wy8)M>zFmA$nb%HZ? zqk!t9WKzIuw4Z-N@Yos*NvzOTt**0wvlPP+T^Wg@6{1z_fsQ=Q$aF*~Bbv1u)Q7SL zp`+ELkgQ(2y~gXDL)l+|jxr$|Wl|1ZhIrDKyo8XHFXc^GK? zBJ@z�k=QTJ>IupT4qn#HLR99D2}aZrVhf*!N^|1yeTzxi7rULo>DL3F-#j=II%Z zPfXXHEM0%(c4VwVMl~|n&^Muy91!D<#`eh!ToPkbTf*W(r7Lw5^-o~>9^z>YzlrjvR82_Vqy(GEB ziwNbgq+l}>v6;npB4c%5AX#j%hmi0f&ZYMyFX^I@Qh+bI6&V}witW$N4i4RnjP=g% z*3D3{2z3^roNT)O7I7rb+3qVZaTeD_VNe(q635s_hosEauZ=V#1{JzT>YSc*{rSY} zpKOEPmiW%66lWT6F8JEM=ze7vW7l%4d61P?qep%R_g(USa0Z!l{|{xuuNYJfY64x# znX3J=Wn9A9wZ5F-l(FApjE;rgMLJY$Q;WjA^P&~z!Liwb?X-+T##rcni(ixUdkB7| z7Hm0E#p|& z1|XX!BX|LVT_&Nx_$FjU%G7;K+rO}1bP3Tzj3nujnz);=wLvz|#&yQ#n)l8o_xlh1q#=E$NGn|Q_zFWQi2{k6O(qs1`V;=*I=FeC-RA_LPTNuJcqs~kh(CqNN z=($%RQ!l1o^bU^BynB(z4d`xy=yKAfy$hm#6$Tl-8Q7(&8^r~q)#O63sUPU?qCdM; z+ep60ZJg#Z=oRQ&y*oN*(rTF{OD%bamAY?j=FHC#2tf0rXT@ z(5y^_!mKP`f=Z>cIVn}aG3 zPfE}^>1<74P~s?o%My2$bVy)yDn|H@w8eYfBC=^tun6ZW+Z!!%>3rfXx+>*dDX+xp zRX}GR>`IKS$@?X)Uh1uRwaHkNS4iTHkq&uvdEG&Cb;G^V*k?FQow?IeKPdIq;6s++ zS0(Oq8T^K{(Hoj&MGG@8Qw)mEc$9P-gzk~X1%^WC*;2+0!)@ysCc1b%`W7ja7@Mak zTxyQl+Tn(Kk>6EFnGX9j9EmKkt0pCn*G8urP;5Qyf8yiI{n(ZJri8X-lCO! z?~I}}1vJOr^?adXV@6+bA`(84SQ2FFAvo}c{4*GCiiYnO1gWE#TAza%oyC+_16^7f z&5E%EHXBh$Mn7f>*(p5ygN#~U^qI*hz|Q*tY_Q6- zCm43TV)6i&`dl zib!qUkwYz?7Cs5v^)xnuK4(mM17vztm~tItzc|(Ej-l1^i4R*J<{lB#7Mv_)mXg4- zahC1%;^nqXIyP^&J&{yxiLoD6zldpH&KHOk_{|oz`1OmU?FC7+ARfG(D9Rcqqc+-J zz;ngIj;bVD6*{2vVfzfWd~viR!VAUG{cd~^k)-?!UQ-u$jaE09A2&@&Et; delta 4088 zcmbVP4Nz3q6~6cFiVK47DjE<9t3afUfwy!~I{rYc*li?*7?NRC}lkO-z`~PKO_#McG80VnSvZx8K>lk9{=l zbf!CV_S|#Mcg{WM-22|WZ|1TRxUBR#x&O?%`w{{Tj0GAv=**69#|0q;8_xVHgAbkg z%LmDq+xIsHKOJekz58l>Q%|r*dHTR6ZHNzAmA*Rhowy8MBRb=*@*3^&rI`wZBk{!$ zhU3$gC-l~FHkZknTBm(@-}_enHSyc@@Rs?*3iE)4vbC=V+xHvn;+6z^#B*fwzGAK=p7r2YwLz zW$>y)3L5|)0$l=)fUbbv12q8?1gA=_gHt6T@Oe=Be$G6g3Q#4;3-Wh?fT0SV%}N$) zf^s8-Q{WdsTQMF1p8~lt4(-~Pfgltm zTBN;NQq5CoI>SWy=1MaYt{ufZQ9HEbyuy!Zt4sGJWAD73j#*h)mmqGNM_l$d0lC&`~!j zZp-;op zrm8+y)C`LAptxCZ+UG`*PI2s;D||0+imm}ikIvp7?NN%FhCV$uxs0&{rurvS)Ma`r za2ZbjB&|sTbWA<1XMsNqT{3!ZN6%a4!qY#wgKV%4l@u4)3UDs{JP}NUQ^yWwdk<~L$(L#)pbi66On|Ia7`ajC~lAGFQJkF_sgp zVN~jD&NTg5`|TT7ptsmx{|Cic3S0_&EqD4~JjB?o+G_4&t<{{pU4sWl@)>XyGU@&w zs)AoLs24Nw$#$S;^p<2HRI{6@G+N0OZVats%Q?K)(tnD)j8 zjI9ky*&^5bZ@|oBIa0pG*$k*;FK5^jKK-zI`v$#0j7tA{FFgGgz9+8S9R51kfiPFG%^6 zl((UM2ca`IXf4L(@sgkiMu`-Fw*6FDc| z#l*1<#Z19x<%t)HoEJh5$a95G*->dTHv482{ildMPw0MW9Fh)a7miMbC(}Pplr|H6 z&5OW8DXUN43;%wr1k=`DivBl>pY2=aE&nH-O;I;_>Q43I9HKkH7&u*Aj2p@b?hI4V zg+SLqbU4$!f(~c8SGkH!Qm*RH5R2;2; zle@KT`@g3w2@HgNTzl=nv?2lrLSo>VR(u&~d5upjDd@xfn|>CyJi^Z{$SWc;eRR;z z!t4<~+8{1AzoP^iMAwlFpgB0oj?2|t<$cyk9ndfY;SbYcB1Awumq2x*>oK;cg;G{3Nh}w8eg3ex*pWe7;r)*74!TSmF}q={ z5jmatJY77Ff2Zige~lRKEOt;soVblqlyVzmxnfCIG2bXkyQ&@3720&`VY>;NTMT!F zd65|I&cyf9HT;)|yWQoSiP9c?(2CBUe7;i*Y8{8^ZKi|(Qwc+PCIF#9P@%M8XarA7U9_6L=ar9WA ziC@An`WY_vU`Rb5ZP1>3X)Q-pFZ}eoIrbFB(vdR`-AMhEe>?~avhW)euKo=vFZ>wq L2V)UoGlu^HS`1bl diff --git a/tube.c b/tube.c index d3384f2..4b0ed70 100755 --- a/tube.c +++ b/tube.c @@ -178,7 +178,7 @@ void tube_init(int argc, char* argv[]) char *argv2[20]; size_t bufsize = 127; int firstArg = 1; - printf("tek4010 version 1.2.4\n"); + printf("tek4010 version 1.2.5\n"); windowName = "Tektronix 4010/4014 emulator"; if ((argc<2) || (argc>19)) { printf("Error:number of arguments\n"); diff --git a/versions.txt b/versions.txt index ca73e37..5c38312 100644 --- a/versions.txt +++ b/versions.txt @@ -1,3 +1,8 @@ +Version 1.2.5 April 19, 2019 +============================ +Bug fixes +- Added scaling to ARDS mode + Version 1.2.4 April 18, 2019 ============================ Bug fixes