Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dexela' | Matthias Vogelgesang | 2013-03-21 | 9 | -94/+22 |
|\ | | | | | | | | | | | Conflicts: plugins/dexela/CMakeLists.txt src/CMakeLists.txt | ||||
| * | Improve libuca package compatibility with RPM systems. | Mihael Koep | 2013-03-21 | 5 | -83/+7 |
| | | |||||
| * | Update package script | Mihael Koep | 2013-03-21 | 1 | -3/+24 |
| | | | | | | | | | | | | | | | | Allows to set additional information in each plugin's CMakeLists.txt. Conflicts: plugins/package-plugin.sh.in | ||||
| * | Revert control glade path to install location | Matthias Vogelgesang | 2013-03-19 | 1 | -2/+1 |
| | | | | | | | | It was not a cool move to change it to the current directory ... | ||||
| * | Build package flags inside package-plugin.sh.in | Mihael Koep | 2013-03-19 | 6 | -6/+17 |
| | | | | | | | | | | | | | | | | | | This will use the information provided by each plugin. Conflicts: plugins/dexela/CMakeLists.txt plugins/package-plugin.sh.in | ||||
| * | Cleanup of dexela plugin build file and package-plugin.sh.in to include ↵ | Mihael Koep | 2013-03-14 | 4 | -13/+9 |
| | | | | | | | | sensible metadata information. | ||||
| * | Merge branch 'dexela_simple_packaging' into dexela | Mihael Koep | 2013-03-14 | 4 | -47/+9 |
| |\ | | | | | | | | | | | | | | | | Conflicts: plugins/dexela/CMakeLists.txt plugins/package-plugin.sh.in | ||||
| * | | Trying to improve dexela plugin packaging. | Mihael Koep | 2013-03-05 | 7 | -6/+62 |
| | | | |||||
* | | | Set streaming bit _after_ pcilib_start | Matthias Vogelgesang | 2013-03-20 | 1 | -3/+3 |
| | | | | | | | | | | | | God knows why this is this way ... | ||||
* | | | Implement trigger logic in base camera | Matthias Vogelgesang | 2013-03-20 | 2 | -21/+24 |
| | | | |||||
* | | | UFO: Use streaming for auto trigger | Matthias Vogelgesang | 2013-03-20 | 2 | -13/+12 |
| | | | | | | | | | | | | This has nothing to do with asynchronous operation mode. | ||||
* | | | UFO: Use internal triggering mechanism | Matthias Vogelgesang | 2013-03-20 | 2 | -22/+69 |
| | | | |||||
* | | | Add Numpy integration documentation | Matthias Vogelgesang | 2013-03-20 | 1 | -1/+27 |
| | | | |||||
* | | | uca_camera_grab takes a gpointer and returns bool | Matthias Vogelgesang | 2013-03-20 | 11 | -83/+104 |
| | | | |||||
* | | | Remove old OpenCV patch | Matthias Vogelgesang | 2013-03-20 | 2 | -403/+0 |
| | | | |||||
* | | | Update package script | Matthias Vogelgesang | 2013-03-19 | 1 | -3/+24 |
| | | | | | | | | | | | | Allows to set additional information in each plugin's CMakeLists.txt. | ||||
* | | | Revert control glade path to install location | Matthias Vogelgesang | 2013-03-18 | 1 | -2/+1 |
| | | | | | | | | | | | | It was not a cool move to change it to the current directory ... | ||||
* | | | Spawn a thread because pcilib_stream blocks | Matthias Vogelgesang | 2013-03-18 | 1 | -6/+17 |
| | | | |||||
* | | | Build package flags inside package-plugin.sh.in | Matthias Vogelgesang | 2013-03-15 | 6 | -3/+16 |
| | | | | | | | | | | | | This will use the information provided by each plugin. | ||||
* | | | Merge branch 'dexela_simple_packaging' | Matthias Vogelgesang | 2013-03-15 | 11 | -8/+550 |
|\ \ \ | | |/ | |/| | | | | | | | Conflicts: .gitignore | ||||
| * | | Improve dexela plugin packaging. | Mihael Koep | 2013-03-07 | 3 | -1/+9 |
| |/ | |||||
| * | Merge remote branch 'origin/1.1' into dexela | Mihael Koep | 2013-02-21 | 7 | -37/+447 |
| |\ | |||||
| * | | add some binaries to gitignore. | Mihael Koep | 2013-02-21 | 1 | -0/+6 |
| | | | |||||
| * | | Include CPack in the build process and set the package file name correctly. | Mihael Koep | 2012-10-30 | 2 | -4/+7 |
| | | | |||||
| * | | Fix rpm version substitution. | Mihael Koep | 2012-10-30 | 1 | -1/+1 |
| | | | |||||
| * | | Add configuring of the spec-file. | Mihael Koep | 2012-10-30 | 1 | -0/+2 |
| | | | |||||
| * | | Fix incomplete committ... | Mihael Koep | 2012-10-30 | 4 | -3/+33 |
| | | | |||||
| * | | Merge remote branch 'origin/master' into dexela | Mihael Koep | 2012-10-25 | 3 | -15/+53 |
| |\ \ | |||||
| * | | | Start migrating to libuca 1.1 and glib plugins. | Mihael Koep | 2012-10-25 | 4 | -1/+3 |
| | | | | |||||
| * | | | Merge remote branch 'origin/master' into dexela | Mihael Koep | 2012-10-19 | 63 | -2222/+4616 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: CMakeLists.txt src/CMakeLists.txt src/uca-camera.c | ||||
| * | | | | Fix version stuff for rpm packaging. | Mihael Koep | 2012-10-19 | 2 | -3/+3 |
| | | | | | |||||
| * | | | | Merge remote branch 'origin/1.0' into dexela | Mihael Koep | 2012-10-19 | 9 | -14/+23 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: CMakeLists.txt | ||||
| | * | | | | Bump version for next fixes | Matthias Vogelgesang | 2012-09-26 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Bump version to prepare for SO fix | Matthias Vogelgesang | 2012-09-26 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | fix SCHNEIDE-382: use correct micros to seconds factor. | Mihael Koep | 2012-10-09 | 2 | -6/+4 |
| | | | | | | |||||
| * | | | | | Add test mode attribute. | Mihael Koep | 2012-10-09 | 1 | -0/+20 |
| | | | | | | |||||
| * | | | | | Return full dimensions as roi. | Mihael Koep | 2012-09-18 | 1 | -0/+13 |
| | | | | | | |||||
| * | | | | | Adapt to new libdexela interface. | Mihael Koep | 2012-09-13 | 1 | -19/+19 |
| | | | | | | |||||
| * | | | | | Work on acquisition. | Mihael Koep | 2012-09-13 | 1 | -16/+26 |
| | | | | | | |||||
| * | | | | | Implement gain and trigger mode properties. | Mihael Koep | 2012-09-13 | 1 | -0/+66 |
| | | | | | | |||||
| * | | | | | Start implementing gain property. | Mihael Koep | 2012-09-12 | 1 | -1/+11 |
| | | | | | | |||||
| * | | | | | Implement sensor width, height, bit depth and binning properties. | Mihael Koep | 2012-09-12 | 1 | -8/+105 |
| | | | | | | |||||
| * | | | | | Standardize package naming. | Mihael Koep | 2012-09-06 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Implement exposure time property. | Mihael Koep | 2012-09-06 | 1 | -19/+25 |
| | | | | | | |||||
| * | | | | | Implement 64bit detection for install directory of libuca. | Mihael Koep | 2012-09-04 | 2 | -2/+7 |
| | | | | | | |||||
| * | | | | | Fix the dexela error quark. | Mihael Koep | 2012-09-04 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | Ignore some generated files. | Mihael Koep | 2012-09-04 | 1 | -0/+3 |
| | | | | | | |||||
| * | | | | | Minor reformatting to trigger the build for testing our generic commit hook... | Mihael Koep | 2012-09-04 | 1 | -3/+5 |
| | | | | | | |||||
| * | | | | | Minor cleanup to trigger the build for testing our generic commit hook... | Mihael Koep | 2012-09-04 | 1 | -1/+0 |
| | | | | | | |||||
| * | | | | | make dexela part compile again. | Mihael Koep | 2012-08-28 | 1 | -2/+1 |
| | | | | | |