Produced by Araxis Merge on 7/10/2017 1:01:45 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\MIXCommon\main\src\java\gov\va\med\imaging\mix\webservices\rest\types\v1 | Series.java | Thu Jun 29 17:22:02 2017 UTC |
| 2 | C:\AraxisMergeCompare\Pri_re\IV-ehmp_cif\MIXCommon\main\src\java\gov\va\med\imaging\mix\webservices\rest\types\v1 | Series.java | Thu Jul 6 15:04:06 2017 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 2 | 516 |
| Changed | 1 | 2 |
| 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 | package go v.va.med.i maging.mix .webservic es.rest.ty pes.v1; | |
| 2 | ||
| 3 | // import gov.va.med .MockDataG enerationF ield; | |
| 4 | import gov .va.med.im aging.GUID ; | |
| 5 | // import gov.va.med .imaging.e xchange.en ums.Object Origin; | |
| 6 | import jav ax.xml.bin d.annotati on.XmlRoot Element; | |
| 7 | ||
| 8 | import jav a.io.Seria lizable; | |
| 9 | import jav a.util.*; | |
| 10 | /** | |
| 11 | * @author DNS TITTOC | |
| 12 | * | |
| 13 | * This Se ries class is for FH IR Imaging Study mode l support (referring to the eq uivalent D ICOM Serie s term) | |
| 14 | * Cardina lity: Pati ent 1..* D iagnosticR eport 0..* ImagingSt udy 0..* S eries 0..* Instance | |
| 15 | */ | |
| 16 | @XmlRootEl ement (nam e="Series" ) | |
| 17 | public cla ss Series | |
| 18 | implements Serializa ble, /* It erable<Ins tance>, */ Comparabl e<Series> | |
| 19 | { | |
| 20 | // pr ivate stat ic final l ong serial VersionUID = -746774 0571635450 273L; | |
| 21 | pr ivate Inte ger number =null; // Numeric identifie r of this series | |
| 22 | pr ivate Stri ng modalit y; // R! stri ng represe ntation of a modalit y (CT, CR, MR, etc) that creat ed this se ries | |
| 23 | pr ivate Stri ng uid; // R! DICOM Series UID (64) | |
| 24 | pr ivate Stri ng descrip tion; // max 64 inDICOM -- -- not in SOAP exch ange | |
| 25 | pr ivate Stri ng availab ility; // ONLINE | O FFLINE | N EARLINE | UNAVAILABL E -- only ONLINE dat a is maint ained for exchange | |
| 26 | pr ivate Stri ng url; // Locatio n of the r eferenced instance(s ) –- not m aintained, not in SO AP exchang e | |
| 27 | pr ivate Stri ng bodySit e; // Body pa rt examine d (ENUM) – - not main tained -- not in SOA P exchange | |
| 28 | pr ivate Stri ng lateral ity; // 'L' or 'R': body part later ality -- n ot in SOAP exchange | |
| 29 | pr ivate Stri ng started ; // when se ries acqui sition sta rted (yyyy -MM-ddTHH: MI:SS+HH:M I -- UTC f ormat) | |
| 30 | // here are the Read O nly attrib utes; they have Gett ers only a nd must be set only internally by DB API call | |
| 31 | pr ivate Inte ger number OfInstance s; // R! -- supp osed to ma tch instan ces SET si ze | |
| 32 | pr ivate Inst ance[] ins tances; | |
| 33 | // pr ivate List <Instance> instances = new Arr ayList<Ins tance>(); // *** sho uld be Sor ted List? | |
| 34 | // pr ivate Sort edSet<Inst ance> inst ances = ne w TreeSet< Instance>( new Instan ceComparat or()); | |
| 35 | ||
| 36 | pu blic Serie s() | |
| 37 | { | |
| 38 | uid = modality = url = b odySite = laterality = started = null; | |
| 39 | numb er=null; | |
| 40 | avai lability = "ONLINE"; | |
| 41 | numb erOfInstan ces=0; | |
| 42 | inst ances = ne w Instance [0]; | |
| 43 | } | |
| 44 | ||
| 45 | // /* * | |
| 46 | // * @param nu mber Serie s Number | |
| 47 | // * @param mo dality typ e of DICOM Modality that creat ed this Se ries | |
| 48 | // * @param ui d the DICO M Series U ID (max 64 ) | |
| 49 | // * @param de scription the descri ption of t he Series | |
| 50 | // * @param av ailability must be s et to "ONL INE" | |
| 51 | // * @param ur l where se ries is ph ysically l ocated -- not suppor ted | |
| 52 | // * @param bo dySite bod y part exa mined (ENU M) –- not maintained | |
| 53 | // * @param la terality ' L' or 'R': body part lateralit y -- not m aintained | |
| 54 | // * @param st artDateTim e when se ries acqui sition sta rted (YYYY -MM-DDTHH: MI:SS+HH:M I) UTC bas ed JSON da te | |
| 55 | // * @return S eries | |
| 56 | // * / | |
| 57 | // pu blic Serie s(Integer number, St ring modal ity, Strin g uid, Str ing descri ption, Str ing availa bility, St ring url, String bod ySite, | |
| 58 | // String lateralit y, String startDateT ime) | |
| 59 | // { | |
| 60 | //// Seri es series = new Seri es(); | |
| 61 | // | |
| 62 | // this .setNumber (number); | |
| 63 | // this .setModali ty(modalit y); | |
| 64 | // this .setUid(ui d); | |
| 65 | // this .setDescri ption(desc ription); | |
| 66 | // this .setAvaila bility(ava ilability) ; | |
| 67 | // this .setUrl(ur l); | |
| 68 | // this .setBodySi te(bodySit e); | |
| 69 | // this .setLatera lity(later ality); | |
| 70 | // this .setStarte d(startDat eTime); | |
| 71 | // this .instances = new Ins tancesType (); | |
| 72 | // | |
| 73 | //// retu rn series; | |
| 74 | // } | |
| 75 | ||
| 76 | pu blic int g etNumberOf Instances( ) | |
| 77 | { | |
| 78 | retu rn numberO fInstances ; // this. instances. size(); | |
| 79 | } | |
| 80 | ||
| 81 | // @D eprecated | |
| 82 | // pu blic Set<I nstance> g etImages() | |
| 83 | // { | |
| 84 | // retu rn Collect ions.unmod ifiableSet (instances ); | |
| 85 | // } | |
| 86 | ||
| 87 | // pu blic void replaceIns tance(Inst ance oldIn stance, In stance new Instance) | |
| 88 | // { | |
| 89 | // inst ances.remo ve(oldInst ance); | |
| 90 | // inst ances.add( newInstanc e); | |
| 91 | // } | |
| 92 | // | |
| 93 | /* * | |
| 94 | * Add insta nce to the Series as a child. | |
| 95 | * @param im age | |
| 96 | * / | |
| 97 | pu blic void addInstanc e(Instance instance) | |
| 98 | { | |
| 99 | sync hronized(i nstances) | |
| 100 | { | |
| 101 | Instan ce [] inst ancesInLis t = this.i nstances; | |
| 102 | int nu mItems = 0 ; | |
| 103 | if (in stancesInL ist.length ==0) { | |
| 104 | instance sInList = new Instan ce[1]; | |
| 105 | } else { | |
| 106 | numItems =instances InList.len gth; | |
| 107 | } | |
| 108 | Instan ce [] inst ancesOutLi st = new I nstance[nu mItems+1]; | |
| 109 | // cop y In list to Out one first | |
| 110 | for (i nt i=0; i< numItems; i++) { | |
| 111 | instance sInList[i] = instanc esOutList[ i]; | |
| 112 | } | |
| 113 | instan cesOutList [numItems] = instanc e; | |
| 114 | this.i nstances = instances OutList; | |
| 115 | ||
| 116 | number OfInstance s++; | |
| 117 | } | |
| 118 | } | |
| 119 | ||
| 120 | // /* * | |
| 121 | // * Appends a ll of the instances in the giv en Set to the Series as childr en. | |
| 122 | // * @param im ages | |
| 123 | // * / | |
| 124 | // pu blic void addInstanc es(List<In stance> in stances) | |
| 125 | // { | |
| 126 | // sync hronized(t his.instan ces) | |
| 127 | // { | |
| 128 | // this.i nstances.a ddAll(inst ances); | |
| 129 | // number OfInstance s += insta nces.size( ); | |
| 130 | // } | |
| 131 | // } | |
| 132 | ||
| 133 | // @O verride | |
| 134 | // pu blic Itera tor<Instan ce> iterat or() | |
| 135 | // { | |
| 136 | // retu rn instanc es.iterato r(); | |
| 137 | // } | |
| 138 | ||
| 139 | pu blic stati c Series c reateMockS eries(Inte ger number ) { | |
| 140 | Seri es series = new Ser ies(); | |
| 141 | seri es.uid = n ew GUID(). toShortStr ing(); | |
| 142 | seri es.number = number; | |
| 143 | retu rn series; | |
| 144 | } | |
| 145 | ||
| 146 | /* (non-Java doc) | |
| 147 | * @see java .lang.Obje ct#toStrin g() | |
| 148 | * / | |
| 149 | @O verride | |
| 150 | pu blic Strin g toString () { | |
| 151 | Stri ng output = "Series Details: \t Series UID [" + t his.uid + "]\t Serie s Number [ " + this.n umber + "] \n" | |
| 152 | + "mod ality [" + this.moda lity + "]\ t Contains " + (((th is.instanc es!=null) && (this.i nstances!= null))?ins tances.len gth:0) + " instances \n"; | |
| 153 | // Iter ator<Insta nce> image Iter = ins tances.ite rator(); | |
| 154 | // whil e(imageIte r.hasNext( )) { | |
| 155 | for (int i=0; i<numberOf Instances; i++) { | |
| 156 | Instan ce instanc e = this.i nstances[i ]; | |
| 157 | output += "\t U ID[" + (in stance == null ? "<n ull instan ce>" : ins tance.getU id()) + | |
| 158 | "] \t In stance#[" + (instanc e == null ? "<ni>" : instance. getNumber( )) + | |
| 159 | "] \n"; | |
| 160 | } | |
| 161 | ||
| 162 | retu rn output; | |
| 163 | } | |
| 164 | ||
| 165 | pu blic Integ er getNumb er() { | |
| 166 | retu rn number; | |
| 167 | } | |
| 168 | ||
| 169 | pu blic void setNumber( Integer nu mber) { | |
| 170 | this .number = number; | |
| 171 | } | |
| 172 | ||
| 173 | /* * | |
| 174 | * Returns t he string representa tion of a modality ( CT, CR, MR , etc) | |
| 175 | * / | |
| 176 | pu blic Strin g getModal ity() { | |
| 177 | retu rn modalit y; | |
| 178 | } | |
| 179 | ||
| 180 | /* * | |
| 181 | * @param mo dality Set s the stri ng represe ntation of a modalit y (CT, CR, MR, etc) | |
| 182 | * / | |
| 183 | pu blic void setModalit y(String m odality) { | |
| 184 | this .modality = modality ; | |
| 185 | } | |
| 186 | ||
| 187 | pu blic Strin g getUid() { | |
| 188 | retu rn uid; | |
| 189 | } | |
| 190 | ||
| 191 | pu blic void setUid(Str ing uid) { | |
| 192 | this .uid = uid ; | |
| 193 | } | |
| 194 | ||
| 195 | pu blic Strin g getDescr iption() { | |
| 196 | retu rn descrip tion; | |
| 197 | } | |
| 198 | ||
| 199 | pu blic void setDescrip tion(Strin g descript ion) { | |
| 200 | this .descripti on = descr iption; | |
| 201 | } | |
| 202 | ||
| 203 | pu blic Strin g getAvail ability() { | |
| 204 | retu rn availab ility; | |
| 205 | } | |
| 206 | ||
| 207 | pu blic void setAvailab ility(Stri ng availab ility) { | |
| 208 | this .availabil ity = avai lability; | |
| 209 | } | |
| 210 | ||
| 211 | pu blic Strin g getUrl() { | |
| 212 | retu rn url; | |
| 213 | } | |
| 214 | ||
| 215 | pu blic void setUrl(Str ing url) { | |
| 216 | this .url = url ; | |
| 217 | } | |
| 218 | ||
| 219 | pu blic Strin g getBodyS ite() { | |
| 220 | retu rn bodySit e; | |
| 221 | } | |
| 222 | ||
| 223 | pu blic void setBodySit e(String b odySite) { | |
| 224 | this .bodySite = bodySite ; | |
| 225 | } | |
| 226 | ||
| 227 | pu blic Strin g getLater ality() { | |
| 228 | retu rn lateral ity; | |
| 229 | } | |
| 230 | ||
| 231 | pu blic void setLateral ity(String lateralit y) { | |
| 232 | this .lateralit y = latera lity; | |
| 233 | } | |
| 234 | ||
| 235 | pu blic Strin g getStart ed() { | |
| 236 | retu rn started ; | |
| 237 | } | |
| 238 | ||
| 239 | pu blic void setStarted (String st artDateTim e) { | |
| 240 | this .started = startDate Time; | |
| 241 | } | |
| 242 | ||
| 243 | pu blic Insta nce[] getI nstance() { // use s ingle (not plural) f or REST JS OJN transl ation's sa ke | |
| 244 | retu rn instanc es; | |
| 245 | } | |
| 246 | ||
| 247 | pu blic void setInstanc es(Instanc e[] instan ces) { | |
| 248 | this .instances = instanc es; | |
| 249 | if ( (this.inst ances!=nul l) && (thi s.instance s.length!= 0)) | |
| 250 | this.n umberOfIns tances = t his.instan ces.length ; | |
| 251 | else | |
| 252 | this.n umberOfIns tances = 0 ; | |
| 253 | } | |
| 254 | @O verride | |
| 255 | pu blic int c ompareTo(S eries that ) | |
| 256 | { | |
| 257 | retu rn this.ui d.compareT o(that.uid ); | |
| 258 | } | |
| 259 | } |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.