Produced by Araxis Merge on 7/10/2017 1:01:42 PM Central Daylight Time. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.
| # | Location | File | Last Modified |
|---|---|---|---|
| 1 | C:\AraxisMergeCompare\Pri_un\IV-ehmp_cif\CoreValueObjects\main\src\java\gov\va\med\imaging\exchange\enums | VistaImageType.java | Thu Jun 29 17:22:21 2017 UTC |
| 2 | C:\AraxisMergeCompare\Pri_re\IV-ehmp_cif\CoreValueObjects\main\src\java\gov\va\med\imaging\exchange\enums | VistaImageType.java | Fri Jul 7 16:37:40 2017 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 3 | 244 |
| Changed | 2 | 4 |
| Inserted | 0 | 0 |
| Removed | 0 | 0 |
| Whitespace | |
|---|---|
| Character case | Differences in character case are significant |
| Line endings | Differences in line endings (CR and LF characters) are ignored |
| CR/LF characters | Not shown in the comparison detail |
No regular expressions were active.
| 1 | /** | |
| 2 | * | |
| 3 | Package: MAG - Vis tA Imaging | |
| 4 | WARNING: Per VHA D irective 2 004-038, t his routin e should n ot be modi fied. | |
| 5 | Date Cre ated: Oct 10, 2008 | |
| 6 | Site Nam e: Washin gton OI Fi eld Office , Silver S pring, MD | |
| 7 | Developer:
|
|
| 8 | Descript ion: | |
| 9 | ||
| 10 | ;; +-------- ---------- ---------- ---------- ---------- ---------- ---------- + | |
| 11 | ;; Property of the US Government . | |
| 12 | ;; No permis sion to co py or redi stribute t his softwa re is give n. | |
| 13 | ;; Use of un released v ersions of this soft ware requi res the us er | |
| 14 | ;; to execu te a writt en test ag reement wi th the Vis tA Imaging | |
| 15 | ;; Developm ent Office of the De partment o f Veterans Affairs, | |
| 16 | ;; telephon e (301) 73 4-0100. | |
| 17 | ;; | |
| 18 | ;; The Food and Drug A dministrat ion classi fies this software a s | |
| 19 | ;; a Class I I medical device. A s such, it may not b e changed | |
| 20 | ;; in any wa y. Modifi cations to this soft ware may r esult in a n | |
| 21 | ;; adulterat ed medical device un der 21CFR8 20, the us e of which | |
| 22 | ;; is consid ered to be a violati on of US F ederal Sta tutes. | |
| 23 | ;; +-------- ---------- ---------- ---------- ---------- ---------- ---------- + | |
| 24 | ||
| 25 | */ | |
| 26 | package go v.va.med.i maging.exc hange.enum s; | |
| 27 | ||
| 28 | /** | |
| 29 | * This is a VistA s pecific en umeration that descr ibes the I mage Type field stor ed in Vist A. | |
| 30 | * This is similar b ut NOT the same as I mageFormat which des cribes the format of an image. | |
| 31 | * This do es not def ine a MIME type. Thi s simply m akes it ea sier to un derstand w hat the | |
| 32 | * numeric image typ e value co rresponds to as defi ned by Vis tA. | |
| 33 | * | |
| 34 | * The fo llowing de finitions come from VistA and should not be modifi ed unless they are c hanged | |
| 35 | * in Vis tA | |
| 36 | * | |
| 37 | * @author
|
|
| 38 | * | |
| 39 | */ | |
| 40 | public enu m VistaIma geType | |
| 41 | { | |
| 42 | JP EG(1, "JPE G Image", ImageForma t.JPEG.get Mime(), "J PG"), | |
| 43 | BW MED(9, "Bl ack and Wh ite med im ages", Ima geFormat.T GA.getMime (), "TGA") , | |
| 44 | CO LOR_SCAN(1 7, "Color Scan", Ima geFormat.J PEG.getMim e(), "JPG" ), | |
| 45 | PA TIENT_PHOT O(18, "Pat ient Photo Id", Imag eFormat.JP EG.getMime (), "JPG") , | |
| 46 | XR AY_JPEG(19 , "JPEG XR ay image", ImageForm at.JPEG.ge tMime(), " JPG"), | |
| 47 | TI FF(15, "TI FF image", ImageForm at.TIFF.ge tMime(), " TIF"), | |
| 48 | MO TION_VIDEO (21, "Moti on Video ( AVI, MPG)" , ImageFor mat.AVI.ge tMime(), " AVI"), | |
| 49 | HT ML(101, "H TML Docume nt", Image Format.HTM L.getMime( ), "HTM"), | |
| 50 | WO RD_DOCUMEN T(102, "Wo rd Documen t", ImageF ormat.DOC. getMime(), "DOC"), | |
| 51 | AS CII_TEXT(1 03, "ASCII Text", Im ageFormat. TEXT_PLAIN .getMime() , "TXT"), | |
| 52 | PD F(104, "PD F Document ", ImageFo rmat.PDF.g etMime(), "PDF"), | |
| 53 | RT F(105, "RT F Document ", ImageFo rmat.RTF.g etMime(), "RTF"), | |
| 54 | AU DIO(106, " Audio File (WAV, MP3 )", ImageF ormat.WAV. getMime(), "WAV"), | |
| 55 | XR AY(3, "TGA Image", I mageFormat .TGA.getMi me(), "TGA "), //TGA | |
| 56 | DI COM(100, " DICOM Imag e", ImageF ormat.DICO M.getMime( ), "DCM"), | |
| 57 | NC AT(501, "D oD NCAT Re ports", Im ageFormat. PDF.getMim e(), "PDF" ), | |
| 58 | UN KNOWN_IMAG ING_TYPE(5 02, "Type not known to VistA I maging", I mageFormat .ANYTHING. getMime(), ""), | |
| 59 | DO D_JPG(503, "JPG from the DoD", ImageForm at.JPEG.ge tMime(), " JPG"), | |
| 60 | DO D_WORD_DOC UMENT(504, "Word Doc ument from the DoD", ImageForm at.DOC.get Mime(), "D OC"), | |
| 61 | DO D_ASCII_TE XT(505, "A SCII Test from the D oD", Image Format.TEX T_PLAIN.ge tMime(), " TXT"), | |
| 62 | DO D_PDF(506, "PDF Docu ment from the DoD", ImageForma t.PDF.getM ime(), "PD F"), | |
| 63 | DO D_RTF(507, "RTF Docu ment from the DoD", ImageForma t.RTF.getM ime(), "RT F"),//, | |
| 64 | // DOD_DOCX_D OCUMENT(50 8, "Word D ocument in DOCX form at", Image Format.DOC X.getMime( )); | |
| 65 | XM L(107, "XM L Document ", ImageFo rmat.XML.g etMime(), "XML"), | |
| 66 | EC G(13, "DIC OM ECG Ima ge", Image Format.DIC OM.getMime (), "DCM") ; | |
| 67 | ||
| 68 | ||
| 69 | pr ivate fina l int imag eType; | |
| 70 | pr ivate fina l String d escription ; | |
| 71 | pr ivate fina l String d efaultMime Type; | |
| 72 | pr ivate fina l String d efaultFile Extension; | |
| 73 | ||
| 74 | Vi staImageTy pe(int ima geType, St ring descr iption, St ring defau ltMimeType , String d efaultFile Extension) | |
| 75 | { | |
| 76 | this .imageType = imageTy pe; | |
| 77 | this .descripti on = descr iption; | |
| 78 | this .defaultMi meType = d efaultMime Type; | |
| 79 | this .defaultFi leExtensio n = defaul tFileExten sion; | |
| 80 | } | |
| 81 | ||
| 82 | /* * | |
| 83 | * Convert a numeric i mage type into the V istaImageT ype that r epresents that value . | |
| 84 | * @param im ageType | |
| 85 | * @return | |
| 86 | * / | |
| 87 | pu blic stati c VistaIma geType val ueOfImageT ype(int im ageType) | |
| 88 | { | |
| 89 | for( VistaImage Type vista ImageType : VistaIma geType.val ues()) | |
| 90 | { | |
| 91 | if(vis taImageTyp e.imageTyp e == image Type) | |
| 92 | { | |
| 93 | return v istaImageT ype; | |
| 94 | } | |
| 95 | } | |
| 96 | retu rn null; | |
| 97 | } | |
| 98 | ||
| 99 | /* * | |
| 100 | * @return t he imageTy pe | |
| 101 | * / | |
| 102 | pu blic int g etImageTyp e() { | |
| 103 | retu rn imageTy pe; | |
| 104 | } | |
| 105 | ||
| 106 | /* * | |
| 107 | * @return t he descrip tion | |
| 108 | * / | |
| 109 | pu blic Strin g getDescr iption() { | |
| 110 | retu rn descrip tion; | |
| 111 | } | |
| 112 | ||
| 113 | /* * | |
| 114 | * @return t he default MimeType | |
| 115 | * / | |
| 116 | pu blic Strin g getDefau ltMimeType () { | |
| 117 | retu rn default MimeType; | |
| 118 | } | |
| 119 | ||
| 120 | pu blic Strin g getDefau ltFileExte nsion() | |
| 121 | { | |
| 122 | retu rn default FileExtens ion; | |
| 123 | } | |
| 124 | } |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.