eddy/CCD_Capture
1
0
Fork 0
mirror of https://github.com/eddyem/CCD_Capture.git synced 2025-12-06 02:35:13 +03:00
Code Issues Packages Projects Releases Wiki Activity

fixed basler bug; still have bugs with on-the-fly size changing

Browse Source
This commit is contained in:
Edward Emelianov 2023-04-11 11:08:28 +03:00
parent 002854f1e9
commit 38dee72b04
5 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
BASLER_cameras/basler.c
View File

@ -253,12 +253,14 @@ static int geometrylimits(frameformat *max, frameformat *step){
int64_values i; int64_values i;
if(!getInt("Width", &i)) return FALSE; if(!getInt("Width", &i)) return FALSE;
max->w = i.max; step->w = i.incr; max->w = i.max; step->w = i.incr;
max->xoff = i.max; step->xoff = i.incr;
if(!getInt("Height", &i)) return FALSE; if(!getInt("Height", &i)) return FALSE;
max->h = i.max; step->h = i.incr; max->h = i.max; step->h = i.incr;
if(!getInt("OffsetX", &i)) return FALSE;
max->xoff = i.max; step->xoff = i.incr;
if(!getInt("OffsetY", &i)) return FALSE;
max->yoff = i.max; step->yoff = i.incr; max->yoff = i.max; step->yoff = i.incr;
if(!getInt("OffsetX", &i)) return FALSE;
max->w -= i.max;
if(!getInt("OffsetY", &i)) return FALSE;
max->h -= i.max;
return TRUE; return TRUE;
} }

6
locale/ru/messages.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-04-11 08:58+0300\n" "POT-Creation-Date: 2023-04-11 10:00+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -478,12 +478,12 @@ msgstr ""
msgid "Can't set brightness to %g" msgid "Can't set brightness to %g"
msgstr "" msgstr ""
#: ccdfunc.c:725 server.c:234 #: ccdfunc.c:725 server.c:236
#, c-format #, c-format
msgid "Can't set binning %dx%d" msgid "Can't set binning %dx%d"
msgstr "" msgstr ""
#: ccdfunc.c:737 server.c:235 #: ccdfunc.c:737 server.c:237
msgid "Can't set given geometry" msgid "Can't set given geometry"
msgstr "" msgstr ""

6
locale/ru/ru.po
View File

@ -7,7 +7,7 @@
msgid "" msgid ""
msgstr "Project-Id-Version: PACKAGE VERSION\n" msgstr "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-04-11 08:58+0300\n" "POT-Creation-Date: 2023-04-11 09:57+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -162,7 +162,7 @@ msgstr "
msgid "Can't set active wheel number" msgid "Can't set active wheel number"
msgstr "îÅ ÍÏÇÕ ÕÓÔÁÎÏ×ÉÔØ ÎÏÍÅÒ ÁËÔÉ×ÎÏÇÏ ËÏÌÅÓÁ" msgstr "îÅ ÍÏÇÕ ÕÓÔÁÎÏ×ÉÔØ ÎÏÍÅÒ ÁËÔÉ×ÎÏÇÏ ËÏÌÅÓÁ"
#: ccdfunc.c:725 server.c:234 #: ccdfunc.c:725 server.c:236
#, c-format #, c-format
msgid "Can't set binning %dx%d" msgid "Can't set binning %dx%d"
msgstr "îÅ ÍÏÇÕ ÕÓÔÁÎÏ×ÉÔØ ÂÉÎÎÉÎÇ %dx%d" msgstr "îÅ ÍÏÇÕ ÕÓÔÁÎÏ×ÉÔØ ÂÉÎÎÉÎÇ %dx%d"
@ -190,7 +190,7 @@ msgstr "
msgid "Can't set gain to %g" msgid "Can't set gain to %g"
msgstr "îÅ ÍÏÇÕ ÕÓÔÁÎÏ×ÉÔØ Gain × %g" msgstr "îÅ ÍÏÇÕ ÕÓÔÁÎÏ×ÉÔØ Gain × %g"
#: ccdfunc.c:737 server.c:235 #: ccdfunc.c:737 server.c:237
msgid "Can't set given geometry" msgid "Can't set given geometry"
msgstr "îÅ ÍÏÇÕ ÕÓÔÁÎÏ×ÉÔØ ÇÅÏÍÅÔÒÉÀ" msgstr "îÅ ÍÏÇÕ ÕÓÔÁÎÏ×ÉÔØ ÇÅÏÍÅÔÒÉÀ"

1
main.c
View File

@ -68,7 +68,6 @@ void signals(int signo){
} }
int main(int argc, char **argv){ int main(int argc, char **argv){
char *self = strdup(argv[0]);
initial_setup(); initial_setup();
#if defined GETTEXT_PACKAGE && defined LOCALEDIR #if defined GETTEXT_PACKAGE && defined LOCALEDIR
printf("GETTEXT_PACKAGE=" GETTEXT_PACKAGE ", LOCALEDIR=" LOCALEDIR "\n"); printf("GETTEXT_PACKAGE=" GETTEXT_PACKAGE ", LOCALEDIR=" LOCALEDIR "\n");

4
server.c
View File

@ -224,8 +224,10 @@ static int camdevini(int n){
frameformat step; frameformat step;
camera->getgeomlimits(&frmformatmax, &step); camera->getgeomlimits(&frmformatmax, &step);
curformat = frmformatmax; curformat = frmformatmax;
DBG("\n\nGeometry format (offx/offy) w/h: (%d/%d) %d/%d", curformat.xoff, curformat.yoff, DBG("\n\nGeometry format max (offx/offy) w/h: (%d/%d) %d/%d", curformat.xoff, curformat.yoff,
curformat.w, curformat.h); curformat.w, curformat.h);
// curformat.w -= curformat.xoff;
// curformat.h -= curformat.yoff;
curformat.xoff = 0; curformat.xoff = 0;
curformat.yoff = 0; curformat.yoff = 0;
if(GP->hbin < 1) GP->hbin = 1; if(GP->hbin < 1) GP->hbin = 1;