@@ -500,6 +500,7 @@ _single_acquisition (ArvTest *test, const char *test_name, ArvTestCamera *test_c
500
500
ArvChunkParser * parser = NULL ;
501
501
char * component = NULL ;
502
502
guint n_parts = 1 ;
503
+ GString * message ;
503
504
504
505
g_return_if_fail (ARV_IS_TEST (test ));
505
506
@@ -563,7 +564,7 @@ _single_acquisition (ArvTest *test, const char *test_name, ArvTestCamera *test_c
563
564
return ;
564
565
}
565
566
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 " );
567
568
chunk_list = g_strsplit_set (chunks , " " , -1 );
568
569
569
570
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
578
579
g_free (chunk_selector );
579
580
}
580
581
582
+ message = g_string_new ("" );
583
+
581
584
if (error == NULL )
582
585
buffer = arv_camera_acquisition (test_camera -> camera , 1000000 , & error );
583
586
@@ -611,12 +614,28 @@ _single_acquisition (ArvTest *test, const char *test_name, ArvTestCamera *test_c
611
614
& error );
612
615
}
613
616
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 ,
615
620
chunk_name , & error );
616
621
if (error != NULL ) {
622
+ double float_value ;
623
+
617
624
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 );
620
639
}
621
640
}
622
641
}
@@ -649,7 +668,9 @@ _single_acquisition (ArvTest *test, const char *test_name, ArvTestCamera *test_c
649
668
error == NULL ?
650
669
ARV_TEST_STATUS_SUCCESS :
651
670
ARV_TEST_STATUS_FAILURE ,
652
- error != NULL ? error -> message : NULL );
671
+ error != NULL ? error -> message : message -> str );
672
+
673
+ g_string_free (message , TRUE);
653
674
g_clear_error (& error );
654
675
g_clear_object (& buffer );
655
676
}
0 commit comments