diff --git a/README b/README index f157c42a023711e68405e788e2ea5f5beb922788..60845db0b8d78583961e0923185642d1ebf387fc 100644 --- a/README +++ b/README @@ -1,19 +1,24 @@ -this is part of the CAMTRON Project. Codename: Software B +To get started recording, read dox/notes_b + > GETTING STARTED + > OVERVIEW VIMBA / B -Based of VimbaX SDK from: - https://www.alliedvision.com/en/products/software/vimba-x-sdk/ --> expanded on VimbaCPP/Example/AsyncOpenCVRecorder ! -does: acquire images and store them as jpeg along with timestamps +Overview git repos camtron, schrebatron and ecotron +############################### -------------------------------- +schrebatron - git@gitlab.idiv.de:tb55xemi/rftrack3k.git +schrebatrondata - git@gitlab.idiv.de:sugu/schrebatrondata.git -Software B actually consists of 2 apps: +ecotrondata - git@gitlab.idiv.de:sugu/ecotrondata.git - https://git.idiv.de/sugu/ecotrondata +ecotron - git@gitlab.idiv.de:tb55xemi/rft2node.git +ecotronscripts - git@gitlab.idiv.de:tb55xemi/ecotron-rfid-controller-script-set.git - 1. recorder-cmd - a commandline app that is meant to be standalone and communicates with the camera +camtron_all - git@gitlab.idiv.de:sugu/camtron_all.git + camtron a - just docs inside camtron_all - notes about hardware (banfs,docs) and setup + camtron b = VIMBA - git@gitlab.idiv.de:sugu/vimba.git - records video from cameras + camtron c = camtron / bgslibrary - git@gitlab.idiv.de:sugu/camtron.git - background subtraction + camtron d = itrackl-process-scriptws - git@gitlab.idiv.de:tb55xemi/itrackl-process-scripts.git - scripts for processing - 2. recorder-gui - a Qt GUI app, which calls the commandline app and displays the images +############################### diff --git a/src/core.h b/src/core.h index aed29c260dcc02f93ed3dcacfc6ffc5c4fb095a7..ed6690ef2b38806ccf84de45859587d26089e2d4 100644 --- a/src/core.h +++ b/src/core.h @@ -24,7 +24,7 @@ public: public slots: void listCams(); void detectCams(); - void onCameraChanged(CameraPtr,UpdateTriggerType); + void onCameraChanged(CameraPtr,UpdateTriggerType); //called by CamObserver which is notified by Vimba SDK void openCam(); void closeCam(); void loadSettings(); diff --git a/src/utils.h b/src/utils.h index 20712f34d0a97e6bb5f105a7994ef331b326c7ab..92893f63e162ea02a35ae10181ae7faa95afedbe 100644 --- a/src/utils.h +++ b/src/utils.h @@ -18,11 +18,11 @@ QString settingsFile(QString filename=""); QString outDir(QString dirname=""); seconds recDuration(seconds=0s); -qint64 frameSize(qint64 frameSize=0); -int fps(int fps=0); +qint64 frameSize(qint64 frameSize=0); //Note: its an estimate and can be easily set in config! +int fps(int fps=0); //TODO: no effect yet. int threadsPerCam(); -int ncam(const int& n=0); +int ncam(const int& n=0); //return number of cams const QChar DELIM='|'; extern std::atomic<bool> running; //global flag to ensure proper exit of threads