From f6d2fd2e45c984c67ebe9b5cabd5d6f20fb9ff9f Mon Sep 17 00:00:00 2001 From: Edward Emelianov Date: Wed, 11 Nov 2026 09:52:21 +0300 Subject: [PATCH] binned fix --- APOGEE_cameras/apogee.c | 6 +++--- BASLER_cameras/basler.c | 3 ++- CMakeLists.txt | 4 +++- Dummy_cameras/dummyfunc.c | 3 ++- FLI_cameras/flifunc.c | 3 ++- TOUPCAM_cameras/toupcam.c | 5 +++-- locale/ru/LC_MESSAGES/ccd_capture.mo | Bin 22456 -> 22751 bytes locale/ru/ru.po | 6 +++--- 8 files changed, 18 insertions(+), 12 deletions(-) diff --git a/APOGEE_cameras/apogee.c b/APOGEE_cameras/apogee.c index 043a549..545e2e9 100644 --- a/APOGEE_cameras/apogee.c +++ b/APOGEE_cameras/apogee.c @@ -46,7 +46,7 @@ static double expt[2] = {0.}; // min/max exposition time static double exptime = 0.; // actual exposition time static double tstart = 0.; // exposure start time static char whynot[BUFSIZ]; // temporary buffer for error messages -static int imW = 0, imH = 0; // size of output image +static int imW = 0, imH = 0; // size of output image (BINNED!) static int pid = -1, vid = -1; static int isexposuring = 0; @@ -224,8 +224,8 @@ static int setgeometry(cc_frameformat *f){ if(ApnGlueSetExpGeom(f->w, f->h, ow, 0, hbin, vbin, f->xoff, f->yoff, &imW, &imH, whynot)){ WARNX("Can't set geometry: %s", whynot); - imW = f->w; - imH = f->h; + imW = f->w / hbin; + imH = f->h / vbin; }else{ camera.geometry = *f; } diff --git a/BASLER_cameras/basler.c b/BASLER_cameras/basler.c index a76f0a9..4ad251e 100644 --- a/BASLER_cameras/basler.c +++ b/BASLER_cameras/basler.c @@ -345,7 +345,8 @@ static int pollcapt(cc_capture_status *st, float *remain){ static int capture(cc_IMG *ima){ FNAME(); //double __t0 = dtime(); - if(!ima || !ima->data || !imgBuf || !isopened || !cc_fiximage(bitdepth, camera.geometry.w, camera.geometry.h, ima)) return FALSE; + if(!ima || !ima->data || !imgBuf || !isopened || + !cc_fiximage(bitdepth, camera.geometry.w / curhbin, camera.geometry.h / curvbin, ima)) return FALSE; static int toohot = FALSE; float_values f; //TIMESTAMP("start capt"); diff --git a/CMakeLists.txt b/CMakeLists.txt index ef2a547..0b46f71 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -168,7 +168,7 @@ add_custom_command( DEPENDS ru_file_updated ) -add_custom_command( +add_custom_target( OUTPUT ru_file_updated COMMAND [ -f ${RU_FILE} ] && ${GETTEXT_MSGMERGE_EXECUTABLE} -Uis ${RU_FILE} ${PO_FILE} || cp ${PO_FILE} ${RU_FILE} COMMAND ${CMAKE_COMMAND} -E touch ru_file_updated @@ -176,3 +176,5 @@ add_custom_command( ) add_custom_target(MO_FILE ALL DEPENDS ${MO_FILE}) +add_dependencies(${PROJ} MO_FILE) +install(FILES ${MO_FILE} DESTINATION "${LOCALEDIR}/ru/LC_MESSAGES") diff --git a/Dummy_cameras/dummyfunc.c b/Dummy_cameras/dummyfunc.c index 5e6aec5..a0363b5 100644 --- a/Dummy_cameras/dummyfunc.c +++ b/Dummy_cameras/dummyfunc.c @@ -71,7 +71,8 @@ static int startexp(){ static int camcapt(cc_IMG *ima){ static int n = 0; - if(!ima || !ima->data || !cc_fiximage(bitpix, camera.geometry.w, camera.geometry.h, ima)) return FALSE; + if(!ima || !ima->data || + !cc_fiximage(bitpix, camera.geometry.w / curhbin, camera.geometry.h / curvbin, ima)) return FALSE; #ifdef EBUG double t0 = sl_dtime(); #endif diff --git a/FLI_cameras/flifunc.c b/FLI_cameras/flifunc.c index 9baf044..8d893e0 100644 --- a/FLI_cameras/flifunc.c +++ b/FLI_cameras/flifunc.c @@ -462,7 +462,8 @@ retn: static int fli_capt(cc_IMG *ima){ int bitpix = is16bit ? 16 : 8; - if(!ima || !ima->data || !cc_fiximage(bitpix, camera.geometry.w, camera.geometry.h, ima)) return FALSE; + if(!ima || !ima->data || + !cc_fiximage(bitpix, camera.geometry.w / curhbin, camera.geometry.h / curvbin, ima)) return FALSE; for(int row = 0; row < ima->h; row++){ void *ptr = NULL; if(is16bit) ptr = (void*)(((uint16_t*)ima->data) + row * ima->w); diff --git a/TOUPCAM_cameras/toupcam.c b/TOUPCAM_cameras/toupcam.c index d60ff2d..ee26629 100644 --- a/TOUPCAM_cameras/toupcam.c +++ b/TOUPCAM_cameras/toupcam.c @@ -313,17 +313,18 @@ static int startexp(){ static int camcapt(cc_IMG *ima){ TCHECK(); int bitpix = toupcam.bytepix * 8; - if(!ima || !ima->data || !toupcam.data || !cc_fiximage(bitpix, camera.geometry.w, camera.geometry.h, ima)) return FALSE; + int realw = camera.geometry.w / toupcam.curbin, realh = camera.geometry.h / toupcam.curbin; + if(!ima || !ima->data || !toupcam.data || !cc_fiximage(bitpix, realw, realh, ima)) return FALSE; //DBG("LOCK"); pthread_mutex_lock(&toupcam.mutex); size_t fullsz = ima->w * ima->h * toupcam.bytepix; if(toupcam.imsz != fullsz){ if(toupcam.imsz < fullsz) fullsz = toupcam.imsz; - int realw = camera.geometry.w / toupcam.curbin; if(ima->w != realw) ima->w = realw; ima->h = fullsz / realw / toupcam.bytepix; WARNX("Asked image size (%zd) not equal real (%zd); set w=%d, h=%d!", ima->w * ima->h * toupcam.bytepix, toupcam.imsz, ima->w, ima->h); + ima->bytelen = fullsz; } memcpy(ima->data, toupcam.data, fullsz); toupcam.lastcapno = toupcam.imseqno; diff --git a/locale/ru/LC_MESSAGES/ccd_capture.mo b/locale/ru/LC_MESSAGES/ccd_capture.mo index f08471e1a270e04f9a3f67c84ed7c31ade723a79..f0d3c5c9414b9a358f1a1a116661e4db6db6ba29 100644 GIT binary patch delta 4434 zcmYk;3s4mI0mtz_zOaf0MC27ML>dC8pukz~0HY?Spb3ve zjToa*8>1l-O4V?oKB!tPb{wlScS&uV$u!!uv1v^^wVBSOozdy{cel>C!*4(T-MiiY z`}FjQu$v!+dA}Ie?=8b|nLJA74KOA=%$SM@-8H5$(wHIGgd_27OvE!d0&idveuH{` zP?RylaSX=b415F&F&PfkJD7_7>4t@4Q9WOX>ft)% z&opwP2j&n`w>gfq*<7^me~NKj{{_|1dpHB5xzPKTU<~z}Y6_#U5hr6Oj>B7MVFcr> z9*jrcVHTk(E=K-LH79-Egc^xX! z+Gu=U3hME7R15E*dKkt{^&lE`e;TUdCAP(=?^UB3whi^-W2gq7LXFrp)Ck=|J^w9I zh3Us|>vQi&3VI+L(=i`40v`K*1L}+W?E9Ul2KAtN6hJ-yH~acNQimDAO4M^xkUz74 z6N6*QP|s~cM$l^xQqY`rqh9nm7T~`y8y!~2TH8+4{{IrSO9r!-^!!xRkgh`gVAY}K zemkzh4%Av3$Z%=oGB8W~e-;JJ^?KBhA3~Ail0aROamwN{6o}K_n=op_!Wg&7{#}By#%$7H=`EMF?<5gqAI+L z6H&j%T1;8UEwdQ!VGU{o-OQ8Ty8|cVb<}&ps67jF(iwlfXe~E1rw5QxHod6r^;cYo zYK?|2AN51D5ue3&oQ-{HwZ4~!s_+eb60f1Q;c({ZDO`h7(TDo}oeai*BZX|DgFT+IFoUdui#3&fGaR=3O`EdLiPN2I2V(72}M(ks%J0e z;|zr8M$k;PbSWnXHrdx#Q7`C|6Kd$w$Y7awkawCZw)asDo01#q zc?-_x`nSj+nS^P^d|&%NpF#;Y-oym_59+~4_E0pgK`pLLsO@wF9eByM?~Kr5numIE zEwbax2bhXiQNIiSKz;&DIOEQGH|dzG{a-+VI!zO5$a?MTaK=kRH`lh#wiB5R^Czsq z;jF+UY{nvNN7k(gcNp^mW}z1MZq$hOAZ<6_Vh#1133Ec*qYck;{TXU*_RtzVcneeT zdwHQBoOD#fRv_!pw4kQoEdCI`MvcT==225pjia$0S@`BUuEYPKR~4*gVwiTb6ZOSk z<2by7qcE0V+FnbH5KYHP>zL;y|ur z=37eB@ws0QliZv$lG<9OV@{tRbwUC1yqXkN36LKrvpk`}^<2YCOoPhhuR-%=z z;~dd8Q}6Z>2FR=@$H^h0;}rQ-uw=|>Ta7N&nLeb8yh4IEWCICTfnz5*5-f#ITi_k? zD#;>`5jWAnMhLEO&3y%#NktvMKW3!4;??FJkh@XDdv&YU1a6Z0BAIGXH2BAy^6CdA$m@IPqo*j3w6C?__*X4>^yBSySODu5!9++!ZhRT4K8T&sseH z8LPxqSsDDYt7M(iW36{pd#tgp%5slYzS^pBJ1tk0z;G$Q zNyOYjK@k-#)S0q!rqVHWQe3hra)N3mHK(TE|Gmo$ci#W|opZl?&pq4y-nOS&ZC>B1 z_I{@}cNWJhQZFOhmeQ_ODO2{z*;3~1SIWMe&wjjyy?8gf@fjY--!S)YXBW2Hzm%@5 zXGf0U0X(`oe-2$*D_1HU=8I)Km>W2VZ}TfGok|&w2Il7qH&*%S{S-@Iy=wf6e~HOcj%t-IrG4M&3mT4w~u^3 zikX2K%*d{)&fmezz*97q@)~>cJ!Zh4vz9M&N(KhneeX9TZ1k)D6bbfkk;V;`o2Bbli^ zfz4~kG_-&jQ4=$wyEu?9@gRP}45WjL(&4^LyQAq*WlB%;KStp~C+fJG*+frN7rx8v zg&oYuIvIX$9Ki7$$Bb|>r*k>8N8Y7LDW5SN?&zexls?Qr$1)w8Ra3~w7BW3gJzuP2 z9=N6Qb>_PFnGWq_8t$yMjA#HeQ)8H!nZn$EE?rtKufD&Pxqb~BSlgtKk$+Hqv4d%- zjdjWS9!!S@F(Vq!G%&NOFQ8k>^~`+_Fq`pd8hm+^xo;;kbM1YZrRqoR)XF40UO+X*`jaGE=vS`2qSf&tez7oWRSN>((<5{DPA> z#%S^yF6Cst!O`qv-E#dbF6J8MeEksfpB~NdlsUYSS;If^WVSi1WdzfCq5937${n1> z33{39Zs#m+<7phN(Gz$J^Po35p8J@FboeCZ{LM9mDGFPe-CsANl({^XjeMkXJI_!b zY+f(o4a|uD#-n-oNc)A0eB=R-@g#0%W@41ar|~+b!*B3d*7{kX^yDHoa&=YT#x&5~ zm+9d7G%000)6w@TJC7;lboCRN5kJ7=_*a^YGIVSy$MalXz;(=C>G0L&`)cK2h0acV zoAy!pKC=YRvXOtN?BN|VN##tY;aliUDlf18ieyR;lzmrDfz7&_*xInAd9y8(BBC<@{9U?YN0Ia2q|l%r#y5TAr*a%vAW2naXKe z$=YAREX}&gU$MRV-`SR*F(djP_h(P*p^0)RvxH5|{r7MLf5x=`PcCF9({>4KOBM3k ze9Et}?TnTV&132>F>BRVFR$RmOb6fLwX8F|L%5u&Z{Thv;DD&BhKaiWnL^rpG zvd;5k`KILE+;wD^r*{`hLv`}O$}O}Hn~#fp=AmY_yeygO9HZnr%_YAloG%Ag^>9p8 z?wRNRP$k_sr#krp&yYp3O0vPeE|1GSlH(cK+FY{hD>J=K(psLBZ_BRZI)!#sDMCC5Y1{o#;B~zWl3()+kW$hQp5%RF)xKpwe&FjmJlH+Rmc?#9BAMchdOOEH{ zQaM{rUhQMB941{Q#~qTjKPZ*mj>nXTR`o}Cw9J*WWRN_%a#~&IhHS50$Bz`e>}93& zmfI!AL$Y+`t#y5B=PA7?hs(Z_U&tKY-IKolKJ%a=k3h{u-^2pS_zT$G2K&{$;sRd92(o8>;iCRCZ(!Sy9!yRL