Mercurial > hg > orthanc-stone

changeset 194:7a031ac16b2d wasm

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rename Enumerations.h to StoneEnumerations.h to avoid clashes with Orthanc
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 20 Mar 2018 14:46:58 +0100
parents 4abddd083374
children fccffbf99ba1
files Framework/Enumerations.cpp Framework/Enumerations.h Framework/Layers/RenderStyle.h Framework/StoneEnumerations.cpp Framework/StoneEnumerations.h Framework/Toolbox/ImageGeometry.h Framework/Toolbox/MessagingToolbox.h Framework/Toolbox/OrthancSlicesLoader.h Framework/Toolbox/ParallelSlicesCursor.h Framework/Toolbox/Slice.cpp Framework/Toolbox/SubpixelReader.h Framework/Viewport/IViewport.h Framework/Volumes/ImageBuffer3D.h Framework/Widgets/IWidget.h Framework/Widgets/IWorldSceneInteractor.h Resources/CMake/OrthancStoneConfiguration.cmake
diffstat 16 files changed, 186 insertions(+), 186 deletions(-) [+]
line wrap: on
line diff
--- a/Framework/Enumerations.cpp	Tue Mar 20 14:05:39 2018 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,75 +0,0 @@
-/**
- * Stone of Orthanc
- * 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 Affero General Public License
- * as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Affero General Public License for more details.
- * 
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- **/
-
-
-#include "Enumerations.h"
-
-#include <Core/Logging.h>
-#include <Core/OrthancException.h>
-#include <Core/Toolbox.h>
-
-namespace OrthancStone
-{  
-  bool StringToSopClassUid(SopClassUid& result,
-                           const std::string& source)
-  {
-    std::string s = Orthanc::Toolbox::StripSpaces(source);
-
-    if (s == "1.2.840.10008.5.1.4.1.1.481.2")
-    {
-      result = SopClassUid_RTDose;
-      return true;
-    }
-    else
-    {
-      //LOG(INFO) << "Unknown SOP class UID: " << source;
-      return false;
-    }
-  }  
-
-
-  void ComputeWindowing(float& targetCenter,
-                        float& targetWidth,
-                        ImageWindowing windowing,
-                        float defaultCenter,
-                        float defaultWidth)
-  {
-    switch (windowing)
-    {
-      case ImageWindowing_Default:
-        targetCenter = defaultCenter;
-        targetWidth = defaultWidth;
-        break;
-
-      case ImageWindowing_Bone:
-        targetCenter = 300;
-        targetWidth = 2000;
-        break;
-
-      case ImageWindowing_Lung:
-        targetCenter = -600;
-        targetWidth = 1600;
-        break;
-
-      default:
-        throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange);
-    }
-  }
-}
--- a/Framework/Enumerations.h	Tue Mar 20 14:05:39 2018 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,99 +0,0 @@
-/**
- * Stone of Orthanc
- * 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 Affero General Public License
- * as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Affero General Public License for more details.
- * 
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- **/
-
-
-#pragma once
-
-#include <string>
-
-namespace OrthancStone
-{
-  enum SliceOffsetMode
-  {
-    SliceOffsetMode_Absolute,
-    SliceOffsetMode_Relative,
-    SliceOffsetMode_Loop
-  };
-
-  enum ImageWindowing
-  {
-    ImageWindowing_Default,
-    ImageWindowing_Bone,
-    ImageWindowing_Lung,
-    ImageWindowing_Custom
-  };
-
-  enum MouseButton
-  {
-    MouseButton_Left,
-    MouseButton_Right,
-    MouseButton_Middle
-  };
-
-  enum MouseWheelDirection
-  {
-    MouseWheelDirection_Up,
-    MouseWheelDirection_Down
-  };
-
-  enum VolumeProjection
-  {
-    VolumeProjection_Axial,
-    VolumeProjection_Coronal,
-    VolumeProjection_Sagittal
-  };
-
-  enum ImageInterpolation
-  {
-    ImageInterpolation_Nearest,
-    ImageInterpolation_Bilinear,
-    ImageInterpolation_Trilinear
-  };
-
-  enum KeyboardModifiers
-  {
-    KeyboardModifiers_None = 0,
-    KeyboardModifiers_Shift = (1 << 0),
-    KeyboardModifiers_Control = (1 << 1),
-    KeyboardModifiers_Alt = (1 << 2)
-  };
-
-  enum SliceImageQuality
-  {
-    SliceImageQuality_Full,
-    SliceImageQuality_Jpeg50,
-    SliceImageQuality_Jpeg90,
-    SliceImageQuality_Jpeg95
-  };
-
-  enum SopClassUid
-  {
-    SopClassUid_RTDose
-  };
-
-  bool StringToSopClassUid(SopClassUid& result,
-                           const std::string& source);
-
-  void ComputeWindowing(float& targetCenter,
-                        float& targetWidth,
-                        ImageWindowing windowing,
-                        float defaultCenter,
-                        float defaultWidth);
-}
--- a/Framework/Layers/RenderStyle.h	Tue Mar 20 14:05:39 2018 +0100
+++ b/Framework/Layers/RenderStyle.h	Tue Mar 20 14:46:58 2018 +0100
@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include "../Enumerations.h"
+#include "../StoneEnumerations.h"
 
 #include <EmbeddedResources.h>
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Framework/StoneEnumerations.cpp	Tue Mar 20 14:46:58 2018 +0100
@@ -0,0 +1,75 @@
+/**
+ * Stone of Orthanc
+ * 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 Affero General Public License
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Affero General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ **/
+
+
+#include "StoneEnumerations.h"
+
+#include <Core/Logging.h>
+#include <Core/OrthancException.h>
+#include <Core/Toolbox.h>
+
+namespace OrthancStone
+{  
+  bool StringToSopClassUid(SopClassUid& result,
+                           const std::string& source)
+  {
+    std::string s = Orthanc::Toolbox::StripSpaces(source);
+
+    if (s == "1.2.840.10008.5.1.4.1.1.481.2")
+    {
+      result = SopClassUid_RTDose;
+      return true;
+    }
+    else
+    {
+      //LOG(INFO) << "Unknown SOP class UID: " << source;
+      return false;
+    }
+  }  
+
+
+  void ComputeWindowing(float& targetCenter,
+                        float& targetWidth,
+                        ImageWindowing windowing,
+                        float defaultCenter,
+                        float defaultWidth)
+  {
+    switch (windowing)
+    {
+      case ImageWindowing_Default:
+        targetCenter = defaultCenter;
+        targetWidth = defaultWidth;
+        break;
+
+      case ImageWindowing_Bone:
+        targetCenter = 300;
+        targetWidth = 2000;
+        break;
+
+      case ImageWindowing_Lung:
+        targetCenter = -600;
+        targetWidth = 1600;
+        break;
+
+      default:
+        throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange);
+    }
+  }
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Framework/StoneEnumerations.h	Tue Mar 20 14:46:58 2018 +0100
@@ -0,0 +1,99 @@
+/**
+ * Stone of Orthanc
+ * 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 Affero General Public License
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Affero General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ **/
+
+
+#pragma once
+
+#include <string>
+
+namespace OrthancStone
+{
+  enum SliceOffsetMode
+  {
+    SliceOffsetMode_Absolute,
+    SliceOffsetMode_Relative,
+    SliceOffsetMode_Loop
+  };
+
+  enum ImageWindowing
+  {
+    ImageWindowing_Default,
+    ImageWindowing_Bone,
+    ImageWindowing_Lung,
+    ImageWindowing_Custom
+  };
+
+  enum MouseButton
+  {
+    MouseButton_Left,
+    MouseButton_Right,
+    MouseButton_Middle
+  };
+
+  enum MouseWheelDirection
+  {
+    MouseWheelDirection_Up,
+    MouseWheelDirection_Down
+  };
+
+  enum VolumeProjection
+  {
+    VolumeProjection_Axial,
+    VolumeProjection_Coronal,
+    VolumeProjection_Sagittal
+  };
+
+  enum ImageInterpolation
+  {
+    ImageInterpolation_Nearest,
+    ImageInterpolation_Bilinear,
+    ImageInterpolation_Trilinear
+  };
+
+  enum KeyboardModifiers
+  {
+    KeyboardModifiers_None = 0,
+    KeyboardModifiers_Shift = (1 << 0),
+    KeyboardModifiers_Control = (1 << 1),
+    KeyboardModifiers_Alt = (1 << 2)
+  };
+
+  enum SliceImageQuality
+  {
+    SliceImageQuality_Full,
+    SliceImageQuality_Jpeg50,
+    SliceImageQuality_Jpeg90,
+    SliceImageQuality_Jpeg95
+  };
+
+  enum SopClassUid
+  {
+    SopClassUid_RTDose
+  };
+
+  bool StringToSopClassUid(SopClassUid& result,
+                           const std::string& source);
+
+  void ComputeWindowing(float& targetCenter,
+                        float& targetWidth,
+                        ImageWindowing windowing,
+                        float defaultCenter,
+                        float defaultWidth);
+}
--- a/Framework/Toolbox/ImageGeometry.h	Tue Mar 20 14:05:39 2018 +0100
+++ b/Framework/Toolbox/ImageGeometry.h	Tue Mar 20 14:46:58 2018 +0100
@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include "../Enumerations.h"
+#include "../StoneEnumerations.h"
 #include "LinearAlgebra.h"
 
 #include <Core/Images/ImageAccessor.h>
--- a/Framework/Toolbox/MessagingToolbox.h	Tue Mar 20 14:05:39 2018 +0100
+++ b/Framework/Toolbox/MessagingToolbox.h	Tue Mar 20 14:46:58 2018 +0100
@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include "../Enumerations.h"
+#include "../StoneEnumerations.h"
 
 #include <Plugins/Samples/Common/IOrthancConnection.h>
 #include <Plugins/Samples/Common/IDicomDataset.h>
--- a/Framework/Toolbox/OrthancSlicesLoader.h	Tue Mar 20 14:05:39 2018 +0100
+++ b/Framework/Toolbox/OrthancSlicesLoader.h	Tue Mar 20 14:46:58 2018 +0100
@@ -23,7 +23,7 @@
 
 #include "IWebService.h"
 #include "SlicesSorter.h"
-#include "../Enumerations.h"
+#include "../StoneEnumerations.h"
 
 #include <boost/shared_ptr.hpp>
 
--- a/Framework/Toolbox/ParallelSlicesCursor.h	Tue Mar 20 14:05:39 2018 +0100
+++ b/Framework/Toolbox/ParallelSlicesCursor.h	Tue Mar 20 14:46:58 2018 +0100
@@ -22,7 +22,7 @@
 #pragma once
 
 #include "ParallelSlices.h"
-#include "../Enumerations.h"
+#include "../StoneEnumerations.h"
 
 namespace OrthancStone
 {
--- a/Framework/Toolbox/Slice.cpp	Tue Mar 20 14:05:39 2018 +0100
+++ b/Framework/Toolbox/Slice.cpp	Tue Mar 20 14:46:58 2018 +0100
@@ -21,7 +21,7 @@
 
 #include "Slice.h"
 
-#include "../Enumerations.h"
+#include "../StoneEnumerations.h"
 #include "GeometryToolbox.h"
 
 #include <Core/Logging.h>
--- a/Framework/Toolbox/SubpixelReader.h	Tue Mar 20 14:05:39 2018 +0100
+++ b/Framework/Toolbox/SubpixelReader.h	Tue Mar 20 14:46:58 2018 +0100
@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include "../Enumerations.h"
+#include "../StoneEnumerations.h"
 #include "GeometryToolbox.h"
 
 #include <Core/Images/ImageTraits.h>
--- a/Framework/Viewport/IViewport.h	Tue Mar 20 14:05:39 2018 +0100
+++ b/Framework/Viewport/IViewport.h	Tue Mar 20 14:46:58 2018 +0100
@@ -22,7 +22,7 @@
 #pragma once
 
 #include "IStatusBar.h"
-#include "../Enumerations.h"
+#include "../StoneEnumerations.h"
 
 #include <Core/Images/ImageAccessor.h>
 
--- a/Framework/Volumes/ImageBuffer3D.h	Tue Mar 20 14:05:39 2018 +0100
+++ b/Framework/Volumes/ImageBuffer3D.h	Tue Mar 20 14:46:58 2018 +0100
@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include "../Enumerations.h"
+#include "../StoneEnumerations.h"
 #include "../Layers/RenderStyle.h"
 #include "../Toolbox/CoordinateSystem3D.h"
 #include "../Toolbox/DicomFrameConverter.h"
--- a/Framework/Widgets/IWidget.h	Tue Mar 20 14:05:39 2018 +0100
+++ b/Framework/Widgets/IWidget.h	Tue Mar 20 14:46:58 2018 +0100
@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include "../Enumerations.h"
+#include "../StoneEnumerations.h"
 #include "../Viewport/IMouseTracker.h"
 #include "../Viewport/IStatusBar.h"
 #include "../Viewport/IViewport.h"
--- a/Framework/Widgets/IWorldSceneInteractor.h	Tue Mar 20 14:05:39 2018 +0100
+++ b/Framework/Widgets/IWorldSceneInteractor.h	Tue Mar 20 14:46:58 2018 +0100
@@ -24,7 +24,7 @@
 #include "IWorldSceneMouseTracker.h"
 
 #include "../Toolbox/ViewportGeometry.h"
-#include "../Enumerations.h"
+#include "../StoneEnumerations.h"
 #include "../Viewport/IStatusBar.h"
 
 namespace OrthancStone
--- a/Resources/CMake/OrthancStoneConfiguration.cmake	Tue Mar 20 14:05:39 2018 +0100
+++ b/Resources/CMake/OrthancStoneConfiguration.cmake	Tue Mar 20 14:46:58 2018 +0100
@@ -159,7 +159,7 @@
   #${ORTHANC_STONE_DIR}/Framework/Layers/SeriesFrameRendererFactory.cpp
   #${ORTHANC_STONE_DIR}/Framework/Layers/SiblingSliceLocationFactory.cpp
   #${ORTHANC_STONE_DIR}/Framework/Layers/SingleFrameRendererFactory.cpp
-  ${ORTHANC_STONE_DIR}/Framework/Enumerations.cpp
+  ${ORTHANC_STONE_DIR}/Framework/StoneEnumerations.cpp
   ${ORTHANC_STONE_DIR}/Framework/Layers/CircleMeasureTracker.cpp
   ${ORTHANC_STONE_DIR}/Framework/Layers/ColorFrameRenderer.cpp
   ${ORTHANC_STONE_DIR}/Framework/Layers/DicomStructureSetRendererFactory.cpp