Olena-patches

olena-patches@lrde.epita.fr

9625 discussions

last-svn-commit-692-ga54cebf Add missing defines in headers.

by Guillaume Lazzara

* lazzara/igr/gui/segmentation/src/crop_widget.hh, * lazzara/igr/gui/segmentation2dt/src/plot_widget.hh, * lazzara/igr/gui/viewer/src/main_window.hh: Here. --- milena/sandbox/ChangeLog | 8 ++++++++ .../igr/gui/segmentation/src/crop_widget.hh | 1 + .../igr/gui/segmentation2dt/src/plot_widget.hh | 1 + .../lazzara/igr/gui/viewer/src/main_window.hh | 1 + 4 files changed, 11 insertions(+), 0 deletions(-) diff --git a/milena/sandbox/ChangeLog b/milena/sandbox/ChangeLog index 5477ab3..705ecda 100644 --- a/milena/sandbox/ChangeLog +++ b/milena/sandbox/ChangeLog @@ -1,5 +1,13 @@ 2010-11-15 Guillaume Lazzara <z(a)lrde.epita.fr> + Add missing defines in headers. + + * lazzara/igr/gui/segmentation/src/crop_widget.hh, + * lazzara/igr/gui/segmentation2dt/src/plot_widget.hh, + * lazzara/igr/gui/viewer/src/main_window.hh: Here. + +2010-11-15 Guillaume Lazzara <z(a)lrde.epita.fr> + Split compilation of files including Milena's headers. * lazzara/igr/gui/segmentation/segmentation.pro, diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/crop_widget.hh b/milena/sandbox/lazzara/igr/gui/segmentation/src/crop_widget.hh index 16f78f3..c5145a3 100644 --- a/milena/sandbox/lazzara/igr/gui/segmentation/src/crop_widget.hh +++ b/milena/sandbox/lazzara/igr/gui/segmentation/src/crop_widget.hh @@ -24,6 +24,7 @@ // executable file might be covered by the GNU General Public License. #ifndef IGR_SEGMENTATION_SRC_CROP_WIDGET_HH +# define IGR_SEGMENTATION_SRC_CROP_WIDGET_HH # include <QtGui> # include <ui_crop_widget.h> diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/plot_widget.hh b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/plot_widget.hh index a5674dd..bdfce62 100644 --- a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/plot_widget.hh +++ b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/plot_widget.hh @@ -24,6 +24,7 @@ // executable file might be covered by the GNU General Public License. #ifndef IGR_SEGMENTATION_SRC_PLOT_WIDGET_HH +# define IGR_SEGMENTATION_SRC_PLOT_WIDGET_HH # include <QtGui> # include <ui_plot_widget.h> diff --git a/milena/sandbox/lazzara/igr/gui/viewer/src/main_window.hh b/milena/sandbox/lazzara/igr/gui/viewer/src/main_window.hh index 76db858..b555257 100644 --- a/milena/sandbox/lazzara/igr/gui/viewer/src/main_window.hh +++ b/milena/sandbox/lazzara/igr/gui/viewer/src/main_window.hh @@ -24,6 +24,7 @@ // executable file might be covered by the GNU General Public License. #ifndef IGR_VIEWER_SRC_MAIN_WINDOW_HH +# define IGR_VIEWER_SRC_MAIN_WINDOW_HH # include <QtGui> # include <ui_main_window.h> -- 1.5.6.5

13 years, 9 months

last-svn-commit-693-g181a278 lazzara/igr/gui/segmentation/src/main_window.cc: Avoid a warning in 2D segmentation tool.

by Guillaume Lazzara

--- milena/sandbox/ChangeLog | 5 +++++ .../igr/gui/segmentation/src/main_window.cc | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/milena/sandbox/ChangeLog b/milena/sandbox/ChangeLog index 705ecda..677070c 100644 --- a/milena/sandbox/ChangeLog +++ b/milena/sandbox/ChangeLog @@ -1,5 +1,10 @@ 2010-11-15 Guillaume Lazzara <z(a)lrde.epita.fr> + * lazzara/igr/gui/segmentation/src/main_window.cc: Avoid a warning + in 2D segmentation tool. + +2010-11-15 Guillaume Lazzara <z(a)lrde.epita.fr> + Add missing defines in headers. * lazzara/igr/gui/segmentation/src/crop_widget.hh, 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 a225daf..6f064cb 100644 --- a/milena/sandbox/lazzara/igr/gui/segmentation/src/main_window.cc +++ b/milena/sandbox/lazzara/igr/gui/segmentation/src/main_window.cc @@ -152,7 +152,7 @@ namespace igr } - void main_window::clear_information_slot(const QPointF& p) + void main_window::clear_information_slot(const QPointF&) { point_info_->setText(""); } -- 1.5.6.5

13 years, 9 months

last-svn-commit-694-gaa8417d Allow to save results filtered differently in the 3D segmentation tool.

by Guillaume Lazzara

* lazzara/igr/gui/segmentation2dt/src/mln_data.cc, * lazzara/igr/gui/segmentation2dt/src/mln_data.hh: Add more temporary images. * lazzara/igr/gui/segmentation2dt/src/save_widget.cc: Add checkboxes to select which image to save. * lazzara/igr/gui/segmentation2dt/src/seg_widget.cc, * lazzara/igr/gui/segmentation2dt/src/seg_widget.hh, * lazzara/igr/gui/segmentation2dt/src/tools/seg.cc, * lazzara/igr/gui/segmentation2dt/src/tools/seg.hh, * lazzara/igr/gui/segmentation2dt/src/tools/mean_regions.cc: Compute non-filtered and linearly filtered image. * lazzara/igr/gui/segmentation2dt/src/task_widget.cc: Avoid a warning. * lazzara/igr/gui/segmentation2dt/src/tools/save.cc * lazzara/igr/gui/segmentation2dt/src/tools/save.hh: Allow to save more images. * lazzara/igr/gui/segmentation2dt/ui/plot_widget.ui, * lazzara/igr/gui/segmentation2dt/ui/save_widget.ui: Update widgets. * lazzara/igr/gui/shared/include/function_means.hh, * lazzara/igr/gui/shared/include/mean_function_per_region.hh, * lazzara/igr/gui/shared/include/normalization.hh: Add missing inlines. * lazzara/igr/gui/shared/include/mean_regions.hh, * lazzara/igr/gui/shared/include/time_smooth_morpho.hh: Add missing includes. --- milena/sandbox/ChangeLog | 37 +++++++ .../igr/gui/segmentation2dt/src/mln_data.cc | 112 +++++++++++++++----- .../igr/gui/segmentation2dt/src/mln_data.hh | 50 ++++++--- .../igr/gui/segmentation2dt/src/save_widget.cc | 21 ++++ .../igr/gui/segmentation2dt/src/seg_widget.cc | 30 ++++-- .../igr/gui/segmentation2dt/src/seg_widget.hh | 3 +- .../igr/gui/segmentation2dt/src/task_widget.cc | 2 +- .../gui/segmentation2dt/src/tools/mean_regions.cc | 72 +++++++++++-- .../igr/gui/segmentation2dt/src/tools/save.cc | 90 +++++++++++++--- .../igr/gui/segmentation2dt/src/tools/save.hh | 12 ++- .../igr/gui/segmentation2dt/src/tools/seg.cc | 60 +++++++++-- .../igr/gui/segmentation2dt/src/tools/seg.hh | 10 ++- .../igr/gui/segmentation2dt/ui/plot_widget.ui | 20 ++++ .../igr/gui/segmentation2dt/ui/save_widget.ui | 80 +++++++++++++-- .../igr/gui/shared/include/function_means.hh | 1 - .../gui/shared/include/mean_function_per_region.hh | 2 +- .../lazzara/igr/gui/shared/include/mean_regions.hh | 2 + .../igr/gui/shared/include/normalization.hh | 1 - .../igr/gui/shared/include/time_smooth_morpho.hh | 2 + 19 files changed, 508 insertions(+), 99 deletions(-) diff --git a/milena/sandbox/ChangeLog b/milena/sandbox/ChangeLog index 677070c..4f62abc 100644 --- a/milena/sandbox/ChangeLog +++ b/milena/sandbox/ChangeLog @@ -1,5 +1,42 @@ 2010-11-15 Guillaume Lazzara <z(a)lrde.epita.fr> + Allow to save results filtered differently in the 3D segmentation + tool. + + * lazzara/igr/gui/segmentation2dt/src/mln_data.cc, + * lazzara/igr/gui/segmentation2dt/src/mln_data.hh: Add more + temporary images. + + * lazzara/igr/gui/segmentation2dt/src/save_widget.cc: Add + checkboxes to select which image to save. + + * lazzara/igr/gui/segmentation2dt/src/seg_widget.cc, + * lazzara/igr/gui/segmentation2dt/src/seg_widget.hh, + * lazzara/igr/gui/segmentation2dt/src/tools/seg.cc, + * lazzara/igr/gui/segmentation2dt/src/tools/seg.hh, + * lazzara/igr/gui/segmentation2dt/src/tools/mean_regions.cc: + Compute non-filtered and linearly filtered image. + + * lazzara/igr/gui/segmentation2dt/src/task_widget.cc: Avoid a warning. + + * lazzara/igr/gui/segmentation2dt/src/tools/save.cc + * lazzara/igr/gui/segmentation2dt/src/tools/save.hh: Allow to save + more images. + + * lazzara/igr/gui/segmentation2dt/ui/plot_widget.ui, + * lazzara/igr/gui/segmentation2dt/ui/save_widget.ui: Update widgets. + + * lazzara/igr/gui/shared/include/function_means.hh, + * lazzara/igr/gui/shared/include/mean_function_per_region.hh, + * lazzara/igr/gui/shared/include/normalization.hh: Add missing + inlines. + + * lazzara/igr/gui/shared/include/mean_regions.hh, + * lazzara/igr/gui/shared/include/time_smooth_morpho.hh: Add + missing includes. + +2010-11-15 Guillaume Lazzara <z(a)lrde.epita.fr> + * lazzara/igr/gui/segmentation/src/main_window.cc: Avoid a warning in 2D segmentation tool. 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 c294c73..f8dc7c8 100644 --- a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/mln_data.cc +++ b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/mln_data.cc @@ -295,19 +295,19 @@ namespace igr } - void mln_data::update_seg(const image3d<seg_data_t>& seg, - const seg_data_t& nregion) + void mln_data::update_seg_smooth(const image3d<seg_data_t>& seg, + const seg_data_t& nregion) { - update_seg(seg, nregion, 0); + update_seg_smooth(seg, nregion, 0); } - void mln_data::update_seg(const image3d<seg_data_t>& seg, - const seg_data_t& nregion, - int sli) + void mln_data::update_seg_smooth(const image3d<seg_data_t>& seg, + const seg_data_t& nregion, + int sli) { - seg_ = seg; - initialize(seg_dsp_, seg_); + seg_smooth_ = seg; + initialize(seg_dsp_, seg_smooth_); // This random function was found here: // http://en.wikipedia.org/wiki/Random_number_generation @@ -324,8 +324,8 @@ namespace igr for_all(p) { value::hsl_<float,float,float> hsl__( - h_values[seg_(p)], -// (unsigned(seg_(p)) * 10) % 359 + 1, + h_values[seg_smooth_(p)], +// (unsigned(seg_smooth_(p)) * 10) % 359 + 1, 1, unsigned(in_(p)) * .002745f); // = 1 / 255 * 0.7); convert::from_to(hsl__, seg_dsp_(p)); @@ -334,22 +334,51 @@ namespace igr // Make sure there is no border! extension::adjust(seg_dsp_, 0); - nregion_ = nregion; + nregion_smooth_ = nregion; emit image_layer_count(seg_dsp_.nslis()); compute_new_seg_image(sli); } - void mln_data::update_mean_regions(const image3d<input_data_t>& mean_regions) + + void mln_data::update_seg(const image3d<seg_data_t>& seg, + const seg_data_t& nregion) { - update_mean_regions(mean_regions, 0); + seg_ = seg; + nregion_ = nregion; } - void mln_data::update_mean_regions(const image3d<input_data_t>& mean_regions, - int sli) + void mln_data::update_seg_smooth_linear(const image3d<seg_data_t>& seg, + const seg_data_t& nregion) + { + seg_smooth_linear_ = seg; + nregion_smooth_linear_ = nregion; + } + + + void mln_data::update_mean_regions(const image3d<input_data_t>& mean_regions) { mean_regions_ = mean_regions; + } + + + void mln_data::update_mean_regions_smooth_linear(const image3d<input_data_t>& mean_regions) + { + mean_regions_smooth_linear_ = mean_regions; + } + + + void mln_data::update_mean_regions_smooth(const image3d<input_data_t>& mean_regions) + { + update_mean_regions_smooth(mean_regions, 0); + } + + + void mln_data::update_mean_regions_smooth(const image3d<input_data_t>& mean_regions, + int sli) + { + mean_regions_smooth_ = mean_regions; mean_regions_dsp_ = data::convert(dsp_data_t(), data::stretch(value::int_u8(), mean_regions)); @@ -368,7 +397,7 @@ namespace igr } - const mln_data::in_t& + const in_t& mln_data::in() const { return in_; @@ -380,38 +409,50 @@ namespace igr } - const mln_data::ref_mean_t& + const ref_mean_t& mln_data::ref_mean() const { return ref_mean_; } - const mln_data::norm_smooth_t& + const norm_smooth_t& mln_data::norm() const { return norm_; } - const mln_data::norm_smooth_t& + const norm_smooth_t& mln_data::norm_smooth() const { return norm_smooth_; } - const mln_data::norm_smooth_t& + const norm_smooth_t& mln_data::norm_smooth_linear() const { return norm_smooth_linear_; } - const mln_data::seg_t& + const seg_t& mln_data::seg() const { return seg_; } + const seg_t& + mln_data::seg_smooth_linear() const + { + return seg_smooth_linear_; + } + + const seg_t& + mln_data::seg_smooth() const + { + return seg_smooth_; + } + unsigned mln_data::seg_nslis() const { return seg_.nslis(); @@ -422,24 +463,45 @@ namespace igr return nregion_; } + const seg_data_t& mln_data::nregion_smooth_linear() const + { + return nregion_smooth_linear_; + } + + const seg_data_t& mln_data::nregion_smooth() const + { + return nregion_smooth_; + } - const mln_data::seg_dsp_t& mln_data::seg_dsp() const + const seg_dsp_t& mln_data::seg_dsp() const { return seg_dsp_; } - mln_data::seg_dsp_t& mln_data::seg_dsp() + seg_dsp_t& mln_data::seg_dsp() { return seg_dsp_; } - const mln_data::mean_regions_t& + const mean_regions_t& mln_data::mean_regions() const { return mean_regions_; } - const mln_data::mean_regions_dsp_t& + const mean_regions_t& + mln_data::mean_regions_smooth_linear() const + { + return mean_regions_smooth_linear_; + } + + const mean_regions_t& + mln_data::mean_regions_smooth() const + { + return mean_regions_smooth_; + } + + const mean_regions_dsp_t& mln_data::mean_regions_dsp() const { return mean_regions_dsp_; 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 6f1776f..bc75ecb 100644 --- a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/mln_data.hh +++ b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/mln_data.hh @@ -26,22 +26,23 @@ namespace igr }; + typedef image3d<igr::input_data_t> in_t; + typedef image3d<igr::dsp_data_t> in_dsp_t; + typedef image2d<igr::mean_t> ref_mean_t; + typedef image2d<igr::dsp_data_t> ref_mean_dsp_t; + typedef image3d<igr::smoothed_data_t> norm_smooth_t; + typedef image3d<igr::dsp_data_t> norm_smooth_dsp_t; + typedef image3d<igr::seg_data_t> seg_t; + typedef image3d<igr::dsp_data_t> seg_dsp_t; + typedef image3d<igr::input_data_t> mean_regions_t; + typedef image3d<igr::dsp_data_t> mean_regions_dsp_t; + + class mln_data : public QObject { Q_OBJECT; public: - typedef image3d<igr::input_data_t> in_t; - typedef image3d<igr::dsp_data_t> in_dsp_t; - typedef image2d<igr::mean_t> ref_mean_t; - typedef image2d<igr::dsp_data_t> ref_mean_dsp_t; - typedef image3d<igr::smoothed_data_t> norm_smooth_t; - typedef image3d<igr::dsp_data_t> norm_smooth_dsp_t; - typedef image3d<igr::seg_data_t> seg_t; - typedef image3d<igr::dsp_data_t> seg_dsp_t; - typedef image3d<igr::input_data_t> mean_regions_t; - typedef image3d<igr::dsp_data_t> mean_regions_dsp_t; - mln_data(); ~mln_data(); @@ -83,12 +84,19 @@ namespace igr void update_norm_smooth(const image3d<smoothed_data_t>& norm_smooth); void update_norm_smooth_linear(const image3d<smoothed_data_t>& norm_smooth_linear); + void update_seg_smooth(const image3d<seg_data_t>& seg, + const seg_data_t& nregion); + void update_seg_smooth(const image3d<seg_data_t>& seg, + const seg_data_t& nregion, int sli); void update_seg(const image3d<seg_data_t>& seg, - const seg_data_t& nregion); - void update_seg(const image3d<seg_data_t>& seg, - const seg_data_t& nregion, int sli); + const seg_data_t& nregion); + void update_seg_smooth_linear(const image3d<seg_data_t>& seg, + const seg_data_t& nregion); + void update_mean_regions(const image3d<input_data_t>& mean_regions); - void update_mean_regions(const image3d<input_data_t>& mean_regions, int sli); + void update_mean_regions_smooth_linear(const image3d<input_data_t>& mean_regions); + void update_mean_regions_smooth(const image3d<input_data_t>& mean_regions); + void update_mean_regions_smooth(const image3d<input_data_t>& mean_regions, int sli); const std::string& filename() const; @@ -104,13 +112,19 @@ namespace igr const norm_smooth_t& norm_smooth_linear() const; const seg_t& seg() const; + const seg_t& seg_smooth_linear() const; + const seg_t& seg_smooth() const; unsigned seg_nslis() const; const seg_data_t& nregion() const; + const seg_data_t& nregion_smooth_linear() const; + const seg_data_t& nregion_smooth() const; const seg_dsp_t& seg_dsp() const; seg_dsp_t& seg_dsp(); const mean_regions_t& mean_regions() const; + const mean_regions_t& mean_regions_smooth_linear() const; + const mean_regions_t& mean_regions_smooth() const; const mean_regions_dsp_t& mean_regions_dsp() const; const log_data& logs() const; @@ -173,10 +187,16 @@ namespace igr norm_smooth_t norm_smooth_linear_; seg_t seg_; + seg_t seg_smooth_linear_; + seg_t seg_smooth_; seg_dsp_t seg_dsp_; igr::seg_data_t nregion_; + igr::seg_data_t nregion_smooth_linear_; + igr::seg_data_t nregion_smooth_; mean_regions_t mean_regions_; + mean_regions_t mean_regions_smooth_linear_; + mean_regions_t mean_regions_smooth_; mean_regions_dsp_t mean_regions_dsp_; log_data logs_; 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 8d87133..576c6ba 100644 --- a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/save_widget.cc +++ b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/save_widget.cc @@ -113,13 +113,34 @@ namespace igr if (logCBox->isChecked()) selected.append(tools::Log); + if (meanFunCBox->isChecked()) + { selected.append(tools::MeanFunctions); + + if (meanFunNonFilteredCBox->isChecked()) + selected.append(tools::MeanFunctionsNonFiltered); + if (meanFunLinearFilterCBox->isChecked()) + selected.append(tools::MeanFunctionsLinearFilter); + if (meanFunMorphoFilterCBox->isChecked()) + selected.append(tools::MeanFunctionsMorphoFilter); + } + if (refImaCBox->isChecked()) selected.append(tools::RefImage); + if (segImaCBox->isChecked()) + { selected.append(tools::SegImage); + if (segImaNonFilteredCBox->isChecked()) + selected.append(tools::SegImageNonFiltered); + if (segImaLinearFilterCBox->isChecked()) + selected.append(tools::SegImageLinearFilter); + if (segImaMorphoFilterCBox->isChecked()) + selected.append(tools::SegImageMorphoFilter); + } + return selected; } 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 6891432..ff49690 100644 --- a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/seg_widget.cc +++ b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/seg_widget.cc @@ -43,7 +43,8 @@ namespace igr { seg_widget::seg_widget(QWidget *parent) - : Task_Widget(parent) + : Task_Widget(parent), + compute_preview_(false), preview_computed_(false) { setupUi(this); } @@ -63,6 +64,7 @@ namespace igr connect(viewer_, SIGNAL(slider_valueChanged(int)), data_, SLOT(compute_new_seg_image(int))); + compute_preview_ = true; emit task_ready(); } @@ -73,6 +75,7 @@ namespace igr set_data_and_connections(); clearBtn->setEnabled(false); nregion_lbl->setText(""); + preview_computed_ = false; viewer_->set_image_layer_count(data_->in_nslis()); } @@ -105,7 +108,7 @@ namespace igr void seg_widget::run_task_(task_handler& handler) { tools::seg* - task = new tools::seg(data_, get_lambda_value()); + task = new tools::seg(data_, get_lambda_value(), compute_preview_, preview_computed_); connect(&handler, SIGNAL(finished()), this, SLOT(task_finished_slot())); @@ -118,8 +121,8 @@ namespace igr { point3d p3d(viewer_->current_slice(), p.y(), p.x()); - if (clearBtn->isEnabled()) // A segmentation have been computed - return data_->seg().domain().has(p3d); + if (preview_computed_) // A segmentation have been computed + return data_->seg_smooth().domain().has(p3d); else return data_->norm_smooth().domain().has(p3d); } @@ -128,8 +131,8 @@ namespace igr float seg_widget::compute_mouseover_data(const QPointF& p) const { point3d p3d(viewer_->current_slice(), p.y(), p.x()); - if (clearBtn->isEnabled()) // A segmentation have been computed - return float(data_->seg()(p3d)); + if (preview_computed_) // A segmentation have been computed + return float(data_->seg_smooth()(p3d)); else return float(data_->norm_smooth()(p3d)); } @@ -163,8 +166,14 @@ namespace igr this, SLOT(task_finished_slot())); clearBtn->setEnabled(true); - this->already_computed_ = true; - nregion_lbl->setText(tr("%1 regions").arg(data_->nregion())); + if (!compute_preview_) + this->already_computed_ = true; + else + { + compute_preview_ = false; + preview_computed_ = true; + } + nregion_lbl->setText(tr("%1 regions").arg(data_->nregion_smooth())); // Result already refreshed and displayed. } @@ -172,26 +181,31 @@ namespace igr void seg_widget::on_filter_1_clicked(bool) { this->already_computed_ = false; + preview_computed_ = false; } void seg_widget::on_filter_2_clicked(bool) { this->already_computed_ = false; + preview_computed_ = false; } void seg_widget::on_filter_3_clicked(bool) { this->already_computed_ = false; + preview_computed_ = false; } void seg_widget::on_filter_4_clicked(bool) { this->already_computed_ = false; + preview_computed_ = false; } void seg_widget::on_filter_5_clicked(bool) { this->already_computed_ = false; + preview_computed_ = false; } } // end of namespace igr::segmentation diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/seg_widget.hh b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/seg_widget.hh index bed5e24..26e35fe 100644 --- a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/seg_widget.hh +++ b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/seg_widget.hh @@ -68,7 +68,8 @@ namespace igr unsigned get_lambda_value() const; private: // Attributes - + bool compute_preview_; + bool preview_computed_; }; diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/task_widget.cc b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/task_widget.cc index e3ddce5..c8e6cbc 100644 --- a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/task_widget.cc +++ b/milena/sandbox/lazzara/igr/gui/segmentation2dt/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..."; } 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 8245a70..6ae3b47 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 @@ -32,23 +32,75 @@ namespace igr void mean_regions::run() { - seg_data_t nregion = data_->nregion(); - image3d<seg_data_t> - seg_packed = labeling::pack(data_->seg(), nregion); + // No filter + { + // FIXME: computed twice? here and in save.cc ? + seg_data_t nregion = data_->nregion(); + image3d<seg_data_t> + seg_packed = labeling::pack(data_->seg(), nregion); - emit next_step(); + emit next_step(); + + data_->update_seg(seg_packed, nregion); + + emit next_step(); + + image3d<input_data_t> + means = shared::mean_regions(data_->in(), + data_->seg(), data_->nregion()); + + emit next_step(); - data_->update_seg(seg_packed, nregion); + data_->update_mean_regions(means); + } emit next_step(); - image3d<input_data_t> - means = shared::mean_regions(data_->in(), - data_->seg(), data_->nregion()); + // Linear filter + { + // FIXME: computed twice? here and in save.cc ? + seg_data_t nregion = data_->nregion_smooth_linear(); + image3d<seg_data_t> + seg_packed = labeling::pack(data_->seg_smooth_linear(), nregion); + + emit next_step(); + + data_->update_seg_smooth_linear(seg_packed, nregion); + + emit next_step(); + + image3d<input_data_t> + means = shared::mean_regions(data_->in(), + data_->seg_smooth_linear(), data_->nregion_smooth_linear()); + + emit next_step(); + + data_->update_mean_regions_smooth_linear(means); + } emit next_step(); - data_->update_mean_regions(means); + // Morpho filter + { + // FIXME: computed twice? here and in save.cc ? + seg_data_t nregion = data_->nregion_smooth(); + image3d<seg_data_t> + seg_packed = labeling::pack(data_->seg_smooth(), nregion); + + emit next_step(); + + data_->update_seg_smooth(seg_packed, nregion); + + emit next_step(); + + image3d<input_data_t> + means = shared::mean_regions(data_->in(), + data_->seg_smooth(), data_->nregion_smooth()); + + emit next_step(); + + data_->update_mean_regions_smooth(means); + } } @@ -60,7 +112,7 @@ namespace igr unsigned mean_regions::step_count() const { - return 4; + return 12; } 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 23e38d1..185ed86 100644 --- a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/save.cc +++ b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/save.cc @@ -104,6 +104,20 @@ namespace igr return true; } + void save::save_mean_funs(const seg_t& pseg, const seg_data_t& pnlabels, + const mean_regions_t& mean_regions, const QString& prefix) + { + QString output_base = basedir_ + "/" + prefix; + util::array<util::array<input_data_t> > + functions = shared::mean_function_per_region(mean_regions, pseg, pnlabels); + + for (unsigned i = 1; i < functions.nelements(); ++i) + { + QString name = output_base + "_l" + QString::number(i) + ".plot"; + mln::io::plot::save(functions[i], name.toStdString()); + } + } + void save::run() { @@ -111,12 +125,19 @@ namespace igr QString basename = f.baseName(); QString output; - - seg_data_t packed_nlabels; - image3d<seg_data_t> packed_seg; - if (selected_.contains(SegImage) || selected_.contains(MeanFunctions)) - packed_seg = labeling::pack(data_->seg(), packed_nlabels); +// seg_data_t pnlabels, pnlabels_smooth, pnlabels_smooth_linear; +// image3d<seg_data_t> +// pseg, pseg_smooth, pseg_smooth_linear; + + // Preparing some common data. +// if (selected_.contains(SegImageNonFiltered) || selected_.contains(MeanFunctionsNonFiltered)) +// pseg = labeling::pack(data_->seg(), pnlabels); +// if (selected_.contains(SegImageLinearFilter) || selected_.contains(MeanFunctionsLinearFilter)) +// pseg_smooth_linear = labeling::pack(data_->seg_smooth_linear(), pnlabels_smooth_linear); +// if (selected_.contains(SegImageMorphoFilter) || selected_.contains(MeanFunctionsMorphoFilter)) +// pseg_smooth = labeling::pack(data_->seg_smooth(), pnlabels_smooth); + foreach(SavedData e, selected_) { @@ -135,24 +156,57 @@ namespace igr emit next_step(); break; - case SegImage: - output = basedir_ + "/" + basename + "_segmentation.raw"; - io::raw::save(packed_seg, output.toStdString()); + + // Segmentations + + case SegImageNonFiltered: + output = basedir_ + "/" + basename + "_segmentation_non_filtered.raw"; + io::raw::save(data_->seg(), output.toStdString()); + emit next_step(); + break; + + case SegImageLinearFilter: + output = basedir_ + "/" + basename + "_segmentation_linear_filter.raw"; + io::raw::save(data_->seg_smooth_linear(), output.toStdString()); emit next_step(); break; + case SegImageMorphoFilter: + output = basedir_ + "/" + basename + "_segmentation_morpho_filter.raw"; + io::raw::save(data_->seg_smooth(), output.toStdString()); + emit next_step(); + break; + + + // Mean functions + + case MeanFunctionsNonFiltered: + save_mean_funs(data_->seg(), data_->nregion(), data_->mean_regions(), + basename + "_non_filtered"); + emit next_step(); + break; + + case MeanFunctionsLinearFilter: + save_mean_funs(data_->seg_smooth_linear(), data_->nregion_smooth_linear(), + data_->mean_regions_smooth_linear(), + basename + "_linear_filter"); + emit next_step(); + break; + + case MeanFunctionsMorphoFilter: + save_mean_funs(data_->seg_smooth(), data_->nregion_smooth(), + data_->mean_regions_smooth(), + basename + "_morpho_filter"); + emit next_step(); + break; + + + default: + case SegImage: case MeanFunctions: - QString output_base = basedir_ + "/" + basename; - util::array<util::array<input_data_t> > - functions = shared::mean_function_per_region(data_->mean_regions(), - packed_seg, packed_nlabels); - - for (unsigned i = 1; i < functions.nelements(); ++i) - { - QString name = output_base + "_l" + QString::number(i) + ".plot"; - io::plot::save(functions[i], name.toStdString()); - } + // Nothing. emit next_step(); + break; } } 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 fc30282..53b61fe 100644 --- a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/save.hh +++ b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/save.hh @@ -26,7 +26,13 @@ namespace igr Log, RefImage, SegImage, - MeanFunctions + SegImageNonFiltered, + SegImageLinearFilter, + SegImageMorphoFilter, + MeanFunctions, + MeanFunctionsNonFiltered, + MeanFunctionsLinearFilter, + MeanFunctionsMorphoFilter }; @@ -59,6 +65,10 @@ namespace igr private: // Members bool save_log(const QString& output); + void save_mean_funs(const seg_t& pseg, + const seg_data_t& pnlabels, + const mean_regions_t& mean_regions, + const QString& prefix); private: // attributes mln_data* data_; 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 b57a52f..3769dc4 100644 --- a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/seg.cc +++ b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/seg.cc @@ -34,9 +34,20 @@ namespace igr - seg::seg(mln_data* data, unsigned lambda) - : data_(data), lambda_(lambda) + seg::seg(mln_data* data, unsigned lambda, + bool compute_preview, bool preview_computed) + : data_(data), lambda_(lambda), + compute_preview_(compute_preview), + preview_computed_(preview_computed) { + // Setting step_count according to options. + if (compute_preview) + step_count_ = 3; + else + if (preview_computed) + step_count_ = 6; + else + step_count_ = 9; } @@ -45,12 +56,11 @@ namespace igr } - void seg::run() + const image3d<seg_data_t> seg::compute_seg(const image3d<igr::smoothed_data_t>& norm, + seg_data_t& nregion) { - seg_data_t nregion; image2d<seg_data_t> - tmp = shared::time_segmentation(data_->norm_smooth(), - nregion, lambda_); + tmp = shared::time_segmentation(norm, nregion, lambda_); emit next_step(); @@ -58,7 +68,41 @@ namespace igr emit next_step(); - data_->update_seg(wsd, nregion); + return wsd; + } + + + void seg::run() + { + // Compute result on morpho smooth image only. + if (compute_preview_ || !preview_computed_) + { + seg_data_t nregion; + image3d<seg_data_t> wsd = compute_seg(data_->norm_smooth(), nregion); + data_->update_seg_smooth(wsd, nregion); + } + + if (!compute_preview_) + { + if (!preview_computed_) + emit next_step(); + + // Non filtered image. + { + seg_data_t nregion; + image3d<seg_data_t> wsd = compute_seg(data_->norm(), nregion); + data_->update_seg(wsd, nregion); + } + + emit next_step(); + + // Linearly filtered image. + { + seg_data_t nregion; + image3d<seg_data_t> wsd = compute_seg(data_->norm_smooth_linear(), nregion); + data_->update_seg_smooth_linear(wsd, nregion); + } + } } @@ -70,7 +114,7 @@ namespace igr unsigned seg::step_count() const { - return 3; + return step_count_; } 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 0e3d75e..f2efc90 100644 --- a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/seg.hh +++ b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/seg.hh @@ -26,7 +26,8 @@ namespace igr Q_OBJECT; public: - seg(mln_data* data, unsigned lambda); + seg(mln_data* data, unsigned lambda, + bool compute_preview, bool preview_computed); ~seg(); void run(); @@ -46,9 +47,16 @@ namespace igr /// @} + private: // methods + const image3d<seg_data_t> compute_seg(const image3d<igr::smoothed_data_t>& norm, + seg_data_t& nregion); + private: // attributes mln_data* data_; unsigned lambda_; + bool compute_preview_; + bool preview_computed_; + unsigned step_count_; }; } // end of namespace igr::segmentation::tools diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/ui/plot_widget.ui b/milena/sandbox/lazzara/igr/gui/segmentation2dt/ui/plot_widget.ui index adbc296..18d8e91 100644 --- a/milena/sandbox/lazzara/igr/gui/segmentation2dt/ui/plot_widget.ui +++ b/milena/sandbox/lazzara/igr/gui/segmentation2dt/ui/plot_widget.ui @@ -71,6 +71,26 @@ </widget> </item> <item> + <widget class="Line" name="line" > + <property name="orientation" > + <enum>Qt::Vertical</enum> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="savePlotBtn_" > + <property name="maximumSize" > + <size> + <width>16777215</width> + <height>20</height> + </size> + </property> + <property name="text" > + <string>Save plot</string> + </property> + </widget> + </item> + <item> <spacer name="horizontalSpacer_2" > <property name="orientation" > <enum>Qt::Horizontal</enum> diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/ui/save_widget.ui b/milena/sandbox/lazzara/igr/gui/segmentation2dt/ui/save_widget.ui index c832560..641cea6 100644 --- a/milena/sandbox/lazzara/igr/gui/segmentation2dt/ui/save_widget.ui +++ b/milena/sandbox/lazzara/igr/gui/segmentation2dt/ui/save_widget.ui @@ -6,7 +6,7 @@ <x>0</x> <y>0</y> <width>370</width> - <height>362</height> + <height>470</height> </rect> </property> <property name="sizePolicy" > @@ -161,23 +161,87 @@ p, li { white-space: pre-wrap; } </widget> </item> <item> - <widget class="QCheckBox" name="segImaCBox" > - <property name="text" > + <widget class="QGroupBox" name="segImaCBox" > + <property name="title" > <string>Segmentation image</string> </property> - <property name="checked" > + <property name="checkable" > <bool>true</bool> </property> + <layout class="QVBoxLayout" name="verticalLayout_5" > + <item> + <widget class="QCheckBox" name="segImaNonFilteredCBox" > + <property name="text" > + <string>Non-filtered</string> + </property> + <property name="checked" > + <bool>true</bool> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="segImaLinearFilterCBox" > + <property name="text" > + <string>Linear filter</string> + </property> + <property name="checked" > + <bool>true</bool> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="segImaMorphoFilterCBox" > + <property name="text" > + <string>Morphological filter</string> + </property> + <property name="checked" > + <bool>true</bool> + </property> + </widget> + </item> + </layout> </widget> </item> <item> - <widget class="QCheckBox" name="meanFunCBox" > - <property name="text" > - <string>Mean function per region </string> + <widget class="QGroupBox" name="meanFunCBox" > + <property name="title" > + <string>Mean function per region</string> </property> - <property name="checked" > + <property name="checkable" > <bool>true</bool> </property> + <layout class="QVBoxLayout" name="verticalLayout_4" > + <item> + <widget class="QCheckBox" name="meanFunNonFilteredCBox" > + <property name="text" > + <string>Non-filtered</string> + </property> + <property name="checked" > + <bool>true</bool> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="meanFunLinearFilterCBox" > + <property name="text" > + <string>Linear filter</string> + </property> + <property name="checked" > + <bool>true</bool> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="meanFunMorphoFilterCBox" > + <property name="text" > + <string>Morphological filter</string> + </property> + <property name="checked" > + <bool>true</bool> + </property> + </widget> + </item> + </layout> </widget> </item> </layout> diff --git a/milena/sandbox/lazzara/igr/gui/shared/include/function_means.hh b/milena/sandbox/lazzara/igr/gui/shared/include/function_means.hh index bdc2098..18cb65a 100644 --- a/milena/sandbox/lazzara/igr/gui/shared/include/function_means.hh +++ b/milena/sandbox/lazzara/igr/gui/shared/include/function_means.hh @@ -49,7 +49,6 @@ namespace igr /// Compute from slice \p sli_first to \p sli_last included. // template <typename V> - inline image2d<float> function_means(const image3d<V>& ima, int sli_first, int sli_last); diff --git a/milena/sandbox/lazzara/igr/gui/shared/include/mean_function_per_region.hh b/milena/sandbox/lazzara/igr/gui/shared/include/mean_function_per_region.hh index b0adcfc..75da3a8 100644 --- a/milena/sandbox/lazzara/igr/gui/shared/include/mean_function_per_region.hh +++ b/milena/sandbox/lazzara/igr/gui/shared/include/mean_function_per_region.hh @@ -30,6 +30,7 @@ #ifndef IGR_SHARED_INCLUDE_MEAN_FUNCTION_PER_REGION_HH # define IGR_SHARED_INCLUDE_MEAN_FUNCTION_PER_REGION_HH +# include <mln/core/var.hh> # include <mln/core/image/image3d.hh> # include <mln/core/image/dmorph/slice_image.hh> @@ -49,7 +50,6 @@ namespace igr /// Compute from slice \p sli_first to \p sli_last included. // template <typename V, typename L> - inline util::array<util::array<V> > mean_function_per_region(const image3d<V>& ima, const image3d<L>& lbl, const L& nregion); diff --git a/milena/sandbox/lazzara/igr/gui/shared/include/mean_regions.hh b/milena/sandbox/lazzara/igr/gui/shared/include/mean_regions.hh index 85a2e7d..6872683 100644 --- a/milena/sandbox/lazzara/igr/gui/shared/include/mean_regions.hh +++ b/milena/sandbox/lazzara/igr/gui/shared/include/mean_regions.hh @@ -34,6 +34,8 @@ # include <mln/core/image/image2d.hh> # include <mln/core/image/dmorph/slice_image.hh> +# include <mln/core/var.hh> + # include <mln/data/paste.hh> # include <mln/labeling/mean_values.hh> # include <mln/labeling/pack.hh> diff --git a/milena/sandbox/lazzara/igr/gui/shared/include/normalization.hh b/milena/sandbox/lazzara/igr/gui/shared/include/normalization.hh index 6ec41a2..e4d91eb 100644 --- a/milena/sandbox/lazzara/igr/gui/shared/include/normalization.hh +++ b/milena/sandbox/lazzara/igr/gui/shared/include/normalization.hh @@ -56,7 +56,6 @@ namespace igr /// number of slices of \p input. // template <typename V1, typename V2> - inline image3d<float> normalization(const image3d<V1>& ima, const image2d<V2>& mean); diff --git a/milena/sandbox/lazzara/igr/gui/shared/include/time_smooth_morpho.hh b/milena/sandbox/lazzara/igr/gui/shared/include/time_smooth_morpho.hh index 4515e16..27331a0 100644 --- a/milena/sandbox/lazzara/igr/gui/shared/include/time_smooth_morpho.hh +++ b/milena/sandbox/lazzara/igr/gui/shared/include/time_smooth_morpho.hh @@ -31,6 +31,8 @@ # define IGR_SHARED_INCLUDE_TIME_SMOOTH_MORPHO_HH # include <mln/core/image/image3d.hh> +# include <mln/accu/stat/mean.hh> +# include <mln/accu/image/all.hh> # include <mln/morpho/closing/structural.hh> # include <mln/morpho/opening/structural.hh> # include <mln/win/sline3d.hh> -- 1.5.6.5

13 years, 9 months

last-svn-commit-695-g9dd5ec1 Add function visualization in the mean region widget.

by Guillaume Lazzara

* lazzara/igr/gui/segmentation2dt/src/mean_regions_widget.cc, * lazzara/igr/gui/segmentation2dt/src/mean_regions_widget.hh: Add mouseclick support for function visualization. --- milena/sandbox/ChangeLog | 8 +++ .../gui/segmentation2dt/src/mean_regions_widget.cc | 62 +++++++++++++++++++- .../gui/segmentation2dt/src/mean_regions_widget.hh | 5 ++ 3 files changed, 73 insertions(+), 2 deletions(-) diff --git a/milena/sandbox/ChangeLog b/milena/sandbox/ChangeLog index 4f62abc..07874a9 100644 --- a/milena/sandbox/ChangeLog +++ b/milena/sandbox/ChangeLog @@ -1,5 +1,13 @@ 2010-11-15 Guillaume Lazzara <z(a)lrde.epita.fr> + Add function visualization in the mean region widget. + + * lazzara/igr/gui/segmentation2dt/src/mean_regions_widget.cc, + * lazzara/igr/gui/segmentation2dt/src/mean_regions_widget.hh: Add + mouseclick support for function visualization. + +2010-11-15 Guillaume Lazzara <z(a)lrde.epita.fr> + Allow to save results filtered differently in the 3D segmentation tool. diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/mean_regions_widget.cc b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/mean_regions_widget.cc index 5a255fe..5756458 100644 --- a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/mean_regions_widget.cc +++ b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/mean_regions_widget.cc @@ -63,6 +63,16 @@ namespace igr connect(viewer_, SIGNAL(slider_valueChanged(int)), data_, SLOT(compute_new_mean_regions_image(int))); + // Plot widget related settings. + connect(viewer_->scene(), SIGNAL(mouse_pressed(const QPointF&)), + this, SLOT(mouse_click_slot(const QPointF&))); + + connect(viewer_->scene(), SIGNAL(mouse_click(const QPointF&)), + this, SLOT(mouse_click_slot(const QPointF&))); + + plot_widget_ = new plot_widget(); + plot_widget_->hide(); + emit task_ready(); } @@ -75,6 +85,14 @@ namespace igr disconnect(viewer_, SIGNAL(slider_valueChanged(int)), data_, SLOT(compute_new_mean_regions_image(int))); + // Plot widget related settings. + disconnect(viewer_->scene(), SIGNAL(mouse_pressed(const QPointF&)), + this, SLOT(mouse_click_slot(const QPointF&))); + + disconnect(viewer_->scene(), SIGNAL(mouse_click(const QPointF&)), + this, SLOT(mouse_click_slot(const QPointF&))); + + delete plot_widget_; } @@ -93,14 +111,14 @@ namespace igr bool mean_regions_widget::has_mouseover_data(const QPointF& p) const { point3d p3d(viewer_->current_slice(), p.y(), p.x()); - return data_->mean_regions().domain().has(p3d); + return data_->mean_regions_smooth().domain().has(p3d); } float mean_regions_widget::compute_mouseover_data(const QPointF& p) const { point3d p3d(viewer_->current_slice(), p.y(), p.x()); - return float(data_->mean_regions()(p3d)); + return float(data_->mean_regions_smooth()(p3d)); } @@ -109,11 +127,51 @@ namespace igr disconnect(sender(), SIGNAL(finished()), this, SLOT(task_finished_slot())); + // Preparing x data for plot widget. + xData_.resize(data_->mean_regions_smooth().nslis()); + for (int i = 0; i < xData_.size(); ++i) + xData_[i] = i; + + this->already_computed_ = true; // Result already refreshed and displayed. } + void mean_regions_widget::mouse_click_slot(const QPointF& p) + { + if (has_mouseover_data(p)) + { + point3d p3d = point3d(0, p.y(), p.x()); + + plot_widget_->clear(); + + QString title(tr("Function for region %1").arg(data_->seg_smooth()(p3d))); + plot_widget_->set_title(title); + + // Copy the data into the curves. + + QwtArray<double> yData; + yData.resize(data_->in_nslis()); + + // Result of the morpholocial filter. + for (int i = 0; i < yData.size(); ++i, ++p3d[0]) + yData[i] = data_->mean_regions_smooth()(p3d); + + plot_widget_->add_curve(tr("Morphological filtering."), + xData_, yData, QPen(Qt::green, 3)); + + // Ready to replot. + plot_widget_->replot(); + + + // Display result. + plot_widget_->show(); + plot_widget_->raise(); + } + } + + } // end of namespace igr::segmentation } // end of namespace igr diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/mean_regions_widget.hh b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/mean_regions_widget.hh index 8d78cb5..6ff7a15 100644 --- a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/mean_regions_widget.hh +++ b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/mean_regions_widget.hh @@ -30,6 +30,7 @@ # include <ui_mean_regions_widget.h> # include <src/task_widget.hh> +# include <src/plot_widget.hh> namespace igr @@ -55,11 +56,15 @@ namespace igr private slots: void task_finished_slot(); + void mouse_click_slot(const QPointF& p); private: // Members virtual void run_task_(task_handler& handler); private: // Attributes + QwtArray<double> xData_; + + plot_widget *plot_widget_; }; -- 1.5.6.5

13 years, 9 months

last-svn-commit-696-g27c8f05 Add save button for function plots.

by Guillaume Lazzara

* lazzara/igr/gui/segmentation2dt/src/plot_widget.cc, * lazzara/igr/gui/segmentation2dt/src/plot_widget.hh: Here. --- milena/sandbox/ChangeLog | 7 ++++++ .../igr/gui/segmentation2dt/src/plot_widget.cc | 21 ++++++++++++++++++++ .../igr/gui/segmentation2dt/src/plot_widget.hh | 1 + 3 files changed, 29 insertions(+), 0 deletions(-) diff --git a/milena/sandbox/ChangeLog b/milena/sandbox/ChangeLog index 07874a9..62d9d00 100644 --- a/milena/sandbox/ChangeLog +++ b/milena/sandbox/ChangeLog @@ -1,5 +1,12 @@ 2010-11-15 Guillaume Lazzara <z(a)lrde.epita.fr> + Add save button for function plots. + + * lazzara/igr/gui/segmentation2dt/src/plot_widget.cc, + * lazzara/igr/gui/segmentation2dt/src/plot_widget.hh: Here. + +2010-11-15 Guillaume Lazzara <z(a)lrde.epita.fr> + Add function visualization in the mean region widget. * lazzara/igr/gui/segmentation2dt/src/mean_regions_widget.cc, diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/plot_widget.cc b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/plot_widget.cc index a19ce36..d90d6d4 100644 --- a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/plot_widget.cc +++ b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/plot_widget.cc @@ -78,6 +78,27 @@ namespace igr } + void plot_widget::on_savePlotBtn__clicked() + { + QPixmap plotPix = QPixmap::grabWidget(plot_); + + QString plotfile = QFileDialog::getSaveFileName(this, + tr("Save plot."), + QString(), + tr("PNG (*.png)")); + + if (!plotfile.endsWith(".png", Qt::CaseInsensitive)) + plotfile.append(".png"); + + if (!plotPix.save(plotfile, "PNG", 100)) + { + QMessageBox::critical(0, "Error saving plot!", + "Cannot write plot file. Make sure you have " + "write permissions."); + } + } + + } // end of namespace igr::segmentation } // end of namespace igr diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/plot_widget.hh b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/plot_widget.hh index bdfce62..e9af350 100644 --- a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/plot_widget.hh +++ b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/plot_widget.hh @@ -62,6 +62,7 @@ namespace igr void on_zoomBestBtn__clicked(); void on_zoomOutBtn__clicked(); void on_zoomInBtn__clicked(); + void on_savePlotBtn__clicked(); private: // Members -- 1.5.6.5

13 years, 9 months

last-svn-commit-697-ga0aa478 Store loaded image with double value type.

by Guillaume Lazzara

* lazzara/igr/gui/viewer/src/main_window.cc: Avoid a warning. * lazzara/igr/gui/viewer/src/mln_data.cc, * lazzara/igr/gui/viewer/src/mln_data.hh: Change loaded image value type from int_u8 to double. --- milena/sandbox/ChangeLog | 10 +++++ .../lazzara/igr/gui/viewer/src/main_window.cc | 2 +- .../sandbox/lazzara/igr/gui/viewer/src/mln_data.cc | 43 ++++++++++++-------- .../sandbox/lazzara/igr/gui/viewer/src/mln_data.hh | 8 +++- 4 files changed, 44 insertions(+), 19 deletions(-) diff --git a/milena/sandbox/ChangeLog b/milena/sandbox/ChangeLog index 62d9d00..eca9e24 100644 --- a/milena/sandbox/ChangeLog +++ b/milena/sandbox/ChangeLog @@ -1,5 +1,15 @@ 2010-11-15 Guillaume Lazzara <z(a)lrde.epita.fr> + Store loaded image with double value type. + + * lazzara/igr/gui/viewer/src/main_window.cc: Avoid a warning. + + * lazzara/igr/gui/viewer/src/mln_data.cc, + * lazzara/igr/gui/viewer/src/mln_data.hh: Change loaded image + value type from int_u8 to double. + +2010-11-15 Guillaume Lazzara <z(a)lrde.epita.fr> + Add save button for function plots. * lazzara/igr/gui/segmentation2dt/src/plot_widget.cc, diff --git a/milena/sandbox/lazzara/igr/gui/viewer/src/main_window.cc b/milena/sandbox/lazzara/igr/gui/viewer/src/main_window.cc index 7770d7c..7d66659 100644 --- a/milena/sandbox/lazzara/igr/gui/viewer/src/main_window.cc +++ b/milena/sandbox/lazzara/igr/gui/viewer/src/main_window.cc @@ -141,7 +141,7 @@ namespace igr } - void main_window::clear_information_slot(const QPointF& p) + void main_window::clear_information_slot(const QPointF&) { point_info_->setText(""); } diff --git a/milena/sandbox/lazzara/igr/gui/viewer/src/mln_data.cc b/milena/sandbox/lazzara/igr/gui/viewer/src/mln_data.cc index 7579c62..e9503c4 100644 --- a/milena/sandbox/lazzara/igr/gui/viewer/src/mln_data.cc +++ b/milena/sandbox/lazzara/igr/gui/viewer/src/mln_data.cc @@ -79,7 +79,7 @@ namespace igr if (!tmp.is_valid()) emit error_loading("Cannot open file! Please checkout the permissions."); - in_ = make::image3d(tmp); + in_ = make::image3d(data::convert(double(), tmp)); in_dsp_ = data::convert(igr::dsp_data_t(), data::stretch(value::int_u8(), in_)); @@ -107,7 +107,7 @@ namespace igr if (!tmp.is_valid()) emit error_loading("Cannot open file! Please checkout the permissions."); - in_ = make::image3d(tmp); + in_ = make::image3d(data::convert(double(), tmp)); } else if (header.value_type == "bool") { @@ -116,7 +116,7 @@ namespace igr if (!tmp.is_valid()) emit error_loading("Cannot open file! Please checkout the permissions."); - in_ = make::image3d(data::convert(value::int_u12(), tmp)); + in_ = make::image3d(data::convert(double(), tmp)); } else if (header.value_type == "unsigned int") { @@ -125,7 +125,7 @@ namespace igr if (!tmp.is_valid()) emit error_loading("Cannot open file! Please checkout the permissions."); - in_ = make::image3d(data::stretch(value::int_u12(), tmp)); + in_ = make::image3d(data::convert(double(), tmp)); } else if (header.value_type == "float") { @@ -134,7 +134,7 @@ namespace igr if (!tmp.is_valid()) emit error_loading("Cannot open file! Please checkout the permissions."); - in_ = make::image3d(data::stretch(value::int_u12(), tmp)); + in_ = make::image3d(data::convert(double(), tmp)); } else qDebug() << "Error while loading the image: unsupported value type..."; @@ -148,10 +148,12 @@ namespace igr { if (header.value_type == "int_u12") { - io::raw::load(in_, filename.toStdString()); + image2d<value::int_u12> tmp; + io::raw::load(tmp, filename.toStdString()); - if (!in_.is_valid()) + if (!tmp.is_valid()) emit error_loading("Cannot open file! Please checkout the permissions."); + in_ = make::image3d(data::convert(double(), tmp)); } else if (header.value_type == "bool") { @@ -160,7 +162,7 @@ namespace igr if (!tmp.is_valid()) emit error_loading("Cannot open file! Please checkout the permissions."); - in_ = data::convert(value::int_u12(), tmp); + in_ = data::convert(double(), tmp); } else if (header.value_type == "unsigned int") { @@ -169,7 +171,7 @@ namespace igr if (!tmp.is_valid()) emit error_loading("Cannot open file! Please checkout the permissions."); - in_ = data::stretch(value::int_u12(), tmp); + in_ = data::convert(double(), tmp); } else if (header.value_type == "float") { @@ -178,7 +180,7 @@ namespace igr if (!tmp.is_valid()) emit error_loading("Cannot open file! Please checkout the permissions."); - in_ = data::stretch(value::int_u12(), tmp); + in_ = data::convert(double(), tmp); } else qDebug() << "Error while loading the image: unsupported value type " @@ -215,14 +217,17 @@ namespace igr if (!tmp.is_valid()) emit error_loading("Cannot open file! Please checkout the permissions."); - in_ = make::image3d(tmp); + in_ = make::image3d(data::convert(double(), tmp)); in_dsp_ = data::convert(igr::dsp_data_t(), data::stretch(value::int_u8(), in_)); } else if (header.dim == 3) { - io::dicom::load(in_, filename.toStdString()); + image3d<value::int_u12> tmp; + io::dicom::load(tmp, filename.toStdString()); + + in_ = data::convert(double(), tmp); if (!in_.is_valid()) emit error_loading("Cannot open file! Please checkout the permissions."); @@ -257,7 +262,7 @@ namespace igr if (!tmp.is_valid()) emit error_loading("Cannot open file! Please checkout the permissions."); - in_ = make::image3d(tmp); + in_ = make::image3d(data::convert(double(), tmp)); } else if (header.value_type == "unsigned int") { @@ -266,7 +271,7 @@ namespace igr if (!tmp.is_valid()) emit error_loading("Cannot open file! Please checkout the permissions."); - in_ = make::image3d(data::stretch(value::int_u12(), tmp)); + in_ = make::image3d(data::convert(double(), tmp)); } else qDebug() << "Error while loading the image: unsupported value type " @@ -276,7 +281,10 @@ namespace igr { if (header.value_type == "int_u12") { - io::dump::load(in_, filename.toStdString()); + image2d<value::int_u12> tmp; + io::dicom::load(tmp, filename.toStdString()); + + in_ = make::image3d(data::convert(double(), tmp)); if (!in_.is_valid()) emit error_loading("Cannot open file! Please checkout the permissions."); @@ -288,7 +296,7 @@ namespace igr if (!tmp.is_valid()) emit error_loading("Cannot open file! Please checkout the permissions."); - in_ = data::stretch(value::int_u12(), tmp); + in_ = data::convert(double(), tmp); } else qDebug() << "Error while loading the image: unsupported value type " @@ -328,7 +336,8 @@ namespace igr else if (ext == "raw") io::raw::save(slice(in_, sli), filename.toStdString()); else if (ext == "pgm") - io::pgm::save(slice(in_, sli), filename.toStdString()); + io::pgm::save(data::convert(value::int_u8(), slice(in_, sli)), + filename.toStdString()); else emit error_saving(tr("Error while saving. Output format not supported.")); } diff --git a/milena/sandbox/lazzara/igr/gui/viewer/src/mln_data.hh b/milena/sandbox/lazzara/igr/gui/viewer/src/mln_data.hh index 57ee01f..fdd72d9 100644 --- a/milena/sandbox/lazzara/igr/gui/viewer/src/mln_data.hh +++ b/milena/sandbox/lazzara/igr/gui/viewer/src/mln_data.hh @@ -41,7 +41,13 @@ namespace igr Q_OBJECT public: - typedef image3d<value::int_u12> in_t; + + /*! We want to store every loaded images with double data type + to avoid data stretching/saturation. Since both float and + integer images can be loaded we that to preserve the + precision. + */ + typedef image3d<double> in_t; typedef image3d<igr::dsp_data_t> in_dsp_t; mln_data(); -- 1.5.6.5

13 years, 9 months

last-svn-commit-698-g90ac1e4 Update code with nslices() instead of nslis().

by Guillaume Lazzara

* lazzara/igr/gui/segmentation/src/mln_data.cc, * lazzara/igr/gui/segmentation/src/tools/crop.cc, * lazzara/igr/gui/segmentation/src/tools/edit_seg.cc, * lazzara/igr/gui/segmentation2dt/src/mean_regions_widget.cc, * lazzara/igr/gui/segmentation2dt/src/mln_data.cc, * lazzara/igr/gui/segmentation2dt/src/norm_smooth_widget.cc, * lazzara/igr/gui/segmentation2dt/src/tools/crop.cc, * lazzara/igr/gui/shared/include/mean_function_per_region.hh, * lazzara/igr/gui/viewer/src/mln_data.cc: Replace nslis by nslices. --- milena/sandbox/ChangeLog | 15 +++++++++++++++ .../lazzara/igr/gui/segmentation/src/mln_data.cc | 16 ++++++++-------- .../lazzara/igr/gui/segmentation/src/tools/crop.cc | 2 +- .../igr/gui/segmentation/src/tools/edit_seg.cc | 4 ++-- .../gui/segmentation2dt/src/mean_regions_widget.cc | 2 +- .../igr/gui/segmentation2dt/src/mln_data.cc | 16 ++++++++-------- .../gui/segmentation2dt/src/norm_smooth_widget.cc | 2 +- .../igr/gui/segmentation2dt/src/tools/crop.cc | 2 +- .../gui/shared/include/mean_function_per_region.hh | 4 ++-- .../sandbox/lazzara/igr/gui/viewer/src/mln_data.cc | 10 +++++----- 10 files changed, 44 insertions(+), 29 deletions(-) diff --git a/milena/sandbox/ChangeLog b/milena/sandbox/ChangeLog index eca9e24..8f6f36c 100644 --- a/milena/sandbox/ChangeLog +++ b/milena/sandbox/ChangeLog @@ -1,3 +1,18 @@ +2010-11-16 Guillaume Lazzara <z(a)lrde.epita.fr> + + Update code with nslices() instead of nslis(). + + * lazzara/igr/gui/segmentation/src/mln_data.cc, + * lazzara/igr/gui/segmentation/src/tools/crop.cc, + * lazzara/igr/gui/segmentation/src/tools/edit_seg.cc, + * lazzara/igr/gui/segmentation2dt/src/mean_regions_widget.cc, + * lazzara/igr/gui/segmentation2dt/src/mln_data.cc, + * lazzara/igr/gui/segmentation2dt/src/norm_smooth_widget.cc, + * lazzara/igr/gui/segmentation2dt/src/tools/crop.cc, + * lazzara/igr/gui/shared/include/mean_function_per_region.hh, + * lazzara/igr/gui/viewer/src/mln_data.cc: Replace nslis by + nslices. + 2010-11-15 Guillaume Lazzara <z(a)lrde.epita.fr> Store loaded image with double value type. diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/mln_data.cc b/milena/sandbox/lazzara/igr/gui/segmentation/src/mln_data.cc index 6c8ea01..0254d98 100644 --- a/milena/sandbox/lazzara/igr/gui/segmentation/src/mln_data.cc +++ b/milena/sandbox/lazzara/igr/gui/segmentation/src/mln_data.cc @@ -70,7 +70,7 @@ namespace igr // Notifying the successful loading emit image_loaded(filename); - emit image_layer_count(in_dsp_.nslis()); + emit image_layer_count(in_dsp_.nslices()); } @@ -110,7 +110,7 @@ namespace igr // Notifying the successful loading emit image_loaded(filename); - emit image_layer_count(in_dsp_.nslis()); + emit image_layer_count(in_dsp_.nslices()); } @@ -158,7 +158,7 @@ namespace igr // Notifying the successful loading emit image_loaded(filename); - emit image_layer_count(in_dsp_.nslis()); + emit image_layer_count(in_dsp_.nslices()); } @@ -241,7 +241,7 @@ namespace igr // Make sure there is no border! extension::adjust(in_dsp_, 0); - emit image_layer_count(in_dsp_.nslis()); + emit image_layer_count(in_dsp_.nslices()); // emit updated_image(data::convert(igr::dsp_data_t(), sl_in_dsp)); } @@ -273,7 +273,7 @@ namespace igr // Make sure there is no border! extension::adjust(seg_dsp_, 0); - emit image_layer_count(seg_dsp_.nslis()); + emit image_layer_count(seg_dsp_.nslices()); compute_new_seg_image(sli); } @@ -291,7 +291,7 @@ namespace igr // Make sure there is no border! extension::adjust(bin_seg_dsp_, 0); - emit image_layer_count(bin_seg_dsp_.nslis()); + emit image_layer_count(bin_seg_dsp_.nslices()); emit updated_bin_seg_dsp_image(data::convert(igr::dsp_data_t(), slice(bin_seg_dsp_, sli))); } @@ -311,7 +311,7 @@ namespace igr unsigned mln_data::in_nslis() const { - return in_.nslis(); + return in_.nslices(); } @@ -323,7 +323,7 @@ namespace igr unsigned mln_data::seg_nslis() const { - return seg_.nslis(); + return seg_.nslices(); } const seg_data_t& mln_data::nregion() const diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/tools/crop.cc b/milena/sandbox/lazzara/igr/gui/segmentation/src/tools/crop.cc index 4692b8d..98dd57e 100644 --- a/milena/sandbox/lazzara/igr/gui/segmentation/src/tools/crop.cc +++ b/milena/sandbox/lazzara/igr/gui/segmentation/src/tools/crop.cc @@ -36,7 +36,7 @@ namespace igr br = box_.bottomRight(); box3d box(point3d(0, tl.y(), tl.x()), - point3d(data_->in().nslis() - 1, br.y(), br.x())); + point3d(data_->in().nslices() - 1, br.y(), br.x())); box.crop_wrt(data_->in().domain()); diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/tools/edit_seg.cc b/milena/sandbox/lazzara/igr/gui/segmentation/src/tools/edit_seg.cc index 3e14ea8..13c6730 100644 --- a/milena/sandbox/lazzara/igr/gui/segmentation/src/tools/edit_seg.cc +++ b/milena/sandbox/lazzara/igr/gui/segmentation/src/tools/edit_seg.cc @@ -55,7 +55,7 @@ namespace igr sub_min_sli = box.pmin().sli(), sub_min_row = box.pmin().row(), sub_min_col = box.pmin().col(), - nslis = box.nslis(), + nslis = box.nslices(), nrows = box.nrows(), ncols = box.ncols(); @@ -147,7 +147,7 @@ namespace igr sub_min_sli = box.pmin().sli(), sub_min_row = box.pmin().row(), sub_min_col = box.pmin().col(), - nslis = box.nslis(), + nslis = box.nslices(), nrows = box.nrows(), ncols = box.ncols(); diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/mean_regions_widget.cc b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/mean_regions_widget.cc index 5756458..dada656 100644 --- a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/mean_regions_widget.cc +++ b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/mean_regions_widget.cc @@ -128,7 +128,7 @@ namespace igr this, SLOT(task_finished_slot())); // Preparing x data for plot widget. - xData_.resize(data_->mean_regions_smooth().nslis()); + xData_.resize(data_->mean_regions_smooth().nslices()); for (int i = 0; i < xData_.size(); ++i) xData_[i] = i; diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/mln_data.cc b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/mln_data.cc index f8dc7c8..160363f 100644 --- a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/mln_data.cc +++ b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/mln_data.cc @@ -82,7 +82,7 @@ namespace igr // Notifying the successful loading emit image_loaded(filename); - emit image_layer_count(in_dsp_.nslis()); + emit image_layer_count(in_dsp_.nslices()); } @@ -118,7 +118,7 @@ namespace igr // Notifying the successful loading emit image_loaded(filename); - emit image_layer_count(in_dsp_.nslis()); + emit image_layer_count(in_dsp_.nslices()); } @@ -232,7 +232,7 @@ namespace igr // Make sure there is no border! extension::adjust(in_dsp_, 0); - emit image_layer_count(in_dsp_.nslis()); + emit image_layer_count(in_dsp_.nslices()); // emit updated_image(data::convert(igr::dsp_data_t(), sl_in_dsp)); } @@ -290,7 +290,7 @@ namespace igr // Make sure there is no border! extension::adjust(norm_smooth_dsp_, 0); - emit image_layer_count(norm_smooth_.nslis()); + emit image_layer_count(norm_smooth_.nslices()); compute_new_norm_smooth_image(0); } @@ -336,7 +336,7 @@ namespace igr nregion_smooth_ = nregion; - emit image_layer_count(seg_dsp_.nslis()); + emit image_layer_count(seg_dsp_.nslices()); compute_new_seg_image(sli); } @@ -386,7 +386,7 @@ namespace igr // Make sure there is no border! extension::adjust(mean_regions_dsp_, 0); - emit image_layer_count(mean_regions_dsp_.nslis()); + emit image_layer_count(mean_regions_dsp_.nslices()); compute_new_mean_regions_image(sli); } @@ -405,7 +405,7 @@ namespace igr unsigned mln_data::in_nslis() const { - return in_.nslis(); + return in_.nslices(); } @@ -455,7 +455,7 @@ namespace igr unsigned mln_data::seg_nslis() const { - return seg_.nslis(); + return seg_.nslices(); } const seg_data_t& mln_data::nregion() const diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/norm_smooth_widget.cc b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/norm_smooth_widget.cc index 682206e..d528c36 100644 --- a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/norm_smooth_widget.cc +++ b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/norm_smooth_widget.cc @@ -128,7 +128,7 @@ namespace igr this, SLOT(task_finished_slot())); // Preparing x data for plot widget. - xData_.resize(data_->norm_smooth().nslis()); + xData_.resize(data_->norm_smooth().nslices()); for (int i = 0; i < xData_.size(); ++i) xData_[i] = i; diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/crop.cc b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/crop.cc index 4692b8d..98dd57e 100644 --- a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/crop.cc +++ b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/crop.cc @@ -36,7 +36,7 @@ namespace igr br = box_.bottomRight(); box3d box(point3d(0, tl.y(), tl.x()), - point3d(data_->in().nslis() - 1, br.y(), br.x())); + point3d(data_->in().nslices() - 1, br.y(), br.x())); box.crop_wrt(data_->in().domain()); diff --git a/milena/sandbox/lazzara/igr/gui/shared/include/mean_function_per_region.hh b/milena/sandbox/lazzara/igr/gui/shared/include/mean_function_per_region.hh index 75da3a8..085472a 100644 --- a/milena/sandbox/lazzara/igr/gui/shared/include/mean_function_per_region.hh +++ b/milena/sandbox/lazzara/igr/gui/shared/include/mean_function_per_region.hh @@ -83,7 +83,7 @@ namespace igr if (! processed(lbl_v)) { util::array<V> result; - result.reserve(ima.nslis()); + result.reserve(ima.nslices()); const V *v = &ima.at_(0, p.row(), p.col()); for(int i = min_sli; i < max_sli; ++i, v += offset) @@ -92,7 +92,7 @@ namespace igr processed[lbl_v] = true; } - mln_assertion(result.size() == ima.nslis()); + mln_assertion(result.size() == ima.nslices()); } trace::exiting("igr::shared::mean_function_per_region"); diff --git a/milena/sandbox/lazzara/igr/gui/viewer/src/mln_data.cc b/milena/sandbox/lazzara/igr/gui/viewer/src/mln_data.cc index e9503c4..4ba3864 100644 --- a/milena/sandbox/lazzara/igr/gui/viewer/src/mln_data.cc +++ b/milena/sandbox/lazzara/igr/gui/viewer/src/mln_data.cc @@ -89,7 +89,7 @@ namespace igr // Notifying the successful loading emit image_loaded(filename); - emit image_layer_count(in_dsp_.nslis()); + emit image_layer_count(in_dsp_.nslices()); } @@ -199,7 +199,7 @@ namespace igr // Notifying the successful loading emit image_loaded(filename); - emit image_layer_count(in_dsp_.nslis()); + emit image_layer_count(in_dsp_.nslices()); } @@ -243,7 +243,7 @@ namespace igr // Notifying the successful loading emit image_loaded(filename); - emit image_layer_count(in_dsp_.nslis()); + emit image_layer_count(in_dsp_.nslices()); } @@ -315,7 +315,7 @@ namespace igr // Notifying the successful loading emit image_loaded(filename); - emit image_layer_count(in_dsp_.nslis()); + emit image_layer_count(in_dsp_.nslices()); } @@ -369,7 +369,7 @@ namespace igr unsigned mln_data::nslis() const { - return in_.nslis(); + return in_.nslices(); } } // end of namespace igr::viewer -- 1.5.6.5

13 years, 9 months

last-svn-commit-699-g319827a lazzara/igr/gui/segmentation/src/task_widget.cc: Avoid a warning.

by Guillaume Lazzara

--- milena/sandbox/ChangeLog | 5 +++++ .../igr/gui/segmentation/src/task_widget.cc | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/milena/sandbox/ChangeLog b/milena/sandbox/ChangeLog index 8f6f36c..311448d 100644 --- a/milena/sandbox/ChangeLog +++ b/milena/sandbox/ChangeLog @@ -1,5 +1,10 @@ 2010-11-16 Guillaume Lazzara <z(a)lrde.epita.fr> + * lazzara/igr/gui/segmentation/src/task_widget.cc: Avoid a + warning. + +2010-11-16 Guillaume Lazzara <z(a)lrde.epita.fr> + Update code with nslices() instead of nslis(). * lazzara/igr/gui/segmentation/src/mln_data.cc, diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/task_widget.cc b/milena/sandbox/lazzara/igr/gui/segmentation/src/task_widget.cc index e3ddce5..c8e6cbc 100644 --- a/milena/sandbox/lazzara/igr/gui/segmentation/src/task_widget.cc +++ b/milena/sandbox/lazzara/igr/gui/segmentation/src/task_widget.cc @@ -55,7 +55,7 @@ namespace igr handler.no_op(); } - void Task_Widget::run_task_(task_handler& handler) + void Task_Widget::run_task_(task_handler& /*handler*/) { qDebug() << "WARNING: task_widget::run_task_ should not be called..."; } -- 1.5.6.5

13 years, 9 months

last-svn-commit-700-g8df88e3 Move IGR code from milena/sandbox to igr's private module.

by Guillaume Lazzara

* milena/sandbox/lazzara/igr/gui/anapath/anapath.pro, * milena/sandbox/lazzara/igr/gui/anapath/src/main.cc, * milena/sandbox/lazzara/igr/gui/anapath/src/main_window.cc, * milena/sandbox/lazzara/igr/gui/anapath/src/main_window.hh, * milena/sandbox/lazzara/igr/gui/anapath/src/mln_data.cc, * milena/sandbox/lazzara/igr/gui/anapath/src/mln_data.hh, * milena/sandbox/lazzara/igr/gui/anapath/src/mln_widgets.cc, * milena/sandbox/lazzara/igr/gui/anapath/src/tools/filter.cc, * milena/sandbox/lazzara/igr/gui/anapath/src/tools/filter.hh, * milena/sandbox/lazzara/igr/gui/anapath/src/tools/load.cc, * milena/sandbox/lazzara/igr/gui/anapath/src/tools/load.hh, * milena/sandbox/lazzara/igr/gui/anapath/src/tools/save.cc, * milena/sandbox/lazzara/igr/gui/anapath/src/tools/save.hh, * milena/sandbox/lazzara/igr/gui/anapath/ui/main_window.ui, * milena/sandbox/lazzara/igr/gui/segmentation/segmentation.pro, * milena/sandbox/lazzara/igr/gui/segmentation/segmentation.sh, * milena/sandbox/lazzara/igr/gui/segmentation/src/crop_widget.cc, * milena/sandbox/lazzara/igr/gui/segmentation/src/crop_widget.hh, * milena/sandbox/lazzara/igr/gui/segmentation/src/edit_seg_widget.cc, * milena/sandbox/lazzara/igr/gui/segmentation/src/edit_seg_widget.hh, * milena/sandbox/lazzara/igr/gui/segmentation/src/load_widget.cc, * milena/sandbox/lazzara/igr/gui/segmentation/src/load_widget.hh, * milena/sandbox/lazzara/igr/gui/segmentation/src/main.cc, * milena/sandbox/lazzara/igr/gui/segmentation/src/main_window.cc, * milena/sandbox/lazzara/igr/gui/segmentation/src/main_window.hh, * milena/sandbox/lazzara/igr/gui/segmentation/src/mln_data.cc, * milena/sandbox/lazzara/igr/gui/segmentation/src/mln_data.hh, * milena/sandbox/lazzara/igr/gui/segmentation/src/mln_widgets.cc, * milena/sandbox/lazzara/igr/gui/segmentation/src/save_widget.cc, * milena/sandbox/lazzara/igr/gui/segmentation/src/save_widget.hh, * milena/sandbox/lazzara/igr/gui/segmentation/src/seg_widget.cc, * milena/sandbox/lazzara/igr/gui/segmentation/src/seg_widget.hh, * milena/sandbox/lazzara/igr/gui/segmentation/src/task.hh, * milena/sandbox/lazzara/igr/gui/segmentation/src/task_handler.cc, * milena/sandbox/lazzara/igr/gui/segmentation/src/task_handler.hh, * milena/sandbox/lazzara/igr/gui/segmentation/src/task_handler.hxx, * milena/sandbox/lazzara/igr/gui/segmentation/src/task_widget.cc, * milena/sandbox/lazzara/igr/gui/segmentation/src/task_widget.hh, * milena/sandbox/lazzara/igr/gui/segmentation/src/tools/crop.cc, * milena/sandbox/lazzara/igr/gui/segmentation/src/tools/crop.hh, * milena/sandbox/lazzara/igr/gui/segmentation/src/tools/edit_seg.cc, * milena/sandbox/lazzara/igr/gui/segmentation/src/tools/edit_seg.hh, * milena/sandbox/lazzara/igr/gui/segmentation/src/tools/load.cc, * milena/sandbox/lazzara/igr/gui/segmentation/src/tools/load.hh, * milena/sandbox/lazzara/igr/gui/segmentation/src/tools/save.cc, * milena/sandbox/lazzara/igr/gui/segmentation/src/tools/save.hh, * milena/sandbox/lazzara/igr/gui/segmentation/src/tools/seg.cc, * milena/sandbox/lazzara/igr/gui/segmentation/src/tools/seg.hh, * milena/sandbox/lazzara/igr/gui/segmentation/ui/crop_widget.ui, * milena/sandbox/lazzara/igr/gui/segmentation/ui/edit_seg_widget.ui, * milena/sandbox/lazzara/igr/gui/segmentation/ui/load_widget.ui, * milena/sandbox/lazzara/igr/gui/segmentation/ui/main_window.ui, * milena/sandbox/lazzara/igr/gui/segmentation/ui/save_widget.ui, * milena/sandbox/lazzara/igr/gui/segmentation/ui/seg_widget.ui, * milena/sandbox/lazzara/igr/gui/segmentation2dt/segmentation2dt.pro, * milena/sandbox/lazzara/igr/gui/segmentation2dt/segmentation2dt.sh, * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/crop_widget.cc, * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/crop_widget.hh, * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/load_widget.cc, * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/load_widget.hh, * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/main.cc, * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/main_window.cc, * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/main_window.hh, * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/mean_regions_widget.cc, * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/mean_regions_widget.hh, * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/mln_data.cc, * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/mln_data.hh, * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/mln_widgets.cc, * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/norm_smooth_widget.cc, * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/norm_smooth_widget.hh, * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/plot.cc, * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/plot.hh, * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/plot_widget.cc, * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/plot_widget.hh, * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/ref_mean_widget.cc, * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/ref_mean_widget.hh, * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/save_widget.cc, * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/save_widget.hh, * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/seg_widget.cc, * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/seg_widget.hh, * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/task.hh, * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/task_handler.cc, * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/task_handler.hh, * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/task_handler.hxx, * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/task_widget.cc, * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/task_widget.hh, * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/crop.cc, * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/crop.hh, * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/load.cc, * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/load.hh, * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/mean_regions.cc, * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/mean_regions.hh, * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/norm_smooth.cc, * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/norm_smooth.hh, * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/ref_mean.cc, * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/ref_mean.hh, * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/save.cc, * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/save.hh, * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/seg.cc, * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/seg.hh, * milena/sandbox/lazzara/igr/gui/segmentation2dt/ui/crop_widget.ui, * milena/sandbox/lazzara/igr/gui/segmentation2dt/ui/edit_seg_widget.ui, * milena/sandbox/lazzara/igr/gui/segmentation2dt/ui/load_widget.ui, * milena/sandbox/lazzara/igr/gui/segmentation2dt/ui/main_window.ui, * milena/sandbox/lazzara/igr/gui/segmentation2dt/ui/mean_regions_widget.ui, * milena/sandbox/lazzara/igr/gui/segmentation2dt/ui/norm_smooth_widget.ui, * milena/sandbox/lazzara/igr/gui/segmentation2dt/ui/plot_widget.ui, * milena/sandbox/lazzara/igr/gui/segmentation2dt/ui/ref_mean_widget.ui, * milena/sandbox/lazzara/igr/gui/segmentation2dt/ui/save_widget.ui, * milena/sandbox/lazzara/igr/gui/segmentation2dt/ui/seg_widget.ui, * milena/sandbox/lazzara/igr/gui/shared/icons/Symbols-Delete-icon.png, * milena/sandbox/lazzara/igr/gui/shared/icons/accept-icon.png, * milena/sandbox/lazzara/igr/gui/shared/icons/close.gif, * milena/sandbox/lazzara/igr/gui/shared/icons/crop-icon.png, * milena/sandbox/lazzara/igr/gui/shared/icons/image-add-icon.png, * milena/sandbox/lazzara/igr/gui/shared/icons/image-edit-icon.png, * milena/sandbox/lazzara/igr/gui/shared/icons/image-multi-icon.png, * milena/sandbox/lazzara/igr/gui/shared/icons/image-next-icon.png, * milena/sandbox/lazzara/igr/gui/shared/icons/image-remove-icon.png, * milena/sandbox/lazzara/igr/gui/shared/icons/next-icon.png, * milena/sandbox/lazzara/igr/gui/shared/icons/page-down-icon.png, * milena/sandbox/lazzara/igr/gui/shared/icons/page-search-icon.png, * milena/sandbox/lazzara/igr/gui/shared/icons/search-add-icon.png, * milena/sandbox/lazzara/igr/gui/shared/icons/search-remove-icon.png, * milena/sandbox/lazzara/igr/gui/shared/include/find_color.hh, * milena/sandbox/lazzara/igr/gui/shared/include/function_means.hh, * milena/sandbox/lazzara/igr/gui/shared/include/io/magick.hh, * milena/sandbox/lazzara/igr/gui/shared/include/mean_function_per_region.hh, * milena/sandbox/lazzara/igr/gui/shared/include/mean_regions.hh, * milena/sandbox/lazzara/igr/gui/shared/include/normalization.hh, * milena/sandbox/lazzara/igr/gui/shared/include/time_segmentation.hh, * milena/sandbox/lazzara/igr/gui/shared/include/time_smooth_linear.hh, * milena/sandbox/lazzara/igr/gui/shared/include/time_smooth_median.hh, * milena/sandbox/lazzara/igr/gui/shared/include/time_smooth_morpho.hh, * milena/sandbox/lazzara/igr/gui/shared/shared.qrc, * milena/sandbox/lazzara/igr/gui/shared/src/color.hh, * milena/sandbox/lazzara/igr/gui/shared/src/igr_types.hh, * milena/sandbox/lazzara/igr/gui/shared/src/image_viewer.cc, * milena/sandbox/lazzara/igr/gui/shared/src/image_viewer.hh, * milena/sandbox/lazzara/igr/gui/shared/src/internal/interactive_scene.cc, * milena/sandbox/lazzara/igr/gui/shared/src/internal/interactive_scene.hh, * milena/sandbox/lazzara/igr/gui/shared/ui/image_viewer.ui, * milena/sandbox/lazzara/igr/gui/viewer/src/main.cc, * milena/sandbox/lazzara/igr/gui/viewer/src/main_window.cc, * milena/sandbox/lazzara/igr/gui/viewer/src/main_window.hh, * milena/sandbox/lazzara/igr/gui/viewer/src/mln_data.cc, * milena/sandbox/lazzara/igr/gui/viewer/src/mln_data.hh, * milena/sandbox/lazzara/igr/gui/viewer/ui/main_window.h, * milena/sandbox/lazzara/igr/gui/viewer/ui/main_window.ui, * milena/sandbox/lazzara/igr/gui/viewer/viewer.pro, * milena/sandbox/lazzara/igr/gui/viewer/viewer.sh: Move... * igr/anapath/anapath.pro, * igr/anapath/src/main.cc, * igr/anapath/src/main_window.cc, * igr/anapath/src/main_window.hh, * igr/anapath/src/mln_data.cc, * igr/anapath/src/mln_data.hh, * igr/anapath/src/mln_widgets.cc, * igr/anapath/src/tools/filter.cc, * igr/anapath/src/tools/filter.hh, * igr/anapath/src/tools/load.cc, * igr/anapath/src/tools/load.hh, * igr/anapath/src/tools/save.cc, * igr/anapath/src/tools/save.hh, * igr/anapath/ui/main_window.ui, * igr/segmentation/segmentation.pro, * igr/segmentation/segmentation.sh, * igr/segmentation/src/crop_widget.cc, * igr/segmentation/src/crop_widget.hh, * igr/segmentation/src/edit_seg_widget.cc, * igr/segmentation/src/edit_seg_widget.hh, * igr/segmentation/src/load_widget.cc, * igr/segmentation/src/load_widget.hh, * igr/segmentation/src/main.cc, * igr/segmentation/src/main_window.cc, * igr/segmentation/src/main_window.hh, * igr/segmentation/src/mln_data.cc, * igr/segmentation/src/mln_data.hh, * igr/segmentation/src/mln_widgets.cc, * igr/segmentation/src/save_widget.cc, * igr/segmentation/src/save_widget.hh, * igr/segmentation/src/seg_widget.cc, * igr/segmentation/src/seg_widget.hh, * igr/segmentation/src/task.hh, * igr/segmentation/src/task_handler.cc, * igr/segmentation/src/task_handler.hh, * igr/segmentation/src/task_handler.hxx, * igr/segmentation/src/task_widget.cc, * igr/segmentation/src/task_widget.hh, * igr/segmentation/src/tools/crop.cc, * igr/segmentation/src/tools/crop.hh, * igr/segmentation/src/tools/edit_seg.cc, * igr/segmentation/src/tools/edit_seg.hh, * igr/segmentation/src/tools/load.cc, * igr/segmentation/src/tools/load.hh, * igr/segmentation/src/tools/save.cc, * igr/segmentation/src/tools/save.hh, * igr/segmentation/src/tools/seg.cc, * igr/segmentation/src/tools/seg.hh, * igr/segmentation/ui/crop_widget.ui, * igr/segmentation/ui/edit_seg_widget.ui, * igr/segmentation/ui/load_widget.ui, * igr/segmentation/ui/main_window.ui, * igr/segmentation/ui/save_widget.ui, * igr/segmentation/ui/seg_widget.ui, * igr/segmentation2dt/segmentation2dt.pro, * igr/segmentation2dt/segmentation2dt.sh, * igr/segmentation2dt/src/crop_widget.cc, * igr/segmentation2dt/src/crop_widget.hh, * igr/segmentation2dt/src/load_widget.cc, * igr/segmentation2dt/src/load_widget.hh, * igr/segmentation2dt/src/main.cc, * igr/segmentation2dt/src/main_window.cc, * igr/segmentation2dt/src/main_window.hh, * igr/segmentation2dt/src/mean_regions_widget.cc, * igr/segmentation2dt/src/mean_regions_widget.hh, * igr/segmentation2dt/src/mln_data.cc, * igr/segmentation2dt/src/mln_data.hh, * igr/segmentation2dt/src/mln_widgets.cc, * igr/segmentation2dt/src/norm_smooth_widget.cc, * igr/segmentation2dt/src/norm_smooth_widget.hh, * igr/segmentation2dt/src/plot.cc, * igr/segmentation2dt/src/plot.hh, * igr/segmentation2dt/src/plot_widget.cc, * igr/segmentation2dt/src/plot_widget.hh, * igr/segmentation2dt/src/ref_mean_widget.cc, * igr/segmentation2dt/src/ref_mean_widget.hh, * igr/segmentation2dt/src/save_widget.cc, * igr/segmentation2dt/src/save_widget.hh, * igr/segmentation2dt/src/seg_widget.cc, * igr/segmentation2dt/src/seg_widget.hh, * igr/segmentation2dt/src/task.hh, * igr/segmentation2dt/src/task_handler.cc, * igr/segmentation2dt/src/task_handler.hh, * igr/segmentation2dt/src/task_handler.hxx, * igr/segmentation2dt/src/task_widget.cc, * igr/segmentation2dt/src/task_widget.hh, * igr/segmentation2dt/src/tools/crop.cc, * igr/segmentation2dt/src/tools/crop.hh, * igr/segmentation2dt/src/tools/load.cc, * igr/segmentation2dt/src/tools/load.hh, * igr/segmentation2dt/src/tools/mean_regions.cc, * igr/segmentation2dt/src/tools/mean_regions.hh, * igr/segmentation2dt/src/tools/norm_smooth.cc, * igr/segmentation2dt/src/tools/norm_smooth.hh, * igr/segmentation2dt/src/tools/ref_mean.cc, * igr/segmentation2dt/src/tools/ref_mean.hh, * igr/segmentation2dt/src/tools/save.cc, * igr/segmentation2dt/src/tools/save.hh, * igr/segmentation2dt/src/tools/seg.cc, * igr/segmentation2dt/src/tools/seg.hh, * igr/segmentation2dt/ui/crop_widget.ui, * igr/segmentation2dt/ui/edit_seg_widget.ui, * igr/segmentation2dt/ui/load_widget.ui, * igr/segmentation2dt/ui/main_window.ui, * igr/segmentation2dt/ui/mean_regions_widget.ui, * igr/segmentation2dt/ui/norm_smooth_widget.ui, * igr/segmentation2dt/ui/plot_widget.ui, * igr/segmentation2dt/ui/ref_mean_widget.ui, * igr/segmentation2dt/ui/save_widget.ui, * igr/segmentation2dt/ui/seg_widget.ui, * igr/shared/icons/Symbols-Delete-icon.png, * igr/shared/icons/accept-icon.png, * igr/shared/icons/close.gif, * igr/shared/icons/crop-icon.png, * igr/shared/icons/image-add-icon.png, * igr/shared/icons/image-edit-icon.png, * igr/shared/icons/image-multi-icon.png, * igr/shared/icons/image-next-icon.png, * igr/shared/icons/image-remove-icon.png, * igr/shared/icons/next-icon.png, * igr/shared/icons/page-down-icon.png, * igr/shared/icons/page-search-icon.png, * igr/shared/icons/search-add-icon.png, * igr/shared/icons/search-remove-icon.png, * igr/shared/include/find_color.hh, * igr/shared/include/function_means.hh, * igr/shared/include/io/magick.hh, * igr/shared/include/mean_function_per_region.hh, * igr/shared/include/mean_regions.hh, * igr/shared/include/normalization.hh, * igr/shared/include/time_segmentation.hh, * igr/shared/include/time_smooth_linear.hh, * igr/shared/include/time_smooth_median.hh, * igr/shared/include/time_smooth_morpho.hh, * igr/shared/shared.qrc, * igr/shared/src/color.hh, * igr/shared/src/igr_types.hh, * igr/shared/src/image_viewer.cc, * igr/shared/src/image_viewer.hh, * igr/shared/src/internal/interactive_scene.cc, * igr/shared/src/internal/interactive_scene.hh, * igr/shared/ui/image_viewer.ui, * igr/viewer/src/main.cc, * igr/viewer/src/main_window.cc, * igr/viewer/src/main_window.hh, * igr/viewer/src/mln_data.cc, * igr/viewer/src/mln_data.hh, * igr/viewer/ui/main_window.h, * igr/viewer/ui/main_window.ui, * igr/viewer/viewer.pro, * igr/viewer/viewer.sh: ... here. --- igr/ChangeLog | 317 ++++++++++++++++++++ .../lazzara/igr/gui => igr}/anapath/anapath.pro | 0 .../lazzara/igr/gui => igr}/anapath/src/main.cc | 0 .../igr/gui => igr}/anapath/src/main_window.cc | 0 .../igr/gui => igr}/anapath/src/main_window.hh | 0 .../igr/gui => igr}/anapath/src/mln_data.cc | 0 .../igr/gui => igr}/anapath/src/mln_data.hh | 0 .../igr/gui => igr}/anapath/src/mln_widgets.cc | 0 .../igr/gui => igr}/anapath/src/tools/filter.cc | 0 .../igr/gui => igr}/anapath/src/tools/filter.hh | 0 .../igr/gui => igr}/anapath/src/tools/load.cc | 0 .../igr/gui => igr}/anapath/src/tools/load.hh | 0 .../igr/gui => igr}/anapath/src/tools/save.cc | 0 .../igr/gui => igr}/anapath/src/tools/save.hh | 0 .../igr/gui => igr}/anapath/ui/main_window.ui | 0 .../igr/gui => igr}/segmentation/segmentation.pro | 0 .../igr/gui => igr}/segmentation/segmentation.sh | 0 .../gui => igr}/segmentation/src/crop_widget.cc | 0 .../gui => igr}/segmentation/src/crop_widget.hh | 0 .../segmentation/src/edit_seg_widget.cc | 0 .../segmentation/src/edit_seg_widget.hh | 0 .../gui => igr}/segmentation/src/load_widget.cc | 0 .../gui => igr}/segmentation/src/load_widget.hh | 0 .../igr/gui => igr}/segmentation/src/main.cc | 0 .../gui => igr}/segmentation/src/main_window.cc | 0 .../gui => igr}/segmentation/src/main_window.hh | 0 .../igr/gui => igr}/segmentation/src/mln_data.cc | 0 .../igr/gui => igr}/segmentation/src/mln_data.hh | 0 .../gui => igr}/segmentation/src/mln_widgets.cc | 0 .../gui => igr}/segmentation/src/save_widget.cc | 0 .../gui => igr}/segmentation/src/save_widget.hh | 0 .../igr/gui => igr}/segmentation/src/seg_widget.cc | 0 .../igr/gui => igr}/segmentation/src/seg_widget.hh | 0 .../igr/gui => igr}/segmentation/src/task.hh | 0 .../gui => igr}/segmentation/src/task_handler.cc | 0 .../gui => igr}/segmentation/src/task_handler.hh | 0 .../gui => igr}/segmentation/src/task_handler.hxx | 0 .../gui => igr}/segmentation/src/task_widget.cc | 0 .../gui => igr}/segmentation/src/task_widget.hh | 0 .../igr/gui => igr}/segmentation/src/tools/crop.cc | 0 .../igr/gui => igr}/segmentation/src/tools/crop.hh | 0 .../gui => igr}/segmentation/src/tools/edit_seg.cc | 0 .../gui => igr}/segmentation/src/tools/edit_seg.hh | 0 .../igr/gui => igr}/segmentation/src/tools/load.cc | 0 .../igr/gui => igr}/segmentation/src/tools/load.hh | 0 .../igr/gui => igr}/segmentation/src/tools/save.cc | 0 .../igr/gui => igr}/segmentation/src/tools/save.hh | 0 .../igr/gui => igr}/segmentation/src/tools/seg.cc | 0 .../igr/gui => igr}/segmentation/src/tools/seg.hh | 0 .../igr/gui => igr}/segmentation/ui/crop_widget.ui | 0 .../gui => igr}/segmentation/ui/edit_seg_widget.ui | 0 .../igr/gui => igr}/segmentation/ui/load_widget.ui | 0 .../igr/gui => igr}/segmentation/ui/main_window.ui | 0 .../igr/gui => igr}/segmentation/ui/save_widget.ui | 0 .../igr/gui => igr}/segmentation/ui/seg_widget.ui | 0 .../segmentation2dt/segmentation2dt.pro | 0 .../gui => igr}/segmentation2dt/segmentation2dt.sh | 0 .../gui => igr}/segmentation2dt/src/crop_widget.cc | 0 .../gui => igr}/segmentation2dt/src/crop_widget.hh | 0 .../gui => igr}/segmentation2dt/src/load_widget.cc | 0 .../gui => igr}/segmentation2dt/src/load_widget.hh | 0 .../igr/gui => igr}/segmentation2dt/src/main.cc | 0 .../gui => igr}/segmentation2dt/src/main_window.cc | 0 .../gui => igr}/segmentation2dt/src/main_window.hh | 0 .../segmentation2dt/src/mean_regions_widget.cc | 0 .../segmentation2dt/src/mean_regions_widget.hh | 0 .../gui => igr}/segmentation2dt/src/mln_data.cc | 0 .../gui => igr}/segmentation2dt/src/mln_data.hh | 0 .../gui => igr}/segmentation2dt/src/mln_widgets.cc | 0 .../segmentation2dt/src/norm_smooth_widget.cc | 0 .../segmentation2dt/src/norm_smooth_widget.hh | 0 .../igr/gui => igr}/segmentation2dt/src/plot.cc | 0 .../igr/gui => igr}/segmentation2dt/src/plot.hh | 0 .../gui => igr}/segmentation2dt/src/plot_widget.cc | 0 .../gui => igr}/segmentation2dt/src/plot_widget.hh | 0 .../segmentation2dt/src/ref_mean_widget.cc | 0 .../segmentation2dt/src/ref_mean_widget.hh | 0 .../gui => igr}/segmentation2dt/src/save_widget.cc | 0 .../gui => igr}/segmentation2dt/src/save_widget.hh | 0 .../gui => igr}/segmentation2dt/src/seg_widget.cc | 0 .../gui => igr}/segmentation2dt/src/seg_widget.hh | 0 .../igr/gui => igr}/segmentation2dt/src/task.hh | 0 .../segmentation2dt/src/task_handler.cc | 0 .../segmentation2dt/src/task_handler.hh | 0 .../segmentation2dt/src/task_handler.hxx | 0 .../gui => igr}/segmentation2dt/src/task_widget.cc | 0 .../gui => igr}/segmentation2dt/src/task_widget.hh | 0 .../gui => igr}/segmentation2dt/src/tools/crop.cc | 0 .../gui => igr}/segmentation2dt/src/tools/crop.hh | 0 .../gui => igr}/segmentation2dt/src/tools/load.cc | 0 .../gui => igr}/segmentation2dt/src/tools/load.hh | 0 .../segmentation2dt/src/tools/mean_regions.cc | 0 .../segmentation2dt/src/tools/mean_regions.hh | 0 .../segmentation2dt/src/tools/norm_smooth.cc | 0 .../segmentation2dt/src/tools/norm_smooth.hh | 0 .../segmentation2dt/src/tools/ref_mean.cc | 0 .../segmentation2dt/src/tools/ref_mean.hh | 0 .../gui => igr}/segmentation2dt/src/tools/save.cc | 0 .../gui => igr}/segmentation2dt/src/tools/save.hh | 0 .../gui => igr}/segmentation2dt/src/tools/seg.cc | 0 .../gui => igr}/segmentation2dt/src/tools/seg.hh | 0 .../gui => igr}/segmentation2dt/ui/crop_widget.ui | 0 .../segmentation2dt/ui/edit_seg_widget.ui | 0 .../gui => igr}/segmentation2dt/ui/load_widget.ui | 0 .../gui => igr}/segmentation2dt/ui/main_window.ui | 0 .../segmentation2dt/ui/mean_regions_widget.ui | 0 .../segmentation2dt/ui/norm_smooth_widget.ui | 0 .../gui => igr}/segmentation2dt/ui/plot_widget.ui | 0 .../segmentation2dt/ui/ref_mean_widget.ui | 0 .../gui => igr}/segmentation2dt/ui/save_widget.ui | 0 .../gui => igr}/segmentation2dt/ui/seg_widget.ui | 0 .../shared/icons/Symbols-Delete-icon.png | Bin 3704 -> 3704 bytes .../igr/gui => igr}/shared/icons/accept-icon.png | Bin 4858 -> 4858 bytes .../lazzara/igr/gui => igr}/shared/icons/close.gif | Bin 340 -> 340 bytes .../igr/gui => igr}/shared/icons/crop-icon.png | Bin 228 -> 228 bytes .../gui => igr}/shared/icons/image-add-icon.png | Bin 2917 -> 2917 bytes .../gui => igr}/shared/icons/image-edit-icon.png | Bin 2305 -> 2305 bytes .../gui => igr}/shared/icons/image-multi-icon.png | Bin 2033 -> 2033 bytes .../gui => igr}/shared/icons/image-next-icon.png | Bin 3008 -> 3008 bytes .../gui => igr}/shared/icons/image-remove-icon.png | Bin 3127 -> 3127 bytes .../igr/gui => igr}/shared/icons/next-icon.png | Bin 4611 -> 4611 bytes .../gui => igr}/shared/icons/page-down-icon.png | Bin 3450 -> 3450 bytes .../gui => igr}/shared/icons/page-search-icon.png | Bin 3101 -> 3101 bytes .../gui => igr}/shared/icons/search-add-icon.png | Bin 4274 -> 4274 bytes .../shared/icons/search-remove-icon.png | Bin 4196 -> 4196 bytes .../igr/gui => igr}/shared/include/find_color.hh | 0 .../gui => igr}/shared/include/function_means.hh | 0 .../igr/gui => igr}/shared/include/io/magick.hh | 0 .../shared/include/mean_function_per_region.hh | 0 .../igr/gui => igr}/shared/include/mean_regions.hh | 0 .../gui => igr}/shared/include/normalization.hh | 0 .../shared/include/time_segmentation.hh | 0 .../shared/include/time_smooth_linear.hh | 0 .../shared/include/time_smooth_median.hh | 0 .../shared/include/time_smooth_morpho.hh | 0 .../lazzara/igr/gui => igr}/shared/shared.qrc | 0 .../lazzara/igr/gui => igr}/shared/src/color.hh | 0 .../igr/gui => igr}/shared/src/igr_types.hh | 0 .../igr/gui => igr}/shared/src/image_viewer.cc | 0 .../igr/gui => igr}/shared/src/image_viewer.hh | 0 .../shared/src/internal/interactive_scene.cc | 0 .../shared/src/internal/interactive_scene.hh | 0 .../igr/gui => igr}/shared/ui/image_viewer.ui | 0 .../lazzara/igr/gui => igr}/viewer/src/main.cc | 0 .../igr/gui => igr}/viewer/src/main_window.cc | 0 .../igr/gui => igr}/viewer/src/main_window.hh | 0 .../lazzara/igr/gui => igr}/viewer/src/mln_data.cc | 0 .../lazzara/igr/gui => igr}/viewer/src/mln_data.hh | 0 .../igr/gui => igr}/viewer/ui/main_window.h | 0 .../igr/gui => igr}/viewer/ui/main_window.ui | 0 .../lazzara/igr/gui => igr}/viewer/viewer.pro | 0 .../lazzara/igr/gui => igr}/viewer/viewer.sh | 0 152 files changed, 317 insertions(+), 0 deletions(-) create mode 100644 igr/ChangeLog rename {milena/sandbox/lazzara/igr/gui => igr}/anapath/anapath.pro (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/anapath/src/main.cc (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/anapath/src/main_window.cc (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/anapath/src/main_window.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/anapath/src/mln_data.cc (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/anapath/src/mln_data.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/anapath/src/mln_widgets.cc (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/anapath/src/tools/filter.cc (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/anapath/src/tools/filter.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/anapath/src/tools/load.cc (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/anapath/src/tools/load.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/anapath/src/tools/save.cc (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/anapath/src/tools/save.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/anapath/ui/main_window.ui (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation/segmentation.pro (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation/segmentation.sh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation/src/crop_widget.cc (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation/src/crop_widget.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation/src/edit_seg_widget.cc (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation/src/edit_seg_widget.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation/src/load_widget.cc (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation/src/load_widget.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation/src/main.cc (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation/src/main_window.cc (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation/src/main_window.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation/src/mln_data.cc (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation/src/mln_data.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation/src/mln_widgets.cc (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation/src/save_widget.cc (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation/src/save_widget.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation/src/seg_widget.cc (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation/src/seg_widget.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation/src/task.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation/src/task_handler.cc (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation/src/task_handler.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation/src/task_handler.hxx (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation/src/task_widget.cc (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation/src/task_widget.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation/src/tools/crop.cc (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation/src/tools/crop.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation/src/tools/edit_seg.cc (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation/src/tools/edit_seg.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation/src/tools/load.cc (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation/src/tools/load.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation/src/tools/save.cc (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation/src/tools/save.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation/src/tools/seg.cc (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation/src/tools/seg.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation/ui/crop_widget.ui (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation/ui/edit_seg_widget.ui (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation/ui/load_widget.ui (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation/ui/main_window.ui (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation/ui/save_widget.ui (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation/ui/seg_widget.ui (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/segmentation2dt.pro (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/segmentation2dt.sh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/src/crop_widget.cc (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/src/crop_widget.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/src/load_widget.cc (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/src/load_widget.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/src/main.cc (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/src/main_window.cc (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/src/main_window.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/src/mean_regions_widget.cc (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/src/mean_regions_widget.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/src/mln_data.cc (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/src/mln_data.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/src/mln_widgets.cc (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/src/norm_smooth_widget.cc (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/src/norm_smooth_widget.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/src/plot.cc (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/src/plot.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/src/plot_widget.cc (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/src/plot_widget.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/src/ref_mean_widget.cc (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/src/ref_mean_widget.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/src/save_widget.cc (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/src/save_widget.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/src/seg_widget.cc (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/src/seg_widget.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/src/task.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/src/task_handler.cc (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/src/task_handler.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/src/task_handler.hxx (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/src/task_widget.cc (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/src/task_widget.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/src/tools/crop.cc (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/src/tools/crop.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/src/tools/load.cc (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/src/tools/load.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/src/tools/mean_regions.cc (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/src/tools/mean_regions.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/src/tools/norm_smooth.cc (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/src/tools/norm_smooth.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/src/tools/ref_mean.cc (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/src/tools/ref_mean.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/src/tools/save.cc (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/src/tools/save.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/src/tools/seg.cc (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/src/tools/seg.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/ui/crop_widget.ui (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/ui/edit_seg_widget.ui (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/ui/load_widget.ui (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/ui/main_window.ui (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/ui/mean_regions_widget.ui (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/ui/norm_smooth_widget.ui (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/ui/plot_widget.ui (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/ui/ref_mean_widget.ui (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/ui/save_widget.ui (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/segmentation2dt/ui/seg_widget.ui (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/shared/icons/Symbols-Delete-icon.png (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/shared/icons/accept-icon.png (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/shared/icons/close.gif (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/shared/icons/crop-icon.png (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/shared/icons/image-add-icon.png (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/shared/icons/image-edit-icon.png (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/shared/icons/image-multi-icon.png (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/shared/icons/image-next-icon.png (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/shared/icons/image-remove-icon.png (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/shared/icons/next-icon.png (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/shared/icons/page-down-icon.png (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/shared/icons/page-search-icon.png (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/shared/icons/search-add-icon.png (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/shared/icons/search-remove-icon.png (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/shared/include/find_color.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/shared/include/function_means.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/shared/include/io/magick.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/shared/include/mean_function_per_region.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/shared/include/mean_regions.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/shared/include/normalization.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/shared/include/time_segmentation.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/shared/include/time_smooth_linear.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/shared/include/time_smooth_median.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/shared/include/time_smooth_morpho.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/shared/shared.qrc (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/shared/src/color.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/shared/src/igr_types.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/shared/src/image_viewer.cc (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/shared/src/image_viewer.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/shared/src/internal/interactive_scene.cc (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/shared/src/internal/interactive_scene.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/shared/ui/image_viewer.ui (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/viewer/src/main.cc (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/viewer/src/main_window.cc (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/viewer/src/main_window.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/viewer/src/mln_data.cc (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/viewer/src/mln_data.hh (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/viewer/ui/main_window.h (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/viewer/ui/main_window.ui (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/viewer/viewer.pro (100%) rename {milena/sandbox/lazzara/igr/gui => igr}/viewer/viewer.sh (100%) diff --git a/igr/ChangeLog b/igr/ChangeLog new file mode 100644 index 0000000..5ea4590 --- /dev/null +++ b/igr/ChangeLog @@ -0,0 +1,317 @@ +2010-11-16 Guillaume Lazzara <z(a)lrde.epita.fr> + + Move IGR code from milena/sandbox to igr's private module. + + * milena/sandbox/lazzara/igr/gui/anapath/anapath.pro, + * milena/sandbox/lazzara/igr/gui/anapath/src/main.cc, + * milena/sandbox/lazzara/igr/gui/anapath/src/main_window.cc, + * milena/sandbox/lazzara/igr/gui/anapath/src/main_window.hh, + * milena/sandbox/lazzara/igr/gui/anapath/src/mln_data.cc, + * milena/sandbox/lazzara/igr/gui/anapath/src/mln_data.hh, + * milena/sandbox/lazzara/igr/gui/anapath/src/mln_widgets.cc, + * milena/sandbox/lazzara/igr/gui/anapath/src/tools/filter.cc, + * milena/sandbox/lazzara/igr/gui/anapath/src/tools/filter.hh, + * milena/sandbox/lazzara/igr/gui/anapath/src/tools/load.cc, + * milena/sandbox/lazzara/igr/gui/anapath/src/tools/load.hh, + * milena/sandbox/lazzara/igr/gui/anapath/src/tools/save.cc, + * milena/sandbox/lazzara/igr/gui/anapath/src/tools/save.hh, + * milena/sandbox/lazzara/igr/gui/anapath/ui/main_window.ui, + * milena/sandbox/lazzara/igr/gui/segmentation/segmentation.pro, + * milena/sandbox/lazzara/igr/gui/segmentation/segmentation.sh, + * milena/sandbox/lazzara/igr/gui/segmentation/src/crop_widget.cc, + * milena/sandbox/lazzara/igr/gui/segmentation/src/crop_widget.hh, + * milena/sandbox/lazzara/igr/gui/segmentation/src/edit_seg_widget.cc, + * milena/sandbox/lazzara/igr/gui/segmentation/src/edit_seg_widget.hh, + * milena/sandbox/lazzara/igr/gui/segmentation/src/load_widget.cc, + * milena/sandbox/lazzara/igr/gui/segmentation/src/load_widget.hh, + * milena/sandbox/lazzara/igr/gui/segmentation/src/main.cc, + * milena/sandbox/lazzara/igr/gui/segmentation/src/main_window.cc, + * milena/sandbox/lazzara/igr/gui/segmentation/src/main_window.hh, + * milena/sandbox/lazzara/igr/gui/segmentation/src/mln_data.cc, + * milena/sandbox/lazzara/igr/gui/segmentation/src/mln_data.hh, + * milena/sandbox/lazzara/igr/gui/segmentation/src/mln_widgets.cc, + * milena/sandbox/lazzara/igr/gui/segmentation/src/save_widget.cc, + * milena/sandbox/lazzara/igr/gui/segmentation/src/save_widget.hh, + * milena/sandbox/lazzara/igr/gui/segmentation/src/seg_widget.cc, + * milena/sandbox/lazzara/igr/gui/segmentation/src/seg_widget.hh, + * milena/sandbox/lazzara/igr/gui/segmentation/src/task.hh, + * milena/sandbox/lazzara/igr/gui/segmentation/src/task_handler.cc, + * milena/sandbox/lazzara/igr/gui/segmentation/src/task_handler.hh, + * milena/sandbox/lazzara/igr/gui/segmentation/src/task_handler.hxx, + * milena/sandbox/lazzara/igr/gui/segmentation/src/task_widget.cc, + * milena/sandbox/lazzara/igr/gui/segmentation/src/task_widget.hh, + * milena/sandbox/lazzara/igr/gui/segmentation/src/tools/crop.cc, + * milena/sandbox/lazzara/igr/gui/segmentation/src/tools/crop.hh, + * milena/sandbox/lazzara/igr/gui/segmentation/src/tools/edit_seg.cc, + * milena/sandbox/lazzara/igr/gui/segmentation/src/tools/edit_seg.hh, + * milena/sandbox/lazzara/igr/gui/segmentation/src/tools/load.cc, + * milena/sandbox/lazzara/igr/gui/segmentation/src/tools/load.hh, + * milena/sandbox/lazzara/igr/gui/segmentation/src/tools/save.cc, + * milena/sandbox/lazzara/igr/gui/segmentation/src/tools/save.hh, + * milena/sandbox/lazzara/igr/gui/segmentation/src/tools/seg.cc, + * milena/sandbox/lazzara/igr/gui/segmentation/src/tools/seg.hh, + * milena/sandbox/lazzara/igr/gui/segmentation/ui/crop_widget.ui, + * milena/sandbox/lazzara/igr/gui/segmentation/ui/edit_seg_widget.ui, + * milena/sandbox/lazzara/igr/gui/segmentation/ui/load_widget.ui, + * milena/sandbox/lazzara/igr/gui/segmentation/ui/main_window.ui, + * milena/sandbox/lazzara/igr/gui/segmentation/ui/save_widget.ui, + * milena/sandbox/lazzara/igr/gui/segmentation/ui/seg_widget.ui, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/segmentation2dt.pro, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/segmentation2dt.sh, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/crop_widget.cc, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/crop_widget.hh, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/load_widget.cc, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/load_widget.hh, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/main.cc, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/main_window.cc, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/main_window.hh, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/mean_regions_widget.cc, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/mean_regions_widget.hh, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/mln_data.cc, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/mln_data.hh, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/mln_widgets.cc, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/norm_smooth_widget.cc, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/norm_smooth_widget.hh, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/plot.cc, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/plot.hh, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/plot_widget.cc, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/plot_widget.hh, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/ref_mean_widget.cc, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/ref_mean_widget.hh, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/save_widget.cc, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/save_widget.hh, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/seg_widget.cc, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/seg_widget.hh, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/task.hh, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/task_handler.cc, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/task_handler.hh, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/task_handler.hxx, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/task_widget.cc, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/task_widget.hh, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/crop.cc, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/crop.hh, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/load.cc, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/load.hh, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/mean_regions.cc, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/mean_regions.hh, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/norm_smooth.cc, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/norm_smooth.hh, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/ref_mean.cc, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/ref_mean.hh, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/save.cc, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/save.hh, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/seg.cc, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/seg.hh, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/ui/crop_widget.ui, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/ui/edit_seg_widget.ui, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/ui/load_widget.ui, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/ui/main_window.ui, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/ui/mean_regions_widget.ui, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/ui/norm_smooth_widget.ui, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/ui/plot_widget.ui, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/ui/ref_mean_widget.ui, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/ui/save_widget.ui, + * milena/sandbox/lazzara/igr/gui/segmentation2dt/ui/seg_widget.ui, + * milena/sandbox/lazzara/igr/gui/shared/icons/Symbols-Delete-icon.png, + * milena/sandbox/lazzara/igr/gui/shared/icons/accept-icon.png, + * milena/sandbox/lazzara/igr/gui/shared/icons/close.gif, + * milena/sandbox/lazzara/igr/gui/shared/icons/crop-icon.png, + * milena/sandbox/lazzara/igr/gui/shared/icons/image-add-icon.png, + * milena/sandbox/lazzara/igr/gui/shared/icons/image-edit-icon.png, + * milena/sandbox/lazzara/igr/gui/shared/icons/image-multi-icon.png, + * milena/sandbox/lazzara/igr/gui/shared/icons/image-next-icon.png, + * milena/sandbox/lazzara/igr/gui/shared/icons/image-remove-icon.png, + * milena/sandbox/lazzara/igr/gui/shared/icons/next-icon.png, + * milena/sandbox/lazzara/igr/gui/shared/icons/page-down-icon.png, + * milena/sandbox/lazzara/igr/gui/shared/icons/page-search-icon.png, + * milena/sandbox/lazzara/igr/gui/shared/icons/search-add-icon.png, + * milena/sandbox/lazzara/igr/gui/shared/icons/search-remove-icon.png, + * milena/sandbox/lazzara/igr/gui/shared/include/find_color.hh, + * milena/sandbox/lazzara/igr/gui/shared/include/function_means.hh, + * milena/sandbox/lazzara/igr/gui/shared/include/io/magick.hh, + * milena/sandbox/lazzara/igr/gui/shared/include/mean_function_per_region.hh, + * milena/sandbox/lazzara/igr/gui/shared/include/mean_regions.hh, + * milena/sandbox/lazzara/igr/gui/shared/include/normalization.hh, + * milena/sandbox/lazzara/igr/gui/shared/include/time_segmentation.hh, + * milena/sandbox/lazzara/igr/gui/shared/include/time_smooth_linear.hh, + * milena/sandbox/lazzara/igr/gui/shared/include/time_smooth_median.hh, + * milena/sandbox/lazzara/igr/gui/shared/include/time_smooth_morpho.hh, + * milena/sandbox/lazzara/igr/gui/shared/shared.qrc, + * milena/sandbox/lazzara/igr/gui/shared/src/color.hh, + * milena/sandbox/lazzara/igr/gui/shared/src/igr_types.hh, + * milena/sandbox/lazzara/igr/gui/shared/src/image_viewer.cc, + * milena/sandbox/lazzara/igr/gui/shared/src/image_viewer.hh, + * milena/sandbox/lazzara/igr/gui/shared/src/internal/interactive_scene.cc, + * milena/sandbox/lazzara/igr/gui/shared/src/internal/interactive_scene.hh, + * milena/sandbox/lazzara/igr/gui/shared/ui/image_viewer.ui, + * milena/sandbox/lazzara/igr/gui/viewer/src/main.cc, + * milena/sandbox/lazzara/igr/gui/viewer/src/main_window.cc, + * milena/sandbox/lazzara/igr/gui/viewer/src/main_window.hh, + * milena/sandbox/lazzara/igr/gui/viewer/src/mln_data.cc, + * milena/sandbox/lazzara/igr/gui/viewer/src/mln_data.hh, + * milena/sandbox/lazzara/igr/gui/viewer/ui/main_window.h, + * milena/sandbox/lazzara/igr/gui/viewer/ui/main_window.ui, + * milena/sandbox/lazzara/igr/gui/viewer/viewer.pro, + * milena/sandbox/lazzara/igr/gui/viewer/viewer.sh: Move... + + * igr/anapath/anapath.pro, + * igr/anapath/src/main.cc, + * igr/anapath/src/main_window.cc, + * igr/anapath/src/main_window.hh, + * igr/anapath/src/mln_data.cc, + * igr/anapath/src/mln_data.hh, + * igr/anapath/src/mln_widgets.cc, + * igr/anapath/src/tools/filter.cc, + * igr/anapath/src/tools/filter.hh, + * igr/anapath/src/tools/load.cc, + * igr/anapath/src/tools/load.hh, + * igr/anapath/src/tools/save.cc, + * igr/anapath/src/tools/save.hh, + * igr/anapath/ui/main_window.ui, + * igr/segmentation/segmentation.pro, + * igr/segmentation/segmentation.sh, + * igr/segmentation/src/crop_widget.cc, + * igr/segmentation/src/crop_widget.hh, + * igr/segmentation/src/edit_seg_widget.cc, + * igr/segmentation/src/edit_seg_widget.hh, + * igr/segmentation/src/load_widget.cc, + * igr/segmentation/src/load_widget.hh, + * igr/segmentation/src/main.cc, + * igr/segmentation/src/main_window.cc, + * igr/segmentation/src/main_window.hh, + * igr/segmentation/src/mln_data.cc, + * igr/segmentation/src/mln_data.hh, + * igr/segmentation/src/mln_widgets.cc, + * igr/segmentation/src/save_widget.cc, + * igr/segmentation/src/save_widget.hh, + * igr/segmentation/src/seg_widget.cc, + * igr/segmentation/src/seg_widget.hh, + * igr/segmentation/src/task.hh, + * igr/segmentation/src/task_handler.cc, + * igr/segmentation/src/task_handler.hh, + * igr/segmentation/src/task_handler.hxx, + * igr/segmentation/src/task_widget.cc, + * igr/segmentation/src/task_widget.hh, + * igr/segmentation/src/tools/crop.cc, + * igr/segmentation/src/tools/crop.hh, + * igr/segmentation/src/tools/edit_seg.cc, + * igr/segmentation/src/tools/edit_seg.hh, + * igr/segmentation/src/tools/load.cc, + * igr/segmentation/src/tools/load.hh, + * igr/segmentation/src/tools/save.cc, + * igr/segmentation/src/tools/save.hh, + * igr/segmentation/src/tools/seg.cc, + * igr/segmentation/src/tools/seg.hh, + * igr/segmentation/ui/crop_widget.ui, + * igr/segmentation/ui/edit_seg_widget.ui, + * igr/segmentation/ui/load_widget.ui, + * igr/segmentation/ui/main_window.ui, + * igr/segmentation/ui/save_widget.ui, + * igr/segmentation/ui/seg_widget.ui, + * igr/segmentation2dt/segmentation2dt.pro, + * igr/segmentation2dt/segmentation2dt.sh, + * igr/segmentation2dt/src/crop_widget.cc, + * igr/segmentation2dt/src/crop_widget.hh, + * igr/segmentation2dt/src/load_widget.cc, + * igr/segmentation2dt/src/load_widget.hh, + * igr/segmentation2dt/src/main.cc, + * igr/segmentation2dt/src/main_window.cc, + * igr/segmentation2dt/src/main_window.hh, + * igr/segmentation2dt/src/mean_regions_widget.cc, + * igr/segmentation2dt/src/mean_regions_widget.hh, + * igr/segmentation2dt/src/mln_data.cc, + * igr/segmentation2dt/src/mln_data.hh, + * igr/segmentation2dt/src/mln_widgets.cc, + * igr/segmentation2dt/src/norm_smooth_widget.cc, + * igr/segmentation2dt/src/norm_smooth_widget.hh, + * igr/segmentation2dt/src/plot.cc, + * igr/segmentation2dt/src/plot.hh, + * igr/segmentation2dt/src/plot_widget.cc, + * igr/segmentation2dt/src/plot_widget.hh, + * igr/segmentation2dt/src/ref_mean_widget.cc, + * igr/segmentation2dt/src/ref_mean_widget.hh, + * igr/segmentation2dt/src/save_widget.cc, + * igr/segmentation2dt/src/save_widget.hh, + * igr/segmentation2dt/src/seg_widget.cc, + * igr/segmentation2dt/src/seg_widget.hh, + * igr/segmentation2dt/src/task.hh, + * igr/segmentation2dt/src/task_handler.cc, + * igr/segmentation2dt/src/task_handler.hh, + * igr/segmentation2dt/src/task_handler.hxx, + * igr/segmentation2dt/src/task_widget.cc, + * igr/segmentation2dt/src/task_widget.hh, + * igr/segmentation2dt/src/tools/crop.cc, + * igr/segmentation2dt/src/tools/crop.hh, + * igr/segmentation2dt/src/tools/load.cc, + * igr/segmentation2dt/src/tools/load.hh, + * igr/segmentation2dt/src/tools/mean_regions.cc, + * igr/segmentation2dt/src/tools/mean_regions.hh, + * igr/segmentation2dt/src/tools/norm_smooth.cc, + * igr/segmentation2dt/src/tools/norm_smooth.hh, + * igr/segmentation2dt/src/tools/ref_mean.cc, + * igr/segmentation2dt/src/tools/ref_mean.hh, + * igr/segmentation2dt/src/tools/save.cc, + * igr/segmentation2dt/src/tools/save.hh, + * igr/segmentation2dt/src/tools/seg.cc, + * igr/segmentation2dt/src/tools/seg.hh, + * igr/segmentation2dt/ui/crop_widget.ui, + * igr/segmentation2dt/ui/edit_seg_widget.ui, + * igr/segmentation2dt/ui/load_widget.ui, + * igr/segmentation2dt/ui/main_window.ui, + * igr/segmentation2dt/ui/mean_regions_widget.ui, + * igr/segmentation2dt/ui/norm_smooth_widget.ui, + * igr/segmentation2dt/ui/plot_widget.ui, + * igr/segmentation2dt/ui/ref_mean_widget.ui, + * igr/segmentation2dt/ui/save_widget.ui, + * igr/segmentation2dt/ui/seg_widget.ui, + * igr/shared/icons/Symbols-Delete-icon.png, + * igr/shared/icons/accept-icon.png, + * igr/shared/icons/close.gif, + * igr/shared/icons/crop-icon.png, + * igr/shared/icons/image-add-icon.png, + * igr/shared/icons/image-edit-icon.png, + * igr/shared/icons/image-multi-icon.png, + * igr/shared/icons/image-next-icon.png, + * igr/shared/icons/image-remove-icon.png, + * igr/shared/icons/next-icon.png, + * igr/shared/icons/page-down-icon.png, + * igr/shared/icons/page-search-icon.png, + * igr/shared/icons/search-add-icon.png, + * igr/shared/icons/search-remove-icon.png, + * igr/shared/include/find_color.hh, + * igr/shared/include/function_means.hh, + * igr/shared/include/io/magick.hh, + * igr/shared/include/mean_function_per_region.hh, + * igr/shared/include/mean_regions.hh, + * igr/shared/include/normalization.hh, + * igr/shared/include/time_segmentation.hh, + * igr/shared/include/time_smooth_linear.hh, + * igr/shared/include/time_smooth_median.hh, + * igr/shared/include/time_smooth_morpho.hh, + * igr/shared/shared.qrc, + * igr/shared/src/color.hh, + * igr/shared/src/igr_types.hh, + * igr/shared/src/image_viewer.cc, + * igr/shared/src/image_viewer.hh, + * igr/shared/src/internal/interactive_scene.cc, + * igr/shared/src/internal/interactive_scene.hh, + * igr/shared/ui/image_viewer.ui, + * igr/viewer/src/main.cc, + * igr/viewer/src/main_window.cc, + * igr/viewer/src/main_window.hh, + * igr/viewer/src/mln_data.cc, + * igr/viewer/src/mln_data.hh, + * igr/viewer/ui/main_window.h, + * igr/viewer/ui/main_window.ui, + * igr/viewer/viewer.pro, + * igr/viewer/viewer.sh: ... here. + + +$Rev$ +$Id$ +$Date$ + +Local Variables: +ispell-local-dictionary: "american" +coding: iso-latin-1 +End: diff --git a/milena/sandbox/lazzara/igr/gui/anapath/anapath.pro b/igr/anapath/anapath.pro similarity index 100% rename from milena/sandbox/lazzara/igr/gui/anapath/anapath.pro rename to igr/anapath/anapath.pro diff --git a/milena/sandbox/lazzara/igr/gui/anapath/src/main.cc b/igr/anapath/src/main.cc similarity index 100% rename from milena/sandbox/lazzara/igr/gui/anapath/src/main.cc rename to igr/anapath/src/main.cc diff --git a/milena/sandbox/lazzara/igr/gui/anapath/src/main_window.cc b/igr/anapath/src/main_window.cc similarity index 100% rename from milena/sandbox/lazzara/igr/gui/anapath/src/main_window.cc rename to igr/anapath/src/main_window.cc diff --git a/milena/sandbox/lazzara/igr/gui/anapath/src/main_window.hh b/igr/anapath/src/main_window.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/anapath/src/main_window.hh rename to igr/anapath/src/main_window.hh diff --git a/milena/sandbox/lazzara/igr/gui/anapath/src/mln_data.cc b/igr/anapath/src/mln_data.cc similarity index 100% rename from milena/sandbox/lazzara/igr/gui/anapath/src/mln_data.cc rename to igr/anapath/src/mln_data.cc diff --git a/milena/sandbox/lazzara/igr/gui/anapath/src/mln_data.hh b/igr/anapath/src/mln_data.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/anapath/src/mln_data.hh rename to igr/anapath/src/mln_data.hh diff --git a/milena/sandbox/lazzara/igr/gui/anapath/src/mln_widgets.cc b/igr/anapath/src/mln_widgets.cc similarity index 100% rename from milena/sandbox/lazzara/igr/gui/anapath/src/mln_widgets.cc rename to igr/anapath/src/mln_widgets.cc diff --git a/milena/sandbox/lazzara/igr/gui/anapath/src/tools/filter.cc b/igr/anapath/src/tools/filter.cc similarity index 100% rename from milena/sandbox/lazzara/igr/gui/anapath/src/tools/filter.cc rename to igr/anapath/src/tools/filter.cc diff --git a/milena/sandbox/lazzara/igr/gui/anapath/src/tools/filter.hh b/igr/anapath/src/tools/filter.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/anapath/src/tools/filter.hh rename to igr/anapath/src/tools/filter.hh diff --git a/milena/sandbox/lazzara/igr/gui/anapath/src/tools/load.cc b/igr/anapath/src/tools/load.cc similarity index 100% rename from milena/sandbox/lazzara/igr/gui/anapath/src/tools/load.cc rename to igr/anapath/src/tools/load.cc diff --git a/milena/sandbox/lazzara/igr/gui/anapath/src/tools/load.hh b/igr/anapath/src/tools/load.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/anapath/src/tools/load.hh rename to igr/anapath/src/tools/load.hh diff --git a/milena/sandbox/lazzara/igr/gui/anapath/src/tools/save.cc b/igr/anapath/src/tools/save.cc similarity index 100% rename from milena/sandbox/lazzara/igr/gui/anapath/src/tools/save.cc rename to igr/anapath/src/tools/save.cc diff --git a/milena/sandbox/lazzara/igr/gui/anapath/src/tools/save.hh b/igr/anapath/src/tools/save.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/anapath/src/tools/save.hh rename to igr/anapath/src/tools/save.hh diff --git a/milena/sandbox/lazzara/igr/gui/anapath/ui/main_window.ui b/igr/anapath/ui/main_window.ui similarity index 100% rename from milena/sandbox/lazzara/igr/gui/anapath/ui/main_window.ui rename to igr/anapath/ui/main_window.ui diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/segmentation.pro b/igr/segmentation/segmentation.pro similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation/segmentation.pro rename to igr/segmentation/segmentation.pro diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/segmentation.sh b/igr/segmentation/segmentation.sh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation/segmentation.sh rename to igr/segmentation/segmentation.sh diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/crop_widget.cc b/igr/segmentation/src/crop_widget.cc similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation/src/crop_widget.cc rename to igr/segmentation/src/crop_widget.cc diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/crop_widget.hh b/igr/segmentation/src/crop_widget.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation/src/crop_widget.hh rename to igr/segmentation/src/crop_widget.hh diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/edit_seg_widget.cc b/igr/segmentation/src/edit_seg_widget.cc similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation/src/edit_seg_widget.cc rename to igr/segmentation/src/edit_seg_widget.cc diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/edit_seg_widget.hh b/igr/segmentation/src/edit_seg_widget.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation/src/edit_seg_widget.hh rename to igr/segmentation/src/edit_seg_widget.hh diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/load_widget.cc b/igr/segmentation/src/load_widget.cc similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation/src/load_widget.cc rename to igr/segmentation/src/load_widget.cc diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/load_widget.hh b/igr/segmentation/src/load_widget.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation/src/load_widget.hh rename to igr/segmentation/src/load_widget.hh diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/main.cc b/igr/segmentation/src/main.cc similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation/src/main.cc rename to igr/segmentation/src/main.cc diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/main_window.cc b/igr/segmentation/src/main_window.cc similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation/src/main_window.cc rename to igr/segmentation/src/main_window.cc diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/main_window.hh b/igr/segmentation/src/main_window.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation/src/main_window.hh rename to igr/segmentation/src/main_window.hh diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/mln_data.cc b/igr/segmentation/src/mln_data.cc similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation/src/mln_data.cc rename to igr/segmentation/src/mln_data.cc diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/mln_data.hh b/igr/segmentation/src/mln_data.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation/src/mln_data.hh rename to igr/segmentation/src/mln_data.hh diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/mln_widgets.cc b/igr/segmentation/src/mln_widgets.cc similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation/src/mln_widgets.cc rename to igr/segmentation/src/mln_widgets.cc diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/save_widget.cc b/igr/segmentation/src/save_widget.cc similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation/src/save_widget.cc rename to igr/segmentation/src/save_widget.cc diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/save_widget.hh b/igr/segmentation/src/save_widget.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation/src/save_widget.hh rename to igr/segmentation/src/save_widget.hh diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/seg_widget.cc b/igr/segmentation/src/seg_widget.cc similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation/src/seg_widget.cc rename to igr/segmentation/src/seg_widget.cc diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/seg_widget.hh b/igr/segmentation/src/seg_widget.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation/src/seg_widget.hh rename to igr/segmentation/src/seg_widget.hh diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/task.hh b/igr/segmentation/src/task.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation/src/task.hh rename to igr/segmentation/src/task.hh diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/task_handler.cc b/igr/segmentation/src/task_handler.cc similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation/src/task_handler.cc rename to igr/segmentation/src/task_handler.cc diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/task_handler.hh b/igr/segmentation/src/task_handler.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation/src/task_handler.hh rename to igr/segmentation/src/task_handler.hh diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/task_handler.hxx b/igr/segmentation/src/task_handler.hxx similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation/src/task_handler.hxx rename to igr/segmentation/src/task_handler.hxx diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/task_widget.cc b/igr/segmentation/src/task_widget.cc similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation/src/task_widget.cc rename to igr/segmentation/src/task_widget.cc diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/task_widget.hh b/igr/segmentation/src/task_widget.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation/src/task_widget.hh rename to igr/segmentation/src/task_widget.hh diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/tools/crop.cc b/igr/segmentation/src/tools/crop.cc similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation/src/tools/crop.cc rename to igr/segmentation/src/tools/crop.cc diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/tools/crop.hh b/igr/segmentation/src/tools/crop.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation/src/tools/crop.hh rename to igr/segmentation/src/tools/crop.hh diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/tools/edit_seg.cc b/igr/segmentation/src/tools/edit_seg.cc similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation/src/tools/edit_seg.cc rename to igr/segmentation/src/tools/edit_seg.cc diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/tools/edit_seg.hh b/igr/segmentation/src/tools/edit_seg.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation/src/tools/edit_seg.hh rename to igr/segmentation/src/tools/edit_seg.hh diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/tools/load.cc b/igr/segmentation/src/tools/load.cc similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation/src/tools/load.cc rename to igr/segmentation/src/tools/load.cc diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/tools/load.hh b/igr/segmentation/src/tools/load.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation/src/tools/load.hh rename to igr/segmentation/src/tools/load.hh diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/tools/save.cc b/igr/segmentation/src/tools/save.cc similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation/src/tools/save.cc rename to igr/segmentation/src/tools/save.cc diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/tools/save.hh b/igr/segmentation/src/tools/save.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation/src/tools/save.hh rename to igr/segmentation/src/tools/save.hh diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/tools/seg.cc b/igr/segmentation/src/tools/seg.cc similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation/src/tools/seg.cc rename to igr/segmentation/src/tools/seg.cc diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/tools/seg.hh b/igr/segmentation/src/tools/seg.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation/src/tools/seg.hh rename to igr/segmentation/src/tools/seg.hh diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/ui/crop_widget.ui b/igr/segmentation/ui/crop_widget.ui similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation/ui/crop_widget.ui rename to igr/segmentation/ui/crop_widget.ui diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/ui/edit_seg_widget.ui b/igr/segmentation/ui/edit_seg_widget.ui similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation/ui/edit_seg_widget.ui rename to igr/segmentation/ui/edit_seg_widget.ui diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/ui/load_widget.ui b/igr/segmentation/ui/load_widget.ui similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation/ui/load_widget.ui rename to igr/segmentation/ui/load_widget.ui diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/ui/main_window.ui b/igr/segmentation/ui/main_window.ui similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation/ui/main_window.ui rename to igr/segmentation/ui/main_window.ui diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/ui/save_widget.ui b/igr/segmentation/ui/save_widget.ui similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation/ui/save_widget.ui rename to igr/segmentation/ui/save_widget.ui diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/ui/seg_widget.ui b/igr/segmentation/ui/seg_widget.ui similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation/ui/seg_widget.ui rename to igr/segmentation/ui/seg_widget.ui diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/segmentation2dt.pro b/igr/segmentation2dt/segmentation2dt.pro similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/segmentation2dt.pro rename to igr/segmentation2dt/segmentation2dt.pro diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/segmentation2dt.sh b/igr/segmentation2dt/segmentation2dt.sh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/segmentation2dt.sh rename to igr/segmentation2dt/segmentation2dt.sh diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/crop_widget.cc b/igr/segmentation2dt/src/crop_widget.cc similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/src/crop_widget.cc rename to igr/segmentation2dt/src/crop_widget.cc diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/crop_widget.hh b/igr/segmentation2dt/src/crop_widget.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/src/crop_widget.hh rename to igr/segmentation2dt/src/crop_widget.hh diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/load_widget.cc b/igr/segmentation2dt/src/load_widget.cc similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/src/load_widget.cc rename to igr/segmentation2dt/src/load_widget.cc diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/load_widget.hh b/igr/segmentation2dt/src/load_widget.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/src/load_widget.hh rename to igr/segmentation2dt/src/load_widget.hh diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/main.cc b/igr/segmentation2dt/src/main.cc similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/src/main.cc rename to igr/segmentation2dt/src/main.cc diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/main_window.cc b/igr/segmentation2dt/src/main_window.cc similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/src/main_window.cc rename to igr/segmentation2dt/src/main_window.cc diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/main_window.hh b/igr/segmentation2dt/src/main_window.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/src/main_window.hh rename to igr/segmentation2dt/src/main_window.hh diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/mean_regions_widget.cc b/igr/segmentation2dt/src/mean_regions_widget.cc similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/src/mean_regions_widget.cc rename to igr/segmentation2dt/src/mean_regions_widget.cc diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/mean_regions_widget.hh b/igr/segmentation2dt/src/mean_regions_widget.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/src/mean_regions_widget.hh rename to igr/segmentation2dt/src/mean_regions_widget.hh diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/mln_data.cc b/igr/segmentation2dt/src/mln_data.cc similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/src/mln_data.cc rename to igr/segmentation2dt/src/mln_data.cc diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/mln_data.hh b/igr/segmentation2dt/src/mln_data.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/src/mln_data.hh rename to igr/segmentation2dt/src/mln_data.hh diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/mln_widgets.cc b/igr/segmentation2dt/src/mln_widgets.cc similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/src/mln_widgets.cc rename to igr/segmentation2dt/src/mln_widgets.cc diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/norm_smooth_widget.cc b/igr/segmentation2dt/src/norm_smooth_widget.cc similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/src/norm_smooth_widget.cc rename to igr/segmentation2dt/src/norm_smooth_widget.cc diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/norm_smooth_widget.hh b/igr/segmentation2dt/src/norm_smooth_widget.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/src/norm_smooth_widget.hh rename to igr/segmentation2dt/src/norm_smooth_widget.hh diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/plot.cc b/igr/segmentation2dt/src/plot.cc similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/src/plot.cc rename to igr/segmentation2dt/src/plot.cc diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/plot.hh b/igr/segmentation2dt/src/plot.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/src/plot.hh rename to igr/segmentation2dt/src/plot.hh diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/plot_widget.cc b/igr/segmentation2dt/src/plot_widget.cc similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/src/plot_widget.cc rename to igr/segmentation2dt/src/plot_widget.cc diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/plot_widget.hh b/igr/segmentation2dt/src/plot_widget.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/src/plot_widget.hh rename to igr/segmentation2dt/src/plot_widget.hh diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/ref_mean_widget.cc b/igr/segmentation2dt/src/ref_mean_widget.cc similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/src/ref_mean_widget.cc rename to igr/segmentation2dt/src/ref_mean_widget.cc diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/ref_mean_widget.hh b/igr/segmentation2dt/src/ref_mean_widget.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/src/ref_mean_widget.hh rename to igr/segmentation2dt/src/ref_mean_widget.hh diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/save_widget.cc b/igr/segmentation2dt/src/save_widget.cc similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/src/save_widget.cc rename to igr/segmentation2dt/src/save_widget.cc diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/save_widget.hh b/igr/segmentation2dt/src/save_widget.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/src/save_widget.hh rename to igr/segmentation2dt/src/save_widget.hh diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/seg_widget.cc b/igr/segmentation2dt/src/seg_widget.cc similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/src/seg_widget.cc rename to igr/segmentation2dt/src/seg_widget.cc diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/seg_widget.hh b/igr/segmentation2dt/src/seg_widget.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/src/seg_widget.hh rename to igr/segmentation2dt/src/seg_widget.hh diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/task.hh b/igr/segmentation2dt/src/task.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/src/task.hh rename to igr/segmentation2dt/src/task.hh diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/task_handler.cc b/igr/segmentation2dt/src/task_handler.cc similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/src/task_handler.cc rename to igr/segmentation2dt/src/task_handler.cc diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/task_handler.hh b/igr/segmentation2dt/src/task_handler.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/src/task_handler.hh rename to igr/segmentation2dt/src/task_handler.hh diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/task_handler.hxx b/igr/segmentation2dt/src/task_handler.hxx similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/src/task_handler.hxx rename to igr/segmentation2dt/src/task_handler.hxx diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/task_widget.cc b/igr/segmentation2dt/src/task_widget.cc similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/src/task_widget.cc rename to igr/segmentation2dt/src/task_widget.cc diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/task_widget.hh b/igr/segmentation2dt/src/task_widget.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/src/task_widget.hh rename to igr/segmentation2dt/src/task_widget.hh diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/crop.cc b/igr/segmentation2dt/src/tools/crop.cc similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/crop.cc rename to igr/segmentation2dt/src/tools/crop.cc diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/crop.hh b/igr/segmentation2dt/src/tools/crop.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/crop.hh rename to igr/segmentation2dt/src/tools/crop.hh diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/load.cc b/igr/segmentation2dt/src/tools/load.cc similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/load.cc rename to igr/segmentation2dt/src/tools/load.cc diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/load.hh b/igr/segmentation2dt/src/tools/load.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/load.hh rename to igr/segmentation2dt/src/tools/load.hh diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/mean_regions.cc b/igr/segmentation2dt/src/tools/mean_regions.cc similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/mean_regions.cc rename to igr/segmentation2dt/src/tools/mean_regions.cc diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/mean_regions.hh b/igr/segmentation2dt/src/tools/mean_regions.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/mean_regions.hh rename to igr/segmentation2dt/src/tools/mean_regions.hh diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/norm_smooth.cc b/igr/segmentation2dt/src/tools/norm_smooth.cc similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/norm_smooth.cc rename to igr/segmentation2dt/src/tools/norm_smooth.cc diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/norm_smooth.hh b/igr/segmentation2dt/src/tools/norm_smooth.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/norm_smooth.hh rename to igr/segmentation2dt/src/tools/norm_smooth.hh diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/ref_mean.cc b/igr/segmentation2dt/src/tools/ref_mean.cc similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/ref_mean.cc rename to igr/segmentation2dt/src/tools/ref_mean.cc diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/ref_mean.hh b/igr/segmentation2dt/src/tools/ref_mean.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/ref_mean.hh rename to igr/segmentation2dt/src/tools/ref_mean.hh diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/save.cc b/igr/segmentation2dt/src/tools/save.cc similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/save.cc rename to igr/segmentation2dt/src/tools/save.cc diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/save.hh b/igr/segmentation2dt/src/tools/save.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/save.hh rename to igr/segmentation2dt/src/tools/save.hh diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/seg.cc b/igr/segmentation2dt/src/tools/seg.cc similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/seg.cc rename to igr/segmentation2dt/src/tools/seg.cc diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/seg.hh b/igr/segmentation2dt/src/tools/seg.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/seg.hh rename to igr/segmentation2dt/src/tools/seg.hh diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/ui/crop_widget.ui b/igr/segmentation2dt/ui/crop_widget.ui similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/ui/crop_widget.ui rename to igr/segmentation2dt/ui/crop_widget.ui diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/ui/edit_seg_widget.ui b/igr/segmentation2dt/ui/edit_seg_widget.ui similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/ui/edit_seg_widget.ui rename to igr/segmentation2dt/ui/edit_seg_widget.ui diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/ui/load_widget.ui b/igr/segmentation2dt/ui/load_widget.ui similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/ui/load_widget.ui rename to igr/segmentation2dt/ui/load_widget.ui diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/ui/main_window.ui b/igr/segmentation2dt/ui/main_window.ui similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/ui/main_window.ui rename to igr/segmentation2dt/ui/main_window.ui diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/ui/mean_regions_widget.ui b/igr/segmentation2dt/ui/mean_regions_widget.ui similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/ui/mean_regions_widget.ui rename to igr/segmentation2dt/ui/mean_regions_widget.ui diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/ui/norm_smooth_widget.ui b/igr/segmentation2dt/ui/norm_smooth_widget.ui similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/ui/norm_smooth_widget.ui rename to igr/segmentation2dt/ui/norm_smooth_widget.ui diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/ui/plot_widget.ui b/igr/segmentation2dt/ui/plot_widget.ui similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/ui/plot_widget.ui rename to igr/segmentation2dt/ui/plot_widget.ui diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/ui/ref_mean_widget.ui b/igr/segmentation2dt/ui/ref_mean_widget.ui similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/ui/ref_mean_widget.ui rename to igr/segmentation2dt/ui/ref_mean_widget.ui diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/ui/save_widget.ui b/igr/segmentation2dt/ui/save_widget.ui similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/ui/save_widget.ui rename to igr/segmentation2dt/ui/save_widget.ui diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/ui/seg_widget.ui b/igr/segmentation2dt/ui/seg_widget.ui similarity index 100% rename from milena/sandbox/lazzara/igr/gui/segmentation2dt/ui/seg_widget.ui rename to igr/segmentation2dt/ui/seg_widget.ui diff --git a/milena/sandbox/lazzara/igr/gui/shared/icons/Symbols-Delete-icon.png b/igr/shared/icons/Symbols-Delete-icon.png similarity index 100% rename from milena/sandbox/lazzara/igr/gui/shared/icons/Symbols-Delete-icon.png rename to igr/shared/icons/Symbols-Delete-icon.png diff --git a/milena/sandbox/lazzara/igr/gui/shared/icons/accept-icon.png b/igr/shared/icons/accept-icon.png similarity index 100% rename from milena/sandbox/lazzara/igr/gui/shared/icons/accept-icon.png rename to igr/shared/icons/accept-icon.png diff --git a/milena/sandbox/lazzara/igr/gui/shared/icons/close.gif b/igr/shared/icons/close.gif similarity index 100% rename from milena/sandbox/lazzara/igr/gui/shared/icons/close.gif rename to igr/shared/icons/close.gif diff --git a/milena/sandbox/lazzara/igr/gui/shared/icons/crop-icon.png b/igr/shared/icons/crop-icon.png similarity index 100% rename from milena/sandbox/lazzara/igr/gui/shared/icons/crop-icon.png rename to igr/shared/icons/crop-icon.png diff --git a/milena/sandbox/lazzara/igr/gui/shared/icons/image-add-icon.png b/igr/shared/icons/image-add-icon.png similarity index 100% rename from milena/sandbox/lazzara/igr/gui/shared/icons/image-add-icon.png rename to igr/shared/icons/image-add-icon.png diff --git a/milena/sandbox/lazzara/igr/gui/shared/icons/image-edit-icon.png b/igr/shared/icons/image-edit-icon.png similarity index 100% rename from milena/sandbox/lazzara/igr/gui/shared/icons/image-edit-icon.png rename to igr/shared/icons/image-edit-icon.png diff --git a/milena/sandbox/lazzara/igr/gui/shared/icons/image-multi-icon.png b/igr/shared/icons/image-multi-icon.png similarity index 100% rename from milena/sandbox/lazzara/igr/gui/shared/icons/image-multi-icon.png rename to igr/shared/icons/image-multi-icon.png diff --git a/milena/sandbox/lazzara/igr/gui/shared/icons/image-next-icon.png b/igr/shared/icons/image-next-icon.png similarity index 100% rename from milena/sandbox/lazzara/igr/gui/shared/icons/image-next-icon.png rename to igr/shared/icons/image-next-icon.png diff --git a/milena/sandbox/lazzara/igr/gui/shared/icons/image-remove-icon.png b/igr/shared/icons/image-remove-icon.png similarity index 100% rename from milena/sandbox/lazzara/igr/gui/shared/icons/image-remove-icon.png rename to igr/shared/icons/image-remove-icon.png diff --git a/milena/sandbox/lazzara/igr/gui/shared/icons/next-icon.png b/igr/shared/icons/next-icon.png similarity index 100% rename from milena/sandbox/lazzara/igr/gui/shared/icons/next-icon.png rename to igr/shared/icons/next-icon.png diff --git a/milena/sandbox/lazzara/igr/gui/shared/icons/page-down-icon.png b/igr/shared/icons/page-down-icon.png similarity index 100% rename from milena/sandbox/lazzara/igr/gui/shared/icons/page-down-icon.png rename to igr/shared/icons/page-down-icon.png diff --git a/milena/sandbox/lazzara/igr/gui/shared/icons/page-search-icon.png b/igr/shared/icons/page-search-icon.png similarity index 100% rename from milena/sandbox/lazzara/igr/gui/shared/icons/page-search-icon.png rename to igr/shared/icons/page-search-icon.png diff --git a/milena/sandbox/lazzara/igr/gui/shared/icons/search-add-icon.png b/igr/shared/icons/search-add-icon.png similarity index 100% rename from milena/sandbox/lazzara/igr/gui/shared/icons/search-add-icon.png rename to igr/shared/icons/search-add-icon.png diff --git a/milena/sandbox/lazzara/igr/gui/shared/icons/search-remove-icon.png b/igr/shared/icons/search-remove-icon.png similarity index 100% rename from milena/sandbox/lazzara/igr/gui/shared/icons/search-remove-icon.png rename to igr/shared/icons/search-remove-icon.png diff --git a/milena/sandbox/lazzara/igr/gui/shared/include/find_color.hh b/igr/shared/include/find_color.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/shared/include/find_color.hh rename to igr/shared/include/find_color.hh diff --git a/milena/sandbox/lazzara/igr/gui/shared/include/function_means.hh b/igr/shared/include/function_means.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/shared/include/function_means.hh rename to igr/shared/include/function_means.hh diff --git a/milena/sandbox/lazzara/igr/gui/shared/include/io/magick.hh b/igr/shared/include/io/magick.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/shared/include/io/magick.hh rename to igr/shared/include/io/magick.hh diff --git a/milena/sandbox/lazzara/igr/gui/shared/include/mean_function_per_region.hh b/igr/shared/include/mean_function_per_region.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/shared/include/mean_function_per_region.hh rename to igr/shared/include/mean_function_per_region.hh diff --git a/milena/sandbox/lazzara/igr/gui/shared/include/mean_regions.hh b/igr/shared/include/mean_regions.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/shared/include/mean_regions.hh rename to igr/shared/include/mean_regions.hh diff --git a/milena/sandbox/lazzara/igr/gui/shared/include/normalization.hh b/igr/shared/include/normalization.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/shared/include/normalization.hh rename to igr/shared/include/normalization.hh diff --git a/milena/sandbox/lazzara/igr/gui/shared/include/time_segmentation.hh b/igr/shared/include/time_segmentation.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/shared/include/time_segmentation.hh rename to igr/shared/include/time_segmentation.hh diff --git a/milena/sandbox/lazzara/igr/gui/shared/include/time_smooth_linear.hh b/igr/shared/include/time_smooth_linear.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/shared/include/time_smooth_linear.hh rename to igr/shared/include/time_smooth_linear.hh diff --git a/milena/sandbox/lazzara/igr/gui/shared/include/time_smooth_median.hh b/igr/shared/include/time_smooth_median.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/shared/include/time_smooth_median.hh rename to igr/shared/include/time_smooth_median.hh diff --git a/milena/sandbox/lazzara/igr/gui/shared/include/time_smooth_morpho.hh b/igr/shared/include/time_smooth_morpho.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/shared/include/time_smooth_morpho.hh rename to igr/shared/include/time_smooth_morpho.hh diff --git a/milena/sandbox/lazzara/igr/gui/shared/shared.qrc b/igr/shared/shared.qrc similarity index 100% rename from milena/sandbox/lazzara/igr/gui/shared/shared.qrc rename to igr/shared/shared.qrc diff --git a/milena/sandbox/lazzara/igr/gui/shared/src/color.hh b/igr/shared/src/color.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/shared/src/color.hh rename to igr/shared/src/color.hh diff --git a/milena/sandbox/lazzara/igr/gui/shared/src/igr_types.hh b/igr/shared/src/igr_types.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/shared/src/igr_types.hh rename to igr/shared/src/igr_types.hh diff --git a/milena/sandbox/lazzara/igr/gui/shared/src/image_viewer.cc b/igr/shared/src/image_viewer.cc similarity index 100% rename from milena/sandbox/lazzara/igr/gui/shared/src/image_viewer.cc rename to igr/shared/src/image_viewer.cc diff --git a/milena/sandbox/lazzara/igr/gui/shared/src/image_viewer.hh b/igr/shared/src/image_viewer.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/shared/src/image_viewer.hh rename to igr/shared/src/image_viewer.hh diff --git a/milena/sandbox/lazzara/igr/gui/shared/src/internal/interactive_scene.cc b/igr/shared/src/internal/interactive_scene.cc similarity index 100% rename from milena/sandbox/lazzara/igr/gui/shared/src/internal/interactive_scene.cc rename to igr/shared/src/internal/interactive_scene.cc diff --git a/milena/sandbox/lazzara/igr/gui/shared/src/internal/interactive_scene.hh b/igr/shared/src/internal/interactive_scene.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/shared/src/internal/interactive_scene.hh rename to igr/shared/src/internal/interactive_scene.hh diff --git a/milena/sandbox/lazzara/igr/gui/shared/ui/image_viewer.ui b/igr/shared/ui/image_viewer.ui similarity index 100% rename from milena/sandbox/lazzara/igr/gui/shared/ui/image_viewer.ui rename to igr/shared/ui/image_viewer.ui diff --git a/milena/sandbox/lazzara/igr/gui/viewer/src/main.cc b/igr/viewer/src/main.cc similarity index 100% rename from milena/sandbox/lazzara/igr/gui/viewer/src/main.cc rename to igr/viewer/src/main.cc diff --git a/milena/sandbox/lazzara/igr/gui/viewer/src/main_window.cc b/igr/viewer/src/main_window.cc similarity index 100% rename from milena/sandbox/lazzara/igr/gui/viewer/src/main_window.cc rename to igr/viewer/src/main_window.cc diff --git a/milena/sandbox/lazzara/igr/gui/viewer/src/main_window.hh b/igr/viewer/src/main_window.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/viewer/src/main_window.hh rename to igr/viewer/src/main_window.hh diff --git a/milena/sandbox/lazzara/igr/gui/viewer/src/mln_data.cc b/igr/viewer/src/mln_data.cc similarity index 100% rename from milena/sandbox/lazzara/igr/gui/viewer/src/mln_data.cc rename to igr/viewer/src/mln_data.cc diff --git a/milena/sandbox/lazzara/igr/gui/viewer/src/mln_data.hh b/igr/viewer/src/mln_data.hh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/viewer/src/mln_data.hh rename to igr/viewer/src/mln_data.hh diff --git a/milena/sandbox/lazzara/igr/gui/viewer/ui/main_window.h b/igr/viewer/ui/main_window.h similarity index 100% rename from milena/sandbox/lazzara/igr/gui/viewer/ui/main_window.h rename to igr/viewer/ui/main_window.h diff --git a/milena/sandbox/lazzara/igr/gui/viewer/ui/main_window.ui b/igr/viewer/ui/main_window.ui similarity index 100% rename from milena/sandbox/lazzara/igr/gui/viewer/ui/main_window.ui rename to igr/viewer/ui/main_window.ui diff --git a/milena/sandbox/lazzara/igr/gui/viewer/viewer.pro b/igr/viewer/viewer.pro similarity index 100% rename from milena/sandbox/lazzara/igr/gui/viewer/viewer.pro rename to igr/viewer/viewer.pro diff --git a/milena/sandbox/lazzara/igr/gui/viewer/viewer.sh b/igr/viewer/viewer.sh similarity index 100% rename from milena/sandbox/lazzara/igr/gui/viewer/viewer.sh rename to igr/viewer/viewer.sh -- 1.5.6.5

13 years, 9 months

last-svn-commit-701-g722f33d Update build system to use MLN_WO_GLOBAL_VARS.

by Guillaume Lazzara

* anapath/anapath.pro, * anapath/src/main.cc, * anapath/src/mln_data.hh, * anapath/src/mln_widgets.cc, * shared/include/io/magick.hh: Make these files compile with MLN_WO_GLOBAL_VARS set. --- igr/ChangeLog | 11 +++++++++++ igr/anapath/anapath.pro | 28 ++++++++++++++++++++++++---- igr/anapath/src/main.cc | 4 +++- igr/anapath/src/mln_data.hh | 6 +----- igr/anapath/src/mln_widgets.cc | 13 ------------- igr/shared/include/io/magick.hh | 3 +++ 6 files changed, 42 insertions(+), 23 deletions(-) delete mode 100644 igr/anapath/src/mln_widgets.cc diff --git a/igr/ChangeLog b/igr/ChangeLog index 5ea4590..9298ac3 100644 --- a/igr/ChangeLog +++ b/igr/ChangeLog @@ -1,5 +1,16 @@ 2010-11-16 Guillaume Lazzara <z(a)lrde.epita.fr> + Update build system to use MLN_WO_GLOBAL_VARS. + + * anapath/anapath.pro, + * anapath/src/main.cc, + * anapath/src/mln_data.hh, + * anapath/src/mln_widgets.cc, + * shared/include/io/magick.hh: Make these files compile with + MLN_WO_GLOBAL_VARS set. + +2010-11-16 Guillaume Lazzara <z(a)lrde.epita.fr> + Move IGR code from milena/sandbox to igr's private module. * milena/sandbox/lazzara/igr/gui/anapath/anapath.pro, diff --git a/igr/anapath/anapath.pro b/igr/anapath/anapath.pro index 19afbd4..a946d99 100644 --- a/igr/anapath/anapath.pro +++ b/igr/anapath/anapath.pro @@ -9,13 +9,33 @@ INCLUDEPATH += . src $(PWD)/.. $(PWD)/../shared $(OLN)/milena LIBS += `Magick++-config --ldflags --libs` -DEFINES = NDEBUG +DEFINES = NDEBUG MLN_WO_GLOBAL_VARS CONFIG += release # Input -HEADERS += src/main_window.hh ../shared/src/image_viewer.hh ../shared/src/internal/interactive_scene.hh src/tools/filter.hh src/tools/save.hh src/mln_data.hh src/tools/load.hh -FORMS += ui/main_window.ui ../shared/ui/image_viewer.ui -SOURCES += src/mln_widgets.cc ../shared/src/internal/interactive_scene.cc src/main.cc +HEADERS += \ + src/main_window.hh \ + ../shared/src/image_viewer.hh \ + ../shared/src/internal/interactive_scene.hh \ + src/tools/filter.hh \ + src/tools/save.hh \ + src/mln_data.hh \ + src/tools/load.hh + +FORMS += \ + ui/main_window.ui \ + ../shared/ui/image_viewer.ui + +SOURCES += \ + ../shared/src/internal/interactive_scene.cc \ + ../shared/src/image_viewer.cc \ + src/main.cc \ + src/main_window.cc \ + src/tools/filter.cc \ + src/tools/save.cc \ + src/tools/load.cc \ + src/mln_data.cc + RESOURCES = ../shared/shared.qrc diff --git a/igr/anapath/src/main.cc b/igr/anapath/src/main.cc index c17610c..5194c43 100644 --- a/igr/anapath/src/main.cc +++ b/igr/anapath/src/main.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -26,6 +27,7 @@ #include <QApplication> #include <QtGui> +#undef MLN_WO_GLOBAL_VARS #include <src/main_window.hh> int main(int argc, char *argv[]) diff --git a/igr/anapath/src/mln_data.hh b/igr/anapath/src/mln_data.hh index d4dadcb..e8befcf 100644 --- a/igr/anapath/src/mln_data.hh +++ b/igr/anapath/src/mln_data.hh @@ -1,10 +1,6 @@ #ifndef IGR_ANAPATH_SRC_MLN_DATA_HH # define IGR_ANAPATH_SRC_MLN_DATA_HH -# ifndef INCLUDE_MLN_FILES -# define MLN_INCLUDE_ONLY -# endif - # include <mln/core/image/image2d.hh> # include <mln/value/rgb8.hh> @@ -19,7 +15,7 @@ namespace igr struct mln_data { - typedef io::magick::large_image<mln::value::rgb8> large_image_t; + typedef io::magick::large_image<mln::value::rgb8> large_image_t; mln_data(); ~mln_data(); diff --git a/igr/anapath/src/mln_widgets.cc b/igr/anapath/src/mln_widgets.cc deleted file mode 100644 index c9e62e1..0000000 --- a/igr/anapath/src/mln_widgets.cc +++ /dev/null @@ -1,13 +0,0 @@ -#define INCLUDE_MLN_FILES - -// Widgets -#include <src/main_window.cc> -#include <shared/src/image_viewer.cc> - -// Tools -#include <src/tools/filter.cc> -#include <src/tools/save.cc> -#include <src/tools/load.cc> - -#include <src/mln_data.cc> - diff --git a/igr/shared/include/io/magick.hh b/igr/shared/include/io/magick.hh index 9de64df..aac73e6 100644 --- a/igr/shared/include/io/magick.hh +++ b/igr/shared/include/io/magick.hh @@ -105,6 +105,7 @@ namespace igr }; + inline std::ostream& operator<<(std::ostream& ostr, const info& i) { if (i.magic != "") @@ -118,6 +119,7 @@ namespace igr // end of io::magick::info + inline info read_info(const std::string& filename, bool quiet = true) { @@ -231,6 +233,7 @@ namespace igr // analyze_tiles + inline void analyze_tiles(const std::string& prefix, const std::string& suffix) -- 1.5.6.5

13 years, 9 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Olena-patches