summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'dexela'Matthias Vogelgesang2013-03-219-94/+22
|\ | | | | | | | | | | Conflicts: plugins/dexela/CMakeLists.txt src/CMakeLists.txt
| * Improve libuca package compatibility with RPM systems.Mihael Koep2013-03-215-83/+7
| |
| * Update package scriptMihael Koep2013-03-211-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 locationMatthias Vogelgesang2013-03-191-2/+1
| | | | | | | | It was not a cool move to change it to the current directory ...
| * Build package flags inside package-plugin.sh.inMihael Koep2013-03-196-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 Koep2013-03-144-13/+9
| | | | | | | | sensible metadata information.
| * Merge branch 'dexela_simple_packaging' into dexelaMihael Koep2013-03-144-47/+9
| |\ | | | | | | | | | | | | | | | Conflicts: plugins/dexela/CMakeLists.txt plugins/package-plugin.sh.in
| * | Trying to improve dexela plugin packaging.Mihael Koep2013-03-057-6/+62
| | |
* | | Set streaming bit _after_ pcilib_startMatthias Vogelgesang2013-03-201-3/+3
| | | | | | | | | | | | God knows why this is this way ...
* | | Implement trigger logic in base cameraMatthias Vogelgesang2013-03-202-21/+24
| | |
* | | UFO: Use streaming for auto triggerMatthias Vogelgesang2013-03-202-13/+12
| | | | | | | | | | | | This has nothing to do with asynchronous operation mode.
* | | UFO: Use internal triggering mechanismMatthias Vogelgesang2013-03-202-22/+69
| | |
* | | Add Numpy integration documentationMatthias Vogelgesang2013-03-201-1/+27
| | |
* | | uca_camera_grab takes a gpointer and returns boolMatthias Vogelgesang2013-03-2011-83/+104
| | |
* | | Remove old OpenCV patchMatthias Vogelgesang2013-03-202-403/+0
| | |
* | | Update package scriptMatthias Vogelgesang2013-03-191-3/+24
| | | | | | | | | | | | Allows to set additional information in each plugin's CMakeLists.txt.
* | | Revert control glade path to install locationMatthias Vogelgesang2013-03-181-2/+1
| | | | | | | | | | | | It was not a cool move to change it to the current directory ...
* | | Spawn a thread because pcilib_stream blocksMatthias Vogelgesang2013-03-181-6/+17
| | |
* | | Build package flags inside package-plugin.sh.inMatthias Vogelgesang2013-03-156-3/+16
| | | | | | | | | | | | This will use the information provided by each plugin.
* | | Merge branch 'dexela_simple_packaging'Matthias Vogelgesang2013-03-1511-8/+550
|\ \ \ | | |/ | |/| | | | | | | Conflicts: .gitignore
| * | Improve dexela plugin packaging.Mihael Koep2013-03-073-1/+9
| |/
| * Merge remote branch 'origin/1.1' into dexelaMihael Koep2013-02-217-37/+447
| |\
| * | add some binaries to gitignore.Mihael Koep2013-02-211-0/+6
| | |
| * | Include CPack in the build process and set the package file name correctly.Mihael Koep2012-10-302-4/+7
| | |
| * | Fix rpm version substitution.Mihael Koep2012-10-301-1/+1
| | |
| * | Add configuring of the spec-file.Mihael Koep2012-10-301-0/+2
| | |
| * | Fix incomplete committ...Mihael Koep2012-10-304-3/+33
| | |
| * | Merge remote branch 'origin/master' into dexelaMihael Koep2012-10-253-15/+53
| |\ \
| * | | Start migrating to libuca 1.1 and glib plugins.Mihael Koep2012-10-254-1/+3
| | | |
| * | | Merge remote branch 'origin/master' into dexelaMihael Koep2012-10-1963-2222/+4616
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: CMakeLists.txt src/CMakeLists.txt src/uca-camera.c
| * | | | Fix version stuff for rpm packaging.Mihael Koep2012-10-192-3/+3
| | | | |
| * | | | Merge remote branch 'origin/1.0' into dexelaMihael Koep2012-10-199-14/+23
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: CMakeLists.txt
| | * | | | Bump version for next fixesMatthias Vogelgesang2012-09-261-1/+1
| | | | | |
| | * | | | Bump version to prepare for SO fixMatthias Vogelgesang2012-09-261-1/+1
| | | | | |
| * | | | | fix SCHNEIDE-382: use correct micros to seconds factor.Mihael Koep2012-10-092-6/+4
| | | | | |
| * | | | | Add test mode attribute.Mihael Koep2012-10-091-0/+20
| | | | | |
| * | | | | Return full dimensions as roi.Mihael Koep2012-09-181-0/+13
| | | | | |
| * | | | | Adapt to new libdexela interface.Mihael Koep2012-09-131-19/+19
| | | | | |
| * | | | | Work on acquisition.Mihael Koep2012-09-131-16/+26
| | | | | |
| * | | | | Implement gain and trigger mode properties.Mihael Koep2012-09-131-0/+66
| | | | | |
| * | | | | Start implementing gain property.Mihael Koep2012-09-121-1/+11
| | | | | |
| * | | | | Implement sensor width, height, bit depth and binning properties.Mihael Koep2012-09-121-8/+105
| | | | | |
| * | | | | Standardize package naming.Mihael Koep2012-09-061-1/+1
| | | | | |
| * | | | | Implement exposure time property.Mihael Koep2012-09-061-19/+25
| | | | | |
| * | | | | Implement 64bit detection for install directory of libuca.Mihael Koep2012-09-042-2/+7
| | | | | |
| * | | | | Fix the dexela error quark.Mihael Koep2012-09-041-2/+2
| | | | | |
| * | | | | Ignore some generated files.Mihael Koep2012-09-041-0/+3
| | | | | |
| * | | | | Minor reformatting to trigger the build for testing our generic commit hook...Mihael Koep2012-09-041-3/+5
| | | | | |
| * | | | | Minor cleanup to trigger the build for testing our generic commit hook...Mihael Koep2012-09-041-1/+0
| | | | | |
| * | | | | make dexela part compile again.Mihael Koep2012-08-281-2/+1
| | | | | |