BUG: Fix handling of deprecated application argument --dimension

Author: Simon Rit

applications/rtk3Doutputimage_group.py

@@ -46,7 +46,7 @@ def SetConstantImageSourceFromArgParse(source, args_info):
     ImageType = type(source.GetOutput())
 
     # Handle deprecated --dimension argument
-    if args_info.dimension is not None:
+    if args_info.dimension is not None and args_info.Size is None:
         print(
             "Warning: '--dimension' is deprecated and will be removed in a future release. "
             "Please use '--size' instead."

include/rtkGgoFunctions.h

@@ -54,7 +54,7 @@ SetConstantImageSourceFromGgo(TConstantImageSourceType * source, const TArgsInfo
   const unsigned int Dimension = ImageType::GetImageDimension();
 
   typename ImageType::SizeType imageSize;
-  if (args_info.dimension_given)
+  if (args_info.dimension_given && !args_info.size_given)
   {
     itkGenericOutputMacro(
       "Warning: --dimension is deprecated and will be removed in a future release. Use --size instead.");
@@ -64,9 +64,12 @@ SetConstantImageSourceFromGgo(TConstantImageSourceType * source, const TArgsInfo
       imageSize[i] = args_info.dimension_arg[i];
     }
   }
-  imageSize.Fill(args_info.size_arg[0]);
-  for (unsigned int i = 0; i < std::min(args_info.size_given, Dimension); i++)
-    imageSize[i] = args_info.size_arg[i];
+  else
+  {
+    imageSize.Fill(args_info.size_arg[0]);
+    for (unsigned int i = 0; i < std::min(args_info.size_given, Dimension); i++)
+      imageSize[i] = args_info.size_arg[i];
+  }
 
   typename ImageType::SpacingType imageSpacing;
   imageSpacing.Fill(args_info.spacing_arg[0]);