Mercurial > hg > orthanc
diff Plugins/Engine/PluginsEnumerations.h @ 2884:497a637366b4 db-changes
integration mainline->db-changes
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Fri, 12 Oct 2018 15:18:10 +0200 |
parents | 37583cd183ed |
children | 3638de45a08c 4e43e67f8ecf |
line wrap: on
line diff
--- a/Plugins/Engine/PluginsEnumerations.h Thu Oct 29 11:25:45 2015 +0100 +++ b/Plugins/Engine/PluginsEnumerations.h Fri Oct 12 15:18:10 2018 +0200 @@ -1,7 +1,8 @@ /** * Orthanc - A Lightweight, RESTful DICOM Store - * Copyright (C) 2012-2015 Sebastien Jodogne, Medical Physics + * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics * Department, University Hospital of Liege, Belgium + * Copyright (C) 2017-2018 Osimis S.A., Belgium * * This program is free software: you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -32,15 +33,11 @@ #pragma once -#if ORTHANC_PLUGINS_ENABLED == 1 +#if ORTHANC_ENABLE_PLUGINS == 1 #include "../Include/orthanc/OrthancCPlugin.h" #include "../../OrthancServer/ServerEnumerations.h" -#if !defined(ORTHANC_ENABLE_DCMTK) || ORTHANC_ENABLE_DCMTK != 0 -#include <dcmtk/dcmdata/dcvr.h> -#endif - namespace Orthanc { namespace Plugins @@ -65,9 +62,17 @@ IdentifierConstraintType Convert(OrthancPluginIdentifierConstraint constraint); -#if !defined(ORTHANC_ENABLE_DCMTK) || ORTHANC_ENABLE_DCMTK != 0 - DcmEVR Convert(OrthancPluginValueRepresentation vr); -#endif + OrthancPluginInstanceOrigin Convert(RequestOrigin origin); + + OrthancPluginHttpMethod Convert(HttpMethod method); + + ValueRepresentation Convert(OrthancPluginValueRepresentation vr); + + OrthancPluginValueRepresentation Convert(ValueRepresentation vr); + + OrthancPluginJobStepStatus Convert(JobStepCode step); + + JobStepCode Convert(OrthancPluginJobStepStatus step); } }