diff options
| author | Matthias Vogelgesang <matthias.vogelgesang@kit.edu> | 2014-09-10 11:18:15 +0200 |
|---|---|---|
| committer | Matthias Vogelgesang <matthias.vogelgesang@kit.edu> | 2014-09-10 11:18:15 +0200 |
| commit | 761414259c36d447fb3aaabe2239cfd09b33b05f (patch) | |
| tree | c4fe17a442ca16be101ded484060459ac1921532 | |
| parent | 1d3206f4e9a54412aa3e7bba5f10691559093316 (diff) | |
| download | uca-761414259c36d447fb3aaabe2239cfd09b33b05f.tar.gz uca-761414259c36d447fb3aaabe2239cfd09b33b05f.tar.bz2 uca-761414259c36d447fb3aaabe2239cfd09b33b05f.tar.xz uca-761414259c36d447fb3aaabe2239cfd09b33b05f.zip | |
Finish removal of "sensor-max-frame-rate"
| -rw-r--r-- | plugins/dexela/uca-dexela-camera.c | 7 | ||||
| -rw-r--r-- | plugins/pf/uca-pf-camera.c | 4 | ||||
| -rw-r--r-- | plugins/pylon/uca-pylon-camera.c | 5 | ||||
| -rw-r--r-- | plugins/ufo/uca-ufo-camera.c | 4 |
4 files changed, 0 insertions, 20 deletions
diff --git a/plugins/dexela/uca-dexela-camera.c b/plugins/dexela/uca-dexela-camera.c index 287ba5c..4c30ad7 100644 --- a/plugins/dexela/uca-dexela-camera.c +++ b/plugins/dexela/uca-dexela-camera.c @@ -52,7 +52,6 @@ static gint base_overrideables[] = { 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, @@ -213,12 +212,6 @@ static void uca_dexela_camera_get_property(GObject *object, guint property_id, G g_value_set_boxed(value, priv->binnings); break; } - case PROP_SENSOR_MAX_FRAME_RATE: - { - // TODO: we do not know how to compute the correct value, so just return 0 for now - g_value_set_float(value, 0.0f); - break; - } case PROP_GAIN_MODE: { g_value_set_uint(value, dexela_get_gain()); diff --git a/plugins/pf/uca-pf-camera.c b/plugins/pf/uca-pf-camera.c index bc98e31..6515700 100644 --- a/plugins/pf/uca-pf-camera.c +++ b/plugins/pf/uca-pf-camera.c @@ -71,7 +71,6 @@ static gint base_overrideables[] = { PROP_SENSOR_WIDTH, PROP_SENSOR_HEIGHT, PROP_SENSOR_BITDEPTH, - PROP_SENSOR_MAX_FRAME_RATE, PROP_EXPOSURE_TIME, PROP_ROI_X, PROP_ROI_Y, @@ -229,9 +228,6 @@ uca_pf_camera_get_property(GObject *object, guint property_id, GValue *value, GP case PROP_SENSOR_BITDEPTH: g_value_set_uint(value, 8); break; - case PROP_SENSOR_MAX_FRAME_RATE: - g_value_set_float(value, 488.0); - break; case PROP_HAS_STREAMING: g_value_set_boolean(value, TRUE); break; diff --git a/plugins/pylon/uca-pylon-camera.c b/plugins/pylon/uca-pylon-camera.c index 02d6795..134dda3 100644 --- a/plugins/pylon/uca-pylon-camera.c +++ b/plugins/pylon/uca-pylon-camera.c @@ -67,7 +67,6 @@ static gint base_overrideables[] = { PROP_SENSOR_HORIZONTAL_BINNINGS, PROP_SENSOR_VERTICAL_BINNING, PROP_SENSOR_VERTICAL_BINNINGS, - PROP_SENSOR_MAX_FRAME_RATE, PROP_TRIGGER_MODE, PROP_EXPOSURE_TIME, PROP_ROI_X, @@ -244,10 +243,6 @@ static void uca_pylon_camera_get_property(GObject *object, guint property_id, GV g_value_set_boxed(value, priv->binnings); break; - case PROP_SENSOR_MAX_FRAME_RATE: - g_value_set_float(value, 0.0); - break; - case PROP_TRIGGER_MODE: g_value_set_enum(value, UCA_CAMERA_TRIGGER_AUTO); break; diff --git a/plugins/ufo/uca-ufo-camera.c b/plugins/ufo/uca-ufo-camera.c index 4f83fcc..d718eb0 100644 --- a/plugins/ufo/uca-ufo-camera.c +++ b/plugins/ufo/uca-ufo-camera.c @@ -81,7 +81,6 @@ static gint base_overrideables[] = { PROP_NAME, PROP_SENSOR_WIDTH, PROP_SENSOR_HEIGHT, - PROP_SENSOR_MAX_FRAME_RATE, PROP_SENSOR_BITDEPTH, PROP_EXPOSURE_TIME, PROP_FRAMES_PER_SECOND, @@ -498,9 +497,6 @@ uca_ufo_camera_get_property(GObject *object, guint property_id, GValue *value, G case PROP_SENSOR_BITDEPTH: g_value_set_uint (value, priv->n_bits); break; - case PROP_SENSOR_MAX_FRAME_RATE: - g_value_set_float(value, 340.0); - break; case PROP_SENSOR_TEMPERATURE: { const double a = priv->frequency == FPGA_48MHZ ? 0.3 : 0.25; |