- Olena-patches

last-svn-commit-202-g3273257 Add a specific (temporary) VTK output routine for binary mesh images.
by Roland Levillain 18 Aug '10

18 Aug '10

* apps/mesh-segm-skel/save_bin_alt.hh (mln::io::vtk::save_bin_alt): New function. --- milena/ChangeLog | 7 + milena/apps/mesh-segm-skel/save_bin_alt.hh | 310 +++++++++++++++++++++++++++- 2 files changed, 312 insertions(+), 5 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index c8219e9..d850e40 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,12 @@ 2010-06-24 Roland Levillain <roland(a)lrde.epita.fr> + Add a specific (temporary) VTK output routine for binary mesh images. + + * apps/mesh-segm-skel/save_bin_alt.hh + (mln::io::vtk::save_bin_alt): New function. + +2010-06-24 Roland Levillain <roland(a)lrde.epita.fr> + Exercise mln::io::vtk::save. * tests/io/vtk/save.cc: New. diff --git a/milena/apps/mesh-segm-skel/save_bin_alt.hh b/milena/apps/mesh-segm-skel/save_bin_alt.hh index 034b840..b09fa88 100644 --- a/milena/apps/mesh-segm-skel/save_bin_alt.hh +++ b/milena/apps/mesh-segm-skel/save_bin_alt.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE) // // This file is part of the Milena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -28,10 +28,11 @@ #ifndef APPS_MESH_SEGM_SKEL_SAVE_BIN_ALT_HH # define APPS_MESH_SEGM_SKEL_SAVE_BIN_ALT_HH -/*--------------------------------------------------------------------. -| FIXME: Copied and adjusted (in a hurry) from mln/io/off/save.hh, | -| because fixing image_if + complex_image was much too long. Sorry. | -`--------------------------------------------------------------------*/ +/*-------------------------------------------------------------------. +| FIXME: Copied and adjusted (in a hurry) from mln/io/off/save.hh, | +| and mln/io/vtk/save.hh,because fixing image_if + complex_image was | +| much too long. Sorry. | +`-------------------------------------------------------------------*/ # include <cstdlib> @@ -51,6 +52,10 @@ namespace mln namespace io { + /*------. + | OFF. | + `------*/ + namespace off { @@ -181,6 +186,301 @@ namespace mln } // end of namespace mln::io::off + + /*------. + | VTK. | + `------*/ + + namespace vtk + { + /** FIXME: Similar to + mln::io::vtk::save(const bin_2complex_image3df&, const std::string&), + but does not save faces whose value is `false'. */ + template <typename I> + void save_bin_alt(const I& ima, + const std::string& filename) + { + const std::string me = "mln::io::vtk::save"; + + std::ofstream ostr(filename.c_str()); + if (!ostr) + { + std::cerr << me << ": `" << filename << "' invalid file." + << std::endl; + /* FIXME: Too violent. We should allow the use of + exceptions, at least to have Milena's code behave + correctly in interpreted environments (std::exit() or + std::abort() causes the termination of a Python + interpreter, for instance!). */ + std::exit(1); + } + + /*---------. + | Header. | + `---------*/ + + /* ``The legacy VTK file formats consist of five basic + parts.'' */ + + /* ``1. The first part is the file version and + identifier. This part contains the single line: + + # vtk DataFile Version x.x. + + This line must be exactly as shown with the + exception of the version number x.x, which will vary + with different releases of VTK. (Note: the current + version number is 3.0. Version 1.0 and 2.0 files are + compatible with version 3.0 files.)'' */ + ostr << "# vtk DataFile Version 2.0" << std::endl; + + /* ``2. The second part is the header. The header consists + of a character string terminated by end-of-line + character `\n'. The header is 256 characters + maximum. The header can be used to describe the data + and include any other pertinent information.'' */ + ostr << "Generated by Milena 1.0 http://olena.lrde.epita.fr" + << std::endl; + + /* ``3. The next part is the file format. The file format + describes the type of file, either ASCII or + binary. On this line the single word ASCII or BINARY + must appear.'' */ + ostr << "ASCII" << std::endl; + + /*-------. + | Data. | + `-------*/ + + /* ``4. The fourth part is the dataset structure. The + geometry part describes the geometry and topology of + the dataset. This part begins with a line containing + the keyword DATASET followed by a keyword describing + the type of dataset. Then, depending upon the type + of dataset, other keyword/data combinations define + the actual data.'' + + [...] + + Dataset Format. The Visualization Toolkit supports + five different dataset formats: structured points, + structured grid, rectilinear grid, unstructured + grid, and polygonal data.'' */ + + ostr << "DATASET POLYDATA" << std::endl << std::endl; + + // --------- // + // Complex. // + // --------- // + + static const unsigned D = I::dim; + typedef mln_geom(I) G; + + /* ``* Polygonal Data + The polygonal dataset consists of arbitrary + combinations of surface graphics primitives + vertices (and polyvertices), lines (and + polylines), polygons (of various types), and + triangle strips. Polygonal data is defined by + the POINTS, VERTICES, LINES, POLYGONS, or + TRIANGLE_STRIPS sections. The POINTS definition + is the same as we saw for structured grid + datasets.'' */ + + // ---------------------------- // + // Geometry (point locations). // + // ---------------------------- // + + ostr << "POINTS " + << ima.domain().cplx().template nfaces_of_static_dim<0>() + << " float" << std::endl; + // Iterate on 0-faces (vertices). + p_n_faces_fwd_piter<D, G> v(ima.domain(), 0); + for_all(v) + { + mln_invariant(v.to_site().size() == 1); + ostr << v.to_site().front()[0] << ' ' + << v.to_site().front()[1] << ' ' + << v.to_site().front()[2] << std::endl; + } + ostr << std::endl; + + /* ``The VERTICES, LINES, POLYGONS, or + TRIANGLE_STRIPS keywords define the polygonal + dataset topology. Each of these keywords + requires two parameters: the number of cells `n' + and the size of the cell list `size'. The cell + list size is the total number of integer values + required to represent the list (i.e., sum of + `numPoints' and connectivity indices over each + cell). None of the keywords VERTICES, LINES, + POLYGONS, or TRIANGLE_STRIPS is required.'' */ + + // ---------- // + // Vertices. // + // ---------- // + + /* FIXME: Do not create a VERTICES section if there is no + vertex. + + Likewise, only process vertices having a value attached + to them, i.e., which are part of the domain of the image + (which is different from the complex, upon which the + domain is based). */ + + /* We do not use + + ima.domain().cplx().template nfaces_of_static_dim<N>() + + to get the number of N-faces, since the image may be + masked, and exhibit less N-faces than its underlying + complex. Iterating on the N-faces is safer. */ + /* FIXME: Is there anything faster? See what the interface + of the (morphed) image can provide. */ + unsigned nvertices = 0; + for_all(v) if (ima(v)) + ++nvertices; + + ostr << "VERTICES " << nvertices << ' ' + /* Each vertex requires two numbers: the cardinal of its + ends (which is always 1) and the indices of the point + among the POINTS section. Hence the total number of + values in the VERTEX section is nvertices * 2. */ + << nvertices * 2 << std::endl; + + for_all(v) if (ima(v)) + ostr << "1 " << v.unproxy_().face().face_id() << std::endl; + ostr << std::endl; + + // ------- // + // Edges. // + // ------- // + + /* FIXME: Do not create a LINES section if there is no + edge. + + Likewise, only process edges having a value attached + to them, i.e., which are part of the domain of the image + (which is different from the complex, upon which the + domain is based). */ + + // Same comment as above about the count of N-faces. + unsigned nedges = 0; + p_n_faces_fwd_piter<D, G> e(ima.domain(), 1); + for_all (e) if (ima(e)) + ++nedges; + + ostr << "LINES " << nedges << ' ' + /* Each edge requires three numbers: the cardinal of its + ends (which is always 2) and the indices of these ends + among the POINTS section. Hence the total number of + values in the LINES section is nedges * 3. */ + << nedges * 3 << std::endl; + + // Vertices adjacent to edges. + typedef complex_lower_neighborhood<D, G> adj_vertices_nbh_t; + adj_vertices_nbh_t adj_vertices_nbh; + mln_niter(adj_vertices_nbh_t) adj_v(adj_vertices_nbh, e); + // Iterate on 1-faces (edges). + for_all (e) if (ima(e)) + { + ostr << "2"; + // Iterate on vertices (0-faces). + for_all (adj_v) + { + // FIXME: Accessing the face id is too complicated. + ostr << " " << adj_v.unproxy_().face().face_id(); + } + ostr << std::endl; + } + ostr << std::endl; + + // ---------- // + // Polygons. // + // ---------- // + + /* FIXME: Do not create a POLYGONS section if there is no + polygon. + + Likewise, only process polygons having a value attached + to them, i.e., which are part of the domain of the image + (which is different from the complex, upon which the + domain is based). */ + + // Same comment as above about the count of N-faces. + unsigned npolygons = 0; + p_n_faces_fwd_piter<D, G> p(ima.domain(), 2); + + // FIXME: Merge this loop with the next one. + + for_all (p) if (ima(p)) + ++npolygons; + + // A neighborhood where neighbors are the set of 0-faces + // transitively adjacent to the reference point. + typedef complex_m_face_neighborhood<D, G> nbh_t; + nbh_t nbh; + mln_fwd_niter(nbh_t) u(nbh, p); + /* FIXME: We should be able to pass this value (m) either at + the construction of the neighborhood or at the construction + of the iterator. */ + u.iter().set_m(0); + + /* Compute the number of values (`size') to be passed as + second parameter of the POLYGONS keyword. */ + unsigned polygons_size = 0; + // Iterate on polygons (2-face). + for_all(p) if (ima(p)) + { + unsigned nvertices = 0; + /* FIXME: There may be a faster way to do this (e.g., + the neighbordhood may provide a method returning the + number of P's neighbors. */ + // Iterate on transitively adjacent vertices (0-face). + for_all(u) + ++nvertices; + // The number of values describing this polygon P is the + // cardinal of its set of vertices (1 value) plus the + // NVERTICES indices of these vertices. + polygons_size += 1 + nvertices; + } + ostr << "POLYGONS " << npolygons << ' ' << polygons_size + << std::endl; + + /* Output polygons (one per line), with their number of + vertices and the indices of these vertices. */ + // Iterate on polygons (2-face). + for_all(p) if (ima(p)) + { + unsigned nvertices = 0; + std::ostringstream vertices; + // Iterate on transitively adjacent vertices (0-face). + for_all(u) + { + // FIXME: Likewise, this is a bit too long... + vertices << ' ' << u.unproxy_().face().face_id(); + ++nvertices; + } + ostr << nvertices << vertices.str() << std::endl; + } + + /* ``5. The final part describes the dataset + attributes. This part begins with the keywords + POINT_DATA or CELL_DATA,followed by an integer + number specifying the number of points or cells, + respectively. (It doesn't matter whether POINT_DATA + or CELL_DATA comes first.) Other keyword/data + combinations then define the actual dataset + attribute values (i.e., scalars, vectors, tensors, + normals, texture coordinates, or field data).'' */ + + // FIXME: To do. + + ostr.close(); + } + + } // end of namespace mln::io::vtk + } // end of namespace mln::io } // end of namespace mln -- 1.5.6.5

1 0

last-svn-commit-203-gfc4e4c6 mln/io/vtk/all.hh: New.
by Roland Levillain 18 Aug '10

18 Aug '10

--- milena/ChangeLog | 4 ++++ milena/mln/io/{tiff => vtk}/all.hh | 16 ++++++++-------- 2 files changed, 12 insertions(+), 8 deletions(-) copy milena/mln/io/{tiff => vtk}/all.hh (80%) diff --git a/milena/ChangeLog b/milena/ChangeLog index d850e40..41c681c 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,7 @@ +2010-07-27 Roland Levillain <roland(a)lrde.epita.fr> + + * mln/io/vtk/all.hh: New. + 2010-06-24 Roland Levillain <roland(a)lrde.epita.fr> Add a specific (temporary) VTK output routine for binary mesh images. diff --git a/milena/mln/io/tiff/all.hh b/milena/mln/io/vtk/all.hh similarity index 80% copy from milena/mln/io/tiff/all.hh copy to milena/mln/io/vtk/all.hh index 55e9712..6ff98ce 100644 --- a/milena/mln/io/tiff/all.hh +++ b/milena/mln/io/vtk/all.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. // @@ -23,11 +23,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_TIFF_ALL_HH -# define MLN_IO_TIFF_ALL_HH +#ifndef MLN_IO_VTK_ALL_HH +# define MLN_IO_VTK_ALL_HH /// \file -/// \brief Inclusion of all TIFF I/O routines. +/// \brief Inclusion of all VTK I/O routines. namespace mln @@ -35,12 +35,12 @@ namespace mln namespace io { - /// Namespace of tiff input/output handling. - namespace tiff {} + /// Namespace of vtk input/output handling. + namespace vtk {} } } -# include <mln/io/tiff/load.hh> +# include <mln/io/vtk/save.hh> -#endif // ! MLN_IO_TIFF_ALL_HH +#endif // ! MLN_IO_VTK_ALL_HH -- 1.5.6.5

1 0

last-svn-commit-204-g40e46d9 mln/io/vtk/save.hh: Fix documentation.
by Roland Levillain 18 Aug '10

18 Aug '10

--- milena/ChangeLog | 4 ++++ milena/mln/io/vtk/save.hh | 38 ++++++++++++++++---------------------- 2 files changed, 20 insertions(+), 22 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 41c681c..d27ada3 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,7 @@ +2010-07-28 Roland Levillain <roland(a)lrde.epita.fr> + + * mln/io/vtk/save.hh: Fix documentation. + 2010-07-27 Roland Levillain <roland(a)lrde.epita.fr> * mln/io/vtk/all.hh: New. diff --git a/milena/mln/io/vtk/save.hh b/milena/mln/io/vtk/save.hh index 10c3f0b..2a4a51f 100644 --- a/milena/mln/io/vtk/save.hh +++ b/milena/mln/io/vtk/save.hh @@ -58,41 +58,35 @@ namespace mln /** \brief Save a (binary) VTK image into a complex image. \param[in] ima The image to save. - \param[in] filename The name of the file where to save the image. - - The image is said binary since data represent only the - existence of faces. */ + \param[in] filename The name of the file where to save the + image. + */ void save(const bin_2complex_image3df& ima, const std::string& filename); - /** \brief Save an 8-bit grey-level VTK image into a complex image. + /** \brief Save an 8-bit gray-level VTK image into a complex image. \param[in] ima The image to save. - \param[in] filename The name of the file where to save the image. - - Only data is attached to 2-faces is saved; the VTK file - cannot store data attached to faces of other dimensions. */ + \param[in] filename The name of the file where to save the + image. + */ void save(const int_u8_2complex_image3df& ima, const std::string& filename); - /** \brief Save a floating-point value grey-level VTK image into + /** \brief Save a floating-point value gray-level VTK image into a complex image. \param[in] ima The image to save. - \param[in] filename The name of the file where to save the image. - - Only data is attached to 2-faces is saved; the VTK file - cannot store data attached to faces of other dimensions. */ + \param[in] filename The name of the file where to save the + image. */ void save(const float_2complex_image3df& ima, const std::string& filename); /** \brief Save a 3x8-bit RGB (color) VTK image into a complex image. \param[in] ima The image to save. - \param[in] filename The name of the file where to save the image. - - Only data is attached to 2-faces is saved; the VTK file - cannot store data attached to faces of other dimensions. */ + \param[in] filename The name of the file where to save the + image. */ void save(const rgb8_2complex_image3df& ima, const std::string& filename); @@ -248,7 +242,7 @@ namespace mln parts.'' */ /* ``1. The first part is the file version and - identifier. This part contains the single line: + identifier. This part contains the single line: # vtk DataFile Version x.x. @@ -268,9 +262,9 @@ namespace mln << std::endl; /* ``3. The next part is the file format. The file format - describes the type of file, either ASCII or - binary. On this line the single word ASCII or BINARY - must appear.'' */ + describes the type of file, either ASCII or + binary. On this line the single word ASCII or BINARY + must appear.'' */ ostr << "ASCII" << std::endl; /*-------. -- 1.5.6.5

1 0

last-svn-commit-205-g36067ca Add a VTK output for images of unsigned integers.
by Roland Levillain 18 Aug '10

18 Aug '10

* mln/io/vtk/save.hh (io::vtk::save(const unsigned_2complex_image3df&, const std::string&)): New function. (io::vtk::internal::unsigned_vtk_saver): New structure. * tests/io/vtk/save.cc: Add a tests case for images of unsigneds. * tests/io/vtk/Makefile.am (MOSTLYCLEANFILES): Add save-tetrahedron-unsigned.vtk. --- milena/ChangeLog | 12 ++++++++++++ milena/mln/io/vtk/save.hh | 32 ++++++++++++++++++++++++++++++++ milena/tests/io/vtk/Makefile.am | 1 + milena/tests/io/vtk/save.cc | 9 +++++++++ 4 files changed, 54 insertions(+), 0 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index d27ada3..338ea73 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,17 @@ 2010-07-28 Roland Levillain <roland(a)lrde.epita.fr> + Add a VTK output for images of unsigned integers. + + * mln/io/vtk/save.hh + (io::vtk::save(const unsigned_2complex_image3df&, const std::string&)): + New function. + (io::vtk::internal::unsigned_vtk_saver): New structure. + * tests/io/vtk/save.cc: Add a tests case for images of unsigneds. + * tests/io/vtk/Makefile.am (MOSTLYCLEANFILES): + Add save-tetrahedron-unsigned.vtk. + +2010-07-28 Roland Levillain <roland(a)lrde.epita.fr> + * mln/io/vtk/save.hh: Fix documentation. 2010-07-27 Roland Levillain <roland(a)lrde.epita.fr> diff --git a/milena/mln/io/vtk/save.hh b/milena/mln/io/vtk/save.hh index 2a4a51f..fbe5a85 100644 --- a/milena/mln/io/vtk/save.hh +++ b/milena/mln/io/vtk/save.hh @@ -73,6 +73,14 @@ namespace mln void save(const int_u8_2complex_image3df& ima, const std::string& filename); + /** \brief Save a gray-level VTK image into a complex image. + + \param[in] ima The image to save. + \param[in] filename The name of the file where to save the + image. */ + void save(const unsigned_2complex_image3df& ima, + const std::string& filename); + /** \brief Save a floating-point value gray-level VTK image into a complex image. @@ -127,6 +135,7 @@ namespace mln void write_face_data(std::ostream& ostr, const image& ima) const; }; + struct int_u8_vtk_saver : public vtk_saver< int_u8_2complex_image3df, int_u8_vtk_saver > { @@ -135,6 +144,14 @@ namespace mln }; + struct unsigned_vtk_saver + : public vtk_saver< unsigned_2complex_image3df, unsigned_vtk_saver > + { + /// \brief Save face data. + void write_face_data(std::ostream& ostr, const image& ima) const; + }; + + struct float_vtk_saver : public vtk_saver< float_2complex_image3df, float_vtk_saver > { @@ -177,6 +194,14 @@ namespace mln } void + save(const unsigned_2complex_image3df& ima, const std::string& filename) + { + trace::entering("mln::io::vtk::save"); + internal::unsigned_vtk_saver()(ima, filename); + trace::exiting("mln::io::vtk::save"); + } + + void save(const float_2complex_image3df& ima, const std::string& filename) { trace::entering("mln::io::vtk::save"); @@ -567,6 +592,13 @@ namespace mln } void + unsigned_vtk_saver::write_face_data(std::ostream& ostr, + const image& ima) const + { + write_scalar_data(ostr, ima, "unsigned_int"); + } + + void float_vtk_saver::write_face_data(std::ostream& ostr, const image& ima) const { diff --git a/milena/tests/io/vtk/Makefile.am b/milena/tests/io/vtk/Makefile.am index 3467f78..548f1b5 100644 --- a/milena/tests/io/vtk/Makefile.am +++ b/milena/tests/io/vtk/Makefile.am @@ -25,5 +25,6 @@ TESTS = $(check_PROGRAMS) MOSTLYCLEANFILES = \ save-tetrahedron-bool.vtk \ save-tetrahedron-int_u8.vtk \ + save-tetrahedron-unsigned.vtk \ save-tetrahedron-float.vtk \ save-tetrahedron-rgb8.vtk diff --git a/milena/tests/io/vtk/save.cc b/milena/tests/io/vtk/save.cc index 908636b..5d4a112 100644 --- a/milena/tests/io/vtk/save.cc +++ b/milena/tests/io/vtk/save.cc @@ -73,6 +73,15 @@ main() "save-tetrahedron-int_u8.vtk"); } + // Unsigned integer values. + { + std::vector<unsigned> values(nfaces); + for (unsigned i = 0; i < nfaces; ++i) + values[i] = mln_max(unsigned) / nfaces * i; + io::vtk::save(make_image<unsigned_2complex_image3df>(bin_ima, values), + "save-tetrahedron-unsigned.vtk"); + } + // Floating-point values. { std::vector<float> values(nfaces); -- 1.5.6.5

1 0

last-svn-commit-206-g57d5538 Regen Milena's Makefile helpers.
by Roland Levillain 18 Aug '10

18 Aug '10

* headers.mk, tests/unit_test/unit-tests.mk: Here. --- milena/ChangeLog | 6 ++++++ milena/headers.mk | 2 ++ milena/tests/unit_test/unit-tests.mk | 4 ++++ 3 files changed, 12 insertions(+), 0 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 338ea73..4697665 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,11 @@ 2010-07-28 Roland Levillain <roland(a)lrde.epita.fr> + Regen Milena's Makefile helpers. + + * headers.mk, tests/unit_test/unit-tests.mk: Here. + +2010-07-28 Roland Levillain <roland(a)lrde.epita.fr> + Add a VTK output for images of unsigned integers. * mln/io/vtk/save.hh diff --git a/milena/headers.mk b/milena/headers.mk index 110caa6..06e1d9e 100644 --- a/milena/headers.mk +++ b/milena/headers.mk @@ -686,6 +686,8 @@ mln/io/tiff/all.hh \ mln/io/tiff/load.hh \ mln/io/txt/all.hh \ mln/io/txt/save.hh \ +mln/io/vtk/all.hh \ +mln/io/vtk/save.hh \ mln/labeling/all.hh \ mln/labeling/background.hh \ mln/labeling/blobs.hh \ diff --git a/milena/tests/unit_test/unit-tests.mk b/milena/tests/unit_test/unit-tests.mk index 6a9d5d5..0cd8877 100644 --- a/milena/tests/unit_test/unit-tests.mk +++ b/milena/tests/unit_test/unit-tests.mk @@ -702,6 +702,8 @@ mln_io_ppms_all \ mln_io_ppms_load \ mln_io_txt_all \ mln_io_txt_save \ +mln_io_vtk_all \ +mln_io_vtk_save \ mln_labeling_all \ mln_labeling_background \ mln_labeling_blobs \ @@ -2000,6 +2002,8 @@ mln_io_ppms_all_SOURCES = mln_io_ppms_all.cc mln_io_ppms_load_SOURCES = mln_io_ppms_load.cc mln_io_txt_all_SOURCES = mln_io_txt_all.cc mln_io_txt_save_SOURCES = mln_io_txt_save.cc +mln_io_vtk_all_SOURCES = mln_io_vtk_all.cc +mln_io_vtk_save_SOURCES = mln_io_vtk_save.cc mln_labeling_all_SOURCES = mln_labeling_all.cc mln_labeling_background_SOURCES = mln_labeling_background.cc mln_labeling_blobs_SOURCES = mln_labeling_blobs.cc -- 1.5.6.5

1 0

last-svn-commit-184-g77dbb2b Fix output streams uses.
by Roland Levillain 18 Aug '10

18 Aug '10

* mln/core/concept/value_set.hh (operator<<(std::ostream&, const Value_Set<E>&)) * mln/morpho/tree/data.hh (operator<< (std::ostream&, const tree::data<I, S>&)): Use the stream passed as argument instead of std::cout. * mln/util/fibonacci_heap.hh (mln::util::internal::fibonacci_heap_node::print_): Take an output stream as argument instead of using the standard output. (mln::util::fibonacci_heap::print_): Rename first argument from `cout' to `ostr' prevent confusions with std::cout. * mln/trace/warning.hh (mln::trace::warning): Print warnings on the standard error instead of the standard ourput. --- milena/ChangeLog | 17 ++++++++++++++ milena/mln/core/concept/value_set.hh | 5 ++- milena/mln/morpho/tree/data.hh | 5 ++- milena/mln/trace/warning.hh | 10 ++++---- milena/mln/util/fibonacci_heap.hh | 40 +++++++++++++++++----------------- 5 files changed, 48 insertions(+), 29 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index b4e98cd..dda6e2c 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,20 @@ +2010-07-29 Roland Levillain <roland(a)lrde.epita.fr> + + Fix output streams uses. + + * mln/core/concept/value_set.hh + (operator<<(std::ostream&, const Value_Set<E>&)) + * mln/morpho/tree/data.hh + (operator<< (std::ostream&, const tree::data<I, S>&)): + Use the stream passed as argument instead of std::cout. + * mln/util/fibonacci_heap.hh + (mln::util::internal::fibonacci_heap_node::print_): Take an output + stream as argument instead of using the standard output. + (mln::util::fibonacci_heap::print_): Rename first argument from + `cout' to `ostr' prevent confusions with std::cout. + * mln/trace/warning.hh (mln::trace::warning): Print warnings on + the standard error instead of the standard ourput. + 2010-07-19 Roland Levillain <roland(a)lrde.epita.fr> Fix and improve the Magick++ I/O API wrapper. diff --git a/milena/mln/core/concept/value_set.hh b/milena/mln/core/concept/value_set.hh index 83f9911..b047ab0 100644 --- a/milena/mln/core/concept/value_set.hh +++ b/milena/mln/core/concept/value_set.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2009, 2010 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -104,7 +105,7 @@ namespace mln const E& vs = exact(vs_); ostr << "{ "; for (unsigned i = 0; i < vs.nvalues(); ++i) - std::cout << vs[i] << ' '; + ostr << vs[i] << ' '; return ostr << '}'; } diff --git a/milena/mln/morpho/tree/data.hh b/milena/mln/morpho/tree/data.hh index 91f69ec..1a0c404 100644 --- a/milena/mln/morpho/tree/data.hh +++ b/milena/mln/morpho/tree/data.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. // @@ -744,7 +745,7 @@ namespace mln typename self_t::depth1st_piter n(t); mln_psite(self_t) old; - std::cout << std::endl << "Hierarchy: " << std::endl; + os << std::endl << "Hierarchy: " << std::endl; n.start(); if (!n.is_valid()) diff --git a/milena/mln/trace/warning.hh b/milena/mln/trace/warning.hh index c06fd7f..01a82a2 100644 --- a/milena/mln/trace/warning.hh +++ b/milena/mln/trace/warning.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. // @@ -30,8 +31,8 @@ /// /// Display warning message in trace output. -# include <string> # include <iostream> +# include <string> # include <mln/trace/quiet.hh> @@ -44,14 +45,13 @@ namespace mln void warning(const std::string& message); + # ifndef MLN_INCLUDE_ONLY inline void warning(const std::string& message) { - std::cout << "Warning: " - << message - << std::endl; + std::cerr << "Warning: " << message << std::endl; } # endif // ! MLN_INCLUDE_ONLY diff --git a/milena/mln/util/fibonacci_heap.hh b/milena/mln/util/fibonacci_heap.hh index 9742edf..daec0a1 100644 --- a/milena/mln/util/fibonacci_heap.hh +++ b/milena/mln/util/fibonacci_heap.hh @@ -1,4 +1,4 @@ -// 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. // @@ -87,7 +87,7 @@ namespace mln bool operator==(fibonacci_heap_node<P,T>& rhs); bool operator<(fibonacci_heap_node<P,T>& rhs); - void print_() const; + void print_(std::ostream& ostr) const; private: @@ -164,7 +164,7 @@ namespace mln - std::ostream& print_(std::ostream& cout, + std::ostream& print_(std::ostream& ostr, internal::fibonacci_heap_node<P,T> *tree = 0, internal::fibonacci_heap_node<P,T> *parent = 0) const; @@ -245,7 +245,7 @@ namespace mln template <typename P, typename T> std::ostream& - operator<<(std::ostream& cout, const fibonacci_heap<P,T>& heap); + operator<<(std::ostream& ostr, const fibonacci_heap<P,T>& heap); @@ -453,9 +453,9 @@ namespace mln template <typename P, typename T> inline - void fibonacci_heap_node<P,T>::print_() const + void fibonacci_heap_node<P,T>::print_(std::ostream& ostr) const { - std::cout << value_ << " (" << priority_ << ")"; + ostr << value_ << " (" << priority_ << ")"; } @@ -767,7 +767,7 @@ namespace mln template <typename P, typename T> std::ostream& - fibonacci_heap<P,T>::print_(std::ostream& cout, + fibonacci_heap<P,T>::print_(std::ostream& ostr, internal::fibonacci_heap_node<P,T> *tree, internal::fibonacci_heap_node<P,T> *parent) const { @@ -781,38 +781,38 @@ namespace mln { do { if (temp->left() == 0) - cout << "(left is 0)"; + ostr << "(left is 0)"; temp->print_(); if (temp->parent() != parent) - cout << "(parent is incorrect)"; + ostr << "(parent is incorrect)"; if (temp->right() == 0) - cout << "(right is 0)"; + ostr << "(right is 0)"; else if (temp->right()->left() != temp) - cout << "(Error in left link left) ->"; + ostr << "(Error in left link left) ->"; else - cout << " <-> "; + ostr << " <-> "; temp = temp->right(); } while (temp != 0 && temp != tree); } else - cout << " <empty>" << std::endl; - cout << std::endl; + ostr << " <empty>" << std::endl; + ostr << std::endl; temp = tree; if (temp != 0) { do { - cout << "children of " << temp->value() << ": "; + ostr << "children of " << temp->value() << ": "; if (temp->child() == 0) - cout << "NONE" << std::endl; - else print_(cout, temp->child(), temp); + ostr << "NONE" << std::endl; + else print_(ostr, temp->child(), temp); temp = temp->right(); } while (temp!=0 && temp != tree); } - return cout; + return ostr; } @@ -1029,9 +1029,9 @@ namespace mln template <typename P, typename T> std::ostream& - operator<<(std::ostream& cout, const fibonacci_heap<P,T>& heap) + operator<<(std::ostream& ostr, const fibonacci_heap<P,T>& heap) { - return heap.print_(cout); + return heap.print_(ostr); } # endif // ! MLN_INCLUDE_ONLY -- 1.5.6.5

1 0

branch vtk-format updated: last-svn-commit-206-g57d5538
by git＠lrde.epita.fr 18 Aug '10

18 Aug '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 vtk-format has been updated discards 34deb373040a6d2b7540bb7321bdb5c8615014ef (commit) discards 1ff059f5bd239a640b62f51c995574dc409763d8 (commit) discards 017a21724f24ae85eac87c3f232dc1cd95559e34 (commit) discards ca5bbc85b1e9d1e6308009cb05c7dc5472f85b34 (commit) discards 96628ac3375ac975182cdc77b4d3f3bdc576a508 (commit) discards abe6735ae1da5c2fbc9f41afe58b1fa022828c85 (commit) discards 48804b2fdca668cae3db96ad7dafa4342bbebbea (commit) discards 406da43f0b5897327952a94e253eb5f95ba31256 (commit) discards e5a9aec0a6c54affaeb106da5da05ea4118be2f6 (commit) discards 5e82f8f41121a6f4724fcbe6687673f070c6bf31 (commit) discards dd86adeb2178f0fa89f6183589eba917f7a0e9c1 (commit) discards c68caaf54cabebfd094a596d54fa6517dac6278b (commit) discards ca0ba34f44e7d21d6487865f6a937a6f43a00f7a (commit) discards f452dc6fdc528b2e40112e77a78c577e4504b081 (commit) discards 8a4d99755f78bbf1bab1b7646722a2a840c48c97 (commit) discards 068f539a01aed9ace0a3d95f9fe889816224830e (commit) discards 06265bdd495a0eea3305ff40a345e0243bcff936 (commit) discards daf48e6da1a7cdc3c4d51465b80b66da9f50ec2d (commit) discards b359f8b1bcc79c8f7d1e4f6e22d49d09b82fd983 (commit) discards 0d9aa9caa5fe3bb69389b3d67bb53381f8b807f5 (commit) discards 7bfa2cb0923ff4103685c7c76feaf44fe8165b06 (commit) via 57d5538008bc881e674005421f55b85b43a5125e (commit) via 36067cacfe2dd5f9d10bd2b1218e3964891a6eaa (commit) via 40e46d9a28a4f226b5c147a7b51dd96ad8040afc (commit) via fc4e4c62045e387832086774ed292c0ca22ee341 (commit) via 32732575159e70d55fc3e64c1ee426a7ef86c92d (commit) via 66c20dd71270e547c499df351f14a21e6c02a2db (commit) via ff2781ffbf32eb06e7a6031fef3ccaf50c2bcf13 (commit) via fe65e41b71bd948244982068e7a40613f50f12a6 (commit) via 12ce2023e232ab5615217a77f783a1e3dd63849a (commit) via df4f3212977a532fa23444757d01466c3964d26c (commit) via a3f5d4e5d8e253740e16673b2e6f384423081ef9 (commit) via 927b81a2edcb73dba5f264e483af9d7e39037e54 (commit) via 9cc5a543c24b596decf7c8df5d6c985d73288c58 (commit) via c4ca4394e803cbb0ba5ff363f0fd10283e5cd6aa (commit) via b3b2b53eab7c637a65ff3c3eec4c4c4d2016d0ac (commit) via d854fef29e096fceaac21fa2b63acde098f8985b (commit) via e5d543fcc84c8ea82614830499e9128d68e50a9c (commit) via 7f4d1c26a783e07987255d7b60b2adf642e308fc (commit) via 9d2bc1347dc3fec5f2636aeb05dd7d3dc4bead7e (commit) via 0dc9adda0c01336cd60479567593327c8938d401 (commit) via 43079fc527fdc7e3adac990948afdbbde32a6c5c (commit) via 7233c3ea545d78aafa38776a85d89984dd31f32c (commit) via f45d1c1cec41b960edc80bd9c69f90f87118117f (commit) via eecd7d1ced5f4dfc8d46bccc2edc1dacddbe635e (commit) via c6904964636040aa2cf81dbe4f0c9f26078e8fac (commit) via 565a8acd20101cf22d58b674d4d1695d8e9926c6 (commit) via 7671c7df2acc25243c83131813db612be8a654b2 (commit) via 15a057175710227bdea5a9702dcbf5bd64704a9d (commit) This update added new revisions after undoing existing revisions. That is to say, the old revision is not a strict subset of the new revision. This situation occurs when you --force push a change and generate a repository containing something like this: * -- * -- B -- O -- O -- O (34deb373040a6d2b7540bb7321bdb5c8615014ef) \ N -- N -- N (57d5538008bc881e674005421f55b85b43a5125e) When this happens we assume that you've already had alert emails for all of the O revisions, and so we here report only the revisions in the N branch from the common base, B. Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- 57d5538 Regen Milena's Makefile helpers. 36067ca Add a VTK output for images of unsigned integers. 40e46d9 mln/io/vtk/save.hh: Fix documentation. fc4e4c6 mln/io/vtk/all.hh: New. 3273257 Add a specific (temporary) VTK output routine for binary mesh images. 66c20dd configure.ac: Configure milena/tests/io/vtk/Makefile. ff2781f Exercise mln::io::vtk::save. fe65e41 Start a VTK output for complex-based images. ----------------------------------------------------------------------- Summary of changes: AUTHORS | 12 +- ChangeLog | 10 + m4/swig.m4 | 9 +- milena/ChangeLog | 40 +++++ milena/mln/io/magick/load.hh | 184 +++++++++++--------- milena/mln/io/magick/save.hh | 140 +++++++++------ milena/mln/topo/skeleton/breadth_first_thinning.hh | 55 +++---- milena/sandbox/ChangeLog | 44 +++--- milena/tests/io/magick/Makefile.am | 8 +- milena/tests/io/magick/load.cc | 72 +++++++- milena/tests/io/magick/save.cc | 86 ++++++++-- scribo/ChangeLog | 7 + scribo/src/Makefile.am | 4 +- 13 files changed, 446 insertions(+), 225 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

branch mesh-segm-skel updated: last-svn-commit-198-g12ce202
by git＠lrde.epita.fr 18 Aug '10

18 Aug '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 mesh-segm-skel has been updated discards e5a9aec0a6c54affaeb106da5da05ea4118be2f6 (commit) discards 5e82f8f41121a6f4724fcbe6687673f070c6bf31 (commit) discards dd86adeb2178f0fa89f6183589eba917f7a0e9c1 (commit) discards c68caaf54cabebfd094a596d54fa6517dac6278b (commit) discards ca0ba34f44e7d21d6487865f6a937a6f43a00f7a (commit) discards f452dc6fdc528b2e40112e77a78c577e4504b081 (commit) discards 8a4d99755f78bbf1bab1b7646722a2a840c48c97 (commit) discards 068f539a01aed9ace0a3d95f9fe889816224830e (commit) discards 06265bdd495a0eea3305ff40a345e0243bcff936 (commit) discards daf48e6da1a7cdc3c4d51465b80b66da9f50ec2d (commit) discards b359f8b1bcc79c8f7d1e4f6e22d49d09b82fd983 (commit) discards 0d9aa9caa5fe3bb69389b3d67bb53381f8b807f5 (commit) discards 7bfa2cb0923ff4103685c7c76feaf44fe8165b06 (commit) via 12ce2023e232ab5615217a77f783a1e3dd63849a (commit) via df4f3212977a532fa23444757d01466c3964d26c (commit) via a3f5d4e5d8e253740e16673b2e6f384423081ef9 (commit) via 927b81a2edcb73dba5f264e483af9d7e39037e54 (commit) via 9cc5a543c24b596decf7c8df5d6c985d73288c58 (commit) via c4ca4394e803cbb0ba5ff363f0fd10283e5cd6aa (commit) via b3b2b53eab7c637a65ff3c3eec4c4c4d2016d0ac (commit) via d854fef29e096fceaac21fa2b63acde098f8985b (commit) via e5d543fcc84c8ea82614830499e9128d68e50a9c (commit) via 7f4d1c26a783e07987255d7b60b2adf642e308fc (commit) via 9d2bc1347dc3fec5f2636aeb05dd7d3dc4bead7e (commit) via 0dc9adda0c01336cd60479567593327c8938d401 (commit) via 43079fc527fdc7e3adac990948afdbbde32a6c5c (commit) via 7233c3ea545d78aafa38776a85d89984dd31f32c (commit) via f45d1c1cec41b960edc80bd9c69f90f87118117f (commit) via eecd7d1ced5f4dfc8d46bccc2edc1dacddbe635e (commit) via c6904964636040aa2cf81dbe4f0c9f26078e8fac (commit) via 565a8acd20101cf22d58b674d4d1695d8e9926c6 (commit) via 7671c7df2acc25243c83131813db612be8a654b2 (commit) via 15a057175710227bdea5a9702dcbf5bd64704a9d (commit) This update added new revisions after undoing existing revisions. That is to say, the old revision is not a strict subset of the new revision. This situation occurs when you --force push a change and generate a repository containing something like this: * -- * -- B -- O -- O -- O (e5a9aec0a6c54affaeb106da5da05ea4118be2f6) \ N -- N -- N (12ce2023e232ab5615217a77f783a1e3dd63849a) When this happens we assume that you've already had alert emails for all of the O revisions, and so we here report only the revisions in the N branch from the common base, B. Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- No new revisions were added by this update. ----------------------------------------------------------------------- Summary of changes: AUTHORS | 12 +- ChangeLog | 10 + m4/swig.m4 | 9 +- milena/ChangeLog | 40 +++++ milena/mln/io/magick/load.hh | 184 +++++++++++--------- milena/mln/io/magick/save.hh | 140 +++++++++------ milena/mln/topo/skeleton/breadth_first_thinning.hh | 55 +++---- milena/sandbox/ChangeLog | 44 +++--- milena/tests/io/magick/Makefile.am | 8 +- milena/tests/io/magick/load.cc | 72 +++++++- milena/tests/io/magick/save.cc | 86 ++++++++-- scribo/ChangeLog | 7 + scribo/src/Makefile.am | 4 +- 13 files changed, 446 insertions(+), 225 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

branch next updated: last-svn-commit-183-geecd7d1
by git＠lrde.epita.fr 18 Aug '10

18 Aug '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 next has been updated via eecd7d1ced5f4dfc8d46bccc2edc1dacddbe635e (commit) from c6904964636040aa2cf81dbe4f0c9f26078e8fac (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- No new revisions were added by this update. ----------------------------------------------------------------------- Summary of changes: AUTHORS | 12 ++++++++++-- ChangeLog | 4 ++++ 2 files changed, 14 insertions(+), 2 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

branch fix-ostream-use created: last-svn-commit-184-g77dbb2b
by git＠lrde.epita.fr 18 Aug '10

18 Aug '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 fix-ostream-use has been created at 77dbb2bbcdbadf2867b8052d89de0ef929edee31 (commit) - Log ----------------------------------------------------------------- 77dbb2b Fix output streams uses. ----------------------------------------------------------------------- hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0