fix(dicom): do not output to stdout with write-rt-struct

Author: thewtex

packages/dicom/dcmtk/CMakeLists.txt

@@ -225,7 +225,7 @@ if (EMSCRIPTEN OR WASI)
 endif()
 set(PLM_GIT_REPOSITORY "https://github.com/InsightSoftwareConsortium/plastimatch")
 # plastimatch-2024-10-30-5036f97-itk-wasm-2025-02-03
-set(PLM_GIT_TAG        "a8e899092d52f6c7146592730c5dcd8e9331200b")
+set(PLM_GIT_TAG        "babc354f210ba86a91cb6def718b45583c604e74")
 option(PLM_CONFIG_ENABLE_DCMTK "Enable DCMTK support" ON)
 option(PLM_CONFIG_ENABLE_OPENMP "Enable OpenMP support" OFF)
 option(PLM_CONFIG_ENABLE_OPENCL "Enable OpenCL support" OFF)

packages/dicom/dcmtk/itk_wasm_rt_study.cxx

@@ -29,7 +29,7 @@ Itk_wasm_rt_study::~Itk_wasm_rt_study ()
 }
 
 void
-Itk_wasm_rt_study::save_rtss (const char* fname, const ItkWasmRtStudyMetadata& metadata)
+Itk_wasm_rt_study::save_rtss (const char* fname, const ItkWasmRtStudyMetadata& metadata, bool quiet)
 {
   // Modified:
   // rt_study.cxx Rt_study::save_dicom
@@ -53,7 +53,7 @@ Itk_wasm_rt_study::save_rtss (const char* fname, const ItkWasmRtStudyMetadata& m
     logic should be improved to better keep track of
     when structure names are valid to avoid this. */
     this->d_ptr->m_seg->prune_empty ();
-    this->d_ptr->m_seg->keyholize ();
+    this->d_ptr->m_seg->keyholize (quiet);
     drs.set_rtss (this->d_ptr->m_seg->get_structure_set());
   }
   drs.set_dose (this->d_ptr->m_dose);

packages/dicom/dcmtk/itk_wasm_rt_study.h

@@ -33,42 +33,13 @@
 class PLMBASE_API Itk_wasm_rt_study: public Rt_study {
 public:
     SMART_POINTER_SUPPORT (Itk_wasm_rt_study);
-public:
-    // Itk_wasm_rt_study_private *d_ptr;
 
-public:
     Itk_wasm_rt_study ();
     ~Itk_wasm_rt_study ();
 
-    void save_rtss (const char *fname, const ItkWasmRtStudyMetadata &metadata);
-
-    // /*! \brief Get the Rt_study_metadata */
-    // const Rt_study_metadata::Pointer& get_rt_study_metadata () const;
-    // Rt_study_metadata::Pointer& get_rt_study_metadata ();
-    // /*! \brief Set metadata items into study_metadata portion of Rt_study_metadata */
-    // void set_study_metadata (const std::vector<std::string>& metadata);
-    // /*! \brief Get the study_metadata portion of Rt_study_metadata */
-    // Metadata::Pointer& get_study_metadata ();
-    // /*! \brief Set metadata items into image portion of Rt_study_metadata */
-    // void set_image_metadata (const std::vector<std::string>& metadata);
-    // /*! \brief Get the image portion of Rt_study_metadata */
-    // Metadata::Pointer& get_image_metadata ();
-    // /*! \brief Set metadata items into dose portion of Rt_study_metadata */
-    // void set_dose_metadata (const std::vector<std::string>& metadata);
-    // /*! \brief Get the dose portion of Rt_study_metadata */
-    // Metadata::Pointer& get_dose_metadata ();
-    // /*! \brief Set metadata items into rtstruct portion 
-    //   of Rt_study_metadata */
-    // void set_rtstruct_metadata (const std::vector<std::string>& metadata);
-    // /*! \brief Get the rtstruct portion of Rt_study_metadata */
-    // Metadata::Pointer& get_rtstruct_metadata ();
-    // /*! \brief Create new StudyInstanceUID and FrameOfReferenceUID for the study */
-    // void generate_new_study_uids ();
-    // /*! \brief Force the CT series UID to a certain value when saving */
-    // void force_ct_series_uid (const std::string& series_uid);
+    void save_rtss (const char *fname, const ItkWasmRtStudyMetadata &metadata, bool quiet = true);
 
 protected:
-    // void save_dcmtk (const char *dicom_dir, bool filenames_with_uid);
 };
 
 #endif

packages/dicom/dcmtk/write-rt-struct.cxx

@@ -48,7 +48,6 @@ int main (int argc, char * argv[])
   std::string dicomMetadataString("{}");
   if (dicomMetadataOption->count() > 0)
   {
-    std::cout << "Reading DICOM metadata from JSON: " << dicomMetadataOption->count() << std::endl;
     dicomMetadataString = std::string(std::istreambuf_iterator<char>(dicomMetadataJson.Get()), {});
   }
   auto deserializedAttempt = glz::read_json<ItkWasmRtStudyMetadata>(dicomMetadataString);
@@ -60,26 +59,12 @@ int main (int argc, char * argv[])
   }
   const auto dicomMetadata = deserializedAttempt.value();
 
-  std::cout << "UID Prefix: " << dicomMetadata.uidPrefix << std::endl;
-
   PlmUidPrefix::getInstance().set(dicomMetadata.uidPrefix);
 
   Itk_wasm_rt_study rt_study;
 
-  rt_study.load_cxt(inputCxt.c_str());
-
-  Rt_study_metadata::Pointer rt_study_metadata = rt_study.get_rt_study_metadata();
-  rt_study_metadata->set_study_description("A Test Prostate Lesion RT Struct Study");
-  rt_study_metadata->set_patient_birth_date("19700101");
-  rt_study_metadata->print();
-  // rt_study.set_rt_study_metadata(rt_study_metadata);
-  // rt_study_metadata->set_study_instance_uid("
-  Metadata::Pointer study_metadata = rt_study_metadata->get_study_metadata();
-  study_metadata->print_metadata();
-
-  Metadata::Pointer rtstruct_metadata = rt_study_metadata->get_rtstruct_metadata();
-  rtstruct_metadata->print_metadata();
-
+  constexpr bool quiet{ true };
+  rt_study.load_cxt(inputCxt.c_str(), quiet);
 
   rt_study.save_rtss(outputDicom.c_str(), dicomMetadata);