Mercurial > hg > orthanc-stone
diff Framework/Toolbox/OrthancSlicesLoader.h @ 318:3a4ca166fafa am-2
ImageAccessor refactoring + implemented Image Cache in SmartLoader
author | am@osimis.io |
---|---|
date | Mon, 08 Oct 2018 17:10:08 +0200 |
parents | b4abaeb783b1 |
children | 814fa32e2fcc |
line wrap: on
line diff
--- a/Framework/Toolbox/OrthancSlicesLoader.h Fri Oct 05 11:57:36 2018 +0200 +++ b/Framework/Toolbox/OrthancSlicesLoader.h Mon Oct 08 17:10:08 2018 +0200 @@ -13,7 +13,7 @@ * 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 <http://www.gnu.org/licenses/>. **/ @@ -27,6 +27,8 @@ #include "../Messages/IObservable.h" #include <boost/shared_ptr.hpp> #include "OrthancApiClient.h" +#include "Core/Images/Image.h" + namespace OrthancStone { @@ -41,13 +43,13 @@ { unsigned int sliceIndex_; const Slice& slice_; - std::auto_ptr<Orthanc::ImageAccessor>& image_; + boost::shared_ptr<Orthanc::ImageAccessor> image_; SliceImageQuality effectiveQuality_; SliceImageReadyMessage(unsigned int sliceIndex, - const Slice& slice, - std::auto_ptr<Orthanc::ImageAccessor>& image, - SliceImageQuality effectiveQuality) + const Slice& slice, + boost::shared_ptr<Orthanc::ImageAccessor> image, + SliceImageQuality effectiveQuality) : BaseMessage(), sliceIndex_(sliceIndex), slice_(slice), @@ -64,8 +66,8 @@ SliceImageQuality effectiveQuality_; SliceImageErrorMessage(unsigned int sliceIndex, - const Slice& slice, - SliceImageQuality effectiveQuality) + const Slice& slice, + SliceImageQuality effectiveQuality) : BaseMessage(), slice_(slice), sliceIndex_(sliceIndex), @@ -100,8 +102,8 @@ SlicesSorter slices_; void NotifySliceImageSuccess(const Operation& operation, - std::auto_ptr<Orthanc::ImageAccessor>& image); - + boost::shared_ptr<Orthanc::ImageAccessor> image); + void NotifySliceImageError(const Operation& operation); void OnGeometryError(const OrthancApiClient::HttpErrorMessage& message);