Allied vision device adapter #388
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…m from camera - Device adapter base - Camera listing - Property page (read only) - SDK wrapper and lib loader Author(s): - Maciej Scecelek
…n - Binning support - Exposure time support Author(s): - Maciej Scecelek
…ty browser fixes and improvements Author(s): - Maciej Scecelek
…Author(s): - Maciej Scecelek
…ssue with reading write only features from SDK - Refactored SDK loading and handling approach to be based on unique_ptr Author(s): - Maciej Scecelek
…r command properties that were broken - Fix for handling TriggerMode scenario and capturing images in LIVE mode - Fix for cleaning capturing state of camera in case of error Author(s): - Maciej Scecelek
…DK init - Changed way of SDK object creation/deletion to shared_ptr Author(s): - Maciej Scecelek
…ading SDK Author(s): - Maciej Scecelek
…Property calls that generates a lot of calls - Added calling OnPropertyChanged callback for Property Browser Author(s): - Maciej Scecelek
…rtical/Horizontal only - Changes to ROI Author(s): - Maciej Scecelek
…e class for devices to handle the same stuff everywhere - Created logging macro Author(s): - Maciej Scecelek
…ing of read-only property - Fixes for errors for snap/live mode in release mode - Added additional error checks Author(s): - Maciej Scecelek
… micro manager avt device adapter Merge in HSW_SDK/mmcoreanddevices from feature/UNISDK-3114-create-jenkins-jobs-for-building-micro-manager-avt-device-adapter to allied-vision-camera-device-adapter Squashed commit of the following: commit 3ef56cc7e2efbdda688d732476055bfdd318a234 Author: Florian Klostermann <[email protected]> Date: Thu Jul 27 14:09:14 2023 +0200 Jenkinsfile fix commit f74b0b65cf5fce2277b17433b612915c51d52eaa Author: Florian Klostermann <[email protected]> Date: Thu Jul 27 14:01:23 2023 +0200 fixed Windows Jenkinsfile commit bf1304f3b1afb11a19f32bbdaffd5ec0d80e2a59 Author: Florian Klostermann <[email protected]> Date: Thu Jul 27 11:58:32 2023 +0200 Added Windows Jenkinsfile
…verting - Added draft pixel type support Author(s): - Maciej Scecelek
…usage of buffer and its clearing - Refactored image transformation - Refactored buffer preparation and resizing Author(s): - Maciej Scecelek
…os(s): - Maciej Scecelek
…llowed value to make the binning field in the main window unchangeable
…ty browser if they are readonly or unavailable
…roperty's GetType() function to determine property type (instead of Vmb feature type)
The Allied Vision Camera Adapter was trying to load the VimbaX shared libraries from the fixed path "/usr/local/bin". This was not good, because "/usr/local/bin" is on linux a location for applications and not for libraries. Instead, now the standard linux dynamic library loading mechanism is used, which tries to automatically resolve the path of the shared library by using the system paths, ld.so.conf and the environment variable LD_LIBRARY_PATH. Adjusted the licence headers, because the micro manager adapter development was not started in 2012.
The legacy cameras use the feature "ExposureTimeAbs" instead of "ExposureTime" for setting the expsure time. The adapter was using the "ExposureTime" feature for the main window exposure setting. If the feature "ExposureTime" is available, it is used for the exposure setting. But if it is not available now "ExposureTimeAbs" is used for the exposure setting. The value of the exposure setting now also corrected to milliseconds.
…current user locale. Reverted chaning the locale. OnExposureChanged is now called every time the exposure feature changes.
Inside onProperty for every float property the OnPropertyChanged callback was always called even when the value has not changed, because for the comparison the float were converted to strings with a different count of decimal places. On stream start and stop now OnPropertiesChanged is called to update the ReadOnly status of all properties in the gui.
Merge in HSW_SDK/mmcoreanddevices from feature/adjust-license to feature/allied-vision-camera-micro-manager-v2.0.2 Squashed commit of the following: commit faba693dfdb1b1f3bea6fe97256bc0fa9ba8c9ae Author: Florian Klostermann <[email protected]> Date: Mon Oct 2 15:53:45 2023 +0200 fixed AVT Makefile.am commit 12869688f62ebfe237e9444303ee9931ac7fb114 Author: Florian Klostermann <[email protected]> Date: Mon Oct 2 14:56:00 2023 +0200 adjusted additional include directory for AlliedVisionCamera commit dff1da08a9873eb955d3151711221faee92e5c55 Author: Florian Klostermann <[email protected]> Date: Mon Oct 2 14:45:10 2023 +0200 adjsted project files after removing sdk headers from repo commit a06627c0ff2d28c164e6ea706984e2af0ff3e2a6 Author: Florian Klostermann <[email protected]> Date: Mon Oct 2 14:36:32 2023 +0200 removed SDK Headers from repo, adjusted Makefile to use VIMBA_X_HOME variable commit 94959ad944621b870d09513826bab5897cbb29a5 Author: Florian Klostermann <[email protected]> Date: Mon Oct 2 14:12:34 2023 +0200 adjusted license headers commit 5dd1d42e94e3d2a6a8d5a63057f5d7b40373358c Author: Florian Klostermann <[email protected]> Date: Thu Sep 21 17:53:45 2023 +0200 adjusted license header
Also remove 32-bit from project file.
marktsuchida
force-pushed
the
allied-vision
branch
from
6eedaaf to
b6848b7
Compare
Resolve micromanager.sln conflicts.
marktsuchida
force-pushed
the
allied-vision
branch
from
0eff813 to
273a57d
Compare
Also fix a bug in Autoconf function MM_LIB_IFELSE() (allow MM_LIB_SIMPLE() to work even if no function to test is given).
|
I merged 'main' into this branch to resolve conflicts in micromanager.sln. The Visual Studio project has been pointed to our internal 3rdparty repository for Vimba X headers. The Linux build will now skip |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Submitted as patch set by Allied Vision.
Cc: @fklostermann.
I will do the following before merging this:
micromanager.sln