Skip to content

Commit 68425b9

Browse files
eritpchyeritpchy
committed
6.10.2 Fixed incorrect pickup 'text_alignment' value
1 parent 0394982 commit 68425b9

File tree

2 files changed

+84
-123
lines changed

2 files changed

+84
-123
lines changed

‎Interfaces/VideoSubFinderCli/VideoSubFinderCli.cpp

Lines changed: 83 additions & 122 deletions
Original file line numberDiff line numberDiff line change
@@ -72,45 +72,6 @@ void ClearDir(wxString DirName)
7272
FileNamesVector.clear();
7373
}
7474

75-
/////////////////////////////////////////////////////////////////////////////
76-
77-
wxString ConvertTextAlignmentToString(TextAlignment val)
78-
{
79-
switch (val)
80-
{
81-
case TextAlignment::Center:
82-
return "Center";
83-
case TextAlignment::Left:
84-
return "Left";
85-
case TextAlignment::Right:
86-
return "Right";
87-
case TextAlignment::Any:
88-
return "Any";
89-
}
90-
}
91-
92-
TextAlignment ConvertStringToTextAlignment(wxString val)
93-
{
94-
TextAlignment res;
95-
if (val == ConvertTextAlignmentToString(TextAlignment::Center))
96-
{
97-
res = TextAlignment::Center;
98-
}
99-
else if (val == ConvertTextAlignmentToString(TextAlignment::Left))
100-
{
101-
res = TextAlignment::Left;
102-
}
103-
else if (val == ConvertTextAlignmentToString(TextAlignment::Right))
104-
{
105-
res = TextAlignment::Right;
106-
}
107-
else if (val == ConvertTextAlignmentToString(TextAlignment::Any))
108-
{
109-
res = TextAlignment::Any;
110-
}
111-
return res;
112-
}
113-
11475
void CVideoSubFinderApp::OnInitCmdLine(wxCmdLineParser& parser) {
11576
wxAppConsole::OnInitCmdLine(parser);
11677

@@ -511,99 +472,99 @@ static void ReadSettings(wxString file_name, std::map<wxString, wxString>& setti
511472

512473
void CVideoSubFinderApp::LoadSettings(wxString file_name)
513474
{
514-
std::map<wxString, wxString> m_general_settings;
515-
ReadSettings(file_name, m_general_settings);
516-
517-
ReadProperty(m_general_settings, g_generate_cleared_text_images_on_test, "generate_cleared_text_images_on_test");
518-
ReadProperty(m_general_settings, g_show_results, "dump_debug_images");
519-
ReadProperty(m_general_settings, g_show_sf_results, "dump_debug_second_filtration_images");
520-
ReadProperty(m_general_settings, g_clear_test_images_folder, "clear_test_images_folder");
521-
ReadProperty(m_general_settings, g_show_transformed_images_only, "show_transformed_images_only");
522-
ReadProperty(m_general_settings, g_use_ocl, "use_ocl");
523-
ReadProperty(m_general_settings, g_use_cuda_gpu, "use_cuda_gpu");
524-
525-
ReadProperty(m_general_settings, g_use_filter_color, "use_filter_color");
526-
ReadProperty(m_general_settings, g_use_outline_filter_color, "use_outline_filter_color");
527-
ReadProperty(m_general_settings, g_dL_color, "dL_color");
528-
ReadProperty(m_general_settings, g_dA_color, "dA_color");
529-
ReadProperty(m_general_settings, g_dB_color, "dB_color");
530-
ReadProperty(m_general_settings, g_combine_to_single_cluster, "combine_to_single_cluster");
531-
532-
ReadProperty(m_general_settings, g_cuda_kmeans_initial_loop_iterations, "cuda_kmeans_initial_loop_iterations");
533-
ReadProperty(m_general_settings, g_cuda_kmeans_loop_iterations, "cuda_kmeans_loop_iterations");
534-
ReadProperty(m_general_settings, g_cpu_kmeans_initial_loop_iterations, "cpu_kmeans_initial_loop_iterations");
535-
ReadProperty(m_general_settings, g_cpu_kmeans_loop_iterations, "cpu_kmeans_loop_iterations");
536-
537-
ReadProperty(m_general_settings, g_smthr, "moderate_threshold_for_scaled_image");
538-
ReadProperty(m_general_settings, g_mthr, "moderate_threshold");
539-
ReadProperty(m_general_settings, g_mnthr, "moderate_threshold_for_NEdges");
540-
ReadProperty(m_general_settings, g_segw, "segment_width");
541-
ReadProperty(m_general_settings, g_segh, "segment_height");
542-
ReadProperty(m_general_settings, g_msegc, "minimum_segments_count");
543-
ReadProperty(m_general_settings, g_scd, "min_sum_color_diff");
544-
ReadProperty(m_general_settings, g_btd, "between_text_distace");
545-
ReadProperty(m_general_settings, g_to, "text_centre_offset");
546-
ReadProperty(m_general_settings, g_scale, "image_scale_for_clear_image");
547-
548-
549-
ReadProperty(m_general_settings, g_use_ILA_images_for_getting_txt_symbols_areas, "use_ILA_images_for_getting_txt_symbols_areas");
550-
ReadProperty(m_general_settings, g_use_ILA_images_before_clear_txt_images_from_borders, "use_ILA_images_before_clear_txt_images_from_borders");
551-
552-
ReadProperty(m_general_settings, g_use_gradient_images_for_clear_txt_images, "use_gradient_images_for_clear_txt_images");
553-
ReadProperty(m_general_settings, g_clear_txt_images_by_main_color, "clear_txt_images_by_main_color");
554-
ReadProperty(m_general_settings, g_use_ILA_images_for_clear_txt_images, "use_ILA_images_for_clear_txt_images");
555-
556-
ReadProperty(m_general_settings, g_mpn, "min_points_number");
557-
ReadProperty(m_general_settings, g_mpd, "min_points_density");
558-
ReadProperty(m_general_settings, g_msh, "min_symbol_height");
559-
ReadProperty(m_general_settings, g_msd, "min_symbol_density");
560-
ReadProperty(m_general_settings, g_mpned, "min_NEdges_points_density");
561-
562-
ReadProperty(m_general_settings, g_join_subs_and_correct_time, "join_subs_and_correct_time");
563-
564-
ReadProperty(m_general_settings, g_threads, "threads");
565-
ReadProperty(m_general_settings, g_DL, "sub_frame_length");
566-
ReadProperty(m_general_settings, g_tp, "text_percent");
567-
ReadProperty(m_general_settings, g_mtpl, "min_text_len_in_percent");
568-
ReadProperty(m_general_settings, g_veple, "vedges_points_line_error");
569-
ReadProperty(m_general_settings, g_ilaple, "ila_points_line_error");
570-
571-
ReadProperty(m_general_settings, g_video_contrast, "video_contrast");
572-
ReadProperty(m_general_settings, g_video_gamma, "video_gamma");
573-
574-
ReadProperty(m_general_settings, g_clear_image_logical, "clear_image_logical");
575-
576-
ReadProperty(m_general_settings, g_DefStringForEmptySub, "def_string_for_empty_sub");
577-
578-
ReadProperty(m_general_settings, g_use_ISA_images_for_search_subtitles, "use_ISA_images_for_search_subtitles");
579-
ReadProperty(m_general_settings, g_use_ILA_images_for_search_subtitles, "use_ILA_images_for_search_subtitles");
580-
ReadProperty(m_general_settings, g_replace_ISA_by_filtered_version, "replace_ISA_by_filtered_version");
581-
ReadProperty(m_general_settings, g_max_dl_down, "max_dl_down");
582-
ReadProperty(m_general_settings, g_max_dl_up, "max_dl_up");
583-
584-
ReadProperty(m_general_settings, g_remove_wide_symbols, "remove_wide_symbols");
585-
586-
ReadProperty(m_general_settings, g_hw_device, "hw_device");
587-
588-
if (ReadProperty(m_general_settings, g_filter_descr, "filter_descr"))
475+
std::map<wxString, wxString> g_general_settings;
476+
ReadSettings(file_name, g_general_settings);
477+
478+
ReadProperty(g_general_settings, g_generate_cleared_text_images_on_test, "generate_cleared_text_images_on_test");
479+
ReadProperty(g_general_settings, g_show_results, "dump_debug_images");
480+
ReadProperty(g_general_settings, g_show_sf_results, "dump_debug_second_filtration_images");
481+
ReadProperty(g_general_settings, g_clear_test_images_folder, "clear_test_images_folder");
482+
ReadProperty(g_general_settings, g_show_transformed_images_only, "show_transformed_images_only");
483+
ReadProperty(g_general_settings, g_use_ocl, "use_ocl");
484+
ReadProperty(g_general_settings, g_use_cuda_gpu, "use_cuda_gpu");
485+
486+
ReadProperty(g_general_settings, g_use_filter_color, "use_filter_color");
487+
ReadProperty(g_general_settings, g_use_outline_filter_color, "use_outline_filter_color");
488+
ReadProperty(g_general_settings, g_dL_color, "dL_color");
489+
ReadProperty(g_general_settings, g_dA_color, "dA_color");
490+
ReadProperty(g_general_settings, g_dB_color, "dB_color");
491+
ReadProperty(g_general_settings, g_combine_to_single_cluster, "combine_to_single_cluster");
492+
493+
ReadProperty(g_general_settings, g_cuda_kmeans_initial_loop_iterations, "cuda_kmeans_initial_loop_iterations");
494+
ReadProperty(g_general_settings, g_cuda_kmeans_loop_iterations, "cuda_kmeans_loop_iterations");
495+
ReadProperty(g_general_settings, g_cpu_kmeans_initial_loop_iterations, "cpu_kmeans_initial_loop_iterations");
496+
ReadProperty(g_general_settings, g_cpu_kmeans_loop_iterations, "cpu_kmeans_loop_iterations");
497+
498+
ReadProperty(g_general_settings, g_smthr, "moderate_threshold_for_scaled_image");
499+
ReadProperty(g_general_settings, g_mthr, "moderate_threshold");
500+
ReadProperty(g_general_settings, g_mnthr, "moderate_threshold_for_NEdges");
501+
ReadProperty(g_general_settings, g_segw, "segment_width");
502+
ReadProperty(g_general_settings, g_segh, "segment_height");
503+
ReadProperty(g_general_settings, g_msegc, "minimum_segments_count");
504+
ReadProperty(g_general_settings, g_scd, "min_sum_color_diff");
505+
ReadProperty(g_general_settings, g_btd, "between_text_distace");
506+
ReadProperty(g_general_settings, g_to, "text_centre_offset");
507+
ReadProperty(g_general_settings, g_scale, "image_scale_for_clear_image");
508+
509+
510+
ReadProperty(g_general_settings, g_use_ILA_images_for_getting_txt_symbols_areas, "use_ILA_images_for_getting_txt_symbols_areas");
511+
ReadProperty(g_general_settings, g_use_ILA_images_before_clear_txt_images_from_borders, "use_ILA_images_before_clear_txt_images_from_borders");
512+
513+
ReadProperty(g_general_settings, g_use_gradient_images_for_clear_txt_images, "use_gradient_images_for_clear_txt_images");
514+
ReadProperty(g_general_settings, g_clear_txt_images_by_main_color, "clear_txt_images_by_main_color");
515+
ReadProperty(g_general_settings, g_use_ILA_images_for_clear_txt_images, "use_ILA_images_for_clear_txt_images");
516+
517+
ReadProperty(g_general_settings, g_mpn, "min_points_number");
518+
ReadProperty(g_general_settings, g_mpd, "min_points_density");
519+
ReadProperty(g_general_settings, g_msh, "min_symbol_height");
520+
ReadProperty(g_general_settings, g_msd, "min_symbol_density");
521+
ReadProperty(g_general_settings, g_mpned, "min_NEdges_points_density");
522+
523+
ReadProperty(g_general_settings, g_join_subs_and_correct_time, "join_subs_and_correct_time");
524+
525+
ReadProperty(g_general_settings, g_threads, "threads");
526+
ReadProperty(g_general_settings, g_DL, "sub_frame_length");
527+
ReadProperty(g_general_settings, g_tp, "text_percent");
528+
ReadProperty(g_general_settings, g_mtpl, "min_text_len_in_percent");
529+
ReadProperty(g_general_settings, g_veple, "vedges_points_line_error");
530+
ReadProperty(g_general_settings, g_ilaple, "ila_points_line_error");
531+
532+
ReadProperty(g_general_settings, g_video_contrast, "video_contrast");
533+
ReadProperty(g_general_settings, g_video_gamma, "video_gamma");
534+
535+
ReadProperty(g_general_settings, g_clear_image_logical, "clear_image_logical");
536+
537+
ReadProperty(g_general_settings, g_DefStringForEmptySub, "def_string_for_empty_sub");
538+
539+
ReadProperty(g_general_settings, g_use_ISA_images_for_search_subtitles, "use_ISA_images_for_search_subtitles");
540+
ReadProperty(g_general_settings, g_use_ILA_images_for_search_subtitles, "use_ILA_images_for_search_subtitles");
541+
ReadProperty(g_general_settings, g_replace_ISA_by_filtered_version, "replace_ISA_by_filtered_version");
542+
ReadProperty(g_general_settings, g_max_dl_down, "max_dl_down");
543+
ReadProperty(g_general_settings, g_max_dl_up, "max_dl_up");
544+
545+
ReadProperty(g_general_settings, g_remove_wide_symbols, "remove_wide_symbols");
546+
547+
ReadProperty(g_general_settings, g_hw_device, "hw_device");
548+
549+
if (ReadProperty(g_general_settings, g_filter_descr, "filter_descr"))
589550
{
590551
if (g_filter_descr == wxT("none"))
591552
{
592553
g_filter_descr = wxT("");
593554
}
594555
}
595556

596-
ReadProperty(m_general_settings, g_save_each_substring_separately, "save_each_substring_separately");
597-
ReadProperty(m_general_settings, g_save_scaled_images, "save_scaled_images");
557+
ReadProperty(g_general_settings, g_save_each_substring_separately, "save_each_substring_separately");
558+
ReadProperty(g_general_settings, g_save_scaled_images, "save_scaled_images");
598559

599-
ReadProperty(m_general_settings, g_border_is_darker, "border_is_darker");
560+
ReadProperty(g_general_settings, g_border_is_darker, "border_is_darker");
600561

601-
wxString g_text_alignment_string;
602-
ReadProperty(m_general_settings, g_text_alignment_string, "text_alignment");
603-
g_text_alignment = ConvertStringToTextAlignment(g_text_alignment_string);
562+
int text_alignment;
563+
ReadProperty(g_general_settings, text_alignment, "text_alignment");
564+
g_text_alignment = (TextAlignment)text_alignment;
604565

605-
ReadProperty(m_general_settings, g_extend_by_grey_color, "extend_by_grey_color");
606-
ReadProperty(m_general_settings, g_allow_min_luminance, "allow_min_luminance");
566+
ReadProperty(g_general_settings, g_extend_by_grey_color, "extend_by_grey_color");
567+
ReadProperty(g_general_settings, g_allow_min_luminance, "allow_min_luminance");
607568
}
608569

609570

‎Interfaces/VideoSubFinderWXW/MyResource.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
#pragma once
1818

19-
#define VSF_VERSION "6.10.1"
19+
#define VSF_VERSION "6.10.2"
2020

2121
#define ID_APP_ABOUT 1100
2222

0 commit comments

Comments
 (0)