Mercurial > hg > orthanc-stone
changeset 1113:3924ddbbadda
merge
| author | Alain Mazy <alain@mazy.be> |
|---|---|
| date | Mon, 04 Nov 2019 12:47:13 +0100 |
| parents | d33ae2b0db9d (diff) c7388dfcd555 (current diff) |
| children | 33b0a762e98a 35e798b16b65 |
| files | |
| diffstat | 4 files changed, 6 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/Framework/Deprecated/Toolbox/ViewportGeometry.cpp Mon Oct 28 11:14:05 2019 +0100 +++ b/Framework/Deprecated/Toolbox/ViewportGeometry.cpp Mon Nov 04 12:47:13 2019 +0100 @@ -81,9 +81,9 @@ void ViewportGeometry::SetSceneExtent(const OrthancStone::Extent2D& extent) { - LOG(INFO) << "New scene extent: (" - << extent.GetX1() << "," << extent.GetY1() << ") => (" - << extent.GetX2() << "," << extent.GetY2() << ")"; +// LOG(INFO) << "New scene extent: (" +// << extent.GetX1() << "," << extent.GetY1() << ") => (" +// << extent.GetX2() << "," << extent.GetY2() << ")"; sceneExtent_ = extent; ComputeTransform();
--- a/Framework/Radiography/RadiographyLayer.cpp Mon Oct 28 11:14:05 2019 +0100 +++ b/Framework/Radiography/RadiographyLayer.cpp Mon Nov 04 12:47:13 2019 +0100 @@ -225,13 +225,6 @@ void RadiographyLayer::SetSize(unsigned int width, unsigned int height) { - if (hasSize_ && - (width != width_ || - height != height_)) - { - throw Orthanc::OrthancException(Orthanc::ErrorCode_IncompatibleImageSize); - } - hasSize_ = true; width_ = width; height_ = height;
--- a/Framework/Radiography/RadiographyScene.cpp Mon Oct 28 11:14:05 2019 +0100 +++ b/Framework/Radiography/RadiographyScene.cpp Mon Nov 04 12:47:13 2019 +0100 @@ -134,7 +134,7 @@ std::auto_ptr<RadiographyLayer> raii(layer); - LOG(INFO) << "Registering layer: " << countLayers_; + // LOG(INFO) << "Registering layer: " << countLayers_; size_t index = countLayers_++; raii->SetIndex(index);
--- a/Framework/Radiography/RadiographyWidget.cpp Mon Oct 28 11:14:05 2019 +0100 +++ b/Framework/Radiography/RadiographyWidget.cpp Mon Nov 04 12:47:13 2019 +0100 @@ -240,15 +240,14 @@ void RadiographyWidget::OnGeometryChanged(const RadiographyScene::GeometryChangedMessage& message) { - LOG(INFO) << "Scene geometry has changed"; - +// LOG(INFO) << "Scene geometry has changed"; FitContent(); } void RadiographyWidget::OnContentChanged(const RadiographyScene::ContentChangedMessage& message) { - LOG(INFO) << "Scene content has changed"; +// LOG(INFO) << "Scene content has changed"; NotifyContentChanged(); }