From f39be2686446c41a5fbf93eba7fb40ca99efcc3a Mon Sep 17 00:00:00 2001 From: Mihael Koep Date: Tue, 9 Sep 2014 13:57:32 +0200 Subject: Add software roi feature to dexela plugin --- plugins/dexela/uca-dexela-camera.c | 52 +++++++++++++++++++++++++++++++++----- 1 file changed, 46 insertions(+), 6 deletions(-) (limited to 'plugins/dexela/uca-dexela-camera.c') diff --git a/plugins/dexela/uca-dexela-camera.c b/plugins/dexela/uca-dexela-camera.c index 4c30ad7..9269457 100644 --- a/plugins/dexela/uca-dexela-camera.c +++ b/plugins/dexela/uca-dexela-camera.c @@ -20,6 +20,7 @@ #include #include "uca-dexela-camera.h" #include "dexela/dexela_api.h" +#include "software-roi.h" #define UCA_DEXELA_CAMERA_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), UCA_TYPE_DEXELA_CAMERA, UcaDexelaCameraPrivate)) @@ -73,6 +74,10 @@ struct _UcaDexelaCameraPrivate { GValueArray *binnings; guint width; guint height; + guint roi_x; + guint roi_y; + guint roi_width; + guint roi_height; guint bits; gsize num_bytes; }; @@ -182,14 +187,24 @@ static void uca_dexela_camera_get_property(GObject *object, guint property_id, G g_value_set_uint(value, priv->height); break; } + case PROP_ROI_X: + { + g_value_set_uint(value, priv->roi_x); + break; + } + case PROP_ROI_Y: + { + g_value_set_uint(value, priv->roi_y); + break; + } case PROP_ROI_WIDTH: { - g_value_set_uint(value, dexela_get_width()); + g_value_set_uint(value, priv->roi_width); break; } case PROP_ROI_HEIGHT: { - g_value_set_uint(value, dexela_get_height()); + g_value_set_uint(value, priv->roi_height); break; } case PROP_SENSOR_HORIZONTAL_BINNING: @@ -246,6 +261,26 @@ static void uca_dexela_camera_set_property(GObject *object, guint property_id, c dexela_set_exposure_time_micros((gint) (exposureTimeInSeconds * MICROS_TO_SECONDS_FACTOR)); break; } + case PROP_ROI_X: + { + priv->roi_x = g_value_get_uint(value); + break; + } + case PROP_ROI_Y: + { + priv->roi_y = g_value_get_uint(value); + break; + } + case PROP_ROI_WIDTH: + { + priv->roi_width = g_value_get_uint(value); + break; + } + case PROP_ROI_HEIGHT: + { + priv->roi_height = g_value_get_uint(value); + break; + } case PROP_SENSOR_HORIZONTAL_BINNING: { const guint horizontalBinning = g_value_get_uint(value); @@ -315,9 +350,10 @@ static void uca_dexela_camera_stop_recording(UcaCamera *camera, GError **error) static gboolean uca_dexela_camera_grab(UcaCamera *camera, gpointer data, GError **error) { g_debug("grab called"); - g_return_if_fail(UCA_IS_DEXELA_CAMERA(camera)); + g_return_val_if_fail(UCA_IS_DEXELA_CAMERA(camera), FALSE); UcaDexelaCameraPrivate *priv = UCA_DEXELA_CAMERA_GET_PRIVATE(camera); - memcpy((gchar *) data, dexela_grab(), priv->width * priv->height * priv->num_bytes); + guchar* fullFrame = dexela_grab(); + apply_software_roi(fullFrame, priv->width, data, priv->roi_x, priv->roi_y, priv->roi_width, priv->roi_height); return TRUE; } @@ -361,12 +397,12 @@ static void uca_dexela_camera_class_init(UcaDexelaCameraClass *klass) 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]]); } - dexela_properties[PROP_GAIN_MODE] = + dexela_properties[PROP_GAIN_MODE] = g_param_spec_uint("gain-mode", "High or Low Full Well", "High (1) or Low (0) Full Well", 0, 1, 0, G_PARAM_READWRITE); - dexela_properties[PROP_TEST_MODE] = + dexela_properties[PROP_TEST_MODE] = g_param_spec_boolean("test-mode", "Enable or disable test mode", "Enable (true) or disable (false) test mode", @@ -388,6 +424,10 @@ static void uca_dexela_camera_init(UcaDexelaCamera *self) priv->bits = dexela_get_bit_depth(); priv->width = dexela_get_width(); priv->height = dexela_get_height(); + priv->roi_x = 0; + priv->roi_y = 0; + priv->roi_width = priv->width; + priv->roi_height = priv->height; priv->num_bytes = 2; } -- cgit v1.2.3 From 718cb1e5d2059b5d88bfe34d8c8bcca6a4550249 Mon Sep 17 00:00:00 2001 From: Mihael Koep Date: Tue, 16 Sep 2014 11:34:47 +0200 Subject: Fix dexela software roi for multi-byte images --- plugins/dexela/uca-dexela-camera.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'plugins/dexela/uca-dexela-camera.c') diff --git a/plugins/dexela/uca-dexela-camera.c b/plugins/dexela/uca-dexela-camera.c index 9269457..5b9c524 100644 --- a/plugins/dexela/uca-dexela-camera.c +++ b/plugins/dexela/uca-dexela-camera.c @@ -353,7 +353,7 @@ static gboolean uca_dexela_camera_grab(UcaCamera *camera, gpointer data, GError g_return_val_if_fail(UCA_IS_DEXELA_CAMERA(camera), FALSE); UcaDexelaCameraPrivate *priv = UCA_DEXELA_CAMERA_GET_PRIVATE(camera); guchar* fullFrame = dexela_grab(); - apply_software_roi(fullFrame, priv->width, data, priv->roi_x, priv->roi_y, priv->roi_width, priv->roi_height); + apply_software_roi(fullFrame, priv->width, priv->num_bytes, data, priv->roi_x, priv->roi_y, priv->roi_width, priv->roi_height); return TRUE; } -- cgit v1.2.3 From 9acde9b885637f3a6be2dbd2b3f14f0d1d211c9b Mon Sep 17 00:00:00 2001 From: Mihael Koep Date: Tue, 9 Sep 2014 16:53:17 +0200 Subject: Define minimun exposure time and enforce it --- plugins/dexela/uca-dexela-camera.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'plugins/dexela/uca-dexela-camera.c') diff --git a/plugins/dexela/uca-dexela-camera.c b/plugins/dexela/uca-dexela-camera.c index 5b9c524..cefd228 100644 --- a/plugins/dexela/uca-dexela-camera.c +++ b/plugins/dexela/uca-dexela-camera.c @@ -18,6 +18,7 @@ #include #include #include +#include #include "uca-dexela-camera.h" #include "dexela/dexela_api.h" #include "software-roi.h" @@ -69,6 +70,7 @@ static gint base_overrideables[] = { static GParamSpec *dexela_properties[N_PROPERTIES] = { NULL, }; static const gdouble MICROS_TO_SECONDS_FACTOR = 1e6d; +static const gdouble MINIMUM_EXPOSURE_TIME_IN_SECONDS = 0.017d; // 17ms as per documentation struct _UcaDexelaCameraPrivate { GValueArray *binnings; @@ -257,7 +259,7 @@ static void uca_dexela_camera_set_property(GObject *object, guint property_id, c switch (property_id) { case PROP_EXPOSURE_TIME: { - const gdouble exposureTimeInSeconds = g_value_get_double(value); + const gdouble exposureTimeInSeconds = fmax(MINIMUM_EXPOSURE_TIME_IN_SECONDS, g_value_get_double(value)); dexela_set_exposure_time_micros((gint) (exposureTimeInSeconds * MICROS_TO_SECONDS_FACTOR)); break; } -- cgit v1.2.3 From abe92df0c159414acf3dcaae28d7b7b3734b27c6 Mon Sep 17 00:00:00 2001 From: Mihael Koep Date: Tue, 16 Sep 2014 11:55:51 +0200 Subject: Implement pixel size properties --- plugins/dexela/uca-dexela-camera.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'plugins/dexela/uca-dexela-camera.c') diff --git a/plugins/dexela/uca-dexela-camera.c b/plugins/dexela/uca-dexela-camera.c index cefd228..db808fc 100644 --- a/plugins/dexela/uca-dexela-camera.c +++ b/plugins/dexela/uca-dexela-camera.c @@ -49,6 +49,8 @@ static gint base_overrideables[] = { PROP_NAME, PROP_SENSOR_WIDTH, PROP_SENSOR_HEIGHT, + PROP_SENSOR_PIXEL_WIDTH, + PROP_SENSOR_PIXEL_HEIGHT, PROP_SENSOR_BITDEPTH, PROP_SENSOR_HORIZONTAL_BINNING, PROP_SENSOR_HORIZONTAL_BINNINGS, @@ -71,6 +73,7 @@ static GParamSpec *dexela_properties[N_PROPERTIES] = { NULL, }; static const gdouble MICROS_TO_SECONDS_FACTOR = 1e6d; static const gdouble MINIMUM_EXPOSURE_TIME_IN_SECONDS = 0.017d; // 17ms as per documentation +static const gdouble PIXEL_SIZE = 74.8e-6; // 74.8µm as per data sheet struct _UcaDexelaCameraPrivate { GValueArray *binnings; @@ -189,6 +192,16 @@ static void uca_dexela_camera_get_property(GObject *object, guint property_id, G g_value_set_uint(value, priv->height); break; } + case PROP_SENSOR_PIXEL_WIDTH: + { + g_value_set_double(value, PIXEL_SIZE); + break; + } + case PROP_SENSOR_PIXEL_HEIGHT: + { + g_value_set_double(value, PIXEL_SIZE); + break; + } case PROP_ROI_X: { g_value_set_uint(value, priv->roi_x); -- cgit v1.2.3 From d35c0cf63f1174932b5a3bccb5f1db0a2e9bacc9 Mon Sep 17 00:00:00 2001 From: Mihael Koep Date: Tue, 9 Sep 2014 16:54:43 +0200 Subject: Change trigger mode mapping to better match libuca rules --- plugins/dexela/uca-dexela-camera.c | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) (limited to 'plugins/dexela/uca-dexela-camera.c') diff --git a/plugins/dexela/uca-dexela-camera.c b/plugins/dexela/uca-dexela-camera.c index db808fc..49f4635 100644 --- a/plugins/dexela/uca-dexela-camera.c +++ b/plugins/dexela/uca-dexela-camera.c @@ -85,6 +85,7 @@ struct _UcaDexelaCameraPrivate { guint roi_height; guint bits; gsize num_bytes; + UcaCameraTrigger uca_trigger_mode; }; /** @@ -104,26 +105,26 @@ static void fill_binnings(UcaDexelaCameraPrivate *priv) g_value_array_append(priv->binnings, &val); } -static void map_dexela_trigger_mode_to_uca(GValue* value, TriggerMode mode) +static void map_dexela_trigger_mode_to_uca(UcaDexelaCameraPrivate *priv, GValue* value, TriggerMode mode) { if (mode == SOFTWARE) { - g_value_set_enum(value, UCA_CAMERA_TRIGGER_SOFTWARE); + g_value_set_enum(value, priv->uca_trigger_mode); return; } if (mode == EDGE) { g_value_set_enum(value, UCA_CAMERA_TRIGGER_EXTERNAL); return; } - // XXX: this mapping is only a hack/guess - if (mode == DURATION) { - g_value_set_enum(value, UCA_CAMERA_TRIGGER_AUTO); - return; - } g_warning("Unsupported dexela trigger mode: %d", mode); } -static void set_trigger_mode(UcaCameraTrigger mode) +static void set_trigger_mode(UcaDexelaCameraPrivate *priv, UcaCameraTrigger mode) { + priv->uca_trigger_mode = mode; + if (mode == UCA_CAMERA_TRIGGER_AUTO) { + dexela_set_trigger_mode(SOFTWARE); + return; + } if (mode == UCA_CAMERA_TRIGGER_SOFTWARE) { dexela_set_trigger_mode(SOFTWARE); return; @@ -132,10 +133,6 @@ static void set_trigger_mode(UcaCameraTrigger mode) dexela_set_trigger_mode(EDGE); return; } - if (mode == UCA_CAMERA_TRIGGER_AUTO) { - dexela_set_trigger_mode(DURATION); - return; - } g_warning("Unsupported uca trigger mode: %d", mode); } @@ -254,7 +251,7 @@ static void uca_dexela_camera_get_property(GObject *object, guint property_id, G } case PROP_TRIGGER_MODE: { - map_dexela_trigger_mode_to_uca(value, dexela_get_trigger_mode()); + map_dexela_trigger_mode_to_uca(priv, value, dexela_get_trigger_mode()); break; } default: @@ -341,7 +338,7 @@ static void uca_dexela_camera_set_property(GObject *object, guint property_id, c } case PROP_TRIGGER_MODE: { - set_trigger_mode(g_value_get_enum(value)); + set_trigger_mode(priv, g_value_get_enum(value)); break; } default: @@ -367,6 +364,10 @@ static gboolean uca_dexela_camera_grab(UcaCamera *camera, gpointer data, GError g_debug("grab called"); g_return_val_if_fail(UCA_IS_DEXELA_CAMERA(camera), FALSE); UcaDexelaCameraPrivate *priv = UCA_DEXELA_CAMERA_GET_PRIVATE(camera); + + if (priv->uca_trigger_mode == UCA_CAMERA_TRIGGER_SOFTWARE) { + // TODO: wait for a signal from uca_camera_trigger() + } guchar* fullFrame = dexela_grab(); apply_software_roi(fullFrame, priv->width, priv->num_bytes, data, priv->roi_x, priv->roi_y, priv->roi_width, priv->roi_height); return TRUE; @@ -444,6 +445,7 @@ static void uca_dexela_camera_init(UcaDexelaCamera *self) priv->roi_width = priv->width; priv->roi_height = priv->height; priv->num_bytes = 2; + priv->uca_trigger_mode = UCA_CAMERA_TRIGGER_AUTO; } G_MODULE_EXPORT GType -- cgit v1.2.3