Mercurial > hg > orthanc-stone

comparison Framework/Loaders/SeriesFramesLoader.cpp @ 1484:121d01aa328e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
SeriesThumbnailsLoader working on raw dicom files
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 22 Jun 2020 17:46:40 +0200
parents 30deba7bc8e2
children
comparison
equal deleted inserted replaced
1483:6abd819aa534 1484:121d01aa328e
413 assert(quality == 0); 413 assert(quality == 0);
414 414
415 std::string file; 415 std::string file;
416 if (dicomDir_->LookupStringValue(file, sopInstanceUid, Orthanc::DICOM_TAG_REFERENCED_FILE_ID)) 416 if (dicomDir_->LookupStringValue(file, sopInstanceUid, Orthanc::DICOM_TAG_REFERENCED_FILE_ID))
417 { 417 {
418 std::unique_ptr<ParseDicomFromFileCommand> command(new ParseDicomFromFileCommand(dicomDirPath_, file)); 418 std::unique_ptr<ParseDicomFromFileCommand> command(new ParseDicomFromFileCommand(source, dicomDirPath_, file));
419 command->SetPixelDataIncluded(true); 419 command->SetPixelDataIncluded(true);
420 command->AcquirePayload(new Payload(source, index, sopInstanceUid, quality, protection.release())); 420 command->AcquirePayload(new Payload(source, index, sopInstanceUid, quality, protection.release()));
421 421
422 { 422 {
423 std::unique_ptr<ILoadersContext::ILock> lock(context_.Lock()); 423 std::unique_ptr<ILoadersContext::ILock> lock(context_.Lock());
472 std::unique_ptr<Payload> payload(new Payload(source, index, sopInstanceUid, quality, protection.release())); 472 std::unique_ptr<Payload> payload(new Payload(source, index, sopInstanceUid, quality, protection.release()));
473 473
474 const std::map<std::string, std::string> empty; 474 const std::map<std::string, std::string> empty;
475 475
476 std::unique_ptr<ParseDicomFromWadoCommand> command( 476 std::unique_ptr<ParseDicomFromWadoCommand> command(
477 new ParseDicomFromWadoCommand(sopInstanceUid, source.CreateDicomWebCommand(uri, empty, empty, NULL))); 477 new ParseDicomFromWadoCommand(source, sopInstanceUid, source.CreateDicomWebCommand(uri, empty, empty, NULL)));
478 command->AcquirePayload(payload.release()); 478 command->AcquirePayload(payload.release());
479 479
480 { 480 {
481 std::unique_ptr<ILoadersContext::ILock> lock(context_.Lock()); 481 std::unique_ptr<ILoadersContext::ILock> lock(context_.Lock());
482 lock->Schedule(GetSharedObserver(), priority, command.release()); 482 lock->Schedule(GetSharedObserver(), priority, command.release());