BUG: polydegree==0 - wasnt saving params; BUG: ants version number

gandreadis · Oct 9, 2014 · 707965a · 707965a
1 parent 46292f3
commit 707965a
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 7 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -34,10 +34,10 @@ mark_as_advanced(${LOCAL_PROJECT_NAME}_INSTALL_DEVELOPMENT)
 set(CPACK_PACKAGE_NAME "ANTs")
 set(CPACK_PACKAGE_VENDOR "CMake.org")
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "ANTs - Advanced Normalization Tools")
-set(CPACK_PACKAGE_VERSION "2.1.v4")
+set(CPACK_PACKAGE_VERSION “2.1.0”)
 set(CPACK_PACKAGE_VERSION_MAJOR "2")
 set(CPACK_PACKAGE_VERSION_MINOR "1")
-set(CPACK_PACKAGE_VERSION_PATCH "v4")
+set(CPACK_PACKAGE_VERSION_PATCH “0”)
 set(CPACK_PACKAGE_INSTALL_DIRECTORY "ANTS_Install")
 set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README.txt")
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "ANTs - robust image registration, segmentation and more")

diff --git a/Examples/CMakeLists.txt b/Examples/CMakeLists.txt
@@ -217,10 +217,10 @@ endif( COPY_SCRIPT_FILES_TO_BIN_DIR )
 set(CPACK_PACKAGE_NAME "ANTs")
 set(CPACK_PACKAGE_VENDOR "CMake.org")
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "ANTs - Advanced Normalization Tools")
-set(CPACK_PACKAGE_VERSION "1.9.y")
-set(CPACK_PACKAGE_VERSION_MAJOR "1")
-set(CPACK_PACKAGE_VERSION_MINOR "9")
-set(CPACK_PACKAGE_VERSION_PATCH "y")
+set(CPACK_PACKAGE_VERSION “2.1.0”)
+set(CPACK_PACKAGE_VERSION_MAJOR “2”)
+set(CPACK_PACKAGE_VERSION_MINOR “1”)
+set(CPACK_PACKAGE_VERSION_PATCH “0”)
 set(CPACK_PACKAGE_INSTALL_DIRECTORY "ANTS")
 # This must always be last!
 include(CPack)
diff --git a/Examples/antsSliceRegularizedRegistration.cxx b/Examples/antsSliceRegularizedRegistration.cxx
@@ -766,7 +766,15 @@ typedef itk::ImageRegistrationMethodv4<FixedImageType, MovingImageType, Translat
     std::cout << " polyx " << polyx << " iceptx " << interceptx  << std::endl;
     std::cout << " polyy " << polyy << " icepty " << intercepty  << std::endl;
     }
-  }// if loop == 0 
+  } else {  // polydegree == 0      
+    transformList = transformUList; 
+    for ( unsigned int i = 0; i < transformList.size(); i++) 
+      {
+      typename TranslationTransformType::ParametersType p = transformList[i]->GetParameters();
+      param_values(i,0) = p[0];
+      param_values(i,1) = p[1];
+      }
+    }
   }// done with optimization, now move on to writing data ...
 
   // write polynomial predicted data