# HG changeset patch # User Benjamin Golinvaux # Date 1583311449 -3600 # Node ID 83af7e562b450f92ee725d7dfcaf0c97cf503e9b # Parent 68579a31eeb4b6fa8bd3c9f71a443b8ae1d7eade IGeometryProvider interface for deprecated loaders (required for AB testing in older app) diff -r 68579a31eeb4 -r 83af7e562b45 Framework/Deprecated/Loaders/OrthancMultiframeVolumeLoader.h --- a/Framework/Deprecated/Loaders/OrthancMultiframeVolumeLoader.h Tue Feb 04 15:24:03 2020 +0100 +++ b/Framework/Deprecated/Loaders/OrthancMultiframeVolumeLoader.h Wed Mar 04 09:44:09 2020 +0100 @@ -23,6 +23,7 @@ #include "LoaderStateMachine.h" #include "../../Volumes/DicomVolumeImage.h" +#include "../Volumes/IGeometryProvider.h" #include @@ -30,7 +31,8 @@ { class OrthancMultiframeVolumeLoader : public LoaderStateMachine, - public OrthancStone::IObservable + public OrthancStone::IObservable, + public IGeometryProvider { private: class LoadRTDoseGeometry; diff -r 68579a31eeb4 -r 83af7e562b45 Framework/Deprecated/Loaders/OrthancSeriesVolumeProgressiveLoader.h --- a/Framework/Deprecated/Loaders/OrthancSeriesVolumeProgressiveLoader.h Tue Feb 04 15:24:03 2020 +0100 +++ b/Framework/Deprecated/Loaders/OrthancSeriesVolumeProgressiveLoader.h Wed Mar 04 09:44:09 2020 +0100 @@ -33,6 +33,9 @@ #include "../../Volumes/DicomVolumeImage.h" #include "../../Volumes/IVolumeSlicer.h" +#include "../Volumes/IGeometryProvider.h" + + #include namespace Deprecated @@ -44,7 +47,8 @@ class OrthancSeriesVolumeProgressiveLoader : public OrthancStone::ObserverBase, public OrthancStone::IObservable, - public OrthancStone::IVolumeSlicer + public OrthancStone::IVolumeSlicer, + public IGeometryProvider { private: static const unsigned int LOW_QUALITY = 0; diff -r 68579a31eeb4 -r 83af7e562b45 Framework/Deprecated/Volumes/IGeometryProvider.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Framework/Deprecated/Volumes/IGeometryProvider.h Wed Mar 04 09:44:09 2020 +0100 @@ -0,0 +1,35 @@ +/** + * Stone of Orthanc + * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics + * Department, University Hospital of Liege, Belgium + * Copyright (C) 2017-2020 Osimis S.A., Belgium + * + * This program is free software: you can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License + * as published by the Free Software Foundation, either version 3 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + **/ + + +#pragma once + +#include "../../Volumes/VolumeImageGeometry.h" + +namespace Deprecated +{ + class IGeometryProvider + { + public: + virtual ~IGeometryProvider() {} + virtual bool HasGeometry() const = 0; + virtual const OrthancStone::VolumeImageGeometry& GetImageGeometry() const = 0; + }; +}