Mercurial > hg > orthanc-stone

comparison Framework/Oracle/GenericOracleRunner.cpp @ 1150:7aad0984d38a broker

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 15 Nov 2019 12:38:15 +0100
parents 2da8b4d6f8c1
children 48befc2bf66d
comparison
equal deleted inserted replaced
1149:2da8b4d6f8c1 1150:7aad0984d38a
350 class DicomHandlerWithCache : public IDicomHandler 350 class DicomHandlerWithCache : public IDicomHandler
351 { 351 {
352 private: 352 private:
353 boost::weak_ptr<IObserver> receiver_; 353 boost::weak_ptr<IObserver> receiver_;
354 IMessageEmitter& emitter_; 354 IMessageEmitter& emitter_;
355 boost::shared_ptr<ParsedDicomFileCache> cache_; 355 boost::shared_ptr<ParsedDicomCache> cache_;
356 356
357 public: 357 public:
358 DicomHandlerWithCache(boost::weak_ptr<IObserver> receiver, 358 DicomHandlerWithCache(boost::weak_ptr<IObserver> receiver,
359 IMessageEmitter& emitter, 359 IMessageEmitter& emitter,
360 boost::shared_ptr<ParsedDicomFileCache> cache) : 360 boost::shared_ptr<ParsedDicomCache> cache) :
361 receiver_(receiver), 361 receiver_(receiver),
362 emitter_(emitter), 362 emitter_(emitter),
363 cache_(cache) 363 cache_(cache)
364 { 364 {
365 if (!cache) 365 if (!cache)
395 } 395 }
396 396
397 397
398 static void RunInternal(boost::weak_ptr<IObserver> receiver, 398 static void RunInternal(boost::weak_ptr<IObserver> receiver,
399 IMessageEmitter& emitter, 399 IMessageEmitter& emitter,
400 boost::shared_ptr<ParsedDicomFileCache> cache, 400 boost::shared_ptr<ParsedDicomCache> cache,
401 const std::string& root, 401 const std::string& root,
402 const ParseDicomFileCommand& command) 402 const ParseDicomFileCommand& command)
403 { 403 {
404 const std::string path = GetPath(root, command.GetPath()); 404 const std::string path = GetPath(root, command.GetPath());
405 405
406 #if 1 406 #if 1
407 if (cache.get()) 407 if (cache.get())
408 { 408 {
409 { 409 {
410 ParsedDicomFileCache::Reader reader(*cache, path); 410 ParsedDicomCache::Reader reader(*cache, path);
411 if (reader.IsValid() && 411 if (reader.IsValid() &&
412 (!command.IsPixelDataIncluded() || 412 (!command.IsPixelDataIncluded() ||
413 reader.HasPixelData())) 413 reader.HasPixelData()))
414 { 414 {
415 // Reuse the DICOM file from the cache 415 // Reuse the DICOM file from the cache