- Olena-patches

last-svn-commit-16-g78149d2 lazzara/skeleton_crest/main.cc: New tool.
by Guillaume Lazzara 17 Feb '10

17 Feb '10

--- milena/sandbox/ChangeLog | 4 ++ milena/sandbox/lazzara/skeleton_crest/main.cc | 52 +++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 0 deletions(-) create mode 100644 milena/sandbox/lazzara/skeleton_crest/main.cc diff --git a/milena/sandbox/ChangeLog b/milena/sandbox/ChangeLog index bed29e7..0fc24be 100644 --- a/milena/sandbox/ChangeLog +++ b/milena/sandbox/ChangeLog @@ -1,3 +1,7 @@ +2010-02-17 Guillaume Lazzara <z(a)lrde.epita.fr> + + * lazzara/skeleton_crest/main.cc: New tool. + 2010-02-16 Guillaume Lazzara <z(a)lrde.epita.fr> Add new tools in bin sandbox. diff --git a/milena/sandbox/lazzara/skeleton_crest/main.cc b/milena/sandbox/lazzara/skeleton_crest/main.cc new file mode 100644 index 0000000..e2bf808 --- /dev/null +++ b/milena/sandbox/lazzara/skeleton_crest/main.cc @@ -0,0 +1,52 @@ +# include <mln/core/image/image2d.hh> +# include <mln/core/alias/neighb2d.hh> +# include <mln/topo/skeleton/crest.hh> +# include <mln/topo/skeleton/is_simple_point.hh> +# include <mln/transform/distance_front.hh> +# include <mln/logical/not.hh> +# include <mln/make/w_window2d_int.hh> +# include <mln/value/int_u8.hh> +# include <mln/arith/revert.hh> +# include <mln/io/pgm/save.hh> +# include <mln/io/pgm/load.hh> +# include <mln/io/pbm/save.hh> +# include <mln/io/pbm/load.hh> +# include <mln/morpho/skeleton_constrained.hh> +# include <mln/core/routine/extend.hh> + +int main(int argc, char *argv[]) +{ + using namespace mln; + + image2d<bool> input; + io::pbm::load(input, argv[1]); + + int vals[] = { 0, 9, 0, 9, 0, + 9, 6, 4, 6, 9, + 0, 4, 0, 4, 0, // Values of distances. + 9, 6, 4, 6, 9, + 0, 9, 0, 9, 0 }; + + image2d<value::int_u8> + dist_map_n = transform::distance_front(logical::not_(input), c8(), + make::w_window2d_int(vals), + mln_max(value::int_u8)); + + image2d<value::int_u8> dist_map = arith::revert(dist_map_n); + + io::pgm::save(dist_map, "distance.pgm"); + io::pgm::save(dist_map_n, "distance_n.pgm"); + + // Constraint + image2d<bool> K = topo::skeleton::crest(input, dist_map_n, c8(), atoi(argv[2])); + io::pbm::save(K, "constraint.pbm"); + + typedef image2d<bool> I; + + I skel = + morpho::skeleton_constrained(input, c8(), + topo::skeleton::is_simple_point<I,neighb2d>, + extend(K, false), dist_map); + + io::pbm::save(skel, "skeleton.pbm"); +} -- 1.5.6.5

1 0

branch exp/milena-z created: last-svn-commit-15-g2510005
by lazzara＠lrde.epita.fr 16 Feb '10

16 Feb '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch exp/milena-z has been created at 2510005ce77741c054e7fc089e075fe280a773ed (commit) - Log ----------------------------------------------------------------- 2510005 Add new tools in bin sandbox. 304dee0 Cleanup to_qimage convertion routines. 9d8c549 Add a routine to convert to a QImage. 757792d Add box<>::merge. 852fd7f Rename image3d<>::nslices to image3d<>::nslis. 749308a Various small fixes. 4976230 * mln/topo/skeleton/crest.hh: Fix invalid PSI values for component 7395d15 Add a routine to read dump files header. 1875111 Add a routine to read DICOM files header. f08ca6b Add A new routine to draw plain boxes. 68181d1 Add more implementations for box specializations. 89cf4ee First draft of raw format support. a7dd8e8 Add new 3D neighborhoods and windows. 0a2727d Add a new rgb32 type for Qt compatibility. 5c414c5 Fix invalid value type names in dump format. ----------------------------------------------------------------------- hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

last-svn-commit-5-g68181d1 Add more implementations for box specializations.
by Guillaume Lazzara 16 Feb '10

16 Feb '10

* mln/core/internal/box_impl.hh: Add width, height and depth. --- milena/ChangeLog | 22 ++++++++----- milena/mln/core/internal/box_impl.hh | 57 +++++++++++++++++++++++++++++++++- 2 files changed, 70 insertions(+), 9 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index f2af5eb..e5c034c 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,11 @@ 2010-02-16 Guillaume Lazzara <z(a)lrde.epita.fr> + Add more implementations for box specializations. + + * mln/core/internal/box_impl.hh: Add width, height and depth. + +2010-02-16 Guillaume Lazzara <z(a)lrde.epita.fr> + First draft of raw format support. * milena/mln/io/raw/all.hh, @@ -11,26 +17,26 @@ Add new 3D neighborhoods and windows. - * milena/mln/core/alias/neighb3d.hh, - * milena/mln/win/sline3d.hh: New. + * mln/core/alias/neighb3d.hh, + * mln/win/sline3d.hh: New. 2010-02-16 Guillaume Lazzara <z(a)lrde.epita.fr> Add a new rgb32 type for Qt compatibility. - * milena/mln/convert/from_to.hxx: Declare conversion routines. + * mln/convert/from_to.hxx: Declare conversion routines. - * milena/mln/value/qt/rgb32.hh: New. + * mln/value/qt/rgb32.hh: New. 2010-02-16 Guillaume Lazzara <z(a)lrde.epita.fr> Fix invalid value type names in dump format. - * milena/mln/value/internal/make_generic_name.hh: New. + * mln/value/internal/make_generic_name.hh: New. - * milena/mln/value/int_u.hh, - * milena/mln/value/label.hh, - * milena/mln/value/rgb.hh: Make use of the new routine to print a + * mln/value/int_u.hh, + * mln/value/label.hh, + * mln/value/rgb.hh: Make use of the new routine to print a correct type names in dump format. 2009-11-18 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/milena/mln/core/internal/box_impl.hh b/milena/mln/core/internal/box_impl.hh index 93fffff..a17e307 100644 --- a/milena/mln/core/internal/box_impl.hh +++ b/milena/mln/core/internal/box_impl.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -38,6 +39,8 @@ namespace mln { + // Forward declaration + namespace internal { @@ -79,6 +82,15 @@ namespace mln /// Give the minimum col. C max_col() const; + + /// Give the width. + unsigned width() const; + + /// Give the height. + unsigned height() const; + + /// Give the depth. + unsigned depth() const; }; template <typename C, typename E> // FIXME: Add an extra param to replace 'unsigned'. @@ -101,6 +113,13 @@ namespace mln /// Give the minimum col. C max_col() const; + + /// Give the width. + unsigned width() const; + + /// Give the height. + unsigned height() const; + }; template <typename C, typename E> // FIXME: Add an extra param to replace 'unsigned'. @@ -187,6 +206,28 @@ namespace mln } + template <typename C, typename E> + inline + unsigned box_impl_<3, C, E>::width() const + { + return internal::force_exact<E>(*this).bbox().len(2); + } + + template <typename C, typename E> + inline + unsigned box_impl_<3, C, E>::height() const + { + return internal::force_exact<E>(*this).bbox().len(1); + } + + template <typename C, typename E> + inline + unsigned box_impl_<3, C, E>::depth() const + { + return internal::force_exact<E>(*this).bbox().len(0); + } + + // 2 template <typename C, typename E> @@ -231,6 +272,20 @@ namespace mln return internal::force_exact<E>(*this).bbox().pmax()[1]; } + template <typename C, typename E> + inline + unsigned box_impl_<2, C, E>::width() const + { + return internal::force_exact<E>(*this).bbox().len(1); + } + + template <typename C, typename E> + inline + unsigned box_impl_<2, C, E>::height() const + { + return internal::force_exact<E>(*this).bbox().len(0); + } + // 1 template <typename C, typename E> -- 1.5.6.5

1 0

last-svn-commit-4-g89cf4ee First draft of raw format support.
by Guillaume Lazzara 16 Feb '10

16 Feb '10

* milena/mln/io/raw/all.hh, * milena/mln/io/raw/get_header.hh, * milena/mln/io/raw/load.hh, * milena/mln/io/raw/save.hh: New. --- milena/ChangeLog | 9 +++ milena/mln/io/{dump => raw}/all.hh | 20 +++--- milena/mln/io/raw/get_header.hh | 135 +++++++++++++++++++++++++++++++++++ milena/mln/io/{dump => raw}/load.hh | 99 ++++++++++++++++---------- milena/mln/io/{dump => raw}/save.hh | 72 ++++++++++++------- 5 files changed, 262 insertions(+), 73 deletions(-) copy milena/mln/io/{dump => raw}/all.hh (76%) create mode 100644 milena/mln/io/raw/get_header.hh copy milena/mln/io/{dump => raw}/load.hh (64%) copy milena/mln/io/{dump => raw}/save.hh (65%) diff --git a/milena/ChangeLog b/milena/ChangeLog index 8d21753..f2af5eb 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,14 @@ 2010-02-16 Guillaume Lazzara <z(a)lrde.epita.fr> + First draft of raw format support. + + * milena/mln/io/raw/all.hh, + * milena/mln/io/raw/get_header.hh, + * milena/mln/io/raw/load.hh, + * milena/mln/io/raw/save.hh: New. + +2010-02-16 Guillaume Lazzara <z(a)lrde.epita.fr> + Add new 3D neighborhoods and windows. * milena/mln/core/alias/neighb3d.hh, diff --git a/milena/mln/io/dump/all.hh b/milena/mln/io/raw/all.hh similarity index 76% copy from milena/mln/io/dump/all.hh copy to milena/mln/io/raw/all.hh index ae405e8..48d5c3c 100644 --- a/milena/mln/io/dump/all.hh +++ b/milena/mln/io/raw/all.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -23,11 +24,11 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -#ifndef MLN_IO_DUMP_ALL_HH -# define MLN_IO_DUMP_ALL_HH +#ifndef MLN_IO_RAW_ALL_HH +# define MLN_IO_RAW_ALL_HH /// \file -/// \brief Inclusion of all dump I/O routines. +/// \brief Inclusion of all raw I/O routines. namespace mln @@ -35,13 +36,14 @@ namespace mln namespace io { - /// Namespace of dump input/output handling. - namespace dump {} + /// Namespace of raw input/output handling. + namespace raw {} } } -# include <mln/io/dump/load.hh> -# include <mln/io/dump/save.hh> +# include <mln/io/raw/get_header.hh> +# include <mln/io/raw/load.hh> +# include <mln/io/raw/save.hh> -#endif // ! MLN_IO_DUMP_ALL_HH +#endif // ! MLN_IO_RAW_ALL_HH diff --git a/milena/mln/io/raw/get_header.hh b/milena/mln/io/raw/get_header.hh new file mode 100644 index 0000000..fa5dbf3 --- /dev/null +++ b/milena/mln/io/raw/get_header.hh @@ -0,0 +1,135 @@ +// Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of Olena. +// +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with Olena. If not, see <http://www.gnu.org/licenses/>. +// +// As a special exception, you may use this file as part of a free +// software project without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to produce +// an executable, this file does not by itself cause the resulting +// executable to be covered by the GNU General Public License. This +// exception does not however invalidate any other reasons why the +// executable file might be covered by the GNU General Public License. + +#ifndef MLN_IO_RAW_GET_HEADER_HH +# define MLN_IO_RAW_GET_HEADER_HH + +/// \file +/// +/// Load a Milena image rawed into a file. + +# include <iostream> +# include <fstream> + +# include <mln/core/concept/image.hh> +# include <mln/core/routine/initialize.hh> +# include <mln/core/box_runstart_piter.hh> +# include <mln/core/pixel.hh> +# include <mln/data/memcpy_.hh> + +namespace mln +{ + + namespace io + { + + namespace raw + { + + /// Store raw file header. + struct raw_header + { + unsigned dim; + std::string value_type; + util::array<unsigned> size; + }; + + + /// Retrieve header in a raw file. + raw_header get_header(const std::string& filename); + + +# ifndef MLN_INCLUDE_ONLY + + + raw_header get_header(const std::string& filename) + { + trace::entering("mln::io::raw::get_header"); + + raw_header header; + + std::string info_filename = filename + ".info"; + + std::ifstream info_file(info_filename.c_str()); + if (! info_file) + { + std::cerr << "io::raw::get_header - Error: cannot open file '" + << filename << "'!" + << std::endl; + abort(); + } + + std::string file_type; + info_file >> file_type; + if (file_type != "milena/raw") + { + std::cerr << "io::raw::load - Error: invalid file type. '" + << filename + << "' is NOT a valid milena/raw info file!" + << std::endl; + abort(); + } + + char dev_null[30]; + + // Dimension ? + // Reading line title "Dim: " + info_file.read(dev_null, 5); + info_file >> header.dim; + + // Size information - Skip it, useless. + header.size.resize(header.dim); + for (unsigned i = 0; i < header.dim; ++i) + info_file >> header.size[i]; + // Skipping endline. + char c; + info_file.get(c); + + + // Value type name ? + // Reading line title "data type: " + info_file.read(dev_null, 11); + // WARNING: value type name limited to 255 characters... + char value_type[255]; + info_file.getline(value_type, 255); + header.value_type = value_type; + + info_file.close(); + + trace::exiting("mln::io::raw::get_header"); + return header; + } + + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::io::raw + + } // end of namespace mln::io + +} // end of namespace mln + +#endif // ! MLN_IO_RAW_GET_HEADER_HH + diff --git a/milena/mln/io/dump/load.hh b/milena/mln/io/raw/load.hh similarity index 64% copy from milena/mln/io/dump/load.hh copy to milena/mln/io/raw/load.hh index ab9892b..7715740 100644 --- a/milena/mln/io/dump/load.hh +++ b/milena/mln/io/raw/load.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -23,12 +24,12 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -#ifndef MLN_IO_DUMP_LOAD_HH -# define MLN_IO_DUMP_LOAD_HH +#ifndef MLN_IO_RAW_LOAD_HH +# define MLN_IO_RAW_LOAD_HH /// \file /// -/// Load a Milena image dumped into a file. +/// Load an image saved as a raw data file. # include <iostream> # include <fstream> @@ -45,13 +46,19 @@ namespace mln namespace io { - namespace dump + namespace raw { - /// Load a Milena image by dumped into a file. + /// Load an image saved as a raw data file. /// /// \param[in,out] ima_ The image to load. /// \param[in] filename the destination. + /// + /// This routine try to read two input files: 'filename' and + /// 'filename.info'. + /// 'filename' is the raw data. + /// 'filename.info' store various information about the image. + // template <typename I> void load(Image& ima_, const std::string& filename); @@ -65,36 +72,41 @@ namespace mln inline void read_point(std::ifstream& file, P& p) { - char tmp[sizeof (P)]; - file.read(tmp, sizeof (P)); - p = *(P*)(void*)(&tmp); + for (unsigned i = 0; i < P::dim; ++i) + file >> p[i]; } template <typename I> inline - void load_header(Image& ima, std::ifstream& file, + void load_header(Image& ima, std::ifstream& info_file, const std::string& filename) { // Milena's file type ? std::string file_type; - file >> file_type; - if (file_type != "milena/dump") + info_file >> file_type; + if (file_type != "milena/raw") { - std::cerr << "io::dump::load - Error: invalid file type. '" + std::cerr << "io::raw::load - Error: invalid file type. '" << filename - << "' is NOT a valid milena/dump file!" + << "' is NOT a valid milena/raw info file!" << std::endl; abort(); } + char dev_null[255]; + // Dimension ? + // Reading line title "Dim: " + info_file.read(dev_null, 5); + unsigned dim; - file >> dim; + info_file >> dim; + typedef mln_site(I) P; if (P::dim != dim) { - std::cerr << "io::dump::load - Error: invalid image dimension. '" + std::cerr << "io::raw::load - Error: invalid image dimension. '" << filename << "' is a " << dim << "-D image " << "but you try to load it into a " << P::dim << "-D image!" @@ -105,18 +117,20 @@ namespace mln // Size information - Skip it, useless. std::string tmp; for (unsigned i = 0; i < dim; ++i) - file >> tmp; + info_file >> tmp; // Skipping endline. char c; - file.get(c); + info_file.get(c); // Value type name ? + // Reading line title "data type: " + info_file.read(dev_null, 11); // WARNING: value type name limited to 255 characters... char value_type[255]; - file.getline(value_type, 255); + info_file.getline(value_type, 255); if (mln_trait_value_name(mln_value(I)) != std::string(value_type)) { - std::cerr << "io::dump::load - Error: invalid image value type. '" + std::cerr << "io::raw::load - Error: invalid image value type. '" << filename << "' is an image of '" << value_type << "' but you try to load it into an image of '" << mln_trait_value_name(mln_value(I)) << "'!" @@ -124,19 +138,18 @@ namespace mln abort(); } - // Empty line - may be used for a new information. - file.get(c); - - // Empty line - may be used for a new information. - file.get(c); - // Pmin + // Reading line title "top left: " + info_file.read(dev_null, 10); P pmin; - read_point(file, pmin); + read_point(info_file, pmin); // Pmax + // Reading line title "bottom right: " + info_file.read(dev_null, 14); P pmax; - read_point(file, pmax); + read_point(info_file, pmax); + std::cout << pmax << std::endl; // Initialize the image buffer. mln_concrete(I) result(box(pmin, pmax)); @@ -163,39 +176,51 @@ namespace mln } - } // end of namespace mln::io::dump::internal + } // end of namespace mln::io::raw::internal template <typename I> void load(Image& ima, const std::string& filename) { - trace::entering("mln::io::dump::load"); + trace::entering("mln::io::raw::load"); std::ifstream file(filename.c_str()); if (! file) { - std::cerr << "io::dump::load - Error: cannot open file '" - << filename << "'!" - << std::endl; + std::cerr << "io::raw::load - error: cannot open file '" + << filename << "'!"; abort(); } - internal::load_header(ima, file, filename); + std::string info_filename = filename + ".info"; + std::ifstream info_file(info_filename.c_str()); + if (! info_file) + { + std::cerr << "io::raw::load - error: cannot open file '" + << info_filename << "'!"; + abort(); + } + + + internal::load_header(ima, info_file, info_filename); internal::load_data(ima, file); mln_postcondition(exact(ima).is_valid()); - trace::exiting("mln::io::dump::load"); + file.close(); + info_file.close(); + + trace::exiting("mln::io::raw::load"); } # endif // ! MLN_INCLUDE_ONLY - } // end of namespace mln::io::dump + } // end of namespace mln::io::raw } // end of namespace mln::io } // end of namespace mln -#endif // ! MLN_IO_DUMP_LOAD_HH +#endif // ! MLN_IO_RAW_LOAD_HH diff --git a/milena/mln/io/dump/save.hh b/milena/mln/io/raw/save.hh similarity index 65% copy from milena/mln/io/dump/save.hh copy to milena/mln/io/raw/save.hh index a361856..f526e57 100644 --- a/milena/mln/io/dump/save.hh +++ b/milena/mln/io/raw/save.hh @@ -23,12 +23,12 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -#ifndef MLN_IO_DUMP_SAVE_HH -# define MLN_IO_DUMP_SAVE_HH +#ifndef MLN_IO_RAW_SAVE_HH +# define MLN_IO_RAW_SAVE_HH /// \file /// -/// Save a Milena image by dumping its data to a file. +/// Save a Milena image as a raw data file. /// /// \todo handle endianness. @@ -48,13 +48,18 @@ namespace mln namespace io { - namespace dump + namespace raw { - /// Save a Milena image by dumping its data to a file. + /// Save a Milena image as a raw data file. /// /// \param[in] ima_ The image to save. /// \param[in] filename the destination. + /// + /// This routine produce two output files: 'filename' and + /// 'filename.info'. + /// 'filename' is the raw data. + /// 'filename.info' store various information about the image. // template <typename I> void save(const Image& ima_, const std::string& filename); @@ -69,15 +74,14 @@ namespace mln template <typename I> inline - void save_header(const I& ima, - std::ofstream& file) + void save_header(const I& ima, std::ofstream& file) { // Milena's file type - file << "milena/dump" << std::endl; + file << "milena/raw" << std::endl; // Dimension typedef mln_site(I) P; - file << P::dim << std::endl; + file << "dim: " << P::dim << std::endl; // Image size. typedef algebra::vec<P::dim, unsigned> vec_t; @@ -88,21 +92,20 @@ namespace mln // Value type name // WARNING: value type name limited to 255 characters... - file << mln_trait_value_name(mln_value(I)) << std::endl; - - // Empty line - may be used for a new information. - file << std::endl; - - // Empty line - may be used for a new information. - file << std::endl; + file << "data type: " << mln_trait_value_name(mln_value(I)) + << std::endl; // Pmin - mln_site(I) p = ima.domain().pmin(); - file.write((char*) (&p), sizeof (P)); + file << "top left: "; + for (unsigned i = 0; i < P::dim - 1; ++i) + file << ima.domain().pmin()[i] << " "; + file << ima.domain().pmin()[P::dim - 1] << std::endl; // Pmax - p = ima.domain().pmax(); - file.write((char*) (&p), sizeof (P)); + file << "bottom right: "; + for (unsigned i = 0; i < P::dim - 1; ++i) + file << ima.domain().pmax()[i] << " "; + file << ima.domain().pmax()[P::dim - 1] << std::endl; } @@ -111,7 +114,8 @@ namespace mln void save_data(I& ima, std::ofstream& file) { // Handle padding. - unsigned data_size = sizeof (mln_value(I)) + sizeof (mln_value(I)) % 2; + unsigned + data_size = sizeof (mln_value(I)) + sizeof (mln_value(I)) % 2; mln_box_runstart_piter(I) p(ima.domain()); for_all(p) @@ -121,7 +125,7 @@ namespace mln } } - } // end of namespace mln::io::dump::internal + } // end of namespace mln::io::raw::internal @@ -130,7 +134,9 @@ namespace mln template <typename I> void save(const Image& ima_, const std::string& filename) { - trace::entering("mln::io::dump::save"); + trace::entering("mln::io::raw::save"); + + mlc_bool(mln_site_(I)::dim == 2 || mln_site_(I)::dim == 3)::check(); const I& ima = exact(ima_); @@ -141,19 +147,31 @@ namespace mln abort(); } - internal::save_header(ima, file); + std::string info_filename = filename + ".info"; + std::ofstream info_file(info_filename.c_str()); + if (! info_file) + { + std::cerr << "error: cannot open file '" << info_filename << "'!"; + abort(); + } + + + internal::save_header(ima, info_file); internal::save_data(ima, file); - trace::exiting("mln::io::dump::save"); + info_file.close(); + file.close(); + + trace::exiting("mln::io::raw::save"); } # endif // ! MLN_INCLUDE_ONLY - } // end of namespace mln::io::dump + } // end of namespace mln::io::raw } // end of namespace mln::io } // end of namespace mln -#endif // ! MLN_IO_DUMP_SAVE_HH +#endif // ! MLN_IO_RAW_SAVE_HH -- 1.5.6.5

1 0

last-svn-commit-15-g2510005 Add new tools in bin sandbox.
by Guillaume Lazzara 16 Feb '10

16 Feb '10

* bin/labeling/colorize.cc, * bin/pgm_to_pbm.cc, * bin/ppm_negate.cc: New. --- milena/sandbox/ChangeLog | 8 ++++++ milena/sandbox/bin/labeling/colorize.cc | 24 +++++++++++++++++ milena/sandbox/bin/pgm_to_pbm.cc | 39 ++++++++++++++++++++++++++++ milena/sandbox/bin/ppm_negate.cc | 43 +++++++++++++++++++++++++++++++ 4 files changed, 114 insertions(+), 0 deletions(-) create mode 100644 milena/sandbox/bin/labeling/colorize.cc create mode 100644 milena/sandbox/bin/pgm_to_pbm.cc create mode 100644 milena/sandbox/bin/ppm_negate.cc diff --git a/milena/sandbox/ChangeLog b/milena/sandbox/ChangeLog index 9e7f25b..bed29e7 100644 --- a/milena/sandbox/ChangeLog +++ b/milena/sandbox/ChangeLog @@ -1,3 +1,11 @@ +2010-02-16 Guillaume Lazzara <z(a)lrde.epita.fr> + + Add new tools in bin sandbox. + + * bin/labeling/colorize.cc, + * bin/pgm_to_pbm.cc, + * bin/ppm_negate.cc: New. + 2009-11-17 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Add some bench + canvas + subsampling + browsing code. diff --git a/milena/sandbox/bin/labeling/colorize.cc b/milena/sandbox/bin/labeling/colorize.cc new file mode 100644 index 0000000..8a548c1 --- /dev/null +++ b/milena/sandbox/bin/labeling/colorize.cc @@ -0,0 +1,24 @@ +#include <mln/core/concept/function.hh> +#include <mln/core/image/image2d.hh> + +#include <mln/value/rgb8.hh> +#include <mln/value/label_8.hh> +#include <mln/io/ppm/save.hh> +#include <mln/io/pgm/load.hh> + +#include <mln/labeling/colorize.hh> + + +int main(int argc, char *argv[]) +{ + using namespace mln; + + if (argc < 3) + std::cout << "Usage : " << argv[0] + << " input_label_8.pgm out.ppm" << std::endl; + + image2d<value::label_8> input; + io::pgm::load(input, argv[1]); + + io::ppm::save(labeling::colorize(value::rgb8(), input), argv[2]); +} diff --git a/milena/sandbox/bin/pgm_to_pbm.cc b/milena/sandbox/bin/pgm_to_pbm.cc new file mode 100644 index 0000000..9470e39 --- /dev/null +++ b/milena/sandbox/bin/pgm_to_pbm.cc @@ -0,0 +1,39 @@ +#include <mln/core/image/image2d.hh> +#include <mln/core/concept/function.hh> +#include <mln/io/pgm/load.hh> +#include <mln/io/pbm/save.hh> +#include <mln/data/transform.hh> +#include <mln/value/int_u8.hh> + +namespace mln +{ + + struct to_bin : public Function_v2v<to_bin> + { + typedef bool result; + + bool operator()(const value::int_u8& v) const + { + return v != 0; + } + + }; + +} + +int main(int argc, char *argv[]) +{ + using namespace mln; + + if (argc < 3) + { + std::cout << "Usage: " << argv[1] << " input.pgm out.pbm" << std::endl; + return 1; + } + + image2d<value::int_u8> input; + io::pgm::load(input, argv[1]); + + to_bin f; + io::pbm::save(data::transform(input, f), argv[2]); +} diff --git a/milena/sandbox/bin/ppm_negate.cc b/milena/sandbox/bin/ppm_negate.cc new file mode 100644 index 0000000..e702224 --- /dev/null +++ b/milena/sandbox/bin/ppm_negate.cc @@ -0,0 +1,43 @@ +#include <mln/core/concept/function.hh> +#include <mln/core/image/image2d.hh> +#include <mln/value/rgb8.hh> +#include <mln/io/ppm/all.hh> +#include <mln/arith/revert.hh> +#include <mln/data/transform.hh> + +namespace mln +{ + + struct rgb_negate : Function_v2v<rgb_negate> + { + typedef value::rgb8 result; + + result operator()(const value::rgb8& v) const + { + value::rgb8 tmp(255 - v.red(), 255 - v.green(), 255 - v.blue()); + return tmp; + } + + }; + +} // end of namespace mln + + + +int main(int argc, char *argv[]) +{ + using namespace mln; + + if (argc < 3) + { + std::cout << "Usage: " << argv[0] << " input.ppm output.ppm" + << std::endl; + return 1; + } + + image2d<value::rgb8> input; + io::ppm::load(input, argv[1]); + + io::ppm::save(data::transform(input, rgb_negate()), argv[2]); +} + -- 1.5.6.5

1 0

last-svn-commit-14-g304dee0 Cleanup to_qimage convertion routines.
by Guillaume Lazzara 16 Feb '10

16 Feb '10

* mln/convert/to_qimage.hh: Remove useless comments and move a specific implementation... * mln/convert/to_qimage_nocopy.hh: ... in this new file. --- milena/ChangeLog | 9 ++ milena/mln/convert/to_qimage.hh | 145 +------------------------------- milena/mln/convert/to_qimage_nocopy.hh | 139 ++++++++++++++++++++++++++++++ 3 files changed, 149 insertions(+), 144 deletions(-) create mode 100644 milena/mln/convert/to_qimage_nocopy.hh diff --git a/milena/ChangeLog b/milena/ChangeLog index 4164689..9a870bf 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,14 @@ 2010-02-16 Guillaume Lazzara <z(a)lrde.epita.fr> + Cleanup to_qimage convertion routines. + + * mln/convert/to_qimage.hh: Remove useless comments and move a + specific implementation... + + * mln/convert/to_qimage_nocopy.hh: ... in this new file. + +2010-02-16 Guillaume Lazzara <z(a)lrde.epita.fr> + Add a routine to convert to a QImage. * mln/convert/to_qimage.hh: New. diff --git a/milena/mln/convert/to_qimage.hh b/milena/mln/convert/to_qimage.hh index 9b2f31c..b51de25 100644 --- a/milena/mln/convert/to_qimage.hh +++ b/milena/mln/convert/to_qimage.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -42,11 +42,6 @@ # include <mln/value/rgb8.hh> - -// # undef QT_VERSION -// # define QT_VERSION 0x040000 - - # if QT_VERSION < 0x040000 # error "Your version of Qt is too old and is not supported." # endif @@ -108,45 +103,6 @@ namespace mln - -// template <typename I> -// inline -// QImage to_qimage_scalar(const Image& ima_) -// { -// const I& ima = exact(ima_); -// mln_precondition(ima.is_valid()); - -// const int -// nrows = geom::nrows(ima), -// ncols = geom::ncols(ima); - -// // Required by a one-shot data copy: -// mln::border::resize(ima, 0); - -// QImage qima(ncols, nrows, QImage::Format_RGB888); -// uchar * ptr_qima = qima.scanLine(0); -// const mln_value(I)* ptr_ima = &ima(ima.domain().pmin()); -// unsigned row_offset = ima.delta_index(dpoint2d(+1, - ncols)); - -// for (unsigned row = 0; row < nrows; ++row, ptr_ima += row_offset) -// for (unsigned col = 0; col < ncols; ++col) -// { -// const mln_value(I)& v = *ptr_ima++; - - - -// std::memcpy(qima.scanLine(0), -// ima.buffer(), -// ima.nelements() * sizeof(mln_value(I))); - -// return qima; -// } - -// # endif // ! QT_VERSION - - - - # if QT_VERSION >= 0x040000 && QT_VERSION < 0x040400 template <typename I> @@ -237,105 +193,6 @@ namespace mln } - // Not used by default since it does not create a deep copy. - template <typename I> - inline - QImage to_qimage_qt_rgb32_nocopy(const Image& ima_) - { - const I& ima = exact(ima_); - mln_precondition(ima.is_valid()); - - const int - nrows = geom::nrows(ima), - ncols = geom::ncols(ima); - - - // Required by a one-shot data copy: - mln::border::resize(ima, 0); - - QImage qima((uchar *)(ima.buffer()), ncols, nrows, - QImage::Format_RGB32); - - return qima; - } - - -// template <typename I> -// inline -// QImage to_qimage_rgb8_3(const Image& ima_) -// { -// const I& ima = exact(ima_); -// mln_precondition(ima.is_valid()); - -// const int -// nrows = geom::nrows(ima), -// ncols = geom::ncols(ima); - -// QImage qima(ncols, nrows, QImage::Format_RGB888); -// uchar * ptr_qima = qima.scanLine(0); -// const mln_value(I)* ptr_ima = &ima(ima.domain().pmin()); -// unsigned row_offset = ima.delta_index(dpoint2d(+1, - ncols)); - -// for (unsigned row = 0; row < nrows; ++row, ptr_ima += row_offset) -// for (unsigned col = 0; col < ncols; ++col) -// { -// const value::rgb8& v = *ptr_ima++; -// *ptr_qima++ = v.red(); -// *ptr_qima++ = v.green(); -// *ptr_qima++ = v.blue(); -// } - -// return qima; -// } - - -// template <typename I> -// inline -// QImage to_qimage_rgb8_4(const Image& ima_) -// { -// const I& ima = exact(ima_); -// mln_precondition(ima.is_valid()); - -// const int -// nrows = geom::nrows(ima), -// ncols = geom::ncols(ima); - - -// // Required by a one-shot data copy: -// mln::border::resize(ima, 0); - -// QImage qima(ncols, nrows, QImage::Format_RGB32); -// std::memcpy(qima.scanLine(0), -// ima.buffer(), -// ima.nelements() * 4); - -// return qima; -// } - - -// template <typename I> -// inline -// QImage to_qimage_rgb8_5(const Image& ima_) -// { -// const I& ima = exact(ima_); -// mln_precondition(ima.is_valid()); - -// const int -// nrows = geom::nrows(ima), -// ncols = geom::ncols(ima); - -// QImage qima(ncols + 2 * ima.border(), -// nrows + 2 * ima.border(), -// QImage::Format_RGB32); -// std::memcpy(qima.scanLine(0), -// ima.buffer(), -// ima.nelements() * 3); - -// return qima; -// } - - - } // end of namespace mln::convert::implementation diff --git a/milena/mln/convert/to_qimage_nocopy.hh b/milena/mln/convert/to_qimage_nocopy.hh new file mode 100644 index 0000000..9ddf5f4 --- /dev/null +++ b/milena/mln/convert/to_qimage_nocopy.hh @@ -0,0 +1,139 @@ +// Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of Olena. +// +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with Olena. If not, see <http://www.gnu.org/licenses/>. +// +// As a special exception, you may use this file as part of a free +// software project without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to produce +// an executable, this file does not by itself cause the resulting +// executable to be covered by the GNU General Public License. This +// exception does not however invalidate any other reasons why the +// executable file might be covered by the GNU General Public License. + +/// \file +/// +/// Convert a Milena image to a Qimage. + + +#ifndef MLN_CONVERT_TO_QIMAGE_NOCOPY_HH +# define MLN_CONVERT_TO_QIMAGE_NOCOPY_HH + +# include <QtGui/QImage> + +# include <mln/core/concept/image.hh> +# include <mln/geom/nrows.hh> +# include <mln/geom/ncols.hh> +# include <mln/border/resize.hh> + + +# include <mln/value/qt/rgb32.hh> +# include <mln/value/rgb8.hh> + +# if QT_VERSION < 0x040000 +# error "Your version of Qt is too old and is not supported." +# endif + + +namespace mln +{ + + namespace convert + { + + // Implementation + + namespace implementation + { + + template <typename I> + inline + QImage to_qimage_nocopy_qt_rgb32(const Image& ima_) + { + const I& ima = exact(ima_); + mln_precondition(ima.is_valid()); + + const int + nrows = geom::nrows(ima), + ncols = geom::ncols(ima); + + mln::border::resize(ima, 0); + + QImage qima((uchar *)(ima.buffer()), ncols, nrows, + QImage::Format_RGB32); + + return qima; + } + + + } // end of namespace mln::convert::implementation + + + + // Dispatch + + namespace internal + { + + template <typename I> + inline + QImage to_qimage_nocopy_dispatch(const Image& ima, const value::qt::rgb32&) + { + return implementation::to_qimage_nocopy_qt_rgb32(ima); + } + + + template <typename I, typename V> + inline + QImage to_qimage_nocopy_dispatch(const Image& ima, V&) + { + // Not supported yet! + mlc_abort(I)::check(); + return QImage(); + } + + + template <typename I> + inline + QImage to_qimage_nocopy_dispatch(const Image& ima) + { + typedef mln_value(I) V; + return to_qimage_nocopy_dispatch(ima, V()); + } + + } // end of namespace mln::convert::internal + + + + // Facade + + template <typename I> + inline + QImage to_qimage_nocopy_nocopy(const Image& ima_) + { + const I& ima = exact(ima_); + mln_precondition(ima.is_valid()); + + QImage output = internal::to_qimage_nocopy_dispatch(ima); + + return output; + } + + + } // end of namespace mln::convert + +} // end of namespace mln + +#endif // ! MLN_CONVERT_TO_QIMAGE_NOCOPY_HH -- 1.5.6.5

1 0

last-svn-commit-13-g9d8c549 Add a routine to convert to a QImage.
by Guillaume Lazzara 16 Feb '10

16 Feb '10

* mln/convert/to_qimage.hh: New. --- milena/ChangeLog | 6 + milena/mln/convert/to_qimage.hh | 411 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 417 insertions(+), 0 deletions(-) create mode 100644 milena/mln/convert/to_qimage.hh diff --git a/milena/ChangeLog b/milena/ChangeLog index d94e481..4164689 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,11 @@ 2010-02-16 Guillaume Lazzara <z(a)lrde.epita.fr> + Add a routine to convert to a QImage. + + * mln/convert/to_qimage.hh: New. + +2010-02-16 Guillaume Lazzara <z(a)lrde.epita.fr> + Add box<>::merge. * mln/core/site_set/box.hh: New member 'merge()'. diff --git a/milena/mln/convert/to_qimage.hh b/milena/mln/convert/to_qimage.hh new file mode 100644 index 0000000..9b2f31c --- /dev/null +++ b/milena/mln/convert/to_qimage.hh @@ -0,0 +1,411 @@ +// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of Olena. +// +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with Olena. If not, see <http://www.gnu.org/licenses/>. +// +// As a special exception, you may use this file as part of a free +// software project without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to produce +// an executable, this file does not by itself cause the resulting +// executable to be covered by the GNU General Public License. This +// exception does not however invalidate any other reasons why the +// executable file might be covered by the GNU General Public License. + +/// \file +/// +/// Convert a Milena image to a Qimage. + +#ifndef MLN_CONVERT_TO_QIMAGE_HH +# define MLN_CONVERT_TO_QIMAGE_HH + +# include <QtGui/QImage> + +# include <mln/core/concept/image.hh> +# include <mln/geom/nrows.hh> +# include <mln/geom/ncols.hh> +# include <mln/border/resize.hh> + + +# include <mln/value/qt/rgb32.hh> +# include <mln/value/rgb8.hh> + + + +// # undef QT_VERSION +// # define QT_VERSION 0x040000 + + +# if QT_VERSION < 0x040000 +# error "Your version of Qt is too old and is not supported." +# endif + + +namespace mln +{ + + namespace convert + { + + // Implementation + + namespace implementation + { + + + template <typename I> + inline + QImage to_qimage_scalar(const Image& ima_) + { + const I& ima = exact(ima_); + mln_precondition(ima.is_valid()); + + const int + nrows = geom::nrows(ima), + ncols = geom::ncols(ima); + +# if QT_VERSION >= 0x040000 && QT_VERSION < 0x040400 + QImage qima(ncols, nrows, QImage::Format_RGB32); + uchar * ptr_qima = qima.scanLine(0); +# if Q_BYTE_ORDER == Q_LITTLE_ENDIAN + ++ptr_qima; +# endif // ! Q_BYTE_ORDER +# else + QImage qima(ncols, nrows, QImage::Format_RGB888); + uchar * ptr_qima = qima.scanLine(0); +# endif // ! QT_VERSION + + const mln_value(I)* ptr_ima = &ima(ima.domain().pmin()); + unsigned row_offset = ima.delta_index(dpoint2d(+1, - ncols)); + + // Data is stored as ABGR so we skip the first value which is ignored. + for (unsigned row = 0; row < nrows; ++row, ptr_ima += row_offset) + for (unsigned col = 0; col < ncols; ++col) + { + const mln_value(I)& v = *ptr_ima++; + std::memset(ptr_qima, v, sizeof(mln_value(I)) * 3); + +# if QT_VERSION >= 0x040000 && QT_VERSION < 0x040400 + ptr_qima += 4; +# else + ptr_qima += 3; +# endif // ! QT_VERSION + } + + return qima; + } + + + + +// template <typename I> +// inline +// QImage to_qimage_scalar(const Image& ima_) +// { +// const I& ima = exact(ima_); +// mln_precondition(ima.is_valid()); + +// const int +// nrows = geom::nrows(ima), +// ncols = geom::ncols(ima); + +// // Required by a one-shot data copy: +// mln::border::resize(ima, 0); + +// QImage qima(ncols, nrows, QImage::Format_RGB888); +// uchar * ptr_qima = qima.scanLine(0); +// const mln_value(I)* ptr_ima = &ima(ima.domain().pmin()); +// unsigned row_offset = ima.delta_index(dpoint2d(+1, - ncols)); + +// for (unsigned row = 0; row < nrows; ++row, ptr_ima += row_offset) +// for (unsigned col = 0; col < ncols; ++col) +// { +// const mln_value(I)& v = *ptr_ima++; + + + +// std::memcpy(qima.scanLine(0), +// ima.buffer(), +// ima.nelements() * sizeof(mln_value(I))); + +// return qima; +// } + +// # endif // ! QT_VERSION + + + + +# if QT_VERSION >= 0x040000 && QT_VERSION < 0x040400 + + template <typename I> + inline + QImage to_qimage_rgb8(const Image& ima_) + { + const I& ima = exact(ima_); + mln_precondition(ima.is_valid()); + + const int + nrows = geom::nrows(ima), + ncols = geom::ncols(ima); + + QImage qima(ncols, nrows, QImage::Format_RGB32); + uchar * ptr_qima = qima.scanLine(0); + const mln_value(I)* ptr_ima = &ima(ima.domain().pmin()); + unsigned row_offset = ima.delta_index(dpoint2d(+1, - ncols)); + + for (unsigned row = 0; row < nrows; ++row, ptr_ima += row_offset) + for (unsigned col = 0; col < ncols; ++col) + { + const mln::value::rgb8& v = *ptr_ima++; +# if Q_BYTE_ORDER == Q_LITTLE_ENDIAN + // Memory representation : BBGGRRFF + *ptr_qima++ = v.blue(); + *ptr_qima++ = v.green(); + *ptr_qima = v.red(); + ptr_qima += 2; +# else /* Q_BIG_ENDIAN */ + // Memory representation : FFRRGGBB + ++ptr_qima; + *ptr_qima++ = v.red(); + *ptr_qima++ = v.green(); + *ptr_qima = v.blue(); +# endif // ! Q_BYTE_ORDER + } + + return qima; + } + +# else + template <typename I> + inline + QImage to_qimage_rgb8(const Image& ima_) + { + const I& ima = exact(ima_); + mln_precondition(ima.is_valid()); + + const int + nrows = geom::nrows(ima), + ncols = geom::ncols(ima); + + + // Required by a one-shot data copy: + mln::border::resize(ima, 0); + + QImage qima(ncols, nrows, QImage::Format_RGB888); + std::memcpy(qima.scanLine(0), + ima.buffer(), + ima.nelements() * 3); + + return qima; + } +# endif // ! QT_VERSION + + + template <typename I> + inline + QImage to_qimage_qt_rgb32(const Image& ima_) + { + const I& ima = exact(ima_); + mln_precondition(ima.is_valid()); + + const int + nrows = geom::nrows(ima), + ncols = geom::ncols(ima); + + + // Required by a one-shot data copy: + mln::border::resize(ima, 0); + + QImage qima(ncols, nrows, QImage::Format_RGB32); + std::memcpy(qima.scanLine(0), + ima.buffer(), + ima.nelements() * 4); + + return qima; + } + + + // Not used by default since it does not create a deep copy. + template <typename I> + inline + QImage to_qimage_qt_rgb32_nocopy(const Image& ima_) + { + const I& ima = exact(ima_); + mln_precondition(ima.is_valid()); + + const int + nrows = geom::nrows(ima), + ncols = geom::ncols(ima); + + + // Required by a one-shot data copy: + mln::border::resize(ima, 0); + + QImage qima((uchar *)(ima.buffer()), ncols, nrows, + QImage::Format_RGB32); + + return qima; + } + + +// template <typename I> +// inline +// QImage to_qimage_rgb8_3(const Image& ima_) +// { +// const I& ima = exact(ima_); +// mln_precondition(ima.is_valid()); + +// const int +// nrows = geom::nrows(ima), +// ncols = geom::ncols(ima); + +// QImage qima(ncols, nrows, QImage::Format_RGB888); +// uchar * ptr_qima = qima.scanLine(0); +// const mln_value(I)* ptr_ima = &ima(ima.domain().pmin()); +// unsigned row_offset = ima.delta_index(dpoint2d(+1, - ncols)); + +// for (unsigned row = 0; row < nrows; ++row, ptr_ima += row_offset) +// for (unsigned col = 0; col < ncols; ++col) +// { +// const value::rgb8& v = *ptr_ima++; +// *ptr_qima++ = v.red(); +// *ptr_qima++ = v.green(); +// *ptr_qima++ = v.blue(); +// } + +// return qima; +// } + + +// template <typename I> +// inline +// QImage to_qimage_rgb8_4(const Image& ima_) +// { +// const I& ima = exact(ima_); +// mln_precondition(ima.is_valid()); + +// const int +// nrows = geom::nrows(ima), +// ncols = geom::ncols(ima); + + +// // Required by a one-shot data copy: +// mln::border::resize(ima, 0); + +// QImage qima(ncols, nrows, QImage::Format_RGB32); +// std::memcpy(qima.scanLine(0), +// ima.buffer(), +// ima.nelements() * 4); + +// return qima; +// } + + +// template <typename I> +// inline +// QImage to_qimage_rgb8_5(const Image& ima_) +// { +// const I& ima = exact(ima_); +// mln_precondition(ima.is_valid()); + +// const int +// nrows = geom::nrows(ima), +// ncols = geom::ncols(ima); + +// QImage qima(ncols + 2 * ima.border(), +// nrows + 2 * ima.border(), +// QImage::Format_RGB32); +// std::memcpy(qima.scanLine(0), +// ima.buffer(), +// ima.nelements() * 3); + +// return qima; +// } + + + + } // end of namespace mln::convert::implementation + + + + // Dispatch + + namespace internal + { + + template <typename I, typename S> + inline + QImage to_qimage_dispatch(const Image& ima, const value::Scalar<S>&) + { + return implementation::to_qimage_scalar(ima); + } + + template <typename I> + inline + QImage to_qimage_dispatch(const Image& ima, const value::rgb8&) + { + return implementation::to_qimage_rgb8(ima); + } + + template <typename I> + inline + QImage to_qimage_dispatch(const Image& ima, const value::qt::rgb32&) + { + return implementation::to_qimage_qt_rgb32(ima); + } + + + template <typename I, typename V> + inline + QImage to_qimage_dispatch(const Image& ima, V&) + { + // Not supported yet! + mlc_abort(I)::check(); + return QImage(); + } + + + template <typename I> + inline + QImage to_qimage_dispatch(const Image& ima) + { + typedef mln_value(I) V; + return to_qimage_dispatch(ima, V()); + } + + } // end of namespace mln::convert::internal + + + + // Facade + + template <typename I> + inline + QImage to_qimage(const Image& ima_) + { + const I& ima = exact(ima_); + mln_precondition(ima.is_valid()); + + QImage output = internal::to_qimage_dispatch(ima); + + return output; + } + + + } // end of namespace mln::convert + +} // end of namespace mln + +#endif // ! MLN_CONVERT_TO_QIMAGE_HH -- 1.5.6.5

1 0

last-svn-commit-12-g757792d Add box<>::merge.
by Guillaume Lazzara 16 Feb '10

16 Feb '10

* mln/core/site_set/box.hh: New member 'merge()'. * tests/core/site_set/Makefile.am, * tests/core/site_set/box.cc: New test. --- milena/ChangeLog | 9 +++++++ milena/mln/core/site_set/box.hh | 24 ++++++++++++++++++++ milena/tests/core/site_set/Makefile.am | 2 + .../{other/box_runend_piter.cc => site_set/box.cc} | 17 +++++++------ 4 files changed, 44 insertions(+), 8 deletions(-) copy milena/tests/core/{other/box_runend_piter.cc => site_set/box.cc} (82%) diff --git a/milena/ChangeLog b/milena/ChangeLog index f76dc74..d94e481 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,14 @@ 2010-02-16 Guillaume Lazzara <z(a)lrde.epita.fr> + Add box<>::merge. + + * mln/core/site_set/box.hh: New member 'merge()'. + + * tests/core/site_set/Makefile.am, + * tests/core/site_set/box.cc: New test. + +2010-02-16 Guillaume Lazzara <z(a)lrde.epita.fr> + Rename image3d<>::nslices to image3d<>::nslis. * mln/core/image/image3d.hh, diff --git a/milena/mln/core/site_set/box.hh b/milena/mln/core/site_set/box.hh index 375f534..75fb91c 100644 --- a/milena/mln/core/site_set/box.hh +++ b/milena/mln/core/site_set/box.hh @@ -152,6 +152,9 @@ namespace mln /// Crop this bbox in order to fit in the reference box \p b. void crop_wrt(const box& b); + /// Merge inplace with another box. + void merge(const box& b); + /// Return the size of this site set in memory. std::size_t memory_size() const; @@ -212,6 +215,27 @@ namespace mln template <typename P> inline + void + box::merge(const box& b) + { + mln_precondition(is_valid()); + if (! b.is_valid()) + { + // no-op + return; + } + + for (unsigned i = 0; i < P::dim; ++i) + { + if (b.pmin()[i] < pmin_[i]) + pmin_[i] = b.pmin()[i]; + if (b.pmax()[i] > pmax_[i]) + pmax_[i] = b.pmax()[i]; + } + } + + template <typename P> + inline P box::pmin() const { diff --git a/milena/tests/core/site_set/Makefile.am b/milena/tests/core/site_set/Makefile.am index a67544a..c0be39b 100644 --- a/milena/tests/core/site_set/Makefile.am +++ b/milena/tests/core/site_set/Makefile.am @@ -20,6 +20,7 @@ include $(top_srcdir)/milena/tests/tests.mk check_PROGRAMS = \ + box \ operators \ p_array \ p_complex \ @@ -34,6 +35,7 @@ check_PROGRAMS = \ p_vaccess \ p_vertices +box_SOURCES = box.cc operators_SOURCES = operators.cc p_array_SOURCES = p_array.cc p_complex_SOURCES = p_complex.cc diff --git a/milena/tests/core/other/box_runend_piter.cc b/milena/tests/core/site_set/box.cc similarity index 82% copy from milena/tests/core/other/box_runend_piter.cc copy to milena/tests/core/site_set/box.cc index fe7cb43..ad5c119 100644 --- a/milena/tests/core/other/box_runend_piter.cc +++ b/milena/tests/core/site_set/box.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -23,19 +23,20 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. +#include <mln/core/site_set/box.hh> #include <mln/core/alias/box2d.hh> -#include <mln/core/box_runend_piter.hh> +#include <mln/core/alias/point2d.hh> int main() { using namespace mln; - box2d b(3,3); - box_runend_piter<point2d> p(b); - unsigned i = 2; - for_all(p) - mln_assertion(p == point2d(i, 2)); + box2d + b1(point2d(0,0), point2d(3, 4)), + b2(point2d(-1,-1), point2d(4, 5)); - mln_assertion(p.run_length() == 3); + b1.merge(b2); + + mln_assertion(b1 == b2); } -- 1.5.6.5

1 0

last-svn-commit-11-g852fd7f Rename image3d<>::nslices to image3d<>::nslis.
by Guillaume Lazzara 16 Feb '10

16 Feb '10

* mln/core/image/image3d.hh, * mln/debug/slices_2d.hh, * tests/io/pbms/load.cc, * tests/io/pgms/load.cc, * tests/io/ppms/load.cc: Rename nslices to nslis. --- milena/ChangeLog | 10 ++++++++++ milena/mln/core/image/image3d.hh | 7 ++++--- milena/mln/debug/slices_2d.hh | 13 +++++++------ milena/tests/io/pbms/load.cc | 2 +- milena/tests/io/pgms/load.cc | 2 +- milena/tests/io/ppms/load.cc | 2 +- 6 files changed, 24 insertions(+), 12 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 04b9146..f76dc74 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,15 @@ 2010-02-16 Guillaume Lazzara <z(a)lrde.epita.fr> + Rename image3d<>::nslices to image3d<>::nslis. + + * mln/core/image/image3d.hh, + * mln/debug/slices_2d.hh, + * tests/io/pbms/load.cc, + * tests/io/pgms/load.cc, + * tests/io/ppms/load.cc: Rename nslices to nslis. + +2010-02-16 Guillaume Lazzara <z(a)lrde.epita.fr> + Various small fixes. * doc/tutorial/tutorial.tex: Add more contacts. diff --git a/milena/mln/core/image/image3d.hh b/milena/mln/core/image/image3d.hh index 6c4afe0..dc2b6c3 100644 --- a/milena/mln/core/image/image3d.hh +++ b/milena/mln/core/image/image3d.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -208,7 +209,7 @@ namespace mln /// Give the number of slices. - unsigned nslices() const; + unsigned nslis() const; /// Give the number of rows. unsigned nrows() const; @@ -511,7 +512,7 @@ namespace mln template <typename T> inline unsigned - image3d<T>::nslices() const + image3d<T>::nslis() const { mln_precondition(this->is_valid()); return this->data_->b_.len(0); diff --git a/milena/mln/debug/slices_2d.hh b/milena/mln/debug/slices_2d.hh index 79aaa99..165e79c 100644 --- a/milena/mln/debug/slices_2d.hh +++ b/milena/mln/debug/slices_2d.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009, 2010 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -86,11 +87,11 @@ namespace mln mln_precondition(input.is_valid()); mln_precondition(n_horizontal > 0 && n_vertical > 0); - mln_precondition(input.nslices() <= n_horizontal * n_vertical); + mln_precondition(input.nslis() <= n_horizontal * n_vertical); image2d<mln_value(I)> output(input.nrows() * n_vertical, input.ncols() * n_horizontal); - if (input.nslices() != n_horizontal * n_vertical) + if (input.nslis() != n_horizontal * n_vertical) data::fill(output, bg); const point3d& p_min = input.domain().pmin(); @@ -152,7 +153,7 @@ namespace mln n_vertical = internal::round_up(n_v); } } - + } // end of namespace mln::debug::internal @@ -170,10 +171,10 @@ namespace mln mln_precondition(ratio_hv > 0.f); unsigned n_horizontal, n_vertical; - internal::slices2d_helper(input.nslices(), input.nrows(), input.ncols(), + internal::slices2d_helper(input.nslis(), input.nrows(), input.ncols(), ratio_hv, n_horizontal, n_vertical); - mln_assertion(n_horizontal * n_vertical >= input.nslices()); + mln_assertion(n_horizontal * n_vertical >= input.nslis()); image2d<mln_value(I)> output = slices_2d(input, n_horizontal, n_vertical, bg); diff --git a/milena/tests/io/pbms/load.cc b/milena/tests/io/pbms/load.cc index 7712590..e95bc4d 100644 --- a/milena/tests/io/pbms/load.cc +++ b/milena/tests/io/pbms/load.cc @@ -54,7 +54,7 @@ int main() image3d<bool> ima3d; io::pbms::load(ima3d, files); - mln_assertion(ima3d.nslices() == 2); + mln_assertion(ima3d.nslis() == 2); mln_assertion(slice(ima3d, 0) == pic); mln_assertion(slice(ima3d, 1) == pic2); diff --git a/milena/tests/io/pgms/load.cc b/milena/tests/io/pgms/load.cc index 8380506..d0b5c75 100644 --- a/milena/tests/io/pgms/load.cc +++ b/milena/tests/io/pgms/load.cc @@ -61,7 +61,7 @@ int main() image3d<int_u8> ima3d; io::pgms::load(ima3d, files); - mln_assertion(ima3d.nslices() == 2); + mln_assertion(ima3d.nslis() == 2); mln_assertion(slice(ima3d, 0) == lena); mln_assertion(slice(ima3d, 1) == lena2); } diff --git a/milena/tests/io/ppms/load.cc b/milena/tests/io/ppms/load.cc index d5149cf..ad8d813 100644 --- a/milena/tests/io/ppms/load.cc +++ b/milena/tests/io/ppms/load.cc @@ -63,7 +63,7 @@ int main() image3d<rgb8> ima3d; io::ppms::load(ima3d, files); - mln_assertion(ima3d.nslices() == 2); + mln_assertion(ima3d.nslis() == 2); mln_assertion(slice(ima3d, 0) == ima); mln_assertion(slice(ima3d, 1) == ima2); } -- 1.5.6.5

1 0

last-svn-commit-10-g749308a Various small fixes.
by Guillaume Lazzara 16 Feb '10

16 Feb '10

* doc/tutorial/tutorial.tex: Add more contacts. * mln/accu/label_used.hh: Do not use label<>::next(). * mln/draw/line.hh: Add a fixme. * mln/io/dump/save.hh: Close the file. * mln/io/plot/save.hh: Fix an invalid prototype. * mln/io/pnm/load.hh: Fix an invalid static check. * mln/io/raw/get_header.hh: Fix comment. * mln/labeling/pack.hh: Disable a static check on symbolic values. * mln/math/diff_abs.hh: Add a fixme. * mln/world/inter_pixel/full2image.hh: Use mln_concrete(). * mln/data/fill_with_value.hh, * mln/io/raw/load.hh, * mln/io/raw/save.hh, * mln/labeling/compute.hh, * mln/registration/icp.hh: Aesthetic changes. --- milena/ChangeLog | 30 ++++++++++++++++++++++++++++ milena/doc/tutorial/tutorial.tex | 4 +++ milena/mln/accu/label_used.hh | 5 ++- milena/mln/data/fill_with_value.hh | 3 +- milena/mln/draw/line.hh | 1 + milena/mln/io/dump/save.hh | 3 ++ milena/mln/io/plot/save.hh | 5 ++- milena/mln/io/pnm/load.hh | 3 +- milena/mln/io/raw/get_header.hh | 2 +- milena/mln/io/raw/load.hh | 2 +- milena/mln/io/raw/save.hh | 2 +- milena/mln/labeling/compute.hh | 10 ++++---- milena/mln/labeling/pack.hh | 2 +- milena/mln/math/diff_abs.hh | 5 +++- milena/mln/registration/icp.hh | 3 +- milena/mln/world/inter_pixel/full2image.hh | 4 +- 16 files changed, 65 insertions(+), 19 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 7171949..04b9146 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,35 @@ 2010-02-16 Guillaume Lazzara <z(a)lrde.epita.fr> + Various small fixes. + + * doc/tutorial/tutorial.tex: Add more contacts. + + * mln/accu/label_used.hh: Do not use label<>::next(). + + * mln/draw/line.hh: Add a fixme. + + * mln/io/dump/save.hh: Close the file. + + * mln/io/plot/save.hh: Fix an invalid prototype. + + * mln/io/pnm/load.hh: Fix an invalid static check. + + * mln/io/raw/get_header.hh: Fix comment. + + * mln/labeling/pack.hh: Disable a static check on symbolic values. + + * mln/math/diff_abs.hh: Add a fixme. + + * mln/world/inter_pixel/full2image.hh: Use mln_concrete(). + + * mln/data/fill_with_value.hh, + * mln/io/raw/load.hh, + * mln/io/raw/save.hh, + * mln/labeling/compute.hh, + * mln/registration/icp.hh: Aesthetic changes. + +2010-02-16 Guillaume Lazzara <z(a)lrde.epita.fr> + * mln/topo/skeleton/crest.hh: Fix invalid PSI values for component edge sites. diff --git a/milena/doc/tutorial/tutorial.tex b/milena/doc/tutorial/tutorial.tex index 7ddbb60..5a61461 100644 --- a/milena/doc/tutorial/tutorial.tex +++ b/milena/doc/tutorial/tutorial.tex @@ -545,6 +545,10 @@ If you want to reach us directly, you can contact one of the following people: \begin{itemize} \item Thierry Geraud - Project Manager - thierry.geraud(a)lrde.epita.fr + \item Jonathan Fabrizio - jonathan.fabrizio(a)lrde.epita.fr + \item Yann Jacquelet - yann.jacquelet(a)lrde.epita.fr + \item Guillaume Lazzara - guillaume.lazzara(a)lrde.epita.fr + \item Roland Levillain - roland.levillain(a)lrde.epita.fr \end{itemize} diff --git a/milena/mln/accu/label_used.hh b/milena/mln/accu/label_used.hh index af82cd2..d6d2b20 100644 --- a/milena/mln/accu/label_used.hh +++ b/milena/mln/accu/label_used.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -116,7 +117,7 @@ namespace mln label_used<L>::take(const argument& l) { if (label_used_.size() <= l) - label_used_.resize(l.next(), false); + label_used_.resize(unsigned(l) + 1, false); label_used_(l) = true; } diff --git a/milena/mln/data/fill_with_value.hh b/milena/mln/data/fill_with_value.hh index 8ab0a66..5688ed1 100644 --- a/milena/mln/data/fill_with_value.hh +++ b/milena/mln/data/fill_with_value.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // diff --git a/milena/mln/draw/line.hh b/milena/mln/draw/line.hh index f5cbffb..528dce3 100644 --- a/milena/mln/draw/line.hh +++ b/milena/mln/draw/line.hh @@ -30,6 +30,7 @@ /// \file /// /// Draw a line in an image. +/// \fixme Add specializations for horizontal lines (use pointers/memset). # include <mln/core/concept/image.hh> # include <mln/core/site_set/p_line2d.hh> diff --git a/milena/mln/io/dump/save.hh b/milena/mln/io/dump/save.hh index a361856..7043948 100644 --- a/milena/mln/io/dump/save.hh +++ b/milena/mln/io/dump/save.hh @@ -144,6 +144,9 @@ namespace mln internal::save_header(ima, file); internal::save_data(ima, file); + + file.close(); + trace::exiting("mln::io::dump::save"); } diff --git a/milena/mln/io/plot/save.hh b/milena/mln/io/plot/save.hh index 8010afa..9f38f4b 100644 --- a/milena/mln/io/plot/save.hh +++ b/milena/mln/io/plot/save.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -60,7 +61,7 @@ namespace mln template <typename T> void save(util::array<T>& arr, const std::string& filename, - int start_value = 0); + int start_value); # ifndef MLN_INCLUDE_ONLY diff --git a/milena/mln/io/pnm/load.hh b/milena/mln/io/pnm/load.hh index a48737a..46587df 100644 --- a/milena/mln/io/pnm/load.hh +++ b/milena/mln/io/pnm/load.hh @@ -197,7 +197,8 @@ namespace mln inline void load_raw_2d(std::ifstream& file, I& ima) { - if (sizeof(value::int_u8) == 1) + typedef mln_value(I) V; + if (sizeof(V) == 1) load_raw_2d_contiguous(file, ima); else load_raw_2d_uncontiguous(file, ima); diff --git a/milena/mln/io/raw/get_header.hh b/milena/mln/io/raw/get_header.hh index fa5dbf3..c263cff 100644 --- a/milena/mln/io/raw/get_header.hh +++ b/milena/mln/io/raw/get_header.hh @@ -28,7 +28,7 @@ /// \file /// -/// Load a Milena image rawed into a file. +/// Load a raw image header. # include <iostream> # include <fstream> diff --git a/milena/mln/io/raw/load.hh b/milena/mln/io/raw/load.hh index 7715740..57ca64c 100644 --- a/milena/mln/io/raw/load.hh +++ b/milena/mln/io/raw/load.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory +// Copyright (C) 2010 EPITA Research and Development Laboratory // (LRDE) // // This file is part of Olena. diff --git a/milena/mln/io/raw/save.hh b/milena/mln/io/raw/save.hh index f526e57..8e927f7 100644 --- a/milena/mln/io/raw/save.hh +++ b/milena/mln/io/raw/save.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // diff --git a/milena/mln/labeling/compute.hh b/milena/mln/labeling/compute.hh index 0e74fd7..d29242f 100644 --- a/milena/mln/labeling/compute.hh +++ b/milena/mln/labeling/compute.hh @@ -38,11 +38,11 @@ /// and change 'input' from Image to Site_Set! /// ==> NO, see below. (Z) /// -/// The overload not taking 'input' as argument works on sites and would be a good -/// candidate for set::compute. However, the fact that this version of compute -/// is in the namespace 'labeling' means that it produces several results at the -/// same time for each labels which is not the case of other implementations of -/// compute. +/// The overload not taking 'input' as argument works on sites and +/// would be a good candidate for set::compute. However, the fact that +/// this version of compute is in the namespace 'labeling' means that +/// it produces several results at the same time for each labels which +/// is not the case of other implementations of compute. # include <mln/core/concept/image.hh> # include <mln/core/concept/accumulator.hh> diff --git a/milena/mln/labeling/pack.hh b/milena/mln/labeling/pack.hh index c5e766e..ebf9bb1 100644 --- a/milena/mln/labeling/pack.hh +++ b/milena/mln/labeling/pack.hh @@ -100,7 +100,7 @@ namespace mln pack_tests(const Image& label, mln_value(I)& new_nlabels) { // FIXME: we may want to check that it is exactly a label. - mlc_is_a(mln_value(I), mln::value::Symbolic)::check(); + //mlc_is_a(mln_value(I), mln::value::Symbolic)::check(); mln_precondition(exact(label).is_valid()); (void) label; (void) new_nlabels; diff --git a/milena/mln/math/diff_abs.hh b/milena/mln/math/diff_abs.hh index f5559ff..e0d8edd 100644 --- a/milena/mln/math/diff_abs.hh +++ b/milena/mln/math/diff_abs.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -29,6 +30,8 @@ /// \file /// /// Define diff_abs routine. +/// +/// \fixme Do we want a specific version for vectorial types? namespace mln diff --git a/milena/mln/registration/icp.hh b/milena/mln/registration/icp.hh index ac80fa3..13f9231 100644 --- a/milena/mln/registration/icp.hh +++ b/milena/mln/registration/icp.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // diff --git a/milena/mln/world/inter_pixel/full2image.hh b/milena/mln/world/inter_pixel/full2image.hh index c861a10..db3bcf3 100644 --- a/milena/mln/world/inter_pixel/full2image.hh +++ b/milena/mln/world/inter_pixel/full2image.hh @@ -52,7 +52,7 @@ namespace mln /// \return A classical image without inter-pixel data. // template <typename I> - I + mln_concrete(I) full2image(const Image& input); @@ -60,7 +60,7 @@ namespace mln template <typename I> - I + mln_concrete(I) full2image(const Image& input_) { trace::entering("world::inter_pixel::full2image"); -- 1.5.6.5

1 0