From: Bastian Dehn Date: Mon, 17 Feb 2025 20:11:58 +0000 (+0100) Subject: change reset button position X-Git-Tag: v1.1.0^2~3^2~16 X-Git-Url: https://gitweb.hhaalo.de/?a=commitdiff_plain;h=d73425d80f5f201b09ceb9025469e53ec69e66cd;p=sane-kds-s2000w-net.git change reset button position --- diff --git a/src/kds_s2000w_handler_opts.c b/src/kds_s2000w_handler_opts.c index c27193c..1806d0e 100644 --- a/src/kds_s2000w_handler_opts.c +++ b/src/kds_s2000w_handler_opts.c @@ -246,10 +246,6 @@ void kds_s2000w_handler_opts_get_option(handler* h, uint32_t option, void* value value_object = json_object_object_get(config, "BinarizationContrast"); _kds_s2000w_handler_opts_write_int_value(value_object, value); break; - case 31: - value_object = json_object_object_get(config, "SkipBlankPages"); - _kds_s2000w_handler_opts_write_int_value(value_object, value); - break; case 32: value_object = json_object_object_get(config, "JpegQuality"); _kds_s2000w_handler_opts_write_string_value(value_object, value); @@ -298,6 +294,10 @@ void kds_s2000w_handler_opts_get_option(handler* h, uint32_t option, void* value value_object = json_object_object_get(config, "TransportHandling"); _kds_s2000w_handler_opts_write_string_value(value_object, value); break; + case 44: + value_object = json_object_object_get(config, "SkipBlankPages"); + _kds_s2000w_handler_opts_write_int_value(value_object, value); + break; default: break; } @@ -441,8 +441,15 @@ void kds_s2000w_handler_opts_set_option(handler* h, uint32_t option, void* value _kds_s2000w_handler_opts_write_int_value_to_json(value_object, value); break; case 31: - value_object = json_object_object_get(config, "SkipBlankPages"); - _kds_s2000w_handler_opts_write_int_value_to_json(value_object, value); + _kds_s2000w_handler_opts_set_option_to_default(h); + _kds_s2000w_handler_opts_set_autostart_on(h); + + SANE_Option_Descriptor* cropping_image = kds_s2000w_option_descriptors_get_by_name("cropping-image"); + cropping_image->cap |= SANE_CAP_SOFT_SELECT; + + if (info != NULL) + *info = RELOAD_OPTIONS | RELOAD_PARAMS; + return; break; case 32: value_object = json_object_object_get(config, "JpegQuality"); @@ -493,15 +500,8 @@ void kds_s2000w_handler_opts_set_option(handler* h, uint32_t option, void* value _kds_s2000w_handler_opts_write_string_value_to_json(value_object, value); break; case 44: - _kds_s2000w_handler_opts_set_option_to_default(h); - _kds_s2000w_handler_opts_set_autostart_on(h); - - SANE_Option_Descriptor* cropping_image = kds_s2000w_option_descriptors_get_by_name("cropping-image"); - cropping_image->cap |= SANE_CAP_SOFT_SELECT; - - if (info != NULL) - *info = RELOAD_OPTIONS | RELOAD_PARAMS; - return; + value_object = json_object_object_get(config, "SkipBlankPages"); + _kds_s2000w_handler_opts_write_int_value_to_json(value_object, value); break; default: break; diff --git a/src/kds_s2000w_option_descriptors.c b/src/kds_s2000w_option_descriptors.c index c8df9c7..6306ae6 100644 --- a/src/kds_s2000w_option_descriptors.c +++ b/src/kds_s2000w_option_descriptors.c @@ -510,8 +510,8 @@ SANE_Option_Descriptor _kds_s2000w_option_descriptor_config_reset() SANE_Option_Descriptor descriptor = { "config-reset", - "reset config", - "load default configuration from scanner", + "Reset Config", + "Load default configuration from scanner", SANE_TYPE_BUTTON, SANE_UNIT_NONE, 0, @@ -1109,7 +1109,7 @@ void kds_s2000w_option_descriptors_init() descriptor_array[28] = _kds_s2000w_option_descriptor_color_balance_blue(); descriptor_array[29] = _kds_s2000w_option_descriptor_color_sharpen(); descriptor_array[30] = _kds_s2000w_option_descriptor_binarization_contrast(); - descriptor_array[31] = _kds_s2000w_option_descriptor_skip_blank_pages(); + descriptor_array[31] = _kds_s2000w_option_descriptor_config_reset(); descriptor_array[32] = _kds_s2000w_option_descriptor_jpeg_quality(); descriptor_array[33] = _kds_s2000w_option_descriptor_skip_blank_page_content(); descriptor_array[34] = _kds_s2000w_option_descriptor_multifeed_sensitivity(); @@ -1122,7 +1122,7 @@ void kds_s2000w_option_descriptors_init() descriptor_array[41] = _kds_s2000w_option_descriptor_post_scan_rotation(); descriptor_array[42] = _kds_s2000w_option_descriptor_edge_fill(); descriptor_array[43] = _kds_s2000w_option_descriptor_transport_handling(); - descriptor_array[44] = _kds_s2000w_option_descriptor_config_reset(); + descriptor_array[44] = _kds_s2000w_option_descriptor_skip_blank_pages(); } void kds_s2000w_option_descriptors_free() diff --git a/tests/kds_s2000w_net_get_opt_tests.c b/tests/kds_s2000w_net_get_opt_tests.c index da03d06..8d63071 100644 --- a/tests/kds_s2000w_net_get_opt_tests.c +++ b/tests/kds_s2000w_net_get_opt_tests.c @@ -420,21 +420,6 @@ void sane_kds_s2000w_net_control_get_option_thirdy_test(void** state) h = NULL; } -void sane_kds_s2000w_net_control_get_option_thirdyone_test(void** state) -{ - handler* h = kds_s2000w_handler_init(); - response* resp = (response*) *state; - h->current_scanner_config = json_tokener_parse(resp->data); - int32_t value = -1; - - sane_kds_s2000w_net_control_option(h, 31, SANE_ACTION_GET_VALUE, &value, NULL); - - assert_int_equal(value, 0); - - kds_s2000w_handler_free(h); - h = NULL; -} - void sane_kds_s2000w_net_control_get_option_thirdytwo_test(void** state) { handler* h = kds_s2000w_handler_init(); @@ -611,6 +596,21 @@ void sane_kds_s2000w_net_control_get_option_fourtythree_test(void** state) assert_string_equal(value, "Normal"); + kds_s2000w_handler_free(h); + h = NULL; +} + +void sane_kds_s2000w_net_control_get_option_fourtyfour_test(void** state) +{ + handler* h = kds_s2000w_handler_init(); + response* resp = (response*) *state; + h->current_scanner_config = json_tokener_parse(resp->data); + int32_t value = -1; + + sane_kds_s2000w_net_control_option(h, 44, SANE_ACTION_GET_VALUE, &value, NULL); + + assert_int_equal(value, 0); + kds_s2000w_handler_free(h); h = NULL; } \ No newline at end of file diff --git a/tests/kds_s2000w_net_get_opt_tests.h b/tests/kds_s2000w_net_get_opt_tests.h index 180ec83..d7a389d 100644 --- a/tests/kds_s2000w_net_get_opt_tests.h +++ b/tests/kds_s2000w_net_get_opt_tests.h @@ -33,7 +33,6 @@ void sane_kds_s2000w_net_control_get_option_twentyseven_test(void** state); void sane_kds_s2000w_net_control_get_option_twentyeight_test(void** state); void sane_kds_s2000w_net_control_get_option_twentynine_test(void** state); void sane_kds_s2000w_net_control_get_option_thirdy_test(void** state); -void sane_kds_s2000w_net_control_get_option_thirdyone_test(void** state); void sane_kds_s2000w_net_control_get_option_thirdytwo_test(void** state); void sane_kds_s2000w_net_control_get_option_thirdythree_test(void** state); void sane_kds_s2000w_net_control_get_option_thirdyfour_test(void** state); @@ -46,5 +45,6 @@ void sane_kds_s2000w_net_control_get_option_fourty_test(void** state); void sane_kds_s2000w_net_control_get_option_fourtyone_test(void** state); void sane_kds_s2000w_net_control_get_option_fourtytwo_test(void** state); void sane_kds_s2000w_net_control_get_option_fourtythree_test(void** state); +void sane_kds_s2000w_net_control_get_option_fourtyfour_test(void** state); #endif \ No newline at end of file diff --git a/tests/kds_s2000w_net_get_opt_tests_run.c b/tests/kds_s2000w_net_get_opt_tests_run.c index 9716f58..abaf83d 100644 --- a/tests/kds_s2000w_net_get_opt_tests_run.c +++ b/tests/kds_s2000w_net_get_opt_tests_run.c @@ -107,7 +107,6 @@ int main() cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_control_get_option_twentyeight_test, setup_default_get_option, teardown_default_get_option), cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_control_get_option_twentynine_test, setup_default_get_option, teardown_default_get_option), cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_control_get_option_thirdy_test, setup_default_get_option, teardown_default_get_option), - cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_control_get_option_thirdyone_test, setup_default_get_option, teardown_default_get_option), cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_control_get_option_thirdytwo_test, setup_default_get_option, teardown_default_get_option), cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_control_get_option_thirdythree_test, setup_default_get_option, teardown_default_get_option), cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_control_get_option_thirdyfour_test, setup_default_get_option, teardown_default_get_option), @@ -119,7 +118,8 @@ int main() cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_control_get_option_fourty_test, setup_default_get_option, teardown_default_get_option), cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_control_get_option_fourtyone_test, setup_default_get_option, teardown_default_get_option), cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_control_get_option_fourtytwo_test, setup_default_get_option, teardown_default_get_option), - cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_control_get_option_fourtythree_test, setup_default_get_option, teardown_default_get_option) + cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_control_get_option_fourtythree_test, setup_default_get_option, teardown_default_get_option), + cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_control_get_option_fourtyfour_test, setup_default_get_option, teardown_default_get_option) }; return cmocka_run_group_tests(net_tests, NULL, NULL); diff --git a/tests/kds_s2000w_option_descriptor_tests.c b/tests/kds_s2000w_option_descriptor_tests.c index 0266652..e478323 100644 --- a/tests/kds_s2000w_option_descriptor_tests.c +++ b/tests/kds_s2000w_option_descriptor_tests.c @@ -555,12 +555,12 @@ void kds_s2000w_option_get_descriptor_thirdyone_test() { SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(31); - assert_string_equal("skip-blank-pages", option->name); - assert_string_equal("Blank Image Deletion Mode", option->title); - assert_string_equal("Blank Image Deletion Mode", option->desc); - assert_int_equal(SANE_TYPE_BOOL, option->type); + assert_string_equal("config-reset", option->name); + assert_string_equal("Reset Config", option->title); + assert_string_equal("Load default configuration from scanner", option->desc); + assert_int_equal(SANE_TYPE_BUTTON, option->type); assert_int_equal(SANE_UNIT_NONE, option->unit); - assert_int_equal(sizeof(SANE_Bool), option->size); + assert_int_equal(0, option->size); assert_int_equal(SANE_CAP_SOFT_DETECT | SANE_CAP_SOFT_SELECT, option->cap); assert_int_equal(SANE_CONSTRAINT_NONE, option->constraint_type); } @@ -784,12 +784,12 @@ void kds_s2000w_option_get_descriptor_fourtyfour_test() { SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(44); - assert_string_equal("config-reset", option->name); - assert_string_equal("reset config", option->title); - assert_string_equal("load default configuration from scanner", option->desc); - assert_int_equal(SANE_TYPE_BUTTON, option->type); + assert_string_equal("skip-blank-pages", option->name); + assert_string_equal("Blank Image Deletion Mode", option->title); + assert_string_equal("Blank Image Deletion Mode", option->desc); + assert_int_equal(SANE_TYPE_BOOL, option->type); assert_int_equal(SANE_UNIT_NONE, option->unit); - assert_int_equal(0, option->size); + assert_int_equal(sizeof(SANE_Bool), option->size); assert_int_equal(SANE_CAP_SOFT_DETECT | SANE_CAP_SOFT_SELECT, option->cap); assert_int_equal(SANE_CONSTRAINT_NONE, option->constraint_type); }