# HG changeset patch # User Sebastien Jodogne # Date 1577699666 -3600 # Node ID a4bb8c2dd21192c52c9aec06eed4fdafe0abb404 # Parent 358461330978df3581785bf1182b998d04f437cb# Parent 8f6c2f9d0fe24f348aa86a7ed8061e60e6043fec integration mainline->broker diff -r 358461330978 -r a4bb8c2dd211 .hgtags --- a/.hgtags Mon Dec 09 20:45:47 2019 +0100 +++ b/.hgtags Mon Dec 30 10:54:26 2019 +0100 @@ -39,3 +39,4 @@ 640feb146fa8186ac4e5ecb87d18b267750ccec3 toa2019102801 33b0a762e98ade4e1f00e26bf865b417269443fb toa2019110401 76705b430c78d4ca0a718c6164ac4b73ce007fde toa2019110801 +ce3052f28f2e6e7b29cfad4efae4e3881e70b056 toa2019122001 diff -r 358461330978 -r a4bb8c2dd211 Framework/Radiography/RadiographyAlphaLayer.cpp --- a/Framework/Radiography/RadiographyAlphaLayer.cpp Mon Dec 09 20:45:47 2019 +0100 +++ b/Framework/Radiography/RadiographyAlphaLayer.cpp Mon Dec 30 10:54:26 2019 +0100 @@ -91,7 +91,6 @@ return; // layer is outside the buffer } - printf("rendering alpha: %d \n", y1); t.Apply(tmp, cropped, interpolation, true /* clear */); float value = foreground_; diff -r 358461330978 -r a4bb8c2dd211 Framework/Radiography/RadiographyWidget.cpp --- a/Framework/Radiography/RadiographyWidget.cpp Mon Dec 09 20:45:47 2019 +0100 +++ b/Framework/Radiography/RadiographyWidget.cpp Mon Dec 30 10:54:26 2019 +0100 @@ -191,7 +191,7 @@ BroadcastMessage(SelectionChangedMessage(*this)); } - bool RadiographyWidget::LookupSelectedLayer(size_t& layer) + bool RadiographyWidget::LookupSelectedLayer(size_t& layer) const { if (hasSelection_) { @@ -262,6 +262,8 @@ Register(*scene_, &RadiographyWidget::OnContentChanged); Register(*scene_, &RadiographyWidget::OnLayerRemoved); + Unselect(); + NotifyContentChanged(); // force redraw diff -r 358461330978 -r a4bb8c2dd211 Framework/Radiography/RadiographyWidget.h --- a/Framework/Radiography/RadiographyWidget.h Mon Dec 09 20:45:47 2019 +0100 +++ b/Framework/Radiography/RadiographyWidget.h Mon Dec 30 10:54:26 2019 +0100 @@ -81,7 +81,7 @@ template bool SelectLayerByType(size_t index = 0); - bool LookupSelectedLayer(size_t& layer); + bool LookupSelectedLayer(size_t& layer) const; void OnGeometryChanged(const RadiographyScene::GeometryChangedMessage& message); diff -r 358461330978 -r a4bb8c2dd211 Framework/Viewport/WebAssemblyViewport.cpp diff -r 358461330978 -r a4bb8c2dd211 Framework/Viewport/WebAssemblyViewport.h