1. 29 Mar, 2011 40 commits
    • Guillaume Lazzara's avatar
    • Guillaume Lazzara's avatar
      Regen generated files. · 843b5b38
      Guillaume Lazzara authored
      	* headers.mk,
      	* tests/unit_test/unit-tests.mk: Regen.
      843b5b38
    • Guillaume Lazzara's avatar
    • Guillaume Lazzara's avatar
    • Guillaume Lazzara's avatar
      Set unit tests dependencies. · cc936794
      Guillaume Lazzara authored
      	* tests/unit_test/Makefile.am: Add new conditional test file.
      
      	* tests/unit_test/cond_tests_magickxx_qt_tesseract_tiff,
      	* tests/unit_test/cond_tests_qt,
      	* tests/unit_test/cond_tests_qt_tesseract_tiff: Update list of files.
      
      	* tests/unit_test/unit-tests.mk: Regen.
      cc936794
    • Guillaume Lazzara's avatar
      New debug tools. · 1dcbbab5
      Guillaume Lazzara authored
      	* src/Makefile.am,
      	* src/debug/Makefile.am: Update targets.
      
      	* src/debug/non_text_mask.cc,
      	* src/debug/show_components_bboxes.cc,
      	* src/debug/show_groups_bboxes.cc,
      	* src/debug/show_links_bottom_aligned_2angles.cc,
      	* src/debug/show_links_top_aligned_2angles.cc,
      	* src/debug/show_paragraph_blocks.cc,
      	* src/non_text_components.cc: New.
      
      	* src/debug/show_links_several_right.cc: Removed. Deprecated.
      1dcbbab5
    • Guillaume Lazzara's avatar
      New non-text components extraction routine. · 21ca1871
      Guillaume Lazzara authored
      	* scribo/make/text_blocks_image.hh,
      	* scribo/make/text_components_image.hh,
      	* scribo/primitive/extract/internal/union.hh: New.
      
      	* scribo/primitive/extract/non_text.hh: New implementation.
      
      	* scribo/primitive/extract/non_text_kmean.hh: New. Old
      	implementatino is saved here.
      21ca1871
    • Guillaume Lazzara's avatar
      Introduce result image output. · 7d037d1f
      Guillaume Lazzara authored
      	* scribo/fun/v2v/highlight.hh,
      	* scribo/io/img/internal/debug_img_visitor.hh,
      	* scribo/io/img/internal/draw_edges.hh,
      	* scribo/io/img/internal/full_img_visitor.hh,
      	* scribo/io/img/internal/non_text_img_visitor.hh,
      	* scribo/io/img/internal/text_img_visitor.hh,
      	* scribo/io/img/save.hh: New.
      7d037d1f
    • Guillaume Lazzara's avatar
      Save image edge coordinates in XML output. · 4c0ed4e9
      Guillaume Lazzara authored
      	* scribo/io/xml/internal/extended_page_xml_visitor.hh: Here.
      
      	* scribo/io/xml/internal/print_image_coords.hh: New.
      4c0ed4e9
    • Guillaume Lazzara's avatar
      0d770d15
    • Guillaume Lazzara's avatar
    • Guillaume Lazzara's avatar
      Various small fixes. · a3308a17
      Guillaume Lazzara authored
      	* scribo/filter/object_links_bottom_aligned.hh,
      	* scribo/filter/object_links_top_aligned.hh,
      	* src/debug/show_links_bottom_aligned.cc,
      	* src/debug/show_links_top_aligned.cc: Update call to
      	linking routine.
      
      	* scribo/filter/object_links_non_aligned_simple.hh: Copy data.
      
      	* scribo/preprocessing/rotate_90.hh,
      	* scribo/text/extract_lines.hh,
      	* src/debug/show_stoppers.cc: Revamp.
      
      	* scribo/primitive/extract/horizontal_separators.hh: Actually use
      	horizontal routine.
      
      	* scribo/primitive/extract/separators.hh: Adjust borders.
      
      	* scribo/primitive/identify.hh: Disable for now.
      
      	* scribo/primitive/link/with_single_right_link.hh: Add anchor argument.
      
      	* scribo/primitive/link/with_single_right_link_top.hh: Rename arguments.
      
      	* src/content_in_doc.cc: Add more usage information.
      
      	* src/debug/show_links_center_aligned.cc: Update anchor value.
      
      	* src/debug/show_text_lines.cc: Add XML output.
      
      	* src/preprocessing/rotate.cc,
      	* src/preprocessing/rotate_90.cc: Initialize ImageMagick.
      a3308a17
    • Guillaume Lazzara's avatar
      Introduce a new component linking method. · cb7a3bf6
      Guillaume Lazzara authored
      	* scribo/primitive/link/internal/link_single_dmax_ratio_aligned_base.hh,
      	* scribo/primitive/link/with_single_left_link_dmax_ratio_aligned.hh:
      	New.
      
      	* scribo/primitive/link/with_single_right_link_dmax_ratio_aligned.hh:
      	Cleanup.
      cb7a3bf6
    • Guillaume Lazzara's avatar
      Spread anchor value to more methods in link functors. · 742d0124
      Guillaume Lazzara authored
      	* scribo/primitive/link/internal/find_link.hh,
      	* scribo/primitive/link/internal/link_functor_base.hh,
      	* scribo/primitive/link/internal/link_single_dmax_ratio_base.hh: Here.
      742d0124
    • Guillaume Lazzara's avatar
      Introduce a logger class. · e441edb8
      Guillaume Lazzara authored
      	* scribo/debug/logger.hh: New.
      
      	* scribo/toolchain/internal/content_in_doc_functor.hh,
      	* scribo/toolchain/internal/text_in_doc_functor.hh,
      	* scribo/toolchain/nepomuk/text_extraction.hh,
      	* scribo/toolchain/text_in_doc.hh,
      	* src/content_in_doc.cc,
      	* src/pbm_text_in_doc.cc,
      	* src/primitive/extract/separators_nonvisible.cc Make use of that
      	class for saving debug images.
      e441edb8
    • Guillaume Lazzara's avatar
      Introduce a logger class. · 303e38d4
      Guillaume Lazzara authored
      	* scribo/debug/logger.hh: New.
      303e38d4
    • Guillaume Lazzara's avatar
      Introduce new anchors. · 257be9e6
      Guillaume Lazzara authored
      	* scribo/core/tag/anchor.hh: New anchors.
      
      	* scribo/filter/internal/alignment_angle.hh,
      	* scribo/primitive/link/internal/compute_anchor.hh: Make use of
      	that new anchors.
      257be9e6
    • Guillaume Lazzara's avatar
      Rename document serializer base class. · bafdc50a
      Guillaume Lazzara authored
      	* scribo/core/internal/doc_xml_serializer.hh: Rename as...
      	* scribo/core/internal/doc_serializer.hh: ... this.
      
      	* scribo/io/xml/internal/extended_page_xml_visitor.hh,
      	* scribo/io/xml/internal/full_xml_visitor.hh,
      	* scribo/io/xml/internal/page_xml_visitor.hh: Update inheritance.
      bafdc50a
    • Guillaume Lazzara's avatar
      Store more information in scribo::document. · fffcde77
      Guillaume Lazzara authored
      	* scribo/core/document.hh: Make a distinction between horizontal
      	and vertical lines. Store the binary image.
      
      	* scribo/io/xml/internal/extended_page_xml_visitor.hh,
      	* scribo/io/xml/internal/full_xml_visitor.hh,
      	* scribo/io/xml/internal/page_xml_visitor.hh,
      	* scribo/toolchain/internal/content_in_doc_functor.hh: Make use of
      	that new methods and information.
      fffcde77
    • Guillaume Lazzara's avatar
      Rename line_info::components() to line_info::component_ids. · dd1061b0
      Guillaume Lazzara authored
      	* scribo/core/line_info.hh: Here.
      
      	* scribo/debug/char_space_image.hh,
      	* scribo/text/recognition.hh,
      	* src/debug/show_text_lines.cc,
      	* scribo/io/xml/internal/full_xml_visitor.hh: Update calls to that
      	method.
      dd1061b0
    • Guillaume Lazzara's avatar
      Some changes in debug routines. · 81e79695
      Guillaume Lazzara authored
      	* scribo/debug/save_bboxes_image.hh,
      	* scribo/debug/save_linked_bboxes_image.hh: Rename as...
      	* scribo/debug/bboxes_image.hh,
      	* scribo/debug/linked_bboxes_image.hh: ... this.
      
      	* scribo/debug/links_image.hh: New.
      
      	* scribo/debug/several_links_decision_image.hh:
      	Remove. Deprecated.
      
      	* scribo/debug/alignment_decision_image.hh: Make use of
      	compute_anchor routine.
      
      	* scribo/debug/all.hh,
      	* scribo/table/extract.hh,
      	* scribo/toolchain/text_in_picture.hh,
      	* src/debug/show_links_several_right_overlap.cc,
      	* src/debug/show_links_single_down.cc,
      	* src/debug/show_links_single_down_left_aligned.cc,
      	* src/debug/show_links_single_down_right_aligned.cc,
      	* src/debug/show_links_single_left.cc,
      	* src/debug/show_links_single_left_dmax_ratio.cc,
      	* src/debug/show_links_single_right.cc,
      	* src/debug/show_links_single_right_dmax_ratio.cc,
      	* src/debug/show_links_single_up.cc,
      	* src/debug/show_links_single_up_left_aligned.cc,
      	* src/debug/show_links_single_up_right_aligned.cc,
      	* src/debug/show_separators.cc,
      	* src/primitive/group/group_from_double_link.cc,
      	* src/primitive/group/group_from_double_several_links.cc,
      	* src/primitive/group/group_from_several_left_links.cc,
      	* src/primitive/group/group_from_single_link.cc,
      	* src/text_in_picture.cc,
      	* src/text_in_picture_neg.cc,
      	* src/text_recognition_in_picture.cc,
      	* tests/filter/components_large.cc,
      	* tests/filter/components_small.cc: Update includes.
      81e79695
    • Guillaume Lazzara's avatar
      Add HAVE_QT guards. · a5262f20
      Guillaume Lazzara authored
      	* scribo/convert/from_base64.hh,
      	* scribo/io/xml/save.hh: Here.
      a5262f20
    • Guillaume Lazzara's avatar
      Small fixes in viewer. · e93e375e
      Guillaume Lazzara authored
      	* demo/viewer/main.cc: Add more includes.
      
      	* demo/viewer/viewer.cc: Add debug output.
      e93e375e
    • Guillaume Lazzara's avatar
    • Guillaume Lazzara's avatar
    • Guillaume Lazzara's avatar
      Make OCR step optional in viewer. · 3c3cd930
      Guillaume Lazzara authored
      	* demo/viewer/Makefile.am: Add new files.
      
      	* demo/viewer/config.cc,
      	* demo/viewer/config.hh: Add OCR settings.
      
      	* demo/viewer/toolchain_options.cc,
      	* demo/viewer/toolchain_options.hh,
      	* demo/viewer/toolchain_options.ui: Remove.
      
      	* demo/viewer/ocr_options.cc,
      	* demo/viewer/ocr_options.hh,
      	* demo/viewer/ocr_options.ui,
      	* demo/viewer/preprocessing_options.cc,
      	* demo/viewer/preprocessing_options.hh,
      	* demo/viewer/preprocessing_options.ui,
      	* demo/viewer/segmentation_options.cc,
      	* demo/viewer/segmentation_options.hh,
      	* demo/viewer/segmentation_options.ui: New option widgets.
      
      	* demo/viewer/preferences_dialog.cc: Insert new widgets.
      
      	* demo/viewer/runner.cc: Take OCR settings into account.
      3c3cd930
    • Guillaume Lazzara's avatar
    • Guillaume Lazzara's avatar
      Compress image data in XML output. · e334996f
      Guillaume Lazzara authored
      	* scribo/scribo/io/xml/internal/full_xml_visitor.hh,
      	* scribo/scribo/io/xml/load.hh: Here.
      e334996f
    • Guillaume Lazzara's avatar
      Small fixes in Scribo. · 8ef4bff9
      Guillaume Lazzara authored
      	* scribo/convert/from_base64.hh: Remove guards HAVE_QT.
      
      	* scribo/core/document.hh: Initialize ImageMagick.
      
      	* scribo/io/xml/internal/html_markups_replace.hh: Remove. Move code...
      	* scribo/core/line_info.hh: ... here.
      
      	* scribo/core/line_links.hh: Make use of is_textline method.
      
      	* scribo/core/paragraph_info.hh: Add nlines method.
      
      	* scribo/core/paragraph_set.hh: Add a construction routine using a
      	line_set.
      
      	* scribo/io/xml/internal/extended_page_xml_visitor.hh,
      	* scribo/io/xml/internal/print_box_coords.hh,
      	* scribo/io/xml/internal/print_page_preambule.hh,
      	* src/primitive/extract/separators_nonvisible.cc: Fix includes.
      
      	* scribo/io/xml/save.hh: Add a precondition.
      
      	* scribo/text/extract_lines.hh,
      	* src/debug/show_info_median_inter_characters.cc,
      	* src/debug/show_info_x_height.cc,
      	* src/debug/show_text_lines.cc: Fix label type.
      8ef4bff9
    • Guillaume Lazzara's avatar
      Regen mk files. · b4cc9d5a
      Guillaume Lazzara authored
      	* scribo/headers.mk,
      	* scribo/tests/unit_test/unit-tests.mk: Regen.
      
      	* scribo/tests/unit_test/cond_tests_qt: Add scribo/io/xml/load.hh.
      b4cc9d5a
    • Guillaume Lazzara's avatar
      4d0483da
    • Guillaume Lazzara's avatar
      Add new debug tools. · a5f72812
      Guillaume Lazzara authored
      	* scribo/src/debug/Makefile.am: New targets.
      
      	* scribo/src/debug/show_separators.cc,
      	* scribo/src/debug/show_stoppers.cc,
      	* scribo/src/debug/show_text_lines.cc: New.
      a5f72812
    • Guillaume Lazzara's avatar
      b3c289fe
    • Guillaume Lazzara's avatar
      Make use of mln::fun::v2v::rgb_to_luma. · 7d8b1163
      Guillaume Lazzara authored
      	* scribo/toolchain/internal/text_in_doc_preprocess_functor.hh,
      	* src/binarization/ppm_sauvola.cc,
      	* src/binarization/ppm_sauvola_ms.cc,
      	* src/binarization/ppm_sauvola_ms_fg.cc,
      	* src/binarization/ppm_sauvola_ms_split.cc,
      	* src/binarization/sauvola.cc,
      	* src/binarization/sauvola_debug.cc,
      	* src/binarization/sauvola_ms.cc,
      	* src/binarization/sauvola_ms_debug.cc,
      	* src/binarization/sauvola_ms_fg.cc,
      	* src/text_in_picture.cc,
      	* src/text_in_picture_neg.cc,
      	* src/text_recognition_in_picture.cc: Here.
      7d8b1163
    • Guillaume Lazzara's avatar
      58cdb6cb
    • Guillaume Lazzara's avatar
    • Guillaume Lazzara's avatar
      scribo/io/xml/load.hh: New XML loader. · 2162f392
      Guillaume Lazzara authored
      2162f392
    • Guillaume Lazzara's avatar
      Make XML output more flexible. · 3d3a249e
      Guillaume Lazzara authored
      	* scribo/core/component_info.hh,
      	* scribo/core/component_set.hh,
      	* scribo/core/document.hh,
      	* scribo/core/line_info.hh,
      	* scribo/core/line_links.hh,
      	* scribo/core/object_groups.hh,
      	* scribo/core/object_links.hh,
      	* scribo/core/paragraph_set.hh: Make these classes serializable.
      
      	* scribo/core/concept/serializable.hh,
      	* scribo/core/concept/serialize_visitor.hh: New concepts.
      
      	* scribo/core/internal/doc_xml_serializer.hh: New. Base
      	implementation.
      
      	* scribo/io/xml/internal/extended_page_xml_visitor.hh,
      	* scribo/io/xml/internal/full_xml_visitor.hh,
      	* scribo/io/xml/internal/page_xml_visitor.hh: New. Visitors
      	producing different XML outputs.
      
      	* scribo/io/xml/internal/html_markups_replace.hh,
      	* scribo/io/xml/internal/print_box_coords.hh,
      	* scribo/io/xml/internal/print_page_preambule.hh: New. Tools for
      	XML output.
      
      	* scribo/io/xml/save.hh: Make use of visitors.
      
      	* scribo/toolchain/internal/content_in_doc_functor.hh: Set default
      	XML output type.
      
      	* src/content_in_doc.cc: Produce several XML output.
      3d3a249e
    • Guillaume Lazzara's avatar
      Set component type during component extraction. · 09da3ef9
      Guillaume Lazzara authored
      	* scribo/core/component_info.hh,
      	* scribo/core/component_set.hh,
      	* scribo/core/document.hh,
      	* scribo/core/tag/component.hh,
      	* scribo/primitive/extract/components.hh,
      	* scribo/primitive/identify.hh: Explicitly set component type to
      	Separator when extracting separator components.
      09da3ef9
    • Guillaume Lazzara's avatar
      4a86f5dc