# HG changeset patch # User Sebastien Jodogne # Date 1516726219 -3600 # Node ID f48c5d422d45d10a39725ef412a0eb988715b3e4 # Parent fb7d602e70253af17fc007222a5b131b24d2dbef removed meaningless ImageInterpolation_Linear value diff -r fb7d602e7025 -r f48c5d422d45 Applications/Samples/BasicPetCtFusionApplication.h --- a/Applications/Samples/BasicPetCtFusionApplication.h Mon Jan 22 17:30:34 2018 +0100 +++ b/Applications/Samples/BasicPetCtFusionApplication.h Tue Jan 23 17:50:19 2018 +0100 @@ -87,13 +87,13 @@ { RenderStyle style = widget.GetLayerStyle(layer); - if (style.interpolation_ == ImageInterpolation_Linear) + if (style.interpolation_ == ImageInterpolation_Bilinear) { style.interpolation_ = ImageInterpolation_Nearest; } else { - style.interpolation_ = ImageInterpolation_Linear; + style.interpolation_ = ImageInterpolation_Bilinear; } widget.SetLayerStyle(layer, style); diff -r fb7d602e7025 -r f48c5d422d45 Applications/Samples/SingleFrameApplication.h --- a/Applications/Samples/SingleFrameApplication.h Mon Jan 22 17:30:34 2018 +0100 +++ b/Applications/Samples/SingleFrameApplication.h Tue Jan 23 17:50:19 2018 +0100 @@ -223,7 +223,7 @@ ("frame", boost::program_options::value()->default_value(0), "Number of the frame, for multi-frame DICOM instances") ("smooth", boost::program_options::value()->default_value(true), - "Enable linear interpolation to smooth the image") + "Enable bilinear interpolation to smooth the image") ; options.add(generic); @@ -262,7 +262,7 @@ if (parameters["smooth"].as()) { - s.interpolation_ = ImageInterpolation_Linear; + s.interpolation_ = ImageInterpolation_Bilinear; } //s.drawGrid_ = true; @@ -302,7 +302,7 @@ s.alpha_ = 0.5; s.applyLut_ = true; s.lut_ = Orthanc::EmbeddedResources::COLORMAP_JET; - s.interpolation_ = ImageInterpolation_Linear; + s.interpolation_ = ImageInterpolation_Bilinear; widget->SetLayerStyle(1, s); } #endif diff -r fb7d602e7025 -r f48c5d422d45 Applications/Samples/SingleVolumeApplication.h --- a/Applications/Samples/SingleVolumeApplication.h Mon Jan 22 17:30:34 2018 +0100 +++ b/Applications/Samples/SingleVolumeApplication.h Tue Jan 23 17:50:19 2018 +0100 @@ -195,7 +195,7 @@ s.alpha_ = 1; s.applyLut_ = true; s.lut_ = Orthanc::EmbeddedResources::COLORMAP_JET; - s.interpolation_ = ImageInterpolation_Linear; + s.interpolation_ = ImageInterpolation_Bilinear; widget->SetLayerStyle(0, s); } #else @@ -241,7 +241,7 @@ s.alpha_ = 0.5; s.applyLut_ = true; s.lut_ = Orthanc::EmbeddedResources::COLORMAP_JET; - s.interpolation_ = ImageInterpolation_Linear; + s.interpolation_ = ImageInterpolation_Bilinear; s.windowing_ = ImageWindowing_Custom; s.customWindowCenter_ = 0; s.customWindowWidth_ = 128; diff -r fb7d602e7025 -r f48c5d422d45 Framework/Enumerations.h --- a/Framework/Enumerations.h Mon Jan 22 17:30:34 2018 +0100 +++ b/Framework/Enumerations.h Tue Jan 23 17:50:19 2018 +0100 @@ -63,7 +63,6 @@ enum ImageInterpolation { ImageInterpolation_Nearest, - ImageInterpolation_Linear, ImageInterpolation_Bilinear, ImageInterpolation_Trilinear }; diff -r fb7d602e7025 -r f48c5d422d45 Framework/Layers/FrameRenderer.cpp --- a/Framework/Layers/FrameRenderer.cpp Mon Jan 22 17:30:34 2018 +0100 +++ b/Framework/Layers/FrameRenderer.cpp Tue Jan 23 17:50:19 2018 +0100 @@ -74,7 +74,7 @@ cairo_pattern_set_filter(cairo_get_source(cr), CAIRO_FILTER_NEAREST); break; - case ImageInterpolation_Linear: + case ImageInterpolation_Bilinear: cairo_pattern_set_filter(cairo_get_source(cr), CAIRO_FILTER_BILINEAR); break;