May 2011 - Olena-patches

last-svn-commit-693-g181a278 lazzara/igr/gui/segmentation/src/main_window.cc: Avoid a warning in 2D segmentation tool.
by Guillaume Lazzara 12 May '11

12 May '11

--- 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

1 0

last-svn-commit-692-ga54cebf Add missing defines in headers.
by Guillaume Lazzara 12 May '11

12 May '11

* 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

1 0

last-svn-commit-691-g687f97b Split compilation of files including Milena's headers.
by Guillaume Lazzara 12 May '11

12 May '11

* lazzara/igr/gui/segmentation/segmentation.pro, * lazzara/igr/gui/segmentation/src/crop_widget.cc, * lazzara/igr/gui/segmentation/src/edit_seg_widget.cc, * lazzara/igr/gui/segmentation/src/edit_seg_widget.hh, * lazzara/igr/gui/segmentation/src/load_widget.cc, * lazzara/igr/gui/segmentation/src/main.cc, * lazzara/igr/gui/segmentation/src/main_window.cc, * lazzara/igr/gui/segmentation/src/mln_data.cc, * lazzara/igr/gui/segmentation/src/mln_data.hh, * lazzara/igr/gui/segmentation/src/save_widget.cc, * lazzara/igr/gui/segmentation/src/seg_widget.cc, * lazzara/igr/gui/segmentation/src/task_handler.hh, * lazzara/igr/gui/segmentation/src/tools/crop.cc, * lazzara/igr/gui/segmentation/src/tools/crop.hh, * lazzara/igr/gui/segmentation/src/tools/edit_seg.cc, * lazzara/igr/gui/segmentation/src/tools/edit_seg.hh, * lazzara/igr/gui/segmentation/src/tools/load.cc, * lazzara/igr/gui/segmentation/src/tools/load.hh, * lazzara/igr/gui/segmentation/src/tools/save.cc, * lazzara/igr/gui/segmentation/src/tools/save.hh, * lazzara/igr/gui/segmentation/src/tools/seg.cc, * lazzara/igr/gui/segmentation/src/tools/seg.hh, * lazzara/igr/gui/segmentation2dt/segmentation2dt.pro, * lazzara/igr/gui/segmentation2dt/src/crop_widget.cc, * lazzara/igr/gui/segmentation2dt/src/load_widget.cc, * lazzara/igr/gui/segmentation2dt/src/main.cc, * lazzara/igr/gui/segmentation2dt/src/main_window.cc, * lazzara/igr/gui/segmentation2dt/src/mln_data.cc, * lazzara/igr/gui/segmentation2dt/src/mln_data.hh, * lazzara/igr/gui/segmentation2dt/src/norm_smooth_widget.cc, * lazzara/igr/gui/segmentation2dt/src/ref_mean_widget.cc, * lazzara/igr/gui/segmentation2dt/src/save_widget.cc, * lazzara/igr/gui/segmentation2dt/src/seg_widget.cc, * lazzara/igr/gui/segmentation2dt/src/task_handler.hh, * lazzara/igr/gui/segmentation2dt/src/tools/crop.cc, * lazzara/igr/gui/segmentation2dt/src/tools/crop.hh, * lazzara/igr/gui/segmentation2dt/src/tools/load.cc, * lazzara/igr/gui/segmentation2dt/src/tools/load.hh, * lazzara/igr/gui/segmentation2dt/src/tools/mean_regions.cc, * lazzara/igr/gui/segmentation2dt/src/tools/mean_regions.hh, * lazzara/igr/gui/segmentation2dt/src/tools/norm_smooth.cc, * lazzara/igr/gui/segmentation2dt/src/tools/norm_smooth.hh, * lazzara/igr/gui/segmentation2dt/src/tools/ref_mean.cc, * lazzara/igr/gui/segmentation2dt/src/tools/ref_mean.hh, * lazzara/igr/gui/segmentation2dt/src/tools/save.cc, * lazzara/igr/gui/segmentation2dt/src/tools/save.hh, * lazzara/igr/gui/segmentation2dt/src/tools/seg.cc, * lazzara/igr/gui/segmentation2dt/src/tools/seg.hh, * lazzara/igr/gui/shared/src/color.hh, * lazzara/igr/gui/shared/src/igr_types.hh, * lazzara/igr/gui/shared/src/image_viewer.hh, * lazzara/igr/gui/viewer/src/main.cc, * lazzara/igr/gui/viewer/src/mln_data.cc, * lazzara/igr/gui/viewer/src/mln_data.hh, * lazzara/igr/gui/viewer/src/mln_widgets.cc, * lazzara/igr/gui/viewer/viewer.pro: Split compilation of files including Milena's headers. --- milena/sandbox/ChangeLog | 62 +++++++++++++++++ .../lazzara/igr/gui/segmentation/segmentation.pro | 55 +++++++++++++-- .../igr/gui/segmentation/src/crop_widget.cc | 1 - .../igr/gui/segmentation/src/edit_seg_widget.cc | 1 - .../igr/gui/segmentation/src/edit_seg_widget.hh | 4 - .../igr/gui/segmentation/src/load_widget.cc | 1 - .../lazzara/igr/gui/segmentation/src/main.cc | 1 + .../igr/gui/segmentation/src/main_window.cc | 1 - .../lazzara/igr/gui/segmentation/src/mln_data.cc | 3 +- .../lazzara/igr/gui/segmentation/src/mln_data.hh | 4 - .../igr/gui/segmentation/src/save_widget.cc | 1 - .../lazzara/igr/gui/segmentation/src/seg_widget.cc | 1 - .../igr/gui/segmentation/src/task_handler.hh | 4 - .../lazzara/igr/gui/segmentation/src/tools/crop.cc | 4 - .../lazzara/igr/gui/segmentation/src/tools/crop.hh | 4 - .../igr/gui/segmentation/src/tools/edit_seg.cc | 6 +- .../igr/gui/segmentation/src/tools/edit_seg.hh | 4 - .../lazzara/igr/gui/segmentation/src/tools/load.cc | 4 - .../lazzara/igr/gui/segmentation/src/tools/load.hh | 4 - .../lazzara/igr/gui/segmentation/src/tools/save.cc | 6 +- .../lazzara/igr/gui/segmentation/src/tools/save.hh | 4 - .../lazzara/igr/gui/segmentation/src/tools/seg.cc | 6 +- .../lazzara/igr/gui/segmentation/src/tools/seg.hh | 4 - .../igr/gui/segmentation2dt/segmentation2dt.pro | 72 ++++++++++++++++++-- .../igr/gui/segmentation2dt/src/crop_widget.cc | 1 - .../igr/gui/segmentation2dt/src/load_widget.cc | 1 - .../lazzara/igr/gui/segmentation2dt/src/main.cc | 4 +- .../igr/gui/segmentation2dt/src/main_window.cc | 1 - .../igr/gui/segmentation2dt/src/mln_data.cc | 2 +- .../igr/gui/segmentation2dt/src/mln_data.hh | 4 - .../gui/segmentation2dt/src/norm_smooth_widget.cc | 2 +- .../igr/gui/segmentation2dt/src/ref_mean_widget.cc | 1 - .../igr/gui/segmentation2dt/src/save_widget.cc | 1 - .../igr/gui/segmentation2dt/src/seg_widget.cc | 1 - .../igr/gui/segmentation2dt/src/task_handler.hh | 4 - .../igr/gui/segmentation2dt/src/tools/crop.cc | 4 - .../igr/gui/segmentation2dt/src/tools/crop.hh | 4 - .../igr/gui/segmentation2dt/src/tools/load.cc | 4 - .../igr/gui/segmentation2dt/src/tools/load.hh | 4 - .../gui/segmentation2dt/src/tools/mean_regions.cc | 4 - .../gui/segmentation2dt/src/tools/mean_regions.hh | 4 - .../gui/segmentation2dt/src/tools/norm_smooth.cc | 4 - .../gui/segmentation2dt/src/tools/norm_smooth.hh | 4 - .../igr/gui/segmentation2dt/src/tools/ref_mean.cc | 4 - .../igr/gui/segmentation2dt/src/tools/ref_mean.hh | 4 - .../igr/gui/segmentation2dt/src/tools/save.cc | 5 +- .../igr/gui/segmentation2dt/src/tools/save.hh | 4 - .../igr/gui/segmentation2dt/src/tools/seg.cc | 6 +- .../igr/gui/segmentation2dt/src/tools/seg.hh | 5 +- milena/sandbox/lazzara/igr/gui/shared/src/color.hh | 7 +-- .../lazzara/igr/gui/shared/src/igr_types.hh | 4 - .../lazzara/igr/gui/shared/src/image_viewer.hh | 7 +-- milena/sandbox/lazzara/igr/gui/viewer/src/main.cc | 4 +- .../sandbox/lazzara/igr/gui/viewer/src/mln_data.cc | 20 +++++- .../sandbox/lazzara/igr/gui/viewer/src/mln_data.hh | 22 +++++- .../lazzara/igr/gui/viewer/src/mln_widgets.cc | 2 - milena/sandbox/lazzara/igr/gui/viewer/viewer.pro | 25 +++++-- 57 files changed, 257 insertions(+), 173 deletions(-) delete mode 100644 milena/sandbox/lazzara/igr/gui/viewer/src/mln_widgets.cc diff --git a/milena/sandbox/ChangeLog b/milena/sandbox/ChangeLog index 44c82e9..5477ab3 100644 --- a/milena/sandbox/ChangeLog +++ b/milena/sandbox/ChangeLog @@ -1,3 +1,65 @@ +2010-11-15 Guillaume Lazzara <z(a)lrde.epita.fr> + + Split compilation of files including Milena's headers. + + * lazzara/igr/gui/segmentation/segmentation.pro, + * lazzara/igr/gui/segmentation/src/crop_widget.cc, + * lazzara/igr/gui/segmentation/src/edit_seg_widget.cc, + * lazzara/igr/gui/segmentation/src/edit_seg_widget.hh, + * lazzara/igr/gui/segmentation/src/load_widget.cc, + * lazzara/igr/gui/segmentation/src/main.cc, + * lazzara/igr/gui/segmentation/src/main_window.cc, + * lazzara/igr/gui/segmentation/src/mln_data.cc, + * lazzara/igr/gui/segmentation/src/mln_data.hh, + * lazzara/igr/gui/segmentation/src/save_widget.cc, + * lazzara/igr/gui/segmentation/src/seg_widget.cc, + * lazzara/igr/gui/segmentation/src/task_handler.hh, + * lazzara/igr/gui/segmentation/src/tools/crop.cc, + * lazzara/igr/gui/segmentation/src/tools/crop.hh, + * lazzara/igr/gui/segmentation/src/tools/edit_seg.cc, + * lazzara/igr/gui/segmentation/src/tools/edit_seg.hh, + * lazzara/igr/gui/segmentation/src/tools/load.cc, + * lazzara/igr/gui/segmentation/src/tools/load.hh, + * lazzara/igr/gui/segmentation/src/tools/save.cc, + * lazzara/igr/gui/segmentation/src/tools/save.hh, + * lazzara/igr/gui/segmentation/src/tools/seg.cc, + * lazzara/igr/gui/segmentation/src/tools/seg.hh, + * lazzara/igr/gui/segmentation2dt/segmentation2dt.pro, + * lazzara/igr/gui/segmentation2dt/src/crop_widget.cc, + * lazzara/igr/gui/segmentation2dt/src/load_widget.cc, + * lazzara/igr/gui/segmentation2dt/src/main.cc, + * lazzara/igr/gui/segmentation2dt/src/main_window.cc, + * lazzara/igr/gui/segmentation2dt/src/mln_data.cc, + * lazzara/igr/gui/segmentation2dt/src/mln_data.hh, + * lazzara/igr/gui/segmentation2dt/src/norm_smooth_widget.cc, + * lazzara/igr/gui/segmentation2dt/src/ref_mean_widget.cc, + * lazzara/igr/gui/segmentation2dt/src/save_widget.cc, + * lazzara/igr/gui/segmentation2dt/src/seg_widget.cc, + * lazzara/igr/gui/segmentation2dt/src/task_handler.hh, + * lazzara/igr/gui/segmentation2dt/src/tools/crop.cc, + * lazzara/igr/gui/segmentation2dt/src/tools/crop.hh, + * lazzara/igr/gui/segmentation2dt/src/tools/load.cc, + * lazzara/igr/gui/segmentation2dt/src/tools/load.hh, + * lazzara/igr/gui/segmentation2dt/src/tools/mean_regions.cc, + * lazzara/igr/gui/segmentation2dt/src/tools/mean_regions.hh, + * lazzara/igr/gui/segmentation2dt/src/tools/norm_smooth.cc, + * lazzara/igr/gui/segmentation2dt/src/tools/norm_smooth.hh, + * lazzara/igr/gui/segmentation2dt/src/tools/ref_mean.cc, + * lazzara/igr/gui/segmentation2dt/src/tools/ref_mean.hh, + * lazzara/igr/gui/segmentation2dt/src/tools/save.cc, + * lazzara/igr/gui/segmentation2dt/src/tools/save.hh, + * lazzara/igr/gui/segmentation2dt/src/tools/seg.cc, + * lazzara/igr/gui/segmentation2dt/src/tools/seg.hh, + * lazzara/igr/gui/shared/src/color.hh, + * lazzara/igr/gui/shared/src/igr_types.hh, + * lazzara/igr/gui/shared/src/image_viewer.hh, + * lazzara/igr/gui/viewer/src/main.cc, + * lazzara/igr/gui/viewer/src/mln_data.cc, + * lazzara/igr/gui/viewer/src/mln_data.hh, + * lazzara/igr/gui/viewer/src/mln_widgets.cc, + * lazzara/igr/gui/viewer/viewer.pro: Split compilation of files + including Milena's headers. + 2010-02-09 Guillaume Lazzara <z(a)lrde.epita.fr> Add a tool for anapath filtering. diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/segmentation.pro b/milena/sandbox/lazzara/igr/gui/segmentation/segmentation.pro index ef8dd61..4a0f003 100644 --- a/milena/sandbox/lazzara/igr/gui/segmentation/segmentation.pro +++ b/milena/sandbox/lazzara/igr/gui/segmentation/segmentation.pro @@ -6,20 +6,61 @@ TEMPLATE = app TARGET = DEPENDPATH += . src ui #INCLUDEPATH += . src $(PWD)/../../ $(PWD)/.. $(PWD)/../shared $(OLN)/milena /home/inca/local/include -INCLUDEPATH += . src $(PWD)/.. $(PWD)/../shared $(OLN)/milena /lrde/dev/linux-x86/stable/gdcm/include +INCLUDEPATH += . src $(PWD)/.. $(PWD)/../shared $(OLN)/milena -DEFINES= NDEBUG +DEFINES= NDEBUG MLN_WO_GLOBAL_VARS QMAKE_CXX += -O2 #LIBS += -L/home/inca/local/lib -lgdcmCommon -lgdcmDICT -lgdcmDSED -lgdcmIOD -lgdcmMSFF -lgdcmexpat -lgdcmjpeg12 -lgdcmjpeg16 -lgdcmjpeg8 -lgdcmopenjpeg -lgdcmuuid -lgdcmzlib -LIBS += -L/lrde/dev/linux-x86/stable/gdcm/lib -lgdcmCommon -lgdcmDICT -lgdcmDSED -lgdcmIOD -lgdcmMSFF -lgdcmexpat -lgdcmjpeg12 -lgdcmjpeg16 -lgdcmjpeg8 -lgdcmopenjpeg -lgdcmuuid -lgdcmzlib - +LIBS += -lgdcmCommon -lgdcmjpeg12 -lgdcmjpeg16 -lgdcmjpeg8 -lgdcmDICT -lgdcmDSED -lgdcmIOD -lgdcmMSFF -lqwt-qt4 # Input -HEADERS += src/main_window.hh ../shared/src/image_viewer.hh ../shared/src/internal/interactive_scene.hh src/mln_data.hh src/tools/crop.hh src/task_handler.hh src/crop_widget.hh src/task_widget.hh src/load_widget.hh src/seg_widget.hh src/tools/seg.hh src/tools/edit_seg.hh src/edit_seg_widget.hh src/save_widget.hh src/tools/save.hh src/tools/load.hh -FORMS += ui/main_window.ui ../shared/ui/image_viewer.ui ui/crop_widget.ui ui/load_widget.ui ui/seg_widget.ui ui/edit_seg_widget.ui ui/save_widget.ui -SOURCES += src/main.cc ../shared/src/internal/interactive_scene.cc src/mln_widgets.cc src/task_handler.cc src/main_window.cc src/task_widget.cc +HEADERS += \ + src/main_window.hh \ + ../shared/src/image_viewer.hh \ + ../shared/src/internal/interactive_scene.hh \ + src/mln_data.hh \ + src/tools/crop.hh \ + src/task_handler.hh \ + src/crop_widget.hh \ + src/task_widget.hh \ + src/load_widget.hh \ + src/seg_widget.hh \ + src/tools/seg.hh \ + src/tools/edit_seg.hh \ + src/edit_seg_widget.hh \ + src/save_widget.hh \ + src/tools/save.hh \ + src/tools/load.hh + +FORMS += \ + ui/main_window.ui \ + ../shared/ui/image_viewer.ui \ + ui/crop_widget.ui \ + ui/load_widget.ui \ + ui/seg_widget.ui \ + ui/edit_seg_widget.ui \ + ui/save_widget.ui + +SOURCES += \ + src/main.cc \ + ../shared/src/internal/interactive_scene.cc \ + ../shared/src/image_viewer.cc \ + src/crop_widget.cc \ + src/edit_seg_widget.cc \ + src/save_widget.cc \ + src/load_widget.cc \ + src/seg_widget.cc \ + src/tools/crop.cc \ + src/tools/edit_seg.cc \ + src/tools/load.cc \ + src/tools/save.cc \ + src/tools/seg.cc \ + src/mln_data.cc \ + src/task_handler.cc \ + src/main_window.cc \ + src/task_widget.cc RESOURCES = ../shared/shared.qrc diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/crop_widget.cc b/milena/sandbox/lazzara/igr/gui/segmentation/src/crop_widget.cc index 4b0dafd..6b56a12 100644 --- a/milena/sandbox/lazzara/igr/gui/segmentation/src/crop_widget.cc +++ b/milena/sandbox/lazzara/igr/gui/segmentation/src/crop_widget.cc @@ -23,7 +23,6 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -//#define INCLUDE_MLN_FILES #include <QtCore> #include <QtGui> #include <src/crop_widget.hh> diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/edit_seg_widget.cc b/milena/sandbox/lazzara/igr/gui/segmentation/src/edit_seg_widget.cc index f662eda..523996f 100644 --- a/milena/sandbox/lazzara/igr/gui/segmentation/src/edit_seg_widget.cc +++ b/milena/sandbox/lazzara/igr/gui/segmentation/src/edit_seg_widget.cc @@ -23,7 +23,6 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -//#define INCLUDE_MLN_FILES #include <QtCore> #include <QtGui> #include <src/edit_seg_widget.hh> diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/edit_seg_widget.hh b/milena/sandbox/lazzara/igr/gui/segmentation/src/edit_seg_widget.hh index 9f988a1..fa62601 100644 --- a/milena/sandbox/lazzara/igr/gui/segmentation/src/edit_seg_widget.hh +++ b/milena/sandbox/lazzara/igr/gui/segmentation/src/edit_seg_widget.hh @@ -31,10 +31,6 @@ # include <src/task_widget.hh> # include <shared/src/igr_types.hh> -# ifndef INCLUDE_MLN_FILES -# define MLN_INCLUDE_ONLY -# endif - # include <mln/core/alias/box3d.hh> # include <mln/util/array.hh> # include <mln/util/set.hh> diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/load_widget.cc b/milena/sandbox/lazzara/igr/gui/segmentation/src/load_widget.cc index 48d9b25..a9073f3 100644 --- a/milena/sandbox/lazzara/igr/gui/segmentation/src/load_widget.cc +++ b/milena/sandbox/lazzara/igr/gui/segmentation/src/load_widget.cc @@ -23,7 +23,6 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -//#define INCLUDE_MLN_FILES #include <QtCore> #include <QtGui> #include <src/load_widget.hh> diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/main.cc b/milena/sandbox/lazzara/igr/gui/segmentation/src/main.cc index 59b332a..503c751 100644 --- a/milena/sandbox/lazzara/igr/gui/segmentation/src/main.cc +++ b/milena/sandbox/lazzara/igr/gui/segmentation/src/main.cc @@ -26,6 +26,7 @@ #include <QApplication> #include <QtGui> +#undef MLN_WO_GLOBAL_VARS #include <src/main_window.hh> int main(int argc, char *argv[]) diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/main_window.cc b/milena/sandbox/lazzara/igr/gui/segmentation/src/main_window.cc index d36f608..a225daf 100644 --- a/milena/sandbox/lazzara/igr/gui/segmentation/src/main_window.cc +++ b/milena/sandbox/lazzara/igr/gui/segmentation/src/main_window.cc @@ -23,7 +23,6 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -//#define INCLUDE_MLN_FILES #include <QtCore> #include <QtGui> #include <src/main_window.hh> diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/mln_data.cc b/milena/sandbox/lazzara/igr/gui/segmentation/src/mln_data.cc index efba25b..6c8ea01 100644 --- a/milena/sandbox/lazzara/igr/gui/segmentation/src/mln_data.cc +++ b/milena/sandbox/lazzara/igr/gui/segmentation/src/mln_data.cc @@ -1,4 +1,5 @@ -#define INCLUDE_MLN_FILES +#include <QtCore> + #include <src/mln_data.hh> #include <mln/core/image/dmorph/slice_image.hh> #include <mln/core/image/image3d.hh> diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/mln_data.hh b/milena/sandbox/lazzara/igr/gui/segmentation/src/mln_data.hh index f295dd9..13995d5 100644 --- a/milena/sandbox/lazzara/igr/gui/segmentation/src/mln_data.hh +++ b/milena/sandbox/lazzara/igr/gui/segmentation/src/mln_data.hh @@ -4,10 +4,6 @@ #include <QtCore/QObject> #include <QtCore/QPointF> -# ifndef INCLUDE_MLN_FILES -# define MLN_INCLUDE_ONLY -# endif - #include <mln/core/image/image3d.hh> #include <shared/src/igr_types.hh> diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/save_widget.cc b/milena/sandbox/lazzara/igr/gui/segmentation/src/save_widget.cc index 3e4b5b8..75d34d4 100644 --- a/milena/sandbox/lazzara/igr/gui/segmentation/src/save_widget.cc +++ b/milena/sandbox/lazzara/igr/gui/segmentation/src/save_widget.cc @@ -23,7 +23,6 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -#define INCLUDE_MLN_FILES #include <QtCore> #include <QtGui> #include <src/save_widget.hh> diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/seg_widget.cc b/milena/sandbox/lazzara/igr/gui/segmentation/src/seg_widget.cc index 88b7d92..0dcb5fc 100644 --- a/milena/sandbox/lazzara/igr/gui/segmentation/src/seg_widget.cc +++ b/milena/sandbox/lazzara/igr/gui/segmentation/src/seg_widget.cc @@ -23,7 +23,6 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -//#define INCLUDE_MLN_FILES #include <QtCore> #include <QtGui> #include <src/seg_widget.hh> diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/task_handler.hh b/milena/sandbox/lazzara/igr/gui/segmentation/src/task_handler.hh index 48d6bb5..d62a62c 100644 --- a/milena/sandbox/lazzara/igr/gui/segmentation/src/task_handler.hh +++ b/milena/sandbox/lazzara/igr/gui/segmentation/src/task_handler.hh @@ -5,10 +5,6 @@ # include <QtCore/QObject> # include <QtGui/QProgressDialog> -# ifndef INCLUDE_MLN_FILES -# define MLN_INCLUDE_ONLY -# endif - # include <src/task.hh> diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/tools/crop.cc b/milena/sandbox/lazzara/igr/gui/segmentation/src/tools/crop.cc index a974d82..4692b8d 100644 --- a/milena/sandbox/lazzara/igr/gui/segmentation/src/tools/crop.cc +++ b/milena/sandbox/lazzara/igr/gui/segmentation/src/tools/crop.cc @@ -1,9 +1,5 @@ #include <src/tools/crop.hh> -# ifndef INCLUDE_MLN_FILES -# define MLN_INCLUDE_ONLY -# endif - #include <mln/core/image/image3d.hh> #include <mln/data/fill.hh> #include <shared/src/igr_types.hh> diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/tools/crop.hh b/milena/sandbox/lazzara/igr/gui/segmentation/src/tools/crop.hh index 40f4729..a19f89c 100644 --- a/milena/sandbox/lazzara/igr/gui/segmentation/src/tools/crop.hh +++ b/milena/sandbox/lazzara/igr/gui/segmentation/src/tools/crop.hh @@ -3,10 +3,6 @@ # include <QtCore/QRectF> -# ifndef INCLUDE_MLN_FILES -# define MLN_INCLUDE_ONLY -# endif - # include <mln/core/alias/box3d.hh> # include <src/task.hh> # include <src/mln_data.hh> diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/tools/edit_seg.cc b/milena/sandbox/lazzara/igr/gui/segmentation/src/tools/edit_seg.cc index cd4dad0..3e14ea8 100644 --- a/milena/sandbox/lazzara/igr/gui/segmentation/src/tools/edit_seg.cc +++ b/milena/sandbox/lazzara/igr/gui/segmentation/src/tools/edit_seg.cc @@ -1,11 +1,9 @@ +#include <QtCore> + #include <src/tools/edit_seg.hh> #include <shared/src/igr_types.hh> -# ifndef INCLUDE_MLN_FILES -# define MLN_INCLUDE_ONLY -# endif - #include <mln/core/image/image3d.hh> #include <mln/data/fill.hh> diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/tools/edit_seg.hh b/milena/sandbox/lazzara/igr/gui/segmentation/src/tools/edit_seg.hh index e77de50..9e28b97 100644 --- a/milena/sandbox/lazzara/igr/gui/segmentation/src/tools/edit_seg.hh +++ b/milena/sandbox/lazzara/igr/gui/segmentation/src/tools/edit_seg.hh @@ -3,10 +3,6 @@ # include <QtCore/QRectF> -# ifndef INCLUDE_MLN_FILES -# define MLN_INCLUDE_ONLY -# endif - # include <mln/util/array.hh> # include <mln/util/set.hh> diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/tools/load.cc b/milena/sandbox/lazzara/igr/gui/segmentation/src/tools/load.cc index 92f82bc..e9815a2 100644 --- a/milena/sandbox/lazzara/igr/gui/segmentation/src/tools/load.cc +++ b/milena/sandbox/lazzara/igr/gui/segmentation/src/tools/load.cc @@ -1,9 +1,5 @@ #include <src/tools/load.hh> -# ifndef INCLUDE_MLN_FILES -# define MLN_INCLUDE_ONLY -# endif - #include <mln/core/image/image3d.hh> #include <mln/data/fill.hh> #include <shared/src/igr_types.hh> diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/tools/load.hh b/milena/sandbox/lazzara/igr/gui/segmentation/src/tools/load.hh index 64a0e30..9e30d18 100644 --- a/milena/sandbox/lazzara/igr/gui/segmentation/src/tools/load.hh +++ b/milena/sandbox/lazzara/igr/gui/segmentation/src/tools/load.hh @@ -3,10 +3,6 @@ # include <QtCore/QRectF> -# ifndef INCLUDE_MLN_FILES -# define MLN_INCLUDE_ONLY -# endif - # include <mln/core/alias/box3d.hh> # include <src/task.hh> # include <src/mln_data.hh> diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/tools/save.cc b/milena/sandbox/lazzara/igr/gui/segmentation/src/tools/save.cc index 7954105..a4877ca 100644 --- a/milena/sandbox/lazzara/igr/gui/segmentation/src/tools/save.cc +++ b/milena/sandbox/lazzara/igr/gui/segmentation/src/tools/save.cc @@ -1,8 +1,6 @@ -#include <src/tools/save.hh> +#include <QtCore> -# ifndef INCLUDE_MLN_FILES -# define MLN_INCLUDE_ONLY -# endif +#include <src/tools/save.hh> #include <mln/core/image/image3d.hh> #include <mln/core/image/dmorph/slice_image.hh> diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/tools/save.hh b/milena/sandbox/lazzara/igr/gui/segmentation/src/tools/save.hh index ed90b06..11cc805 100644 --- a/milena/sandbox/lazzara/igr/gui/segmentation/src/tools/save.hh +++ b/milena/sandbox/lazzara/igr/gui/segmentation/src/tools/save.hh @@ -3,10 +3,6 @@ # include <QtCore/QRectF> -# ifndef INCLUDE_MLN_FILES -# define MLN_INCLUDE_ONLY -# endif - # include <mln/core/alias/box3d.hh> # include <src/task.hh> # include <src/mln_data.hh> diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/tools/seg.cc b/milena/sandbox/lazzara/igr/gui/segmentation/src/tools/seg.cc index 7a4b003..4fb8898 100644 --- a/milena/sandbox/lazzara/igr/gui/segmentation/src/tools/seg.cc +++ b/milena/sandbox/lazzara/igr/gui/segmentation/src/tools/seg.cc @@ -1,8 +1,6 @@ -#include <src/tools/seg.hh> +#include <QtCore> -# ifndef INCLUDE_MLN_FILES -# define MLN_INCLUDE_ONLY -# endif +#include <src/tools/seg.hh> #include <mln/core/image/image3d.hh> #include <mln/core/image/image2d.hh> diff --git a/milena/sandbox/lazzara/igr/gui/segmentation/src/tools/seg.hh b/milena/sandbox/lazzara/igr/gui/segmentation/src/tools/seg.hh index 1f7c478..b974042 100644 --- a/milena/sandbox/lazzara/igr/gui/segmentation/src/tools/seg.hh +++ b/milena/sandbox/lazzara/igr/gui/segmentation/src/tools/seg.hh @@ -3,10 +3,6 @@ # include <QtCore/QRectF> -# ifndef INCLUDE_MLN_FILES -# define MLN_INCLUDE_ONLY -# endif - # include <mln/core/alias/box3d.hh> # include <src/task.hh> # include <src/mln_data.hh> diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/segmentation2dt.pro b/milena/sandbox/lazzara/igr/gui/segmentation2dt/segmentation2dt.pro index 8781b33..d7ce7e6 100644 --- a/milena/sandbox/lazzara/igr/gui/segmentation2dt/segmentation2dt.pro +++ b/milena/sandbox/lazzara/igr/gui/segmentation2dt/segmentation2dt.pro @@ -6,20 +6,80 @@ TEMPLATE = app TARGET = DEPENDPATH += . src ui #INCLUDEPATH += . src $(PWD)/../../ $(PWD)/.. $(PWD)/../shared $(OLN)/milena /home/inca/local/include -INCLUDEPATH += . src $(PWD)/.. $(PWD)/../shared $(OLN)/milena /lrde/dev/linux-x86/stable/gdcm/include +INCLUDEPATH += . src $(PWD)/.. $(PWD)/../shared $(OLN)/milena -DEFINES= NDEBUG +DEFINES= NDEBUG MLN_WO_GLOBAL_VARS QMAKE_CXX += -O2 #LIBS += -L/home/inca/local/lib -lgdcmCommon -lgdcmDICT -lgdcmDSED -lgdcmIOD -lgdcmMSFF -lgdcmexpat -lgdcmjpeg12 -lgdcmjpeg16 -lgdcmjpeg8 -lgdcmopenjpeg -lgdcmuuid -lgdcmzlib -lqwt-qt4 -LIBS += -L/lrde/dev/linux-x86/stable/gdcm/lib -lgdcmCommon -lgdcmDICT -lgdcmDSED -lgdcmIOD -lgdcmMSFF -lgdcmexpat -lgdcmjpeg12 -lgdcmjpeg16 -lgdcmjpeg8 -lgdcmopenjpeg -lgdcmuuid -lgdcmzlib -lqwt-qt4 +LIBS += -lgdcmCommon -lgdcmjpeg12 -lgdcmjpeg16 -lgdcmjpeg8 -lgdcmDICT -lgdcmDSED -lgdcmIOD -lgdcmMSFF -lqwt-qt4 + + + # Input -HEADERS += src/main_window.hh ../shared/src/image_viewer.hh ../shared/src/internal/interactive_scene.hh src/mln_data.hh src/tools/crop.hh src/task_handler.hh src/crop_widget.hh src/task_widget.hh src/load_widget.hh src/seg_widget.hh src/tools/seg.hh src/save_widget.hh src/tools/save.hh src/ref_mean_widget.hh src/tools/ref_mean.hh src/tools/norm_smooth.hh src/norm_smooth_widget.hh src/mean_regions_widget.hh src/tools/mean_regions.hh src/tools/load.hh src/plot_widget.hh src/plot.hh -FORMS += ui/main_window.ui ../shared/ui/image_viewer.ui ui/crop_widget.ui ui/load_widget.ui ui/seg_widget.ui ui/save_widget.ui ui/ref_mean_widget.ui ui/norm_smooth_widget.ui ui/mean_regions_widget.ui ui/plot_widget.ui -SOURCES += src/main.cc ../shared/src/internal/interactive_scene.cc src/mln_widgets.cc src/task_handler.cc src/main_window.cc src/task_widget.cc src/plot_widget.cc src/plot.cc +HEADERS += \ + src/main_window.hh \ + ../shared/src/image_viewer.hh \ + ../shared/src/internal/interactive_scene.hh \ + src/mln_data.hh \ + src/tools/crop.hh \ + src/task_handler.hh \ + src/crop_widget.hh \ + src/task_widget.hh \ + src/load_widget.hh \ + src/seg_widget.hh \ + src/tools/seg.hh \ + src/save_widget.hh \ + src/tools/save.hh \ + src/ref_mean_widget.hh \ + src/tools/ref_mean.hh \ + src/tools/norm_smooth.hh \ + src/norm_smooth_widget.hh \ + src/mean_regions_widget.hh \ + src/tools/mean_regions.hh \ + src/tools/load.hh \ + src/plot_widget.hh \ + src/plot.hh + +FORMS += \ + ui/main_window.ui \ + ../shared/ui/image_viewer.ui \ + ui/crop_widget.ui \ + ui/load_widget.ui \ + ui/seg_widget.ui \ + ui/save_widget.ui \ + ui/ref_mean_widget.ui \ + ui/norm_smooth_widget.ui \ + ui/mean_regions_widget.ui \ + ui/plot_widget.ui + +SOURCES += \ + src/main.cc \ + ../shared/src/internal/interactive_scene.cc \ + ../shared/src/image_viewer.cc \ + src/crop_widget.cc \ + src/save_widget.cc \ + src/load_widget.cc \ + src/seg_widget.cc \ + src/ref_mean_widget.cc \ + src/norm_smooth_widget.cc \ + src/mean_regions_widget.cc \ + src/tools/crop.cc \ + src/tools/seg.cc \ + src/tools/save.cc \ + src/tools/ref_mean.cc \ + src/tools/norm_smooth.cc \ + src/tools/mean_regions.cc \ + src/tools/load.cc \ + src/mln_data.cc \ + src/task_handler.cc \ + src/main_window.cc \ + src/task_widget.cc \ + src/plot_widget.cc \ + src/plot.cc RESOURCES = ../shared/shared.qrc diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/crop_widget.cc b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/crop_widget.cc index ba90c64..67a51b7 100644 --- a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/crop_widget.cc +++ b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/crop_widget.cc @@ -23,7 +23,6 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -//#define INCLUDE_MLN_FILES #include <QtCore> #include <QtGui> #include <src/crop_widget.hh> diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/load_widget.cc b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/load_widget.cc index 6969ed5..27787b0 100644 --- a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/load_widget.cc +++ b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/load_widget.cc @@ -23,7 +23,6 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -//#define INCLUDE_MLN_FILES #include <QtCore> #include <QtGui> #include <src/load_widget.hh> diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/main.cc b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/main.cc index 59b332a..132d270 100644 --- a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/main.cc +++ b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/main.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -26,6 +27,7 @@ #include <QApplication> #include <QtGui> +#undef MLN_WO_GLOBAL_VARS #include <src/main_window.hh> int main(int argc, char *argv[]) diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/main_window.cc b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/main_window.cc index 0da6059..00e95de 100644 --- a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/main_window.cc +++ b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/main_window.cc @@ -23,7 +23,6 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -//#define INCLUDE_MLN_FILES #include <QtCore> #include <QtGui> #include <src/main_window.hh> diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/mln_data.cc b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/mln_data.cc index e90b236..c294c73 100644 --- a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/mln_data.cc +++ b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/mln_data.cc @@ -1,4 +1,4 @@ -#define INCLUDE_MLN_FILES +#include <QtCore> #include <src/mln_data.hh> #include <mln/core/image/dmorph/slice_image.hh> #include <mln/core/image/image3d.hh> diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/mln_data.hh b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/mln_data.hh index 4dcdf81..6f1776f 100644 --- a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/mln_data.hh +++ b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/mln_data.hh @@ -4,10 +4,6 @@ #include <QtCore/QObject> #include <QtCore/QPointF> -# ifndef INCLUDE_MLN_FILES -# define MLN_INCLUDE_ONLY -# endif - #include <mln/core/image/image2d.hh> #include <mln/core/image/image3d.hh> #include <shared/src/igr_types.hh> diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/norm_smooth_widget.cc b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/norm_smooth_widget.cc index cad1e7f..682206e 100644 --- a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/norm_smooth_widget.cc +++ b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/norm_smooth_widget.cc @@ -23,7 +23,7 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -//#define INCLUDE_MLN_FILES + #include <QtCore> #include <QtGui> diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/ref_mean_widget.cc b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/ref_mean_widget.cc index bc7b456..61d8e21 100644 --- a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/ref_mean_widget.cc +++ b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/ref_mean_widget.cc @@ -23,7 +23,6 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -//#define INCLUDE_MLN_FILES #include <QtCore> #include <QtGui> #include <src/ref_mean_widget.hh> diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/save_widget.cc b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/save_widget.cc index edf270a..8d87133 100644 --- a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/save_widget.cc +++ b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/save_widget.cc @@ -23,7 +23,6 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -#define INCLUDE_MLN_FILES #include <QtCore> #include <QtGui> #include <src/save_widget.hh> diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/seg_widget.cc b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/seg_widget.cc index aaf9c1d..6891432 100644 --- a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/seg_widget.cc +++ b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/seg_widget.cc @@ -23,7 +23,6 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -//#define INCLUDE_MLN_FILES #include <QtCore> #include <QtGui> #include <src/seg_widget.hh> diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/task_handler.hh b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/task_handler.hh index 48d6bb5..d62a62c 100644 --- a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/task_handler.hh +++ b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/task_handler.hh @@ -5,10 +5,6 @@ # include <QtCore/QObject> # include <QtGui/QProgressDialog> -# ifndef INCLUDE_MLN_FILES -# define MLN_INCLUDE_ONLY -# endif - # include <src/task.hh> diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/crop.cc b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/crop.cc index a974d82..4692b8d 100644 --- a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/crop.cc +++ b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/crop.cc @@ -1,9 +1,5 @@ #include <src/tools/crop.hh> -# ifndef INCLUDE_MLN_FILES -# define MLN_INCLUDE_ONLY -# endif - #include <mln/core/image/image3d.hh> #include <mln/data/fill.hh> #include <shared/src/igr_types.hh> diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/crop.hh b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/crop.hh index 40f4729..a19f89c 100644 --- a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/crop.hh +++ b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/crop.hh @@ -3,10 +3,6 @@ # include <QtCore/QRectF> -# ifndef INCLUDE_MLN_FILES -# define MLN_INCLUDE_ONLY -# endif - # include <mln/core/alias/box3d.hh> # include <src/task.hh> # include <src/mln_data.hh> diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/load.cc b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/load.cc index 92f82bc..e9815a2 100644 --- a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/load.cc +++ b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/load.cc @@ -1,9 +1,5 @@ #include <src/tools/load.hh> -# ifndef INCLUDE_MLN_FILES -# define MLN_INCLUDE_ONLY -# endif - #include <mln/core/image/image3d.hh> #include <mln/data/fill.hh> #include <shared/src/igr_types.hh> diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/load.hh b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/load.hh index 64a0e30..9e30d18 100644 --- a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/load.hh +++ b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/load.hh @@ -3,10 +3,6 @@ # include <QtCore/QRectF> -# ifndef INCLUDE_MLN_FILES -# define MLN_INCLUDE_ONLY -# endif - # include <mln/core/alias/box3d.hh> # include <src/task.hh> # include <src/mln_data.hh> diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/mean_regions.cc b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/mean_regions.cc index 64353d3..8245a70 100644 --- a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/mean_regions.cc +++ b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/mean_regions.cc @@ -1,7 +1,3 @@ -# ifndef INCLUDE_MLN_FILES -# define MLN_INCLUDE_ONLY -# endif - #include <src/tools/mean_regions.hh> #include <src/mln_data.hh> diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/mean_regions.hh b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/mean_regions.hh index a20057b..2d7ff5e 100644 --- a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/mean_regions.hh +++ b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/mean_regions.hh @@ -3,10 +3,6 @@ # include <QtCore/QRectF> -# ifndef INCLUDE_MLN_FILES -# define MLN_INCLUDE_ONLY -# endif - # include <mln/core/alias/box3d.hh> # include <src/task.hh> # include <src/mln_data.hh> diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/norm_smooth.cc b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/norm_smooth.cc index 9a1ddb3..16751ce 100644 --- a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/norm_smooth.cc +++ b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/norm_smooth.cc @@ -1,7 +1,3 @@ -# ifndef INCLUDE_MLN_FILES -# define MLN_INCLUDE_ONLY -# endif - #include <src/tools/norm_smooth.hh> #include <src/mln_data.hh> diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/norm_smooth.hh b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/norm_smooth.hh index fc4d1e8..ce74aa1 100644 --- a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/norm_smooth.hh +++ b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/norm_smooth.hh @@ -3,10 +3,6 @@ # include <QtCore/QRectF> -# ifndef INCLUDE_MLN_FILES -# define MLN_INCLUDE_ONLY -# endif - # include <mln/core/alias/box3d.hh> # include <src/task.hh> # include <src/mln_data.hh> diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/ref_mean.cc b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/ref_mean.cc index 31e9d21..42fd288 100644 --- a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/ref_mean.cc +++ b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/ref_mean.cc @@ -1,7 +1,3 @@ -# ifndef INCLUDE_MLN_FILES -# define MLN_INCLUDE_ONLY -# endif - #include <src/tools/ref_mean.hh> #include <src/mln_data.hh> diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/ref_mean.hh b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/ref_mean.hh index dc39810..e8decf7 100644 --- a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/ref_mean.hh +++ b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/ref_mean.hh @@ -3,10 +3,6 @@ # include <QtCore/QRectF> -# ifndef INCLUDE_MLN_FILES -# define MLN_INCLUDE_ONLY -# endif - # include <mln/core/alias/box3d.hh> # include <src/task.hh> # include <src/mln_data.hh> diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/save.cc b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/save.cc index 37a5608..23e38d1 100644 --- a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/save.cc +++ b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/save.cc @@ -3,12 +3,9 @@ #include <src/tools/save.hh> #include <QtCore/QFile> +#include <QtCore/QFileInfo> #include <QtCore/QTextStream> -# ifndef INCLUDE_MLN_FILES -# define MLN_INCLUDE_ONLY -# endif - #include <mln/core/image/image3d.hh> #include <mln/core/image/dmorph/slice_image.hh> #include <mln/data/fill.hh> diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/save.hh b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/save.hh index 01d8560..fc30282 100644 --- a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/save.hh +++ b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/save.hh @@ -4,10 +4,6 @@ # include <QtCore/QRectF> # include <QtCore/QString> -# ifndef INCLUDE_MLN_FILES -# define MLN_INCLUDE_ONLY -# endif - # include <mln/core/alias/box3d.hh> # include <src/task.hh> # include <src/mln_data.hh> diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/seg.cc b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/seg.cc index d72cb50..b57a52f 100644 --- a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/seg.cc +++ b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/seg.cc @@ -1,8 +1,6 @@ -#include <src/tools/seg.hh> +#include <QtCore> -# ifndef INCLUDE_MLN_FILES -# define MLN_INCLUDE_ONLY -# endif +#include <src/tools/seg.hh> #include <mln/core/image/image3d.hh> #include <mln/core/image/image2d.hh> diff --git a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/seg.hh b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/seg.hh index 963b6a8..0e3d75e 100644 --- a/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/seg.hh +++ b/milena/sandbox/lazzara/igr/gui/segmentation2dt/src/tools/seg.hh @@ -3,11 +3,8 @@ # include <QtCore/QRectF> -# ifndef INCLUDE_MLN_FILES -# define MLN_INCLUDE_ONLY -# endif - # include <mln/core/alias/box3d.hh> +# include <mln/core/image/image3d.hh> # include <src/task.hh> # include <src/mln_data.hh> diff --git a/milena/sandbox/lazzara/igr/gui/shared/src/color.hh b/milena/sandbox/lazzara/igr/gui/shared/src/color.hh index 980d3bb..cf62577 100644 --- a/milena/sandbox/lazzara/igr/gui/shared/src/color.hh +++ b/milena/sandbox/lazzara/igr/gui/shared/src/color.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -30,10 +31,6 @@ #ifndef MLN_DEMO_SRC_COLOR_HH # define MLN_DEMO_SRC_COLOR_HH -# ifndef INCLUDE_MLN_FILES -# define MLN_INCLUDE_ONLY -# endif - //# if QT_VERSION >= 0x040000 && QT_VERSION < 0x040400 # include <mln/value/qt/rgb32.hh> diff --git a/milena/sandbox/lazzara/igr/gui/shared/src/igr_types.hh b/milena/sandbox/lazzara/igr/gui/shared/src/igr_types.hh index da64d22..5154b6b 100644 --- a/milena/sandbox/lazzara/igr/gui/shared/src/igr_types.hh +++ b/milena/sandbox/lazzara/igr/gui/shared/src/igr_types.hh @@ -3,10 +3,6 @@ # include <shared/src/color.hh> -# ifndef INCLUDE_MLN_FILES -# define MLN_INCLUDE_ONLY -# endif - # include <mln/value/label_16.hh> # include <mln/value/int_u12.hh> # include <mln/value/int_u8.hh> diff --git a/milena/sandbox/lazzara/igr/gui/shared/src/image_viewer.hh b/milena/sandbox/lazzara/igr/gui/shared/src/image_viewer.hh index c9623b8..5996b1e 100644 --- a/milena/sandbox/lazzara/igr/gui/shared/src/image_viewer.hh +++ b/milena/sandbox/lazzara/igr/gui/shared/src/image_viewer.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -32,10 +33,6 @@ # include <ui_image_viewer.h> -# ifndef INCLUDE_MLN_FILES -# define MLN_INCLUDE_ONLY -# endif - # include <src/igr_types.hh> # include <mln/core/image/image2d.hh> diff --git a/milena/sandbox/lazzara/igr/gui/viewer/src/main.cc b/milena/sandbox/lazzara/igr/gui/viewer/src/main.cc index 4678229..46674c1 100644 --- a/milena/sandbox/lazzara/igr/gui/viewer/src/main.cc +++ b/milena/sandbox/lazzara/igr/gui/viewer/src/main.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -26,6 +27,7 @@ #include <QApplication> #include <QtGui> +#undef MLN_WO_GLOBAL_VARS #include <src/main_window.hh> int main(int argc, char *argv[]) diff --git a/milena/sandbox/lazzara/igr/gui/viewer/src/mln_data.cc b/milena/sandbox/lazzara/igr/gui/viewer/src/mln_data.cc index e43fa15..7579c62 100644 --- a/milena/sandbox/lazzara/igr/gui/viewer/src/mln_data.cc +++ b/milena/sandbox/lazzara/igr/gui/viewer/src/mln_data.cc @@ -1,4 +1,22 @@ -#define INCLUDE_MLN_FILES +// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory +// (LRDE) +// +// This file is part of Olena. +// +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with Olena. If not, see <http://www.gnu.org/licenses/>. + +#include <QtCore> + #include <src/mln_data.hh> #include <mln/core/image/dmorph/slice_image.hh> #include <mln/core/image/image3d.hh> diff --git a/milena/sandbox/lazzara/igr/gui/viewer/src/mln_data.hh b/milena/sandbox/lazzara/igr/gui/viewer/src/mln_data.hh index 9c78742..57ee01f 100644 --- a/milena/sandbox/lazzara/igr/gui/viewer/src/mln_data.hh +++ b/milena/sandbox/lazzara/igr/gui/viewer/src/mln_data.hh @@ -1,13 +1,27 @@ +// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory +// (LRDE) +// +// This file is part of Olena. +// +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with Olena. If not, see <http://www.gnu.org/licenses/>. + + #ifndef IGR_VIEWER_SRC_MLN_DATA_HH # define IGR_VIEWER_SRC_MLN_DATA_HH #include <QtCore/QObject> #include <QtCore/QPointF> -# ifndef INCLUDE_MLN_FILES -# define MLN_INCLUDE_ONLY -# endif - #include <mln/core/image/image3d.hh> #include <shared/src/igr_types.hh> #include <mln/value/int_u12.hh> diff --git a/milena/sandbox/lazzara/igr/gui/viewer/src/mln_widgets.cc b/milena/sandbox/lazzara/igr/gui/viewer/src/mln_widgets.cc deleted file mode 100644 index 2ac5c66..0000000 --- a/milena/sandbox/lazzara/igr/gui/viewer/src/mln_widgets.cc +++ /dev/null @@ -1,2 +0,0 @@ -#include <shared/src/image_viewer.cc> -#include <src/mln_data.cc> diff --git a/milena/sandbox/lazzara/igr/gui/viewer/viewer.pro b/milena/sandbox/lazzara/igr/gui/viewer/viewer.pro index f4ffc14..b384b8f 100644 --- a/milena/sandbox/lazzara/igr/gui/viewer/viewer.pro +++ b/milena/sandbox/lazzara/igr/gui/viewer/viewer.pro @@ -5,19 +5,32 @@ TEMPLATE = app TARGET = DEPENDPATH += . src ui -INCLUDEPATH += . src ../shared ../ $(OLN)/milena /lrde/dev/linux-x86/stable/gdcm/include +INCLUDEPATH += . src ../shared ../ $(OLN)/milena #INCLUDEPATH += . src ../shared ../ $(OLN)/milena /home/inca/local/include -DEFINES= NDEBUG +DEFINES= NDEBUG MLN_WO_GLOBAL_VARS #LIBS += -L/home/inca/local/lib -lgdcmCommon -lgdcmDICT -lgdcmDSED -lgdcmIOD -lgdcmMSFF -lgdcmexpat -lgdcmjpeg12 -lgdcmjpeg16 -lgdcmjpeg8 -lgdcmopenjpeg -lgdcmuuid -lgdcmzlib -LIBS += -L/lrde/dev/linux-x86/stable/gdcm/lib -lgdcmCommon -lgdcmDICT -lgdcmDSED -lgdcmIOD -lgdcmMSFF -lgdcmexpat -lgdcmjpeg12 -lgdcmjpeg16 -lgdcmjpeg8 -lgdcmopenjpeg -lgdcmuuid -lgdcmzlib +LIBS += -lgdcmCommon -lgdcmjpeg12 -lgdcmjpeg16 -lgdcmjpeg8 -lgdcmDICT -lgdcmDSED -lgdcmIOD -lgdcmMSFF -lqwt-qt4 # Input -HEADERS += src/main_window.hh ../shared/src/image_viewer.hh ../shared/src/internal/interactive_scene.hh src/mln_data.hh -FORMS += ui/main_window.ui ../shared/ui/image_viewer.ui -SOURCES += src/main.cc src/main_window.cc ../shared/src/internal/interactive_scene.cc src/mln_widgets.cc +HEADERS += \ + src/main_window.hh \ + ../shared/src/image_viewer.hh \ + ../shared/src/internal/interactive_scene.hh \ + src/mln_data.hh + +FORMS += \ + ui/main_window.ui \ + ../shared/ui/image_viewer.ui + +SOURCES += \ + src/main.cc \ + src/main_window.cc \ + ../shared/src/internal/interactive_scene.cc \ + ../shared/src/image_viewer.cc \ + src/mln_data.cc RESOURCES = ../shared/shared.qrc -- 1.5.6.5

1 0

branch igr deleted: last-svn-commit-706-g8f0158d
by lazzara＠lrde.epita.fr 12 May '11

12 May '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch igr has been deleted was 8f0158d53a1725f7d1170d1b759a1daebb64bc4e ----------------------------------------------------------------------- 8f0158d53a1725f7d1170d1b759a1daebb64bc4e mln/io/dicom/load.hh: Fix invalid data while loading large image. ----------------------------------------------------------------------- hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

branch igr created: last-svn-commit-706-g8f0158d
by lazzara＠lrde.epita.fr 12 May '11

12 May '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch igr has been created at 8f0158d53a1725f7d1170d1b759a1daebb64bc4e (commit) - Log ----------------------------------------------------------------- 8f0158d mln/io/dicom/load.hh: Fix invalid data while loading large image. dab5d67 mln/io/dicom/load.hh: Fix invalid image loading. 881edd2 Use int_u16 instead of int_u12. 04cf923 Add more from_to overloads. 1b4ffab Fix Paths in scripts and build systems. 722f33d Update build system to use MLN_WO_GLOBAL_VARS. 8df88e3 Move IGR code from milena/sandbox to igr's private module. 319827a lazzara/igr/gui/segmentation/src/task_widget.cc: Avoid a warning. 90ac1e4 Update code with nslices() instead of nslis(). a0aa478 Store loaded image with double value type. 27c8f05 Add save button for function plots. 9dd5ec1 Add function visualization in the mean region widget. aa8417d Allow to save results filtered differently in the 3D segmentation tool. 181a278 lazzara/igr/gui/segmentation/src/main_window.cc: Avoid a warning in 2D segmentation tool. a54cebf Add missing defines in headers. 687f97b Split compilation of files including Milena's headers. 62569b3 Add an image loader in the anapath GUI. 1d4349d Fix compilation 522f81f Add a tool to superpose segmentation images. b6b6df1 Update GUI according last IGR's needs. cdda6fe Add specific routines in mln. adea41d Add a tool for anapath filtering. ed2fd90 Remove deprecated IGR's segmentation tool. b394deb Improve IGR's segmentation tools. 1e5f309 Improve 2D+t segmentation tool. 6374b5e Improve the display of the normalized image. 9b9e09a Thread image loading. db74d4f Cleanup I/O and documentation in IGR's code. f1c1798 Add new GUIs for IGR. ----------------------------------------------------------------------- hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

branch next updated: last-svn-commit-540-gc4bb3f8
by lazzara＠lrde.epita.fr 12 May '11

12 May '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch next has been updated via c4bb3f89369ffeb277be7c669a9b08b583bfc795 (commit) from 742ddd1264342667c087c0d6cb17e7bd0203dc95 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- c4bb3f8 mln/io/dicom/load.hh: Fix invalid data while loading large image. ----------------------------------------------------------------------- Summary of changes: milena/ChangeLog | 5 +++++ milena/mln/io/dicom/load.hh | 32 +++++++++++++++++++------------- 2 files changed, 24 insertions(+), 13 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

last-svn-commit-706-g8f0158d mln/io/dicom/load.hh: Fix invalid data while loading large image.
by Guillaume Lazzara 12 May '11

12 May '11

--- milena/ChangeLog | 5 +++++ milena/mln/io/dicom/load.hh | 37 ++++++++++++++++++------------------- 2 files changed, 23 insertions(+), 19 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 994efe7..1939611 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,8 @@ +2011-05-12 Guillaume Lazzara <z(a)lrde.epita.fr> + + * mln/io/dicom/load.hh: Fix invalid data while loading large + image. + 2011-01-27 Guillaume Lazzara <z(a)lrde.epita.fr> * mln/io/dicom/load.hh: Fix invalid image loading. diff --git a/milena/mln/io/dicom/load.hh b/milena/mln/io/dicom/load.hh index 1823b18..be75bdf 100644 --- a/milena/mln/io/dicom/load.hh +++ b/milena/mln/io/dicom/load.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009, 2011 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -143,14 +144,21 @@ namespace mln algebra::vec<mln_site_(I)::dim, unsigned int> vmin; algebra::vec<mln_site_(I)::dim, unsigned int> vmax; algebra::vec<mln_site_(I)::dim, unsigned int> vdims; - for (int i = 0; i < ndims; ++i) + int j = ndims - 1; + for (int i = 0; i < ndims; ++i, --j) { vmin[i] = 0; vmax[i] = dims[i] - 1; if (i == 0) - vdims[i] = 1; + vdims[j] = 1; else - vdims[i] = dims[i - 1] * vdims[i - 1]; + vdims[j] = dims[i - 1] * vdims[j + 1]; + } + + if (ndims > 1) + { + std::swap(vmin[0], vmin[1]); + std::swap(vmax[0], vmax[1]); } mln_site(I) pmin(vmin); @@ -160,31 +168,22 @@ namespace mln mln_piter(I) p(ima.domain()); unsigned int index = 0; - // FIXME: HACK. We may prefer to change the way we access the - // data instead of swapping that information. If swap is not - // performed, the loaded image is rotated and symmetrized. - std::swap(vdims[0], vdims[1]); - - // int k = 0; for_all(p) { index = 0; for (int i = 0; i < ndims; ++i) { - index += p.to_site().to_vec()[i] * vdims[i]; + index += p[i] * vdims[i]; } - ima(p) = (unsigned char) dataBuffer[(index * bytes_allocated) * samples_per_pixel]; + mln_value(I) v = (unsigned char) dataBuffer[(index * bytes_allocated) * samples_per_pixel]; // FIXME: RGB support, HighBit if HB == 1 - for (int j = 0; j < bytes_allocated; ++j) + for (unsigned int j = 0; j < bytes_allocated; ++j) { - ima(p) += ((unsigned char) dataBuffer[(index * bytes_allocated + j) * samples_per_pixel]) * 256 * j; + v += ((unsigned char) dataBuffer[(index * bytes_allocated + j) * samples_per_pixel]) * 256 * j; } - /*std::cout << "[ x = " << p.to_site().to_vec()[0] - << " | y = " << p.to_site().to_vec()[1] - << " | z = " << p.to_site().to_vec()[2] - << " ] => " << ima(p) - << std::endl;*/ + + ima(p) = v; } delete(dataBuffer); -- 1.5.6.5

1 0

branch unstable/scribo updated: last-svn-commit-867-g9d8ad62
by lazzara＠lrde.epita.fr 11 May '11

11 May '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch unstable/scribo has been updated via 9d8ad622a97eb18dec9decd8461b3b05c5f4566c (commit) via fcbcf9bd9a68e4b0b17565e317a08fd38ee8881f (commit) from 32b4b85ab922c2384553543763a7eb4989023f6f (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- 9d8ad62 Small fixes in Scribo. fcbcf9b Stats correction. ----------------------------------------------------------------------- Summary of changes: scribo/ChangeLog | 11 +++++++++++ scribo/scribo/core/stats.hh | 2 +- scribo/scribo/primitive/extract/lines_pattern.hh | 7 ++++--- scribo/scribo/primitive/extract/non_text.hh | 4 ++-- scribo/scribo/text/merging.hh | 9 ++++++--- scribo/src/primitive/extract/alignments.cc | 1 + 6 files changed, 25 insertions(+), 9 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

last-svn-commit-867-g9d8ad62 Small fixes in Scribo.
by Guillaume Lazzara 11 May '11

11 May '11

* scribo/primitive/extract/lines_pattern.hh: Fix missing include. * scribo/primitive/extract/non_text.hh: Change debug level for debug image. * src/primitive/extract/alignments.cc: Improve comment. --- scribo/ChangeLog | 11 +++++++++++ scribo/scribo/primitive/extract/lines_pattern.hh | 7 ++++--- scribo/scribo/primitive/extract/non_text.hh | 4 ++-- scribo/src/primitive/extract/alignments.cc | 1 + 4 files changed, 18 insertions(+), 5 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index f4dcf15..08642d5 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,14 @@ +2011-05-11 Guillaume Lazzara <lazzara(a)fidji.lrde.epita.fr> + + Small fixes in Scribo. + + * scribo/primitive/extract/lines_pattern.hh: Fix missing include. + + * scribo/primitive/extract/non_text.hh: Change debug level for + debug image. + + * src/primitive/extract/alignments.cc: Improve comment. + 2011-05-06 Guillaume Lazzara <lazzara(a)lrde.epita.fr> Load and save color information. diff --git a/scribo/scribo/primitive/extract/lines_pattern.hh b/scribo/scribo/primitive/extract/lines_pattern.hh index f96c7b3..85bdbe4 100644 --- a/scribo/scribo/primitive/extract/lines_pattern.hh +++ b/scribo/scribo/primitive/extract/lines_pattern.hh @@ -195,9 +195,10 @@ namespace scribo continue; } - // If the background parts of the pattern have exactly or - // less than 95% of background pixels, the current pixel is - // considered as part of the background. + // If the background parts of the pattern have exactly + // or less than 95% of background pixels each, the + // current pixel is considered as part of the + // background. is_foreground = true; for (unsigned i = 0; i < q_arr.size(); ++i) if ((length - *(tmp_ptr + q_arr[i])) < miss_ratio) diff --git a/scribo/scribo/primitive/extract/non_text.hh b/scribo/scribo/primitive/extract/non_text.hh index e2a6a03..0ceee13 100644 --- a/scribo/scribo/primitive/extract/non_text.hh +++ b/scribo/scribo/primitive/extract/non_text.hh @@ -329,9 +329,9 @@ namespace scribo // Debug { - debug::logger().log_image(debug::Special,//debug::AuxiliaryResults, + debug::logger().log_image(debug::AuxiliaryResults, txt, "txt_components"); - debug::logger().log_image(debug::Special,//debug::AuxiliaryResults, + debug::logger().log_image(debug::AuxiliaryResults, txtblocks, "txt_blocks"); } diff --git a/scribo/src/primitive/extract/alignments.cc b/scribo/src/primitive/extract/alignments.cc index 2508ec9..6690b17 100644 --- a/scribo/src/primitive/extract/alignments.cc +++ b/scribo/src/primitive/extract/alignments.cc @@ -30,6 +30,7 @@ #include <scribo/text/extract_lines_wo_merge.hh> #include <scribo/primitive/extract/alignments.hh> +#include <scribo/primitive/remove/separators.hh> #include <scribo/debug/usage.hh> const char *args_desc[][2] = -- 1.5.6.5

1 0

branch julien_temp_paragraphs updated: last-svn-commit-841-g3c34377
by git＠lrde.epita.fr 09 May '11

09 May '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch julien_temp_paragraphs has been updated via 3c34377d73d008a4b76275f4498094d20ead4907 (commit) via 2982cdf5fe2596d9bddf6866dab9019d8be87c29 (commit) from 6de9f46259689a7e2e125e79da07c3bd7335d8be (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- 3c34377 Stats correction. 2982cdf Correcting bug in stats ----------------------------------------------------------------------- Summary of changes: scribo/scribo/core/stats.hh | 14 ++++++++------ scribo/scribo/text/merging.hh | 9 ++++++--- 2 files changed, 14 insertions(+), 9 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0