LRE
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
List overview
Download
Olena-patches
April 2011
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
olena-patches@lrde.epita.fr
4 participants
107 discussions
Start a n
N
ew thread
last-svn-commit-705-gdab5d67 mln/io/dicom/load.hh: Fix invalid image loading.
by Guillaume Lazzara
--- milena/ChangeLog | 4 ++++ milena/mln/io/dicom/load.hh | 15 +++++++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 7268baf..994efe7 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,7 @@ +2011-01-27 Guillaume Lazzara <z(a)lrde.epita.fr> + + * mln/io/dicom/load.hh: Fix invalid image loading. + 2011-01-13 Guillaume Lazzara <z(a)lrde.epita.fr> Add more from_to overloads. diff --git a/milena/mln/io/dicom/load.hh b/milena/mln/io/dicom/load.hh index f250a16..1823b18 100644 --- a/milena/mln/io/dicom/load.hh +++ b/milena/mln/io/dicom/load.hh @@ -40,7 +40,6 @@ # include <gdcm-2.0/gdcmDataSet.h> # include <gdcm-2.0/gdcmAttribute.h> - namespace mln { @@ -107,6 +106,9 @@ namespace mln abort(); } + // FIXME: Check image.GetPixelFormat() with mln_value(I) + // quantification. + //gdcm::File &file = r.GetFile(); //gdcm::DataSet& ds = file.GetDataSet(); @@ -132,7 +134,9 @@ namespace mln if (mln_site_(I)::dim != ndims) { - std::cerr << "error: dimension mismatch" << std::endl; + std::cerr << "error: dimension mismatch. Found " + << ndims << " but expected " << mln_site_(I)::dim + << std::endl; abort(); } @@ -155,6 +159,13 @@ namespace mln initialize(ima, result); mln_piter(I) p(ima.domain()); unsigned int index = 0; + + // FIXME: HACK. We may prefer to change the way we access the + // data instead of swapping that information. If swap is not + // performed, the loaded image is rotated and symmetrized. + std::swap(vdims[0], vdims[1]); + + // int k = 0; for_all(p) { index = 0; -- 1.5.6.5
13 years, 8 months
1
0
0
0
last-svn-commit-704-g881edd2 Use int_u16 instead of int_u12.
by Guillaume Lazzara
* igr/segmentation/src/mln_data.cc * igr/segmentation2dt/src/mln_data.cc * igr/shared/src/igr_types.hh * igr/viewer/src/mln_data.cc --- igr/ChangeLog | 9 +++++++++ igr/segmentation/src/mln_data.cc | 8 ++++---- igr/segmentation2dt/src/mln_data.cc | 2 +- igr/shared/src/igr_types.hh | 4 ++-- igr/viewer/src/mln_data.cc | 23 ++++++++++++----------- 5 files changed, 28 insertions(+), 18 deletions(-) diff --git a/igr/ChangeLog b/igr/ChangeLog index f915752..1a38d23 100644 --- a/igr/ChangeLog +++ b/igr/ChangeLog @@ -1,3 +1,12 @@ +2011-01-13 Guillaume Lazzara <z(a)lrde.epita.fr> + + Use int_u16 instead of int_u12. + + * igr/segmentation/src/mln_data.cc + * igr/segmentation2dt/src/mln_data.cc + * igr/shared/src/igr_types.hh + * igr/viewer/src/mln_data.cc + 2010-11-18 Guillaume Lazzara <z(a)lrde.epita.fr> Fix Paths in scripts and build systems. diff --git a/igr/segmentation/src/mln_data.cc b/igr/segmentation/src/mln_data.cc index 0254d98..ca4af30 100644 --- a/igr/segmentation/src/mln_data.cc +++ b/igr/segmentation/src/mln_data.cc @@ -54,7 +54,7 @@ namespace igr void mln_data::load_pgm(const QString& filename) { - image2d<value::int_u12> tmp; + image2d<value::int_u16> tmp; io::pgm::load(tmp, filename.toStdString()); if (!tmp.is_valid()) @@ -81,7 +81,7 @@ namespace igr if (header.dim == 2) { - image2d<value::int_u12> tmp; + image2d<value::int_u16> tmp; io::dicom::load(tmp, filename.toStdString()); if (!tmp.is_valid()) @@ -119,7 +119,7 @@ namespace igr io::dump::dump_header header = io::dump::get_header(filename.toStdString()); - if (header.value_type != "int_u12") + if (header.value_type != "int_u16") { QString msg("Image value type not supported : %1"); msg.arg(header.value_type.c_str()); @@ -129,7 +129,7 @@ namespace igr if (header.dim == 2) { - image2d<value::int_u12> tmp; + image2d<value::int_u16> tmp; io::dump::load(tmp, filename.toStdString()); if (!tmp.is_valid()) diff --git a/igr/segmentation2dt/src/mln_data.cc b/igr/segmentation2dt/src/mln_data.cc index 160363f..b49be39 100644 --- a/igr/segmentation2dt/src/mln_data.cc +++ b/igr/segmentation2dt/src/mln_data.cc @@ -91,7 +91,7 @@ namespace igr io::dump::dump_header header = io::dump::get_header(filename.toStdString()); - if (header.value_type != "int_u12") + if (header.value_type != "int_u16" || header.value_type != "int_u12") { QString msg("Image value type not supported : %1"); msg.arg(header.value_type.c_str()); diff --git a/igr/shared/src/igr_types.hh b/igr/shared/src/igr_types.hh index 5154b6b..6c10b52 100644 --- a/igr/shared/src/igr_types.hh +++ b/igr/shared/src/igr_types.hh @@ -4,7 +4,7 @@ # include <shared/src/color.hh> # include <mln/value/label_16.hh> -# include <mln/value/int_u12.hh> +# include <mln/value/int_u16.hh> # include <mln/value/int_u8.hh> @@ -14,7 +14,7 @@ namespace igr using namespace mln; // Data type of original DICOM files. - typedef value::int_u12 input_data_t; + typedef value::int_u16 input_data_t; // Data type of DICOM images loaded in memories. typedef value::int_u8 input_mem_data_t; diff --git a/igr/viewer/src/mln_data.cc b/igr/viewer/src/mln_data.cc index 4ba3864..e1ae0b1 100644 --- a/igr/viewer/src/mln_data.cc +++ b/igr/viewer/src/mln_data.cc @@ -27,6 +27,7 @@ #include <mln/data/convert.hh> #include <mln/data/stretch.hh> #include <mln/value/int_u8.hh> +#include <mln/value/int_u16.hh> #include <mln/extension/adjust.hh> #include <mln/io/dump/all.hh> @@ -73,7 +74,7 @@ namespace igr void mln_data::load_pgm(const QString& filename) { - image2d<value::int_u12> tmp; + image2d<value::int_u16> tmp; io::pgm::load(tmp, filename.toStdString()); if (!tmp.is_valid()) @@ -100,9 +101,9 @@ namespace igr if (header.dim == 2) { - if (header.value_type == "int_u12") + if (header.value_type == "int_u16") { - image2d<value::int_u12> tmp; + image2d<value::int_u16> tmp; io::raw::load(tmp, filename.toStdString()); if (!tmp.is_valid()) @@ -146,9 +147,9 @@ namespace igr } else if (header.dim == 3) { - if (header.value_type == "int_u12") + if (header.value_type == "int_u16") { - image2d<value::int_u12> tmp; + image2d<value::int_u16> tmp; io::raw::load(tmp, filename.toStdString()); if (!tmp.is_valid()) @@ -211,7 +212,7 @@ namespace igr if (header.dim == 2) { - image2d<value::int_u12> tmp; + image2d<value::int_u16> tmp; io::dicom::load(tmp, filename.toStdString()); if (!tmp.is_valid()) @@ -224,7 +225,7 @@ namespace igr } else if (header.dim == 3) { - image3d<value::int_u12> tmp; + image3d<value::int_u16> tmp; io::dicom::load(tmp, filename.toStdString()); in_ = data::convert(double(), tmp); @@ -254,9 +255,9 @@ namespace igr if (header.dim == 2) { - if (header.value_type == "int_u12") + if (header.value_type == "int_u16") { - image2d<value::int_u12> tmp; + image2d<value::int_u16> tmp; io::dump::load(tmp, filename.toStdString()); if (!tmp.is_valid()) @@ -279,9 +280,9 @@ namespace igr } else if (header.dim == 3) { - if (header.value_type == "int_u12") + if (header.value_type == "int_u16") { - image2d<value::int_u12> tmp; + image2d<value::int_u16> tmp; io::dicom::load(tmp, filename.toStdString()); in_ = make::image3d(data::convert(double(), tmp)); -- 1.5.6.5
13 years, 8 months
1
0
0
0
last-svn-commit-703-g04cf923 Add more from_to overloads.
by Guillaume Lazzara
* mln/convert/from_to.hxx: Add forward declarations. * mln/convert/impl/all.hh: Include from_to_builtins.hh. * mln/convert/impl/from_to_builtins.hh: New. Add new from_to overloads for builtin types. --- milena/ChangeLog | 11 +++ milena/mln/convert/from_to.hxx | 17 ++++- milena/mln/convert/impl/all.hh | 4 +- .../{from_int_to_value.hh => from_to_builtins.hh} | 82 ++++++++------------ 4 files changed, 61 insertions(+), 53 deletions(-) copy milena/mln/convert/impl/{from_int_to_value.hh => from_to_builtins.hh} (56%) diff --git a/milena/ChangeLog b/milena/ChangeLog index 23fa923..7268baf 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,14 @@ +2011-01-13 Guillaume Lazzara <z(a)lrde.epita.fr> + + Add more from_to overloads. + + * mln/convert/from_to.hxx: Add forward declarations. + + * mln/convert/impl/all.hh: Include from_to_builtins.hh. + + * mln/convert/impl/from_to_builtins.hh: New. Add new from_to + overloads for builtin types. + 2010-04-07 Guillaume Lazzara <z(a)lrde.epita.fr> Add an image loader in the anapath GUI. diff --git a/milena/mln/convert/from_to.hxx b/milena/mln/convert/from_to.hxx index cc7cc15..b6ecfc5 100644 --- a/milena/mln/convert/from_to.hxx +++ b/milena/mln/convert/from_to.hxx @@ -1,4 +1,4 @@ -// Copyright (C) 2008, 2009, 2010 EPITA Research and Development +// Copyright (C) 2008, 2009, 2010, 2011 EPITA Research and Development // Laboratory (LRDE) // // This file is part of Olena. @@ -211,6 +211,21 @@ namespace mln template <unsigned n> void from_to_(const value::int_u<n>& from, double& to_); + /// float -> double + template <typename V> + void + from_to(const float& from, double& to); + + /// bool -> double + template <typename V> + void + from_to(const bool& from, double& to); + + /// unsigned -> double + template <typename V> + void + from_to(const unsigned& from, double& to); + // label -> int_u. template <unsigned n> void diff --git a/milena/mln/convert/impl/all.hh b/milena/mln/convert/impl/all.hh index 7c3405b..10a98ed 100644 --- a/milena/mln/convert/impl/all.hh +++ b/milena/mln/convert/impl/all.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009, 2011 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -36,6 +37,7 @@ # include <mln/convert/impl/from_image_to_site_set.hh> # include <mln/convert/impl/from_int_to_value.hh> # include <mln/convert/impl/from_site_set_to_image.hh> +# include <mln/convert/impl/from_to_builtins.hh> # include <mln/convert/impl/from_unsigned_to_value.hh> # include <mln/convert/impl/from_value_to_value.hh> diff --git a/milena/mln/convert/impl/from_int_to_value.hh b/milena/mln/convert/impl/from_to_builtins.hh similarity index 56% copy from milena/mln/convert/impl/from_int_to_value.hh copy to milena/mln/convert/impl/from_to_builtins.hh index 30840b3..ddad7b9 100644 --- a/milena/mln/convert/impl/from_int_to_value.hh +++ b/milena/mln/convert/impl/from_to_builtins.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2011 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -23,89 +23,69 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -#ifndef MLN_CONVERT_IMPL_FROM_INT_TO_VALUE_HH -# define MLN_CONVERT_IMPL_FROM_INT_TO_VALUE_HH +#ifndef MLN_CONVERT_IMPL_FROM_TO_BUILTINS_HH +# define MLN_CONVERT_IMPL_FROM_TO_BUILTINS_HH /// \file /// -/// General conversion procedure from a int to a value. +/// Conversion procedure from builtins to builtins. /// /// \todo Augment code + add checks. -# include <utility> -# include <mln/value/concept/integer.hh> -# include <mln/core/concept/value.hh> -# include <mln/math/round.hh> - - - - namespace mln { namespace convert { - /// Conversion of a int \p from towards a value \p to. + /// Conversion of a float \p from towards a double \p to. + template <typename V> + void + from_to(const float& from, double& to); + + /// Conversion of a bool \p from towards a double \p to. template <typename V> void - from_to(const int& from, Value<V>& to); + from_to(const bool& from, double& to); + + /// Conversion of an unsigned \p from towards a double \p to. + template <typename V> + void + from_to(const unsigned& from, double& to); # ifndef MLN_INCLUDE_ONLY - namespace impl + namespace over_load { - // Case 1: - - template <typename V> - inline - void - from_int_to_value(const int& from, - mln::value::Integer<V>& to) - { - exact(to) = from; - } + // Facades. - // Default: no conversion defined. - template <typename V> + // float->double inline void - from_int_to_value(const int& from, - Value<V>& to) + from_to_(const float& from, double& to) { - mlc_abort(V)::check(); + to = from; } - } // end of namespace mln::convert::impl - - - namespace internal - { - - template <typename V> + // bool->double inline void - from_int_to_value_dispatch(const int& from, Value<V>& to) + from_to_(const bool& from, + double& to) { - impl::from_int_to_value(from, exact(to)); + to = from; } - } // end of namespace mln::convert::internal - - - namespace over_load - { - - // Facades. - // int-> Value - template <typename V> + // unsigned->double + inline void - from_to_(const int& from, Value<V>& to) + from_to_(const unsigned& from, + double& to) { - internal::from_int_to_value_dispatch(from, to); + to = from; } } // end of namespace mln::convert::over_load @@ -117,4 +97,4 @@ namespace mln } // end of namespace mln -#endif // ! MLN_CONVERT_IMPL_FROM_INT_TO_VALUE_HH +#endif // ! MLN_CONVERT_IMPL_FROM_TO_BUILTINS_HH -- 1.5.6.5
13 years, 8 months
1
0
0
0
last-svn-commit-702-g1b4ffab Fix Paths in scripts and build systems.
by Guillaume Lazzara
* segmentation/segmentation.pro, * segmentation/segmentation.sh, * segmentation2dt/segmentation2dt.pro, * segmentation2dt/segmentation2dt.sh, * viewer/viewer.pro: Here. * anapath/anapath.sh: New. --- igr/ChangeLog | 10 ++++++++++ igr/anapath/anapath.sh | 4 ++++ igr/segmentation/segmentation.pro | 2 +- igr/segmentation/segmentation.sh | 2 +- igr/segmentation2dt/segmentation2dt.pro | 4 ++-- igr/segmentation2dt/segmentation2dt.sh | 2 +- igr/viewer/viewer.pro | 2 +- 7 files changed, 20 insertions(+), 6 deletions(-) create mode 100755 igr/anapath/anapath.sh diff --git a/igr/ChangeLog b/igr/ChangeLog index 9298ac3..f915752 100644 --- a/igr/ChangeLog +++ b/igr/ChangeLog @@ -1,3 +1,13 @@ +2010-11-18 Guillaume Lazzara <z(a)lrde.epita.fr> + + Fix Paths in scripts and build systems. + + * segmentation/segmentation.pro, + * segmentation/segmentation.sh, + * segmentation2dt/segmentation2dt.pro, + * segmentation2dt/segmentation2dt.sh, + * viewer/viewer.pro: Here. + 2010-11-16 Guillaume Lazzara <z(a)lrde.epita.fr> Update build system to use MLN_WO_GLOBAL_VARS. diff --git a/igr/anapath/anapath.sh b/igr/anapath/anapath.sh new file mode 100755 index 0000000..b1c0c85 --- /dev/null +++ b/igr/anapath/anapath.sh @@ -0,0 +1,4 @@ +#!/bin/zsh +source ~/.zshrc +/home/inca/olena/igr/anapath/anapath + diff --git a/igr/segmentation/segmentation.pro b/igr/segmentation/segmentation.pro index 4a0f003..743ce04 100644 --- a/igr/segmentation/segmentation.pro +++ b/igr/segmentation/segmentation.pro @@ -5,7 +5,7 @@ TEMPLATE = app TARGET = DEPENDPATH += . src ui -#INCLUDEPATH += . src $(PWD)/../../ $(PWD)/.. $(PWD)/../shared $(OLN)/milena /home/inca/local/include +#INCLUDEPATH += . src $(PWD)/../../ $(PWD)/.. $(PWD)/../shared $(OLN)/milena /home/inca/local/include /usr/local/qwt-5.0.2/include INCLUDEPATH += . src $(PWD)/.. $(PWD)/../shared $(OLN)/milena DEFINES= NDEBUG MLN_WO_GLOBAL_VARS diff --git a/igr/segmentation/segmentation.sh b/igr/segmentation/segmentation.sh index ea2f160..32a8c5c 100755 --- a/igr/segmentation/segmentation.sh +++ b/igr/segmentation/segmentation.sh @@ -1,3 +1,3 @@ #!/bin/zsh source ~/.zshrc -/home/inca/olena/trunk/milena/sandbox/lazzara/igr/gui/segmentation/segmentation +/home/inca/olena/igr/segmentation/segmentation diff --git a/igr/segmentation2dt/segmentation2dt.pro b/igr/segmentation2dt/segmentation2dt.pro index d7ce7e6..69456f1 100644 --- a/igr/segmentation2dt/segmentation2dt.pro +++ b/igr/segmentation2dt/segmentation2dt.pro @@ -5,14 +5,14 @@ TEMPLATE = app TARGET = DEPENDPATH += . src ui -#INCLUDEPATH += . src $(PWD)/../../ $(PWD)/.. $(PWD)/../shared $(OLN)/milena /home/inca/local/include +#INCLUDEPATH += . src $(PWD)/../../ $(PWD)/.. $(PWD)/../shared $(OLN)/milena /home/inca/local/include /usr/local/qwt-5.0.2/include INCLUDEPATH += . src $(PWD)/.. $(PWD)/../shared $(OLN)/milena DEFINES= NDEBUG MLN_WO_GLOBAL_VARS QMAKE_CXX += -O2 -#LIBS += -L/home/inca/local/lib -lgdcmCommon -lgdcmDICT -lgdcmDSED -lgdcmIOD -lgdcmMSFF -lgdcmexpat -lgdcmjpeg12 -lgdcmjpeg16 -lgdcmjpeg8 -lgdcmopenjpeg -lgdcmuuid -lgdcmzlib -lqwt-qt4 +#LIBS += -L/home/inca/local/lib -lgdcmCommon -lgdcmDICT -lgdcmDSED -lgdcmIOD -lgdcmMSFF -lgdcmexpat -lgdcmjpeg12 -lgdcmjpeg16 -lgdcmjpeg8 -lgdcmopenjpeg -lgdcmuuid -lgdcmzlib -L/usr/local/qwt-5.0.2/lib -lqwt LIBS += -lgdcmCommon -lgdcmjpeg12 -lgdcmjpeg16 -lgdcmjpeg8 -lgdcmDICT -lgdcmDSED -lgdcmIOD -lgdcmMSFF -lqwt-qt4 diff --git a/igr/segmentation2dt/segmentation2dt.sh b/igr/segmentation2dt/segmentation2dt.sh index 54b0a37..9ceeeef 100755 --- a/igr/segmentation2dt/segmentation2dt.sh +++ b/igr/segmentation2dt/segmentation2dt.sh @@ -1,4 +1,4 @@ #!/bin/zsh source ~/.zshrc -/home/inca/olena/trunk/milena/sandbox/lazzara/igr/gui/segmentation2dt/segmentation2dt +/home/inca/olena/igr/segmentation2dt/segmentation2dt diff --git a/igr/viewer/viewer.pro b/igr/viewer/viewer.pro index b384b8f..ef01446 100644 --- a/igr/viewer/viewer.pro +++ b/igr/viewer/viewer.pro @@ -6,7 +6,7 @@ TEMPLATE = app TARGET = DEPENDPATH += . src ui INCLUDEPATH += . src ../shared ../ $(OLN)/milena -#INCLUDEPATH += . src ../shared ../ $(OLN)/milena /home/inca/local/include +#INCLUDEPATH += . src ../shared ../ $(OLN) /home/inca/local/include DEFINES= NDEBUG MLN_WO_GLOBAL_VARS -- 1.5.6.5
13 years, 8 months
1
0
0
0
last-svn-commit-701-g722f33d Update build system to use MLN_WO_GLOBAL_VARS.
by Guillaume Lazzara
* anapath/anapath.pro, * anapath/src/main.cc, * anapath/src/mln_data.hh, * anapath/src/mln_widgets.cc, * shared/include/io/magick.hh: Make these files compile with MLN_WO_GLOBAL_VARS set. --- igr/ChangeLog | 11 +++++++++++ igr/anapath/anapath.pro | 28 ++++++++++++++++++++++++---- igr/anapath/src/main.cc | 4 +++- igr/anapath/src/mln_data.hh | 6 +----- igr/anapath/src/mln_widgets.cc | 13 ------------- igr/shared/include/io/magick.hh | 3 +++ 6 files changed, 42 insertions(+), 23 deletions(-) delete mode 100644 igr/anapath/src/mln_widgets.cc diff --git a/igr/ChangeLog b/igr/ChangeLog index 5ea4590..9298ac3 100644 --- a/igr/ChangeLog +++ b/igr/ChangeLog @@ -1,5 +1,16 @@ 2010-11-16 Guillaume Lazzara <z(a)lrde.epita.fr> + Update build system to use MLN_WO_GLOBAL_VARS. + + * anapath/anapath.pro, + * anapath/src/main.cc, + * anapath/src/mln_data.hh, + * anapath/src/mln_widgets.cc, + * shared/include/io/magick.hh: Make these files compile with + MLN_WO_GLOBAL_VARS set. + +2010-11-16 Guillaume Lazzara <z(a)lrde.epita.fr> + Move IGR code from milena/sandbox to igr's private module. * milena/sandbox/lazzara/igr/gui/anapath/anapath.pro, diff --git a/igr/anapath/anapath.pro b/igr/anapath/anapath.pro index 19afbd4..a946d99 100644 --- a/igr/anapath/anapath.pro +++ b/igr/anapath/anapath.pro @@ -9,13 +9,33 @@ INCLUDEPATH += . src $(PWD)/.. $(PWD)/../shared $(OLN)/milena LIBS += `Magick++-config --ldflags --libs` -DEFINES = NDEBUG +DEFINES = NDEBUG MLN_WO_GLOBAL_VARS CONFIG += release # Input -HEADERS += src/main_window.hh ../shared/src/image_viewer.hh ../shared/src/internal/interactive_scene.hh src/tools/filter.hh src/tools/save.hh src/mln_data.hh src/tools/load.hh -FORMS += ui/main_window.ui ../shared/ui/image_viewer.ui -SOURCES += src/mln_widgets.cc ../shared/src/internal/interactive_scene.cc src/main.cc +HEADERS += \ + src/main_window.hh \ + ../shared/src/image_viewer.hh \ + ../shared/src/internal/interactive_scene.hh \ + src/tools/filter.hh \ + src/tools/save.hh \ + src/mln_data.hh \ + src/tools/load.hh + +FORMS += \ + ui/main_window.ui \ + ../shared/ui/image_viewer.ui + +SOURCES += \ + ../shared/src/internal/interactive_scene.cc \ + ../shared/src/image_viewer.cc \ + src/main.cc \ + src/main_window.cc \ + src/tools/filter.cc \ + src/tools/save.cc \ + src/tools/load.cc \ + src/mln_data.cc + RESOURCES = ../shared/shared.qrc diff --git a/igr/anapath/src/main.cc b/igr/anapath/src/main.cc index c17610c..5194c43 100644 --- a/igr/anapath/src/main.cc +++ b/igr/anapath/src/main.cc @@ -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. // @@ -26,6 +27,7 @@ #include <QApplication> #include <QtGui> +#undef MLN_WO_GLOBAL_VARS #include <src/main_window.hh> int main(int argc, char *argv[]) diff --git a/igr/anapath/src/mln_data.hh b/igr/anapath/src/mln_data.hh index d4dadcb..e8befcf 100644 --- a/igr/anapath/src/mln_data.hh +++ b/igr/anapath/src/mln_data.hh @@ -1,10 +1,6 @@ #ifndef IGR_ANAPATH_SRC_MLN_DATA_HH # define IGR_ANAPATH_SRC_MLN_DATA_HH -# ifndef INCLUDE_MLN_FILES -# define MLN_INCLUDE_ONLY -# endif - # include <mln/core/image/image2d.hh> # include <mln/value/rgb8.hh> @@ -19,7 +15,7 @@ namespace igr struct mln_data { - typedef io::magick::large_image<mln::value::rgb8> large_image_t; + typedef io::magick::large_image<mln::value::rgb8> large_image_t; mln_data(); ~mln_data(); diff --git a/igr/anapath/src/mln_widgets.cc b/igr/anapath/src/mln_widgets.cc deleted file mode 100644 index c9e62e1..0000000 --- a/igr/anapath/src/mln_widgets.cc +++ /dev/null @@ -1,13 +0,0 @@ -#define INCLUDE_MLN_FILES - -// Widgets -#include <src/main_window.cc> -#include <shared/src/image_viewer.cc> - -// Tools -#include <src/tools/filter.cc> -#include <src/tools/save.cc> -#include <src/tools/load.cc> - -#include <src/mln_data.cc> - diff --git a/igr/shared/include/io/magick.hh b/igr/shared/include/io/magick.hh index 9de64df..aac73e6 100644 --- a/igr/shared/include/io/magick.hh +++ b/igr/shared/include/io/magick.hh @@ -105,6 +105,7 @@ namespace igr }; + inline std::ostream& operator<<(std::ostream& ostr, const info& i) { if (i.magic != "") @@ -118,6 +119,7 @@ namespace igr // end of io::magick::info + inline info read_info(const std::string& filename, bool quiet = true) { @@ -231,6 +233,7 @@ namespace igr // analyze_tiles + inline void analyze_tiles(const std::string& prefix, const std::string& suffix) -- 1.5.6.5
13 years, 8 months
1
0
0
0
last-svn-commit-700-g8df88e3 Move IGR code from milena/sandbox to igr's private module.
by Guillaume Lazzara
* milena/sandbox/lazzara/igr/gui/anapath/anapath.pro, * milena/sandbox/lazzara/igr/gui/anapath/src/main.cc, * milena/sandbox/lazzara/igr/gui/anapath/src/main_window.cc, * milena/sandbox/lazzara/igr/gui/anapath/src/main_window.hh, * milena/sandbox/lazzara/igr/gui/anapath/src/mln_data.cc, * milena/sandbox/lazzara/igr/gui/anapath/src/mln_data.hh, * milena/sandbox/lazzara/igr/gui/anapath/src/mln_widgets.cc, * milena/sandbox/lazzara/igr/gui/anapath/src/tools/filter.cc, * milena/sandbox/lazzara/igr/gui/anapath/src/tools/filter.hh, * milena/sandbox/lazzara/igr/gui/anapath/src/tools/load.cc, * milena/sandbox/lazzara/igr/gui/anapath/src/tools/load.hh, * milena/sandbox/lazzara/igr/gui/anapath/src/tools/save.cc, * milena/sandbox/lazzara/igr/gui/anapath/src/tools/save.hh, * milena/sandbox/lazzara/igr/gui/anapath/ui/main_window.ui, * milena/sandbox/lazzara/igr/gui/segmentation/segmentation.pro, * milena/sandbox/lazzara/igr/gui/segmentation/segmentation.sh, * milena/sandbox/lazzara/igr/gui/segmentation/src/crop_widget.cc, * milena/sandbox/lazzara/igr/gui/segmentation/src/crop_widget.hh, * milena/sandbox/lazzara/igr/gui/segmentation/src/edit_seg_widget.cc, * milena/sandbox/lazzara/igr/gui/segmentation/src/edit_seg_widget.hh, * milena/sandbox/lazzara/igr/gui/segmentation/src/load_widget.cc, * milena/sandbox/lazzara/igr/gui/segmentation/src/load_widget.hh, * milena/sandbox/lazzara/igr/gui/segmentation/src/main.cc, * milena/sandbox/lazzara/igr/gui/segmentation/src/main_window.cc, * milena/sandbox/lazzara/igr/gui/segmentation/src/main_window.hh, * milena/sandbox/lazzara/igr/gui/segmentation/src/mln_data.cc, * milena/sandbox/lazzara/igr/gui/segmentation/src/mln_data.hh, * milena/sandbox/lazzara/igr/gui/segmentation/src/mln_widgets.cc, * milena/sandbox/lazzara/igr/gui/segmentation/src/save_widget.cc, * milena/sandbox/lazzara/igr/gui/segmentation/src/save_widget.hh, * milena/sandbox/lazzara/igr/gui/segmentation/src/seg_widget.cc, * milena/sandbox/lazzara/igr/gui/segmentation/src/seg_widget.hh, * milena/sandbox/lazzara/igr/gui/segmentation/src/task.hh, * milena/sandbox/lazzara/igr/gui/segmentation/src/task_handler.cc, * milena/sandbox/lazzara/igr/gui/segmentation/src/task_handler.hh, * milena/sandbox/lazzara/igr/gui/segmentation/src/task_handler.hxx, * milena/sandbox/lazzara/igr/gui/segmentation/src/task_widget.cc, * milena/sandbox/lazzara/igr/gui/segmentation/src/task_widget.hh, * milena/sandbox/lazzara/igr/gui/segmentation/src/tools/crop.cc, * milena/sandbox/lazzara/igr/gui/segmentation/src/tools/crop.hh, * milena/sandbox/lazzara/igr/gui/segmentation/src/tools/edit_seg.cc, * milena/sandbox/lazzara/igr/gui/segmentation/src/tools/edit_seg.hh, * milena/sandbox/lazzara/igr/gui/segmentation/src/tools/load.cc, * milena/sandbox/lazzara/igr/gui/segmentation/src/tools/load.hh, * milena/sandbox/lazzara/igr/gui/segmentation/src/tools/save.cc, * milena/sandbox/lazzara/igr/gui/segmentation/src/tools/save.hh, * milena/sandbox/lazzara/igr/gui/segmentation/src/tools/seg.cc, * milena/sandbox/lazzara/igr/gui/segmentation/src/tools/seg.hh, * milena/sandbox/lazzara/igr/gui/segmentation/ui/crop_widget.ui, * milena/sandbox/lazzara/igr/gui/segmentation/ui/edit_seg_widget.ui, * milena/sandbox/lazzara/igr/gui/segmentation/ui/load_widget.ui, * milena/sandbox/lazzara/igr/gui/segmentation/ui/main_window.ui, * milena/sandbox/lazzara/igr/gui/segmentation/ui/save_widget.ui, * milena/sandbox/lazzara/igr/gui/segmentation/ui/seg_widget.ui, * milena/sandbox/lazzara/igr/gui/segmentation2dt/segmentation2dt.pro, * milena/sandbox/lazzara/igr/gui/segmentation2dt/segmentation2dt.sh, * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/crop_widget.cc, * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/crop_widget.hh, * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/load_widget.cc, * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/load_widget.hh, * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/main.cc, * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/main_window.cc, * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/main_window.hh, * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/mean_regions_widget.cc, * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/mean_regions_widget.hh, * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/mln_data.cc, * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/mln_data.hh, * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/mln_widgets.cc, * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/norm_smooth_widget.cc, * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/norm_smooth_widget.hh, * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/plot.cc, * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/plot.hh, * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/plot_widget.cc, * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/plot_widget.hh, * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/ref_mean_widget.cc, * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/ref_mean_widget.hh, * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/save_widget.cc, * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/save_widget.hh, * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/seg_widget.cc, * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/seg_widget.hh, * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/task.hh, * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/task_handler.cc, * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/task_handler.hh, * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/task_handler.hxx, * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/task_widget.cc, * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/task_widget.hh, * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/crop.cc, * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/crop.hh, * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/load.cc, * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/load.hh, * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/mean_regions.cc, * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/mean_regions.hh, * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/norm_smooth.cc, * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/norm_smooth.hh, * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/ref_mean.cc, * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/ref_mean.hh, * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/save.cc, * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/save.hh, * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/seg.cc, * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/seg.hh, * milena/sandbox/lazzara/igr/gui/segmentation2dt/ui/crop_widget.ui, * milena/sandbox/lazzara/igr/gui/segmentation2dt/ui/edit_seg_widget.ui, * milena/sandbox/lazzara/igr/gui/segmentation2dt/ui/load_widget.ui, * milena/sandbox/lazzara/igr/gui/segmentation2dt/ui/main_window.ui, * milena/sandbox/lazzara/igr/gui/segmentation2dt/ui/mean_regions_widget.ui, * milena/sandbox/lazzara/igr/gui/segmentation2dt/ui/norm_smooth_widget.ui, * milena/sandbox/lazzara/igr/gui/segmentation2dt/ui/plot_widget.ui, * milena/sandbox/lazzara/igr/gui/segmentation2dt/ui/ref_mean_widget.ui, * milena/sandbox/lazzara/igr/gui/segmentation2dt/ui/save_widget.ui, * milena/sandbox/lazzara/igr/gui/segmentation2dt/ui/seg_widget.ui, * milena/sandbox/lazzara/igr/gui/shared/icons/Symbols-Delete-icon.png, * milena/sandbox/lazzara/igr/gui/shared/icons/accept-icon.png, * milena/sandbox/lazzara/igr/gui/shared/icons/close.gif, * milena/sandbox/lazzara/igr/gui/shared/icons/crop-icon.png, * milena/sandbox/lazzara/igr/gui/shared/icons/image-add-icon.png, * milena/sandbox/lazzara/igr/gui/shared/icons/image-edit-icon.png, * milena/sandbox/lazzara/igr/gui/shared/icons/image-multi-icon.png, * milena/sandbox/lazzara/igr/gui/shared/icons/image-next-icon.png, * milena/sandbox/lazzara/igr/gui/shared/icons/image-remove-icon.png, * milena/sandbox/lazzara/igr/gui/shared/icons/next-icon.png, * milena/sandbox/lazzara/igr/gui/shared/icons/page-down-icon.png, * milena/sandbox/lazzara/igr/gui/shared/icons/page-search-icon.png, * milena/sandbox/lazzara/igr/gui/shared/icons/search-add-icon.png, * milena/sandbox/lazzara/igr/gui/shared/icons/search-remove-icon.png, * milena/sandbox/lazzara/igr/gui/shared/include/find_color.hh, * milena/sandbox/lazzara/igr/gui/shared/include/function_means.hh, * milena/sandbox/lazzara/igr/gui/shared/include/io/magick.hh, * milena/sandbox/lazzara/igr/gui/shared/include/mean_function_per_region.hh, * milena/sandbox/lazzara/igr/gui/shared/include/mean_regions.hh, * milena/sandbox/lazzara/igr/gui/shared/include/normalization.hh, * milena/sandbox/lazzara/igr/gui/shared/include/time_segmentation.hh, * milena/sandbox/lazzara/igr/gui/shared/include/time_smooth_linear.hh, * milena/sandbox/lazzara/igr/gui/shared/include/time_smooth_median.hh, * milena/sandbox/lazzara/igr/gui/shared/include/time_smooth_morpho.hh, * milena/sandbox/lazzara/igr/gui/shared/shared.qrc, * milena/sandbox/lazzara/igr/gui/shared/src/color.hh, * milena/sandbox/lazzara/igr/gui/shared/src/igr_types.hh, * milena/sandbox/lazzara/igr/gui/shared/src/image_viewer.cc, * milena/sandbox/lazzara/igr/gui/shared/src/image_viewer.hh, * milena/sandbox/lazzara/igr/gui/shared/src/internal/interactive_scene.cc, * milena/sandbox/lazzara/igr/gui/shared/src/internal/interactive_scene.hh, * milena/sandbox/lazzara/igr/gui/shared/ui/image_viewer.ui, * milena/sandbox/lazzara/igr/gui/viewer/src/main.cc, * milena/sandbox/lazzara/igr/gui/viewer/src/main_window.cc, * milena/sandbox/lazzara/igr/gui/viewer/src/main_window.hh, * milena/sandbox/lazzara/igr/gui/viewer/src/mln_data.cc, * milena/sandbox/lazzara/igr/gui/viewer/src/mln_data.hh, * milena/sandbox/lazzara/igr/gui/viewer/ui/main_window.h, * milena/sandbox/lazzara/igr/gui/viewer/ui/main_window.ui, * milena/sandbox/lazzara/igr/gui/viewer/viewer.pro, * milena/sandbox/lazzara/igr/gui/viewer/viewer.sh: Move... * igr/anapath/anapath.pro, * igr/anapath/src/main.cc, * igr/anapath/src/main_window.cc, * igr/anapath/src/main_window.hh, * igr/anapath/src/mln_data.cc, * igr/anapath/src/mln_data.hh, * igr/anapath/src/mln_widgets.cc, * igr/anapath/src/tools/filter.cc, * igr/anapath/src/tools/filter.hh, * igr/anapath/src/tools/load.cc, * igr/anapath/src/tools/load.hh, * igr/anapath/src/tools/save.cc, * igr/anapath/src/tools/save.hh, * igr/anapath/ui/main_window.ui, * igr/segmentation/segmentation.pro, * igr/segmentation/segmentation.sh, * igr/segmentation/src/crop_widget.cc, * igr/segmentation/src/crop_widget.hh, * igr/segmentation/src/edit_seg_widget.cc, * igr/segmentation/src/edit_seg_widget.hh, * igr/segmentation/src/load_widget.cc, * igr/segmentation/src/load_widget.hh, * igr/segmentation/src/main.cc, * igr/segmentation/src/main_window.cc, * igr/segmentation/src/main_window.hh, * igr/segmentation/src/mln_data.cc, * igr/segmentation/src/mln_data.hh, * igr/segmentation/src/mln_widgets.cc, * igr/segmentation/src/save_widget.cc, * igr/segmentation/src/save_widget.hh, * igr/segmentation/src/seg_widget.cc, * igr/segmentation/src/seg_widget.hh, * igr/segmentation/src/task.hh, * igr/segmentation/src/task_handler.cc, * igr/segmentation/src/task_handler.hh, * igr/segmentation/src/task_handler.hxx, * igr/segmentation/src/task_widget.cc, * igr/segmentation/src/task_widget.hh, * igr/segmentation/src/tools/crop.cc, * igr/segmentation/src/tools/crop.hh, * igr/segmentation/src/tools/edit_seg.cc, * igr/segmentation/src/tools/edit_seg.hh, * igr/segmentation/src/tools/load.cc, * igr/segmentation/src/tools/load.hh, * igr/segmentation/src/tools/save.cc, * igr/segmentation/src/tools/save.hh, * igr/segmentation/src/tools/seg.cc, * igr/segmentation/src/tools/seg.hh, * igr/segmentation/ui/crop_widget.ui, * igr/segmentation/ui/edit_seg_widget.ui, * igr/segmentation/ui/load_widget.ui, * igr/segmentation/ui/main_window.ui, * igr/segmentation/ui/save_widget.ui, * igr/segmentation/ui/seg_widget.ui, * igr/segmentation2dt/segmentation2dt.pro, * igr/segmentation2dt/segmentation2dt.sh, * igr/segmentation2dt/src/crop_widget.cc, * igr/segmentation2dt/src/crop_widget.hh, * igr/segmentation2dt/src/load_widget.cc, * igr/segmentation2dt/src/load_widget.hh, * igr/segmentation2dt/src/main.cc, * igr/segmentation2dt/src/main_window.cc, * igr/segmentation2dt/src/main_window.hh, * igr/segmentation2dt/src/mean_regions_widget.cc, * igr/segmentation2dt/src/mean_regions_widget.hh, * igr/segmentation2dt/src/mln_data.cc, * igr/segmentation2dt/src/mln_data.hh, * igr/segmentation2dt/src/mln_widgets.cc, * igr/segmentation2dt/src/norm_smooth_widget.cc, * igr/segmentation2dt/src/norm_smooth_widget.hh, * igr/segmentation2dt/src/plot.cc, * igr/segmentation2dt/src/plot.hh, * igr/segmentation2dt/src/plot_widget.cc, * igr/segmentation2dt/src/plot_widget.hh, * igr/segmentation2dt/src/ref_mean_widget.cc, * igr/segmentation2dt/src/ref_mean_widget.hh, * igr/segmentation2dt/src/save_widget.cc, * igr/segmentation2dt/src/save_widget.hh, * igr/segmentation2dt/src/seg_widget.cc, * igr/segmentation2dt/src/seg_widget.hh, * igr/segmentation2dt/src/task.hh, * igr/segmentation2dt/src/task_handler.cc, * igr/segmentation2dt/src/task_handler.hh, * igr/segmentation2dt/src/task_handler.hxx, * igr/segmentation2dt/src/task_widget.cc, * igr/segmentation2dt/src/task_widget.hh, * igr/segmentation2dt/src/tools/crop.cc, * igr/segmentation2dt/src/tools/crop.hh, * igr/segmentation2dt/src/tools/load.cc, * igr/segmentation2dt/src/tools/load.hh, * igr/segmentation2dt/src/tools/mean_regions.cc, * igr/segmentation2dt/src/tools/mean_regions.hh, * igr/segmentation2dt/src/tools/norm_smooth.cc, * igr/segmentation2dt/src/tools/norm_smooth.hh, * igr/segmentation2dt/src/tools/ref_mean.cc, * igr/segmentation2dt/src/tools/ref_mean.hh, * igr/segmentation2dt/src/tools/save.cc, * igr/segmentation2dt/src/tools/save.hh, * igr/segmentation2dt/src/tools/seg.cc, * igr/segmentation2dt/src/tools/seg.hh, * igr/segmentation2dt/ui/crop_widget.ui, * igr/segmentation2dt/ui/edit_seg_widget.ui, * igr/segmentation2dt/ui/load_widget.ui, * igr/segmentation2dt/ui/main_window.ui, * igr/segmentation2dt/ui/mean_regions_widget.ui, * igr/segmentation2dt/ui/norm_smooth_widget.ui, * igr/segmentation2dt/ui/plot_widget.ui, * igr/segmentation2dt/ui/ref_mean_widget.ui, * igr/segmentation2dt/ui/save_widget.ui, * igr/segmentation2dt/ui/seg_widget.ui, * igr/shared/icons/Symbols-Delete-icon.png, * igr/shared/icons/accept-icon.png, * igr/shared/icons/close.gif, * igr/shared/icons/crop-icon.png, * igr/shared/icons/image-add-icon.png, * igr/shared/icons/image-edit-icon.png, * igr/shared/icons/image-multi-icon.png, * igr/shared/icons/image-next-icon.png, * igr/shared/icons/image-remove-icon.png, * igr/shared/icons/next-icon.png, * igr/shared/icons/page-down-icon.png, * igr/shared/icons/page-search-icon.png, * igr/shared/icons/search-add-icon.png, * igr/shared/icons/search-remove-icon.png, * igr/shared/include/find_color.hh, * igr/shared/include/function_means.hh, * igr/shared/include/io/magick.hh, * igr/shared/include/mean_function_per_region.hh, * igr/shared/include/mean_regions.hh, * igr/shared/include/normalization.hh, * igr/shared/include/time_segmentation.hh, * igr/shared/include/time_smooth_linear.hh, * igr/shared/include/time_smooth_median.hh, * igr/shared/include/time_smooth_morpho.hh, * igr/shared/shared.qrc, * igr/shared/src/color.hh, * igr/shared/src/igr_types.hh, * igr/shared/src/image_viewer.cc, * igr/shared/src/image_viewer.hh, * igr/shared/src/internal/interactive_scene.cc, * igr/shared/src/internal/interactive_scene.hh, * igr/shared/ui/image_viewer.ui, * igr/viewer/src/main.cc, * igr/viewer/src/main_window.cc, * igr/viewer/src/main_window.hh, * igr/viewer/src/mln_data.cc, * igr/viewer/src/mln_data.hh, * igr/viewer/ui/main_window.h, * igr/viewer/ui/main_window.ui, * igr/viewer/viewer.pro, * igr/viewer/viewer.sh: ... here. --- igr/ChangeLog | 317 ++++++++++++++++++++ .../lazzara/igr/gui => igr}/anapath/anapath.pro | 0 .../lazzara/igr/gui => igr}/anapath/src/main.cc | 0 .../igr/gui => igr}/anapath/src/main_window.cc | 0 .../igr/gui => igr}/anapath/src/main_window.hh | 0 .../igr/gui => igr}/anapath/src/mln_data.cc | 0 .../igr/gui => igr}/anapath/src/mln_data.hh | 0 .../igr/gui => igr}/anapath/src/mln_widgets.cc | 0 .../igr/gui => igr}/anapath/src/tools/filter.cc | 0 .../igr/gui => igr}/anapath/src/tools/filter.hh | 0 .../igr/gui => igr}/anapath/src/tools/load.cc | 0 .../igr/gui => igr}/anapath/src/tools/load.hh | 0 .../igr/gui => igr}/anapath/src/tools/save.cc | 0 .../igr/gui => igr}/anapath/src/tools/save.hh | 0 .../igr/gui => igr}/anapath/ui/main_window.ui | 0 .../igr/gui => igr}/segmentation/segmentation.pro | 0 .../igr/gui => igr}/segmentation/segmentation.sh | 0 .../gui => igr}/segmentation/src/crop_widget.cc | 0 .../gui => igr}/segmentation/src/crop_widget.hh | 0 .../segmentation/src/edit_seg_widget.cc | 0 .../segmentation/src/edit_seg_widget.hh | 0 .../gui => igr}/segmentation/src/load_widget.cc | 0 .../gui => igr}/segmentation/src/load_widget.hh | 0 .../igr/gui => igr}/segmentation/src/main.cc | 0 .../gui => igr}/segmentation/src/main_window.cc | 0 .../gui => igr}/segmentation/src/main_window.hh | 0 .../igr/gui => igr}/segmentation/src/mln_data.cc | 0 .../igr/gui => igr}/segmentation/src/mln_data.hh | 0 .../gui => igr}/segmentation/src/mln_widgets.cc | 0 .../gui => igr}/segmentation/src/save_widget.cc | 0 .../gui => igr}/segmentation/src/save_widget.hh | 0 .../igr/gui => igr}/segmentation/src/seg_widget.cc | 0 .../igr/gui => igr}/segmentation/src/seg_widget.hh | 0 .../igr/gui => igr}/segmentation/src/task.hh | 0 .../gui => igr}/segmentation/src/task_handler.cc | 0 .../gui => igr}/segmentation/src/task_handler.hh | 0 .../gui => igr}/segmentation/src/task_handler.hxx | 0 .../gui => igr}/segmentation/src/task_widget.cc | 0 .../gui => igr}/segmentation/src/task_widget.hh | 0 .../igr/gui => igr}/segmentation/src/tools/crop.cc | 0 .../igr/gui => igr}/segmentation/src/tools/crop.hh | 0 .../gui => igr}/segmentation/src/tools/edit_seg.cc | 0 .../gui => igr}/segmentation/src/tools/edit_seg.hh | 0 .../igr/gui => igr}/segmentation/src/tools/load.cc | 0 .../igr/gui => igr}/segmentation/src/tools/load.hh | 0 .../igr/gui => igr}/segmentation/src/tools/save.cc | 0 .../igr/gui => igr}/segmentation/src/tools/save.hh | 0 .../igr/gui => igr}/segmentation/src/tools/seg.cc | 0 .../igr/gui => igr}/segmentation/src/tools/seg.hh | 0 .../igr/gui => igr}/segmentation/ui/crop_widget.ui | 0 .../gui => igr}/segmentation/ui/edit_seg_widget.ui | 0 .../igr/gui => igr}/segmentation/ui/load_widget.ui | 0 .../igr/gui => igr}/segmentation/ui/main_window.ui | 0 .../igr/gui => igr}/segmentation/ui/save_widget.ui | 0 .../igr/gui => igr}/segmentation/ui/seg_widget.ui | 0 .../segmentation2dt/segmentation2dt.pro | 0 .../gui => igr}/segmentation2dt/segmentation2dt.sh | 0 .../gui => igr}/segmentation2dt/src/crop_widget.cc | 0 .../gui => igr}/segmentation2dt/src/crop_widget.hh | 0 .../gui => igr}/segmentation2dt/src/load_widget.cc | 0 .../gui => igr}/segmentation2dt/src/load_widget.hh | 0 .../igr/gui => igr}/segmentation2dt/src/main.cc | 0 .../gui => igr}/segmentation2dt/src/main_window.cc | 0 .../gui => igr}/segmentation2dt/src/main_window.hh | 0 .../segmentation2dt/src/mean_regions_widget.cc | 0 .../segmentation2dt/src/mean_regions_widget.hh | 0 .../gui => igr}/segmentation2dt/src/mln_data.cc | 0 .../gui => igr}/segmentation2dt/src/mln_data.hh | 0 .../gui => igr}/segmentation2dt/src/mln_widgets.cc | 0 .../segmentation2dt/src/norm_smooth_widget.cc | 0 .../segmentation2dt/src/norm_smooth_widget.hh | 0 .../igr/gui => igr}/segmentation2dt/src/plot.cc | 0 .../igr/gui => igr}/segmentation2dt/src/plot.hh | 0 .../gui => igr}/segmentation2dt/src/plot_widget.cc | 0 .../gui => igr}/segmentation2dt/src/plot_widget.hh | 0 .../segmentation2dt/src/ref_mean_widget.cc | 0 .../segmentation2dt/src/ref_mean_widget.hh | 0 .../gui => igr}/segmentation2dt/src/save_widget.cc | 0 .../gui => igr}/segmentation2dt/src/save_widget.hh | 0 .../gui => igr}/segmentation2dt/src/seg_widget.cc | 0 .../gui => igr}/segmentation2dt/src/seg_widget.hh | 0 .../igr/gui => igr}/segmentation2dt/src/task.hh | 0 .../segmentation2dt/src/task_handler.cc | 0 .../segmentation2dt/src/task_handler.hh | 0 .../segmentation2dt/src/task_handler.hxx | 0 .../gui => igr}/segmentation2dt/src/task_widget.cc | 0 .../gui => igr}/segmentation2dt/src/task_widget.hh | 0 .../gui => igr}/segmentation2dt/src/tools/crop.cc | 0 .../gui => igr}/segmentation2dt/src/tools/crop.hh | 0 .../gui => igr}/segmentation2dt/src/tools/load.cc | 0 .../gui => igr}/segmentation2dt/src/tools/load.hh | 0 .../segmentation2dt/src/tools/mean_regions.cc | 0 .../segmentation2dt/src/tools/mean_regions.hh | 0 .../segmentation2dt/src/tools/norm_smooth.cc | 0 .../segmentation2dt/src/tools/norm_smooth.hh | 0 .../segmentation2dt/src/tools/ref_mean.cc | 0 .../segmentation2dt/src/tools/ref_mean.hh | 0 .../gui => igr}/segmentation2dt/src/tools/save.cc | 0 .../gui => igr}/segmentation2dt/src/tools/save.hh | 0 .../gui => igr}/segmentation2dt/src/tools/seg.cc | 0 .../gui => igr}/segmentation2dt/src/tools/seg.hh | 0 .../gui => igr}/segmentation2dt/ui/crop_widget.ui | 0 .../segmentation2dt/ui/edit_seg_widget.ui | 0 .../gui => igr}/segmentation2dt/ui/load_widget.ui | 0 .../gui => igr}/segmentation2dt/ui/main_window.ui | 0 .../segmentation2dt/ui/mean_regions_widget.ui | 0 .../segmentation2dt/ui/norm_smooth_widget.ui | 0 .../gui => igr}/segmentation2dt/ui/plot_widget.ui | 0 .../segmentation2dt/ui/ref_mean_widget.ui | 0 .../gui => igr}/segmentation2dt/ui/save_widget.ui | 0 .../gui => igr}/segmentation2dt/ui/seg_widget.ui | 0 .../shared/icons/Symbols-Delete-icon.png | Bin 3704 -> 3704 bytes .../igr/gui => igr}/shared/icons/accept-icon.png | Bin 4858 -> 4858 bytes .../lazzara/igr/gui => igr}/shared/icons/close.gif | Bin 340 -> 340 bytes .../igr/gui => igr}/shared/icons/crop-icon.png | Bin 228 -> 228 bytes .../gui => igr}/shared/icons/image-add-icon.png | Bin 2917 -> 2917 bytes .../gui => igr}/shared/icons/image-edit-icon.png | Bin 2305 -> 2305 bytes .../gui => igr}/shared/icons/image-multi-icon.png | Bin 2033 -> 2033 bytes .../gui => igr}/shared/icons/image-next-icon.png | Bin 3008 -> 3008 bytes .../gui => igr}/shared/icons/image-remove-icon.png | Bin 3127 -> 3127 bytes .../igr/gui => igr}/shared/icons/next-icon.png | Bin 4611 -> 4611 bytes .../gui => igr}/shared/icons/page-down-icon.png | Bin 3450 -> 3450 bytes .../gui => igr}/shared/icons/page-search-icon.png | Bin 3101 -> 3101 bytes .../gui => igr}/shared/icons/search-add-icon.png | Bin 4274 -> 4274 bytes .../shared/icons/search-remove-icon.png | Bin 4196 -> 4196 bytes .../igr/gui => igr}/shared/include/find_color.hh | 0 .../gui => igr}/shared/include/function_means.hh | 0 .../igr/gui => igr}/shared/include/io/magick.hh | 0 .../shared/include/mean_function_per_region.hh | 0 .../igr/gui => igr}/shared/include/mean_regions.hh | 0 .../gui => igr}/shared/include/normalization.hh | 0 .../shared/include/time_segmentation.hh | 0 .../shared/include/time_smooth_linear.hh | 0 .../shared/include/time_smooth_median.hh | 0 .../shared/include/time_smooth_morpho.hh | 0 .../lazzara/igr/gui => igr}/shared/shared.qrc | 0 .../lazzara/igr/gui => igr}/shared/src/color.hh | 0 .../igr/gui => igr}/shared/src/igr_types.hh | 0 .../igr/gui => igr}/shared/src/image_viewer.cc | 0 .../igr/gui => igr}/shared/src/image_viewer.hh | 0 .../shared/src/internal/interactive_scene.cc | 0 .../shared/src/internal/interactive_scene.hh | 0 .../igr/gui => igr}/shared/ui/image_viewer.ui | 0 .../lazzara/igr/gui => igr}/viewer/src/main.cc | 0 .../igr/gui => igr}/viewer/src/main_window.cc | 0 .../igr/gui => igr}/viewer/src/main_window.hh | 0 .../lazzara/igr/gui => igr}/viewer/src/mln_data.cc | 0 .../lazzara/igr/gui => igr}/viewer/src/mln_data.hh | 0 .../igr/gui => igr}/viewer/ui/main_window.h | 0 .../igr/gui => igr}/viewer/ui/main_window.ui | 0 .../lazzara/igr/gui => igr}/viewer/viewer.pro | 0 .../lazzara/igr/gui => igr}/viewer/viewer.sh | 0 152 files changed, 317 insertions(+), 0 deletions(-) create mode 100644 igr/ChangeLog rename {milena/sandbox/lazzara/igr/gui => igr}/anapath/anapath.pro (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/anapath/src/main.cc (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/anapath/src/main_window.cc (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/anapath/src/main_window.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/anapath/src/mln_data.cc (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/anapath/src/mln_data.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/anapath/src/mln_widgets.cc (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/anapath/src/tools/filter.cc (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/anapath/src/tools/filter.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/anapath/src/tools/load.cc (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/anapath/src/tools/load.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/anapath/src/tools/save.cc (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/anapath/src/tools/save.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/anapath/ui/main_window.ui (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation/segmentation.pro (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation/segmentation.sh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation/src/crop_widget.cc (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation/src/crop_widget.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation/src/edit_seg_widget.cc (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation/src/edit_seg_widget.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation/src/load_widget.cc (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation/src/load_widget.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation/src/main.cc (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation/src/main_window.cc (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation/src/main_window.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation/src/mln_data.cc (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation/src/mln_data.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation/src/mln_widgets.cc (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation/src/save_widget.cc (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation/src/save_widget.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation/src/seg_widget.cc (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation/src/seg_widget.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation/src/task.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation/src/task_handler.cc (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation/src/task_handler.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation/src/task_handler.hxx (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation/src/task_widget.cc (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation/src/task_widget.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation/src/tools/crop.cc (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation/src/tools/crop.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation/src/tools/edit_seg.cc (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation/src/tools/edit_seg.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation/src/tools/load.cc (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation/src/tools/load.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation/src/tools/save.cc (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation/src/tools/save.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation/src/tools/seg.cc (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation/src/tools/seg.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation/ui/crop_widget.ui (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation/ui/edit_seg_widget.ui (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation/ui/load_widget.ui (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation/ui/main_window.ui (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation/ui/save_widget.ui (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation/ui/seg_widget.ui (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/segmentation2dt.pro (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/segmentation2dt.sh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/src/crop_widget.cc (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/src/crop_widget.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/src/load_widget.cc (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/src/load_widget.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/src/main.cc (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/src/main_window.cc (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/src/main_window.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/src/mean_regions_widget.cc (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/src/mean_regions_widget.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/src/mln_data.cc (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/src/mln_data.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/src/mln_widgets.cc (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/src/norm_smooth_widget.cc (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/src/norm_smooth_widget.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/src/plot.cc (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/src/plot.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/src/plot_widget.cc (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/src/plot_widget.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/src/ref_mean_widget.cc (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/src/ref_mean_widget.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/src/save_widget.cc (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/src/save_widget.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/src/seg_widget.cc (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/src/seg_widget.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/src/task.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/src/task_handler.cc (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/src/task_handler.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/src/task_handler.hxx (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/src/task_widget.cc (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/src/task_widget.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/src/tools/crop.cc (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/src/tools/crop.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/src/tools/load.cc (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/src/tools/load.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/src/tools/mean_regions.cc (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/src/tools/mean_regions.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/src/tools/norm_smooth.cc (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/src/tools/norm_smooth.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/src/tools/ref_mean.cc (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/src/tools/ref_mean.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/src/tools/save.cc (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/src/tools/save.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/src/tools/seg.cc (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/src/tools/seg.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/ui/crop_widget.ui (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/ui/edit_seg_widget.ui (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/ui/load_widget.ui (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/ui/main_window.ui (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/ui/mean_regions_widget.ui (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/ui/norm_smooth_widget.ui (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/ui/plot_widget.ui (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/ui/ref_mean_widget.ui (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/ui/save_widget.ui (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/ui/seg_widget.ui (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/shared/icons/Symbols-Delete-icon.png (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/shared/icons/accept-icon.png (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/shared/icons/close.gif (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/shared/icons/crop-icon.png (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/shared/icons/image-add-icon.png (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/shared/icons/image-edit-icon.png (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/shared/icons/image-multi-icon.png (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/shared/icons/image-next-icon.png (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/shared/icons/image-remove-icon.png (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/shared/icons/next-icon.png (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/shared/icons/page-down-icon.png (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/shared/icons/page-search-icon.png (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/shared/icons/search-add-icon.png (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/shared/icons/search-remove-icon.png (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/shared/include/find_color.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/shared/include/function_means.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/shared/include/io/magick.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/shared/include/mean_function_per_region.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/shared/include/mean_regions.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/shared/include/normalization.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/shared/include/time_segmentation.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/shared/include/time_smooth_linear.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/shared/include/time_smooth_median.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/shared/include/time_smooth_morpho.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/shared/shared.qrc (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/shared/src/color.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/shared/src/igr_types.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/shared/src/image_viewer.cc (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/shared/src/image_viewer.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/shared/src/internal/interactive_scene.cc (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/shared/src/internal/interactive_scene.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/shared/ui/image_viewer.ui (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/viewer/src/main.cc (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/viewer/src/main_window.cc (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/viewer/src/main_window.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/viewer/src/mln_data.cc (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/viewer/src/mln_data.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/viewer/ui/main_window.h (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/viewer/ui/main_window.ui (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/viewer/viewer.pro (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/viewer/viewer.sh (100%) diff --git a/igr/ChangeLog b/igr/ChangeLog new file mode 100644 index 0000000..5ea4590 --- /dev/null +++ b/igr/ChangeLog @@ -0,0 +1,317 @@ +2010-11-16 Guillaume Lazzara <z(a)lrde.epita.fr> + + Move IGR code from milena/sandbox to igr's private module. + + * milena/sandbox/lazzara/igr/gui/anapath/anapath.pro, + * milena/sandbox/lazzara/igr/gui/anapath/src/main.cc, + * milena/sandbox/lazzara/igr/gui/anapath/src/main_window.cc, + * milena/sandbox/lazzara/igr/gui/anapath/src/main_window.hh, + * milena/sandbox/lazzara/igr/gui/anapath/src/mln_data.cc, + * milena/sandbox/lazzara/igr/gui/anapath/src/mln_data.hh, + * milena/sandbox/lazzara/igr/gui/anapath/src/mln_widgets.cc, + * milena/sandbox/lazzara/igr/gui/anapath/src/tools/filter.cc, + * milena/sandbox/lazzara/igr/gui/anapath/src/tools/filter.hh, + * milena/sandbox/lazzara/igr/gui/anapath/src/tools/load.cc, + * milena/sandbox/lazzara/igr/gui/anapath/src/tools/load.hh, + * milena/sandbox/lazzara/igr/gui/anapath/src/tools/save.cc, + * milena/sandbox/lazzara/igr/gui/anapath/src/tools/save.hh, + * milena/sandbox/lazzara/igr/gui/anapath/ui/main_window.ui, + * milena/sandbox/lazzara/igr/gui/segmentation/segmentation.pro, + * milena/sandbox/lazzara/igr/gui/segmentation/segmentation.sh, + * milena/sandbox/lazzara/igr/gui/segmentation/src/crop_widget.cc, + * milena/sandbox/lazzara/igr/gui/segmentation/src/crop_widget.hh, + * milena/sandbox/lazzara/igr/gui/segmentation/src/edit_seg_widget.cc, + * milena/sandbox/lazzara/igr/gui/segmentation/src/edit_seg_widget.hh, + * milena/sandbox/lazzara/igr/gui/segmentation/src/load_widget.cc, + * milena/sandbox/lazzara/igr/gui/segmentation/src/load_widget.hh, + * milena/sandbox/lazzara/igr/gui/segmentation/src/main.cc, + * milena/sandbox/lazzara/igr/gui/segmentation/src/main_window.cc, + * milena/sandbox/lazzara/igr/gui/segmentation/src/main_window.hh, + * milena/sandbox/lazzara/igr/gui/segmentation/src/mln_data.cc, + * milena/sandbox/lazzara/igr/gui/segmentation/src/mln_data.hh, + * milena/sandbox/lazzara/igr/gui/segmentation/src/mln_widgets.cc, + * milena/sandbox/lazzara/igr/gui/segmentation/src/save_widget.cc, + * milena/sandbox/lazzara/igr/gui/segmentation/src/save_widget.hh, + * milena/sandbox/lazzara/igr/gui/segmentation/src/seg_widget.cc, + * milena/sandbox/lazzara/igr/gui/segmentation/src/seg_widget.hh, + * milena/sandbox/lazzara/igr/gui/segmentation/src/task.hh, + * milena/sandbox/lazzara/igr/gui/segmentation/src/task_handler.cc, + * milena/sandbox/lazzara/igr/gui/segmentation/src/task_handler.hh, + * milena/sandbox/lazzara/igr/gui/segmentation/src/task_handler.hxx, + * milena/sandbox/lazzara/igr/gui/segmentation/src/task_widget.cc, + * milena/sandbox/lazzara/igr/gui/segmentation/src/task_widget.hh, + * milena/sandbox/lazzara/igr/gui/segmentation/src/tools/crop.cc, + * milena/sandbox/lazzara/igr/gui/segmentation/src/tools/crop.hh, + * milena/sandbox/lazzara/igr/gui/segmentation/src/tools/edit_seg.cc, + * milena/sandbox/lazzara/igr/gui/segmentation/src/tools/edit_seg.hh, + * milena/sandbox/lazzara/igr/gui/segmentation/src/tools/load.cc, + * milena/sandbox/lazzara/igr/gui/segmentation/src/tools/load.hh, + * milena/sandbox/lazzara/igr/gui/segmentation/src/tools/save.cc, + * milena/sandbox/lazzara/igr/gui/segmentation/src/tools/save.hh, + * milena/sandbox/lazzara/igr/gui/segmentation/src/tools/seg.cc, + * milena/sandbox/lazzara/igr/gui/segmentation/src/tools/seg.hh, + * milena/sandbox/lazzara/igr/gui/segmentation/ui/crop_widget.ui, + * milena/sandbox/lazzara/igr/gui/segmentation/ui/edit_seg_widget.ui, + * milena/sandbox/lazzara/igr/gui/segmentation/ui/load_widget.ui, + * milena/sandbox/lazzara/igr/gui/segmentation/ui/main_window.ui, + * milena/sandbox/lazzara/igr/gui/segmentation/ui/save_widget.ui, + * milena/sandbox/lazzara/igr/gui/segmentation/ui/seg_widget.ui, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/segmentation2dt.pro, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/segmentation2dt.sh, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/crop_widget.cc, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/crop_widget.hh, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/load_widget.cc, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/load_widget.hh, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/main.cc, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/main_window.cc, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/main_window.hh, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/mean_regions_widget.cc, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/mean_regions_widget.hh, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/mln_data.cc, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/mln_data.hh, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/mln_widgets.cc, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/norm_smooth_widget.cc, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/norm_smooth_widget.hh, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/plot.cc, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/plot.hh, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/plot_widget.cc, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/plot_widget.hh, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/ref_mean_widget.cc, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/ref_mean_widget.hh, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/save_widget.cc, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/save_widget.hh, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/seg_widget.cc, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/seg_widget.hh, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/task.hh, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/task_handler.cc, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/task_handler.hh, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/task_handler.hxx, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/task_widget.cc, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/task_widget.hh, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/crop.cc, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/crop.hh, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/load.cc, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/load.hh, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/mean_regions.cc, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/mean_regions.hh, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/norm_smooth.cc, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/norm_smooth.hh, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/ref_mean.cc, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/ref_mean.hh, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/save.cc, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/save.hh, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/seg.cc, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/seg.hh, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/ui/crop_widget.ui, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/ui/edit_seg_widget.ui, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/ui/load_widget.ui, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/ui/main_window.ui, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/ui/mean_regions_widget.ui, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/ui/norm_smooth_widget.ui, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/ui/plot_widget.ui, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/ui/ref_mean_widget.ui, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/ui/save_widget.ui, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/ui/seg_widget.ui, + * milena/sandbox/lazzara/igr/gui/shared/icons/Symbols-Delete-icon.png, + * milena/sandbox/lazzara/igr/gui/shared/icons/accept-icon.png, + * milena/sandbox/lazzara/igr/gui/shared/icons/close.gif, + * milena/sandbox/lazzara/igr/gui/shared/icons/crop-icon.png, + * milena/sandbox/lazzara/igr/gui/shared/icons/image-add-icon.png, + * milena/sandbox/lazzara/igr/gui/shared/icons/image-edit-icon.png, + * milena/sandbox/lazzara/igr/gui/shared/icons/image-multi-icon.png, + * milena/sandbox/lazzara/igr/gui/shared/icons/image-next-icon.png, + * milena/sandbox/lazzara/igr/gui/shared/icons/image-remove-icon.png, + * milena/sandbox/lazzara/igr/gui/shared/icons/next-icon.png, + * milena/sandbox/lazzara/igr/gui/shared/icons/page-down-icon.png, + * milena/sandbox/lazzara/igr/gui/shared/icons/page-search-icon.png, + * milena/sandbox/lazzara/igr/gui/shared/icons/search-add-icon.png, + * milena/sandbox/lazzara/igr/gui/shared/icons/search-remove-icon.png, + * milena/sandbox/lazzara/igr/gui/shared/include/find_color.hh, + * milena/sandbox/lazzara/igr/gui/shared/include/function_means.hh, + * milena/sandbox/lazzara/igr/gui/shared/include/io/magick.hh, + * milena/sandbox/lazzara/igr/gui/shared/include/mean_function_per_region.hh, + * milena/sandbox/lazzara/igr/gui/shared/include/mean_regions.hh, + * milena/sandbox/lazzara/igr/gui/shared/include/normalization.hh, + * milena/sandbox/lazzara/igr/gui/shared/include/time_segmentation.hh, + * milena/sandbox/lazzara/igr/gui/shared/include/time_smooth_linear.hh, + * milena/sandbox/lazzara/igr/gui/shared/include/time_smooth_median.hh, + * milena/sandbox/lazzara/igr/gui/shared/include/time_smooth_morpho.hh, + * milena/sandbox/lazzara/igr/gui/shared/shared.qrc, + * milena/sandbox/lazzara/igr/gui/shared/src/color.hh, + * milena/sandbox/lazzara/igr/gui/shared/src/igr_types.hh, + * milena/sandbox/lazzara/igr/gui/shared/src/image_viewer.cc, + * milena/sandbox/lazzara/igr/gui/shared/src/image_viewer.hh, + * milena/sandbox/lazzara/igr/gui/shared/src/internal/interactive_scene.cc, + * milena/sandbox/lazzara/igr/gui/shared/src/internal/interactive_scene.hh, + * milena/sandbox/lazzara/igr/gui/shared/ui/image_viewer.ui, + * milena/sandbox/lazzara/igr/gui/viewer/src/main.cc, + * milena/sandbox/lazzara/igr/gui/viewer/src/main_window.cc, + * milena/sandbox/lazzara/igr/gui/viewer/src/main_window.hh, + * milena/sandbox/lazzara/igr/gui/viewer/src/mln_data.cc, + * milena/sandbox/lazzara/igr/gui/viewer/src/mln_data.hh, + * milena/sandbox/lazzara/igr/gui/viewer/ui/main_window.h, + * milena/sandbox/lazzara/igr/gui/viewer/ui/main_window.ui, + * milena/sandbox/lazzara/igr/gui/viewer/viewer.pro, + * milena/sandbox/lazzara/igr/gui/viewer/viewer.sh: Move... + + * igr/anapath/anapath.pro, + * igr/anapath/src/main.cc, + * igr/anapath/src/main_window.cc, + * igr/anapath/src/main_window.hh, + * igr/anapath/src/mln_data.cc, + * igr/anapath/src/mln_data.hh, + * igr/anapath/src/mln_widgets.cc, + * igr/anapath/src/tools/filter.cc, + * igr/anapath/src/tools/filter.hh, + * igr/anapath/src/tools/load.cc, + * igr/anapath/src/tools/load.hh, + * igr/anapath/src/tools/save.cc, + * igr/anapath/src/tools/save.hh, + * igr/anapath/ui/main_window.ui, + * igr/segmentation/segmentation.pro, + * igr/segmentation/segmentation.sh, + * igr/segmentation/src/crop_widget.cc, + * igr/segmentation/src/crop_widget.hh, + * igr/segmentation/src/edit_seg_widget.cc, + * igr/segmentation/src/edit_seg_widget.hh, + * igr/segmentation/src/load_widget.cc, + * igr/segmentation/src/load_widget.hh, + * igr/segmentation/src/main.cc, + * igr/segmentation/src/main_window.cc, + * igr/segmentation/src/main_window.hh, + * igr/segmentation/src/mln_data.cc, + * igr/segmentation/src/mln_data.hh, + * igr/segmentation/src/mln_widgets.cc, + * igr/segmentation/src/save_widget.cc, + * igr/segmentation/src/save_widget.hh, + * igr/segmentation/src/seg_widget.cc, + * igr/segmentation/src/seg_widget.hh, + * igr/segmentation/src/task.hh, + * igr/segmentation/src/task_handler.cc, + * igr/segmentation/src/task_handler.hh, + * igr/segmentation/src/task_handler.hxx, + * igr/segmentation/src/task_widget.cc, + * igr/segmentation/src/task_widget.hh, + * igr/segmentation/src/tools/crop.cc, + * igr/segmentation/src/tools/crop.hh, + * igr/segmentation/src/tools/edit_seg.cc, + * igr/segmentation/src/tools/edit_seg.hh, + * igr/segmentation/src/tools/load.cc, + * igr/segmentation/src/tools/load.hh, + * igr/segmentation/src/tools/save.cc, + * igr/segmentation/src/tools/save.hh, + * igr/segmentation/src/tools/seg.cc, + * igr/segmentation/src/tools/seg.hh, + * igr/segmentation/ui/crop_widget.ui, + * igr/segmentation/ui/edit_seg_widget.ui, + * igr/segmentation/ui/load_widget.ui, + * igr/segmentation/ui/main_window.ui, + * igr/segmentation/ui/save_widget.ui, + * igr/segmentation/ui/seg_widget.ui, + * igr/segmentation2dt/segmentation2dt.pro, + * igr/segmentation2dt/segmentation2dt.sh, + * igr/segmentation2dt/src/crop_widget.cc, + * igr/segmentation2dt/src/crop_widget.hh, + * igr/segmentation2dt/src/load_widget.cc, + * igr/segmentation2dt/src/load_widget.hh, + * igr/segmentation2dt/src/main.cc, + * igr/segmentation2dt/src/main_window.cc, + * igr/segmentation2dt/src/main_window.hh, + * igr/segmentation2dt/src/mean_regions_widget.cc, + * igr/segmentation2dt/src/mean_regions_widget.hh, + * igr/segmentation2dt/src/mln_data.cc, + * igr/segmentation2dt/src/mln_data.hh, + * igr/segmentation2dt/src/mln_widgets.cc, + * igr/segmentation2dt/src/norm_smooth_widget.cc, + * igr/segmentation2dt/src/norm_smooth_widget.hh, + * igr/segmentation2dt/src/plot.cc, + * igr/segmentation2dt/src/plot.hh, + * igr/segmentation2dt/src/plot_widget.cc, + * igr/segmentation2dt/src/plot_widget.hh, + * igr/segmentation2dt/src/ref_mean_widget.cc, + * igr/segmentation2dt/src/ref_mean_widget.hh, + * igr/segmentation2dt/src/save_widget.cc, + * igr/segmentation2dt/src/save_widget.hh, + * igr/segmentation2dt/src/seg_widget.cc, + * igr/segmentation2dt/src/seg_widget.hh, + * igr/segmentation2dt/src/task.hh, + * igr/segmentation2dt/src/task_handler.cc, + * igr/segmentation2dt/src/task_handler.hh, + * igr/segmentation2dt/src/task_handler.hxx, + * igr/segmentation2dt/src/task_widget.cc, + * igr/segmentation2dt/src/task_widget.hh, + * igr/segmentation2dt/src/tools/crop.cc, + * igr/segmentation2dt/src/tools/crop.hh, + * igr/segmentation2dt/src/tools/load.cc, + * igr/segmentation2dt/src/tools/load.hh, + * igr/segmentation2dt/src/tools/mean_regions.cc, + * igr/segmentation2dt/src/tools/mean_regions.hh, + * igr/segmentation2dt/src/tools/norm_smooth.cc, + * igr/segmentation2dt/src/tools/norm_smooth.hh, + * igr/segmentation2dt/src/tools/ref_mean.cc, + * igr/segmentation2dt/src/tools/ref_mean.hh, + * igr/segmentation2dt/src/tools/save.cc, + * igr/segmentation2dt/src/tools/save.hh, + * igr/segmentation2dt/src/tools/seg.cc, + * igr/segmentation2dt/src/tools/seg.hh, + * igr/segmentation2dt/ui/crop_widget.ui, + * igr/segmentation2dt/ui/edit_seg_widget.ui, + * igr/segmentation2dt/ui/load_widget.ui, + * igr/segmentation2dt/ui/main_window.ui, + * igr/segmentation2dt/ui/mean_regions_widget.ui, + * igr/segmentation2dt/ui/norm_smooth_widget.ui, + * igr/segmentation2dt/ui/plot_widget.ui, + * igr/segmentation2dt/ui/ref_mean_widget.ui, + * igr/segmentation2dt/ui/save_widget.ui, + * igr/segmentation2dt/ui/seg_widget.ui, + * igr/shared/icons/Symbols-Delete-icon.png, + * igr/shared/icons/accept-icon.png, + * igr/shared/icons/close.gif, + * igr/shared/icons/crop-icon.png, + * igr/shared/icons/image-add-icon.png, + * igr/shared/icons/image-edit-icon.png, + * igr/shared/icons/image-multi-icon.png, + * igr/shared/icons/image-next-icon.png, + * igr/shared/icons/image-remove-icon.png, + * igr/shared/icons/next-icon.png, + * igr/shared/icons/page-down-icon.png, + * igr/shared/icons/page-search-icon.png, + * igr/shared/icons/search-add-icon.png, + * igr/shared/icons/search-remove-icon.png, + * igr/shared/include/find_color.hh, + * igr/shared/include/function_means.hh, + * igr/shared/include/io/magick.hh, + * igr/shared/include/mean_function_per_region.hh, + * igr/shared/include/mean_regions.hh, + * igr/shared/include/normalization.hh, + * igr/shared/include/time_segmentation.hh, + * igr/shared/include/time_smooth_linear.hh, + * igr/shared/include/time_smooth_median.hh, + * igr/shared/include/time_smooth_morpho.hh, + * igr/shared/shared.qrc, + * igr/shared/src/color.hh, + * igr/shared/src/igr_types.hh, + * igr/shared/src/image_viewer.cc, + * igr/shared/src/image_viewer.hh, + * igr/shared/src/internal/interactive_scene.cc, + * igr/shared/src/internal/interactive_scene.hh, + * igr/shared/ui/image_viewer.ui, + * igr/viewer/src/main.cc, + * igr/viewer/src/main_window.cc, + * igr/viewer/src/main_window.hh, + * igr/viewer/src/mln_data.cc, + * igr/viewer/src/mln_data.hh, + * igr/viewer/ui/main_window.h, + * igr/viewer/ui/main_window.ui, + * igr/viewer/viewer.pro, + * igr/viewer/viewer.sh: ... here. + + +$Rev$ +$Id$ +$Date$ + +Local Variables: +ispell-local-dictionary: "american" +coding: iso-latin-1 +End: diff --git a/milena/sandbox/lazzara/igr/gui/anapath/anapath.pro b/igr/anapath/anapath.pro similarity index 100% rename from milena/sandbox/lazzara/igr/gui/anapath/anapath.pro rename to igr/anapath/anapath.pro diff --git a/milena/sandbox/lazzara/igr/gui/anapath/src/main.cc b/igr/anapath/src/main.cc similarity index 100% rename from milena/sandbox/lazzara/igr/gui/anapath/src/main.cc rename to igr/anapath/src/main.cc diff --git a/milena/sandbox/lazzara/igr/gui/anapath/src/main_window.cc b/igr/anapath/src/main_window.cc similarity index 100% rename from milena/sandbox/lazzara/igr/gui/anapath/src/main_window.cc rename to igr/anapath/src/main_window.cc diff --git a/milena/sandbox/lazzara/igr/gui/anapath/src/main_window.hh b/igr/anapath/src/main_window.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/anapath/src/main_window.hh rename to igr/anapath/src/main_window.hh diff --git a/milena/sandbox/lazzara/igr/gui/anapath/src/mln_data.cc b/igr/anapath/src/mln_data.cc similarity index 100% rename from milena/sandbox/lazzara/igr/gui/anapath/src/mln_data.cc rename to igr/anapath/src/mln_data.cc diff --git a/milena/sandbox/lazzara/igr/gui/anapath/src/mln_data.hh b/igr/anapath/src/mln_data.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/anapath/src/mln_data.hh rename to igr/anapath/src/mln_data.hh diff --git a/milena/sandbox/lazzara/igr/gui/anapath/src/mln_widgets.cc b/igr/anapath/src/mln_widgets.cc similarity index 100% rename from milena/sandbox/lazzara/igr/gui/anapath/src/mln_widgets.cc rename to igr/anapath/src/mln_widgets.cc diff --git a/milena/sandbox/lazzara/igr/gui/anapath/src/tools/filter.cc b/igr/anapath/src/tools/filter.cc similarity index 100% rename from milena/sandbox/lazzara/igr/gui/anapath/src/tools/filter.cc rename to igr/anapath/src/tools/filter.cc diff --git a/milena/sandbox/lazzara/igr/gui/anapath/src/tools/filter.hh b/igr/anapath/src/tools/filter.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/anapath/src/tools/filter.hh rename to igr/anapath/src/tools/filter.hh diff --git a/milena/sandbox/lazzara/igr/gui/anapath/src/tools/load.cc b/igr/anapath/src/tools/load.cc similarity index 100% rename from milena/sandbox/lazzara/igr/gui/anapath/src/tools/load.cc rename to igr/anapath/src/tools/load.cc diff --git a/milena/sandbox/lazzara/igr/gui/anapath/src/tools/load.hh b/igr/anapath/src/tools/load.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/anapath/src/tools/load.hh rename to igr/anapath/src/tools/load.hh diff --git a/milena/sandbox/lazzara/igr/gui/anapath/src/tools/save.cc b/igr/anapath/src/tools/save.cc similarity index 100% rename from milena/sandbox/lazzara/igr/gui/anapath/src/tools/save.cc rename to igr/anapath/src/tools/save.cc diff --git a/milena/sandbox/lazzara/igr/gui/anapath/src/tools/save.hh b/igr/anapath/src/tools/save.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/anapath/src/tools/save.hh rename to igr/anapath/src/tools/save.hh diff --git a/milena/sandbox/lazzara/igr/gui/anapath/ui/main_window.ui b/igr/anapath/ui/main_window.ui similarity index 100% rename from milena/sandbox/lazzara/igr/gui/anapath/ui/main_window.ui rename to igr/anapath/ui/main_window.ui diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/segmentation.pro b/igr/segmentation/segmentation.pro similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation/segmentation.pro rename to igr/segmentation/segmentation.pro diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/segmentation.sh b/igr/segmentation/segmentation.sh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation/segmentation.sh rename to igr/segmentation/segmentation.sh diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/crop_widget.cc b/igr/segmentation/src/crop_widget.cc similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation/src/crop_widget.cc rename to igr/segmentation/src/crop_widget.cc diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/crop_widget.hh b/igr/segmentation/src/crop_widget.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation/src/crop_widget.hh rename to igr/segmentation/src/crop_widget.hh diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/edit_seg_widget.cc b/igr/segmentation/src/edit_seg_widget.cc similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation/src/edit_seg_widget.cc rename to igr/segmentation/src/edit_seg_widget.cc diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/edit_seg_widget.hh b/igr/segmentation/src/edit_seg_widget.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation/src/edit_seg_widget.hh rename to igr/segmentation/src/edit_seg_widget.hh diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/load_widget.cc b/igr/segmentation/src/load_widget.cc similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation/src/load_widget.cc rename to igr/segmentation/src/load_widget.cc diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/load_widget.hh b/igr/segmentation/src/load_widget.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation/src/load_widget.hh rename to igr/segmentation/src/load_widget.hh diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/main.cc b/igr/segmentation/src/main.cc similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation/src/main.cc rename to igr/segmentation/src/main.cc diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/main_window.cc b/igr/segmentation/src/main_window.cc similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation/src/main_window.cc rename to igr/segmentation/src/main_window.cc diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/main_window.hh b/igr/segmentation/src/main_window.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation/src/main_window.hh rename to igr/segmentation/src/main_window.hh diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/mln_data.cc b/igr/segmentation/src/mln_data.cc similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation/src/mln_data.cc rename to igr/segmentation/src/mln_data.cc diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/mln_data.hh b/igr/segmentation/src/mln_data.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation/src/mln_data.hh rename to igr/segmentation/src/mln_data.hh diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/mln_widgets.cc b/igr/segmentation/src/mln_widgets.cc similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation/src/mln_widgets.cc rename to igr/segmentation/src/mln_widgets.cc diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/save_widget.cc b/igr/segmentation/src/save_widget.cc similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation/src/save_widget.cc rename to igr/segmentation/src/save_widget.cc diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/save_widget.hh b/igr/segmentation/src/save_widget.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation/src/save_widget.hh rename to igr/segmentation/src/save_widget.hh diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/seg_widget.cc b/igr/segmentation/src/seg_widget.cc similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation/src/seg_widget.cc rename to igr/segmentation/src/seg_widget.cc diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/seg_widget.hh b/igr/segmentation/src/seg_widget.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation/src/seg_widget.hh rename to igr/segmentation/src/seg_widget.hh diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/task.hh b/igr/segmentation/src/task.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation/src/task.hh rename to igr/segmentation/src/task.hh diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/task_handler.cc b/igr/segmentation/src/task_handler.cc similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation/src/task_handler.cc rename to igr/segmentation/src/task_handler.cc diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/task_handler.hh b/igr/segmentation/src/task_handler.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation/src/task_handler.hh rename to igr/segmentation/src/task_handler.hh diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/task_handler.hxx b/igr/segmentation/src/task_handler.hxx similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation/src/task_handler.hxx rename to igr/segmentation/src/task_handler.hxx diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/task_widget.cc b/igr/segmentation/src/task_widget.cc similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation/src/task_widget.cc rename to igr/segmentation/src/task_widget.cc diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/task_widget.hh b/igr/segmentation/src/task_widget.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation/src/task_widget.hh rename to igr/segmentation/src/task_widget.hh diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/tools/crop.cc b/igr/segmentation/src/tools/crop.cc similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation/src/tools/crop.cc rename to igr/segmentation/src/tools/crop.cc diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/tools/crop.hh b/igr/segmentation/src/tools/crop.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation/src/tools/crop.hh rename to igr/segmentation/src/tools/crop.hh diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/tools/edit_seg.cc b/igr/segmentation/src/tools/edit_seg.cc similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation/src/tools/edit_seg.cc rename to igr/segmentation/src/tools/edit_seg.cc diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/tools/edit_seg.hh b/igr/segmentation/src/tools/edit_seg.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation/src/tools/edit_seg.hh rename to igr/segmentation/src/tools/edit_seg.hh diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/tools/load.cc b/igr/segmentation/src/tools/load.cc similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation/src/tools/load.cc rename to igr/segmentation/src/tools/load.cc diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/tools/load.hh b/igr/segmentation/src/tools/load.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation/src/tools/load.hh rename to igr/segmentation/src/tools/load.hh diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/tools/save.cc b/igr/segmentation/src/tools/save.cc similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation/src/tools/save.cc rename to igr/segmentation/src/tools/save.cc diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/tools/save.hh b/igr/segmentation/src/tools/save.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation/src/tools/save.hh rename to igr/segmentation/src/tools/save.hh diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/tools/seg.cc b/igr/segmentation/src/tools/seg.cc similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation/src/tools/seg.cc rename to igr/segmentation/src/tools/seg.cc diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/tools/seg.hh b/igr/segmentation/src/tools/seg.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation/src/tools/seg.hh rename to igr/segmentation/src/tools/seg.hh diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/ui/crop_widget.ui b/igr/segmentation/ui/crop_widget.ui similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation/ui/crop_widget.ui rename to igr/segmentation/ui/crop_widget.ui diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/ui/edit_seg_widget.ui b/igr/segmentation/ui/edit_seg_widget.ui similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation/ui/edit_seg_widget.ui rename to igr/segmentation/ui/edit_seg_widget.ui diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/ui/load_widget.ui b/igr/segmentation/ui/load_widget.ui similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation/ui/load_widget.ui rename to igr/segmentation/ui/load_widget.ui diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/ui/main_window.ui b/igr/segmentation/ui/main_window.ui similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation/ui/main_window.ui rename to igr/segmentation/ui/main_window.ui diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/ui/save_widget.ui b/igr/segmentation/ui/save_widget.ui similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation/ui/save_widget.ui rename to igr/segmentation/ui/save_widget.ui diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/ui/seg_widget.ui b/igr/segmentation/ui/seg_widget.ui similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation/ui/seg_widget.ui rename to igr/segmentation/ui/seg_widget.ui diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/segmentation2dt.pro b/igr/segmentation2dt/segmentation2dt.pro similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/segmentation2dt.pro rename to igr/segmentation2dt/segmentation2dt.pro diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/segmentation2dt.sh b/igr/segmentation2dt/segmentation2dt.sh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/segmentation2dt.sh rename to igr/segmentation2dt/segmentation2dt.sh diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/crop_widget.cc b/igr/segmentation2dt/src/crop_widget.cc similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/src/crop_widget.cc rename to igr/segmentation2dt/src/crop_widget.cc diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/crop_widget.hh b/igr/segmentation2dt/src/crop_widget.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/src/crop_widget.hh rename to igr/segmentation2dt/src/crop_widget.hh diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/load_widget.cc b/igr/segmentation2dt/src/load_widget.cc similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/src/load_widget.cc rename to igr/segmentation2dt/src/load_widget.cc diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/load_widget.hh b/igr/segmentation2dt/src/load_widget.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/src/load_widget.hh rename to igr/segmentation2dt/src/load_widget.hh diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/main.cc b/igr/segmentation2dt/src/main.cc similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/src/main.cc rename to igr/segmentation2dt/src/main.cc diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/main_window.cc b/igr/segmentation2dt/src/main_window.cc similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/src/main_window.cc rename to igr/segmentation2dt/src/main_window.cc diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/main_window.hh b/igr/segmentation2dt/src/main_window.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/src/main_window.hh rename to igr/segmentation2dt/src/main_window.hh diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/mean_regions_widget.cc b/igr/segmentation2dt/src/mean_regions_widget.cc similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/src/mean_regions_widget.cc rename to igr/segmentation2dt/src/mean_regions_widget.cc diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/mean_regions_widget.hh b/igr/segmentation2dt/src/mean_regions_widget.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/src/mean_regions_widget.hh rename to igr/segmentation2dt/src/mean_regions_widget.hh diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/mln_data.cc b/igr/segmentation2dt/src/mln_data.cc similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/src/mln_data.cc rename to igr/segmentation2dt/src/mln_data.cc diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/mln_data.hh b/igr/segmentation2dt/src/mln_data.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/src/mln_data.hh rename to igr/segmentation2dt/src/mln_data.hh diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/mln_widgets.cc b/igr/segmentation2dt/src/mln_widgets.cc similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/src/mln_widgets.cc rename to igr/segmentation2dt/src/mln_widgets.cc diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/norm_smooth_widget.cc b/igr/segmentation2dt/src/norm_smooth_widget.cc similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/src/norm_smooth_widget.cc rename to igr/segmentation2dt/src/norm_smooth_widget.cc diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/norm_smooth_widget.hh b/igr/segmentation2dt/src/norm_smooth_widget.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/src/norm_smooth_widget.hh rename to igr/segmentation2dt/src/norm_smooth_widget.hh diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/plot.cc b/igr/segmentation2dt/src/plot.cc similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/src/plot.cc rename to igr/segmentation2dt/src/plot.cc diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/plot.hh b/igr/segmentation2dt/src/plot.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/src/plot.hh rename to igr/segmentation2dt/src/plot.hh diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/plot_widget.cc b/igr/segmentation2dt/src/plot_widget.cc similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/src/plot_widget.cc rename to igr/segmentation2dt/src/plot_widget.cc diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/plot_widget.hh b/igr/segmentation2dt/src/plot_widget.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/src/plot_widget.hh rename to igr/segmentation2dt/src/plot_widget.hh diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/ref_mean_widget.cc b/igr/segmentation2dt/src/ref_mean_widget.cc similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/src/ref_mean_widget.cc rename to igr/segmentation2dt/src/ref_mean_widget.cc diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/ref_mean_widget.hh b/igr/segmentation2dt/src/ref_mean_widget.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/src/ref_mean_widget.hh rename to igr/segmentation2dt/src/ref_mean_widget.hh diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/save_widget.cc b/igr/segmentation2dt/src/save_widget.cc similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/src/save_widget.cc rename to igr/segmentation2dt/src/save_widget.cc diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/save_widget.hh b/igr/segmentation2dt/src/save_widget.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/src/save_widget.hh rename to igr/segmentation2dt/src/save_widget.hh diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/seg_widget.cc b/igr/segmentation2dt/src/seg_widget.cc similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/src/seg_widget.cc rename to igr/segmentation2dt/src/seg_widget.cc diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/seg_widget.hh b/igr/segmentation2dt/src/seg_widget.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/src/seg_widget.hh rename to igr/segmentation2dt/src/seg_widget.hh diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/task.hh b/igr/segmentation2dt/src/task.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/src/task.hh rename to igr/segmentation2dt/src/task.hh diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/task_handler.cc b/igr/segmentation2dt/src/task_handler.cc similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/src/task_handler.cc rename to igr/segmentation2dt/src/task_handler.cc diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/task_handler.hh b/igr/segmentation2dt/src/task_handler.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/src/task_handler.hh rename to igr/segmentation2dt/src/task_handler.hh diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/task_handler.hxx b/igr/segmentation2dt/src/task_handler.hxx similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/src/task_handler.hxx rename to igr/segmentation2dt/src/task_handler.hxx diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/task_widget.cc b/igr/segmentation2dt/src/task_widget.cc similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/src/task_widget.cc rename to igr/segmentation2dt/src/task_widget.cc diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/task_widget.hh b/igr/segmentation2dt/src/task_widget.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/src/task_widget.hh rename to igr/segmentation2dt/src/task_widget.hh diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/crop.cc b/igr/segmentation2dt/src/tools/crop.cc similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/crop.cc rename to igr/segmentation2dt/src/tools/crop.cc diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/crop.hh b/igr/segmentation2dt/src/tools/crop.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/crop.hh rename to igr/segmentation2dt/src/tools/crop.hh diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/load.cc b/igr/segmentation2dt/src/tools/load.cc similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/load.cc rename to igr/segmentation2dt/src/tools/load.cc diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/load.hh b/igr/segmentation2dt/src/tools/load.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/load.hh rename to igr/segmentation2dt/src/tools/load.hh diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/mean_regions.cc b/igr/segmentation2dt/src/tools/mean_regions.cc similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/mean_regions.cc rename to igr/segmentation2dt/src/tools/mean_regions.cc diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/mean_regions.hh b/igr/segmentation2dt/src/tools/mean_regions.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/mean_regions.hh rename to igr/segmentation2dt/src/tools/mean_regions.hh diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/norm_smooth.cc b/igr/segmentation2dt/src/tools/norm_smooth.cc similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/norm_smooth.cc rename to igr/segmentation2dt/src/tools/norm_smooth.cc diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/norm_smooth.hh b/igr/segmentation2dt/src/tools/norm_smooth.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/norm_smooth.hh rename to igr/segmentation2dt/src/tools/norm_smooth.hh diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/ref_mean.cc b/igr/segmentation2dt/src/tools/ref_mean.cc similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/ref_mean.cc rename to igr/segmentation2dt/src/tools/ref_mean.cc diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/ref_mean.hh b/igr/segmentation2dt/src/tools/ref_mean.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/ref_mean.hh rename to igr/segmentation2dt/src/tools/ref_mean.hh diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/save.cc b/igr/segmentation2dt/src/tools/save.cc similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/save.cc rename to igr/segmentation2dt/src/tools/save.cc diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/save.hh b/igr/segmentation2dt/src/tools/save.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/save.hh rename to igr/segmentation2dt/src/tools/save.hh diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/seg.cc b/igr/segmentation2dt/src/tools/seg.cc similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/seg.cc rename to igr/segmentation2dt/src/tools/seg.cc diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/seg.hh b/igr/segmentation2dt/src/tools/seg.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/seg.hh rename to igr/segmentation2dt/src/tools/seg.hh diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/ui/crop_widget.ui b/igr/segmentation2dt/ui/crop_widget.ui similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/ui/crop_widget.ui rename to igr/segmentation2dt/ui/crop_widget.ui diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/ui/edit_seg_widget.ui b/igr/segmentation2dt/ui/edit_seg_widget.ui similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/ui/edit_seg_widget.ui rename to igr/segmentation2dt/ui/edit_seg_widget.ui diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/ui/load_widget.ui b/igr/segmentation2dt/ui/load_widget.ui similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/ui/load_widget.ui rename to igr/segmentation2dt/ui/load_widget.ui diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/ui/main_window.ui b/igr/segmentation2dt/ui/main_window.ui similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/ui/main_window.ui rename to igr/segmentation2dt/ui/main_window.ui diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/ui/mean_regions_widget.ui b/igr/segmentation2dt/ui/mean_regions_widget.ui similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/ui/mean_regions_widget.ui rename to igr/segmentation2dt/ui/mean_regions_widget.ui diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/ui/norm_smooth_widget.ui b/igr/segmentation2dt/ui/norm_smooth_widget.ui similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/ui/norm_smooth_widget.ui rename to igr/segmentation2dt/ui/norm_smooth_widget.ui diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/ui/plot_widget.ui b/igr/segmentation2dt/ui/plot_widget.ui similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/ui/plot_widget.ui rename to igr/segmentation2dt/ui/plot_widget.ui diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/ui/ref_mean_widget.ui b/igr/segmentation2dt/ui/ref_mean_widget.ui similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/ui/ref_mean_widget.ui rename to igr/segmentation2dt/ui/ref_mean_widget.ui diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/ui/save_widget.ui b/igr/segmentation2dt/ui/save_widget.ui similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/ui/save_widget.ui rename to igr/segmentation2dt/ui/save_widget.ui diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/ui/seg_widget.ui b/igr/segmentation2dt/ui/seg_widget.ui similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/ui/seg_widget.ui rename to igr/segmentation2dt/ui/seg_widget.ui diff --git a/milena/sandbox/lazzara/igr/gui/shared/icons/Symbols-Delete-icon.png b/igr/shared/icons/Symbols-Delete-icon.png similarity index 100% rename from milena/sandbox/lazzara/igr/gui/shared/icons/Symbols-Delete-icon.png rename to igr/shared/icons/Symbols-Delete-icon.png diff --git a/milena/sandbox/lazzara/igr/gui/shared/icons/accept-icon.png b/igr/shared/icons/accept-icon.png similarity index 100% rename from milena/sandbox/lazzara/igr/gui/shared/icons/accept-icon.png rename to igr/shared/icons/accept-icon.png diff --git a/milena/sandbox/lazzara/igr/gui/shared/icons/close.gif b/igr/shared/icons/close.gif similarity index 100% rename from milena/sandbox/lazzara/igr/gui/shared/icons/close.gif rename to igr/shared/icons/close.gif diff --git a/milena/sandbox/lazzara/igr/gui/shared/icons/crop-icon.png b/igr/shared/icons/crop-icon.png similarity index 100% rename from milena/sandbox/lazzara/igr/gui/shared/icons/crop-icon.png rename to igr/shared/icons/crop-icon.png diff --git a/milena/sandbox/lazzara/igr/gui/shared/icons/image-add-icon.png b/igr/shared/icons/image-add-icon.png similarity index 100% rename from milena/sandbox/lazzara/igr/gui/shared/icons/image-add-icon.png rename to igr/shared/icons/image-add-icon.png diff --git a/milena/sandbox/lazzara/igr/gui/shared/icons/image-edit-icon.png b/igr/shared/icons/image-edit-icon.png similarity index 100% rename from milena/sandbox/lazzara/igr/gui/shared/icons/image-edit-icon.png rename to igr/shared/icons/image-edit-icon.png diff --git a/milena/sandbox/lazzara/igr/gui/shared/icons/image-multi-icon.png b/igr/shared/icons/image-multi-icon.png similarity index 100% rename from milena/sandbox/lazzara/igr/gui/shared/icons/image-multi-icon.png rename to igr/shared/icons/image-multi-icon.png diff --git a/milena/sandbox/lazzara/igr/gui/shared/icons/image-next-icon.png b/igr/shared/icons/image-next-icon.png similarity index 100% rename from milena/sandbox/lazzara/igr/gui/shared/icons/image-next-icon.png rename to igr/shared/icons/image-next-icon.png diff --git a/milena/sandbox/lazzara/igr/gui/shared/icons/image-remove-icon.png b/igr/shared/icons/image-remove-icon.png similarity index 100% rename from milena/sandbox/lazzara/igr/gui/shared/icons/image-remove-icon.png rename to igr/shared/icons/image-remove-icon.png diff --git a/milena/sandbox/lazzara/igr/gui/shared/icons/next-icon.png b/igr/shared/icons/next-icon.png similarity index 100% rename from milena/sandbox/lazzara/igr/gui/shared/icons/next-icon.png rename to igr/shared/icons/next-icon.png diff --git a/milena/sandbox/lazzara/igr/gui/shared/icons/page-down-icon.png b/igr/shared/icons/page-down-icon.png similarity index 100% rename from milena/sandbox/lazzara/igr/gui/shared/icons/page-down-icon.png rename to igr/shared/icons/page-down-icon.png diff --git a/milena/sandbox/lazzara/igr/gui/shared/icons/page-search-icon.png b/igr/shared/icons/page-search-icon.png similarity index 100% rename from milena/sandbox/lazzara/igr/gui/shared/icons/page-search-icon.png rename to igr/shared/icons/page-search-icon.png diff --git a/milena/sandbox/lazzara/igr/gui/shared/icons/search-add-icon.png b/igr/shared/icons/search-add-icon.png similarity index 100% rename from milena/sandbox/lazzara/igr/gui/shared/icons/search-add-icon.png rename to igr/shared/icons/search-add-icon.png diff --git a/milena/sandbox/lazzara/igr/gui/shared/icons/search-remove-icon.png b/igr/shared/icons/search-remove-icon.png similarity index 100% rename from milena/sandbox/lazzara/igr/gui/shared/icons/search-remove-icon.png rename to igr/shared/icons/search-remove-icon.png diff --git a/milena/sandbox/lazzara/igr/gui/shared/include/find_color.hh b/igr/shared/include/find_color.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/shared/include/find_color.hh rename to igr/shared/include/find_color.hh diff --git a/milena/sandbox/lazzara/igr/gui/shared/include/function_means.hh b/igr/shared/include/function_means.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/shared/include/function_means.hh rename to igr/shared/include/function_means.hh diff --git a/milena/sandbox/lazzara/igr/gui/shared/include/io/magick.hh b/igr/shared/include/io/magick.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/shared/include/io/magick.hh rename to igr/shared/include/io/magick.hh diff --git a/milena/sandbox/lazzara/igr/gui/shared/include/mean_function_per_region.hh b/igr/shared/include/mean_function_per_region.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/shared/include/mean_function_per_region.hh rename to igr/shared/include/mean_function_per_region.hh diff --git a/milena/sandbox/lazzara/igr/gui/shared/include/mean_regions.hh b/igr/shared/include/mean_regions.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/shared/include/mean_regions.hh rename to igr/shared/include/mean_regions.hh diff --git a/milena/sandbox/lazzara/igr/gui/shared/include/normalization.hh b/igr/shared/include/normalization.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/shared/include/normalization.hh rename to igr/shared/include/normalization.hh diff --git a/milena/sandbox/lazzara/igr/gui/shared/include/time_segmentation.hh b/igr/shared/include/time_segmentation.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/shared/include/time_segmentation.hh rename to igr/shared/include/time_segmentation.hh diff --git a/milena/sandbox/lazzara/igr/gui/shared/include/time_smooth_linear.hh b/igr/shared/include/time_smooth_linear.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/shared/include/time_smooth_linear.hh rename to igr/shared/include/time_smooth_linear.hh diff --git a/milena/sandbox/lazzara/igr/gui/shared/include/time_smooth_median.hh b/igr/shared/include/time_smooth_median.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/shared/include/time_smooth_median.hh rename to igr/shared/include/time_smooth_median.hh diff --git a/milena/sandbox/lazzara/igr/gui/shared/include/time_smooth_morpho.hh b/igr/shared/include/time_smooth_morpho.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/shared/include/time_smooth_morpho.hh rename to igr/shared/include/time_smooth_morpho.hh diff --git a/milena/sandbox/lazzara/igr/gui/shared/shared.qrc b/igr/shared/shared.qrc similarity index 100% rename from milena/sandbox/lazzara/igr/gui/shared/shared.qrc rename to igr/shared/shared.qrc diff --git a/milena/sandbox/lazzara/igr/gui/shared/src/color.hh b/igr/shared/src/color.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/shared/src/color.hh rename to igr/shared/src/color.hh diff --git a/milena/sandbox/lazzara/igr/gui/shared/src/igr_types.hh b/igr/shared/src/igr_types.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/shared/src/igr_types.hh rename to igr/shared/src/igr_types.hh diff --git a/milena/sandbox/lazzara/igr/gui/shared/src/image_viewer.cc b/igr/shared/src/image_viewer.cc similarity index 100% rename from milena/sandbox/lazzara/igr/gui/shared/src/image_viewer.cc rename to igr/shared/src/image_viewer.cc diff --git a/milena/sandbox/lazzara/igr/gui/shared/src/image_viewer.hh b/igr/shared/src/image_viewer.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/shared/src/image_viewer.hh rename to igr/shared/src/image_viewer.hh diff --git a/milena/sandbox/lazzara/igr/gui/shared/src/internal/interactive_scene.cc b/igr/shared/src/internal/interactive_scene.cc similarity index 100% rename from milena/sandbox/lazzara/igr/gui/shared/src/internal/interactive_scene.cc rename to igr/shared/src/internal/interactive_scene.cc diff --git a/milena/sandbox/lazzara/igr/gui/shared/src/internal/interactive_scene.hh b/igr/shared/src/internal/interactive_scene.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/shared/src/internal/interactive_scene.hh rename to igr/shared/src/internal/interactive_scene.hh diff --git a/milena/sandbox/lazzara/igr/gui/shared/ui/image_viewer.ui b/igr/shared/ui/image_viewer.ui similarity index 100% rename from milena/sandbox/lazzara/igr/gui/shared/ui/image_viewer.ui rename to igr/shared/ui/image_viewer.ui diff --git a/milena/sandbox/lazzara/igr/gui/viewer/src/main.cc b/igr/viewer/src/main.cc similarity index 100% rename from milena/sandbox/lazzara/igr/gui/viewer/src/main.cc rename to igr/viewer/src/main.cc diff --git a/milena/sandbox/lazzara/igr/gui/viewer/src/main_window.cc b/igr/viewer/src/main_window.cc similarity index 100% rename from milena/sandbox/lazzara/igr/gui/viewer/src/main_window.cc rename to igr/viewer/src/main_window.cc diff --git a/milena/sandbox/lazzara/igr/gui/viewer/src/main_window.hh b/igr/viewer/src/main_window.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/viewer/src/main_window.hh rename to igr/viewer/src/main_window.hh diff --git a/milena/sandbox/lazzara/igr/gui/viewer/src/mln_data.cc b/igr/viewer/src/mln_data.cc similarity index 100% rename from milena/sandbox/lazzara/igr/gui/viewer/src/mln_data.cc rename to igr/viewer/src/mln_data.cc diff --git a/milena/sandbox/lazzara/igr/gui/viewer/src/mln_data.hh b/igr/viewer/src/mln_data.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/viewer/src/mln_data.hh rename to igr/viewer/src/mln_data.hh diff --git a/milena/sandbox/lazzara/igr/gui/viewer/ui/main_window.h b/igr/viewer/ui/main_window.h similarity index 100% rename from milena/sandbox/lazzara/igr/gui/viewer/ui/main_window.h rename to igr/viewer/ui/main_window.h diff --git a/milena/sandbox/lazzara/igr/gui/viewer/ui/main_window.ui b/igr/viewer/ui/main_window.ui similarity index 100% rename from milena/sandbox/lazzara/igr/gui/viewer/ui/main_window.ui rename to igr/viewer/ui/main_window.ui diff --git a/milena/sandbox/lazzara/igr/gui/viewer/viewer.pro b/igr/viewer/viewer.pro similarity index 100% rename from milena/sandbox/lazzara/igr/gui/viewer/viewer.pro rename to igr/viewer/viewer.pro diff --git a/milena/sandbox/lazzara/igr/gui/viewer/viewer.sh b/igr/viewer/viewer.sh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/viewer/viewer.sh rename to igr/viewer/viewer.sh -- 1.5.6.5
13 years, 8 months
1
0
0
0
last-svn-commit-699-g319827a lazzara/igr/gui/segmentation/src/task_widget.cc: Avoid a warning.
by Guillaume Lazzara
--- milena/sandbox/ChangeLog | 5 +++++ .../igr/gui/segmentation/src/task_widget.cc | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/milena/sandbox/ChangeLog b/milena/sandbox/ChangeLog index 8f6f36c..311448d 100644 --- a/milena/sandbox/ChangeLog +++ b/milena/sandbox/ChangeLog @@ -1,5 +1,10 @@ 2010-11-16 Guillaume Lazzara <z(a)lrde.epita.fr> + * lazzara/igr/gui/segmentation/src/task_widget.cc: Avoid a + warning. + +2010-11-16 Guillaume Lazzara <z(a)lrde.epita.fr> + Update code with nslices() instead of nslis(). * lazzara/igr/gui/segmentation/src/mln_data.cc, diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/task_widget.cc b/milena/sandbox/lazzara/igr/gui/segmentation/src/task_widget.cc index e3ddce5..c8e6cbc 100644 --- a/milena/sandbox/lazzara/igr/gui/segmentation/src/task_widget.cc +++ b/milena/sandbox/lazzara/igr/gui/segmentation/src/task_widget.cc @@ -55,7 +55,7 @@ namespace igr handler.no_op(); } - void Task_Widget::run_task_(task_handler& handler) + void Task_Widget::run_task_(task_handler& /*handler*/) { qDebug() << "WARNING: task_widget::run_task_ should not be called..."; } -- 1.5.6.5
13 years, 8 months
1
0
0
0
last-svn-commit-698-g90ac1e4 Update code with nslices() instead of nslis().
by Guillaume Lazzara
* lazzara/igr/gui/segmentation/src/mln_data.cc, * lazzara/igr/gui/segmentation/src/tools/crop.cc, * lazzara/igr/gui/segmentation/src/tools/edit_seg.cc, * lazzara/igr/gui/segmentation2dt/src/mean_regions_widget.cc, * lazzara/igr/gui/segmentation2dt/src/mln_data.cc, * lazzara/igr/gui/segmentation2dt/src/norm_smooth_widget.cc, * lazzara/igr/gui/segmentation2dt/src/tools/crop.cc, * lazzara/igr/gui/shared/include/mean_function_per_region.hh, * lazzara/igr/gui/viewer/src/mln_data.cc: Replace nslis by nslices. --- milena/sandbox/ChangeLog | 15 +++++++++++++++ .../lazzara/igr/gui/segmentation/src/mln_data.cc | 16 ++++++++-------- .../lazzara/igr/gui/segmentation/src/tools/crop.cc | 2 +- .../igr/gui/segmentation/src/tools/edit_seg.cc | 4 ++-- .../gui/segmentation2dt/src/mean_regions_widget.cc | 2 +- .../igr/gui/segmentation2dt/src/mln_data.cc | 16 ++++++++-------- .../gui/segmentation2dt/src/norm_smooth_widget.cc | 2 +- .../igr/gui/segmentation2dt/src/tools/crop.cc | 2 +- .../gui/shared/include/mean_function_per_region.hh | 4 ++-- .../sandbox/lazzara/igr/gui/viewer/src/mln_data.cc | 10 +++++----- 10 files changed, 44 insertions(+), 29 deletions(-) diff --git a/milena/sandbox/ChangeLog b/milena/sandbox/ChangeLog index eca9e24..8f6f36c 100644 --- a/milena/sandbox/ChangeLog +++ b/milena/sandbox/ChangeLog @@ -1,3 +1,18 @@ +2010-11-16 Guillaume Lazzara <z(a)lrde.epita.fr> + + Update code with nslices() instead of nslis(). + + * lazzara/igr/gui/segmentation/src/mln_data.cc, + * lazzara/igr/gui/segmentation/src/tools/crop.cc, + * lazzara/igr/gui/segmentation/src/tools/edit_seg.cc, + * lazzara/igr/gui/segmentation2dt/src/mean_regions_widget.cc, + * lazzara/igr/gui/segmentation2dt/src/mln_data.cc, + * lazzara/igr/gui/segmentation2dt/src/norm_smooth_widget.cc, + * lazzara/igr/gui/segmentation2dt/src/tools/crop.cc, + * lazzara/igr/gui/shared/include/mean_function_per_region.hh, + * lazzara/igr/gui/viewer/src/mln_data.cc: Replace nslis by + nslices. + 2010-11-15 Guillaume Lazzara <z(a)lrde.epita.fr> Store loaded image with double value type. diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/mln_data.cc b/milena/sandbox/lazzara/igr/gui/segmentation/src/mln_data.cc index 6c8ea01..0254d98 100644 --- a/milena/sandbox/lazzara/igr/gui/segmentation/src/mln_data.cc +++ b/milena/sandbox/lazzara/igr/gui/segmentation/src/mln_data.cc @@ -70,7 +70,7 @@ namespace igr // Notifying the successful loading emit image_loaded(filename); - emit image_layer_count(in_dsp_.nslis()); + emit image_layer_count(in_dsp_.nslices()); } @@ -110,7 +110,7 @@ namespace igr // Notifying the successful loading emit image_loaded(filename); - emit image_layer_count(in_dsp_.nslis()); + emit image_layer_count(in_dsp_.nslices()); } @@ -158,7 +158,7 @@ namespace igr // Notifying the successful loading emit image_loaded(filename); - emit image_layer_count(in_dsp_.nslis()); + emit image_layer_count(in_dsp_.nslices()); } @@ -241,7 +241,7 @@ namespace igr // Make sure there is no border! extension::adjust(in_dsp_, 0); - emit image_layer_count(in_dsp_.nslis()); + emit image_layer_count(in_dsp_.nslices()); // emit updated_image(data::convert(igr::dsp_data_t(), sl_in_dsp)); } @@ -273,7 +273,7 @@ namespace igr // Make sure there is no border! extension::adjust(seg_dsp_, 0); - emit image_layer_count(seg_dsp_.nslis()); + emit image_layer_count(seg_dsp_.nslices()); compute_new_seg_image(sli); } @@ -291,7 +291,7 @@ namespace igr // Make sure there is no border! extension::adjust(bin_seg_dsp_, 0); - emit image_layer_count(bin_seg_dsp_.nslis()); + emit image_layer_count(bin_seg_dsp_.nslices()); emit updated_bin_seg_dsp_image(data::convert(igr::dsp_data_t(), slice(bin_seg_dsp_, sli))); } @@ -311,7 +311,7 @@ namespace igr unsigned mln_data::in_nslis() const { - return in_.nslis(); + return in_.nslices(); } @@ -323,7 +323,7 @@ namespace igr unsigned mln_data::seg_nslis() const { - return seg_.nslis(); + return seg_.nslices(); } const seg_data_t& mln_data::nregion() const diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/tools/crop.cc b/milena/sandbox/lazzara/igr/gui/segmentation/src/tools/crop.cc index 4692b8d..98dd57e 100644 --- a/milena/sandbox/lazzara/igr/gui/segmentation/src/tools/crop.cc +++ b/milena/sandbox/lazzara/igr/gui/segmentation/src/tools/crop.cc @@ -36,7 +36,7 @@ namespace igr br = box_.bottomRight(); box3d box(point3d(0, tl.y(), tl.x()), - point3d(data_->in().nslis() - 1, br.y(), br.x())); + point3d(data_->in().nslices() - 1, br.y(), br.x())); box.crop_wrt(data_->in().domain()); diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/tools/edit_seg.cc b/milena/sandbox/lazzara/igr/gui/segmentation/src/tools/edit_seg.cc index 3e14ea8..13c6730 100644 --- a/milena/sandbox/lazzara/igr/gui/segmentation/src/tools/edit_seg.cc +++ b/milena/sandbox/lazzara/igr/gui/segmentation/src/tools/edit_seg.cc @@ -55,7 +55,7 @@ namespace igr sub_min_sli = box.pmin().sli(), sub_min_row = box.pmin().row(), sub_min_col = box.pmin().col(), - nslis = box.nslis(), + nslis = box.nslices(), nrows = box.nrows(), ncols = box.ncols(); @@ -147,7 +147,7 @@ namespace igr sub_min_sli = box.pmin().sli(), sub_min_row = box.pmin().row(), sub_min_col = box.pmin().col(), - nslis = box.nslis(), + nslis = box.nslices(), nrows = box.nrows(), ncols = box.ncols(); diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/mean_regions_widget.cc b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/mean_regions_widget.cc index 5756458..dada656 100644 --- a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/mean_regions_widget.cc +++ b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/mean_regions_widget.cc @@ -128,7 +128,7 @@ namespace igr this, SLOT(task_finished_slot())); // Preparing x data for plot widget. - xData_.resize(data_->mean_regions_smooth().nslis()); + xData_.resize(data_->mean_regions_smooth().nslices()); for (int i = 0; i < xData_.size(); ++i) xData_[i] = i; diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/mln_data.cc b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/mln_data.cc index f8dc7c8..160363f 100644 --- a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/mln_data.cc +++ b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/mln_data.cc @@ -82,7 +82,7 @@ namespace igr // Notifying the successful loading emit image_loaded(filename); - emit image_layer_count(in_dsp_.nslis()); + emit image_layer_count(in_dsp_.nslices()); } @@ -118,7 +118,7 @@ namespace igr // Notifying the successful loading emit image_loaded(filename); - emit image_layer_count(in_dsp_.nslis()); + emit image_layer_count(in_dsp_.nslices()); } @@ -232,7 +232,7 @@ namespace igr // Make sure there is no border! extension::adjust(in_dsp_, 0); - emit image_layer_count(in_dsp_.nslis()); + emit image_layer_count(in_dsp_.nslices()); // emit updated_image(data::convert(igr::dsp_data_t(), sl_in_dsp)); } @@ -290,7 +290,7 @@ namespace igr // Make sure there is no border! extension::adjust(norm_smooth_dsp_, 0); - emit image_layer_count(norm_smooth_.nslis()); + emit image_layer_count(norm_smooth_.nslices()); compute_new_norm_smooth_image(0); } @@ -336,7 +336,7 @@ namespace igr nregion_smooth_ = nregion; - emit image_layer_count(seg_dsp_.nslis()); + emit image_layer_count(seg_dsp_.nslices()); compute_new_seg_image(sli); } @@ -386,7 +386,7 @@ namespace igr // Make sure there is no border! extension::adjust(mean_regions_dsp_, 0); - emit image_layer_count(mean_regions_dsp_.nslis()); + emit image_layer_count(mean_regions_dsp_.nslices()); compute_new_mean_regions_image(sli); } @@ -405,7 +405,7 @@ namespace igr unsigned mln_data::in_nslis() const { - return in_.nslis(); + return in_.nslices(); } @@ -455,7 +455,7 @@ namespace igr unsigned mln_data::seg_nslis() const { - return seg_.nslis(); + return seg_.nslices(); } const seg_data_t& mln_data::nregion() const diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/norm_smooth_widget.cc b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/norm_smooth_widget.cc index 682206e..d528c36 100644 --- a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/norm_smooth_widget.cc +++ b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/norm_smooth_widget.cc @@ -128,7 +128,7 @@ namespace igr this, SLOT(task_finished_slot())); // Preparing x data for plot widget. - xData_.resize(data_->norm_smooth().nslis()); + xData_.resize(data_->norm_smooth().nslices()); for (int i = 0; i < xData_.size(); ++i) xData_[i] = i; diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/crop.cc b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/crop.cc index 4692b8d..98dd57e 100644 --- a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/crop.cc +++ b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/crop.cc @@ -36,7 +36,7 @@ namespace igr br = box_.bottomRight(); box3d box(point3d(0, tl.y(), tl.x()), - point3d(data_->in().nslis() - 1, br.y(), br.x())); + point3d(data_->in().nslices() - 1, br.y(), br.x())); box.crop_wrt(data_->in().domain()); diff --git a/milena/sandbox/lazzara/igr/gui/shared/include/mean_function_per_region.hh b/milena/sandbox/lazzara/igr/gui/shared/include/mean_function_per_region.hh index 75da3a8..085472a 100644 --- a/milena/sandbox/lazzara/igr/gui/shared/include/mean_function_per_region.hh +++ b/milena/sandbox/lazzara/igr/gui/shared/include/mean_function_per_region.hh @@ -83,7 +83,7 @@ namespace igr if (! processed(lbl_v)) { util::array<V> result; - result.reserve(ima.nslis()); + result.reserve(ima.nslices()); const V *v = &ima.at_(0, p.row(), p.col()); for(int i = min_sli; i < max_sli; ++i, v += offset) @@ -92,7 +92,7 @@ namespace igr processed[lbl_v] = true; } - mln_assertion(result.size() == ima.nslis()); + mln_assertion(result.size() == ima.nslices()); } trace::exiting("igr::shared::mean_function_per_region"); diff --git a/milena/sandbox/lazzara/igr/gui/viewer/src/mln_data.cc b/milena/sandbox/lazzara/igr/gui/viewer/src/mln_data.cc index e9503c4..4ba3864 100644 --- a/milena/sandbox/lazzara/igr/gui/viewer/src/mln_data.cc +++ b/milena/sandbox/lazzara/igr/gui/viewer/src/mln_data.cc @@ -89,7 +89,7 @@ namespace igr // Notifying the successful loading emit image_loaded(filename); - emit image_layer_count(in_dsp_.nslis()); + emit image_layer_count(in_dsp_.nslices()); } @@ -199,7 +199,7 @@ namespace igr // Notifying the successful loading emit image_loaded(filename); - emit image_layer_count(in_dsp_.nslis()); + emit image_layer_count(in_dsp_.nslices()); } @@ -243,7 +243,7 @@ namespace igr // Notifying the successful loading emit image_loaded(filename); - emit image_layer_count(in_dsp_.nslis()); + emit image_layer_count(in_dsp_.nslices()); } @@ -315,7 +315,7 @@ namespace igr // Notifying the successful loading emit image_loaded(filename); - emit image_layer_count(in_dsp_.nslis()); + emit image_layer_count(in_dsp_.nslices()); } @@ -369,7 +369,7 @@ namespace igr unsigned mln_data::nslis() const { - return in_.nslis(); + return in_.nslices(); } } // end of namespace igr::viewer -- 1.5.6.5
13 years, 8 months
1
0
0
0
last-svn-commit-697-ga0aa478 Store loaded image with double value type.
by Guillaume Lazzara
* lazzara/igr/gui/viewer/src/main_window.cc: Avoid a warning. * lazzara/igr/gui/viewer/src/mln_data.cc, * lazzara/igr/gui/viewer/src/mln_data.hh: Change loaded image value type from int_u8 to double. --- milena/sandbox/ChangeLog | 10 +++++ .../lazzara/igr/gui/viewer/src/main_window.cc | 2 +- .../sandbox/lazzara/igr/gui/viewer/src/mln_data.cc | 43 ++++++++++++-------- .../sandbox/lazzara/igr/gui/viewer/src/mln_data.hh | 8 +++- 4 files changed, 44 insertions(+), 19 deletions(-) diff --git a/milena/sandbox/ChangeLog b/milena/sandbox/ChangeLog index 62d9d00..eca9e24 100644 --- a/milena/sandbox/ChangeLog +++ b/milena/sandbox/ChangeLog @@ -1,5 +1,15 @@ 2010-11-15 Guillaume Lazzara <z(a)lrde.epita.fr> + Store loaded image with double value type. + + * lazzara/igr/gui/viewer/src/main_window.cc: Avoid a warning. + + * lazzara/igr/gui/viewer/src/mln_data.cc, + * lazzara/igr/gui/viewer/src/mln_data.hh: Change loaded image + value type from int_u8 to double. + +2010-11-15 Guillaume Lazzara <z(a)lrde.epita.fr> + Add save button for function plots. * lazzara/igr/gui/segmentation2dt/src/plot_widget.cc, diff --git a/milena/sandbox/lazzara/igr/gui/viewer/src/main_window.cc b/milena/sandbox/lazzara/igr/gui/viewer/src/main_window.cc index 7770d7c..7d66659 100644 --- a/milena/sandbox/lazzara/igr/gui/viewer/src/main_window.cc +++ b/milena/sandbox/lazzara/igr/gui/viewer/src/main_window.cc @@ -141,7 +141,7 @@ namespace igr } - void main_window::clear_information_slot(const QPointF& p) + void main_window::clear_information_slot(const QPointF&) { point_info_->setText(""); } diff --git a/milena/sandbox/lazzara/igr/gui/viewer/src/mln_data.cc b/milena/sandbox/lazzara/igr/gui/viewer/src/mln_data.cc index 7579c62..e9503c4 100644 --- a/milena/sandbox/lazzara/igr/gui/viewer/src/mln_data.cc +++ b/milena/sandbox/lazzara/igr/gui/viewer/src/mln_data.cc @@ -79,7 +79,7 @@ namespace igr if (!tmp.is_valid()) emit error_loading("Cannot open file! Please checkout the permissions."); - in_ = make::image3d(tmp); + in_ = make::image3d(data::convert(double(), tmp)); in_dsp_ = data::convert(igr::dsp_data_t(), data::stretch(value::int_u8(), in_)); @@ -107,7 +107,7 @@ namespace igr if (!tmp.is_valid()) emit error_loading("Cannot open file! Please checkout the permissions."); - in_ = make::image3d(tmp); + in_ = make::image3d(data::convert(double(), tmp)); } else if (header.value_type == "bool") { @@ -116,7 +116,7 @@ namespace igr if (!tmp.is_valid()) emit error_loading("Cannot open file! Please checkout the permissions."); - in_ = make::image3d(data::convert(value::int_u12(), tmp)); + in_ = make::image3d(data::convert(double(), tmp)); } else if (header.value_type == "unsigned int") { @@ -125,7 +125,7 @@ namespace igr if (!tmp.is_valid()) emit error_loading("Cannot open file! Please checkout the permissions."); - in_ = make::image3d(data::stretch(value::int_u12(), tmp)); + in_ = make::image3d(data::convert(double(), tmp)); } else if (header.value_type == "float") { @@ -134,7 +134,7 @@ namespace igr if (!tmp.is_valid()) emit error_loading("Cannot open file! Please checkout the permissions."); - in_ = make::image3d(data::stretch(value::int_u12(), tmp)); + in_ = make::image3d(data::convert(double(), tmp)); } else qDebug() << "Error while loading the image: unsupported value type..."; @@ -148,10 +148,12 @@ namespace igr { if (header.value_type == "int_u12") { - io::raw::load(in_, filename.toStdString()); + image2d<value::int_u12> tmp; + io::raw::load(tmp, filename.toStdString()); - if (!in_.is_valid()) + if (!tmp.is_valid()) emit error_loading("Cannot open file! Please checkout the permissions."); + in_ = make::image3d(data::convert(double(), tmp)); } else if (header.value_type == "bool") { @@ -160,7 +162,7 @@ namespace igr if (!tmp.is_valid()) emit error_loading("Cannot open file! Please checkout the permissions."); - in_ = data::convert(value::int_u12(), tmp); + in_ = data::convert(double(), tmp); } else if (header.value_type == "unsigned int") { @@ -169,7 +171,7 @@ namespace igr if (!tmp.is_valid()) emit error_loading("Cannot open file! Please checkout the permissions."); - in_ = data::stretch(value::int_u12(), tmp); + in_ = data::convert(double(), tmp); } else if (header.value_type == "float") { @@ -178,7 +180,7 @@ namespace igr if (!tmp.is_valid()) emit error_loading("Cannot open file! Please checkout the permissions."); - in_ = data::stretch(value::int_u12(), tmp); + in_ = data::convert(double(), tmp); } else qDebug() << "Error while loading the image: unsupported value type " @@ -215,14 +217,17 @@ namespace igr if (!tmp.is_valid()) emit error_loading("Cannot open file! Please checkout the permissions."); - in_ = make::image3d(tmp); + in_ = make::image3d(data::convert(double(), tmp)); in_dsp_ = data::convert(igr::dsp_data_t(), data::stretch(value::int_u8(), in_)); } else if (header.dim == 3) { - io::dicom::load(in_, filename.toStdString()); + image3d<value::int_u12> tmp; + io::dicom::load(tmp, filename.toStdString()); + + in_ = data::convert(double(), tmp); if (!in_.is_valid()) emit error_loading("Cannot open file! Please checkout the permissions."); @@ -257,7 +262,7 @@ namespace igr if (!tmp.is_valid()) emit error_loading("Cannot open file! Please checkout the permissions."); - in_ = make::image3d(tmp); + in_ = make::image3d(data::convert(double(), tmp)); } else if (header.value_type == "unsigned int") { @@ -266,7 +271,7 @@ namespace igr if (!tmp.is_valid()) emit error_loading("Cannot open file! Please checkout the permissions."); - in_ = make::image3d(data::stretch(value::int_u12(), tmp)); + in_ = make::image3d(data::convert(double(), tmp)); } else qDebug() << "Error while loading the image: unsupported value type " @@ -276,7 +281,10 @@ namespace igr { if (header.value_type == "int_u12") { - io::dump::load(in_, filename.toStdString()); + image2d<value::int_u12> tmp; + io::dicom::load(tmp, filename.toStdString()); + + in_ = make::image3d(data::convert(double(), tmp)); if (!in_.is_valid()) emit error_loading("Cannot open file! Please checkout the permissions."); @@ -288,7 +296,7 @@ namespace igr if (!tmp.is_valid()) emit error_loading("Cannot open file! Please checkout the permissions."); - in_ = data::stretch(value::int_u12(), tmp); + in_ = data::convert(double(), tmp); } else qDebug() << "Error while loading the image: unsupported value type " @@ -328,7 +336,8 @@ namespace igr else if (ext == "raw") io::raw::save(slice(in_, sli), filename.toStdString()); else if (ext == "pgm") - io::pgm::save(slice(in_, sli), filename.toStdString()); + io::pgm::save(data::convert(value::int_u8(), slice(in_, sli)), + filename.toStdString()); else emit error_saving(tr("Error while saving. Output format not supported.")); } diff --git a/milena/sandbox/lazzara/igr/gui/viewer/src/mln_data.hh b/milena/sandbox/lazzara/igr/gui/viewer/src/mln_data.hh index 57ee01f..fdd72d9 100644 --- a/milena/sandbox/lazzara/igr/gui/viewer/src/mln_data.hh +++ b/milena/sandbox/lazzara/igr/gui/viewer/src/mln_data.hh @@ -41,7 +41,13 @@ namespace igr Q_OBJECT public: - typedef image3d<value::int_u12> in_t; + + /*! We want to store every loaded images with double data type + to avoid data stretching/saturation. Since both float and + integer images can be loaded we that to preserve the + precision. + */ + typedef image3d<double> in_t; typedef image3d<igr::dsp_data_t> in_dsp_t; mln_data(); -- 1.5.6.5
13 years, 8 months
1
0
0
0
last-svn-commit-696-g27c8f05 Add save button for function plots.
by Guillaume Lazzara
* lazzara/igr/gui/segmentation2dt/src/plot_widget.cc, * lazzara/igr/gui/segmentation2dt/src/plot_widget.hh: Here. --- milena/sandbox/ChangeLog | 7 ++++++ .../igr/gui/segmentation2dt/src/plot_widget.cc | 21 ++++++++++++++++++++ .../igr/gui/segmentation2dt/src/plot_widget.hh | 1 + 3 files changed, 29 insertions(+), 0 deletions(-) diff --git a/milena/sandbox/ChangeLog b/milena/sandbox/ChangeLog index 07874a9..62d9d00 100644 --- a/milena/sandbox/ChangeLog +++ b/milena/sandbox/ChangeLog @@ -1,5 +1,12 @@ 2010-11-15 Guillaume Lazzara <z(a)lrde.epita.fr> + Add save button for function plots. + + * lazzara/igr/gui/segmentation2dt/src/plot_widget.cc, + * lazzara/igr/gui/segmentation2dt/src/plot_widget.hh: Here. + +2010-11-15 Guillaume Lazzara <z(a)lrde.epita.fr> + Add function visualization in the mean region widget. * lazzara/igr/gui/segmentation2dt/src/mean_regions_widget.cc, diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/plot_widget.cc b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/plot_widget.cc index a19ce36..d90d6d4 100644 --- a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/plot_widget.cc +++ b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/plot_widget.cc @@ -78,6 +78,27 @@ namespace igr } + void plot_widget::on_savePlotBtn__clicked() + { + QPixmap plotPix = QPixmap::grabWidget(plot_); + + QString plotfile = QFileDialog::getSaveFileName(this, + tr("Save plot."), + QString(), + tr("PNG (*.png)")); + + if (!plotfile.endsWith(".png", Qt::CaseInsensitive)) + plotfile.append(".png"); + + if (!plotPix.save(plotfile, "PNG", 100)) + { + QMessageBox::critical(0, "Error saving plot!", + "Cannot write plot file. Make sure you have " + "write permissions."); + } + } + + } // end of namespace igr::segmentation } // end of namespace igr diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/plot_widget.hh b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/plot_widget.hh index bdfce62..e9af350 100644 --- a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/plot_widget.hh +++ b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/plot_widget.hh @@ -62,6 +62,7 @@ namespace igr void on_zoomBestBtn__clicked(); void on_zoomOutBtn__clicked(); void on_zoomInBtn__clicked(); + void on_savePlotBtn__clicked(); private: // Members -- 1.5.6.5
13 years, 8 months
1
0
0
0
← Newer
1
...
6
7
8
9
10
11
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
Results per page:
10
25
50
100
200