1. 22 May, 2015 1 commit
  2. 25 Mar, 2015 1 commit
  3. 20 Feb, 2015 3 commits
    • Edwin Carlinet's avatar
      Clean G2/ctos related computation. · fd5f4506
      Edwin Carlinet authored
      	*  apps/g2/CMakeLists.txt,
      	*  apps/g2/compute_ctos-cli.cpp: New.
      	*  apps/g2/compute_ctos.cpp,
      	*  apps/g2/compute_ctos.hpp: Add maxtree/mintree merge algorithm.
      	*  apps/g2/compute_g2.hpp,
      	*  apps/g2/satmaxtree.cpp: Move debug info to std:cerr.
      fd5f4506
    • Edwin Carlinet's avatar
      Clean up g2 computation and modularisation. · 50a8fde3
      Edwin Carlinet authored
            *  apps/g2/compute_ctos.cpp,
            *  apps/g2/compute_ctos.hpp: New.
            *  apps/g2/g2-maxdepth.cpp: Support for other pinf.
            *  apps/g2/satmaxtree-cli.cpp: Externalize 2-Face removal.
            *  apps/g2/satmaxtree.cpp,
            *  apps/g2/satmaxtree.hpp: Clean facades and add 2F removal method.
            *  mln/morpho/tos/ctos.hpp: Add some overloads.
      50a8fde3
    • Edwin Carlinet's avatar
      Small fixes. · c284cd58
      Edwin Carlinet authored
              *  apps/tos/addborder.hpp: Fix missing header.
              *  apps/tos/croutines.hpp: Add missing mln_exiting.
              *  mln/accu/accumulators/accu_as_it.hpp: Fix missing header.
      c284cd58
  4. 06 Feb, 2015 2 commits
  5. 04 Feb, 2015 1 commit
  6. 19 Jan, 2015 1 commit
    • Edwin Carlinet's avatar
      Add utils for the interactive segmentation. · 8b4184c9
      Edwin Carlinet authored
      	*  apps/supervised-gui/CMakeLists.txt,
      	*  apps/supervised-gui/automatic.cpp,
      	*  apps/supervised-gui/supervised-cli-multi.cpp,
      	*  apps/supervised-gui/supervised-gui-3c.cpp,
      	*  apps/supervised-gui/compute_distance.hpp: Add debug msg.
      	*  apps/supervised-gui/generate_res.cpp,
      	*  apps/supervised-gui/nettoyage.cpp: New.
      8b4184c9
  7. 05 Jan, 2015 5 commits
  8. 31 Dec, 2014 3 commits
    • Edwin Carlinet's avatar
      QCM app now uses milena's opening impl. · 36fd93c3
      Edwin Carlinet authored
      	* apps/qcm/Makefile: Add link to boost program options.
      	* apps/qcm/qcm.cpp: Use milena's opning impl.
      	* apps/qcm/qcm.py: Python script for grading.
      36fd93c3
    • Edwin Carlinet's avatar
      Fix apps to make it compile with clang. · d5c82889
      Edwin Carlinet authored
      	* apps/CMakeLists.txt,
      	* apps/attributes/meaningfullness.hpp,
      	* apps/g2/CMakeLists.txt,
      	* apps/g2/satmaxtree.cpp,
      	* apps/tests/attributes/meaningfullness.cpp,
      	* apps/tos/Kinterpolate.hpp,
      	* apps/tos/mumford_shah.hpp,
      	* apps/tos/topology.hpp,
      d5c82889
    • Edwin Carlinet's avatar
      Clean build system. · 601021d9
      Edwin Carlinet authored
      	* cmake/FindFreeImage.cmake,
      	* CMakeLists.txt: Check the availability of sub-libraries in the main
                Makefile.
      
      	* apps/imview/CMakeLists.txt,
      	* apps/saliency/CMakeLists.txt,
      	* apps/simplification/CMakeLists.txt,
      	* apps/supervised-gui/CMakeLists.txt: Conditional compilation if
              QT4 is available.
      
      	* apps/maxtree_comparison/CMakeLists.txt,
      	* apps/clattice/CMakeLists.txt,
      	* apps/tests/attributes/CMakeLists.txt,
      	* apps/tests/tos/CMakeLists.txt,
      	* apps/tosgui/CMakeLists.txt,
      	* bench/CMakeLists.txt,
      	* cli/CMakeLists.txt,
      	* tests/io/CMakeLists.txt,
      	* tests/morpho/CMakeLists.txt,
      	* tests/morpho/component_tree/CMakeLists.txt: Remove hard-coding
              of FreeImage linking and use ${FreeImage_LIBRARIES} instead.
      601021d9
  9. 13 Nov, 2014 4 commits
    • Edwin Carlinet's avatar
      Add the 3-classes interactive segmentation tos-based app. · d2e0dbba
      Edwin Carlinet authored
      	*  apps/supervised-gui/CMakeLists.txt,
      	*  apps/supervised-gui/brush.cpp,
      	*  apps/supervised-gui/brush.hpp,
      	*  apps/supervised-gui/compute_distance.hpp,
      	*  apps/supervised-gui/constants.hpp,
      	*  apps/supervised-gui/supervised-cli.cpp,
      	*  apps/supervised-gui/supervised-gui-3c.cpp: 3-classes based app.
      d2e0dbba
    • Edwin Carlinet's avatar
      Add mumford-shah computation on the tree. · 9db0bcc9
      Edwin Carlinet authored
      	*  apps/CMakeLists.txt,
      	*  apps/attributes/gradient_magnitude.hpp: Add gradient on 0F too.
      	*  apps/mumford_shah_on_tree/CMakeLists.txt,
      	*  apps/mumford_shah_on_tree/mumford_shah_on_tree.cpp,
      	*  apps/mumford_shah_on_tree/mumford_shah_on_tree.hpp,
      	*  apps/mumford_shah_on_tree/mumford_shah_on_tree_full.cpp: New.
      9db0bcc9
    • Edwin Carlinet's avatar
      Clean up and parallelization of the graph of shapes computation. · be1cd23f
      Edwin Carlinet authored
      	*  apps/g2/CMakeLists.txt,
      	*  apps/g2/compute_g2.cpp,
      	*  apps/g2/compute_g2.hpp,
      	*  apps/g2/g2-maxdepth.cpp,
      	*  apps/g2/routines.cpp,
      	*  apps/g2/routines.hpp,
      	*  apps/g2/types.hpp: Clean up.
      be1cd23f
    • Edwin Carlinet's avatar
      Some supplementary tos routines. · dc1212f2
      Edwin Carlinet authored
      	*  apps/tos/addborder.hpp: add a border processed marginally.
      	*  apps/tos/croutines.hpp: add a grain_filter_inplace routine.
      dc1212f2
  10. 03 Oct, 2014 2 commits
    • Edwin Carlinet's avatar
      Add gradient magnitude attribute. · 98d1d783
      Edwin Carlinet authored
      	*  apps/attributes/Makefile,
      	*  apps/attributes/gradient_magnitude-cli.cpp,
      	*  apps/attributes/gradient_magnitude-patternspec.cpp,
      	*  apps/attributes/gradient_magnitude.hpp: New.
      	*  apps/attributes/meaningfullness-patternspec-cli.cpp: Improcve doc.
      98d1d783
    • Edwin Carlinet's avatar
      Add hierarchical segmentation apps. · 638f7806
      Edwin Carlinet authored
      	*  apps/CMakeLists.txt,
      	*  apps/hierachical_seg-gui/brush.cpp,
      	*  apps/hierachical_seg-gui/brush.hpp,
      	*  apps/hierachical_seg-gui/hierachical_seg-cli.cpp,
      	*  apps/hierachical_seg-gui/hierachical_seg-gui.cpp,
      	*  apps/hierachical_seg-gui/supervised-cli.cpp: New
      638f7806
  11. 19 Sep, 2014 1 commit
  12. 28 Aug, 2014 3 commits
    • Edwin Carlinet's avatar
      Add supervised segmentation based on tree. · 277af807
      Edwin Carlinet authored
              *  apps/supervised-gui/CMakeLists.txt,
              *  apps/supervised-gui/brush.cpp,
              *  apps/supervised-gui/brush.hpp,
              *  apps/supervised-gui/myheap.hpp,
              *  apps/supervised-gui/supervised-cli.cpp: New app.
      277af807
    • Edwin Carlinet's avatar
      Implement energy on top the new Component Tree Framework. · 45c25ccf
      Edwin Carlinet authored
              *  apps/CMakeLists.txt,
              *  apps/attributes/CMakeLists.txt,
              *  apps/attributes/cMSER.hpp,
              *  apps/attributes/cMeaningFullNess.hpp,
              *  apps/attributes/curvature.cpp,
              *  apps/attributes/curvature.hpp,
              *  apps/attributes/MSER-patternspec-cli.cpp,
              *  apps/attributes/meaningfullness-cli.cpp,
              *  apps/attributes/meaningfullness-patternspec-cli.cpp: New.
      
      Old implementation maintained for bwd compatibility.
              *  apps/attributes/MSER.hpp,
              *  apps/attributes/meaningfullness.hpp,
              *  apps/attributes/meaningfullnessArgparser.cpp,
              *  apps/tests/attributes/meaningfullness.cpp,
      45c25ccf
    • Edwin Carlinet's avatar
      Add Graph Of Shape based tools. · 7c15ecec
      Edwin Carlinet authored
              *  apps/g2/Makefile,
              *  apps/g2/types.hpp,
              *  apps/g2/compute_g2.cpp,
              *  apps/g2/compute_g2.hpp: Add clean g2 computation routines
              generalized to n-dimensional data.
      
              *  apps/g2/g2.cpp,
              *  apps/g2/g2.hpp: Experimental code to play with G2.
      
              *  apps/g2/accu/lca.hpp: Fix doc and set default node to
                 npos() on empty initialization.
      
              *  apps/g2/reconstruct.hpp,
              *  apps/g2/remove_parent_relation.hpp,
              *  apps/g2/routines.cpp,
              *  apps/g2/routines.hpp: Some G2 related routines.
      
              *  apps/g2/g2-maxdepth.cpp,
              *  apps/g2/satmaxtree-cli.cpp,
              *  apps/g2/satmaxtree.cpp,
              *  apps/g2/satmaxtree.hpp: New Graph Color Framework.
      7c15ecec
  13. 22 Aug, 2014 1 commit
    • Edwin Carlinet's avatar
      Add methods related to the ToS computation. · 8276a665
      Edwin Carlinet authored
      	*  apps/tos/Kinterpolate.hpp: Implement method to auto-detect
      	resize parameters
      	*  apps/tos/croutines.hpp: New routines using new ToS interface.
      	*  apps/tos/topology.hpp: Add functor for 2F-test.
      
      These files use the old interface, they are here for old-program using the
      old interface but should be ported.
      	*  apps/tos/Makefile,
      	*  apps/tos/colorToSGrad.cpp,
      	*  apps/tos/colorToSGrad.hpp: ICPR 2014 method.
      	*  apps/tos/libtos.cpp,
      	*  apps/tos/libtos.hpp: Pre-compiled methods.
      	*  apps/tos/pgm_objdetection.cpp,
      	*  apps/tos/pgm_objdetection_mser.cpp,
      	*  apps/tos/ppm_objdetection.cpp,
      	*  apps/tos/ppm_objdetection_mser.cpp: Object detection algorithms.
      	*  apps/tos/routines.cpp,
      	*  apps/tos/routines.hpp: Some ToS helper functions.
      8276a665
  14. 13 Aug, 2014 1 commit
  15. 08 Jul, 2014 2 commits
    • Edwin Carlinet's avatar
      Start supervised segmentation app based on ToS. · 996904c4
      Edwin Carlinet authored
       	* apps/CMakeLists.txt,
      	* apps/supervised-gui/CMakeLists.txt,
      	* apps/supervised-gui/brush.cpp,
      	* apps/supervised-gui/brush.hpp,
      	* apps/supervised-gui/supervised-cli.cpp: New.
      996904c4
    • Edwin Carlinet's avatar
      Clean imviewer qt widget. ImageViewer now inherits from QGraphicsView and · e37f7a51
      Edwin Carlinet authored
      is a standard QT widget.
      
      	* mln/qt/graphics_pixmap_item.cpp,
      	* mln/qt/graphics_pixmap_item.hpp: Deleted.
      	* mln/qt/mainwin.cpp, mln/qt/mainwin.hpp: Renamed as...
      	* mln/qt/imageviewer.cpp, mln/qt/imageviewer.hpp: ...this.
      	* apps/imview/CMakeLists.txt,
      	* apps/imview/imview.cpp,
      	* apps/saliency/CMakeLists.txt,
      	* apps/saliency/dispsaliency.hpp,
      	* apps/tosgui/CMakeLists.txt,
      	* apps/tosgui/dispatcher.cpp,
      	* apps/tosgui/dispatcher.hpp,
      	* apps/tosgui/toscgui.cpp,
      	* apps/tosgui/tosgui.cpp: Updated with new API.
      e37f7a51
  16. 26 Mar, 2014 2 commits
  17. 03 Feb, 2014 1 commit
  18. 01 Feb, 2014 1 commit
  19. 28 Oct, 2013 5 commits
    • Edwin Carlinet's avatar
      Update ToSgui apps with new interface. · f0508340
      Edwin Carlinet authored
      	*  apps/tosgui/CMakeLists.txt,
      	*  apps/tosgui/attribute.cpp,
      	*  apps/tosgui/attribute.hpp,
      	*  apps/tosgui/attributes/area.hpp,
      	*  apps/tosgui/attributes/gray.hpp,
      	*  apps/tosgui/attributes/meaningfullness.hpp,
      	*  apps/tosgui/attributes/mser.hpp,
      	*  apps/tosgui/dispatcher.cpp,
      	*  apps/tosgui/dispatcher.hpp,
      	*  apps/tosgui/plotwindow.cpp,
      	*  apps/tosgui/plotwindow.hpp,
      	*  apps/tosgui/qattribute.hpp,
      	*  apps/tosgui/toscgui.cpp,
      	*  apps/tosgui/tosgui.cpp: Update.
      f0508340
    • Edwin Carlinet's avatar
      Add saliency based apps. · 8f2912e5
      Edwin Carlinet authored
      	*  apps/CMakeLists.txt,
      	*  apps/saliency/CMakeLists.txt,
      	*  apps/saliency/closure.hpp,
      	*  apps/saliency/dispsaliency.cpp,
      	*  apps/saliency/dispsaliency.hpp,
      	*  apps/saliency/extinction.hpp,
      	*  apps/saliency/saliency.cpp,
      	*  apps/saliency/saliency.hpp: New.
      8f2912e5
    • Edwin Carlinet's avatar
      Add MSER and MeaningFullNess attributes for ToS based apps. · b99cf8cb
      Edwin Carlinet authored
      	*  apps/attributes/MSER.hpp,
      	*  apps/attributes/MSERArgparser.cpp,
      	*  apps/attributes/MSERArgparser.hpp,
      	*  apps/attributes/argparser.hpp,
      	*  apps/attributes/meaningfullness.hpp,
      	*  apps/attributes/meaningfullnessArgparser.cpp,
      	*  apps/attributes/meaningfullnessArgparser.hpp,
      	*  apps/tests/CMakeLists.txt,
      	*  apps/tests/attributes/CMakeLists.txt,
      	*  apps/tests/attributes/meaningfullness.cpp: New.
      b99cf8cb
    • Edwin Carlinet's avatar
      Fix comparison issue in color version of the ToS viewer. · 7e0bcbe0
      Edwin Carlinet authored
      	* apps/tosgui/qattribute.hpp: Fix warning
      	* apps/tosgui/toscgui.cpp: Fixed comparison function for add_border.
      7e0bcbe0
    • Edwin Carlinet's avatar
      Add plot windows for each member of the energy. · 6468269f
      Edwin Carlinet authored
      	* apps/tosgui/dispatcher.cpp,
      	* apps/tosgui/dispatcher.hpp: Add several nodes selection.
      	* apps/tosgui/qattribute.hpp,
      	* apps/tosgui/toscgui.cpp,
      	* apps/tosgui/tosgui.cpp: plot each member of the energy function.
      6468269f