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-208-g313000d Split interface and implementation of topo::is_not_end_point.
by Roland Levillain 12 Apr '11
by Roland Levillain 12 Apr '11
12 Apr '11
* mln/topo/is_not_end_point.hh: Here.
---
milena/ChangeLog | 6 ++++
milena/mln/topo/is_not_end_point.hh | 47 ++++++++++++++++++++--------------
2 files changed, 34 insertions(+), 19 deletions(-)
diff --git a/milena/ChangeLog b/milena/ChangeLog
index da73aef..45c94c8 100644
--- a/milena/ChangeLog
+++ b/milena/ChangeLog
@@ -1,3 +1,9 @@
+2010-09-16 Roland Levillain <roland(a)lrde.epita.fr>
+
+ Split interface and implementation of topo::is_not_end_point.
+
+ * mln/topo/is_not_end_point.hh: Here.
+
2010-09-15 Roland Levillain <roland(a)lrde.epita.fr>
Catch up with the renaming to detach_cell.
diff --git a/milena/mln/topo/is_not_end_point.hh b/milena/mln/topo/is_not_end_point.hh
index 3c419ec..62561fa 100644
--- a/milena/mln/topo/is_not_end_point.hh
+++ b/milena/mln/topo/is_not_end_point.hh
@@ -35,7 +35,6 @@
# include <mln/core/concept/image.hh>
# include <mln/core/concept/neighborhood.hh>
-
namespace mln
{
@@ -50,24 +49,10 @@ namespace mln
///
/// \param nbh_fg The foreground neighborhood.
/// \apram ima The image.
- is_not_end_point(const Neighborhood<N>& nbh,
- const Image<I>& ima)
- : nbh_(exact(nbh)),
- ima_(exact(ima))
- {
- }
-
- // Is \a p not na end point?
- bool operator()(const mln_psite(I)& p) const
- {
- // Number of foreground neighbors pixels.
- unsigned nneighbs = 0;
- mln_niter(N) n(nbh_, p);
- for_all(n)
- if (ima_.has(n) && ima_(n))
- ++nneighbs;
- return nneighbs != 1;
- }
+ is_not_end_point(const Neighborhood<N>& nbh, const Image<I>& ima);
+
+ // Is \a p not an end point?
+ bool operator()(const mln_psite(I)& p) const;
private:
/// The foreground neighborhood.
@@ -76,8 +61,32 @@ namespace mln
const I& ima_;
};
+
+
# ifndef MLN_INCLUDE_ONLY
+ template <typename I, typename N>
+ inline
+ is_not_end_point<I, N>::is_not_end_point(const Neighborhood<N>& nbh,
+ const Image<I>& ima)
+ : nbh_(exact(nbh)),
+ ima_(exact(ima))
+ {
+ }
+
+ template <typename I, typename N>
+ inline
+ bool
+ is_not_end_point<I, N>::operator()(const mln_psite(I)& p) const
+ {
+ // Number of foreground neighbors pixels.
+ unsigned nneighbs = 0;
+ mln_niter(N) n(nbh_, p);
+ for_all(n)
+ if (ima_.has(n) && ima_(n))
+ ++nneighbs;
+ return nneighbs != 1;
+ }
# endif // MLN_INCLUDE_ONLY
--
1.5.6.5
1
0
last-svn-commit-209-gdbff476 Fix the processing order in topo::breadth_first_thinning.
by Roland Levillain 12 Apr '11
by Roland Levillain 12 Apr '11
12 Apr '11
* mln/topo/skeleton/breadth_first_thinning.hh: Use a p_queue_fast
site set instead of a pair of p_set's to ensure an actual
breadth-first processing of sites.
---
milena/ChangeLog | 8 +++
milena/mln/topo/skeleton/breadth_first_thinning.hh | 63 ++++++++-----------
2 files changed, 35 insertions(+), 36 deletions(-)
diff --git a/milena/ChangeLog b/milena/ChangeLog
index 45c94c8..7554064 100644
--- a/milena/ChangeLog
+++ b/milena/ChangeLog
@@ -1,3 +1,11 @@
+2010-09-17 Roland Levillain <roland(a)lrde.epita.fr>
+
+ Fix the processing order in topo::breadth_first_thinning.
+
+ * mln/topo/skeleton/breadth_first_thinning.hh: Use a p_queue_fast
+ site set instead of a pair of p_set's to ensure an actual
+ breadth-first processing of sites.
+
2010-09-16 Roland Levillain <roland(a)lrde.epita.fr>
Split interface and implementation of topo::is_not_end_point.
diff --git a/milena/mln/topo/skeleton/breadth_first_thinning.hh b/milena/mln/topo/skeleton/breadth_first_thinning.hh
index 3be9539..348b271 100644
--- a/milena/mln/topo/skeleton/breadth_first_thinning.hh
+++ b/milena/mln/topo/skeleton/breadth_first_thinning.hh
@@ -37,7 +37,7 @@
# include <mln/core/concept/image.hh>
# include <mln/core/concept/neighborhood.hh>
-# include <mln/core/site_set/p_set.hh>
+# include <mln/core/site_set/p_queue_fast.hh>
# include <mln/fun/p2b/tautology.hh>
@@ -116,9 +116,9 @@ namespace mln
is_simple.set_image(output);
typedef mln_psite(I) psite;
- typedef p_set<psite> set_t;
- set_t set;
- // Populate SET with candidate simple points.
+ typedef p_queue_fast<psite> queue_t;
+ queue_t queue;
+ // Populate QUEUE with candidate simple points.
mln_piter(I) p_(output.domain());
for_all(p_)
{
@@ -129,43 +129,34 @@ namespace mln
the compiler and pass an actual, explicit psite. */
psite p = p_;
if (output(p) && constraint(p) && is_simple(p))
- set.insert(p);
+ queue.push(p);
}
- while (!set.is_empty())
+ while (!queue.is_empty())
{
- set_t next_set;
-
- mln_piter(set_t) ps(set);
- for_all(ps)
- {
- // Same remark as above.
- psite p = ps;
-
- /* FIXME: We compute the cell and attachment of P twice:
- during the call to is_simple() and within detach().
- How could we reuse this elegantly, without breaking
- the genericity of the skeleton algorithm?
- Also, keep in mind that functors can maintain an
- internal state and make side effects, meaning that
- e.g. constraint(p) might not be constant for a
- given p during the thinning. */
- if (output(p) && constraint(p) && is_simple(p))
+ psite p = queue.pop_front();
+
+ /* FIXME: We compute the cell and attachment of P twice:
+ during the call to is_simple() and within detach().
+ How could we reuse this elegantly, without breaking
+ the genericity of the skeleton algorithm?
+ Also, keep in mind that functors can maintain an
+ internal state and make side effects, meaning that
+ e.g. constraint(p) might not be constant for a
+ given p during the thinning. */
+ if (output(p) && constraint(p) && is_simple(p))
+ {
+ detach(p, output);
+ mln_niter(N) n_(nbh, p);
+ for_all(n_)
{
- detach(p, output);
- mln_niter(N) n_(nbh, p);
- for_all(n_)
- {
- // Same remark as above regarding P and P_.
- psite n = n_;
- if (output.domain().has(n)
- && output(n) && constraint(n) && is_simple(n))
- next_set.insert(n);
- }
+ // Same remark as above regarding P and P_.
+ psite n = n_;
+ if (output.domain().has(n)
+ && output(n) && constraint(n) && is_simple(n))
+ queue.push(n);
}
- }
- set.clear();
- std::swap(set, next_set);
+ }
}
trace::exiting("topo::skeleton::breadth_first_thinning");
--
1.5.6.5
1
0
last-svn-commit-210-g8aa5d02 Aesthetic changes in thinning algorithms.
by Roland Levillain 12 Apr '11
by Roland Levillain 12 Apr '11
12 Apr '11
* mln/topo/skeleton/breadth_first_thinning.hh: Remove a comment.
* mln/topo/skeleton/priority_driven_thinning.hh: Likewise.
Rename p_queue to queue to avoid confusions with mln::p_queue and
improve uniformity w.r.t. topo::breadth_first_thinning.
---
milena/ChangeLog | 9 +++++++
milena/mln/topo/skeleton/breadth_first_thinning.hh | 9 -------
.../mln/topo/skeleton/priority_driven_thinning.hh | 23 ++++++-------------
3 files changed, 16 insertions(+), 25 deletions(-)
diff --git a/milena/ChangeLog b/milena/ChangeLog
index 7554064..11924f1 100644
--- a/milena/ChangeLog
+++ b/milena/ChangeLog
@@ -1,5 +1,14 @@
2010-09-17 Roland Levillain <roland(a)lrde.epita.fr>
+ Aesthetic changes in thinning algorithms.
+
+ * mln/topo/skeleton/breadth_first_thinning.hh: Remove a comment.
+ * mln/topo/skeleton/priority_driven_thinning.hh: Likewise.
+ Rename p_queue to queue to avoid confusions with mln::p_queue and
+ improve uniformity w.r.t. topo::breadth_first_thinning.
+
+2010-09-17 Roland Levillain <roland(a)lrde.epita.fr>
+
Fix the processing order in topo::breadth_first_thinning.
* mln/topo/skeleton/breadth_first_thinning.hh: Use a p_queue_fast
diff --git a/milena/mln/topo/skeleton/breadth_first_thinning.hh b/milena/mln/topo/skeleton/breadth_first_thinning.hh
index 348b271..d2f33b5 100644
--- a/milena/mln/topo/skeleton/breadth_first_thinning.hh
+++ b/milena/mln/topo/skeleton/breadth_first_thinning.hh
@@ -135,15 +135,6 @@ namespace mln
while (!queue.is_empty())
{
psite p = queue.pop_front();
-
- /* FIXME: We compute the cell and attachment of P twice:
- during the call to is_simple() and within detach().
- How could we reuse this elegantly, without breaking
- the genericity of the skeleton algorithm?
- Also, keep in mind that functors can maintain an
- internal state and make side effects, meaning that
- e.g. constraint(p) might not be constant for a
- given p during the thinning. */
if (output(p) && constraint(p) && is_simple(p))
{
detach(p, output);
diff --git a/milena/mln/topo/skeleton/priority_driven_thinning.hh b/milena/mln/topo/skeleton/priority_driven_thinning.hh
index f074b6a..42e1b13 100644
--- a/milena/mln/topo/skeleton/priority_driven_thinning.hh
+++ b/milena/mln/topo/skeleton/priority_driven_thinning.hh
@@ -126,9 +126,9 @@ namespace mln
typedef mln_psite(I) psite;
typedef p_queue_fast<psite> queue_t;
- typedef p_priority<mln_value(J), queue_t> p_queue_t;
- p_queue_t p_queue;
- // Populate P_QUEUE with candidate simple points.
+ typedef p_priority<mln_value(J), queue_t> priority_queue_t;
+ priority_queue_t queue;
+ // Populate QUEUE with candidate simple points.
mln_piter(I) p_(output.domain());
for_all(p_)
{
@@ -139,21 +139,12 @@ namespace mln
the compiler and pass an actual, explicit psite. */
psite p = p_;
if (output(p) && constraint(p) && is_simple(p))
- p_queue.push(priority(p), p);
+ queue.push(priority(p), p);
}
- while (!p_queue.is_empty())
+ while (!queue.is_empty())
{
- psite p = p_queue.pop_front();
-
- /* FIXME: We compute the cell and attachment of P twice:
- during the call to is_simple() and within detach().
- How could we reuse this elegantly, without breaking
- the genericity of the skeleton algorithm?
- Also, keep in mind that functors can maintain an
- internal state and make side effects, meaning that
- e.g. constraint(p) might not be constant for a
- given p during the thinning. */
+ psite p = queue.pop_front();
if (output(p) && constraint(p) && is_simple(p))
{
detach(p, output);
@@ -164,7 +155,7 @@ namespace mln
psite n = n_;
if (output.domain().has(n)
&& output(n) && constraint(n) && is_simple(n))
- p_queue.push(priority(n), n);
+ queue.push(priority(n), n);
}
}
}
--
1.5.6.5
1
0
last-svn-commit-211-ga47828e Have topo::is_n_face take a psite type as class parameter.
by Roland Levillain 12 Apr '11
by Roland Levillain 12 Apr '11
12 Apr '11
* mln/topo/is_n_face.hh: Here, so that the argument of this
functor (e.g., an iterator) is always converted to the psite
type.
* apps/mesh-segm-skel/mesh-complex-max-curv-skel.cc,
* apps/mesh-segm-skel/mesh-complex-pinv-curv-skel.cc,
* apps/mesh-segm-skel/mesh-complex-skel.cc:
Adjust.
---
milena/ChangeLog | 12 ++++++++++++
.../mesh-segm-skel/mesh-complex-max-curv-skel.cc | 2 +-
.../mesh-segm-skel/mesh-complex-pinv-curv-skel.cc | 2 +-
milena/apps/mesh-segm-skel/mesh-complex-skel.cc | 2 +-
milena/mln/topo/is_n_face.hh | 16 ++++++++--------
5 files changed, 23 insertions(+), 11 deletions(-)
diff --git a/milena/ChangeLog b/milena/ChangeLog
index 11924f1..e0532ab 100644
--- a/milena/ChangeLog
+++ b/milena/ChangeLog
@@ -1,3 +1,15 @@
+2010-09-19 Roland Levillain <roland(a)lrde.epita.fr>
+
+ Have topo::is_n_face take a psite type as class parameter.
+
+ * mln/topo/is_n_face.hh: Here, so that the argument of this
+ functor (e.g., an iterator) is always converted to the psite
+ type.
+ * apps/mesh-segm-skel/mesh-complex-max-curv-skel.cc,
+ * apps/mesh-segm-skel/mesh-complex-pinv-curv-skel.cc,
+ * apps/mesh-segm-skel/mesh-complex-skel.cc:
+ Adjust.
+
2010-09-17 Roland Levillain <roland(a)lrde.epita.fr>
Aesthetic changes in thinning algorithms.
diff --git a/milena/apps/mesh-segm-skel/mesh-complex-max-curv-skel.cc b/milena/apps/mesh-segm-skel/mesh-complex-max-curv-skel.cc
index 5c17726..edb943e 100644
--- a/milena/apps/mesh-segm-skel/mesh-complex-max-curv-skel.cc
+++ b/milena/apps/mesh-segm-skel/mesh-complex-max-curv-skel.cc
@@ -261,7 +261,7 @@ main(int argc, char* argv[])
As a workaround, we use the constraint predicate of the
skeleton routine to restrict the iteration to 2-cells. */
- mln::topo::is_n_face<bin_ima_t::dim> constraint_p;
+ mln::topo::is_n_face<mln_psite_(bin_ima_t), bin_ima_t::dim> constraint_p;
bin_ima_t skel =
mln::topo::skeleton::breadth_first_thinning(surface, nbh,
is_simple_p,
diff --git a/milena/apps/mesh-segm-skel/mesh-complex-pinv-curv-skel.cc b/milena/apps/mesh-segm-skel/mesh-complex-pinv-curv-skel.cc
index 7092b18..e2bdf45 100644
--- a/milena/apps/mesh-segm-skel/mesh-complex-pinv-curv-skel.cc
+++ b/milena/apps/mesh-segm-skel/mesh-complex-pinv-curv-skel.cc
@@ -266,7 +266,7 @@ main(int argc, char* argv[])
As a workaround, we use the constraint predicate of the
skeleton routine to restrict the iteration to 2-cells. */
- mln::topo::is_n_face<bin_ima_t::dim> constraint_p;
+ mln::topo::is_n_face<mln_psite_(bin_ima_t), bin_ima_t::dim> constraint_p;
bin_ima_t skel =
mln::topo::skeleton::breadth_first_thinning(surface, nbh,
is_simple_p,
diff --git a/milena/apps/mesh-segm-skel/mesh-complex-skel.cc b/milena/apps/mesh-segm-skel/mesh-complex-skel.cc
index f5a7f11..b8b7da8 100644
--- a/milena/apps/mesh-segm-skel/mesh-complex-skel.cc
+++ b/milena/apps/mesh-segm-skel/mesh-complex-skel.cc
@@ -219,7 +219,7 @@ main(int argc, char* argv[])
As a workaround, we use the constraint predicate of the
skeleton routine to restrict the iteration to 2-cells. */
- mln::topo::is_n_face<bin_ima_t::dim> constraint_p;
+ mln::topo::is_n_face<mln_psite_(bin_ima_t), bin_ima_t::dim> constraint_p;
bin_ima_t skel =
mln::topo::skeleton::breadth_first_thinning(surface, nbh,
is_simple_p,
diff --git a/milena/mln/topo/is_n_face.hh b/milena/mln/topo/is_n_face.hh
index bc9aa71..ab696c1 100644
--- a/milena/mln/topo/is_n_face.hh
+++ b/milena/mln/topo/is_n_face.hh
@@ -41,26 +41,26 @@ namespace mln
{
// Forward declaration.
- template <unsigned N> struct is_n_face;
+ template <typename P, unsigned N>
+ struct is_n_face;
- /// A functor testing wheter a mln::complex_psite is an \p N -face.
- template <unsigned N>
- struct is_n_face : public mln::Function_v2b< is_n_face<N> >
+ /// A functor testing wheter a psite (presumably an
+ /// mln::complex_psite) is an \p N -face.
+ template <typename P, unsigned N>
+ struct is_n_face : public mln::Function_v2b< is_n_face<P, N> >
{
typedef bool result;
- template <typename P>
bool operator()(const P& p) const;
};
# ifndef MLN_INCLUDE_ONLY
- template <unsigned N>
- template <typename P>
+ template <typename P, unsigned N>
inline
bool
- is_n_face<N>::operator()(const P& p) const
+ is_n_face<P, N>::operator()(const P& p) const
{
return p.n() == N;
}
--
1.5.6.5
1
0
12 Apr '11
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Olena, a generic and efficient image processing platform".
The branch mesh-segm-skel has been updated
via 5946ef3265c3baaaacf7597068829e139335d5d2 (commit)
via ced2ccefc907fc5f2370a900363453a64ad56941 (commit)
via 27351d0b4d93b4fd41a6d536ac9d316036e9711d (commit)
via 8ac5e61c7787a138a48775ec0a080cf8b38491f3 (commit)
via f714e94e041ac4710c40212e02e1baa4822352b1 (commit)
via b84bea10cca01a6aa03cbfd5a5db722b8df45e6c (commit)
via f9882dac38deb8792722bf665612fbb6342f49bd (commit)
via 15ce5544f6eadb79168fdaff7b867719cf2dd37a (commit)
via 082d9aef633066d141349796fbc1cd7c29210d6f (commit)
via a84435517393f311aefec6a09eac81e720fe3cef (commit)
via 17def89e82362a5e889db4c40a66ff5f47dc036e (commit)
via 48e818f5e12b9f7f5951749b7cf957492c0b363e (commit)
via f825089e31169381cab43aac66dfde4ddf57f56c (commit)
via 6629f93070da7d9eea9fa6a7b99e96154d624565 (commit)
via e402de7a1c8b372d768e93fdb76718e73ab48681 (commit)
via 21a5b46f16b712625498aaa2b01a601cdd614990 (commit)
via 1bfe4f9f3a6a5b8711a638f7586f0d484d219137 (commit)
via 44da300ad852dbb3d98bd133664b09117a6dcbb9 (commit)
via 5bebfceecb0e8d6164758247f9b5148b641d8c7c (commit)
via 93a3309aef7eb123f621a410a35ecab3e37a14da (commit)
via 5fca43edf80864073321c4c03af10c3161a39f75 (commit)
via a69fad4b913734b5a51a8ecb062542110daf5127 (commit)
via fc569341928749e7beabe978428fffc79cadb44a (commit)
via 5326c7cc6201adec706c09fe870464646eed4da3 (commit)
via d2986812d738df5d46cdd957db9193306fb67eca (commit)
via 65616e271c7e03852b4dd707cb0c146744f5c2b3 (commit)
via 7a48c8c49c5012794fe78390bf942700304269ec (commit)
via 5c73804074ee26a60ef78c98b4fa3eb7a9f8016d (commit)
via 3076fae6bbd1035c08e66d939be27634c9593980 (commit)
via a6b48d3454f55b143c9d2b7bb7960aff39890644 (commit)
via 004dc21fabbaa89f053ced04991cff7382586120 (commit)
via a47828ebc4f6c80b5eeea268f0f453303a8a67b2 (commit)
via 8aa5d0276bbd76c6f3b452d9283a748df08ce87c (commit)
via dbff476989547afcfb8a0de52b49d3efb5915d2d (commit)
via 313000d77af0064f510e683824132f4c44a94e71 (commit)
via a087bc4d5c23b64db8ca8a3fe40c73387419ec70 (commit)
via ee56e13b49f84c30aaaee1f3c1edfdac61784c52 (commit)
via b4a75638b975b3e0a70d47ab1fa48caff05468f3 (commit)
via a04de22136722fbb9445e9f0eec4b0a474a4393d (commit)
via cb5723f7d881aa291082a67e2a0303456b1b3402 (commit)
via 739f3d21f481e522f8712bbfb5dd891a7886d615 (commit)
via 8b3107da88f52723fe8e170efc6a6f10d4bdc17e (commit)
via 57d5538008bc881e674005421f55b85b43a5125e (commit)
via 36067cacfe2dd5f9d10bd2b1218e3964891a6eaa (commit)
via 40e46d9a28a4f226b5c147a7b51dd96ad8040afc (commit)
via fc4e4c62045e387832086774ed292c0ca22ee341 (commit)
via 32732575159e70d55fc3e64c1ee426a7ef86c92d (commit)
via 66c20dd71270e547c499df351f14a21e6c02a2db (commit)
via ff2781ffbf32eb06e7a6031fef3ccaf50c2bcf13 (commit)
via fe65e41b71bd948244982068e7a40613f50f12a6 (commit)
from ad49d7efbc810b16dcedc41d74b52c4168ec81dd (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
5946ef3 Configure milena/apps/generic-skel/Makefile.
ced2cce New apps on generic skeletonization.
27351d0 apps/graph-morpho: Catch up with current mln::topo::is_n_face.
8ac5e61 Use priority-driven thinning in collapse-based thinnings apps.
f714e94 Simplify curvature-based thinnings using 2- and 1-collapses apps.
b84bea1 Miscellaneous changes in mesh-related operations.
f9882da New apps: max curvature-based thinnings using 2- and 1-collapses.
15ce554 Add VTK versions of some OFF meshes.
082d9ae New app: binary OFF to VTK mesh conversion.
a844355 New app performing a 2-collapse on a mesh.
17def89 Prevent a site from being introduced twice in thinning's queues.
48e818f Add routines to identify and detach (collapse) simple pairs.
f825089 Merge branch 'vtk-format' into skeletons+vtk-format
1bfe4f9 Small corrections in apps/mesh-segm-skel.
44da300 Exercise topology-related routines.
5bebfce New complex image alias: mln::bin_2complex_image2d.
93a3309 Revamp mln::topo::is_simple_cell.
5fca43e Have is_facet take into account the values of a (complex) image.
a69fad4 Revamp topology-related routines.
fc56934 Make the interface of thinning algorithms uniform w.r.t. functors.
5326c7c State a cell is not simple if it does not correspond to a facet.
d298681 Use mln::data::paste to simplify mesh skeleton applications.
65616e2 Update mesh skeleton applications.
7a48c8c More generic breadth-first-thinning-based skeleton transformations.
5c73804 Introduce a helper to build an mln::mutable_extension_ima.
3076fae Introduce an extension-by-mutable-image morpher.
a6b48d3 Get the `detach' argument of thinning algorithms by reference.
004dc21 Get rid of intermediate psites in thinning algorithms.
a47828e Have topo::is_n_face take a psite type as class parameter.
8aa5d02 Aesthetic changes in thinning algorithms.
dbff476 Fix the processing order in topo::breadth_first_thinning.
313000d Split interface and implementation of topo::is_not_end_point.
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 8 +
configure.ac | 2 +
milena/ChangeLog | 469 +
milena/apps/Makefile.am | 6 +-
milena/apps/generic-skel/Makefile.am | 54 +
.../generic-skel/image2d-skel-unconstrained.cc | 85 +
.../generic-skel/image2d-skel-with-end-points.cc | 84 +
milena/apps/generic-skel/image2d-skel.hh | 174 +
.../test-image2d-skel-unconstrained.in | 24 +
.../test-image2d-skel-with-end-points.in | 24 +
milena/apps/graph-morpho/morpho.hh | 8 +-
milena/apps/mesh-segm-skel/Makefile.am | 83 +-
.../apps/mesh-segm-skel/mesh-complex-2-collapse.cc | 155 +
.../mesh-complex-max-curv-1-collapse.cc | 377 +
.../mesh-complex-max-curv-2-collapse.cc | 319 +
.../mesh-segm-skel/mesh-complex-max-curv-skel.cc | 82 +-
.../mesh-segm-skel/mesh-complex-pinv-curv-skel.cc | 82 +-
milena/apps/mesh-segm-skel/mesh-complex-skel.cc | 85 +-
milena/apps/mesh-segm-skel/off-to-vtk-bin.cc | 60 +
milena/apps/mesh-segm-skel/save_bin_alt.hh | 310 +-
.../mesh-segm-skel/test-mesh-complex-2-collapse.in | 23 +
.../test-mesh-complex-max-curv-1-collapse.in | 24 +
.../test-mesh-complex-max-curv-2-collapse.in | 24 +
.../test-mesh-complex-max-curv-extrema.in | 16 +
milena/headers.mk | 10 +-
milena/mesh/Makefile.am | 26 +-
milena/mesh/bunny-holefilled.vtk |458714 ++++++++++++++++++++
milena/mesh/pseudo-manifold.vtk | 188 +
milena/mesh/teapot.vtk |25008 ++
milena/mesh/tetrahedron.vtk | 48 +
milena/mln/core/alias/complex_image.hh | 10 +-
.../mln/core/image/dmorph/mutable_extension_ima.hh | 272 +
milena/mln/core/routine/mutable_extend.hh | 67 +
milena/mln/geom/complex_geometry.hh | 17 +-
milena/mln/io/off/load.hh | 30 +-
milena/mln/io/vtk/all.hh | 47 +
milena/mln/io/vtk/load.hh | 615 +
milena/mln/io/vtk/save.hh | 653 +
milena/mln/make/attachment.hh | 53 +-
milena/mln/make/cell.hh | 11 +-
milena/mln/make/detachment.hh | 50 +-
milena/mln/topo/detach.hh | 83 -
milena/mln/topo/detach_cell.hh | 154 +
milena/mln/topo/detach_pair.hh | 191 +
milena/mln/topo/detach_point.hh | 113 +
milena/mln/topo/is_facet.hh | 52 +-
milena/mln/topo/is_n_face.hh | 16 +-
milena/mln/topo/is_not_end_point.hh | 97 +
milena/mln/topo/is_simple_cell.hh | 114 +-
milena/mln/topo/is_simple_pair.hh | 225 +
milena/mln/topo/is_simple_point2d.hh | 140 +
milena/mln/topo/skeleton/breadth_first_thinning.hh | 140 +-
.../mln/topo/skeleton/priority_driven_thinning.hh | 207 +
milena/tests/core/image/complex_image.hh | 20 +-
milena/tests/io/Makefile.am | 3 +-
milena/tests/io/vtk/Makefile.am | 33 +
milena/tests/io/vtk/load_bin.cc | 60 +
milena/tests/io/vtk/load_save_bin.cc | 48 +
milena/tests/io/vtk/save.cc | 106 +
milena/tests/make/Makefile.am | 6 +-
milena/tests/make/attachment.cc | 77 +
milena/tests/make/detachment.cc | 98 +
milena/tests/topo/Makefile.am | 13 +-
milena/tests/topo/detach_pair.cc | 73 +
milena/tests/topo/is_facet.cc | 80 +
milena/tests/topo/is_simple_pair.cc | 73 +
milena/tests/topo/skeleton/Makefile.am | 20 +-
.../tests/topo/skeleton/breadth_first_thinning.cc | 74 +
.../skeleton/breadth_first_thinning_constrained.cc | 78 +
.../topo/skeleton/priority_driven_thinning.cc | 92 +
.../priority_driven_thinning_constrained.cc | 96 +
milena/tests/unit_test/unit-tests.mk | 4 +
72 files changed, 490616 insertions(+), 367 deletions(-)
create mode 100644 milena/apps/generic-skel/Makefile.am
create mode 100644 milena/apps/generic-skel/image2d-skel-unconstrained.cc
create mode 100644 milena/apps/generic-skel/image2d-skel-with-end-points.cc
create mode 100644 milena/apps/generic-skel/image2d-skel.hh
create mode 100644 milena/apps/generic-skel/test-image2d-skel-unconstrained.in
create mode 100644 milena/apps/generic-skel/test-image2d-skel-with-end-points.in
create mode 100644 milena/apps/mesh-segm-skel/mesh-complex-2-collapse.cc
create mode 100644 milena/apps/mesh-segm-skel/mesh-complex-max-curv-1-collapse.cc
create mode 100644 milena/apps/mesh-segm-skel/mesh-complex-max-curv-2-collapse.cc
create mode 100644 milena/apps/mesh-segm-skel/off-to-vtk-bin.cc
create mode 100644 milena/apps/mesh-segm-skel/test-mesh-complex-2-collapse.in
create mode 100644 milena/apps/mesh-segm-skel/test-mesh-complex-max-curv-1-collapse.in
create mode 100644 milena/apps/mesh-segm-skel/test-mesh-complex-max-curv-2-collapse.in
mode change 100755 => 100644 milena/apps/mesh-segm-skel/test-mesh-segm.in
create mode 100644 milena/mesh/bunny-holefilled.vtk
create mode 100644 milena/mesh/pseudo-manifold.vtk
create mode 100644 milena/mesh/teapot.vtk
create mode 100644 milena/mesh/tetrahedron.vtk
create mode 100644 milena/mln/core/image/dmorph/mutable_extension_ima.hh
create mode 100644 milena/mln/core/routine/mutable_extend.hh
create mode 100644 milena/mln/io/vtk/all.hh
create mode 100644 milena/mln/io/vtk/load.hh
create mode 100644 milena/mln/io/vtk/save.hh
delete mode 100644 milena/mln/topo/detach.hh
create mode 100644 milena/mln/topo/detach_cell.hh
create mode 100644 milena/mln/topo/detach_pair.hh
create mode 100644 milena/mln/topo/detach_point.hh
create mode 100644 milena/mln/topo/is_not_end_point.hh
create mode 100644 milena/mln/topo/is_simple_pair.hh
create mode 100644 milena/mln/topo/is_simple_point2d.hh
create mode 100644 milena/mln/topo/skeleton/priority_driven_thinning.hh
create mode 100644 milena/tests/io/vtk/Makefile.am
create mode 100644 milena/tests/io/vtk/load_bin.cc
create mode 100644 milena/tests/io/vtk/load_save_bin.cc
create mode 100644 milena/tests/io/vtk/save.cc
create mode 100644 milena/tests/make/attachment.cc
create mode 100644 milena/tests/make/detachment.cc
create mode 100644 milena/tests/topo/detach_pair.cc
create mode 100644 milena/tests/topo/is_facet.cc
create mode 100644 milena/tests/topo/is_simple_pair.cc
create mode 100644 milena/tests/topo/skeleton/breadth_first_thinning.cc
create mode 100644 milena/tests/topo/skeleton/breadth_first_thinning_constrained.cc
create mode 100644 milena/tests/topo/skeleton/priority_driven_thinning.cc
create mode 100644 milena/tests/topo/skeleton/priority_driven_thinning_constrained.cc
hooks/post-receive
--
Olena, a generic and efficient image processing platform
1
0
12 Apr '11
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Olena, a generic and efficient image processing platform".
The branch vtk-format has been updated
via 6629f93070da7d9eea9fa6a7b99e96154d624565 (commit)
via e402de7a1c8b372d768e93fdb76718e73ab48681 (commit)
via 21a5b46f16b712625498aaa2b01a601cdd614990 (commit)
from 57d5538008bc881e674005421f55b85b43a5125e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
6629f93 Add preliminary VTK input for binary images.
e402de7 Add VTK-format meshes.
21a5b46 Add a pre-allocation routine to mln::geom::complex_geometry.
-----------------------------------------------------------------------
Summary of changes:
milena/ChangeLog | 35 ++
milena/mesh/Makefile.am | 20 +-
milena/mesh/pseudo-manifold.vtk | 188 ++++++++
milena/mesh/tetrahedron.vtk | 48 ++
milena/mln/geom/complex_geometry.hh | 17 +-
milena/mln/io/off/load.hh | 30 +-
milena/mln/io/vtk/all.hh | 3 +-
milena/mln/io/vtk/load.hh | 615 +++++++++++++++++++++++++
milena/tests/io/vtk/Makefile.am | 7 +-
milena/tests/io/{off => vtk}/load_bin.cc | 12 +-
milena/tests/io/{off => vtk}/load_save_bin.cc | 15 +-
11 files changed, 956 insertions(+), 34 deletions(-)
create mode 100644 milena/mesh/pseudo-manifold.vtk
create mode 100644 milena/mesh/tetrahedron.vtk
create mode 100644 milena/mln/io/vtk/load.hh
copy milena/tests/io/{off => vtk}/load_bin.cc (87%)
copy milena/tests/io/{off => vtk}/load_save_bin.cc (80%)
hooks/post-receive
--
Olena, a generic and efficient image processing platform
1
0
last-svn-commit-248-g27351d0 apps/graph-morpho: Catch up with current mln::topo::is_n_face.
by Roland Levillain 12 Apr '11
by Roland Levillain 12 Apr '11
12 Apr '11
* apps/graph-morpho/morpho.hh
(trait::graph< mln::complex_image<1, G, V> >::is_vertex)
(trait::graph< mln::complex_image<1, G, V> >::is_edge):
Fix the return type.
---
milena/ChangeLog | 9 +++++++++
milena/apps/graph-morpho/morpho.hh | 8 ++++----
2 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/milena/ChangeLog b/milena/ChangeLog
index c34431a..f567ea8 100644
--- a/milena/ChangeLog
+++ b/milena/ChangeLog
@@ -1,3 +1,12 @@
+2011-04-12 Roland Levillain <roland(a)lrde.epita.fr>
+
+ apps/graph-morpho: Catch up with current mln::topo::is_n_face.
+
+ * apps/graph-morpho/morpho.hh
+ (trait::graph< mln::complex_image<1, G, V> >::is_vertex)
+ (trait::graph< mln::complex_image<1, G, V> >::is_edge):
+ Fix the return type.
+
2011-03-20 Roland Levillain <roland(a)lrde.epita.fr>
Use priority-driven thinning in collapse-based thinnings apps.
diff --git a/milena/apps/graph-morpho/morpho.hh b/milena/apps/graph-morpho/morpho.hh
index bcdcdd9..734ee6c 100644
--- a/milena/apps/graph-morpho/morpho.hh
+++ b/milena/apps/graph-morpho/morpho.hh
@@ -134,17 +134,17 @@ namespace trait
{
// Return a functor saying whether a psite is a vertex or not.
static
- const mln::topo::is_n_face<0>& is_vertex()
+ const mln::topo::is_n_face<mln::complex_psite<1, G>, 0>& is_vertex()
{
- static mln::topo::is_n_face<0> is_vertex_fun;
+ static mln::topo::is_n_face<mln::complex_psite<1, G>, 0> is_vertex_fun;
return is_vertex_fun;
}
// Return a functor saying whether a psite is a vertex or not.
static
- const mln::topo::is_n_face<1>& is_edge()
+ const mln::topo::is_n_face<mln::complex_psite<1, G>, 1>& is_edge()
{
- static mln::topo::is_n_face<1> is_edge_fun;
+ static mln::topo::is_n_face<mln::complex_psite<1, G>, 1> is_edge_fun;
return is_edge_fun;
}
--
1.5.6.5
1
0
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Olena, a generic and efficient image processing platform".
The branch igr has been deleted
was dab5d674ff5a32dbbba0dbe53543864f89d405cc
-----------------------------------------------------------------------
dab5d674ff5a32dbbba0dbe53543864f89d405cc mln/io/dicom/load.hh: Fix invalid image loading.
-----------------------------------------------------------------------
hooks/post-receive
--
Olena, a generic and efficient image processing platform
1
0
last-svn-commit-690-g62569b3 Add an image loader in the anapath GUI.
by Guillaume Lazzara 11 Apr '11
by Guillaume Lazzara 11 Apr '11
11 Apr '11
* sandbox/lazzara/igr/gui/anapath/src/tools/load.cc
* sandbox/lazzara/igr/gui/anapath/src/tools/load.hh
---
milena/ChangeLog | 7 +++
.../lazzara/igr/gui/anapath/src/tools/load.cc | 55 ++++++++++++++++++++
.../lazzara/igr/gui/anapath/src/tools/load.hh | 49 +++++++++++++++++
3 files changed, 111 insertions(+), 0 deletions(-)
create mode 100644 milena/sandbox/lazzara/igr/gui/anapath/src/tools/load.cc
create mode 100644 milena/sandbox/lazzara/igr/gui/anapath/src/tools/load.hh
diff --git a/milena/ChangeLog b/milena/ChangeLog
index 6d5de98..23fa923 100644
--- a/milena/ChangeLog
+++ b/milena/ChangeLog
@@ -1,3 +1,10 @@
+2010-04-07 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ Add an image loader in the anapath GUI.
+
+ * sandbox/lazzara/igr/gui/anapath/src/tools/load.cc
+ * sandbox/lazzara/igr/gui/anapath/src/tools/load.hh
+
2010-11-18 Guillaume Lazzara <z(a)lrde.epita.fr>
* mln/io/pnm/save.hh: Add a fixme related to an ICE with GCC
diff --git a/milena/sandbox/lazzara/igr/gui/anapath/src/tools/load.cc b/milena/sandbox/lazzara/igr/gui/anapath/src/tools/load.cc
new file mode 100644
index 0000000..48b1f46
--- /dev/null
+++ b/milena/sandbox/lazzara/igr/gui/anapath/src/tools/load.cc
@@ -0,0 +1,55 @@
+#include <src/tools/load.hh>
+#include <mln/util/timer.hh>
+#include <shared/include/io/magick.hh>
+
+namespace igr
+{
+
+ namespace anapath
+ {
+
+ namespace tools
+ {
+
+ load::load(mln_data* data)
+ : data_(data)
+ {
+ }
+
+
+ void load::start(const QString& filename)
+ {
+ filename_ = filename;
+ QThread::start();
+ }
+
+
+ void load::run()
+ {
+ // Closing previous open image.
+ if (data_->input)
+ data_->input->close();
+ delete data_->input;
+
+
+ // Open new image.
+ data_->input = 0;
+
+ util::timer t;
+ t.start();
+
+ large_image_t *tmp = new large_image_t(filename_.toStdString());
+ if (! tmp->is_valid())
+ emit error(tmp->info_hook().error.c_str());
+
+ t.stop();
+ std::cout << "image loaded - " << t << std::endl;
+
+ data_->input = tmp;
+ }
+
+ } // end of namespace igr::anapath::tools
+
+ } // end of namespace igr::anapath
+
+} // end of namespace igr
diff --git a/milena/sandbox/lazzara/igr/gui/anapath/src/tools/load.hh b/milena/sandbox/lazzara/igr/gui/anapath/src/tools/load.hh
new file mode 100644
index 0000000..cfaa6d9
--- /dev/null
+++ b/milena/sandbox/lazzara/igr/gui/anapath/src/tools/load.hh
@@ -0,0 +1,49 @@
+#ifndef IGR_ANAPATH_SRC_TOOLS_LOAD_HH
+# define IGR_ANAPATH_SRC_TOOLS_LOAD_HH
+
+#include <QtCore>
+
+#include <src/mln_data.hh>
+
+namespace igr
+{
+
+ namespace anapath
+ {
+
+ namespace tools
+ {
+
+
+ class load : public QThread
+ {
+ Q_OBJECT;
+
+ typedef io::magick::large_image<mln::value::rgb8> large_image_t;
+
+ public:
+
+ load(mln_data *data);
+ void start(const QString& filename);
+
+ virtual void run();
+
+ signals:
+ void error(const QString& msg);
+
+ private: // members
+
+ private: // attributes
+ mln_data* data_;
+ QString filename_;
+ };
+
+
+
+ } // end of namespace igr::anapath::tools
+
+ } // end of namespace igr::anapath
+
+} // end of namespace igr
+
+#endif // !IGR_ANAPATH_SRC_TOOLS_LOAD_HH
--
1.5.6.5
1
0
last-svn-commit-691-g687f97b Split compilation of files including Milena's headers.
by Guillaume Lazzara 11 Apr '11
by Guillaume Lazzara 11 Apr '11
11 Apr '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