* 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 &lt;z(a)lrde.epita.fr&gt; + + 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 &lt;z(a)lrde.epita.fr&gt; 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