Olena-patches
Threads by month
- ----- 2025 -----
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 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
- 9625 discussions
last-svn-commit-872-g316f515 New specific toolchain for historical documents.
by Guillaume Lazzara 16 May '11
by Guillaume Lazzara 16 May '11
16 May '11
* scribo/toolchain/content_in_hdoc.hh,
* scribo/toolchain/internal/content_in_hdoc_functor.hh,
* src/content_in_hdoc.cc: New.
---
scribo/ChangeLog | 8 ++
.../{content_in_doc.hh => content_in_hdoc.hh} | 14 ++--
...n_doc_functor.hh => content_in_hdoc_functor.hh} | 69 +++++++++++++------
.../src/{content_in_doc.cc => content_in_hdoc.cc} | 47 ++++++++++++--
4 files changed, 103 insertions(+), 35 deletions(-)
copy scribo/scribo/toolchain/{content_in_doc.hh => content_in_hdoc.hh} (85%)
copy scribo/scribo/toolchain/internal/{content_in_doc_functor.hh => content_in_hdoc_functor.hh} (87%)
copy scribo/src/{content_in_doc.cc => content_in_hdoc.cc} (80%)
diff --git a/scribo/ChangeLog b/scribo/ChangeLog
index 0b6042c..d3d7f90 100644
--- a/scribo/ChangeLog
+++ b/scribo/ChangeLog
@@ -1,3 +1,11 @@
+2011-05-16 Guillaume Lazzara <lazzara(a)fidji.lrde.epita.fr>
+
+ New specific toolchain for historical documents.
+
+ * scribo/toolchain/content_in_hdoc.hh,
+ * scribo/toolchain/internal/content_in_hdoc_functor.hh,
+ * src/content_in_hdoc.cc: New.
+
2011-05-17 Guillaume Lazzara <z(a)lrde.epita.fr>
Fix use of skeleton_constrained.
diff --git a/scribo/scribo/toolchain/content_in_doc.hh b/scribo/scribo/toolchain/content_in_hdoc.hh
similarity index 85%
copy from scribo/scribo/toolchain/content_in_doc.hh
copy to scribo/scribo/toolchain/content_in_hdoc.hh
index 8f6f7a4..97233d5 100644
--- a/scribo/scribo/toolchain/content_in_doc.hh
+++ b/scribo/scribo/toolchain/content_in_hdoc.hh
@@ -23,14 +23,14 @@
// exception does not however invalidate any other reasons why the
// executable file might be covered by the GNU General Public License.
-#ifndef SCRIBO_TOOLCHAIN_CONTENT_IN_DOC_HH
-# define SCRIBO_TOOLCHAIN_CONTENT_IN_DOC_HH
+#ifndef SCRIBO_TOOLCHAIN_CONTENT_IN_HDOC_HH
+# define SCRIBO_TOOLCHAIN_CONTENT_IN_HDOC_HH
/// \file
///
/// Analyse a document.
-# include <scribo/toolchain/internal/content_in_doc_functor.hh>
+# include <scribo/toolchain/internal/content_in_hdoc_functor.hh>
namespace scribo
{
@@ -43,7 +43,7 @@ namespace scribo
template <typename I, typename J>
document<mln_ch_value(I, def::lbl_type)>
- content_in_doc(const Image<I>& input, const Image<J>& input_preproc,
+ content_in_hdoc(const Image<I>& input, const Image<J>& input_preproc,
bool denoise,
bool find_line_seps = true,
bool find_whitespace_seps = true,
@@ -56,7 +56,7 @@ namespace scribo
template <typename I, typename J>
document<mln_ch_value(I, def::lbl_type)>
- content_in_doc(const Image<I>& input, const Image<J>& input_preproc,
+ content_in_hdoc(const Image<I>& input, const Image<J>& input_preproc,
bool denoise,
bool find_line_seps = true,
bool find_whitespace_seps = true,
@@ -66,7 +66,7 @@ namespace scribo
mln_precondition(exact(input).is_valid());
mln_precondition(exact(input_preproc).is_valid());
- internal::content_in_doc_functor<J> f("noname");
+ internal::content_in_hdoc_functor<J> f("noname");
f.enable_denoising = denoise;
f.enable_line_seps = find_line_seps;
f.enable_whitespace_seps = find_whitespace_seps;
@@ -87,5 +87,5 @@ namespace scribo
} // end of namespace scribo
-#endif // SCRIBO_TOOLCHAIN_CONTENT_IN_DOC_HH
+#endif // SCRIBO_TOOLCHAIN_CONTENT_IN_HDOC_HH
diff --git a/scribo/scribo/toolchain/internal/content_in_doc_functor.hh b/scribo/scribo/toolchain/internal/content_in_hdoc_functor.hh
similarity index 87%
copy from scribo/scribo/toolchain/internal/content_in_doc_functor.hh
copy to scribo/scribo/toolchain/internal/content_in_hdoc_functor.hh
index d60f3cc..92db8a7 100644
--- a/scribo/scribo/toolchain/internal/content_in_doc_functor.hh
+++ b/scribo/scribo/toolchain/internal/content_in_hdoc_functor.hh
@@ -24,19 +24,20 @@
// exception does not however invalidate any other reasons why the
// executable file might be covered by the GNU General Public License.
-#ifndef SCRIBO_TOOLCHAIN_INTERNAL_CONTENT_IN_DOC_FUNCTOR_HH
-# define SCRIBO_TOOLCHAIN_INTERNAL_CONTENT_IN_DOC_FUNCTOR_HH
+#ifndef SCRIBO_TOOLCHAIN_INTERNAL_CONTENT_IN_HDOC_FUNCTOR_HH
+# define SCRIBO_TOOLCHAIN_INTERNAL_CONTENT_IN_HDOC_FUNCTOR_HH
# include <scribo/core/def/lbl_type.hh>
# include <scribo/core/document.hh>
# include <scribo/core/line_set.hh>
# include <scribo/core/paragraph_set.hh>
-# include <scribo/primitive/extract/non_text.hh>
+# include <scribo/primitive/extract/non_text_hdoc.hh>
# include <scribo/primitive/extract/components.hh>
-# include <scribo/primitive/extract/separators.hh>
-# include <scribo/primitive/extract/vertical_separators.hh>
-# include <scribo/primitive/extract/horizontal_separators.hh>
+// # include <scribo/primitive/extract/separators.hh>
+// # include <scribo/primitive/extract/vertical_separators.hh>
+// # include <scribo/primitive/extract/horizontal_separators.hh>
+# include <scribo/primitive/extract/lines_h_thick_and_thin.hh>
# include <scribo/primitive/extract/alignments.hh>
@@ -44,6 +45,8 @@
# include <scribo/primitive/remove/separators.hh>
+# include <scribo/preprocessing/rotate_90.hh>
+
# include <scribo/filter/line_links_x_height.hh>
# include <scribo/filter/object_links_bbox_h_ratio.hh>
# include <scribo/filter/objects_small.hh>
@@ -87,13 +90,13 @@ namespace scribo
template <typename I>
- struct content_in_doc_functor
+ struct content_in_hdoc_functor
: public Toolchain_Functor
{
typedef scribo::def::lbl_type V;
typedef mln_ch_value(I,V) L;
- content_in_doc_functor(const char *doc_filename);
+ content_in_hdoc_functor(const char *doc_filename);
virtual int nsteps() const;
@@ -135,7 +138,7 @@ namespace scribo
# ifndef MLN_INCLUDE_ONLY
template <typename I>
- content_in_doc_functor<I>::content_in_doc_functor(const char *doc_filename)
+ content_in_hdoc_functor<I>::content_in_hdoc_functor(const char *doc_filename)
: enable_denoising(true),
enable_line_seps(true),
enable_whitespace_seps(true),
@@ -155,9 +158,9 @@ namespace scribo
template <typename I>
template <typename J>
- scribo::document<typename content_in_doc_functor<I>::L>
- content_in_doc_functor<I>::operator()(const Image<J>& original_image,
- const Image<I>& processed_image)
+ scribo::document<typename content_in_hdoc_functor<I>::L>
+ content_in_hdoc_functor<I>::operator()(const Image<J>& original_image,
+ const Image<I>& processed_image)
{
mln_precondition(exact(original_image).is_valid());
mln_precondition(exact(processed_image).is_valid());
@@ -177,8 +180,11 @@ namespace scribo
// Vertical and horizontal separators
{
mln_ch_value(I,bool)
- vseparators = primitive::extract::vertical_separators(processed_image, 81),
- hseparators = primitive::extract::horizontal_separators(processed_image, 81);
+ vseparators = preprocessing::rotate_90(
+ primitive::extract::lines_h_thick_and_thin(
+ preprocessing::rotate_90(processed_image), 101, 3, 0.05, 0.80, 2), false),
+ hseparators = primitive::extract::lines_h_thick_and_thin(
+ processed_image, 101, 3);
doc.set_vline_separators(vseparators);
doc.set_hline_separators(hseparators);
@@ -196,6 +202,7 @@ namespace scribo
input_cleaned = primitive::remove::separators(processed_image,
separators);
+ doc.set_binary_image_wo_seps(input_cleaned);
on_progress();
}
@@ -204,15 +211,15 @@ namespace scribo
// Debug
if (enable_line_seps)
{
- debug::logger().log_image(debug::AuxiliaryResults,
+ debug::logger().log_image(debug::Special,
doc.vline_seps(),
"vseparators");
- debug::logger().log_image(debug::AuxiliaryResults,
+ debug::logger().log_image(debug::Special,
doc.hline_seps(),
"hseparators");
- debug::logger().log_image(debug::AuxiliaryResults,
+ debug::logger().log_image(debug::Special,
input_cleaned,
"input_wo_separators");
}
@@ -247,6 +254,7 @@ namespace scribo
on_progress();
+
/// Set separator components.
if (enable_line_seps)
components.add_separators(separators);
@@ -371,7 +379,7 @@ namespace scribo
if (debug::logger().is_enabled())
{
if (enable_whitespace_seps)
- debug::logger().log_image(debug::AuxiliaryResults,
+ debug::logger().log_image(debug::Special,
whitespaces, "whitespaces");
// Bboxes image.
@@ -435,6 +443,22 @@ namespace scribo
on_progress();
+ //===== DEBUG =====
+# ifndef SCRIBO_NDEBUG
+ {
+ image2d<bool> tmp = duplicate(input_cleaned);
+ for_all_lines(l, lines)
+ if (lines(l).is_textline())
+ mln::draw::box_plain(tmp, lines(l).bbox(), false);
+
+ debug::logger().log_image(
+ debug::AuxiliaryResults,
+ tmp,
+ "input_wo_text");
+ }
+# endif // ! SCRIBO_NDEBUG
+ //===== END OF DEBUG =====
+
// Text recognition
if (enable_ocr)
{
@@ -543,7 +567,7 @@ namespace scribo
// Extract other Elements
on_new_progress_label("Extracting Elements");
component_set<L>
- elements = scribo::primitive::extract::non_text(doc, 3);
+ elements = scribo::primitive::extract::non_text_hdoc(doc, 31);
on_progress();
@@ -551,6 +575,7 @@ namespace scribo
// Identify other Elements
on_new_progress_label("Identifying Elements");
elements = scribo::primitive::identify(elements);
+
doc.set_elements(elements);
on_progress();
@@ -575,7 +600,7 @@ namespace scribo
template<typename I>
int
- content_in_doc_functor<I>::nsteps() const
+ content_in_hdoc_functor<I>::nsteps() const
{
return 10 + enable_denoising + enable_line_seps
+ enable_whitespace_seps + enable_ocr + save_doc_as_xml;
@@ -584,7 +609,7 @@ namespace scribo
template<typename I>
void
- content_in_doc_functor<I>::on_xml_saved()
+ content_in_hdoc_functor<I>::on_xml_saved()
{
// Nothing
}
@@ -598,4 +623,4 @@ namespace scribo
} // end of namespace scribo
-#endif // ! SCRIBO_TOOLCHAIN_INTERNAL_CONTENT_IN_DOC_FUNCTOR_HH
+#endif // ! SCRIBO_TOOLCHAIN_INTERNAL_CONTENT_IN_HDOC_FUNCTOR_HH
diff --git a/scribo/src/content_in_doc.cc b/scribo/src/content_in_hdoc.cc
similarity index 80%
copy from scribo/src/content_in_doc.cc
copy to scribo/src/content_in_hdoc.cc
index c879504..e0d2258 100644
--- a/scribo/src/content_in_doc.cc
+++ b/scribo/src/content_in_hdoc.cc
@@ -34,7 +34,7 @@
#include <mln/io/pbm/save.hh>
#include <mln/io/magick/load.hh>
-#include <scribo/toolchain/content_in_doc.hh>
+#include <scribo/toolchain/content_in_hdoc.hh>
#include <scribo/toolchain/text_in_doc_preprocess.hh>
#include <scribo/core/document.hh>
@@ -46,6 +46,14 @@
#include <scribo/preprocessing/crop.hh>
#include <scribo/io/xml/save.hh>
+#include <scribo/io/img/save.hh>
+
+
+#include <mln/core/alias/neighb2d.hh>
+#include <mln/labeling/compute.hh>
+#include <mln/labeling/foreground.hh>
+#include <mln/util/timer.hh>
+
const char *args_desc[][2] =
@@ -87,10 +95,15 @@ int main(int argc, char* argv[])
scribo::make::internal::debug_filename_prefix = argv[argc - 1];
}
+ scribo::debug::logger().set_level(scribo::debug::None);
+
trace::entering("main");
Magick::InitializeMagick(*argv);
+ mln::util::timer t;
+ t.start();
+
typedef image2d<scribo::def::lbl_type> L;
image2d<value::rgb8> input;
mln::io::magick::load(input, argv[1]);
@@ -109,6 +122,23 @@ int main(int argc, char* argv[])
}
input_preproc = toolchain::text_in_doc_preprocess(input, false, K);
+
+ // Cleanup components on borders
+ {
+ typedef scribo::def::lbl_type V;
+ V nlabels;
+ image2d<V> lbl = labeling::foreground(input_preproc, c8(), nlabels);
+ mln::util::array<box2d>
+ bbox = labeling::compute(accu::shape::bbox<point2d>(), lbl, nlabels);
+
+ const box2d& b = input.domain();
+ for_all_ncomponents(e, nlabels)
+ if (bbox(e).pmin().row() == b.pmin().row()
+ || bbox(e).pmax().row() == b.pmax().row()
+ || bbox(e).pmin().col() == b.pmin().col()
+ || bbox(e).pmax().col() == b.pmax().col())
+ data::fill(((input_preproc | bbox(e)).rw() | (pw::value(lbl) == pw::cst(e))).rw(), false);
+ }
}
// Optional Cropping
@@ -164,15 +194,20 @@ int main(int argc, char* argv[])
// Text
std::cout << "Analysing document..." << std::endl;
document<L>
- doc = scribo::toolchain::content_in_doc(input, input_preproc, denoise,
- find_line_seps, find_whitespace_seps,
- !language.empty(), language);
+ doc = scribo::toolchain::content_in_hdoc(input, input_preproc, denoise,
+ find_line_seps, find_whitespace_seps,
+ !language.empty(), language);
// Saving results
std::cout << "Saving results..." << std::endl;
- scribo::io::xml::save(doc, argv[2], scribo::io::xml::PageExtended);
scribo::io::xml::save(doc, "page.xml", scribo::io::xml::Page);
- scribo::io::xml::save(doc, "full.xml", scribo::io::xml::Full);
+
+ std::cout << "End of process - " << t << std::endl;
+
+ scribo::io::xml::save(doc, argv[2], scribo::io::xml::PageExtended);
+ scribo::io::img::save(doc, "debug.png", scribo::io::img::DebugWoImage);
+ scribo::io::img::save(doc, "full.png", scribo::io::img::Full);
+ // scribo::io::xml::save(doc, "full.xml", scribo::io::xml::Full);
trace::exiting("main");
}
--
1.5.6.5
1
0
12 May '11
* scribo/core/tag/line.hh: Add operator<<.
* scribo/io/xml/internal/compute_text_colour.hh: Update color
names.
* scribo/io/xml/internal/extended_page_xml_visitor.hh,
* scribo/io/xml/internal/full_xml_visitor.hh,
* scribo/io/xml/internal/page_xml_visitor.hh,
* scribo/io/xml/internal/print_box_coords.hh,
* scribo/io/xml/internal/print_page_preambule.hh: Update in order
to produce PAGE compatible XML files.
---
scribo/ChangeLog | 16 ++++
scribo/scribo/core/tag/line.hh | 13 +++-
.../scribo/io/xml/internal/compute_text_colour.hh | 32 ++++----
.../io/xml/internal/extended_page_xml_visitor.hh | 4 +-
scribo/scribo/io/xml/internal/full_xml_visitor.hh | 4 +-
scribo/scribo/io/xml/internal/page_xml_visitor.hh | 77 +++++++++++++-------
scribo/scribo/io/xml/internal/print_box_coords.hh | 12 ++--
.../scribo/io/xml/internal/print_page_preambule.hh | 42 +++++++-----
8 files changed, 129 insertions(+), 71 deletions(-)
diff --git a/scribo/ChangeLog b/scribo/ChangeLog
index 08642d5..fedc5ec 100644
--- a/scribo/ChangeLog
+++ b/scribo/ChangeLog
@@ -1,3 +1,19 @@
+2011-05-12 Guillaume Lazzara <lazzara(a)fidji.lrde.epita.fr>
+
+ Update support for PAGE XML format.
+
+ * scribo/core/tag/line.hh: Add operator<<.
+
+ * scribo/io/xml/internal/compute_text_colour.hh: Update color
+ names.
+
+ * scribo/io/xml/internal/extended_page_xml_visitor.hh,
+ * scribo/io/xml/internal/full_xml_visitor.hh,
+ * scribo/io/xml/internal/page_xml_visitor.hh,
+ * scribo/io/xml/internal/print_box_coords.hh,
+ * scribo/io/xml/internal/print_page_preambule.hh: Update in order
+ to produce PAGE compatible XML files.
+
2011-05-11 Guillaume Lazzara <lazzara(a)fidji.lrde.epita.fr>
Small fixes in Scribo.
diff --git a/scribo/scribo/core/tag/line.hh b/scribo/scribo/core/tag/line.hh
index 3fb1fdf..12b3246 100644
--- a/scribo/scribo/core/tag/line.hh
+++ b/scribo/scribo/core/tag/line.hh
@@ -158,8 +158,7 @@ namespace scribo
inline
- std::ostream&
- operator<<(std::ostream& ostr, const Type& type)
+ std::string type2str(const Type& type)
{
std::string str;
switch(type)
@@ -205,9 +204,17 @@ namespace scribo
break;
}
- return ostr << str;
+ return str;
+ }
+
+ inline
+ std::ostream&
+ operator<<(std::ostream& ostr, const Type& type)
+ {
+ return ostr << type2str(type);
}
+
inline
Type str2type(const std::string& str)
{
diff --git a/scribo/scribo/io/xml/internal/compute_text_colour.hh b/scribo/scribo/io/xml/internal/compute_text_colour.hh
index 1caf358..86fe454 100644
--- a/scribo/scribo/io/xml/internal/compute_text_colour.hh
+++ b/scribo/scribo/io/xml/internal/compute_text_colour.hh
@@ -48,7 +48,7 @@ namespace scribo
{
const char *
- compute_txt_text_colour(const value::rgb8& v);
+ compute_text_colour(const value::rgb8& v);
struct color_t
@@ -63,23 +63,23 @@ namespace scribo
const char *
- compute_txt_text_colour(const value::rgb8& v)
+ compute_text_colour(const value::rgb8& v)
{
static color_t colors[] = {
- { mln::make::vec(0, 0, 0), "Black", 0 },
- { mln::make::vec(255, 0, 0), "Red", 0 },
- { mln::make::vec(255, 255, 255), "White", 0 },
- { mln::make::vec(0, 255, 0), "Green", 0 },
- { mln::make::vec(0, 0, 255), "Blue", 0 },
- { mln::make::vec(255, 255, 0), "Yellow", 0 },
- { mln::make::vec(255, 165, 0), "Orange", 0 },
- { mln::make::vec(255, 192, 203), "Pink", 0 },
- { mln::make::vec(192, 192, 192), "Grey", 0 },
- { mln::make::vec(64, 224, 208), "Turquoise", 0 },
- { mln::make::vec(75, 0, 130), "Indigo", 0 },
- { mln::make::vec(238, 130, 238), "Violet", 0 },
- { mln::make::vec(0, 255, 255), "Cyan", 0 },
- { mln::make::vec(255, 0, 255), "Magenta", 0 },
+ { mln::make::vec(0, 0, 0), "black", 0 },
+ { mln::make::vec(255, 0, 0), "red", 0 },
+ { mln::make::vec(255, 255, 255), "white", 0 },
+ { mln::make::vec(0, 255, 0), "green", 0 },
+ { mln::make::vec(0, 0, 255), "blue", 0 },
+ { mln::make::vec(255, 255, 0), "yellow", 0 },
+ { mln::make::vec(255, 165, 0), "orange", 0 },
+ { mln::make::vec(255, 192, 203), "pink", 0 },
+ { mln::make::vec(192, 192, 192), "grey", 0 },
+ { mln::make::vec(64, 224, 208), "turquoise", 0 },
+ { mln::make::vec(75, 0, 130), "indigo", 0 },
+ { mln::make::vec(238, 130, 238), "violet", 0 },
+ { mln::make::vec(0, 255, 255), "cyan", 0 },
+ { mln::make::vec(255, 0, 255), "magenta", 0 },
{ mln::make::vec(0, 0, 0), 0, 0 } // Invalid
};
diff --git a/scribo/scribo/io/xml/internal/extended_page_xml_visitor.hh b/scribo/scribo/io/xml/internal/extended_page_xml_visitor.hh
index 869795b..0cdebb5 100644
--- a/scribo/scribo/io/xml/internal/extended_page_xml_visitor.hh
+++ b/scribo/scribo/io/xml/internal/extended_page_xml_visitor.hh
@@ -267,7 +267,7 @@ namespace scribo
<< "\" txt_text_type=\"" << lines(fid).type()
<< "\" txt_reverse_video=\"" << (lines(fid).reverse_video() ? "true" : "false")
<< "\" txt_indented=\"" << (lines(fid).indented() ? "true" : "false")
- << "\" txt_text_colour=\"" << internal::compute_txt_text_colour(parset(p).color())
+ << "\" txt_text_colour=\"" << internal::compute_text_colour(parset(p).color())
<< "\" kerning=\"" << lines(fid).char_space();
// EXTENSIONS - Not officially supported
@@ -321,7 +321,7 @@ namespace scribo
<< "\" txt_text_type=\"" << line.type()
<< "\" txt_reverse_video=\"" << (line.reverse_video() ? "true" : "false")
<< "\" txt_indented=\"" << (line.indented() ? "true" : "false")
- << "\" txt_text_colour=\"" << internal::compute_txt_text_colour(line.color())
+ << "\" txt_text_colour=\"" << internal::compute_text_colour(line.color())
<< "\" kerning=\"" << line.char_space()
<< "\" baseline=\"" << line.baseline()
<< "\" meanline=\"" << line.meanline()
diff --git a/scribo/scribo/io/xml/internal/full_xml_visitor.hh b/scribo/scribo/io/xml/internal/full_xml_visitor.hh
index 6b59e60..a8dfffe 100644
--- a/scribo/scribo/io/xml/internal/full_xml_visitor.hh
+++ b/scribo/scribo/io/xml/internal/full_xml_visitor.hh
@@ -453,7 +453,7 @@ namespace scribo
<< "\" txt_text_type=\"" << lines(fid).type()
<< "\" txt_reverse_video=\"" << (lines(fid).reverse_video() ? "true" : "false")
<< "\" txt_indented=\"" << (lines(fid).indented() ? "true" : "false")
- << "\" txt_text_colour=\"" << internal::compute_txt_text_colour(parset(p).color())
+ << "\" txt_text_colour=\"" << internal::compute_text_colour(parset(p).color())
<< "\" kerning=\"" << lines(fid).char_space();
// EXTENSIONS - Not officially supported
@@ -507,7 +507,7 @@ namespace scribo
<< "\" txt_text_type=\"" << line.type()
<< "\" txt_reverse_video=\"" << (line.reverse_video() ? "true" : "false")
<< "\" txt_indented=\"" << (line.indented() ? "true" : "false")
- << "\" txt_text_colour=\"" << internal::compute_txt_text_colour(line.color())
+ << "\" txt_text_colour=\"" << internal::compute_text_colour(line.color())
<< "\" kerning=\"" << line.char_space()
<< "\" baseline=\"" << line.baseline()
<< "\" meanline=\"" << line.meanline()
diff --git a/scribo/scribo/io/xml/internal/page_xml_visitor.hh b/scribo/scribo/io/xml/internal/page_xml_visitor.hh
index 0014caf..0f3cce1 100644
--- a/scribo/scribo/io/xml/internal/page_xml_visitor.hh
+++ b/scribo/scribo/io/xml/internal/page_xml_visitor.hh
@@ -37,6 +37,7 @@
# include <scribo/io/xml/internal/print_box_coords.hh>
# include <scribo/io/xml/internal/print_page_preambule.hh>
+# include <scribo/io/xml/internal/compute_text_colour.hh>
namespace scribo
@@ -56,12 +57,11 @@ namespace scribo
We use a XML Schema part of the PAGE (Page Analysis and Ground
truth Elements) image representation framework.
- This schema was used in the Page Segmentation COMPetition
- (PSCOMP) for ICDAR 2009.
+ This schema was used in the Historical Document Layout
+ Analysis COMPetition (HDLAC) for ICDAR 2011.
Its XSD file is located here:
- http://schema.primaresearch.org/PAGE/gts/pagecontent/2009-03-16/pagecontent…
-
+ http://schema.primaresearch.org/PAGE/gts/pagecontent/2010-03-19/pagecontent…
*/
class page_xml_visitor : public doc_serializer<page_xml_visitor>
{
@@ -83,6 +83,7 @@ namespace scribo
private: // Attributes
std::ofstream& output;
+ mutable int base_vertical_line_id_;
};
@@ -104,6 +105,12 @@ namespace scribo
void
page_xml_visitor::visit(const document<L>& doc) const
{
+ // Make sure there are no duplicate ids for line separators.
+ // Vertical and horizontal lines are indexed separately from
+ // 0, so vertical and horizontal lines with the same id
+ // exist.
+ base_vertical_line_id_ = doc.hline_seps_comps().nelements();
+
// Preambule
print_PAGE_preambule(output, doc, true);
@@ -121,8 +128,8 @@ namespace scribo
if (doc.has_hline_seps())
doc.hline_seps_comps().accept(*this);
- output << " </page>" << std::endl;
- output << "</pcGts>" << std::endl;
+ output << " </Page>" << std::endl;
+ output << "</PcGts>" << std::endl;
}
@@ -147,16 +154,26 @@ namespace scribo
switch (info.type())
{
case component::VerticalLineSeparator:
+ {
+ output << " <SeparatorRegion id=\"sr" << info.id() + base_vertical_line_id_
+ << "\" orientation=\"0.000000\" "
+ << " colour=\"black\">" << std::endl;
+
+ internal::print_box_coords(output, info.bbox(), " ");
+
+ output << " </SeparatorRegion>" << std::endl;
+ break;
+ }
+
case component::HorizontalLineSeparator:
{
- output << " <separator_region id=\"sr" << info.id()
- << "\" sep_orientation=\"0.000000\" "
- << " sep_colour=\"Black\" "
- << " sep_bgcolour=\"White\">" << std::endl;
+ output << " <SeparatorRegion id=\"sr" << info.id()
+ << "\" orientation=\"0.000000\" "
+ << " colour=\"black\">" << std::endl;
internal::print_box_coords(output, info.bbox(), " ");
- output << " </separator_region>" << std::endl;
+ output << " </SeparatorRegion>" << std::endl;
break;
}
@@ -164,15 +181,15 @@ namespace scribo
default:
case component::Image:
{
- output << " <image_region id=\"ir" << info.id()
- << "\" img_colour_type=\"24_Bit_Colour\""
- << " img_orientation=\"0.000000\" "
- << " img_emb_text=\"No\" "
- << " img_bgcolour=\"White\">" << std::endl;
+ output << " <ImageRegion id=\"ir" << info.id()
+ << "\" colourDepth=\"colour\""
+ << " orientation=\"0.000000\" "
+ << " embText=\"false\" "
+ << " bgColour=\"white\">" << std::endl;
internal::print_box_coords(output, info.bbox(), " ");
- output << " </image_region>" << std::endl;
+ output << " </ImageRegion>" << std::endl;
break;
}
}
@@ -194,20 +211,30 @@ namespace scribo
// FIXME: compute that information on the whole paragraph
// and use them here.
line_id_t fid = line_ids(0);
- output << " <text_region id=\"" << p
- << "\" txt_orientation=\"" << lines(fid).orientation()
- << "\" txt_reading_orientation=\"" << lines(fid).reading_orientation()
- << "\" txt_reading_direction=\"" << lines(fid).reading_direction()
- << "\" txt_text_type=\"" << lines(fid).type()
- << "\" txt_reverse_video=\"" << (lines(fid).reverse_video() ? "true" : "false")
- << "\" txt_indented=\"" << (lines(fid).indented() ? "true" : "false")
+ output << " <TextRegion id=\"r" << p
+ << "\" orientation=\"" << lines(fid).orientation()
+ << "\" readingOrientation=\"" << lines(fid).reading_orientation()
+ << "\" readingDirection=\"" << lines(fid).reading_direction()
+ << "\" type=\"" << ((lines(fid).type() == line::Text) ? "paragraph" : line::type2str(lines(fid).type()))
+ << "\" reverseVideo=\"" << (lines(fid).reverse_video() ? "true" : "false")
+ << "\" indented=\"" << (lines(fid).indented() ? "true" : "false")
<< "\" kerning=\"" << lines(fid).char_space()
+ << "\" textColour=\"" << compute_text_colour(lines(fid).color())
+// << "\" bgColour=\"" << compute_text_color(lines(fid).bgcolor())
+// << "\" fontSize=\"" << compute_text_color(lines(fid).x_height())
+// << "\" leading=\"" << compute_text_color(lines(fid).leading())
<< "\">"
<< std::endl;
+ // Add support for text recognition
+ // <TextEquiv>
+ // <PlainText></PlainText>
+ // <Unicode></Unicode>
+ // </TextEquiv>
+
internal::print_box_coords(output, parset(p).bbox(), " ");
- output << " </text_region>" << std::endl;
+ output << " </TextRegion>" << std::endl;
}
}
diff --git a/scribo/scribo/io/xml/internal/print_box_coords.hh b/scribo/scribo/io/xml/internal/print_box_coords.hh
index ad84709..8549b47 100644
--- a/scribo/scribo/io/xml/internal/print_box_coords.hh
+++ b/scribo/scribo/io/xml/internal/print_box_coords.hh
@@ -64,20 +64,20 @@ namespace scribo
{
std::string sc = space;
std::string sp = sc + " ";
- ostr << sc << "<coords>" << std::endl
- << sp << "<point x=\"" << b.pmin().col()
+ ostr << sc << "<Coords>" << std::endl
+ << sp << "<Point x=\"" << b.pmin().col()
<< "\" y=\"" << b.pmin().row() << "\"/>"
<< std::endl
- << sp << "<point x=\"" << b.pmax().col()
+ << sp << "<Point x=\"" << b.pmax().col()
<< "\" y=\"" << b.pmin().row() << "\"/>"
<< std::endl
- << sp << "<point x=\"" << b.pmax().col()
+ << sp << "<Point x=\"" << b.pmax().col()
<< "\" y=\"" << b.pmax().row() << "\"/>"
<< std::endl
- << sp << "<point x=\"" << b.pmin().col()
+ << sp << "<Point x=\"" << b.pmin().col()
<< "\" y=\"" << b.pmax().row() << "\"/>"
<< std::endl
- << sc << "</coords>" << std::endl;
+ << sc << "</Coords>" << std::endl;
}
diff --git a/scribo/scribo/io/xml/internal/print_page_preambule.hh b/scribo/scribo/io/xml/internal/print_page_preambule.hh
index 3ee29be..bcb6b33 100644
--- a/scribo/scribo/io/xml/internal/print_page_preambule.hh
+++ b/scribo/scribo/io/xml/internal/print_page_preambule.hh
@@ -30,6 +30,7 @@
///
/// \brief Print PAGE XML format preambule.
+# include <ctime>
# include <fstream>
# include <mln/core/alias/box2d.hh>
# include <scribo/core/document.hh>
@@ -63,27 +64,34 @@ namespace scribo
const document<L>& doc,
bool with_validation)
{
- output << "<?xml version=\"1.0\"?>" << std::endl;
+ output << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" << std::endl;
if (with_validation)
- output << "<pcGts xmlns=\"http://schema.primaresearch.org/PAGE/gts/pagecontent/2009-03-16\" "
+ output << "<PcGts xmlns=\"http://schema.primaresearch.org/PAGE/gts/pagecontent/2010-03-19\" "
<< "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" "
- << "xsi:schemaLocation=\"http://schema.primaresearch.org/PAGE/gts/pagecontent/2009-03-16 "
- << "http://schema.primaresearch.org/PAGE/gts/pagecontent/2009-03-16/pagecontent…" "
- << "pcGtsId=\"" << doc.filename() << "\">" << std::endl;
+ << "xsi:schemaLocation=\"http://schema.primaresearch.org/PAGE/gts/pagecontent/2010-03-19 "
+ << "http://schema.primaresearch.org/PAGE/gts/pagecontent/2010-03-19/pagecontent…">"
+ << std::endl;
else
- output << "<pcGts>" << std::endl;
-
- output << " <pcMetadata>" << std::endl;
- output << " <pcCreator>LRDE</pcCreator>" << std::endl;
- output << " <pcCreated/>" << std::endl;
- output << " <pcLastChange/>" << std::endl;
- output << " <pcComments>Generated by Scribo from Olena.</pcComments>" << std::endl;
- output << " </pcMetadata>" << std::endl;
-
- output << " <page image_filename=\"" << doc.filename()
- << "\" image_width=\"" << doc.width()
- << "\" image_height=\"" << doc.height()
+ output << "<PcGts>" << std::endl;
+
+
+ time_t cur_time = time(NULL);
+ tm * time_struct;
+ time_struct = localtime(&cur_time);
+ char time_info[55];
+ strftime(time_info, 55, "%Y-%m-%dT%H:%M:%S", time_struct);
+
+ output << " <Metadata>" << std::endl;
+ output << " <Creator>LRDE</Creator>" << std::endl;
+ output << " <Created>" << time_info << "</Created>" << std::endl;
+ output << " <LastChange>" << time_info << "</LastChange>" << std::endl;
+ output << " <Comments>Generated by Scribo from Olena.</Comments>" << std::endl;
+ output << " </Metadata>" << std::endl;
+
+ output << " <Page imageFilename=\"" << doc.filename()
+ << "\" imageWidth=\"" << doc.width()
+ << "\" imageHeight=\"" << doc.height()
<< "\">" << std::endl;
}
--
1.5.6.5
1
0
last-svn-commit-699-g319827a lazzara/igr/gui/segmentation/src/task_widget.cc: Avoid a warning.
by Guillaume Lazzara 12 May '11
by Guillaume Lazzara 12 May '11
12 May '11
---
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
1
0
last-svn-commit-700-g8df88e3 Move IGR code from milena/sandbox to igr's private module.
by Guillaume Lazzara 12 May '11
by Guillaume Lazzara 12 May '11
12 May '11
* 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
1
0
last-svn-commit-701-g722f33d Update build system to use MLN_WO_GLOBAL_VARS.
by Guillaume Lazzara 12 May '11
by Guillaume Lazzara 12 May '11
12 May '11
* 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
1
0
last-svn-commit-702-g1b4ffab Fix Paths in scripts and build systems.
by Guillaume Lazzara 12 May '11
by Guillaume Lazzara 12 May '11
12 May '11
* 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
1
0
* 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
1
0
12 May '11
* 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
1
0
last-svn-commit-705-gdab5d67 mln/io/dicom/load.hh: Fix invalid image loading.
by Guillaume Lazzara 12 May '11
by Guillaume Lazzara 12 May '11
12 May '11
---
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
1
0
last-svn-commit-691-g687f97b Split compilation of files including Milena's headers.
by Guillaume Lazzara 12 May '11
by Guillaume Lazzara 12 May '11
12 May '11
* lazzara/igr/gui/segmentation/segmentation.pro,
* lazzara/igr/gui/segmentation/src/crop_widget.cc,
* lazzara/igr/gui/segmentation/src/edit_seg_widget.cc,
* lazzara/igr/gui/segmentation/src/edit_seg_widget.hh,
* lazzara/igr/gui/segmentation/src/load_widget.cc,
* lazzara/igr/gui/segmentation/src/main.cc,
* lazzara/igr/gui/segmentation/src/main_window.cc,
* lazzara/igr/gui/segmentation/src/mln_data.cc,
* lazzara/igr/gui/segmentation/src/mln_data.hh,
* lazzara/igr/gui/segmentation/src/save_widget.cc,
* lazzara/igr/gui/segmentation/src/seg_widget.cc,
* lazzara/igr/gui/segmentation/src/task_handler.hh,
* lazzara/igr/gui/segmentation/src/tools/crop.cc,
* lazzara/igr/gui/segmentation/src/tools/crop.hh,
* lazzara/igr/gui/segmentation/src/tools/edit_seg.cc,
* lazzara/igr/gui/segmentation/src/tools/edit_seg.hh,
* lazzara/igr/gui/segmentation/src/tools/load.cc,
* lazzara/igr/gui/segmentation/src/tools/load.hh,
* lazzara/igr/gui/segmentation/src/tools/save.cc,
* lazzara/igr/gui/segmentation/src/tools/save.hh,
* lazzara/igr/gui/segmentation/src/tools/seg.cc,
* lazzara/igr/gui/segmentation/src/tools/seg.hh,
* lazzara/igr/gui/segmentation2dt/segmentation2dt.pro,
* lazzara/igr/gui/segmentation2dt/src/crop_widget.cc,
* lazzara/igr/gui/segmentation2dt/src/load_widget.cc,
* lazzara/igr/gui/segmentation2dt/src/main.cc,
* lazzara/igr/gui/segmentation2dt/src/main_window.cc,
* lazzara/igr/gui/segmentation2dt/src/mln_data.cc,
* lazzara/igr/gui/segmentation2dt/src/mln_data.hh,
* lazzara/igr/gui/segmentation2dt/src/norm_smooth_widget.cc,
* lazzara/igr/gui/segmentation2dt/src/ref_mean_widget.cc,
* lazzara/igr/gui/segmentation2dt/src/save_widget.cc,
* lazzara/igr/gui/segmentation2dt/src/seg_widget.cc,
* lazzara/igr/gui/segmentation2dt/src/task_handler.hh,
* lazzara/igr/gui/segmentation2dt/src/tools/crop.cc,
* lazzara/igr/gui/segmentation2dt/src/tools/crop.hh,
* lazzara/igr/gui/segmentation2dt/src/tools/load.cc,
* lazzara/igr/gui/segmentation2dt/src/tools/load.hh,
* lazzara/igr/gui/segmentation2dt/src/tools/mean_regions.cc,
* lazzara/igr/gui/segmentation2dt/src/tools/mean_regions.hh,
* lazzara/igr/gui/segmentation2dt/src/tools/norm_smooth.cc,
* lazzara/igr/gui/segmentation2dt/src/tools/norm_smooth.hh,
* lazzara/igr/gui/segmentation2dt/src/tools/ref_mean.cc,
* lazzara/igr/gui/segmentation2dt/src/tools/ref_mean.hh,
* lazzara/igr/gui/segmentation2dt/src/tools/save.cc,
* lazzara/igr/gui/segmentation2dt/src/tools/save.hh,
* lazzara/igr/gui/segmentation2dt/src/tools/seg.cc,
* lazzara/igr/gui/segmentation2dt/src/tools/seg.hh,
* lazzara/igr/gui/shared/src/color.hh,
* lazzara/igr/gui/shared/src/igr_types.hh,
* lazzara/igr/gui/shared/src/image_viewer.hh,
* lazzara/igr/gui/viewer/src/main.cc,
* lazzara/igr/gui/viewer/src/mln_data.cc,
* lazzara/igr/gui/viewer/src/mln_data.hh,
* lazzara/igr/gui/viewer/src/mln_widgets.cc,
* lazzara/igr/gui/viewer/viewer.pro: Split compilation of files
including Milena's headers.
---
milena/sandbox/ChangeLog | 62 +++++++++++++++++
.../lazzara/igr/gui/segmentation/segmentation.pro | 55 +++++++++++++--
.../igr/gui/segmentation/src/crop_widget.cc | 1 -
.../igr/gui/segmentation/src/edit_seg_widget.cc | 1 -
.../igr/gui/segmentation/src/edit_seg_widget.hh | 4 -
.../igr/gui/segmentation/src/load_widget.cc | 1 -
.../lazzara/igr/gui/segmentation/src/main.cc | 1 +
.../igr/gui/segmentation/src/main_window.cc | 1 -
.../lazzara/igr/gui/segmentation/src/mln_data.cc | 3 +-
.../lazzara/igr/gui/segmentation/src/mln_data.hh | 4 -
.../igr/gui/segmentation/src/save_widget.cc | 1 -
.../lazzara/igr/gui/segmentation/src/seg_widget.cc | 1 -
.../igr/gui/segmentation/src/task_handler.hh | 4 -
.../lazzara/igr/gui/segmentation/src/tools/crop.cc | 4 -
.../lazzara/igr/gui/segmentation/src/tools/crop.hh | 4 -
.../igr/gui/segmentation/src/tools/edit_seg.cc | 6 +-
.../igr/gui/segmentation/src/tools/edit_seg.hh | 4 -
.../lazzara/igr/gui/segmentation/src/tools/load.cc | 4 -
.../lazzara/igr/gui/segmentation/src/tools/load.hh | 4 -
.../lazzara/igr/gui/segmentation/src/tools/save.cc | 6 +-
.../lazzara/igr/gui/segmentation/src/tools/save.hh | 4 -
.../lazzara/igr/gui/segmentation/src/tools/seg.cc | 6 +-
.../lazzara/igr/gui/segmentation/src/tools/seg.hh | 4 -
.../igr/gui/segmentation2dt/segmentation2dt.pro | 72 ++++++++++++++++++--
.../igr/gui/segmentation2dt/src/crop_widget.cc | 1 -
.../igr/gui/segmentation2dt/src/load_widget.cc | 1 -
.../lazzara/igr/gui/segmentation2dt/src/main.cc | 4 +-
.../igr/gui/segmentation2dt/src/main_window.cc | 1 -
.../igr/gui/segmentation2dt/src/mln_data.cc | 2 +-
.../igr/gui/segmentation2dt/src/mln_data.hh | 4 -
.../gui/segmentation2dt/src/norm_smooth_widget.cc | 2 +-
.../igr/gui/segmentation2dt/src/ref_mean_widget.cc | 1 -
.../igr/gui/segmentation2dt/src/save_widget.cc | 1 -
.../igr/gui/segmentation2dt/src/seg_widget.cc | 1 -
.../igr/gui/segmentation2dt/src/task_handler.hh | 4 -
.../igr/gui/segmentation2dt/src/tools/crop.cc | 4 -
.../igr/gui/segmentation2dt/src/tools/crop.hh | 4 -
.../igr/gui/segmentation2dt/src/tools/load.cc | 4 -
.../igr/gui/segmentation2dt/src/tools/load.hh | 4 -
.../gui/segmentation2dt/src/tools/mean_regions.cc | 4 -
.../gui/segmentation2dt/src/tools/mean_regions.hh | 4 -
.../gui/segmentation2dt/src/tools/norm_smooth.cc | 4 -
.../gui/segmentation2dt/src/tools/norm_smooth.hh | 4 -
.../igr/gui/segmentation2dt/src/tools/ref_mean.cc | 4 -
.../igr/gui/segmentation2dt/src/tools/ref_mean.hh | 4 -
.../igr/gui/segmentation2dt/src/tools/save.cc | 5 +-
.../igr/gui/segmentation2dt/src/tools/save.hh | 4 -
.../igr/gui/segmentation2dt/src/tools/seg.cc | 6 +-
.../igr/gui/segmentation2dt/src/tools/seg.hh | 5 +-
milena/sandbox/lazzara/igr/gui/shared/src/color.hh | 7 +--
.../lazzara/igr/gui/shared/src/igr_types.hh | 4 -
.../lazzara/igr/gui/shared/src/image_viewer.hh | 7 +--
milena/sandbox/lazzara/igr/gui/viewer/src/main.cc | 4 +-
.../sandbox/lazzara/igr/gui/viewer/src/mln_data.cc | 20 +++++-
.../sandbox/lazzara/igr/gui/viewer/src/mln_data.hh | 22 +++++-
.../lazzara/igr/gui/viewer/src/mln_widgets.cc | 2 -
milena/sandbox/lazzara/igr/gui/viewer/viewer.pro | 25 +++++--
57 files changed, 257 insertions(+), 173 deletions(-)
delete mode 100644 milena/sandbox/lazzara/igr/gui/viewer/src/mln_widgets.cc
diff --git a/milena/sandbox/ChangeLog b/milena/sandbox/ChangeLog
index 44c82e9..5477ab3 100644
--- a/milena/sandbox/ChangeLog
+++ b/milena/sandbox/ChangeLog
@@ -1,3 +1,65 @@
+2010-11-15 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ Split compilation of files including Milena's headers.
+
+ * lazzara/igr/gui/segmentation/segmentation.pro,
+ * lazzara/igr/gui/segmentation/src/crop_widget.cc,
+ * lazzara/igr/gui/segmentation/src/edit_seg_widget.cc,
+ * lazzara/igr/gui/segmentation/src/edit_seg_widget.hh,
+ * lazzara/igr/gui/segmentation/src/load_widget.cc,
+ * lazzara/igr/gui/segmentation/src/main.cc,
+ * lazzara/igr/gui/segmentation/src/main_window.cc,
+ * lazzara/igr/gui/segmentation/src/mln_data.cc,
+ * lazzara/igr/gui/segmentation/src/mln_data.hh,
+ * lazzara/igr/gui/segmentation/src/save_widget.cc,
+ * lazzara/igr/gui/segmentation/src/seg_widget.cc,
+ * lazzara/igr/gui/segmentation/src/task_handler.hh,
+ * lazzara/igr/gui/segmentation/src/tools/crop.cc,
+ * lazzara/igr/gui/segmentation/src/tools/crop.hh,
+ * lazzara/igr/gui/segmentation/src/tools/edit_seg.cc,
+ * lazzara/igr/gui/segmentation/src/tools/edit_seg.hh,
+ * lazzara/igr/gui/segmentation/src/tools/load.cc,
+ * lazzara/igr/gui/segmentation/src/tools/load.hh,
+ * lazzara/igr/gui/segmentation/src/tools/save.cc,
+ * lazzara/igr/gui/segmentation/src/tools/save.hh,
+ * lazzara/igr/gui/segmentation/src/tools/seg.cc,
+ * lazzara/igr/gui/segmentation/src/tools/seg.hh,
+ * lazzara/igr/gui/segmentation2dt/segmentation2dt.pro,
+ * lazzara/igr/gui/segmentation2dt/src/crop_widget.cc,
+ * lazzara/igr/gui/segmentation2dt/src/load_widget.cc,
+ * lazzara/igr/gui/segmentation2dt/src/main.cc,
+ * lazzara/igr/gui/segmentation2dt/src/main_window.cc,
+ * lazzara/igr/gui/segmentation2dt/src/mln_data.cc,
+ * lazzara/igr/gui/segmentation2dt/src/mln_data.hh,
+ * lazzara/igr/gui/segmentation2dt/src/norm_smooth_widget.cc,
+ * lazzara/igr/gui/segmentation2dt/src/ref_mean_widget.cc,
+ * lazzara/igr/gui/segmentation2dt/src/save_widget.cc,
+ * lazzara/igr/gui/segmentation2dt/src/seg_widget.cc,
+ * lazzara/igr/gui/segmentation2dt/src/task_handler.hh,
+ * lazzara/igr/gui/segmentation2dt/src/tools/crop.cc,
+ * lazzara/igr/gui/segmentation2dt/src/tools/crop.hh,
+ * lazzara/igr/gui/segmentation2dt/src/tools/load.cc,
+ * lazzara/igr/gui/segmentation2dt/src/tools/load.hh,
+ * lazzara/igr/gui/segmentation2dt/src/tools/mean_regions.cc,
+ * lazzara/igr/gui/segmentation2dt/src/tools/mean_regions.hh,
+ * lazzara/igr/gui/segmentation2dt/src/tools/norm_smooth.cc,
+ * lazzara/igr/gui/segmentation2dt/src/tools/norm_smooth.hh,
+ * lazzara/igr/gui/segmentation2dt/src/tools/ref_mean.cc,
+ * lazzara/igr/gui/segmentation2dt/src/tools/ref_mean.hh,
+ * lazzara/igr/gui/segmentation2dt/src/tools/save.cc,
+ * lazzara/igr/gui/segmentation2dt/src/tools/save.hh,
+ * lazzara/igr/gui/segmentation2dt/src/tools/seg.cc,
+ * lazzara/igr/gui/segmentation2dt/src/tools/seg.hh,
+ * lazzara/igr/gui/shared/src/color.hh,
+ * lazzara/igr/gui/shared/src/igr_types.hh,
+ * lazzara/igr/gui/shared/src/image_viewer.hh,
+ * lazzara/igr/gui/viewer/src/main.cc,
+ * lazzara/igr/gui/viewer/src/mln_data.cc,
+ * lazzara/igr/gui/viewer/src/mln_data.hh,
+ * lazzara/igr/gui/viewer/src/mln_widgets.cc,
+ * lazzara/igr/gui/viewer/viewer.pro: Split compilation of files
+ including Milena's headers.
+
2010-02-09 Guillaume Lazzara <z(a)lrde.epita.fr>
Add a tool for anapath filtering.
diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/segmentation.pro b/milena/sandbox/lazzara/igr/gui/segmentation/segmentation.pro
index ef8dd61..4a0f003 100644
--- a/milena/sandbox/lazzara/igr/gui/segmentation/segmentation.pro
+++ b/milena/sandbox/lazzara/igr/gui/segmentation/segmentation.pro
@@ -6,20 +6,61 @@ TEMPLATE = app
TARGET =
DEPENDPATH += . src ui
#INCLUDEPATH += . src $(PWD)/../../ $(PWD)/.. $(PWD)/../shared $(OLN)/milena /home/inca/local/include
-INCLUDEPATH += . src $(PWD)/.. $(PWD)/../shared $(OLN)/milena /lrde/dev/linux-x86/stable/gdcm/include
+INCLUDEPATH += . src $(PWD)/.. $(PWD)/../shared $(OLN)/milena
-DEFINES= NDEBUG
+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
-LIBS += -L/lrde/dev/linux-x86/stable/gdcm/lib -lgdcmCommon -lgdcmDICT -lgdcmDSED -lgdcmIOD -lgdcmMSFF -lgdcmexpat -lgdcmjpeg12 -lgdcmjpeg16 -lgdcmjpeg8 -lgdcmopenjpeg -lgdcmuuid -lgdcmzlib
-
+LIBS += -lgdcmCommon -lgdcmjpeg12 -lgdcmjpeg16 -lgdcmjpeg8 -lgdcmDICT -lgdcmDSED -lgdcmIOD -lgdcmMSFF -lqwt-qt4
# Input
-HEADERS += src/main_window.hh ../shared/src/image_viewer.hh ../shared/src/internal/interactive_scene.hh src/mln_data.hh src/tools/crop.hh src/task_handler.hh src/crop_widget.hh src/task_widget.hh src/load_widget.hh src/seg_widget.hh src/tools/seg.hh src/tools/edit_seg.hh src/edit_seg_widget.hh src/save_widget.hh src/tools/save.hh src/tools/load.hh
-FORMS += ui/main_window.ui ../shared/ui/image_viewer.ui ui/crop_widget.ui ui/load_widget.ui ui/seg_widget.ui ui/edit_seg_widget.ui ui/save_widget.ui
-SOURCES += src/main.cc ../shared/src/internal/interactive_scene.cc src/mln_widgets.cc src/task_handler.cc src/main_window.cc src/task_widget.cc
+HEADERS += \
+ src/main_window.hh \
+ ../shared/src/image_viewer.hh \
+ ../shared/src/internal/interactive_scene.hh \
+ src/mln_data.hh \
+ src/tools/crop.hh \
+ src/task_handler.hh \
+ src/crop_widget.hh \
+ src/task_widget.hh \
+ src/load_widget.hh \
+ src/seg_widget.hh \
+ src/tools/seg.hh \
+ src/tools/edit_seg.hh \
+ src/edit_seg_widget.hh \
+ src/save_widget.hh \
+ src/tools/save.hh \
+ src/tools/load.hh
+
+FORMS += \
+ ui/main_window.ui \
+ ../shared/ui/image_viewer.ui \
+ ui/crop_widget.ui \
+ ui/load_widget.ui \
+ ui/seg_widget.ui \
+ ui/edit_seg_widget.ui \
+ ui/save_widget.ui
+
+SOURCES += \
+ src/main.cc \
+ ../shared/src/internal/interactive_scene.cc \
+ ../shared/src/image_viewer.cc \
+ src/crop_widget.cc \
+ src/edit_seg_widget.cc \
+ src/save_widget.cc \
+ src/load_widget.cc \
+ src/seg_widget.cc \
+ src/tools/crop.cc \
+ src/tools/edit_seg.cc \
+ src/tools/load.cc \
+ src/tools/save.cc \
+ src/tools/seg.cc \
+ src/mln_data.cc \
+ src/task_handler.cc \
+ src/main_window.cc \
+ src/task_widget.cc
RESOURCES = ../shared/shared.qrc
diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/crop_widget.cc b/milena/sandbox/lazzara/igr/gui/segmentation/src/crop_widget.cc
index 4b0dafd..6b56a12 100644
--- a/milena/sandbox/lazzara/igr/gui/segmentation/src/crop_widget.cc
+++ b/milena/sandbox/lazzara/igr/gui/segmentation/src/crop_widget.cc
@@ -23,7 +23,6 @@
// exception does not however invalidate any other reasons why the
// executable file might be covered by the GNU General Public License.
-//#define INCLUDE_MLN_FILES
#include <QtCore>
#include <QtGui>
#include <src/crop_widget.hh>
diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/edit_seg_widget.cc b/milena/sandbox/lazzara/igr/gui/segmentation/src/edit_seg_widget.cc
index f662eda..523996f 100644
--- a/milena/sandbox/lazzara/igr/gui/segmentation/src/edit_seg_widget.cc
+++ b/milena/sandbox/lazzara/igr/gui/segmentation/src/edit_seg_widget.cc
@@ -23,7 +23,6 @@
// exception does not however invalidate any other reasons why the
// executable file might be covered by the GNU General Public License.
-//#define INCLUDE_MLN_FILES
#include <QtCore>
#include <QtGui>
#include <src/edit_seg_widget.hh>
diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/edit_seg_widget.hh b/milena/sandbox/lazzara/igr/gui/segmentation/src/edit_seg_widget.hh
index 9f988a1..fa62601 100644
--- a/milena/sandbox/lazzara/igr/gui/segmentation/src/edit_seg_widget.hh
+++ b/milena/sandbox/lazzara/igr/gui/segmentation/src/edit_seg_widget.hh
@@ -31,10 +31,6 @@
# include <src/task_widget.hh>
# include <shared/src/igr_types.hh>
-# ifndef INCLUDE_MLN_FILES
-# define MLN_INCLUDE_ONLY
-# endif
-
# include <mln/core/alias/box3d.hh>
# include <mln/util/array.hh>
# include <mln/util/set.hh>
diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/load_widget.cc b/milena/sandbox/lazzara/igr/gui/segmentation/src/load_widget.cc
index 48d9b25..a9073f3 100644
--- a/milena/sandbox/lazzara/igr/gui/segmentation/src/load_widget.cc
+++ b/milena/sandbox/lazzara/igr/gui/segmentation/src/load_widget.cc
@@ -23,7 +23,6 @@
// exception does not however invalidate any other reasons why the
// executable file might be covered by the GNU General Public License.
-//#define INCLUDE_MLN_FILES
#include <QtCore>
#include <QtGui>
#include <src/load_widget.hh>
diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/main.cc b/milena/sandbox/lazzara/igr/gui/segmentation/src/main.cc
index 59b332a..503c751 100644
--- a/milena/sandbox/lazzara/igr/gui/segmentation/src/main.cc
+++ b/milena/sandbox/lazzara/igr/gui/segmentation/src/main.cc
@@ -26,6 +26,7 @@
#include <QApplication>
#include <QtGui>
+#undef MLN_WO_GLOBAL_VARS
#include <src/main_window.hh>
int main(int argc, char *argv[])
diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/main_window.cc b/milena/sandbox/lazzara/igr/gui/segmentation/src/main_window.cc
index d36f608..a225daf 100644
--- a/milena/sandbox/lazzara/igr/gui/segmentation/src/main_window.cc
+++ b/milena/sandbox/lazzara/igr/gui/segmentation/src/main_window.cc
@@ -23,7 +23,6 @@
// exception does not however invalidate any other reasons why the
// executable file might be covered by the GNU General Public License.
-//#define INCLUDE_MLN_FILES
#include <QtCore>
#include <QtGui>
#include <src/main_window.hh>
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 efba25b..6c8ea01 100644
--- a/milena/sandbox/lazzara/igr/gui/segmentation/src/mln_data.cc
+++ b/milena/sandbox/lazzara/igr/gui/segmentation/src/mln_data.cc
@@ -1,4 +1,5 @@
-#define INCLUDE_MLN_FILES
+#include <QtCore>
+
#include <src/mln_data.hh>
#include <mln/core/image/dmorph/slice_image.hh>
#include <mln/core/image/image3d.hh>
diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/mln_data.hh b/milena/sandbox/lazzara/igr/gui/segmentation/src/mln_data.hh
index f295dd9..13995d5 100644
--- a/milena/sandbox/lazzara/igr/gui/segmentation/src/mln_data.hh
+++ b/milena/sandbox/lazzara/igr/gui/segmentation/src/mln_data.hh
@@ -4,10 +4,6 @@
#include <QtCore/QObject>
#include <QtCore/QPointF>
-# ifndef INCLUDE_MLN_FILES
-# define MLN_INCLUDE_ONLY
-# endif
-
#include <mln/core/image/image3d.hh>
#include <shared/src/igr_types.hh>
diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/save_widget.cc b/milena/sandbox/lazzara/igr/gui/segmentation/src/save_widget.cc
index 3e4b5b8..75d34d4 100644
--- a/milena/sandbox/lazzara/igr/gui/segmentation/src/save_widget.cc
+++ b/milena/sandbox/lazzara/igr/gui/segmentation/src/save_widget.cc
@@ -23,7 +23,6 @@
// exception does not however invalidate any other reasons why the
// executable file might be covered by the GNU General Public License.
-#define INCLUDE_MLN_FILES
#include <QtCore>
#include <QtGui>
#include <src/save_widget.hh>
diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/seg_widget.cc b/milena/sandbox/lazzara/igr/gui/segmentation/src/seg_widget.cc
index 88b7d92..0dcb5fc 100644
--- a/milena/sandbox/lazzara/igr/gui/segmentation/src/seg_widget.cc
+++ b/milena/sandbox/lazzara/igr/gui/segmentation/src/seg_widget.cc
@@ -23,7 +23,6 @@
// exception does not however invalidate any other reasons why the
// executable file might be covered by the GNU General Public License.
-//#define INCLUDE_MLN_FILES
#include <QtCore>
#include <QtGui>
#include <src/seg_widget.hh>
diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/task_handler.hh b/milena/sandbox/lazzara/igr/gui/segmentation/src/task_handler.hh
index 48d6bb5..d62a62c 100644
--- a/milena/sandbox/lazzara/igr/gui/segmentation/src/task_handler.hh
+++ b/milena/sandbox/lazzara/igr/gui/segmentation/src/task_handler.hh
@@ -5,10 +5,6 @@
# include <QtCore/QObject>
# include <QtGui/QProgressDialog>
-# ifndef INCLUDE_MLN_FILES
-# define MLN_INCLUDE_ONLY
-# endif
-
# include <src/task.hh>
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 a974d82..4692b8d 100644
--- a/milena/sandbox/lazzara/igr/gui/segmentation/src/tools/crop.cc
+++ b/milena/sandbox/lazzara/igr/gui/segmentation/src/tools/crop.cc
@@ -1,9 +1,5 @@
#include <src/tools/crop.hh>
-# ifndef INCLUDE_MLN_FILES
-# define MLN_INCLUDE_ONLY
-# endif
-
#include <mln/core/image/image3d.hh>
#include <mln/data/fill.hh>
#include <shared/src/igr_types.hh>
diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/tools/crop.hh b/milena/sandbox/lazzara/igr/gui/segmentation/src/tools/crop.hh
index 40f4729..a19f89c 100644
--- a/milena/sandbox/lazzara/igr/gui/segmentation/src/tools/crop.hh
+++ b/milena/sandbox/lazzara/igr/gui/segmentation/src/tools/crop.hh
@@ -3,10 +3,6 @@
# include <QtCore/QRectF>
-# ifndef INCLUDE_MLN_FILES
-# define MLN_INCLUDE_ONLY
-# endif
-
# include <mln/core/alias/box3d.hh>
# include <src/task.hh>
# include <src/mln_data.hh>
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 cd4dad0..3e14ea8 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
@@ -1,11 +1,9 @@
+#include <QtCore>
+
#include <src/tools/edit_seg.hh>
#include <shared/src/igr_types.hh>
-# ifndef INCLUDE_MLN_FILES
-# define MLN_INCLUDE_ONLY
-# endif
-
#include <mln/core/image/image3d.hh>
#include <mln/data/fill.hh>
diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/tools/edit_seg.hh b/milena/sandbox/lazzara/igr/gui/segmentation/src/tools/edit_seg.hh
index e77de50..9e28b97 100644
--- a/milena/sandbox/lazzara/igr/gui/segmentation/src/tools/edit_seg.hh
+++ b/milena/sandbox/lazzara/igr/gui/segmentation/src/tools/edit_seg.hh
@@ -3,10 +3,6 @@
# include <QtCore/QRectF>
-# ifndef INCLUDE_MLN_FILES
-# define MLN_INCLUDE_ONLY
-# endif
-
# include <mln/util/array.hh>
# include <mln/util/set.hh>
diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/tools/load.cc b/milena/sandbox/lazzara/igr/gui/segmentation/src/tools/load.cc
index 92f82bc..e9815a2 100644
--- a/milena/sandbox/lazzara/igr/gui/segmentation/src/tools/load.cc
+++ b/milena/sandbox/lazzara/igr/gui/segmentation/src/tools/load.cc
@@ -1,9 +1,5 @@
#include <src/tools/load.hh>
-# ifndef INCLUDE_MLN_FILES
-# define MLN_INCLUDE_ONLY
-# endif
-
#include <mln/core/image/image3d.hh>
#include <mln/data/fill.hh>
#include <shared/src/igr_types.hh>
diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/tools/load.hh b/milena/sandbox/lazzara/igr/gui/segmentation/src/tools/load.hh
index 64a0e30..9e30d18 100644
--- a/milena/sandbox/lazzara/igr/gui/segmentation/src/tools/load.hh
+++ b/milena/sandbox/lazzara/igr/gui/segmentation/src/tools/load.hh
@@ -3,10 +3,6 @@
# include <QtCore/QRectF>
-# ifndef INCLUDE_MLN_FILES
-# define MLN_INCLUDE_ONLY
-# endif
-
# include <mln/core/alias/box3d.hh>
# include <src/task.hh>
# include <src/mln_data.hh>
diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/tools/save.cc b/milena/sandbox/lazzara/igr/gui/segmentation/src/tools/save.cc
index 7954105..a4877ca 100644
--- a/milena/sandbox/lazzara/igr/gui/segmentation/src/tools/save.cc
+++ b/milena/sandbox/lazzara/igr/gui/segmentation/src/tools/save.cc
@@ -1,8 +1,6 @@
-#include <src/tools/save.hh>
+#include <QtCore>
-# ifndef INCLUDE_MLN_FILES
-# define MLN_INCLUDE_ONLY
-# endif
+#include <src/tools/save.hh>
#include <mln/core/image/image3d.hh>
#include <mln/core/image/dmorph/slice_image.hh>
diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/tools/save.hh b/milena/sandbox/lazzara/igr/gui/segmentation/src/tools/save.hh
index ed90b06..11cc805 100644
--- a/milena/sandbox/lazzara/igr/gui/segmentation/src/tools/save.hh
+++ b/milena/sandbox/lazzara/igr/gui/segmentation/src/tools/save.hh
@@ -3,10 +3,6 @@
# include <QtCore/QRectF>
-# ifndef INCLUDE_MLN_FILES
-# define MLN_INCLUDE_ONLY
-# endif
-
# include <mln/core/alias/box3d.hh>
# include <src/task.hh>
# include <src/mln_data.hh>
diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/tools/seg.cc b/milena/sandbox/lazzara/igr/gui/segmentation/src/tools/seg.cc
index 7a4b003..4fb8898 100644
--- a/milena/sandbox/lazzara/igr/gui/segmentation/src/tools/seg.cc
+++ b/milena/sandbox/lazzara/igr/gui/segmentation/src/tools/seg.cc
@@ -1,8 +1,6 @@
-#include <src/tools/seg.hh>
+#include <QtCore>
-# ifndef INCLUDE_MLN_FILES
-# define MLN_INCLUDE_ONLY
-# endif
+#include <src/tools/seg.hh>
#include <mln/core/image/image3d.hh>
#include <mln/core/image/image2d.hh>
diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/tools/seg.hh b/milena/sandbox/lazzara/igr/gui/segmentation/src/tools/seg.hh
index 1f7c478..b974042 100644
--- a/milena/sandbox/lazzara/igr/gui/segmentation/src/tools/seg.hh
+++ b/milena/sandbox/lazzara/igr/gui/segmentation/src/tools/seg.hh
@@ -3,10 +3,6 @@
# include <QtCore/QRectF>
-# ifndef INCLUDE_MLN_FILES
-# define MLN_INCLUDE_ONLY
-# endif
-
# include <mln/core/alias/box3d.hh>
# include <src/task.hh>
# include <src/mln_data.hh>
diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/segmentation2dt.pro b/milena/sandbox/lazzara/igr/gui/segmentation2dt/segmentation2dt.pro
index 8781b33..d7ce7e6 100644
--- a/milena/sandbox/lazzara/igr/gui/segmentation2dt/segmentation2dt.pro
+++ b/milena/sandbox/lazzara/igr/gui/segmentation2dt/segmentation2dt.pro
@@ -6,20 +6,80 @@ TEMPLATE = app
TARGET =
DEPENDPATH += . src ui
#INCLUDEPATH += . src $(PWD)/../../ $(PWD)/.. $(PWD)/../shared $(OLN)/milena /home/inca/local/include
-INCLUDEPATH += . src $(PWD)/.. $(PWD)/../shared $(OLN)/milena /lrde/dev/linux-x86/stable/gdcm/include
+INCLUDEPATH += . src $(PWD)/.. $(PWD)/../shared $(OLN)/milena
-DEFINES= NDEBUG
+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/lrde/dev/linux-x86/stable/gdcm/lib -lgdcmCommon -lgdcmDICT -lgdcmDSED -lgdcmIOD -lgdcmMSFF -lgdcmexpat -lgdcmjpeg12 -lgdcmjpeg16 -lgdcmjpeg8 -lgdcmopenjpeg -lgdcmuuid -lgdcmzlib -lqwt-qt4
+LIBS += -lgdcmCommon -lgdcmjpeg12 -lgdcmjpeg16 -lgdcmjpeg8 -lgdcmDICT -lgdcmDSED -lgdcmIOD -lgdcmMSFF -lqwt-qt4
+
+
+
# Input
-HEADERS += src/main_window.hh ../shared/src/image_viewer.hh ../shared/src/internal/interactive_scene.hh src/mln_data.hh src/tools/crop.hh src/task_handler.hh src/crop_widget.hh src/task_widget.hh src/load_widget.hh src/seg_widget.hh src/tools/seg.hh src/save_widget.hh src/tools/save.hh src/ref_mean_widget.hh src/tools/ref_mean.hh src/tools/norm_smooth.hh src/norm_smooth_widget.hh src/mean_regions_widget.hh src/tools/mean_regions.hh src/tools/load.hh src/plot_widget.hh src/plot.hh
-FORMS += ui/main_window.ui ../shared/ui/image_viewer.ui ui/crop_widget.ui ui/load_widget.ui ui/seg_widget.ui ui/save_widget.ui ui/ref_mean_widget.ui ui/norm_smooth_widget.ui ui/mean_regions_widget.ui ui/plot_widget.ui
-SOURCES += src/main.cc ../shared/src/internal/interactive_scene.cc src/mln_widgets.cc src/task_handler.cc src/main_window.cc src/task_widget.cc src/plot_widget.cc src/plot.cc
+HEADERS += \
+ src/main_window.hh \
+ ../shared/src/image_viewer.hh \
+ ../shared/src/internal/interactive_scene.hh \
+ src/mln_data.hh \
+ src/tools/crop.hh \
+ src/task_handler.hh \
+ src/crop_widget.hh \
+ src/task_widget.hh \
+ src/load_widget.hh \
+ src/seg_widget.hh \
+ src/tools/seg.hh \
+ src/save_widget.hh \
+ src/tools/save.hh \
+ src/ref_mean_widget.hh \
+ src/tools/ref_mean.hh \
+ src/tools/norm_smooth.hh \
+ src/norm_smooth_widget.hh \
+ src/mean_regions_widget.hh \
+ src/tools/mean_regions.hh \
+ src/tools/load.hh \
+ src/plot_widget.hh \
+ src/plot.hh
+
+FORMS += \
+ ui/main_window.ui \
+ ../shared/ui/image_viewer.ui \
+ ui/crop_widget.ui \
+ ui/load_widget.ui \
+ ui/seg_widget.ui \
+ ui/save_widget.ui \
+ ui/ref_mean_widget.ui \
+ ui/norm_smooth_widget.ui \
+ ui/mean_regions_widget.ui \
+ ui/plot_widget.ui
+
+SOURCES += \
+ src/main.cc \
+ ../shared/src/internal/interactive_scene.cc \
+ ../shared/src/image_viewer.cc \
+ src/crop_widget.cc \
+ src/save_widget.cc \
+ src/load_widget.cc \
+ src/seg_widget.cc \
+ src/ref_mean_widget.cc \
+ src/norm_smooth_widget.cc \
+ src/mean_regions_widget.cc \
+ src/tools/crop.cc \
+ src/tools/seg.cc \
+ src/tools/save.cc \
+ src/tools/ref_mean.cc \
+ src/tools/norm_smooth.cc \
+ src/tools/mean_regions.cc \
+ src/tools/load.cc \
+ src/mln_data.cc \
+ src/task_handler.cc \
+ src/main_window.cc \
+ src/task_widget.cc \
+ src/plot_widget.cc \
+ src/plot.cc
RESOURCES = ../shared/shared.qrc
diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/crop_widget.cc b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/crop_widget.cc
index ba90c64..67a51b7 100644
--- a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/crop_widget.cc
+++ b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/crop_widget.cc
@@ -23,7 +23,6 @@
// exception does not however invalidate any other reasons why the
// executable file might be covered by the GNU General Public License.
-//#define INCLUDE_MLN_FILES
#include <QtCore>
#include <QtGui>
#include <src/crop_widget.hh>
diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/load_widget.cc b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/load_widget.cc
index 6969ed5..27787b0 100644
--- a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/load_widget.cc
+++ b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/load_widget.cc
@@ -23,7 +23,6 @@
// exception does not however invalidate any other reasons why the
// executable file might be covered by the GNU General Public License.
-//#define INCLUDE_MLN_FILES
#include <QtCore>
#include <QtGui>
#include <src/load_widget.hh>
diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/main.cc b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/main.cc
index 59b332a..132d270 100644
--- a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/main.cc
+++ b/milena/sandbox/lazzara/igr/gui/segmentation2dt/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/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/main_window.cc b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/main_window.cc
index 0da6059..00e95de 100644
--- a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/main_window.cc
+++ b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/main_window.cc
@@ -23,7 +23,6 @@
// exception does not however invalidate any other reasons why the
// executable file might be covered by the GNU General Public License.
-//#define INCLUDE_MLN_FILES
#include <QtCore>
#include <QtGui>
#include <src/main_window.hh>
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 e90b236..c294c73 100644
--- a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/mln_data.cc
+++ b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/mln_data.cc
@@ -1,4 +1,4 @@
-#define INCLUDE_MLN_FILES
+#include <QtCore>
#include <src/mln_data.hh>
#include <mln/core/image/dmorph/slice_image.hh>
#include <mln/core/image/image3d.hh>
diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/mln_data.hh b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/mln_data.hh
index 4dcdf81..6f1776f 100644
--- a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/mln_data.hh
+++ b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/mln_data.hh
@@ -4,10 +4,6 @@
#include <QtCore/QObject>
#include <QtCore/QPointF>
-# ifndef INCLUDE_MLN_FILES
-# define MLN_INCLUDE_ONLY
-# endif
-
#include <mln/core/image/image2d.hh>
#include <mln/core/image/image3d.hh>
#include <shared/src/igr_types.hh>
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 cad1e7f..682206e 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
@@ -23,7 +23,7 @@
// exception does not however invalidate any other reasons why the
// executable file might be covered by the GNU General Public License.
-//#define INCLUDE_MLN_FILES
+
#include <QtCore>
#include <QtGui>
diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/ref_mean_widget.cc b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/ref_mean_widget.cc
index bc7b456..61d8e21 100644
--- a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/ref_mean_widget.cc
+++ b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/ref_mean_widget.cc
@@ -23,7 +23,6 @@
// exception does not however invalidate any other reasons why the
// executable file might be covered by the GNU General Public License.
-//#define INCLUDE_MLN_FILES
#include <QtCore>
#include <QtGui>
#include <src/ref_mean_widget.hh>
diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/save_widget.cc b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/save_widget.cc
index edf270a..8d87133 100644
--- a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/save_widget.cc
+++ b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/save_widget.cc
@@ -23,7 +23,6 @@
// exception does not however invalidate any other reasons why the
// executable file might be covered by the GNU General Public License.
-#define INCLUDE_MLN_FILES
#include <QtCore>
#include <QtGui>
#include <src/save_widget.hh>
diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/seg_widget.cc b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/seg_widget.cc
index aaf9c1d..6891432 100644
--- a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/seg_widget.cc
+++ b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/seg_widget.cc
@@ -23,7 +23,6 @@
// exception does not however invalidate any other reasons why the
// executable file might be covered by the GNU General Public License.
-//#define INCLUDE_MLN_FILES
#include <QtCore>
#include <QtGui>
#include <src/seg_widget.hh>
diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/task_handler.hh b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/task_handler.hh
index 48d6bb5..d62a62c 100644
--- a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/task_handler.hh
+++ b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/task_handler.hh
@@ -5,10 +5,6 @@
# include <QtCore/QObject>
# include <QtGui/QProgressDialog>
-# ifndef INCLUDE_MLN_FILES
-# define MLN_INCLUDE_ONLY
-# endif
-
# include <src/task.hh>
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 a974d82..4692b8d 100644
--- a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/crop.cc
+++ b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/crop.cc
@@ -1,9 +1,5 @@
#include <src/tools/crop.hh>
-# ifndef INCLUDE_MLN_FILES
-# define MLN_INCLUDE_ONLY
-# endif
-
#include <mln/core/image/image3d.hh>
#include <mln/data/fill.hh>
#include <shared/src/igr_types.hh>
diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/crop.hh b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/crop.hh
index 40f4729..a19f89c 100644
--- a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/crop.hh
+++ b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/crop.hh
@@ -3,10 +3,6 @@
# include <QtCore/QRectF>
-# ifndef INCLUDE_MLN_FILES
-# define MLN_INCLUDE_ONLY
-# endif
-
# include <mln/core/alias/box3d.hh>
# include <src/task.hh>
# include <src/mln_data.hh>
diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/load.cc b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/load.cc
index 92f82bc..e9815a2 100644
--- a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/load.cc
+++ b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/load.cc
@@ -1,9 +1,5 @@
#include <src/tools/load.hh>
-# ifndef INCLUDE_MLN_FILES
-# define MLN_INCLUDE_ONLY
-# endif
-
#include <mln/core/image/image3d.hh>
#include <mln/data/fill.hh>
#include <shared/src/igr_types.hh>
diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/load.hh b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/load.hh
index 64a0e30..9e30d18 100644
--- a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/load.hh
+++ b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/load.hh
@@ -3,10 +3,6 @@
# include <QtCore/QRectF>
-# ifndef INCLUDE_MLN_FILES
-# define MLN_INCLUDE_ONLY
-# endif
-
# include <mln/core/alias/box3d.hh>
# include <src/task.hh>
# include <src/mln_data.hh>
diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/mean_regions.cc b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/mean_regions.cc
index 64353d3..8245a70 100644
--- a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/mean_regions.cc
+++ b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/mean_regions.cc
@@ -1,7 +1,3 @@
-# ifndef INCLUDE_MLN_FILES
-# define MLN_INCLUDE_ONLY
-# endif
-
#include <src/tools/mean_regions.hh>
#include <src/mln_data.hh>
diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/mean_regions.hh b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/mean_regions.hh
index a20057b..2d7ff5e 100644
--- a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/mean_regions.hh
+++ b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/mean_regions.hh
@@ -3,10 +3,6 @@
# include <QtCore/QRectF>
-# ifndef INCLUDE_MLN_FILES
-# define MLN_INCLUDE_ONLY
-# endif
-
# include <mln/core/alias/box3d.hh>
# include <src/task.hh>
# include <src/mln_data.hh>
diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/norm_smooth.cc b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/norm_smooth.cc
index 9a1ddb3..16751ce 100644
--- a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/norm_smooth.cc
+++ b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/norm_smooth.cc
@@ -1,7 +1,3 @@
-# ifndef INCLUDE_MLN_FILES
-# define MLN_INCLUDE_ONLY
-# endif
-
#include <src/tools/norm_smooth.hh>
#include <src/mln_data.hh>
diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/norm_smooth.hh b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/norm_smooth.hh
index fc4d1e8..ce74aa1 100644
--- a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/norm_smooth.hh
+++ b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/norm_smooth.hh
@@ -3,10 +3,6 @@
# include <QtCore/QRectF>
-# ifndef INCLUDE_MLN_FILES
-# define MLN_INCLUDE_ONLY
-# endif
-
# include <mln/core/alias/box3d.hh>
# include <src/task.hh>
# include <src/mln_data.hh>
diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/ref_mean.cc b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/ref_mean.cc
index 31e9d21..42fd288 100644
--- a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/ref_mean.cc
+++ b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/ref_mean.cc
@@ -1,7 +1,3 @@
-# ifndef INCLUDE_MLN_FILES
-# define MLN_INCLUDE_ONLY
-# endif
-
#include <src/tools/ref_mean.hh>
#include <src/mln_data.hh>
diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/ref_mean.hh b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/ref_mean.hh
index dc39810..e8decf7 100644
--- a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/ref_mean.hh
+++ b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/ref_mean.hh
@@ -3,10 +3,6 @@
# include <QtCore/QRectF>
-# ifndef INCLUDE_MLN_FILES
-# define MLN_INCLUDE_ONLY
-# endif
-
# include <mln/core/alias/box3d.hh>
# include <src/task.hh>
# include <src/mln_data.hh>
diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/save.cc b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/save.cc
index 37a5608..23e38d1 100644
--- a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/save.cc
+++ b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/save.cc
@@ -3,12 +3,9 @@
#include <src/tools/save.hh>
#include <QtCore/QFile>
+#include <QtCore/QFileInfo>
#include <QtCore/QTextStream>
-# ifndef INCLUDE_MLN_FILES
-# define MLN_INCLUDE_ONLY
-# endif
-
#include <mln/core/image/image3d.hh>
#include <mln/core/image/dmorph/slice_image.hh>
#include <mln/data/fill.hh>
diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/save.hh b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/save.hh
index 01d8560..fc30282 100644
--- a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/save.hh
+++ b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/save.hh
@@ -4,10 +4,6 @@
# include <QtCore/QRectF>
# include <QtCore/QString>
-# ifndef INCLUDE_MLN_FILES
-# define MLN_INCLUDE_ONLY
-# endif
-
# include <mln/core/alias/box3d.hh>
# include <src/task.hh>
# include <src/mln_data.hh>
diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/seg.cc b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/seg.cc
index d72cb50..b57a52f 100644
--- a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/seg.cc
+++ b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/seg.cc
@@ -1,8 +1,6 @@
-#include <src/tools/seg.hh>
+#include <QtCore>
-# ifndef INCLUDE_MLN_FILES
-# define MLN_INCLUDE_ONLY
-# endif
+#include <src/tools/seg.hh>
#include <mln/core/image/image3d.hh>
#include <mln/core/image/image2d.hh>
diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/seg.hh b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/seg.hh
index 963b6a8..0e3d75e 100644
--- a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/seg.hh
+++ b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/seg.hh
@@ -3,11 +3,8 @@
# include <QtCore/QRectF>
-# ifndef INCLUDE_MLN_FILES
-# define MLN_INCLUDE_ONLY
-# endif
-
# include <mln/core/alias/box3d.hh>
+# include <mln/core/image/image3d.hh>
# include <src/task.hh>
# include <src/mln_data.hh>
diff --git a/milena/sandbox/lazzara/igr/gui/shared/src/color.hh b/milena/sandbox/lazzara/igr/gui/shared/src/color.hh
index 980d3bb..cf62577 100644
--- a/milena/sandbox/lazzara/igr/gui/shared/src/color.hh
+++ b/milena/sandbox/lazzara/igr/gui/shared/src/color.hh
@@ -1,4 +1,5 @@
-// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory
+// (LRDE)
//
// This file is part of Olena.
//
@@ -30,10 +31,6 @@
#ifndef MLN_DEMO_SRC_COLOR_HH
# define MLN_DEMO_SRC_COLOR_HH
-# ifndef INCLUDE_MLN_FILES
-# define MLN_INCLUDE_ONLY
-# endif
-
//# if QT_VERSION >= 0x040000 && QT_VERSION < 0x040400
# include <mln/value/qt/rgb32.hh>
diff --git a/milena/sandbox/lazzara/igr/gui/shared/src/igr_types.hh b/milena/sandbox/lazzara/igr/gui/shared/src/igr_types.hh
index da64d22..5154b6b 100644
--- a/milena/sandbox/lazzara/igr/gui/shared/src/igr_types.hh
+++ b/milena/sandbox/lazzara/igr/gui/shared/src/igr_types.hh
@@ -3,10 +3,6 @@
# include <shared/src/color.hh>
-# ifndef INCLUDE_MLN_FILES
-# define MLN_INCLUDE_ONLY
-# endif
-
# include <mln/value/label_16.hh>
# include <mln/value/int_u12.hh>
# include <mln/value/int_u8.hh>
diff --git a/milena/sandbox/lazzara/igr/gui/shared/src/image_viewer.hh b/milena/sandbox/lazzara/igr/gui/shared/src/image_viewer.hh
index c9623b8..5996b1e 100644
--- a/milena/sandbox/lazzara/igr/gui/shared/src/image_viewer.hh
+++ b/milena/sandbox/lazzara/igr/gui/shared/src/image_viewer.hh
@@ -1,4 +1,5 @@
-// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory
+// (LRDE)
//
// This file is part of Olena.
//
@@ -32,10 +33,6 @@
# include <ui_image_viewer.h>
-# ifndef INCLUDE_MLN_FILES
-# define MLN_INCLUDE_ONLY
-# endif
-
# include <src/igr_types.hh>
# include <mln/core/image/image2d.hh>
diff --git a/milena/sandbox/lazzara/igr/gui/viewer/src/main.cc b/milena/sandbox/lazzara/igr/gui/viewer/src/main.cc
index 4678229..46674c1 100644
--- a/milena/sandbox/lazzara/igr/gui/viewer/src/main.cc
+++ b/milena/sandbox/lazzara/igr/gui/viewer/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/milena/sandbox/lazzara/igr/gui/viewer/src/mln_data.cc b/milena/sandbox/lazzara/igr/gui/viewer/src/mln_data.cc
index e43fa15..7579c62 100644
--- a/milena/sandbox/lazzara/igr/gui/viewer/src/mln_data.cc
+++ b/milena/sandbox/lazzara/igr/gui/viewer/src/mln_data.cc
@@ -1,4 +1,22 @@
-#define INCLUDE_MLN_FILES
+// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory
+// (LRDE)
+//
+// This file is part of Olena.
+//
+// Olena is free software: you can redistribute it and/or modify it under
+// the terms of the GNU General Public License as published by the Free
+// Software Foundation, version 2 of the License.
+//
+// Olena is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Olena. If not, see <http://www.gnu.org/licenses/>.
+
+#include <QtCore>
+
#include <src/mln_data.hh>
#include <mln/core/image/dmorph/slice_image.hh>
#include <mln/core/image/image3d.hh>
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 9c78742..57ee01f 100644
--- a/milena/sandbox/lazzara/igr/gui/viewer/src/mln_data.hh
+++ b/milena/sandbox/lazzara/igr/gui/viewer/src/mln_data.hh
@@ -1,13 +1,27 @@
+// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory
+// (LRDE)
+//
+// This file is part of Olena.
+//
+// Olena is free software: you can redistribute it and/or modify it under
+// the terms of the GNU General Public License as published by the Free
+// Software Foundation, version 2 of the License.
+//
+// Olena is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Olena. If not, see <http://www.gnu.org/licenses/>.
+
+
#ifndef IGR_VIEWER_SRC_MLN_DATA_HH
# define IGR_VIEWER_SRC_MLN_DATA_HH
#include <QtCore/QObject>
#include <QtCore/QPointF>
-# ifndef INCLUDE_MLN_FILES
-# define MLN_INCLUDE_ONLY
-# endif
-
#include <mln/core/image/image3d.hh>
#include <shared/src/igr_types.hh>
#include <mln/value/int_u12.hh>
diff --git a/milena/sandbox/lazzara/igr/gui/viewer/src/mln_widgets.cc b/milena/sandbox/lazzara/igr/gui/viewer/src/mln_widgets.cc
deleted file mode 100644
index 2ac5c66..0000000
--- a/milena/sandbox/lazzara/igr/gui/viewer/src/mln_widgets.cc
+++ /dev/null
@@ -1,2 +0,0 @@
-#include <shared/src/image_viewer.cc>
-#include <src/mln_data.cc>
diff --git a/milena/sandbox/lazzara/igr/gui/viewer/viewer.pro b/milena/sandbox/lazzara/igr/gui/viewer/viewer.pro
index f4ffc14..b384b8f 100644
--- a/milena/sandbox/lazzara/igr/gui/viewer/viewer.pro
+++ b/milena/sandbox/lazzara/igr/gui/viewer/viewer.pro
@@ -5,19 +5,32 @@
TEMPLATE = app
TARGET =
DEPENDPATH += . src ui
-INCLUDEPATH += . src ../shared ../ $(OLN)/milena /lrde/dev/linux-x86/stable/gdcm/include
+INCLUDEPATH += . src ../shared ../ $(OLN)/milena
#INCLUDEPATH += . src ../shared ../ $(OLN)/milena /home/inca/local/include
-DEFINES= NDEBUG
+DEFINES= NDEBUG MLN_WO_GLOBAL_VARS
#LIBS += -L/home/inca/local/lib -lgdcmCommon -lgdcmDICT -lgdcmDSED -lgdcmIOD -lgdcmMSFF -lgdcmexpat -lgdcmjpeg12 -lgdcmjpeg16 -lgdcmjpeg8 -lgdcmopenjpeg -lgdcmuuid -lgdcmzlib
-LIBS += -L/lrde/dev/linux-x86/stable/gdcm/lib -lgdcmCommon -lgdcmDICT -lgdcmDSED -lgdcmIOD -lgdcmMSFF -lgdcmexpat -lgdcmjpeg12 -lgdcmjpeg16 -lgdcmjpeg8 -lgdcmopenjpeg -lgdcmuuid -lgdcmzlib
+LIBS += -lgdcmCommon -lgdcmjpeg12 -lgdcmjpeg16 -lgdcmjpeg8 -lgdcmDICT -lgdcmDSED -lgdcmIOD -lgdcmMSFF -lqwt-qt4
# Input
-HEADERS += src/main_window.hh ../shared/src/image_viewer.hh ../shared/src/internal/interactive_scene.hh src/mln_data.hh
-FORMS += ui/main_window.ui ../shared/ui/image_viewer.ui
-SOURCES += src/main.cc src/main_window.cc ../shared/src/internal/interactive_scene.cc src/mln_widgets.cc
+HEADERS += \
+ src/main_window.hh \
+ ../shared/src/image_viewer.hh \
+ ../shared/src/internal/interactive_scene.hh \
+ src/mln_data.hh
+
+FORMS += \
+ ui/main_window.ui \
+ ../shared/ui/image_viewer.ui
+
+SOURCES += \
+ src/main.cc \
+ src/main_window.cc \
+ ../shared/src/internal/interactive_scene.cc \
+ ../shared/src/image_viewer.cc \
+ src/mln_data.cc
RESOURCES = ../shared/shared.qrc
--
1.5.6.5
1
0