1. 03 Jun, 2010 27 commits
    • Guillaume Lazzara's avatar
      28453cfc
    • Guillaume Lazzara's avatar
      Add new routines to detect separators. · f256a61a
      Guillaume Lazzara authored
      	* scribo/primitive/extract/horizontal_separators.hh,
      	* scribo/primitive/extract/separators.hh,
      	* scribo/primitive/extract/vertical_separators.hh,
      	* scribo/primitive/remove/separators.hh: New.
      f256a61a
    • Guillaume Lazzara's avatar
      Add A first draft of a README in Scribo. · 464d58f9
      Guillaume Lazzara authored
      	* README: New.
      464d58f9
    • Guillaume Lazzara's avatar
      Move AFP's GUI into Scribo's demo directory. · 9c5c4831
      Guillaume Lazzara authored
      	* milena/sandbox/lazzara/afp/photos/gui/gui.pro,
      	* milena/sandbox/lazzara/afp/photos/gui/gui.qrc,
      	* milena/sandbox/lazzara/afp/photos/gui/icons/next.png,
      	* milena/sandbox/lazzara/afp/photos/gui/icons/ok.png,
      	* milena/sandbox/lazzara/afp/photos/gui/icons/photos.png,
      	* milena/sandbox/lazzara/afp/photos/gui/icons/prev.png,
      	* milena/sandbox/lazzara/afp/photos/gui/icons/remove.png,
      	* milena/sandbox/lazzara/afp/photos/gui/src/custom_delegate.cc,
      	* milena/sandbox/lazzara/afp/photos/gui/src/custom_delegate.hh,
      	* milena/sandbox/lazzara/afp/photos/gui/src/launch_dialog.cc,
      	* milena/sandbox/lazzara/afp/photos/gui/src/launch_dialog.hh,
      	* milena/sandbox/lazzara/afp/photos/gui/src/main.cc,
      	* milena/sandbox/lazzara/afp/photos/gui/src/main_window.cc,
      	* milena/sandbox/lazzara/afp/photos/gui/src/main_window.hh,
      	* milena/sandbox/lazzara/afp/photos/gui/ui/launch_dialog.ui,
      	* milena/sandbox/lazzara/afp/photos/gui/ui/main_window.ui: Move...
      
      	* scribo/demo/tip/gui.pro,
      	* scribo/demo/tip/gui.qrc,
      	* scribo/demo/tip/icons/next.png,
      	* scribo/demo/tip/icons/ok.png,
      	* scribo/demo/tip/icons/photos.png,
      	* scribo/demo/tip/icons/prev.png,
      	* scribo/demo/tip/icons/remove.png,
      	* scribo/demo/tip/src/custom_delegate.cc,
      	* scribo/demo/tip/src/custom_delegate.hh,
      	* scribo/demo/tip/src/launch_dialog.cc,
      	* scribo/demo/tip/src/launch_dialog.hh,
      	* scribo/demo/tip/src/main.cc,
      	* scribo/demo/tip/src/main_window.cc,
      	* scribo/demo/tip/src/main_window.hh,
      	* scribo/demo/tip/ui/launch_dialog.ui,
      	* scribo/demo/tip/ui/main_window.ui: ... here.
      9c5c4831
    • Guillaume Lazzara's avatar
      Introduce dmax_functor concept. · 9d7a1cca
      Guillaume Lazzara authored
      	* core/concept/dmax_functor.hh,
      	* primitive/link/internal/dmax_default.hh,
      	* primitive/link/internal/dmax_functor_base.hh,
      	* primitive/link/internal/dmax_width_and_height.hh,
      	* primitive/link/internal/dmax_width_only.hh: New.
      
      	* primitive/link/internal/link_single_dmax_ratio_base.hh,
      	* primitive/link/with_single_left_link_dmax_ratio.hh,
      	* primitive/link/with_single_right_link_dmax_ratio.hh: Make use of
      	the new functors.
      9d7a1cca
    • Guillaume Lazzara's avatar
      Small fixes in Scribo. · a184c810
      Guillaume Lazzara authored
      	* binarization/sauvola_ms.hh,
      	* binarization/sauvola_threshold_image_debug.hh: Update prototypes.
      
      	* primitive/internal/rd.hh,
      	* primitive/group/apply.hh,
      	* debug/save_bboxes_image.hh: Add missing mln:: namespace prefix.
      
      	* filter/objects_large.hh: Split into a routine and a functor.
      
      	* fun/v2b/objects_large_filter.hh: New.
      
      	* io/xml/save_text_lines.hh: Save line type.
      
      	* table/internal/repair_lines.hh,
      	* table/internal/align_lines.hh,
      	* make/text.hh: Update macro name.
      
      	* core/erase_objects.hh,
      	* primitive/extract/lines_discontinued.hh,
      	* primitive/extract/lines_h_discontinued.hh,
      	* primitive/extract/lines_h_pattern.hh,
      	* primitive/extract/lines_h_single.hh,
      	* primitive/extract/lines_h_thick.hh,
      	* primitive/extract/lines_thick.hh,
      	* primitive/extract/lines_v_discontinued.hh,
      	* primitive/extract/lines_v_single.hh,
      	* primitive/extract/lines_v_thick.hh,
      	* primitive/group/from_graph.hh,
      	* primitive/internal/find_graph_link.hh,
      	* primitive/link/with_graph.hh,
      	* primitive/link/with_several_graphes.hh,
      	* primitive/link/with_several_left_links.hh,
      	* primitive/link/with_several_right_links.hh,
      	* table/erase.hh,
      	* table/extract.hh: Remove any references to object_image.
      
      	* table/internal/connect_lines.hh: use
      	influence_zone_geodesic_saturated
      
      	* filter/objects_small.hh: Duplicate component set.
      
      	* primitive/internal/all.hh,
      	* primitive/extract/all.hh,
      	* filter/all.hh,
      	* core/all.hh: Remove non existing includes.
      
      	* core/macros.hh: New macro.
      
      	* core/line_info.hh: Fix stats.
      
      	* filter/object_links_non_aligned.hh,
      	* filter/object_links_non_h_aligned.hh,
      	* filter/object_links_non_v_aligned.hh: Removed.
      a184c810
    • Guillaume Lazzara's avatar
      Fix few bugs. · b826d415
      Guillaume Lazzara authored
      b826d415
    • Guillaume Lazzara's avatar
      Improve the usability of AFP's GUI. · 32401e08
      Guillaume Lazzara authored
      	* lazzara/afp/photos/gui/src/main_window.cc,
      	* lazzara/afp/photos/gui/src/main_window.hh: Add shortcuts to
      	navigate quickly.
      32401e08
    • Guillaume Lazzara's avatar
      Add support for more image types. · 622c2395
      Guillaume Lazzara authored
      	* lazzara/afp/photos/gui/src/main_window.cc,
      	* lazzara/afp/photos/gui/src/main_window.hh: Add support for more
      	image format and handle directories with no image.
      622c2395
    • Guillaume Lazzara's avatar
      Improve options menu and progress dialog. · 752d8cae
      Guillaume Lazzara authored
      	* lazzara/afp/photos/gui/src/launch_dialog.cc,
      	* lazzara/afp/photos/gui/src/launch_dialog.hh,
      	* lazzara/afp/photos/gui/src/main_window.cc,
      	* lazzara/afp/photos/gui/src/main_window.hh,
      	* lazzara/afp/photos/gui/ui/launch_dialog.ui: Improve options menu
      	and progress dialog.
      752d8cae
    • Guillaume Lazzara's avatar
      Add a GUI for AFP's use case. · d02047f7
      Guillaume Lazzara authored
      	* lazzara/afp/photos/gui/gui.pro,
      	* lazzara/afp/photos/gui/gui.qrc,
      	* lazzara/afp/photos/gui/icons/next.png,
      	* lazzara/afp/photos/gui/icons/ok.png,
      	* lazzara/afp/photos/gui/icons/photos.png,
      	* lazzara/afp/photos/gui/icons/prev.png,
      	* lazzara/afp/photos/gui/icons/remove.png,
      	* lazzara/afp/photos/gui/src/custom_delegate.cc,
      	* lazzara/afp/photos/gui/src/custom_delegate.hh,
      	* lazzara/afp/photos/gui/src/launch_dialog.cc,
      	* lazzara/afp/photos/gui/src/launch_dialog.hh,
      	* lazzara/afp/photos/gui/src/main.cc,
      	* lazzara/afp/photos/gui/src/main_window.cc,
      	* lazzara/afp/photos/gui/src/main_window.hh,
      	* lazzara/afp/photos/gui/ui/launch_dialog.ui,
      	* lazzara/afp/photos/gui/ui/main_window.ui: New files. GUI meant
      	to display the results of text finding in pictures.
      d02047f7
    • Guillaume Lazzara's avatar
      Improve dematerialization wizard. · 8d47be15
      Guillaume Lazzara authored
      	* demo/wizard/src/crop_widget.cc,
      	* demo/wizard/src/main.cc,
      	* demo/wizard/src/main_window.cc,
      	* demo/wizard/src/main_window.hh,
      	* demo/wizard/src/preprocessing_widget.cc,
      	* demo/wizard/src/process_page.cc,
      	* demo/wizard/src/result_page.cc,
      	* demo/wizard/src/result_page.hh,
      	* demo/wizard/src/result_widget.cc,
      	* demo/wizard/src/result_widget.hh,
      	* demo/wizard/src/runner.cc,
      	* demo/wizard/ui/preprocessing_widget.ui,
      	* demo/wizard/wizard.pro: Add support for text recognition and
      	display results.
      8d47be15
    • Guillaume Lazzara's avatar
      Add a new demo in Scribo. · 548b72e3
      Guillaume Lazzara authored
      	* demo/demat/demat.pro,
      	* demo/demat/demat.qrc,
      	* demo/demat/src/doc_type.hh,
      	* demo/demat/src/main.cc,
      	* demo/demat/src/main_window.cc,
      	* demo/demat/src/main_window.hh,
      	* demo/demat/src/mln_widgets.cc,
      	* demo/demat/src/preprocessing_task.hh,
      	* demo/demat/src/process_args.hh,
      	* demo/demat/src/runner.cc,
      	* demo/demat/src/runner.hh,
      	* demo/demat/ui/main_window.ui: New.
      
      	* demo/shared/src/crop_item.cc,
      	* demo/shared/src/crop_item.hh,
      	* demo/shared/src/image_viewer.cc,
      	* demo/shared/src/image_viewer.hh,
      	* demo/shared/ui/image_viewer.ui: Update according the needs of
      	this new demo.
      548b72e3
    • Guillaume Lazzara's avatar
      11701a0c
    • Guillaume Lazzara's avatar
    • Guillaume Lazzara's avatar
      Use anchor::Type in alignment routines' dispatch. · b54300a5
      Guillaume Lazzara authored
      	* filter/object_links_bottom_aligned.hh,
      	* filter/object_links_center_aligned.hh,
      	* filter/object_links_left_aligned.hh,
      	* filter/object_links_non_aligned_simple.hh,
      	* filter/object_links_right_aligned.hh,
      	* filter/object_links_top_aligned.hh: Use anchor::Type.
      
      	* filter/internal/alignment_angle.hh,
      	* filter/internal/component_aligned.hh: New.
      b54300a5
    • Guillaume Lazzara's avatar
      Small fixes related to object_groups. · 6143a5ec
      Guillaume Lazzara authored
      	* core/object_groups.hh: Add more preconditions.
      
      	* filter/object_groups_small.hh: Call duplicate().
      6143a5ec
    • Guillaume Lazzara's avatar
      Add init() member to object_links structure. · 2c6947d7
      Guillaume Lazzara authored
      	* core/object_links.hh: New init() member.
      
      	* filter/object_groups_v_thickness.hh,
      	* filter/object_groups_with_holes.hh,
      	* primitive/group/from_double_link.hh,
      	* primitive/link/internal/link_functor_base.hh,
      	* primitive/link/merge_double_link.hh,
      	* src/afp/link.hh,
      	* src/afp/regroup.hh: Call init() on object_links instances.
      
      	* primitive/internal/init_link_array.hh: Remove.
      2c6947d7
    • Guillaume Lazzara's avatar
    • Guillaume Lazzara's avatar
      Add new Sauvola overloads and update examples. · d10f1a65
      Guillaume Lazzara authored
      	* scribo/binarization/internal/first_pass_functor.hh,
      	* scribo/binarization/local_threshold.hh,
      	* scribo/binarization/sauvola.hh,
      	* scribo/binarization/sauvola_ms.hh,
      	* scribo/binarization/sauvola_ms_split.hh,
      	* scribo/binarization/sauvola_threshold_image.hh,
      	* scribo/canvas/integral_browsing.hh: Add more parameters to
      	Sauvola routines.
      
      	* scribo/binarization/sauvola_threshold_image_debug.hh: New. New
      	overload providing debug outputs.
      
      	* scribo/debug/usage.hh: Remove a parameter.
      
      	* scribo/src/binarization/Makefile.am,
      	* scribo/src/binarization/pgm_global_threshold_auto.cc,
      	* scribo/src/binarization/pgm_sauvola.cc,
      	* scribo/src/binarization/pgm_sauvola_ms.cc,
      	* scribo/src/binarization/ppm_fg_sauvola_ms.cc,
      	* scribo/src/binarization/ppm_sauvola.cc,
      	* scribo/src/binarization/ppm_sauvola_ms.cc,
      	* scribo/src/binarization/ppm_sauvola_ms_split.cc: Add new
                program arguments.
      
      	* scribo/src/binarization/fg_sauvola_ms.cc,
              * scribo/src/binarization/sauvola.cc,
              * scribo/src/binarization/sauvola_ms.cc,
              * scribo/src/binarization/sauvola_ms_split.cc,
      	* scribo/src/binarization/sauvola_debug.cc: New.
      d10f1a65
    • Guillaume Lazzara's avatar
      Add support for various image types in text_in_photo_fast. · b1a4d275
      Guillaume Lazzara authored
      	* src/Makefile.am: Add ImageMagick CPPFLAGS and LDFLAGS.
      
      	* src/text_in_photo_ppm_fast.cc: Rename as...
      	* src/text_in_photo_fast.cc: ... this. Use ImageMagick to load images.
      b1a4d275
    • Guillaume Lazzara's avatar
      Improve dematerialization wizard. · 9f724b07
      Guillaume Lazzara authored
      	* demo/wizard/src/crop_widget.cc,
      	* demo/wizard/src/main.cc,
      	* demo/wizard/src/main_window.cc,
      	* demo/wizard/src/main_window.hh,
      	* demo/wizard/src/preprocessing_widget.cc,
      	* demo/wizard/src/process_page.cc,
      	* demo/wizard/src/result_page.cc,
      	* demo/wizard/src/result_page.hh,
      	* demo/wizard/src/result_widget.cc,
      	* demo/wizard/src/result_widget.hh,
      	* demo/wizard/src/runner.cc,
      	* demo/wizard/ui/preprocessing_widget.ui,
      	* demo/wizard/wizard.pro: Add support for text recognition and
      	display results.
      9f724b07
    • Guillaume Lazzara's avatar
      Add a new demo in Scribo. · 6adbc43e
      Guillaume Lazzara authored
      	* demo/demat/demat.pro,
      	* demo/demat/demat.qrc,
      	* demo/demat/src/doc_type.hh,
      	* demo/demat/src/main.cc,
      	* demo/demat/src/main_window.cc,
      	* demo/demat/src/main_window.hh,
      	* demo/demat/src/mln_widgets.cc,
      	* demo/demat/src/preprocessing_task.hh,
      	* demo/demat/src/process_args.hh,
      	* demo/demat/src/runner.cc,
      	* demo/demat/src/runner.hh,
      	* demo/demat/ui/main_window.ui: New.
      
      	* demo/shared/src/crop_item.cc,
      	* demo/shared/src/crop_item.hh,
      	* demo/shared/src/image_viewer.cc,
      	* demo/shared/src/image_viewer.hh,
      	* demo/shared/ui/image_viewer.ui: Update according the needs of
      	this new demo.
      6adbc43e
    • Guillaume Lazzara's avatar
      Small fixes in Scribo. · 4a195987
      Guillaume Lazzara authored
      	* binarization/sauvola_ms.hh: Fix compilation issues on MacOS X.
      
      	* core/component_set.hh: Add labeled_image_() member.
      
      	* debug/save_bboxes_image.hh: Add a missing include.
      
      	* preprocessing/split_bg_fg.hh,
      	* primitive/extract/components.hh: Fix namespace ambiguities.
      
      	* src/text_in_article.cc: Rename as...
      	* src/text_in_article_pbm.cc: ... this.
      
      	* src/Makefile.am: Update source file names.
      4a195987
    • Guillaume Lazzara's avatar
      Add a function to convert qt::rgb32 values to int_u8. · c5e55142
      Guillaume Lazzara authored
      	* mln/fun/v2v/qt_rgb_to_int_u.hh: New.
      
      	* tests/fun/v2v/Makefile.am,
      	* tests/fun/v2v/qt_rgb_to_int_u.cc: New test.
      c5e55142
    • Guillaume Lazzara's avatar
      Use sites instead of pixels in canvas::labeling::blobs functors. · 1c596f64
      Guillaume Lazzara authored
      	* mln/canvas/labeling/blobs.hh,
      	* mln/labeling/blobs.hh: Update members prototypes.
      
      	* mln/labeling/blobs_and_compute.hh: Do not construct on-the-fly
      	pixels anymore.
      1c596f64
    • Guillaume Lazzara's avatar
      70ca8455
  2. 25 May, 2010 5 commits
  3. 21 May, 2010 1 commit
    • Edwin Carlinet's avatar
      Add MLN_WO_GLOBAL_VARS directive that prevents globals vars to be included. · 482527bb
      Edwin Carlinet authored and Guillaume Lazzara's avatar Guillaume Lazzara committed
      	* mln/border/thickness.hh,
      	* mln/core/alias/dpoint1d.hh,
      	* mln/core/alias/dpoint2d.hh,
      	* mln/core/alias/dpoint3d.hh,
      	* mln/fun/v2v/hsl_to_rgb.hh,
      	* mln/literal/black.hh,
      	* mln/literal/colors.hh,
      	* mln/literal/identity.hh,
      	* mln/literal/one.hh,
      	* mln/literal/origin.hh,
      	* mln/literal/white.hh,
      	* mln/literal/zero.hh,
      	* mln/tag/init.hh,
      	* mln/trace/entering.hh,
      	* mln/trace/quiet.hh,
      	* mln/value/sign.hh : Add MLN_WO_GLOBAL_VARS define.
      482527bb
  4. 30 Apr, 2010 3 commits
    • Guillaume Lazzara's avatar
      Add some code in my sandbox. · 902b12ce
      Guillaume Lazzara authored
      	* milena/sandbox/lazzara/scribo/binarization_naive/main.cc,
      	* milena/sandbox/lazzara/scribo/binarization_naive/toto.cc,
      	* milena/sandbox/lazzara/scribo/fill_holes/main.cc,
      	* milena/sandbox/lazzara/scribo/separateurs_materialises/lines_pattern.cc,
      	* milena/sandbox/lazzara/scribo/skeleton_crest/main.cc,
      	* milena/sandbox/lazzara/skeleton_crest/main.cc: New.
      902b12ce
    • Guillaume Lazzara's avatar
      Add fastest implementations in labeling::compute. · 79ee98c0
      Guillaume Lazzara authored
      	* mln/labeling/compute.hh: New fastest implementations.
      79ee98c0
    • Guillaume Lazzara's avatar
      Small fixes in Milena. · 669c38a5
      Guillaume Lazzara authored
      	* milena/mln/canvas/labeling/blobs.hh: Fill extension.
      
      	* milena/mln/data/paste_without_localization.hh: Check whether the
      	two images have the same domain.
      
      	* milena/mln/labeling/blobs_and_compute.hh: Rename members.
      
      	* milena/mln/labeling/colorize.hh: Add missing includes.
      
      	* milena/mln/world/binary_2d/enlarge.hh: use def::coord.
      669c38a5
  5. 13 Apr, 2010 2 commits
  6. 09 Apr, 2010 2 commits
    • Guillaume Lazzara's avatar
      Rename nslis to nslices. · 0e13f810
      Guillaume Lazzara authored
      	* mln/geom/nslis.hh,
      	* tests/geom/nslis.cc: Rename as...
      
      	* mln/geom/nslices.hh,
      	* tests/geom/nslices.cc: ... this.
      
      	* mln/core/image/image3d.hh,
      	* mln/core/internal/box_impl.hh,
      	* mln/core/site_set/box.hh,
      	* mln/debug/slices_2d.hh,
      	* mln/geom/all.hh,
      	* mln/geom/size3d.hh,
      	* mln/linear/gaussian.hh,
      	* mln/linear/gaussian/impl.hh,
      	* mln/make/box3d.hh,
      	* mln/make/image.hh,
      	* mln/registration/icp.hh,
      	* tests/core/alias/box3d.cc,
      	* tests/core/image/image3d.cc,
      	* tests/geom/Makefile.am,
      	* tests/io/pbms/load.cc,
      	* tests/io/pgms/load.cc,
      	* tests/io/ppms/load.cc,
      	* tests/transform/bench_closest_point_geodesic.cc: Rename nslis to
      	nslices.
      0e13f810
    • Guillaume Lazzara's avatar
      img/picasso.ppm: Add a ppm version. · aa0bdee5
      Guillaume Lazzara authored
      aa0bdee5