comparison Core/Enumerations.h @ 2382:7284093111b0

big reorganization to cleanly separate framework vs. server
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 29 Aug 2017 21:17:35 +0200
parents b8969010b534
children 7e217a1cc63f
comparison
equal deleted inserted replaced
2381:b8969010b534 2382:7284093111b0
441 ValueRepresentation_UnsignedShort = 30, // US (uint16_t) 441 ValueRepresentation_UnsignedShort = 30, // US (uint16_t)
442 ValueRepresentation_UnlimitedText = 31, // UT 442 ValueRepresentation_UnlimitedText = 31, // UT
443 ValueRepresentation_NotSupported // Not supported by Orthanc, or tag not in dictionary 443 ValueRepresentation_NotSupported // Not supported by Orthanc, or tag not in dictionary
444 }; 444 };
445 445
446 enum DicomReplaceMode
447 {
448 DicomReplaceMode_InsertIfAbsent,
449 DicomReplaceMode_ThrowIfAbsent,
450 DicomReplaceMode_IgnoreIfAbsent
451 };
452
453 enum DicomToJsonFormat
454 {
455 DicomToJsonFormat_Full,
456 DicomToJsonFormat_Short,
457 DicomToJsonFormat_Human
458 };
459
460 enum DicomToJsonFlags
461 {
462 DicomToJsonFlags_IncludeBinary = (1 << 0),
463 DicomToJsonFlags_IncludePrivateTags = (1 << 1),
464 DicomToJsonFlags_IncludeUnknownTags = (1 << 2),
465 DicomToJsonFlags_IncludePixelData = (1 << 3),
466 DicomToJsonFlags_ConvertBinaryToAscii = (1 << 4),
467 DicomToJsonFlags_ConvertBinaryToNull = (1 << 5),
468
469 // Some predefined combinations
470 DicomToJsonFlags_None = 0,
471 DicomToJsonFlags_Default = (DicomToJsonFlags_IncludeBinary |
472 DicomToJsonFlags_IncludePixelData |
473 DicomToJsonFlags_IncludePrivateTags |
474 DicomToJsonFlags_IncludeUnknownTags |
475 DicomToJsonFlags_ConvertBinaryToNull)
476 };
477
478 enum DicomFromJsonFlags
479 {
480 DicomFromJsonFlags_DecodeDataUriScheme = (1 << 0),
481 DicomFromJsonFlags_GenerateIdentifiers = (1 << 1)
482 };
483
484 enum DicomVersion
485 {
486 DicomVersion_2008,
487 DicomVersion_2017c
488 };
489
490 enum ModalityManufacturer
491 {
492 ModalityManufacturer_Generic,
493 ModalityManufacturer_GenericNoWildcardInDates,
494 ModalityManufacturer_GenericNoUniversalWildcard,
495 ModalityManufacturer_StoreScp,
496 ModalityManufacturer_ClearCanvas,
497 ModalityManufacturer_Dcm4Chee,
498 ModalityManufacturer_Vitrea
499 };
500
501 enum DicomRequestType
502 {
503 DicomRequestType_Echo,
504 DicomRequestType_Find,
505 DicomRequestType_Get,
506 DicomRequestType_Move,
507 DicomRequestType_Store
508 };
509
510 enum TransferSyntax
511 {
512 TransferSyntax_Deflated,
513 TransferSyntax_Jpeg,
514 TransferSyntax_Jpeg2000,
515 TransferSyntax_JpegLossless,
516 TransferSyntax_Jpip,
517 TransferSyntax_Mpeg2,
518 TransferSyntax_Rle
519 };
520
446 521
447 /** 522 /**
448 * WARNING: Do not change the explicit values in the enumerations 523 * WARNING: Do not change the explicit values in the enumerations
449 * below this point. This would result in incompatible databases 524 * below this point. This would result in incompatible databases
450 * between versions of Orthanc! 525 * between versions of Orthanc!
511 586
512 const char* EnumerationToString(RequestOrigin origin); 587 const char* EnumerationToString(RequestOrigin origin);
513 588
514 const char* EnumerationToString(PixelFormat format); 589 const char* EnumerationToString(PixelFormat format);
515 590
591 const char* EnumerationToString(ModalityManufacturer manufacturer);
592
593 const char* EnumerationToString(DicomRequestType type);
594
595 const char* EnumerationToString(TransferSyntax syntax);
596
597 const char* EnumerationToString(DicomVersion version);
598
516 Encoding StringToEncoding(const char* encoding); 599 Encoding StringToEncoding(const char* encoding);
517 600
518 ResourceType StringToResourceType(const char* type); 601 ResourceType StringToResourceType(const char* type);
519 602
520 ImageFormat StringToImageFormat(const char* format); 603 ImageFormat StringToImageFormat(const char* format);
523 606
524 ValueRepresentation StringToValueRepresentation(const std::string& vr, 607 ValueRepresentation StringToValueRepresentation(const std::string& vr,
525 bool throwIfUnsupported); 608 bool throwIfUnsupported);
526 609
527 PhotometricInterpretation StringToPhotometricInterpretation(const char* value); 610 PhotometricInterpretation StringToPhotometricInterpretation(const char* value);
611
612 ModalityManufacturer StringToModalityManufacturer(const std::string& manufacturer);
613
614 DicomVersion StringToDicomVersion(const std::string& version);
528 615
529 unsigned int GetBytesPerPixel(PixelFormat format); 616 unsigned int GetBytesPerPixel(PixelFormat format);
530 617
531 bool GetDicomEncoding(Encoding& encoding, 618 bool GetDicomEncoding(Encoding& encoding,
532 const char* specificCharacterSet); 619 const char* specificCharacterSet);