refactor(image-sets-normalization): rename output to image-sets

InsightSoftwareConsortium · Mar 26, 2024 · 2553931 · 2553931
1 parent 0e5b203
commit 2553931
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 15 deletions.
diff --git a/packages/dicom/gdcm/image-sets-normalization.cxx b/packages/dicom/gdcm/image-sets-normalization.cxx
@@ -107,8 +107,8 @@ int main(int argc, char *argv[])
   std::vector<std::string> files;
   pipeline.add_option("--files", files, "DICOM files")->required()->check(CLI::ExistingFile)->type_size(1, -1)->type_name("INPUT_BINARY_FILE");
 
-  itk::wasm::OutputTextStream imageSetsMetadata;
-  pipeline.add_option("image-sets-metadata", imageSetsMetadata, "Image sets JSON")->required()->type_name("OUTPUT_JSON");
+  itk::wasm::OutputTextStream imageSets;
+  pipeline.add_option("image-sets", imageSets, "Image sets JSON")->required()->type_name("OUTPUT_JSON");
 
   ITK_WASM_PARSE(pipeline);
 
@@ -232,7 +232,7 @@ int main(int argc, char *argv[])
   rapidjson::StringBuffer stringBuffer;
   rapidjson::Writer<rapidjson::StringBuffer> writer(stringBuffer);
   imageSetsJson.Accept(writer);
-  imageSetsMetadata.Get() << stringBuffer.GetString();
+  imageSets.Get() << stringBuffer.GetString();
 
   return EXIT_SUCCESS;
 }
diff --git a/packages/dicom/python/itkwasm-dicom-wasi/itkwasm_dicom_wasi/image_sets_normalization.py b/packages/dicom/python/itkwasm-dicom-wasi/itkwasm_dicom_wasi/image_sets_normalization.py
@@ -41,8 +41,8 @@ def image_sets_normalization(
     args: List[str] = ['--memory-io',]
     # Inputs
     # Outputs
-    image_sets_metadata_name = '0'
-    args.append(image_sets_metadata_name)
+    image_sets_name = '0'
+    args.append(image_sets_name)
 
     # Options
     input_count = len(pipeline_inputs)

diff --git a/...hon/itkwasm-dicom-wasi/itkwasm_dicom_wasi/wasm_modules/image-sets-normalization.wasi.wasm b/...hon/itkwasm-dicom-wasi/itkwasm_dicom_wasi/wasm_modules/image-sets-normalization.wasi.wasm
diff --git a/packages/dicom/typescript/src/image-sets-normalization-node-result.ts b/packages/dicom/typescript/src/image-sets-normalization-node-result.ts
@@ -4,7 +4,7 @@ import { JsonCompatible } from 'itk-wasm'
 
 interface ImageSetsNormalizationNodeResult {
   /** Image sets JSON */
-  imageSetsMetadata: JsonCompatible
+  imageSets: JsonCompatible
 
 }
 

diff --git a/packages/dicom/typescript/src/image-sets-normalization-node.ts b/packages/dicom/typescript/src/image-sets-normalization-node.ts
@@ -37,8 +37,8 @@ async function imageSetsNormalizationNode(
   const args = []
   // Inputs
   // Outputs
-  const imageSetsMetadataName = '0'
-  args.push(imageSetsMetadataName)
+  const imageSetsName = '0'
+  args.push(imageSetsName)
 
   // Options
   args.push('--memory-io')
@@ -66,7 +66,7 @@ async function imageSetsNormalizationNode(
   }
 
   const result = {
-    imageSetsMetadata: outputs[0]?.data as JsonCompatible,
+    imageSets: outputs[0]?.data as JsonCompatible,
   }
   return result
 }

diff --git a/packages/dicom/typescript/src/image-sets-normalization-result.ts b/packages/dicom/typescript/src/image-sets-normalization-result.ts
@@ -4,7 +4,7 @@ import { JsonCompatible, WorkerPoolFunctionResult } from 'itk-wasm'
 
 interface ImageSetsNormalizationResult extends WorkerPoolFunctionResult {
   /** Image sets JSON */
-  imageSetsMetadata: JsonCompatible
+  imageSets: JsonCompatible
 
 }
 

diff --git a/packages/dicom/typescript/src/image-sets-normalization.ts b/packages/dicom/typescript/src/image-sets-normalization.ts
@@ -38,8 +38,8 @@ async function imageSetsNormalization(
   const args = []
   // Inputs
   // Outputs
-  const imageSetsMetadataName = '0'
-  args.push(imageSetsMetadataName)
+  const imageSetsName = '0'
+  args.push(imageSetsName)
 
   // Options
   args.push('--memory-io')
@@ -79,7 +79,7 @@ async function imageSetsNormalization(
 
   const result = {
     webWorker: usedWebWorker as Worker,
-    imageSetsMetadata: outputs[0]?.data as JsonCompatible,
+    imageSets: outputs[0]?.data as JsonCompatible,
   }
   return result
 }

diff --git a/packages/dicom/typescript/test/browser/demo-app/index.html b/packages/dicom/typescript/test/browser/demo-app/index.html
@@ -365,8 +365,8 @@ <h3>👨‍💻 Live API Demo ✨</h3>
     <sl-divider></sl-divider>
 
     <div id="imageSetsNormalizationOutputs">
-      <sl-details disabled id="imageSetsNormalization-image-sets-metadata-details" summary="imageSetsMetadata: Image sets JSON"></sl-details>
-      <sl-button variant="neutral" outline name="image-sets-metadata-download" disabled>Download</sl-button>
+      <sl-details disabled id="imageSetsNormalization-image-sets-details" summary="imageSets: Image sets JSON"></sl-details>
+      <sl-button variant="neutral" outline name="image-sets-download" disabled>Download</sl-button>
 <br /><br />
     </div>