feat(image-io): Update package for bindgen generation

InsightSoftwareConsortium · Oct 3, 2023 · da20f7e · da20f7e
1 parent 3dcd325
commit da20f7e
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 28 deletions.
diff --git a/packages/image-io/CMakeLists.txt b/packages/image-io/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.16)
-project(convert-image)
+project(itkwasm-image-io)
 
 set(CMAKE_CXX_STANDARD 17)
 
@@ -56,66 +56,89 @@ else()
 endif()
 set(imageios_ITKIOPNG itkPNGImageIO)
 set(imageio_id_itkPNGImageIO 0)
+set(imageio_kebab_itkPNGImageIO "png")
 
 set(imageios_ITKIOMeta itkMetaImageIO)
 set(imageio_id_itkMetaImageIO 1)
+set(imageio_kebab_itkMetaImageIO "meta")
 
 set(imageios_ITKIOTIFF itkTIFFImageIO)
 set(imageio_id_itkTIFFImageIO 2)
+set(imageio_kebab_itkTIFFImageIO "tiff")
 
 set(imageios_ITKIONIFTI itkNiftiImageIO)
 set(imageio_id_itkNiftiImageIO 3)
+set(imageio_kebab_itkNiftiImageIO "nifti")
 
 set(imageios_ITKIOJPEG itkJPEGImageIO)
 set(imageio_id_itkJPEGImageIO 4)
+set(imageio_kebab_itkJPEGImageIO "jpeg")
 
 set(imageios_ITKIONRRD itkNrrdImageIO)
 set(imageio_id_itkNrrdImageIO 5)
+set(imageio_kebab_itkNrrdImageIO "nrrd")
 
 set(imageios_ITKIOVTK itkVTKImageIO)
 set(imageio_id_itkVTKImageIO 6)
+set(imageio_kebab_itkVTKImageIO "vtk")
 
 set(imageios_ITKIOBMP itkBMPImageIO)
 set(imageio_id_itkBMPImageIO 7)
+set(imageio_kebab_itkBMPImageIO "bmp")
 
 set(imageios_ITKIOHDF5 itkHDF5ImageIO)
 set(imageio_id_itkHDF5ImageIO 8)
+set(imageio_kebab_itkHDF5ImageIO "hdf5")
 
 set(imageios_ITKIOMINC itkMINCImageIO)
 set(imageio_id_itkMINCImageIO 9)
+set(imageio_kebab_itkMINCImageIO "minc")
 
 set(imageios_ITKIOMRC itkMRCImageIO)
 set(imageio_id_itkMRCImageIO 10)
+set(imageio_kebab_itkMRCImageIO "mrc")
 
 set(imageios_ITKIOLSM itkLSMImageIO)
 set(imageio_id_itkLSMImageIO 11)
+set(imageio_kebab_itkLSMImageIO "lsm")
 
 set(imageios_MGHIO itkMGHImageIO)
 set(imageio_id_itkMGHImageIO 12)
+set(imageio_kebab_itkMGHImageIO "mgh")
 
 set(imageios_ITKIOBioRad itkBioRadImageIO)
 set(imageio_id_itkBioRadImageIO 13)
+set(imageio_kebab_itkBioRadImageIO "bio-rad")
 
 set(imageios_ITKIOGIPL itkGiplImageIO)
 set(imageio_id_itkGiplImageIO 14)
+set(imageio_kebab_itkGiplImageIO "gipl")
 
 set(imageios_ITKIOGE itkGEAdwImageIO itkGE4ImageIO itkGE5ImageIO)
 set(imageio_id_itkGE4ImageIO 15)
+set(imageio_kebab_itkGE4ImageIO "ge4")
 set(imageio_id_itkGE5ImageIO 16)
+set(imageio_kebab_itkGE5ImageIO "ge5")
 set(imageio_id_itkGEAdwImageIO 17)
+set(imageio_kebab_itkGEAdwImageIO "ge-adw")
 
 set(imageios_ITKIOGDCM itkGDCMImageIO)
 set(imageio_id_itkGDCMImageIO 18)
+set(imageio_kebab_itkGDCMImageIO "gdcm")
 
 set(imageios_IOScanco itkScancoImageIO)
 set(imageio_id_itkScancoImageIO 19)
+set(imageio_kebab_itkScancoImageIO "scanco")
 
 set(imageios_IOFDF itkFDFImageIO)
 set(imageio_id_itkFDFImageIO 20)
+set(imageio_kebab_itkFDFImageIO "fdf")
 
 set(imageios_WebAssemblyInterface itkWasmImageIO itkWasmZstdImageIO)
 set(imageio_id_itkWasmImageIO 21)
+set(imageio_kebab_itkWasmImageIO "wasm")
 set(imageio_id_itkWasmZstdImageIO 22)
+set(imageio_kebab_itkWasmZstdImageIO "wasm-zstd")
 
 set(ITK_NO_IMAGEIO_FACTORY_REGISTER_MANAGER 1)
 set(ImageIOIndex_ARRAY "")
@@ -141,6 +164,10 @@ foreach(io_module ${WebAssemblyInterface_ImageIOModules} WebAssemblyInterface)
   endif()
   foreach(imageio ${imageios_${io_module}})
     string(SUBSTRING "${imageio}" 3 -1 ioname)
+    if(NOT DEFINED imageio_kebab_${imageio})
+      message(FATAL_ERROR "Unknown kebab name for imageio ${imageio}")
+    endif()
+    set(ioname ${imageio_kebab_${imageio}})
     set(read_binary "${ioname}-read-image")
     set(write_binary "${ioname}-write-image")
     set(ImageIOIndex_ARRAY "${ImageIOIndex_ARRAY}'${ioname}', ")
@@ -152,17 +179,17 @@ foreach(io_module ${WebAssemblyInterface_ImageIOModules} WebAssemblyInterface)
 
     add_executable(${read_binary} read-image.cxx ${extra_srcs})
     target_link_libraries(${read_binary} PUBLIC ${ITK_LIBRARIES})
-    target_compile_definitions(${read_binary} PUBLIC -DIMAGE_IO_CLASS=${imageio_id_${imageio}})
+    target_compile_definitions(${read_binary} PUBLIC -DIMAGE_IO_CLASS=${imageio_id_${imageio}} -DIMAGE_IO_KEBAB_NAME=${ioname})
     add_executable(${write_binary} write-image.cxx ${extra_srcs})
     target_link_libraries(${write_binary} PUBLIC ${ITK_LIBRARIES})
-    target_compile_definitions(${write_binary} PUBLIC -DIMAGE_IO_CLASS=${imageio_id_${imageio}})
+    target_compile_definitions(${write_binary} PUBLIC -DIMAGE_IO_CLASS=${imageio_id_${imageio}} -DIMAGE_IO_KEBAB_NAME=${ioname})
     if (EMSCRIPTEN)
       set(target_esm_read "${read_binary}")
       set(target_umd_read "${read_binary}.umd")
       set(target_esm_write "${write_binary}")
       set(target_umd_write "${write_binary}.umd")
-      target_compile_definitions(${target_umd_read} PUBLIC -DIMAGE_IO_CLASS=${imageio_id_${imageio}})
-      target_compile_definitions(${target_umd_write} PUBLIC -DIMAGE_IO_CLASS=${imageio_id_${imageio}})
+      target_compile_definitions(${target_umd_read} PUBLIC -DIMAGE_IO_CLASS=${imageio_id_${imageio}} -DIMAGE_IO_KEBAB_NAME=${ioname})
+      target_compile_definitions(${target_umd_write} PUBLIC -DIMAGE_IO_CLASS=${imageio_id_${imageio}} -DIMAGE_IO_KEBAB_NAME=${ioname})
       foreach(target ${target_esm_read} ${target_umd_read} ${target_esm_write} ${target_umd_write})
         set(exception_catching )
         if(${io_module} STREQUAL "ITKIOGE")
@@ -171,23 +198,11 @@ foreach(io_module ${WebAssemblyInterface_ImageIOModules} WebAssemblyInterface)
         set(imageio_common_link_flags " -s ERROR_ON_UNDEFINED_SYMBOLS=0 -s SUPPORT_LONGJMP=1")
         get_property(link_flags TARGET ${target} PROPERTY LINK_FLAGS)
         set_property(TARGET ${target} APPEND_STRING PROPERTY LINK_FLAGS " ${imageio_common_link_flags} ${link_flags}")
-        set_property(TARGET ${target}
-          PROPERTY RUNTIME_OUTPUT_DIRECTORY
-          ${CMAKE_CURRENT_SOURCE_DIR}/typescript/dist/pipelines
-          )
-      endforeach()
-    elseif (WASI)
-      foreach(target ${read_binary} ${write_binary})
-        set(exception_catching )
-        set_property(TARGET ${target}
-          PROPERTY RUNTIME_OUTPUT_DIRECTORY
-          ${CMAKE_CURRENT_SOURCE_DIR}/typescript/wasi/pipelines
-          )
       endforeach()
     endif()
   endforeach()
 endforeach()
 if(EMSCRIPTEN)
-  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/ImageIOIndex.ts.in
-    ${CMAKE_CURRENT_SOURCE_DIR}/typescript/src/ImageIOIndex.ts @ONLY)
+  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/image-io-index.ts.in
+    ${CMAKE_CURRENT_SOURCE_DIR}/typescript/src/image-io-index.ts @ONLY)
 endif()
diff --git a/packages/image-io/image-io-index.ts.in b/packages/image-io/image-io-index.ts.in
@@ -0,0 +1,3 @@
+const ImageIOIndex = [@ImageIOIndex_ARRAY@]
+
+export default ImageIOIndex
diff --git a/packages/image-io/read-image.cxx b/packages/image-io/read-image.cxx
@@ -74,6 +74,8 @@
 #endif
 #include "itkWasmImageIO.h"
 
+#define PIPELINE_NAME (#IMAGE_IO_KEBAB_NAME "read-image")
+
 #include "itkPipeline.h"
 #include "itkOutputImage.h"
 
@@ -101,17 +103,17 @@ int readImage(const std::string & inputFileName, itk::wasm::OutputImageIO & outp
 
 int main (int argc, char * argv[])
 {
-  itk::wasm::Pipeline pipeline("read-image", "Read an image file format and convert it to the itk-wasm file format", argc, argv);
+  itk::wasm::Pipeline pipeline("PIPELINE_NAME", "Read an image file format and convert it to the itk-wasm file format", argc, argv);
 
   std::string inputFileName;
-  pipeline.add_option("input-image", inputFileName, "Input image")->required()->check(CLI::ExistingFile);
+  pipeline.add_option("input-image", inputFileName, "Input image")->required()->check(CLI::ExistingFile)->type_name("INPUT_BINARY_FILE");
 
   itk::wasm::OutputImageIO outputImageIO;
-  pipeline.add_option("OutputImage", outputImageIO, "Output image")->required();
+  pipeline.add_option("output-image", outputImageIO, "Output image")->required()->type_name("OUTPUT_IMAGE");
 
   bool quiet = false;
   pipeline.add_flag("-q,--quiet", quiet, "Less verbose output");
-  
+
   ITK_WASM_PARSE(pipeline);
 
 #if IMAGE_IO_CLASS == 0

diff --git a/packages/image-io/write-image.cxx b/packages/image-io/write-image.cxx
@@ -74,6 +74,8 @@
 #endif
 #include "itkWasmImageIO.h"
 
+#define PIPELINE_NAME (#IMAGE_IO_KEBAB_NAME "write-image")
+
 #include "itkPipeline.h"
 #include "itkOutputImage.h"
 #include "itkWasmImageIOBase.h"
@@ -134,20 +136,20 @@ int writeImage(itk::wasm::InputImageIO & inputImageIO, const std::string & outpu
 
 int main (int argc, char * argv[])
 {
-  itk::wasm::Pipeline pipeline("write-image", "Write an itk-wasm file format converted to an image file format", argc, argv);
+  itk::wasm::Pipeline pipeline("PIPELINE_NAME", "Write an itk-wasm file format converted to an image file format", argc, argv);
 
   itk::wasm::InputImageIO inputImageIO;
-  pipeline.add_option("input-image", inputImageIO, "Input image")->required();
+  pipeline.add_option("input-image", inputImageIO, "Input image")->required()->type_name("INPUT_IMAGE");
 
   std::string outputFileName;
-  pipeline.add_option("output-image", outputFileName, "Output image")->required();
+  pipeline.add_option("output-image", outputFileName, "Output image")->required()->type_name("OUTPUT_BINARY_FILE");
 
   bool quiet = false;
   pipeline.add_flag("-q,--quiet", quiet, "Less verbose output");
-  
+
   bool useCompression = false;
   pipeline.add_flag("-c,--use-compression", quiet, "Use compression in the written file");
-  
+
   ITK_WASM_PARSE(pipeline);
 
 #if IMAGE_IO_CLASS == 0
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		const ImageIOIndex = [@ImageIOIndex_ARRAY@]

		export default ImageIOIndex