Produced by Araxis Merge on 3/25/2019 8:58:03 AM 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\IMAG_Source\VISA\Java\StudyWebApp\main\src\java\gov\va\med\imaging\study\rest\types | StudyImageType.java | Mon Mar 18 20:39:15 2019 UTC |
2 | C:\AraxisMergeCompare\Pri_re\IMAG_Source\VISA\Java\StudyWebApp\main\src\java\gov\va\med\imaging\study\rest\types | StudyImageType.java | Tue Mar 19 12:04:04 2019 UTC |
Description | Between Files 1 and 2 |
|
---|---|---|
Text Blocks | Lines | |
Unchanged | 3 | 466 |
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: Mar 16, 2012 | |
6 | Site Nam e: Washin gton OI Fi eld Office , Silver S pring, MD | |
7 | Developer: DN S WERFEJ | |
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.stu dy.rest.ty pes; | |
27 | ||
28 | import jav a.util.Dat e; | |
29 | ||
30 | import jav ax.xml.bin d.annotati on.XmlElem ent; | |
31 | import jav ax.xml.bin d.annotati on.XmlRoot Element; | |
32 | ||
33 | /** | |
34 | * @author DN S WERFEJ | |
35 | * | |
36 | */ | |
37 | @XmlRootEl ement | |
38 | public cla ss StudyIm ageType | |
39 | { | |
40 | pr ivate Stri ng imageId ; | |
41 | privat e String d icomUid; | |
42 | privat e Integer imageNumbe r; | |
43 | privat e String d icomSequen ceNumber; | |
44 | privat e String d icomImageN umber; | |
45 | privat e String i mageType; | |
46 | privat e String t humbnailIm ageUri; | |
47 | privat e String r eferenceIm ageUri; | |
48 | privat e String d iagnosticI mageUri; | |
49 | privat e String i mageModali ty; | |
50 | privat e boolean imageHasAn notations; | |
51 | // if the im age is ass ociated wi th a progr ess note, indicates if it is r esulted | |
52 | pr ivate Stri ng associa tedNoteRes ulted; | |
53 | ||
54 | pr ivate Stud yObjectSta tusType im ageStatus = StudyObj ectStatusT ype.NO_STA TUS; | |
55 | pr ivate Stud yObjectSta tusType im ageViewSta tus = Stud yObjectSta tusType.NO _STATUS; | |
56 | pr ivate bool ean sensit ive = fals e; | |
57 | pr ivate Date documentD ate = null ; | |
58 | pr ivate Date captureDa te = null; | |
59 | pr ivate bool ean dicom; | |
60 | ||
61 | ||
62 | public StudyImag eType() | |
63 | { | |
64 | su per(); | |
65 | } | |
66 | ||
67 | pu blic Strin g getImage Id() { | |
68 | retu rn imageId ; | |
69 | } | |
70 | ||
71 | pu blic void setImageId (String im ageId) { | |
72 | this .imageId = imageId; | |
73 | } | |
74 | ||
75 | @X mlElement( nillable=t rue) | |
76 | pu blic Strin g getDicom Uid() { | |
77 | retu rn dicomUi d; | |
78 | } | |
79 | ||
80 | pu blic void setDicomUi d(String d icomUid) { | |
81 | this .dicomUid = dicomUid ; | |
82 | } | |
83 | ||
84 | pu blic Integ er getImag eNumber() { | |
85 | retu rn imageNu mber; | |
86 | } | |
87 | ||
88 | pu blic void setImageNu mber(Integ er imageNu mber) { | |
89 | this .imageNumb er = image Number; | |
90 | } | |
91 | ||
92 | pu blic Strin g getImage Type() { | |
93 | retu rn imageTy pe; | |
94 | } | |
95 | ||
96 | pu blic void setImageTy pe(String imageType) { | |
97 | this .imageType = imageTy pe; | |
98 | } | |
99 | ||
100 | pu blic Strin g getThumb nailImageU ri() | |
101 | { | |
102 | retu rn thumbna ilImageUri ; | |
103 | } | |
104 | ||
105 | pu blic void setThumbna ilImageUri (String th umbnailIma geUri) | |
106 | { | |
107 | this .thumbnail ImageUri = thumbnail ImageUri; | |
108 | } | |
109 | ||
110 | pu blic Strin g getRefer enceImageU ri() | |
111 | { | |
112 | retu rn referen ceImageUri ; | |
113 | } | |
114 | ||
115 | pu blic void setReferen ceImageUri (String re ferenceIma geUri) | |
116 | { | |
117 | this .reference ImageUri = reference ImageUri; | |
118 | } | |
119 | ||
120 | pu blic Strin g getDiagn osticImage Uri() | |
121 | { | |
122 | retu rn diagnos ticImageUr i; | |
123 | } | |
124 | ||
125 | pu blic void setDiagnos ticImageUr i(String d iagnosticI mageUri) | |
126 | { | |
127 | this .diagnosti cImageUri = diagnost icImageUri ; | |
128 | } | |
129 | ||
130 | pu blic Strin g getImage Modality() { | |
131 | retu rn imageMo dality; | |
132 | } | |
133 | ||
134 | pu blic void setImageMo dality(Str ing imageM odality) { | |
135 | this .imageModa lity = ima geModality ; | |
136 | } | |
137 | ||
138 | pu blic boole an isImage HasAnnotat ions() | |
139 | { | |
140 | retu rn imageHa sAnnotatio ns; | |
141 | } | |
142 | ||
143 | pu blic void setImageHa sAnnotatio ns(boolean imageHasA nnotations ) | |
144 | { | |
145 | this .imageHasA nnotations = imageHa sAnnotatio ns; | |
146 | } | |
147 | ||
148 | pu blic Strin g getAssoc iatedNoteR esulted() | |
149 | { | |
150 | retu rn associa tedNoteRes ulted; | |
151 | } | |
152 | ||
153 | pu blic void setAssocia tedNoteRes ulted(Stri ng associa tedNoteRes ulted) | |
154 | { | |
155 | this .associate dNoteResul ted = asso ciatedNote Resulted; | |
156 | } | |
157 | ||
158 | pu blic boole an isSensi tive() | |
159 | { | |
160 | retu rn sensiti ve; | |
161 | } | |
162 | ||
163 | pu blic void setSensiti ve(boolean sensitive ) | |
164 | { | |
165 | this .sensitive = sensiti ve; | |
166 | } | |
167 | ||
168 | pu blic Date getDocumen tDate() | |
169 | { | |
170 | retu rn documen tDate; | |
171 | } | |
172 | ||
173 | pu blic void setDocumen tDate(Date documentD ate) | |
174 | { | |
175 | this .documentD ate = docu mentDate; | |
176 | } | |
177 | ||
178 | pu blic Date getCapture Date() | |
179 | { | |
180 | retu rn capture Date; | |
181 | } | |
182 | ||
183 | pu blic void setCapture Date(Date captureDat e) | |
184 | { | |
185 | this .captureDa te = captu reDate; | |
186 | } | |
187 | ||
188 | pu blic Study ObjectStat usType get ImageStatu s() | |
189 | { | |
190 | retu rn imageSt atus; | |
191 | } | |
192 | ||
193 | pu blic void setImageSt atus(Study ObjectStat usType ima geStatus) | |
194 | { | |
195 | this .imageStat us = image Status; | |
196 | } | |
197 | ||
198 | pu blic Study ObjectStat usType get ImageViewS tatus() | |
199 | { | |
200 | retu rn imageVi ewStatus; | |
201 | } | |
202 | ||
203 | pu blic void setImageVi ewStatus(S tudyObject StatusType imageView Status) | |
204 | { | |
205 | this .imageView Status = i mageViewSt atus; | |
206 | } | |
207 | ||
208 | pu blic Strin g getDicom SequenceNu mber() | |
209 | { | |
210 | retu rn dicomSe quenceNumb er; | |
211 | } | |
212 | ||
213 | pu blic void setDicomSe quenceNumb er(String dicomSeque nceNumber) | |
214 | { | |
215 | this .dicomSequ enceNumber = dicomSe quenceNumb er; | |
216 | } | |
217 | ||
218 | pu blic Strin g getDicom ImageNumbe r() | |
219 | { | |
220 | retu rn dicomIm ageNumber; | |
221 | } | |
222 | ||
223 | pu blic void setDicomIm ageNumber( String dic omImageNum ber) | |
224 | { | |
225 | this .dicomImag eNumber = dicomImage Number; | |
226 | } | |
227 | ||
228 | pu blic boole an isDicom () { | |
229 | retu rn dicom; | |
230 | } | |
231 | ||
232 | pu blic void setDicom(b oolean dic om) { | |
233 | this .dicom = d icom; | |
234 | } | |
235 | } |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.