Mercurial > hg > orthanc-stone

changeset 1893:90b5e116a5f9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
removed DicomStructureSet::GetStructureColor()
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 19 Jan 2022 14:01:57 +0100
parents cdf91ad891a5
children 438071a29f77
files OrthancStone/Sources/Toolbox/DicomStructureSet.cpp OrthancStone/Sources/Toolbox/DicomStructureSet.h OrthancStone/UnitTestsSources/TestStructureSet.cpp
diffstat 3 files changed, 0 insertions(+), 24 deletions(-) [+]
line wrap: on
line diff
--- a/OrthancStone/Sources/Toolbox/DicomStructureSet.cpp	Wed Jan 19 13:50:28 2022 +0100
+++ b/OrthancStone/Sources/Toolbox/DicomStructureSet.cpp	Wed Jan 19 14:01:57 2022 +0100
@@ -694,18 +694,6 @@
   }
   
     
-  void DicomStructureSet::GetStructureColor(uint8_t& red,
-                                            uint8_t& green,
-                                            uint8_t& blue,
-                                            size_t index) const
-  {
-    const Structure& s = GetStructure(index);
-    red = s.red_;
-    green = s.green_;
-    blue = s.blue_;
-  }
-
-
   void DicomStructureSet::GetReferencedInstances(std::set<std::string>& instances) const
   {
     for (Structures::const_iterator structure = structures_.begin();
--- a/OrthancStone/Sources/Toolbox/DicomStructureSet.h	Wed Jan 19 13:50:28 2022 +0100
+++ b/OrthancStone/Sources/Toolbox/DicomStructureSet.h	Wed Jan 19 14:01:57 2022 +0100
@@ -195,12 +195,6 @@
 
     Color GetStructureColor(size_t index) const;
 
-    // TODO - remove
-    void GetStructureColor(uint8_t& red,
-                           uint8_t& green,
-                           uint8_t& blue,
-                           size_t index) const;
-
     void GetReferencedInstances(std::set<std::string>& instances) const;
 
     void AddReferencedSlice(const std::string& sopInstanceUid,
--- a/OrthancStone/UnitTestsSources/TestStructureSet.cpp	Wed Jan 19 13:50:28 2022 +0100
+++ b/OrthancStone/UnitTestsSources/TestStructureSet.cpp	Wed Jan 19 14:01:57 2022 +0100
@@ -31,8 +31,6 @@
 #  pragma warning(disable: 4748)
 #endif
 
-#include "../Sources/Loaders/DicomStructureSetLoader.h"
-#include "../Sources/Loaders/OrthancSeriesVolumeProgressiveLoader.h"
 #include "../Sources/Toolbox/DicomStructureSet2.h"
 #include "../Sources/Toolbox/DicomStructureSetUtils.h"
 #include "../Sources/Toolbox/DisjointDataSet.h"
@@ -106,7 +104,6 @@
                              Orthanc::EmbeddedResources::GetFileResourceSize(Orthanc::EmbeddedResources::RT_STRUCT_00));
 
   FullOrthancDataset dicom(test);
-  //loader.content_.reset(new DicomStructureSet(dicom));
   structureSet.Clear();
 
   structureSet.FillStructuresFromDataset(dicom);
@@ -228,7 +225,6 @@
   DicomStructureSet2 structureSet;
 
   OrthancPlugins::FullOrthancDataset dicom(GetTestJson());
-  //loader.content_.reset(new DicomStructureSet(dicom));
   structureSet.Clear();
 
   structureSet.FillStructuresFromDataset(dicom);
@@ -241,7 +237,6 @@
   DicomStructureSet2 structureSet;
 
   OrthancPlugins::FullOrthancDataset dicom(GetTestJson());
-  //loader.content_.reset(new DicomStructureSet(dicom));
   structureSet.Clear();
 
   structureSet.SetContents(dicom);
@@ -1173,7 +1168,6 @@
   Orthanc::SystemToolbox::ReadFile(jsonText, "72c773ac-5059f2c4-2e6a9120-4fd4bca1-45701661.json");
 
   FullOrthancDataset dicom(jsonText);
-  //loader.content_.reset(new DicomStructureSet(dicom));
   structureSet.Clear();
 
   structureSet.FillStructuresFromDataset(dicom);