From 034204d3d8d1a32b1a20e50697c5f81db6fb20cf Mon Sep 17 00:00:00 2001
From: Matthias Vogelgesang <matthias.vogelgesang@gmail.com>
Date: Fri, 31 Aug 2012 23:14:16 +0200
Subject: Initial plugin manager

---
 test/test-mock.c | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'test/test-mock.c')

diff --git a/test/test-mock.c b/test/test-mock.c
index 7594a3a..625a3fe 100644
--- a/test/test-mock.c
+++ b/test/test-mock.c
@@ -1,6 +1,7 @@
 
 #include <glib.h>
 #include "uca-camera.h"
+#include "uca-plugin-manager.h"
 #include "cameras/uca-mock-camera.h"
 
 typedef struct {
@@ -160,6 +161,14 @@ static void test_signal(Fixture *fixture, gconstpointer data)
 int main(int argc, char *argv[])
 {
     g_type_init();
+
+    UcaPluginManager *manager = uca_plugin_manager_new ();
+    GList *list = uca_plugin_manager_get_available_cameras (manager);
+
+    g_list_free (list);
+
+    g_object_unref (manager);
+
     g_test_init(&argc, &argv, NULL);
     g_test_bug_base("http://ufo.kit.edu/ufo/ticket");
 
-- 
cgit v1.2.3


From ec0e31d89baf7cb6c2fb30ead081655886478609 Mon Sep 17 00:00:00 2001
From: Matthias Vogelgesang <matthias.vogelgesang@gmail.com>
Date: Fri, 21 Sep 2012 11:59:06 +0200
Subject: Port the unit tests to the plugin manager

---
 test/CMakeLists.txt |  26 ++++----
 test/test-mock.c    | 182 +++++++++++++++++++++++++++-------------------------
 2 files changed, 107 insertions(+), 101 deletions(-)

(limited to 'test/test-mock.c')

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 651c805..ee5b407 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -47,10 +47,6 @@ target_link_libraries(grab uca ${GLIB2_LIBRARIES} ${GOBJECT2_LIBRARIES})
 #add_executable(grab_pylon grab_pylon.c)
 #target_link_libraries(grab_pylon uca ${GLIB2_LIBRARIES} ${GOBJECT2_LIBRARIES})
 #
-#if (NOT DEFINED WITH_CONTROL_GUI)
-#    set(WITH_CONTROL_GUI TRUE)
-#endif()
-#
 if (GTK2_FOUND)
     include_directories(${GTK2_INCLUDE_DIRS})
 
@@ -69,17 +65,17 @@ if (GTK2_FOUND)
         DESTINATION share/libuca)
 endif()
 
-#if (HAVE_MOCK_CAMERA)
-#    add_executable(test-mock test-mock.c)
-#
-#    target_link_libraries(test-mock
-#        uca
-#        ${GLIB2_LIBRARIES}
-#        ${GOBJECT2_LIBRARIES})
-#
-#    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/gtester.xsl
-#        ${CMAKE_CURRENT_BINARY_DIR}/gtester.xsl)
-#endif()
+if (HAVE_MOCK_CAMERA)
+    add_executable(test-mock test-mock.c)
+
+    target_link_libraries(test-mock
+        uca
+        ${GLIB2_LIBRARIES}
+        ${GOBJECT2_LIBRARIES})
+
+    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/gtester.xsl
+        ${CMAKE_CURRENT_BINARY_DIR}/gtester.xsl)
+endif()
 
 #add_executable(test-all test-all.c)
 #target_link_libraries(test-all uca
diff --git a/test/test-mock.c b/test/test-mock.c
index 625a3fe..ca16c59 100644
--- a/test/test-mock.c
+++ b/test/test-mock.c
@@ -2,184 +2,194 @@
 #include <glib.h>
 #include "uca-camera.h"
 #include "uca-plugin-manager.h"
-#include "cameras/uca-mock-camera.h"
 
 typedef struct {
-    UcaMockCamera *camera;
+    UcaPluginManager *manager;
+    UcaCamera *camera;
 } Fixture;
 
-static void fixture_setup(Fixture *fixture, gconstpointer data)
+static void
+fixture_setup (Fixture *fixture, gconstpointer data)
 {
     GError *error = NULL;
-    fixture->camera = uca_mock_camera_new(&error);
-    g_assert(error == NULL);
-    g_assert(fixture->camera);
+
+    fixture->manager = uca_plugin_manager_new ();
+    uca_plugin_manager_add_path (fixture->manager, "./src");
+
+    fixture->camera = uca_plugin_manager_new_camera (fixture->manager, "mock", &error);
+    g_assert (error == NULL);
+    g_assert (fixture->camera);
 }
 
-static void fixture_teardown(Fixture *fixture, gconstpointer data)
+static void
+fixture_teardown (Fixture *fixture, gconstpointer data)
 {
-    g_object_unref(fixture->camera);
+    g_object_unref (fixture->camera);
+    g_object_unref (fixture->manager);
 }
 
-static void on_property_change(gpointer instance, GParamSpec *pspec, gpointer user_data)
+static void
+on_property_change (gpointer instance, GParamSpec *pspec, gpointer user_data)
 {
     gboolean *success = (gboolean *) user_data;
     *success = TRUE;
 }
 
-static void test_factory()
+static void
+test_factory (Fixture *fixture, gconstpointer data)
 {
     GError *error = NULL;
-    UcaCamera *camera = uca_camera_new("fox994m3a0yxmy", &error);
-    g_assert_error(error, UCA_CAMERA_ERROR, UCA_CAMERA_ERROR_NOT_FOUND);
-    g_assert(camera == NULL);
+    UcaCamera *camera = uca_plugin_manager_new_camera (fixture->manager, "fox994m3a0yxmy", &error);
+    g_assert_error (error, UCA_PLUGIN_MANAGER_ERROR, UCA_PLUGIN_MANAGER_ERROR_MODULE_NOT_FOUND);
+    g_assert (camera == NULL);
 }
 
-static void test_recording(Fixture *fixture, gconstpointer data)
+static void
+test_recording (Fixture *fixture, gconstpointer data)
 {
     GError *error = NULL;
-    UcaCamera *camera = UCA_CAMERA(fixture->camera);
+    UcaCamera *camera = UCA_CAMERA (fixture->camera);
 
-    uca_camera_stop_recording(camera, &error);
-    g_assert_error(error, UCA_CAMERA_ERROR, UCA_CAMERA_ERROR_NOT_RECORDING);
-    g_error_free(error);
+    uca_camera_stop_recording (camera, &error);
+    g_assert_error (error, UCA_CAMERA_ERROR, UCA_CAMERA_ERROR_NOT_RECORDING);
+    g_error_free (error);
 
     error = NULL;
-    uca_camera_start_recording(camera, &error);
-    g_assert_no_error(error);
-    uca_camera_stop_recording(camera, &error);
-    g_assert_no_error(error);
+    uca_camera_start_recording (camera, &error);
+    g_assert_no_error (error);
+    uca_camera_stop_recording (camera, &error);
+    g_assert_no_error (error);
 }
 
-static void test_recording_signal(Fixture *fixture, gconstpointer data)
+static void
+test_recording_signal (Fixture *fixture, gconstpointer data)
 {
-    UcaCamera *camera = UCA_CAMERA(fixture->camera);
+    UcaCamera *camera = UCA_CAMERA (fixture->camera);
     gboolean success = FALSE;
-    g_signal_connect(G_OBJECT(camera), "notify::is-recording", 
+    g_signal_connect (G_OBJECT (camera), "notify::is-recording",
             (GCallback) on_property_change, &success);
 
-    uca_camera_start_recording(camera, NULL);
-    g_assert(success == TRUE);
+    uca_camera_start_recording (camera, NULL);
+    g_assert (success == TRUE);
 
     success = FALSE;
-    uca_camera_stop_recording(camera, NULL);
-    g_assert(success == TRUE);
+    uca_camera_stop_recording (camera, NULL);
+    g_assert (success == TRUE);
 }
 
-static void grab_func(gpointer data, gpointer user_data)
+static void
+grab_func (gpointer data, gpointer user_data)
 {
     guint *count = (guint *) user_data;
     *count += 1;
 }
 
-static void test_recording_async(Fixture *fixture, gconstpointer data)
+static void
+test_recording_async (Fixture *fixture, gconstpointer data)
 {
-    UcaCamera *camera = UCA_CAMERA(fixture->camera);
+    UcaCamera *camera = UCA_CAMERA (fixture->camera);
 
     guint count = 0;
-    uca_camera_set_grab_func(camera, grab_func, &count);
+    uca_camera_set_grab_func (camera, grab_func, &count);
 
-    g_object_set(G_OBJECT(camera),
+    g_object_set (G_OBJECT (camera),
             "frame-rate", 10.0,
             "transfer-asynchronously", TRUE,
             NULL);
 
     GError *error = NULL;
-    uca_camera_start_recording(camera, &error);
-    g_assert_no_error(error);
+    uca_camera_start_recording (camera, &error);
+    g_assert_no_error (error);
 
     /*
      * We sleep for an 1/8 of a second at 10 frames per second, thus we should
      * record 2 frames.
      */
-    g_usleep(G_USEC_PER_SEC / 8);
+    g_usleep (G_USEC_PER_SEC / 8);
 
-    uca_camera_stop_recording(camera, &error);
-    g_assert_no_error(error);
-    g_assert_cmpint(count, ==, 2);
+    uca_camera_stop_recording (camera, &error);
+    g_assert_no_error (error);
+    g_assert_cmpint (count, ==, 2);
 }
 
-static void test_recording_property(Fixture *fixture, gconstpointer data)
+static void
+test_recording_property (Fixture *fixture, gconstpointer data)
 {
-    UcaCamera *camera = UCA_CAMERA(fixture->camera);
+    UcaCamera *camera = UCA_CAMERA (fixture->camera);
 
     gboolean is_recording = FALSE;
-    uca_camera_start_recording(camera, NULL);
-    g_object_get(G_OBJECT(camera),
+    uca_camera_start_recording (camera, NULL);
+    g_object_get (G_OBJECT (camera),
             "is-recording", &is_recording,
             NULL);
-    g_assert(is_recording == TRUE);
+    g_assert (is_recording == TRUE);
 
-    uca_camera_stop_recording(camera, NULL);
-    g_object_get(G_OBJECT(camera),
+    uca_camera_stop_recording (camera, NULL);
+    g_object_get (G_OBJECT (camera),
             "is-recording", &is_recording,
             NULL);
-    g_assert(is_recording == FALSE);
+    g_assert (is_recording == FALSE);
 }
 
-static void test_base_properties(Fixture *fixture, gconstpointer data)
+static void
+test_base_properties (Fixture *fixture, gconstpointer data)
 {
-    UcaCamera *camera = UCA_CAMERA(fixture->camera);
+    UcaCamera *camera = UCA_CAMERA (fixture->camera);
     guint n_properties = 0;
-    GParamSpec **properties = g_object_class_list_properties(G_OBJECT_GET_CLASS(camera), &n_properties);
+    GParamSpec **properties = g_object_class_list_properties (G_OBJECT_GET_CLASS (camera), &n_properties);
     GValue val = {0};
 
     for (guint i = 0; i < n_properties; i++) {
-        g_value_init(&val, properties[i]->value_type);
-        g_object_get_property(G_OBJECT(camera), properties[i]->name, &val);
-        g_value_unset(&val);
+        g_value_init (&val, properties[i]->value_type);
+        g_object_get_property (G_OBJECT (camera), properties[i]->name, &val);
+        g_value_unset (&val);
     }
 
-    g_free(properties);
+    g_free (properties);
 }
 
-static void test_binnings_properties(Fixture *fixture, gconstpointer data)
+static void
+test_binnings_properties (Fixture *fixture, gconstpointer data)
 {
-    UcaCamera *camera = UCA_CAMERA(fixture->camera);
+    UcaCamera *camera = UCA_CAMERA (fixture->camera);
 
     GValueArray *array = NULL;
-    g_object_get(G_OBJECT(camera),
+    g_object_get (G_OBJECT (camera),
             "sensor-horizontal-binnings", &array,
             NULL);
 
-    GValue *value = g_value_array_get_nth(array, 0);
-    g_assert(value != NULL);
-    g_assert(g_value_get_uint(value) == 1);
+    GValue *value = g_value_array_get_nth (array, 0);
+    g_assert (value != NULL);
+    g_assert (g_value_get_uint (value) == 1);
 }
 
-static void test_signal(Fixture *fixture, gconstpointer data)
+static void
+test_signal (Fixture *fixture, gconstpointer data)
 {
-    UcaCamera *camera = UCA_CAMERA(fixture->camera);
+    UcaCamera *camera = UCA_CAMERA (fixture->camera);
     gboolean success = FALSE;
-    g_signal_connect(camera, "notify::frame-rate", (GCallback) on_property_change, &success);
-    g_object_set(G_OBJECT(camera),
+    g_signal_connect (camera, "notify::frame-rate", (GCallback) on_property_change, &success);
+    g_object_set (G_OBJECT (camera),
             "frame-rate", 30.0,
             NULL);
-    g_assert(success == TRUE);
+    g_assert (success == TRUE);
 }
 
-int main(int argc, char *argv[])
+int main (int argc, char *argv[])
 {
-    g_type_init();
-
-    UcaPluginManager *manager = uca_plugin_manager_new ();
-    GList *list = uca_plugin_manager_get_available_cameras (manager);
-
-    g_list_free (list);
-
-    g_object_unref (manager);
+    g_type_init ();
 
-    g_test_init(&argc, &argv, NULL);
-    g_test_bug_base("http://ufo.kit.edu/ufo/ticket");
+    g_test_init (&argc, &argv, NULL);
+    g_test_bug_base ("http://ufo.kit.edu/ufo/ticket");
 
-    g_test_add_func("/factory", test_factory);
-    g_test_add("/recording", Fixture, NULL, fixture_setup, test_recording, fixture_teardown);
-    g_test_add("/recording/signal", Fixture, NULL, fixture_setup, test_recording_signal, fixture_teardown);
-    g_test_add("/recording/asynchronous", Fixture, NULL, fixture_setup, test_recording_async, fixture_teardown);
-    g_test_add("/properties/base", Fixture, NULL, fixture_setup, test_base_properties, fixture_teardown);
-    g_test_add("/properties/recording", Fixture, NULL, fixture_setup, test_recording_property, fixture_teardown);
-    g_test_add("/properties/binnings", Fixture, NULL, fixture_setup, test_binnings_properties, fixture_teardown);
-    g_test_add("/signal", Fixture, NULL, fixture_setup, test_signal, fixture_teardown);
+    g_test_add ("/factory", Fixture, NULL, fixture_setup, test_factory, fixture_teardown);
+    g_test_add ("/recording", Fixture, NULL, fixture_setup, test_recording, fixture_teardown);
+    g_test_add ("/recording/signal", Fixture, NULL, fixture_setup, test_recording_signal, fixture_teardown);
+    g_test_add ("/recording/asynchronous", Fixture, NULL, fixture_setup, test_recording_async, fixture_teardown);
+    g_test_add ("/properties/base", Fixture, NULL, fixture_setup, test_base_properties, fixture_teardown);
+    g_test_add ("/properties/recording", Fixture, NULL, fixture_setup, test_recording_property, fixture_teardown);
+    g_test_add ("/properties/binnings", Fixture, NULL, fixture_setup, test_binnings_properties, fixture_teardown);
+    g_test_add ("/signal", Fixture, NULL, fixture_setup, test_signal, fixture_teardown);
 
-    return g_test_run();
+    return g_test_run ();
 }
-- 
cgit v1.2.3


From b3dbedeec78a55802565a3824ab52188e8b9bd4d Mon Sep 17 00:00:00 2001
From: Matthias Vogelgesang <matthias.vogelgesang@gmail.com>
Date: Mon, 8 Oct 2012 14:38:16 +0200
Subject: Generate introspection files

Unfortunately, the gir tools recognize anything with $PREFIX_new_$SUFFIX as some
kind of constructor. This means that we have to rename
uca_plugin_manager_new_camera() to uca_plugin_manager_get_camera().
---
 CMakeLists.txt           |  1 +
 NEWS                     |  2 +-
 src/CMakeLists.txt       | 57 ++++++++++++++++++++++++++++++++++++++++++++++++
 src/uca-plugin-manager.c | 13 +++++------
 src/uca-plugin-manager.h |  2 +-
 test/test-mock.c         |  4 ++--
 tools/benchmark.c        |  2 +-
 tools/gen-doc.c          |  2 +-
 tools/grab-async.c       |  2 +-
 tools/grab.c             |  2 +-
 tools/gui/control.c      |  2 +-
 tools/perf-overhead.c    |  2 +-
 12 files changed, 74 insertions(+), 17 deletions(-)

(limited to 'test/test-mock.c')

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bb53b40..bef3712 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -33,6 +33,7 @@ set(UCA_ENUM_HDRS
     ${CMAKE_CURRENT_SOURCE_DIR}/src/uca-camera.h
     ${CMAKE_CURRENT_SOURCE_DIR}/plugins/pco/uca-pco-camera.h)
 
+
 # ---  Common configuration ---------------------------------------------------
 
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/package.sh.in
diff --git a/NEWS b/NEWS
index e7c7243..624242b 100644
--- a/NEWS
+++ b/NEWS
@@ -13,7 +13,7 @@ looks in pre- and user-defined directories for DSOs that match
     UcaCamera *camera;
 
     manager = uca_plugin_manager_new ();
-    camera = uca_plugin_manager_new_camera (manager, "foo", &error);
+    camera = uca_plugin_manager_get_camera (manager, "foo", &error);
 
 The plugin manager adds a dependency on GModule (pkg-config package
 `gmodule-2.0`) that is part of GLib.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4bf5820..dd2f464 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -37,6 +37,9 @@ add_custom_command(
 
 # --- Configure ---------------------------------------------------------------
 
+find_program(INTROSPECTION_SCANNER "g-ir-scanner")
+find_program(INTROSPECTION_COMPILER "g-ir-compiler")
+
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in
                ${CMAKE_CURRENT_BINARY_DIR}/config.h)
 
@@ -67,7 +70,51 @@ set_target_properties(uca PROPERTIES
 target_link_libraries(uca ${UCA_DEPS})
 
 
+# --- Build introspection files -----------------------------------------------
+
+if (INTROSPECTION_SCANNER AND INTROSPECTION_COMPILER)
+    option(WITH_GIR "Build introspection files" ON)
+
+    if (WITH_GIR)
+        set(GIR_PREFIX "Uca-${UCA_ABI_VERSION}")
+        set(GIR_XML "${GIR_PREFIX}.gir")
+        set(GIR_TYPELIB "${GIR_PREFIX}.typelib")
+        set(_gir_input)
+
+        foreach(_src ${uca_SRCS} ${uca_HDRS})
+            list(APPEND _gir_input "${CMAKE_CURRENT_SOURCE_DIR}/${_src}")
+        endforeach()
+
+        add_custom_command(OUTPUT ${GIR_XML}
+            COMMAND ${INTROSPECTION_SCANNER}
+                    --namespace=Uca
+                    --nsversion=${UCA_ABI_VERSION}
+                    --library=uca
+                    --no-libtool
+                    --include=GObject-2.0
+                    --include=GModule-2.0
+                    --output ${GIR_XML}
+                    --warn-all
+                    ${_gir_input}
+            DEPENDS ${uca_SRCS}
+            WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+
+        add_custom_command(OUTPUT ${GIR_TYPELIB}
+            COMMAND ${INTROSPECTION_COMPILER}
+                    -o ${GIR_TYPELIB}
+                    ${GIR_XML}
+            DEPENDS ${GIR_XML}
+            WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+
+        add_custom_target(gir ALL DEPENDS ${GIR_XML} ${GIR_TYPELIB})
+        add_dependencies(gir uca)
+
+    endif()
+endif()
+
+
 # --- Build documentation -----------------------------------------------------
+
 pkg_check_modules(GTK_DOC gtk-doc)
 
 if(GTK_DOC_FOUND)
@@ -170,6 +217,16 @@ install(FILES ${uca_HDRS}
         DESTINATION include/uca
         COMPONENT headers)
 
+if(WITH_GIR)
+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${GIR_XML}
+            DESTINATION share/gir-1.0
+            COMPONENT libraries)
+
+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${GIR_TYPELIB}
+            DESTINATION ${LIB_INSTALL_DIR}/girepository-1.0
+            COMPONENT libraries)
+endif()
+
 
 # --- Generate package description --------------------------------------------
 
diff --git a/src/uca-plugin-manager.c b/src/uca-plugin-manager.c
index 5678e83..cb7e518 100644
--- a/src/uca-plugin-manager.c
+++ b/src/uca-plugin-manager.c
@@ -49,9 +49,7 @@ uca_plugin_manager_error_quark (void)
  * uca_plugin_manager_new:
  * @config: (allow-none): A #UcaConfiguration object or %NULL.
  *
- * Create a plugin manager object to instantiate filter objects. When a config
- * object is passed to the constructor, its search-path property is added to the
- * internal search paths.
+ * Create a plugin manager object to instantiate camera objects.
  *
  * Return value: A new plugin manager object.
  */
@@ -147,9 +145,10 @@ list_free_full (GList *list)
  *
  * @manager: A #UcaPluginManager
  *
- * Return: A list with strings of available camera names. You have to free the
- * individual strings with g_list_foreach(list, (GFunc) g_free, NULL) and the
- * list itself with g_list_free.
+ * Returns: (element-type utf8) (transfer full): A list with strings of
+ * available camera names. You have to free the individual strings with
+ * g_list_foreach(list, (GFunc) g_free, NULL) and the list itself with
+ * g_list_free.
  */
 GList *
 uca_plugin_manager_get_available_cameras (UcaPluginManager *manager)
@@ -201,7 +200,7 @@ find_camera_module_path (GList *search_paths, const gchar *name)
  * @error: Location for a #GError
  */
 UcaCamera *
-uca_plugin_manager_new_camera (UcaPluginManager   *manager,
+uca_plugin_manager_get_camera (UcaPluginManager   *manager,
                                const gchar        *name,
                                GError            **error)
 {
diff --git a/src/uca-plugin-manager.h b/src/uca-plugin-manager.h
index 9291857..6c3ab4e 100644
--- a/src/uca-plugin-manager.h
+++ b/src/uca-plugin-manager.h
@@ -55,7 +55,7 @@ void                 uca_plugin_manager_add_path    (UcaPluginManager   *manager
                                                      const gchar        *path);
 GList               *uca_plugin_manager_get_available_cameras
                                                     (UcaPluginManager   *manager);
-UcaCamera           *uca_plugin_manager_new_camera  (UcaPluginManager   *manager,
+UcaCamera           *uca_plugin_manager_get_camera  (UcaPluginManager   *manager,
                                                      const gchar        *name,
                                                      GError            **error);
 GType                uca_plugin_manager_get_type    (void);
diff --git a/test/test-mock.c b/test/test-mock.c
index ca16c59..711364d 100644
--- a/test/test-mock.c
+++ b/test/test-mock.c
@@ -16,7 +16,7 @@ fixture_setup (Fixture *fixture, gconstpointer data)
     fixture->manager = uca_plugin_manager_new ();
     uca_plugin_manager_add_path (fixture->manager, "./src");
 
-    fixture->camera = uca_plugin_manager_new_camera (fixture->manager, "mock", &error);
+    fixture->camera = uca_plugin_manager_get_camera (fixture->manager, "mock", &error);
     g_assert (error == NULL);
     g_assert (fixture->camera);
 }
@@ -39,7 +39,7 @@ static void
 test_factory (Fixture *fixture, gconstpointer data)
 {
     GError *error = NULL;
-    UcaCamera *camera = uca_plugin_manager_new_camera (fixture->manager, "fox994m3a0yxmy", &error);
+    UcaCamera *camera = uca_plugin_manager_get_camera (fixture->manager, "fox994m3a0yxmy", &error);
     g_assert_error (error, UCA_PLUGIN_MANAGER_ERROR, UCA_PLUGIN_MANAGER_ERROR_MODULE_NOT_FOUND);
     g_assert (camera == NULL);
 }
diff --git a/tools/benchmark.c b/tools/benchmark.c
index ef99fd1..bff8b50 100644
--- a/tools/benchmark.c
+++ b/tools/benchmark.c
@@ -250,7 +250,7 @@ main (int argc, char *argv[])
     g_log_set_handler (NULL, G_LOG_LEVEL_MASK, log_handler, log_channel);
 
     manager = uca_plugin_manager_new ();
-    camera = uca_plugin_manager_new_camera (manager, argv[1], &error);
+    camera = uca_plugin_manager_get_camera (manager, argv[1], &error);
 
     if (camera == NULL) {
         g_error ("Initialization: %s", error->message);
diff --git a/tools/gen-doc.c b/tools/gen-doc.c
index 86d6ff9..f555a5f 100644
--- a/tools/gen-doc.c
+++ b/tools/gen-doc.c
@@ -136,7 +136,7 @@ int main(int argc, char *argv[])
     }
     else {
         name = argv[1];
-        camera = uca_plugin_manager_new_camera (manager, name, &error);
+        camera = uca_plugin_manager_get_camera (manager, name, &error);
     }
 
     if (camera == NULL) {
diff --git a/tools/grab-async.c b/tools/grab-async.c
index 6132829..2c4bf04 100644
--- a/tools/grab-async.c
+++ b/tools/grab-async.c
@@ -94,7 +94,7 @@ main(int argc, char *argv[])
     }
 
     manager = uca_plugin_manager_new ();
-    camera = uca_plugin_manager_new_camera (manager, argv[1], &error);
+    camera = uca_plugin_manager_get_camera (manager, argv[1], &error);
 
     if (camera == NULL) {
         g_print("Error during initialization: %s\n", error->message);
diff --git a/tools/grab.c b/tools/grab.c
index 1f5c917..1518997 100644
--- a/tools/grab.c
+++ b/tools/grab.c
@@ -75,7 +75,7 @@ int main(int argc, char *argv[])
     }
 
     manager = uca_plugin_manager_new ();
-    camera = uca_plugin_manager_new_camera (manager, argv[1], &error);
+    camera = uca_plugin_manager_get_camera (manager, argv[1], &error);
 
     if (camera == NULL) {
         g_print("Error during initialization: %s\n", error->message);
diff --git a/tools/gui/control.c b/tools/gui/control.c
index 75b3cde..178c809 100644
--- a/tools/gui/control.c
+++ b/tools/gui/control.c
@@ -207,7 +207,7 @@ create_main_window (GtkBuilder *builder, const gchar* camera_name)
     static ThreadData td;
 
     GError *error = NULL;
-    UcaCamera *camera = uca_plugin_manager_new_camera (plugin_manager, camera_name, &error);
+    UcaCamera *camera = uca_plugin_manager_get_camera (plugin_manager, camera_name, &error);
 
     if ((camera == NULL) || (error != NULL)) {
         g_error ("%s\n", error->message);
diff --git a/tools/perf-overhead.c b/tools/perf-overhead.c
index f8bdcbd..6735e6f 100644
--- a/tools/perf-overhead.c
+++ b/tools/perf-overhead.c
@@ -163,7 +163,7 @@ main (int argc, char *argv[])
     }
 
     manager = uca_plugin_manager_new ();
-    camera = uca_plugin_manager_new_camera (manager, argv[1], &error);
+    camera = uca_plugin_manager_get_camera (manager, argv[1], &error);
 
     if (camera == NULL) {
         g_print ("Error during initialization: %s\n", error->message);
-- 
cgit v1.2.3


From 4a27a2e95aa1a2312ad17404d7ab236b2fa6f1b7 Mon Sep 17 00:00:00 2001
From: Matthias Vogelgesang <matthias.vogelgesang@gmail.com>
Date: Tue, 9 Oct 2012 15:43:10 +0200
Subject: Fix #150: Add "frames-per-second" property

Right now, there is only information for the DIMAX camera about the actual
inherent system delay. For all other cameras fps = 1. / t_exp.
---
 plugins/pco/uca-pco-camera.c | 111 +++++++++++++++++++++++++++++++++++--------
 src/uca-camera.c             |  26 ++++++++++
 src/uca-camera.h             |   1 +
 test/test-mock.c             |  21 ++++++++
 4 files changed, 139 insertions(+), 20 deletions(-)

(limited to 'test/test-mock.c')

diff --git a/plugins/pco/uca-pco-camera.c b/plugins/pco/uca-pco-camera.c
index ccccf82..893a480 100644
--- a/plugins/pco/uca-pco-camera.c
+++ b/plugins/pco/uca-pco-camera.c
@@ -129,6 +129,7 @@ static gint base_overrideables[] = {
     PROP_SENSOR_VERTICAL_BINNINGS,
     PROP_SENSOR_MAX_FRAME_RATE,
     PROP_EXPOSURE_TIME,
+    PROP_FRAMES_PER_SECOND,
     PROP_TRIGGER_MODE,
     PROP_ROI_X,
     PROP_ROI_Y,
@@ -208,7 +209,8 @@ static pco_cl_map_entry *get_pco_cl_map_entry(int camera_type)
     return NULL;
 }
 
-static guint fill_binnings(UcaPcoCameraPrivate *priv)
+static guint
+fill_binnings(UcaPcoCameraPrivate *priv)
 {
     uint16_t *horizontal = NULL;
     uint16_t *vertical = NULL;
@@ -241,7 +243,8 @@ static guint fill_binnings(UcaPcoCameraPrivate *priv)
     return err;
 }
 
-static void fill_pixelrates(UcaPcoCameraPrivate *priv, guint32 rates[4], gint num_rates)
+static void
+fill_pixelrates(UcaPcoCameraPrivate *priv, guint32 rates[4], gint num_rates)
 {
     GValue val = {0};
     g_value_init(&val, G_TYPE_UINT);
@@ -253,7 +256,8 @@ static void fill_pixelrates(UcaPcoCameraPrivate *priv, guint32 rates[4], gint nu
     }
 }
 
-static guint override_temperature_range(UcaPcoCameraPrivate *priv)
+static guint
+override_temperature_range(UcaPcoCameraPrivate *priv)
 {
     int16_t default_temp, min_temp, max_temp;
     guint err = pco_get_cooling_range(priv->pco, &default_temp, &min_temp, &max_temp);
@@ -270,7 +274,8 @@ static guint override_temperature_range(UcaPcoCameraPrivate *priv)
     return err;
 }
 
-static void property_override_default_guint_value (GObjectClass *oclass, const gchar *property_name, guint new_default)
+static void
+property_override_default_guint_value (GObjectClass *oclass, const gchar *property_name, guint new_default)
 {
     GParamSpecUInt *pspec = G_PARAM_SPEC_UINT (g_object_class_find_property (oclass, property_name));
 
@@ -280,13 +285,15 @@ static void property_override_default_guint_value (GObjectClass *oclass, const g
         g_warning ("pspec for %s not found\n", property_name);
 }
 
-static void override_maximum_adcs(UcaPcoCameraPrivate *priv)
+static void
+override_maximum_adcs(UcaPcoCameraPrivate *priv)
 {
     GParamSpecInt *spec = (GParamSpecInt *) pco_properties[PROP_SENSOR_ADCS];
     spec->maximum = pco_get_maximum_number_of_adcs(priv->pco);
 }
 
-static gdouble convert_timebase(guint16 timebase)
+static gdouble
+convert_timebase(guint16 timebase)
 {
     switch (timebase) {
         case TIMEBASE_NS:
@@ -301,12 +308,14 @@ static gdouble convert_timebase(guint16 timebase)
     return 1e-3;
 }
 
-static void read_timebase(UcaPcoCameraPrivate *priv)
+static void
+read_timebase(UcaPcoCameraPrivate *priv)
 {
     pco_get_timebase(priv->pco, &priv->delay_timebase, &priv->exposure_timebase);
 }
 
-static gdouble get_suitable_timebase(gdouble time)
+static gdouble
+get_suitable_timebase(gdouble time)
 {
     if (time * 1e3 >= 1.0)
         return TIMEBASE_MS;
@@ -317,7 +326,24 @@ static gdouble get_suitable_timebase(gdouble time)
     return TIMEBASE_INVALID;
 }
 
-static int fg_callback(frameindex_t frame, struct fg_apc_data *apc)
+static gdouble
+get_internal_delay (UcaPcoCamera *camera)
+{
+    if (camera->priv->camera_description->camera_type == CAMERATYPE_PCO_DIMAX_STD) {
+        gdouble sensor_rate;
+        g_object_get (camera, "sensor-rate", &sensor_rate, NULL);
+
+        if (sensor_rate == 55000000.0)
+            return 0.000079;
+        else if (sensor_rate == 62500000.0)
+            return 0.000069;
+    }
+
+    return 0.0;
+}
+
+static int
+fg_callback(frameindex_t frame, struct fg_apc_data *apc)
 {
     UcaCamera *camera = UCA_CAMERA(apc);
     UcaPcoCameraPrivate *priv = UCA_PCO_CAMERA_GET_PRIVATE(camera);
@@ -333,7 +359,8 @@ static int fg_callback(frameindex_t frame, struct fg_apc_data *apc)
     return 0;
 }
 
-static gboolean setup_fg_callback(UcaCamera *camera)
+static gboolean
+setup_fg_callback(UcaCamera *camera)
 {
     UcaPcoCameraPrivate *priv = UCA_PCO_CAMERA_GET_PRIVATE(camera);
     struct FgApcControl ctrl;
@@ -353,7 +380,8 @@ static gboolean setup_fg_callback(UcaCamera *camera)
     return Fg_registerApcHandler(priv->fg, priv->fg_port, &ctrl, FG_APC_CONTROL_BASIC) == FG_OK;
 }
 
-static void uca_pco_camera_start_recording(UcaCamera *camera, GError **error)
+static void
+uca_pco_camera_start_recording(UcaCamera *camera, GError **error)
 {
     g_return_if_fail(UCA_IS_PCO_CAMERA(camera));
     guint err = PCO_NOERROR;
@@ -451,7 +479,8 @@ static void uca_pco_camera_start_recording(UcaCamera *camera, GError **error)
     FG_SET_ERROR(err, priv->fg, UCA_PCO_CAMERA_ERROR_FG_ACQUISITION);
 }
 
-static void uca_pco_camera_stop_recording(UcaCamera *camera, GError **error)
+static void
+uca_pco_camera_stop_recording(UcaCamera *camera, GError **error)
 {
     g_return_if_fail(UCA_IS_PCO_CAMERA(camera));
     UcaPcoCameraPrivate *priv = UCA_PCO_CAMERA_GET_PRIVATE(camera);
@@ -467,7 +496,8 @@ static void uca_pco_camera_stop_recording(UcaCamera *camera, GError **error)
         g_warning(" Unable to unblock all\n");
 }
 
-static void uca_pco_camera_start_readout(UcaCamera *camera, GError **error)
+static void
+uca_pco_camera_start_readout(UcaCamera *camera, GError **error)
 {
     g_return_if_fail(UCA_IS_PCO_CAMERA(camera));
     UcaPcoCameraPrivate *priv = UCA_PCO_CAMERA_GET_PRIVATE(camera);
@@ -486,7 +516,8 @@ static void uca_pco_camera_start_readout(UcaCamera *camera, GError **error)
     priv->current_image = 1;
 }
 
-static void uca_pco_camera_trigger(UcaCamera *camera, GError **error)
+static void
+uca_pco_camera_trigger(UcaCamera *camera, GError **error)
 {
     g_return_if_fail(UCA_IS_PCO_CAMERA(camera));
     UcaPcoCameraPrivate *priv = UCA_PCO_CAMERA_GET_PRIVATE(camera);
@@ -500,7 +531,8 @@ static void uca_pco_camera_trigger(UcaCamera *camera, GError **error)
                 "Could not trigger frame acquisition");
 }
 
-static void uca_pco_camera_grab(UcaCamera *camera, gpointer *data, GError **error)
+static void
+uca_pco_camera_grab(UcaCamera *camera, gpointer *data, GError **error)
 {
     static const gint MAX_TIMEOUT = G_MAXINT;
 
@@ -543,7 +575,8 @@ static void uca_pco_camera_grab(UcaCamera *camera, gpointer *data, GError **erro
         memcpy((gchar *) *data, (gchar *) frame, priv->frame_width * priv->frame_height * priv->num_bytes);
 }
 
-static void uca_pco_camera_set_property(GObject *object, guint property_id, const GValue *value, GParamSpec *pspec)
+static void
+uca_pco_camera_set_property(GObject *object, guint property_id, const GValue *value, GParamSpec *pspec)
 {
     UcaPcoCameraPrivate *priv = UCA_PCO_CAMERA_GET_PRIVATE(object);
 
@@ -624,6 +657,29 @@ static void uca_pco_camera_set_property(GObject *object, guint property_id, cons
             }
             break;
 
+        case PROP_FRAMES_PER_SECOND:
+            {
+                gdouble n_frames_per_second;
+                gdouble exposure_time;
+                gdouble delay;
+
+                /*
+                 * We want to expose n frames in one second, each frame takes
+                 * exposure time + delay time. Thus we have
+                 *
+                 *   1s = n * (t_exp + t_delay) <=> t_exp = 1s/n - t_delay.
+                 */
+                delay = get_internal_delay (UCA_PCO_CAMERA (object));
+                n_frames_per_second = g_value_get_double (value);
+                exposure_time = 1.0 / n_frames_per_second - delay;
+
+                if (exposure_time <= 0.0)
+                    g_warning ("Too many frames per second requested.");
+                else
+                    g_object_set (object, "exposure-time", exposure_time, NULL);
+            }
+            break;
+
         case PROP_DELAY_TIME:
             {
                 const gdouble time = g_value_get_double(value);
@@ -787,7 +843,8 @@ static void uca_pco_camera_set_property(GObject *object, guint property_id, cons
     }
 }
 
-static void uca_pco_camera_get_property(GObject *object, guint property_id, GValue *value, GParamSpec *pspec)
+static void
+uca_pco_camera_get_property(GObject *object, guint property_id, GValue *value, GParamSpec *pspec)
 {
     UcaPcoCameraPrivate *priv = UCA_PCO_CAMERA_GET_PRIVATE(object);
 
@@ -892,6 +949,17 @@ static void uca_pco_camera_get_property(GObject *object, guint property_id, GVal
             }
             break;
 
+        case PROP_FRAMES_PER_SECOND:
+            {
+                gdouble exposure_time;
+                gdouble delay;
+
+                delay = get_internal_delay (UCA_PCO_CAMERA (object));
+                g_object_get (object, "exposure-time", &exposure_time, NULL);
+                g_value_set_double (value, 1.0 / (exposure_time + delay));
+            }
+            break;
+
         case PROP_DELAY_TIME:
             {
                 uint32_t delay_time;
@@ -1075,7 +1143,8 @@ static void uca_pco_camera_get_property(GObject *object, guint property_id, GVal
     }
 }
 
-static void uca_pco_camera_finalize(GObject *object)
+static void
+uca_pco_camera_finalize(GObject *object)
 {
     UcaPcoCameraPrivate *priv = UCA_PCO_CAMERA_GET_PRIVATE(object);
 
@@ -1103,7 +1172,8 @@ static void uca_pco_camera_finalize(GObject *object)
     G_OBJECT_CLASS(uca_pco_camera_parent_class)->finalize(object);
 }
 
-static void uca_pco_camera_class_init(UcaPcoCameraClass *klass)
+static void
+uca_pco_camera_class_init(UcaPcoCameraClass *klass)
 {
     GObjectClass *gobject_class = G_OBJECT_CLASS(klass);
     gobject_class->set_property = uca_pco_camera_set_property;
@@ -1286,7 +1356,8 @@ static void uca_pco_camera_class_init(UcaPcoCameraClass *klass)
     g_type_class_add_private(klass, sizeof(UcaPcoCameraPrivate));
 }
 
-static void uca_pco_camera_init(UcaPcoCamera *self)
+static void
+uca_pco_camera_init(UcaPcoCamera *self)
 {
     self->priv = UCA_PCO_CAMERA_GET_PRIVATE(self);
     self->priv->fg = NULL;
diff --git a/src/uca-camera.c b/src/uca-camera.c
index f973355..14da820 100644
--- a/src/uca-camera.c
+++ b/src/uca-camera.c
@@ -66,6 +66,7 @@ const gchar *uca_camera_props[N_BASE_PROPERTIES] = {
     "sensor-max-frame-rate",
     "trigger-mode",
     "exposure-time",
+    "frames-per-second",
     "roi-x0",
     "roi-y0",
     "roi-width",
@@ -102,6 +103,15 @@ uca_camera_set_property (GObject *object, guint property_id, const GValue *value
             priv->transfer_async = g_value_get_boolean(value);
             break;
 
+        case PROP_FRAMES_PER_SECOND:
+            {
+                gdouble frames_per_second;
+
+                frames_per_second = g_value_get_double (value);
+                g_object_set (object, "exposure-time", 1. / frames_per_second, NULL);
+            }
+            break;
+
         default:
             G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec);
     }
@@ -125,6 +135,15 @@ uca_camera_get_property(GObject *object, guint property_id, GValue *value, GPara
             g_value_set_boolean(value, priv->transfer_async);
             break;
 
+        case PROP_FRAMES_PER_SECOND:
+            {
+                gdouble exposure_time; 
+
+                g_object_get (object, "exposure-time", &exposure_time, NULL);
+                g_value_set_double (value, 1. / exposure_time);
+            }
+            break;
+
         default:
             G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec);
     }
@@ -267,6 +286,13 @@ uca_camera_class_init(UcaCameraClass *klass)
             0.0, G_MAXDOUBLE, 1.0,
             G_PARAM_READWRITE);
 
+    camera_properties[PROP_FRAMES_PER_SECOND] =
+        g_param_spec_double(uca_camera_props[PROP_FRAMES_PER_SECOND],
+            "Frames per second",
+            "Frames per second",
+            0.0, G_MAXDOUBLE, 1.0,
+            G_PARAM_READWRITE);
+
     camera_properties[PROP_HAS_STREAMING] =
         g_param_spec_boolean(uca_camera_props[PROP_HAS_STREAMING],
             "Streaming capability",
diff --git a/src/uca-camera.h b/src/uca-camera.h
index bd89bc6..7d81dac 100644
--- a/src/uca-camera.h
+++ b/src/uca-camera.h
@@ -63,6 +63,7 @@ enum {
     PROP_SENSOR_MAX_FRAME_RATE,
     PROP_TRIGGER_MODE,
     PROP_EXPOSURE_TIME,
+    PROP_FRAMES_PER_SECOND,
     PROP_ROI_X,
     PROP_ROI_Y,
     PROP_ROI_WIDTH,
diff --git a/test/test-mock.c b/test/test-mock.c
index 711364d..17af329 100644
--- a/test/test-mock.c
+++ b/test/test-mock.c
@@ -148,6 +148,26 @@ test_base_properties (Fixture *fixture, gconstpointer data)
     g_free (properties);
 }
 
+static void
+test_fps_property (Fixture *fixture, gconstpointer data)
+{
+    gdouble frames_per_second;
+    gdouble exposure_time = 0.5;
+
+    g_object_set (G_OBJECT (fixture->camera),
+                  "exposure-time", exposure_time,
+                  NULL);
+    g_object_get (G_OBJECT (fixture->camera),
+                  "frames-per-second", &frames_per_second,
+                  NULL);
+
+    /*
+     * The mock camera does not override the "frames-per-second" property, so we
+     * check the implementation from the base camera.
+     */
+    g_assert_cmpfloat (frames_per_second, ==, 1.0 / exposure_time);
+}
+
 static void
 test_binnings_properties (Fixture *fixture, gconstpointer data)
 {
@@ -189,6 +209,7 @@ int main (int argc, char *argv[])
     g_test_add ("/properties/base", Fixture, NULL, fixture_setup, test_base_properties, fixture_teardown);
     g_test_add ("/properties/recording", Fixture, NULL, fixture_setup, test_recording_property, fixture_teardown);
     g_test_add ("/properties/binnings", Fixture, NULL, fixture_setup, test_binnings_properties, fixture_teardown);
+    g_test_add ("/properties/frames-per-second", Fixture, NULL, fixture_setup, test_fps_property, fixture_teardown);
     g_test_add ("/signal", Fixture, NULL, fixture_setup, test_signal, fixture_teardown);
 
     return g_test_run ();
-- 
cgit v1.2.3


From d8743d20b93d34497183d05ccb17519194ec5abb Mon Sep 17 00:00:00 2001
From: Matthias Vogelgesang <matthias.vogelgesang@gmail.com>
Date: Tue, 16 Oct 2012 12:27:47 +0200
Subject: Integrate initial unit facility

---
 src/uca-camera.c | 140 +++++++++++++++++++++++++++++++++++++++++++++----------
 src/uca-camera.h |  18 ++++++-
 test/test-mock.c |   8 ++++
 3 files changed, 140 insertions(+), 26 deletions(-)

(limited to 'test/test-mock.c')

diff --git a/src/uca-camera.c b/src/uca-camera.c
index 091ef54..2cf17ff 100644
--- a/src/uca-camera.c
+++ b/src/uca-camera.c
@@ -50,7 +50,25 @@ G_DEFINE_TYPE(UcaCamera, uca_camera, G_TYPE_OBJECT)
  */
 GQuark uca_camera_error_quark()
 {
-    return g_quark_from_static_string("uca-camera-error-quark");
+    return g_quark_from_static_string ("uca-camera-error-quark");
+}
+
+/**
+ * UcaUnit:
+ * @UCA_UNIT_NA: Not applicable
+ * @UCA_UNIT_METER: SI meter
+ * @UCA_UNIT_SECOND: SI second
+ * @UCA_UNIT_PIXEL: Number of pixels in one dimension
+ * @UCA_UNIT_COUNT: Number
+ *
+ * Units should be registered by camera implementations using
+ * uca_camera_register_unit() and can be queried by client programs with
+ * uca_camera_get_unit().
+ */
+
+GQuark uca_unit_quark ()
+{
+    return g_quark_from_static_string ("uca-unit-quark");
 }
 
 enum {
@@ -96,6 +114,12 @@ struct _UcaCameraPrivate {
     gboolean transfer_async;
 };
 
+static void
+uca_camera_set_property_unit (GParamSpec *pspec, UcaUnit unit)
+{
+    g_param_spec_set_qdata (pspec, UCA_UNIT_QUARK, GINT_TO_POINTER (unit));
+}
+
 static void
 uca_camera_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec)
 {
@@ -149,7 +173,7 @@ uca_camera_get_property(GObject *object, guint property_id, GValue *value, GPara
 
         case PROP_FRAMES_PER_SECOND:
             {
-                gdouble exposure_time; 
+                gdouble exposure_time;
 
                 g_object_get (object, "exposure-time", &exposure_time, NULL);
                 g_value_set_double (value, 1. / exposure_time);
@@ -162,11 +186,18 @@ uca_camera_get_property(GObject *object, guint property_id, GValue *value, GPara
 }
 
 static void
-uca_camera_class_init(UcaCameraClass *klass)
+uca_camera_finalize (GObject *object)
+{
+    G_OBJECT_CLASS (uca_camera_parent_class)->finalize (object);
+}
+
+static void
+uca_camera_class_init (UcaCameraClass *klass)
 {
     GObjectClass *gobject_class = G_OBJECT_CLASS(klass);
     gobject_class->set_property = uca_camera_set_property;
     gobject_class->get_property = uca_camera_get_property;
+    gobject_class->finalize = uca_camera_finalize;
 
     klass->start_recording = NULL;
     klass->stop_recording = NULL;
@@ -342,7 +373,7 @@ uca_camera_class_init(UcaCameraClass *klass)
 }
 
 static void
-uca_camera_init(UcaCamera *camera)
+uca_camera_init (UcaCamera *camera)
 {
     camera->grab_func = NULL;
 
@@ -351,26 +382,20 @@ uca_camera_init(UcaCamera *camera)
     camera->priv->is_readout = FALSE;
     camera->priv->transfer_async = FALSE;
 
-    /*
-     * This here would be the best place to instantiate the tango server object,
-     * along these lines:
-     *
-     * // I'd prefer if you expose a single C method, so we don't have to
-     * // compile uca-camera.c with g++
-     * tango_handle = tango_server_new(camera);
-     *
-     * void tango_server_new(UcaCamera *camera)
-     * {
-     *     // Do whatever is necessary. In the end you will have some kind of
-     *     // Tango object t which needs to somehow hook up to the properties. A
-     *     // list of all available properties can be enumerated with
-     *     // g_object_class_list_properties(G_OBJECT_CLASS(camera),
-     *     //     &n_properties);
-     *
-     *     // For setting/getting properties, use g_object_get/set_property() or
-     *     // g_object_get/set() whatever is more suitable.
-     * }
-     */
+    uca_camera_set_property_unit (camera_properties[PROP_SENSOR_WIDTH], UCA_UNIT_PIXEL);
+    uca_camera_set_property_unit (camera_properties[PROP_SENSOR_HEIGHT], UCA_UNIT_PIXEL);
+    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);
+    uca_camera_set_property_unit (camera_properties[PROP_ROI_Y], UCA_UNIT_PIXEL);
+    uca_camera_set_property_unit (camera_properties[PROP_ROI_WIDTH], UCA_UNIT_PIXEL);
+    uca_camera_set_property_unit (camera_properties[PROP_ROI_HEIGHT], UCA_UNIT_PIXEL);
+    uca_camera_set_property_unit (camera_properties[PROP_ROI_WIDTH_MULTIPLIER], UCA_UNIT_COUNT);
+    uca_camera_set_property_unit (camera_properties[PROP_ROI_HEIGHT_MULTIPLIER], UCA_UNIT_COUNT);
 }
 
 /**
@@ -523,7 +548,8 @@ uca_camera_start_readout (UcaCamera *camera, GError **error)
  *
  * Set the grab function that is called whenever a frame is readily transfered.
  */
-void uca_camera_set_grab_func(UcaCamera *camera, UcaCameraGrabFunc func, gpointer user_data)
+void
+uca_camera_set_grab_func(UcaCamera *camera, UcaCameraGrabFunc func, gpointer user_data)
 {
     camera->grab_func = func;
     camera->user_data = user_data;
@@ -600,3 +626,67 @@ uca_camera_grab (UcaCamera *camera, gpointer *data, GError **error)
     g_static_mutex_unlock (&mutex);
 }
 
+/**
+ * uca_camera_register_unit:
+ * @camera: A #UcaCamera object
+ * @prop_name: Name of a property
+ * @unit: #UcaUnit
+ *
+ * Associates @prop_name of @camera with a specific @unit.
+ *
+ * Since: 1.1
+ */
+void
+uca_camera_register_unit (UcaCamera *camera,
+                          const gchar *prop_name,
+                          UcaUnit unit)
+{
+    UcaCameraClass *klass;
+    GObjectClass *oclass;
+    GParamSpec *pspec;
+
+    klass  = UCA_CAMERA_GET_CLASS (camera);
+    oclass = G_OBJECT_CLASS (klass);
+    pspec  = g_object_class_find_property (oclass, prop_name);
+
+    if (pspec == NULL) {
+        g_warning ("Camera does not have property `%s'", prop_name);
+        return;
+    }
+
+    uca_camera_set_property_unit (pspec, unit);
+}
+
+/**
+ * uca_camera_get_unit:
+ * @camera: A #UcaCamera object
+ * @prop_name: Name of a property
+ *
+ * Returns the unit associated with @prop_name of @camera.
+ *
+ * Returns: A #UcaUnit value associated with @prop_name. If there is none, the
+ * value will be #UCA_UNIT_NA.
+ * Since: 1.1
+ */
+UcaUnit
+uca_camera_get_unit (UcaCamera *camera,
+                     const gchar *prop_name)
+{
+    UcaCameraClass *klass;
+    GObjectClass *oclass;
+    GParamSpec *pspec;
+    gpointer data;
+
+    klass  = UCA_CAMERA_GET_CLASS (camera);
+    oclass = G_OBJECT_CLASS (klass);
+    pspec  = g_object_class_find_property (oclass, prop_name);
+
+    if (pspec == NULL) {
+        g_warning ("Camera does not have property `%s'", prop_name);
+        return UCA_UNIT_NA;
+    }
+
+    data = g_param_spec_get_qdata (pspec, UCA_UNIT_QUARK);
+    return data == NULL ? UCA_UNIT_NA : GPOINTER_TO_INT (data);
+}
+
diff --git a/src/uca-camera.h b/src/uca-camera.h
index 8bc48bc..4aad0b4 100644
--- a/src/uca-camera.h
+++ b/src/uca-camera.h
@@ -29,8 +29,11 @@ G_BEGIN_DECLS
 #define UCA_IS_CAMERA_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE((klass), UCA_TYPE_CAMERA))
 #define UCA_CAMERA_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS((obj), UCA_TYPE_CAMERA, UcaCameraClass))
 
-#define UCA_CAMERA_ERROR uca_camera_error_quark()
+#define UCA_CAMERA_ERROR    uca_camera_error_quark()
+#define UCA_UNIT_QUARK      uca_unit_quark()
+
 GQuark uca_camera_error_quark(void);
+GQuark uca_unit_quark(void);
 
 typedef enum {
     UCA_CAMERA_ERROR_NOT_FOUND,
@@ -46,6 +49,14 @@ typedef enum {
     UCA_CAMERA_TRIGGER_EXTERNAL
 } UcaCameraTrigger;
 
+typedef enum {
+    UCA_UNIT_NA,
+    UCA_UNIT_METER,
+    UCA_UNIT_SECOND,
+    UCA_UNIT_PIXEL,
+    UCA_UNIT_COUNT
+} UcaUnit;
+
 typedef struct _UcaCamera           UcaCamera;
 typedef struct _UcaCameraClass      UcaCameraClass;
 typedef struct _UcaCameraPrivate    UcaCameraPrivate;
@@ -136,6 +147,11 @@ void        uca_camera_grab             (UcaCamera          *camera,
 void        uca_camera_set_grab_func    (UcaCamera          *camera,
                                          UcaCameraGrabFunc   func,
                                          gpointer            user_data);
+void        uca_camera_register_unit    (UcaCamera          *camera,
+                                         const gchar        *prop_name,
+                                         UcaUnit             unit);
+UcaUnit     uca_camera_get_unit         (UcaCamera          *camera,
+                                         const gchar        *prop_name);
 
 GType uca_camera_get_type(void);
 
diff --git a/test/test-mock.c b/test/test-mock.c
index 17af329..08f24b8 100644
--- a/test/test-mock.c
+++ b/test/test-mock.c
@@ -168,6 +168,13 @@ test_fps_property (Fixture *fixture, gconstpointer data)
     g_assert_cmpfloat (frames_per_second, ==, 1.0 / exposure_time);
 }
 
+static void
+test_property_units (Fixture *fixture, gconstpointer data)
+{
+    g_assert (uca_camera_get_unit (fixture->camera, "sensor-width") == UCA_UNIT_PIXEL);
+    g_assert (uca_camera_get_unit (fixture->camera, "name") == UCA_UNIT_NA);
+}
+
 static void
 test_binnings_properties (Fixture *fixture, gconstpointer data)
 {
@@ -210,6 +217,7 @@ int main (int argc, char *argv[])
     g_test_add ("/properties/recording", Fixture, NULL, fixture_setup, test_recording_property, fixture_teardown);
     g_test_add ("/properties/binnings", Fixture, NULL, fixture_setup, test_binnings_properties, fixture_teardown);
     g_test_add ("/properties/frames-per-second", Fixture, NULL, fixture_setup, test_fps_property, fixture_teardown);
+    g_test_add ("/properties/units", Fixture, NULL, fixture_setup, test_property_units, fixture_teardown);
     g_test_add ("/signal", Fixture, NULL, fixture_setup, test_signal, fixture_teardown);
 
     return g_test_run ();
-- 
cgit v1.2.3


From de2e8e3191eae37b91f672a03e028a35c8863c9d Mon Sep 17 00:00:00 2001
From: Matthias Vogelgesang <matthias.vogelgesang@gmail.com>
Date: Tue, 16 Oct 2012 12:40:18 +0200
Subject: Add temperature unit and descriptions for pco

---
 plugins/mock/uca-mock-camera.c |  2 ++
 plugins/pco/uca-pco-camera.c   | 14 ++++++++++++++
 src/uca-camera.c               |  7 ++++---
 src/uca-camera.h               |  1 +
 test/test-mock.c               |  4 ++++
 5 files changed, 25 insertions(+), 3 deletions(-)

(limited to 'test/test-mock.c')

diff --git a/plugins/mock/uca-mock-camera.c b/plugins/mock/uca-mock-camera.c
index 38caf0d..bf3124e 100644
--- a/plugins/mock/uca-mock-camera.c
+++ b/plugins/mock/uca-mock-camera.c
@@ -397,6 +397,8 @@ static void uca_mock_camera_init(UcaMockCamera *self)
     g_value_init(&val, G_TYPE_UINT);
     g_value_set_uint(&val, 1);
     g_value_array_append(self->priv->binnings, &val);
+
+    uca_camera_register_unit (UCA_CAMERA (self), "frame-rate", UCA_UNIT_COUNT);
 }
 
 G_MODULE_EXPORT UcaCamera *
diff --git a/plugins/pco/uca-pco-camera.c b/plugins/pco/uca-pco-camera.c
index 725ffbf..92f814e 100644
--- a/plugins/pco/uca-pco-camera.c
+++ b/plugins/pco/uca-pco-camera.c
@@ -1363,6 +1363,8 @@ uca_pco_camera_class_init(UcaPcoCameraClass *klass)
 static void
 uca_pco_camera_init(UcaPcoCamera *self)
 {
+    UcaCamera *camera;
+
     self->priv = UCA_PCO_CAMERA_GET_PRIVATE(self);
     self->priv->fg = NULL;
     self->priv->fg_mem = NULL;
@@ -1376,6 +1378,18 @@ uca_pco_camera_init(UcaPcoCamera *self)
 
     self->priv->delay_timebase = TIMEBASE_INVALID;
     self->priv->exposure_timebase = TIMEBASE_INVALID;
+
+    camera = UCA_CAMERA (self);
+    uca_camera_register_unit (camera, "sensor-width-extended", UCA_UNIT_PIXEL);
+    uca_camera_register_unit (camera, "sensor-height-extended", UCA_UNIT_PIXEL);
+    uca_camera_register_unit (camera, "temperature", UCA_UNIT_DEGREE_CELSIUS);
+    uca_camera_register_unit (camera, "cooling-point", UCA_UNIT_DEGREE_CELSIUS);
+    uca_camera_register_unit (camera, "cooling-point-min", UCA_UNIT_DEGREE_CELSIUS);
+    uca_camera_register_unit (camera, "cooling-point-max", UCA_UNIT_DEGREE_CELSIUS);
+    uca_camera_register_unit (camera, "cooling-point-default", UCA_UNIT_DEGREE_CELSIUS);
+    uca_camera_register_unit (camera, "sensor-adcs", UCA_UNIT_COUNT);
+    uca_camera_register_unit (camera, "sensor-max-adcs", UCA_UNIT_COUNT);
+    uca_camera_register_unit (camera, "delay-time", UCA_UNIT_SECOND);
 }
 
 G_MODULE_EXPORT UcaCamera *
diff --git a/src/uca-camera.c b/src/uca-camera.c
index 2cf17ff..8b08359 100644
--- a/src/uca-camera.c
+++ b/src/uca-camera.c
@@ -56,10 +56,11 @@ GQuark uca_camera_error_quark()
 /**
  * UcaUnit:
  * @UCA_UNIT_NA: Not applicable
- * @UCA_UNIT_METER: SI meter
- * @UCA_UNIT_SECOND: SI second
+ * @UCA_UNIT_METER: Length in SI meter
+ * @UCA_UNIT_SECOND: Time in SI second
  * @UCA_UNIT_PIXEL: Number of pixels in one dimension
- * @UCA_UNIT_COUNT: Number
+ * @UCA_UNIT_DEGREE_CELSIUS: Temperature in degree Celsius
+ * @UCA_UNIT_COUNT: Generic number
  *
  * Units should be registered by camera implementations using
  * uca_camera_register_unit() and can be queried by client programs with
diff --git a/src/uca-camera.h b/src/uca-camera.h
index 4aad0b4..d84b5f2 100644
--- a/src/uca-camera.h
+++ b/src/uca-camera.h
@@ -54,6 +54,7 @@ typedef enum {
     UCA_UNIT_METER,
     UCA_UNIT_SECOND,
     UCA_UNIT_PIXEL,
+    UCA_UNIT_DEGREE_CELSIUS,
     UCA_UNIT_COUNT
 } UcaUnit;
 
diff --git a/test/test-mock.c b/test/test-mock.c
index 08f24b8..85c1ba4 100644
--- a/test/test-mock.c
+++ b/test/test-mock.c
@@ -171,8 +171,12 @@ test_fps_property (Fixture *fixture, gconstpointer data)
 static void
 test_property_units (Fixture *fixture, gconstpointer data)
 {
+    /* Default camera properties */
     g_assert (uca_camera_get_unit (fixture->camera, "sensor-width") == UCA_UNIT_PIXEL);
     g_assert (uca_camera_get_unit (fixture->camera, "name") == UCA_UNIT_NA);
+
+    /* Mock-specific properties */
+    g_assert (uca_camera_get_unit (fixture->camera, "frame-rate") == UCA_UNIT_COUNT);
 }
 
 static void
-- 
cgit v1.2.3