# HG changeset patch # User Alain Mazy # Date 1570628101 -7200 # Node ID b26fb3a99f01e29992682f0b6b48c5316ed922ac # Parent 08cdcadfab141461e4b0a81a65bdea66a5d94f60# Parent 95939fa925f6a7b1a329237cc872757882e041c8 merge diff -r 95939fa925f6 -r b26fb3a99f01 Framework/Radiography/RadiographyWindowingTracker.cpp --- a/Framework/Radiography/RadiographyWindowingTracker.cpp Tue Oct 08 17:23:27 2019 +0200 +++ b/Framework/Radiography/RadiographyWindowingTracker.cpp Wed Oct 09 15:35:01 2019 +0200 @@ -20,6 +20,7 @@ #include "RadiographyWindowingTracker.h" +#include "RadiographyWidget.h" #include @@ -115,6 +116,8 @@ RadiographyWindowingTracker::RadiographyWindowingTracker(UndoRedoStack& undoRedoStack, RadiographyScene& scene, + RadiographyWidget& widget, + ImageInterpolation interpolationDuringTracking, int x, int y, Action leftAction, @@ -123,6 +126,8 @@ Action downAction) : undoRedoStack_(undoRedoStack), scene_(scene), + widget_(widget), + initialWidgetInterpolation_(widget.GetInterpolation()), clickX_(x), clickY_(y), leftAction_(leftAction), @@ -131,6 +136,7 @@ downAction_(downAction) { scene_.GetWindowingWithDefault(sourceCenter_, sourceWidth_); + widget_.SetInterpolation(interpolationDuringTracking); float minValue, maxValue; scene.GetRange(minValue, maxValue); @@ -156,6 +162,7 @@ void RadiographyWindowingTracker::MouseUp() { + widget_.SetInterpolation(initialWidgetInterpolation_); undoRedoStack_.Add(new UndoRedoCommand(*this)); } diff -r 95939fa925f6 -r b26fb3a99f01 Framework/Radiography/RadiographyWindowingTracker.h --- a/Framework/Radiography/RadiographyWindowingTracker.h Tue Oct 08 17:23:27 2019 +0200 +++ b/Framework/Radiography/RadiographyWindowingTracker.h Wed Oct 09 15:35:01 2019 +0200 @@ -27,6 +27,9 @@ namespace OrthancStone { + + class RadiographyWidget; + class RadiographyWindowingTracker : public Deprecated::IWorldSceneMouseTracker { public: @@ -43,6 +46,8 @@ UndoRedoStack& undoRedoStack_; RadiographyScene& scene_; + RadiographyWidget& widget_; + ImageInterpolation initialWidgetInterpolation_; int clickX_; int clickY_; Action leftAction_; @@ -62,6 +67,8 @@ public: RadiographyWindowingTracker(UndoRedoStack& undoRedoStack, RadiographyScene& scene, + RadiographyWidget& widget, + ImageInterpolation interpolationDuringTracking, int x, int y, Action leftAction,