diff options
| author | Matthias Vogelgesang <matthias.vogelgesang@kit.edu> | 2014-09-10 11:09:39 +0200 |
|---|---|---|
| committer | Matthias Vogelgesang <matthias.vogelgesang@kit.edu> | 2014-09-10 11:09:39 +0200 |
| commit | 499a4716e19b115d68c39385a87f9bbe4b44bb4e (patch) | |
| tree | 7d759e2332d3df0f9d3c8d0392fea28498269b5b /src | |
| parent | d4a7a6b344d89ba36963cfca60db5586b4597855 (diff) | |
| download | uca-499a4716e19b115d68c39385a87f9bbe4b44bb4e.tar.gz uca-499a4716e19b115d68c39385a87f9bbe4b44bb4e.tar.bz2 uca-499a4716e19b115d68c39385a87f9bbe4b44bb4e.tar.xz uca-499a4716e19b115d68c39385a87f9bbe4b44bb4e.zip | |
Fix #54: remove sensor-max-frame-rate
Diffstat (limited to 'src')
| -rw-r--r-- | src/uca-camera.c | 27 | ||||
| -rw-r--r-- | src/uca-camera.h | 1 |
2 files changed, 3 insertions, 25 deletions
diff --git a/src/uca-camera.c b/src/uca-camera.c index fce3d12..fbd251f 100644 --- a/src/uca-camera.c +++ b/src/uca-camera.c @@ -101,7 +101,6 @@ const gchar *uca_camera_props[N_BASE_PROPERTIES] = { "sensor-horizontal-binnings", "sensor-vertical-binning", "sensor-vertical-binnings", - "sensor-max-frame-rate", "trigger-mode", "exposure-time", "frames-per-second", @@ -169,13 +168,6 @@ uca_camera_set_property (GObject *object, guint property_id, const GValue *value { gdouble frames_per_second; frames_per_second = g_value_get_double (value); - - gfloat max_framerate; - g_object_get (object, "sensor-max-frame-rate", &max_framerate, NULL); - - if (max_framerate < frames_per_second) - frames_per_second = max_framerate; - g_object_set (object, "exposure-time", 1. / frames_per_second, NULL); } break; @@ -224,16 +216,11 @@ uca_camera_get_property(GObject *object, guint property_id, GValue *value, GPara gdouble exposure_time; g_object_get (object, "exposure-time", &exposure_time, NULL); - if (exposure_time > 0) - { + + if (exposure_time > 0.0) g_value_set_double (value, 1. / exposure_time); - } else - { - gfloat max_framerate; - g_object_get (object, "sensor-max-frame-rate", &max_framerate, NULL); - g_value_set_double (value, max_framerate); - } + g_warning ("Invalid `::exposure-time' set"); } break; @@ -424,13 +411,6 @@ uca_camera_class_init (UcaCameraClass *klass) 1, G_MAXUINT, 1, G_PARAM_READABLE), G_PARAM_READABLE); - camera_properties[PROP_SENSOR_MAX_FRAME_RATE] = - g_param_spec_float(uca_camera_props[PROP_SENSOR_MAX_FRAME_RATE], - "Maximum frame rate", - "Maximum frame rate at full frame resolution", - 0.0f, G_MAXFLOAT, 1.0f, - G_PARAM_READABLE); - camera_properties[PROP_TRIGGER_MODE] = g_param_spec_enum("trigger-mode", "Trigger mode", @@ -587,7 +567,6 @@ uca_camera_init (UcaCamera *camera) uca_camera_set_property_unit (camera_properties[PROP_SENSOR_BITDEPTH], UCA_UNIT_COUNT); uca_camera_set_property_unit (camera_properties[PROP_SENSOR_HORIZONTAL_BINNING], UCA_UNIT_PIXEL); uca_camera_set_property_unit (camera_properties[PROP_SENSOR_VERTICAL_BINNING], UCA_UNIT_PIXEL); - uca_camera_set_property_unit (camera_properties[PROP_SENSOR_MAX_FRAME_RATE], UCA_UNIT_COUNT); uca_camera_set_property_unit (camera_properties[PROP_EXPOSURE_TIME], UCA_UNIT_SECOND); uca_camera_set_property_unit (camera_properties[PROP_FRAMES_PER_SECOND], UCA_UNIT_COUNT); uca_camera_set_property_unit (camera_properties[PROP_ROI_X], UCA_UNIT_PIXEL); diff --git a/src/uca-camera.h b/src/uca-camera.h index d958870..62a6c89 100644 --- a/src/uca-camera.h +++ b/src/uca-camera.h @@ -77,7 +77,6 @@ enum { PROP_SENSOR_HORIZONTAL_BINNINGS, PROP_SENSOR_VERTICAL_BINNING, PROP_SENSOR_VERTICAL_BINNINGS, - PROP_SENSOR_MAX_FRAME_RATE, PROP_TRIGGER_MODE, PROP_EXPOSURE_TIME, PROP_FRAMES_PER_SECOND, |