URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-11-21 Guillaume Duhamel &lt;guillaume.duhamel(a)lrde.epita.fr&gt; Replace the default viewer by "display". * mln/display/save_and_show.hh, * mln/display/show.hh, * tests/display/save_and_show.cc, * tests/display/show.cc: Replace "xv" by "display" for the default viewer. --- mln/display/save_and_show.hh | 6 +++--- mln/display/show.hh | 8 ++++---- tests/display/save_and_show.cc | 4 ++-- tests/display/show.cc | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) Index: trunk/milena/tests/display/show.cc =================================================================== --- trunk/milena/tests/display/show.cc (revision 1509) +++ trunk/milena/tests/display/show.cc (revision 1510) @@ -69,7 +69,7 @@ { image_if_value<image2d<unsigned> > t = inplace (tmp | i); display::save (t); - display::show (t, "xv", 1); + display::show (t, "display", 1); } // image2d<value::rgb8> color_image (16, 16); @@ -77,7 +77,7 @@ // for (int j = 0; j < 16; ++j) // color_image(point2d(i, j)) = value::rgb8(0,0,255); // display::save (color_image); -// display::show (color_image, "xv"); +// display::show (color_image, "display"); display::remove (); } Index: trunk/milena/tests/display/save_and_show.cc =================================================================== --- trunk/milena/tests/display/save_and_show.cc (revision 1509) +++ trunk/milena/tests/display/save_and_show.cc (revision 1510) @@ -65,11 +65,11 @@ for (unsigned i = 2; i < 6; i += 2) { image_if_value<image2d<unsigned> > t = inplace (tmp | i); - display::save_and_show (t, "xv", 1); + display::save_and_show (t, "display", 1); } /// FIXME: Uncomment this ASAP // image2d<value::rgb8> ima (100, 100); // level::fill(ima, value::rgb8 (0, 0, 255)); -// display::save_and_show (ima, "xv", 1); +// display::save_and_show (ima, "display", 1); } Index: trunk/milena/mln/display/save_and_show.hh =================================================================== --- trunk/milena/mln/display/save_and_show.hh (revision 1509) +++ trunk/milena/mln/display/save_and_show.hh (revision 1510) @@ -49,7 +49,7 @@ * \param[in] input_ the image to show. * \param[in] cmd The string which contains the programm of the * viewer which the user want to display with. By default its - * value is "xv". + * value is "display". * \param[in] time The number of second of * display, 0 display permanently. By default the value is 0. * @@ -58,7 +58,7 @@ */ template <typename I> void - save_and_show(const Image<I>& input_, std::string cmd = "xv", int time = 0); + save_and_show(const Image<I>& input_, std::string cmd = "display", int time = 0); # ifndef MLN_INCLUDE_ONLY @@ -82,7 +82,7 @@ /// Facade. template <typename I> void - save_and_show(const Image<I>& input_, std::string cmd = "xv", int time = 0) + save_and_show(const Image<I>& input_, std::string cmd = "display", int time = 0) { trace::entering("display::save_and_show"); Index: trunk/milena/mln/display/show.hh =================================================================== --- trunk/milena/mln/display/show.hh (revision 1509) +++ trunk/milena/mln/display/show.hh (revision 1510) @@ -31,7 +31,7 @@ /*! \file mln/display/show.hh * * \brief Display the temporary image which has just been saved with - * given viewer (default xv). + * given viewer (default display). */ # include <mln/trait/image_from_mesh.hh> @@ -53,7 +53,7 @@ * \param[in] input_ the image to show. * \param[in] cmd The string which contains the programm of the * viewer which the user want to display with. By default its - * value is "xv". + * value is "display". * \param[in] time The number of second of * display, 0 display permanently. By default the value is 0. * @@ -62,7 +62,7 @@ */ template <typename I> void - show(const Image<I>& input_, std::string cmd = "xv", int time = 0); + show(const Image<I>& input_, std::string cmd = "display", int time = 0); # ifndef MLN_INCLUDE_ONLY @@ -114,7 +114,7 @@ /// Facade. template <typename I> void - show(const Image<I>& input_, std::string cmd = "xv", int time = 0) + show(const Image<I>& input_, std::string cmd = "display", int time = 0) { trace::entering("display::show");