Mercurial > hg > orthanc
comparison OrthancServer/ServerEnumerations.cpp @ 2319:ae6245053bcf
made some manufacturer obsolete: MedInria (that was not used), Syngovia & AgfaImpax (replaced by GenericNoWildcardInDates) + added 'GenericNoWildcards'
| author | amazy |
|---|---|
| date | Thu, 13 Jul 2017 12:37:55 +0200 |
| parents | 5b7556568fa4 |
| children | 174c3616ab6d |
comparison
equal
deleted
inserted
replaced
| 2318:e5fc5db6a84b | 2319:ae6245053bcf |
|---|---|
| 323 switch (manufacturer) | 323 switch (manufacturer) |
| 324 { | 324 { |
| 325 case ModalityManufacturer_Generic: | 325 case ModalityManufacturer_Generic: |
| 326 return "Generic"; | 326 return "Generic"; |
| 327 | 327 |
| 328 case ModalityManufacturer_GenericNoWildcardInDates: | |
| 329 return "GenericNoWildcardInDates"; | |
| 330 | |
| 331 case ModalityManufacturer_GenericNoWildcards: | |
| 332 return "GenericNoWildcards"; | |
| 333 | |
| 328 case ModalityManufacturer_StoreScp: | 334 case ModalityManufacturer_StoreScp: |
| 329 return "StoreScp"; | 335 return "StoreScp"; |
| 330 | 336 |
| 331 case ModalityManufacturer_ClearCanvas: | 337 case ModalityManufacturer_ClearCanvas: |
| 332 return "ClearCanvas"; | 338 return "ClearCanvas"; |
| 333 | 339 |
| 334 case ModalityManufacturer_MedInria: | |
| 335 return "MedInria"; | |
| 336 | |
| 337 case ModalityManufacturer_Dcm4Chee: | 340 case ModalityManufacturer_Dcm4Chee: |
| 338 return "Dcm4Chee"; | 341 return "Dcm4Chee"; |
| 339 | |
| 340 case ModalityManufacturer_SyngoVia: | |
| 341 return "SyngoVia"; | |
| 342 | |
| 343 case ModalityManufacturer_AgfaImpax: | |
| 344 return "AgfaImpax"; | |
| 345 | 342 |
| 346 case ModalityManufacturer_Vitrea: | 343 case ModalityManufacturer_Vitrea: |
| 347 return "Vitrea"; | 344 return "Vitrea"; |
| 348 | 345 |
| 349 default: | 346 default: |
| 387 { | 384 { |
| 388 if (manufacturer == "Generic") | 385 if (manufacturer == "Generic") |
| 389 { | 386 { |
| 390 return ModalityManufacturer_Generic; | 387 return ModalityManufacturer_Generic; |
| 391 } | 388 } |
| 389 else if (manufacturer == "GenericNoWildcardInDates") | |
| 390 { | |
| 391 return ModalityManufacturer_GenericNoWildcardInDates; | |
| 392 } | |
| 393 else if (manufacturer == "GenericNoWildcards") | |
| 394 { | |
| 395 return ModalityManufacturer_GenericNoWildcards; | |
| 396 } | |
| 392 else if (manufacturer == "ClearCanvas") | 397 else if (manufacturer == "ClearCanvas") |
| 393 { | 398 { |
| 394 return ModalityManufacturer_ClearCanvas; | 399 return ModalityManufacturer_ClearCanvas; |
| 395 } | 400 } |
| 396 else if (manufacturer == "StoreScp") | 401 else if (manufacturer == "StoreScp") |
| 397 { | 402 { |
| 398 return ModalityManufacturer_StoreScp; | 403 return ModalityManufacturer_StoreScp; |
| 399 } | 404 } |
| 400 else if (manufacturer == "MedInria") | |
| 401 { | |
| 402 return ModalityManufacturer_MedInria; | |
| 403 } | |
| 404 else if (manufacturer == "Dcm4Chee") | 405 else if (manufacturer == "Dcm4Chee") |
| 405 { | 406 { |
| 406 return ModalityManufacturer_Dcm4Chee; | 407 return ModalityManufacturer_Dcm4Chee; |
| 407 } | 408 } |
| 408 else if (manufacturer == "SyngoVia") | |
| 409 { | |
| 410 return ModalityManufacturer_SyngoVia; | |
| 411 } | |
| 412 else if (manufacturer == "AgfaImpax") | |
| 413 { | |
| 414 return ModalityManufacturer_AgfaImpax; | |
| 415 } | |
| 416 else if (manufacturer == "Vitrea") | 409 else if (manufacturer == "Vitrea") |
| 417 { | 410 { |
| 418 return ModalityManufacturer_Vitrea; | 411 return ModalityManufacturer_Vitrea; |
| 419 } | 412 } |
| 420 else if (manufacturer == "EFilm2") | 413 else if (manufacturer == "AgfaImpax" || manufacturer == "SyngoVia") |
| 414 { | |
| 415 LOG(WARNING) << "The " << manufacturer << " manufacturer is obsolete since Orthanc 1.2.1. To guarantee compatibility with future Orthanc version, you should use \"GenericNoWildcardInDates\" instead in your configuration file."; | |
| 416 return ModalityManufacturer_GenericNoWildcardInDates; | |
| 417 } | |
| 418 else if (manufacturer == "EFilm2" || manufacturer == "MedInria") | |
| 421 { | 419 { |
| 422 LOG(WARNING) << "The " << manufacturer << " manufacturer is obsolete since Orthanc 1.2.1. To guarantee compatibility with future Orthanc version, you should remove it from your configuration file."; | 420 LOG(WARNING) << "The " << manufacturer << " manufacturer is obsolete since Orthanc 1.2.1. To guarantee compatibility with future Orthanc version, you should remove it from your configuration file."; |
| 423 | 421 |
| 424 return ModalityManufacturer_Generic; | 422 return ModalityManufacturer_Generic; |
| 425 } | 423 } |