test: allow to test Chunk selectors

Author: EmmanuelP

src/arv-test.cfg

@@ -211,7 +211,8 @@ SoftwareTriggerDelay=1.0
 # GigEVision write_memory error (busy)
 SoftwareTriggerWait=0.2
 ChunksDelay=1.0
-ChunkList=Timestamp
+ChunkList=Scan3dCoordinateReferenceValue
+ChunkSelector=ChunkScan3dCoordinateReferenceSelector TranslationZ TranslationX RotationZ RotationX
 
 [Smartek:GC651M]
 

src/arvtest.c

@@ -496,6 +496,7 @@ _single_acquisition (ArvTest *test, const char *test_name, ArvTestCamera *test_c
         GError *error = NULL;
         ArvBuffer *buffer = NULL;
         char **chunk_list = NULL;
+        char **chunk_selector_list = NULL;
         ArvChunkParser *parser = NULL;
         char *component = NULL;
         guint n_parts = 1;
@@ -547,6 +548,7 @@ _single_acquisition (ArvTest *test, const char *test_name, ArvTestCamera *test_c
 
         if (chunk_test) {
                 char *chunks;
+                char *chunk_selector;
                 gboolean chunks_support = arv_test_camera_get_key_file_boolean (test_camera, test,
                                                                                 "ChunksSupport", TRUE);
                 n_parts = arv_test_camera_get_key_file_int64 (test_camera, test,
@@ -564,11 +566,16 @@ _single_acquisition (ArvTest *test, const char *test_name, ArvTestCamera *test_c
                 chunks = arv_test_camera_get_key_file_string (test_camera, test, "ChunkList", "OffsetX OffsetY");
                 chunk_list = g_strsplit_set (chunks, " ", -1);
 
+                chunk_selector = arv_test_camera_get_key_file_string(test_camera, test,
+                                                                     "ChunkSelector", "Ignore Ignore");
+                chunk_selector_list = g_strsplit_set(chunk_selector, " ", -1);
+
                 parser = arv_camera_create_chunk_parser (test_camera->camera);
 
                 arv_camera_set_chunks (test_camera->camera, chunks, &error);
 
                 g_free (chunks);
+                g_free (chunk_selector);
         }
 
         if (error == NULL)
@@ -586,23 +593,44 @@ _single_acquisition (ArvTest *test, const char *test_name, ArvTestCamera *test_c
                                      arv_buffer_get_n_parts(buffer), n_parts);
         }
 
-        if (error == NULL && chunk_test) {
-                int n_chunks = g_strv_length (chunk_list);
-                int i;
-
-                if (arv_buffer_has_chunks(buffer)) {
-                        for (i = 0; i < n_chunks && error == NULL; i++) {
-                                char *chunk_name = g_strdup_printf ("Chunk%s", chunk_list[i]);
-                                arv_chunk_parser_get_integer_value (parser, buffer, chunk_name, &error);
-                                g_clear_pointer (&chunk_name, g_free);
+        if (chunk_test) {
+                if (error == NULL) {
+                        int n_chunks = g_strv_length (chunk_list);
+                        int n_elements = g_strv_length (chunk_selector_list) - 1;
+                        int i, j;
+
+                        if (arv_buffer_has_chunks(buffer)) {
+                                for (i = 0; i < n_chunks && error == NULL; i++) {
+                                        char *chunk_name = g_strdup_printf ("Chunk%s", chunk_list[i]);
+                                        for (j = 0; j < n_elements && error == NULL; j++) {
+                                                if (g_strcmp0 (chunk_selector_list[0], "Ignore") != 0) {
+                                                        arv_chunk_parser_set_string_feature_value
+                                                                (parser,
+                                                                 chunk_selector_list[0],
+                                                                 chunk_selector_list[j+1],
+                                                                 &error);
+                                                }
+                                                if (error == NULL) {
+                                                        arv_chunk_parser_get_integer_value (parser, buffer,
+                                                                                            chunk_name, &error);
+                                                        if (error != NULL) {
+                                                                g_clear_error (&error);
+                                                                arv_chunk_parser_get_float_value (parser, buffer,
+                                                                                                  chunk_name, &error);
+                                                        }
+                                                }
+                                        }
+                                        g_clear_pointer (&chunk_name, g_free);
+                                }
+                        } else {
+                                g_set_error (&error, ARV_DEVICE_ERROR, ARV_DEVICE_ERROR_TRANSFER_ERROR,
+                                             "No chunk found in buffer");
                         }
-                } else {
-                        g_set_error (&error, ARV_DEVICE_ERROR, ARV_DEVICE_ERROR_TRANSFER_ERROR,
-                                     "No chunk found in buffer");
-                }
 
-                g_clear_object (&parser);
+                        g_clear_object (&parser);
+                }
                 g_strfreev (chunk_list);
+                g_strfreev (chunk_selector_list);
         }
 
         if (chunk_test)