Skip to content

Commit 16274fb

Browse files
committed
test: show chunk values
1 parent c76032d commit 16274fb

File tree

1 file changed

+26
-5
lines changed

1 file changed

+26
-5
lines changed

src/arvtest.c

Lines changed: 26 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -500,6 +500,7 @@ _single_acquisition (ArvTest *test, const char *test_name, ArvTestCamera *test_c
500500
ArvChunkParser *parser = NULL;
501501
char *component = NULL;
502502
guint n_parts = 1;
503+
GString *message;
503504

504505
g_return_if_fail (ARV_IS_TEST (test));
505506

@@ -563,7 +564,7 @@ _single_acquisition (ArvTest *test, const char *test_name, ArvTestCamera *test_c
563564
return;
564565
}
565566

566-
chunks = arv_test_camera_get_key_file_string (test_camera, test, "ChunkList", "OffsetX OffsetY");
567+
chunks = arv_test_camera_get_key_file_string (test_camera, test, "ChunkList", "Width Height");
567568
chunk_list = g_strsplit_set (chunks, " ", -1);
568569

569570
chunk_selector = arv_test_camera_get_key_file_string(test_camera, test,
@@ -578,6 +579,8 @@ _single_acquisition (ArvTest *test, const char *test_name, ArvTestCamera *test_c
578579
g_free (chunk_selector);
579580
}
580581

582+
message = g_string_new ("");
583+
581584
if (error == NULL)
582585
buffer = arv_camera_acquisition (test_camera->camera, 1000000, &error);
583586

@@ -611,12 +614,28 @@ _single_acquisition (ArvTest *test, const char *test_name, ArvTestCamera *test_c
611614
&error);
612615
}
613616
if (error == NULL) {
614-
arv_chunk_parser_get_integer_value (parser, buffer,
617+
gint64 int_value;
618+
619+
int_value = arv_chunk_parser_get_integer_value (parser, buffer,
615620
chunk_name, &error);
616621
if (error != NULL) {
622+
double float_value;
623+
617624
g_clear_error (&error);
618-
arv_chunk_parser_get_float_value (parser, buffer,
619-
chunk_name, &error);
625+
float_value = arv_chunk_parser_get_float_value
626+
(parser, buffer, chunk_name, &error);
627+
if (error == NULL) {
628+
g_string_append_printf
629+
(message,
630+
"%s%g",
631+
message->len > 0 ? " ": "",
632+
float_value);
633+
}
634+
} else {
635+
g_string_append_printf (message, "%s%"
636+
G_GINT64_MODIFIER "d",
637+
message->len > 0 ? " ": "",
638+
int_value);
620639
}
621640
}
622641
}
@@ -649,7 +668,9 @@ _single_acquisition (ArvTest *test, const char *test_name, ArvTestCamera *test_c
649668
error == NULL ?
650669
ARV_TEST_STATUS_SUCCESS :
651670
ARV_TEST_STATUS_FAILURE,
652-
error != NULL ? error->message : NULL);
671+
error != NULL ? error->message : message->str);
672+
673+
g_string_free (message, TRUE);
653674
g_clear_error (&error);
654675
g_clear_object (&buffer);
655676
}

0 commit comments

Comments
 (0)