diff options
| -rw-r--r-- | cmake/FindDEXELA.cmake | 19 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 14 | ||||
| -rw-r--r-- | src/cameras/uca-dexela-camera.c | 164 | ||||
| -rw-r--r-- | src/cameras/uca-dexela-camera.h | 68 | ||||
| -rw-r--r-- | src/config.h.in | 1 | ||||
| -rw-r--r-- | src/uca-camera.c | 7 |
6 files changed, 273 insertions, 0 deletions
diff --git a/cmake/FindDEXELA.cmake b/cmake/FindDEXELA.cmake new file mode 100644 index 0000000..b343e14 --- /dev/null +++ b/cmake/FindDEXELA.cmake @@ -0,0 +1,19 @@ +# Try to find libdexela.so +# +# Defines +# +# DEXELA_FOUND - system has libdexela +# DEXELA_INCLUDE_DIRS - libdexela include directory +# DEXELA_LIBRARIES - dexela library + +find_package(PackageHandleStandardArgs) + +find_path(DEXELA_INCLUDE_DIRS dexela_api.h PATHS /root/Dexela/include) +find_library(DEXELA_LIBRARIES dexela PATHS /root/Dexela/dexela-spike) + +find_package_handle_standard_args(DEXELA DEFAULT_MSG DEXELA_LIBRARIES DEXELA_INCLUDE_DIRS) + +mark_as_advanced( + DEXELA_INCLUDE_DIRS + DEXELA_LIBRARIES +) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 9508c5c..94de82d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -18,6 +18,7 @@ find_package(PCO) find_package(PF) find_package(IPE) find_package(Pylon) +find_package(DEXELA) # --- Find frame grabber interfaces find_package(FgLib5) @@ -103,7 +104,20 @@ if (PYLON_FOUND) include_directories(${LIBPYLONCAM_INCLUDEDIR}) link_directories(${LIBPYLONCAM_LIBDIR}) endif() +endif() + +if (DEXELA_FOUND) + option(HAVE_DEXELA_CL "Camera: CameraLink-based dexela detector" ON) + + if (HAVE_DEXELA_CL) + list(APPEND uca_SRCS cameras/uca-dexela-camera.c) + list(APPEND uca_HDRS cameras/uca-dexela-camera.h) + list(APPEND cameras "Ufo") + + set(uca_LIBS ${uca_LIBS} ${DEXELA_LIBRARIES}) + include_directories(${DEXELA_INCLUDE_DIRS}) + endif() endif() if (HAVE_MOCK_CAMERA) diff --git a/src/cameras/uca-dexela-camera.c b/src/cameras/uca-dexela-camera.c new file mode 100644 index 0000000..576c769 --- /dev/null +++ b/src/cameras/uca-dexela-camera.c @@ -0,0 +1,164 @@ +/* Copyright (C) 2011, 2012 Mihael Koep <koep@softwareschneiderei.de> + (Softwareschneiderei GmbH) + + This library is free software; you can redistribute it and/or modify it + under the terms of the GNU Lesser General Public License as published by the + Free Software Foundation; either version 2.1 of the License, or (at your + option) any later version. + + This library is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more + details. + + You should have received a copy of the GNU Lesser General Public License along + with this library; if not, write to the Free Software Foundation, Inc., 51 + Franklin St, Fifth Floor, Boston, MA 02110, USA */ + +#include "uca-camera.h" +#include "uca-dexela-camera.h" +#include "uca-enums.h" + +#define UCA_DEXELA_CAMERA_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), UCA_TYPE_DEXELA_CAMERA, UcaDexelaCameraPrivate)) + +G_DEFINE_TYPE(UcaDexelaCamera, uca_dexela_camera, UCA_TYPE_CAMERA) +/** + * UcaDexelaCameraError: + * @UCA_DEXELA_CAMERA_ERROR_LIBPCO_INIT: Initializing libdexela failed + */ +GQuark uca_pco_camera_error_quark() +{ + return g_quark_from_static_string("uca-dexela-camera-error-quark"); +} + +enum { + PROP_SENSOR_EXTENDED = N_BASE_PROPERTIES, + N_PROPERTIES +}; + +static gint base_overrideables[] = { + PROP_NAME, + PROP_SENSOR_WIDTH, + PROP_SENSOR_HEIGHT, + PROP_SENSOR_BITDEPTH, + PROP_SENSOR_HORIZONTAL_BINNING, + PROP_SENSOR_HORIZONTAL_BINNINGS, + PROP_SENSOR_VERTICAL_BINNING, + PROP_SENSOR_VERTICAL_BINNINGS, + PROP_SENSOR_MAX_FRAME_RATE, + PROP_EXPOSURE_TIME, + PROP_TRIGGER_MODE, + PROP_ROI_X, + PROP_ROI_Y, + PROP_ROI_WIDTH, + PROP_ROI_HEIGHT, + PROP_ROI_WIDTH_MULTIPLIER, + PROP_ROI_HEIGHT_MULTIPLIER, + PROP_HAS_STREAMING, + PROP_HAS_CAMRAM_RECORDING, + 0 +}; + +static GParamSpec *dexela_properties[N_PROPERTIES] = { NULL, }; + +struct _UcaDexelaCameraPrivate { +}; + +UcaDexelaCamera *uca_dexela_camera_new(GError **error) +{ + UcaDexelaCamera *camera = g_object_new(UCA_TYPE_DEXELA_CAMERA, NULL); + UcaDexelaCameraPrivate *priv = UCA_DEXELA_CAMERA_GET_PRIVATE(camera); + /* + * Here we override property ranges because we didn't know them at property + * installation time. + */ + GObjectClass *camera_class = G_OBJECT_CLASS (UCA_CAMERA_GET_CLASS (camera)); + return camera; +} + +static void uca_dexela_camera_set_property(GObject *object, guint property_id, const GValue *value, GParamSpec *pspec) +{ + UcaDexelaCameraPrivate *priv = UCA_DEXELA_CAMERA_GET_PRIVATE(object); + + switch (property_id) { + case PROP_EXPOSURE_TIME: + { + // TODO set exposure time + + } + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec); + return; + } +} + +static void uca_dexela_camera_get_property(GObject *object, guint property_id, GValue *value, GParamSpec *pspec) +{ + UcaDexelaCameraPrivate *priv = UCA_DEXELA_CAMERA_GET_PRIVATE(object); + + switch (property_id) { + case PROP_EXPOSURE_TIME: + { + // TODO read exposure time + } + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec); + break; + } +} + +static void uca_dexela_camera_start_recording(UcaCamera *camera, GError **error) +{ +} + +static void uca_dexela_camera_stop_recording(UcaCamera *camera, GError **error) +{ +} + +static void uca_dexela_camera_start_readout(UcaCamera *camera, GError **error) +{ +} + +static void uca_dexela_camera_trigger(UcaCamera *camera, GError **error) +{ +} + +static void uca_dexela_camera_grab(UcaCamera *camera, gpointer *data, GError **error) +{ +} + +static void uca_dexela_camera_finalize(GObject *object) +{ + UcaDexelaCameraPrivate *priv = UCA_DEXELA_CAMERA_GET_PRIVATE(object); + G_OBJECT_CLASS(uca_dexela_camera_parent_class)->finalize(object); +} + +static void uca_dexela_camera_class_init(UcaDexelaCameraClass *klass) +{ + GObjectClass *gobject_class = G_OBJECT_CLASS(klass); + gobject_class->set_property = uca_dexela_camera_set_property; + gobject_class->get_property = uca_dexela_camera_get_property; + gobject_class->finalize = uca_dexela_camera_finalize; + + UcaCameraClass *camera_class = UCA_CAMERA_CLASS(klass); + camera_class->start_recording = uca_dexela_camera_start_recording; + camera_class->stop_recording = uca_dexela_camera_stop_recording; + camera_class->start_readout = uca_dexela_camera_start_readout; + camera_class->trigger = uca_dexela_camera_trigger; + camera_class->grab = uca_dexela_camera_grab; + + for (guint i = 0; base_overrideables[i] != 0; i++) + g_object_class_override_property(gobject_class, base_overrideables[i], uca_camera_props[base_overrideables[i]]); + + for (guint id = N_BASE_PROPERTIES; id < N_PROPERTIES; id++) { + g_object_class_install_property(gobject_class, id, dexela_properties[id]); + } + g_type_class_add_private(klass, sizeof(UcaDexelaCameraPrivate)); +} + +static void uca_dexela_camera_init(UcaDexelaCamera *self) +{ + self->priv = UCA_DEXELA_CAMERA_GET_PRIVATE(self); +} diff --git a/src/cameras/uca-dexela-camera.h b/src/cameras/uca-dexela-camera.h new file mode 100644 index 0000000..9badf10 --- /dev/null +++ b/src/cameras/uca-dexela-camera.h @@ -0,0 +1,68 @@ +/* Copyright (C) 2011, 2012 Mihael Koep <koep@softwareschneiderei.de> + (Softwareschneiderei GmbH) + + This library is free software; you can redistribute it and/or modify it + under the terms of the GNU Lesser General Public License as published by the + Free Software Foundation; either version 2.1 of the License, or (at your + option) any later version. + + This library is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more + details. + + You should have received a copy of the GNU Lesser General Public License along + with this library; if not, write to the Free Software Foundation, Inc., 51 + Franklin St, Fifth Floor, Boston, MA 02110, USA */ + +#ifndef __UCA_DEXELA_CAMERA_H +#define __UCA_DEXELA_CAMERA_H + +#include <glib-object.h> +#include "uca-camera.h" + +#define UCA_TYPE_DEXELA_CAMERA (uca_dexela_camera_get_type()) +#define UCA_DEXELA_CAMERA(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), UCA_TYPE_DEXELA_CAMERA, UcaDexelaCamera)) +#define UCA_IS_DEXELA_CAMERA(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), UCA_TYPE_DEXELA_CAMERA)) +#define UCA_DEXELA_CAMERA_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), UCA_TYPE_DEXELA_CAMERA, UcaDexelaCameraClass)) +#define UCA_IS_DEXELA_CAMERA_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), UCA_TYPE_DEXELA_CAMERA)) +#define UCA_DEXELA_CAMERA_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), UCA_TYPE_DEXELA_CAMERA, UcaDexelaCameraClass)) + +#define UCA_DEXELA_CAMERA_ERROR uca_dexela_camera_error_quark() +typedef enum { + UCA_DEXELA_CAMERA_ERROR_LIBPCO_INIT, +} UcaDexelaCameraError; + +typedef struct _UcaDexelaCamera UcaDexelaCamera; +typedef struct _UcaDexelaCameraClass UcaDexelaCameraClass; +typedef struct _UcaDexelaCameraPrivate UcaDexelaCameraPrivate; + +/** + * UcaDexelaCamera: + * + * Creates #UcaDexelaCamera instances by loading corresponding shared objects. The + * contents of the #UcaDexelaCamera structure are private and should only be + * accessed via the provided API. + */ +struct _UcaDexelaCamera { + /*< private >*/ + UcaCamera parent; + + UcaDexelaCameraPrivate *priv; +}; + +/** + * UcaDexelaCameraClass: + * + * #UcaDexelaCamera class + */ +struct _UcaDexelaCameraClass { + /*< private >*/ + UcaCameraClass parent; +}; + +UcaDexelaCamera *uca_dexela_camera_new(GError **error); + +GType uca_dexela_camera_get_type(void); + +#endif diff --git a/src/config.h.in b/src/config.h.in index e3911a1..ec1fb62 100644 --- a/src/config.h.in +++ b/src/config.h.in @@ -3,6 +3,7 @@ #cmakedefine HAVE_PHOTRON_FASTCAM #cmakedefine HAVE_UFO_CAMERA #cmakedefine HAVE_PYLON_CAMERA +#cmakedefine HAVE_DEXELA_CL #cmakedefine HAVE_MOCK_CAMERA #define CONTROL_GLADE_PATH "${CMAKE_INSTALL_PREFIX}/share/libuca/control.glade" diff --git a/src/uca-camera.c b/src/uca-camera.c index 78adae3..6b4b9f1 100644 --- a/src/uca-camera.c +++ b/src/uca-camera.c @@ -40,6 +40,10 @@ #include "cameras/uca-pf-camera.h" #endif +#ifdef HAVE_DEXELA_CL +#include "cameras/uca-dexela-camera.h" +#endif + #define UCA_CAMERA_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), UCA_TYPE_CAMERA, UcaCameraPrivate)) G_DEFINE_TYPE(UcaCamera, uca_camera, G_TYPE_OBJECT) @@ -81,6 +85,9 @@ static gchar *uca_camera_types[] = { #ifdef HAVE_PHOTON_FOCUS "pf", #endif +#ifdef HAVE_DEXELA_CL + "dexela", +#endif NULL }; |