Merge pull request #2376 from SCIInstitute/release_v6.6.0

Release v6.6.0 changes

Author: akenmorris

CMakeLists.txt

@@ -6,13 +6,13 @@ cmake_minimum_required(VERSION 3.20)
 SET(SHAPEWORKS_MAJOR_VERSION 6 CACHE INTERNAL "Major version number" FORCE)
 SET(SHAPEWORKS_MINOR_VERSION 6 CACHE INTERNAL "Minor version number" FORCE)
 SET(SHAPEWORKS_PATCH_VERSION 0 CACHE INTERNAL "Patch version number" FORCE)
-SET(SHAPEWORKS_VERSION_STRING "6.6.0_RC6")
+SET(SHAPEWORKS_VERSION_STRING "6.6.0")
 SET(SHAPEWORKS_VERSION "${SHAPEWORKS_MAJOR_VERSION}.${SHAPEWORKS_MINOR_VERSION}.${SHAPEWORKS_PATCH_VERSION}")
 
 # First, check that files were checked out properly using git-lfs
 file(MD5 "${CMAKE_CURRENT_SOURCE_DIR}/Testing/data/icp_baseline.nrrd" HASH)
 if (NOT "${HASH}" STREQUAL "bb94438a695c749b264180019abbbb97")
-  message( FATAL_ERROR "MD5 hash of '${CMAKE_CURRENT_SOURCE_DIR}/Testing/data/icp_baseline.nrrd' is incorrect.  This most likely means that git-lfs was not installed when ShapeWorks was cloned." )
+  message( FATAL_ERROR "MD5 hash of '${CMAKE_CURRENT_SOURCE_DIR}/Testing/data/icp_baseline.nrrd' is incorrect.  This most likely means that git-lfs was not installed when ShapeWorks was cloned.  If you have downloaded a zip or tar.gz of the source, then it will be missing Git-LFS objects.  Please use git to clone ShapeWorks or download a source archive containing the Git-LFS objects under releases." )
 endif()
 
 set(CMAKE_CXX_STANDARD 17)             # available options are [98, 11, 14, 17. 20]

README.md

@@ -22,7 +22,9 @@ Latest Release
 <!--![](docs/img/about/release6.1.png)-->
 <!--![](docs/img/about/release6.2.png)-->
 <!--![](docs/img/about/release6.3.png)-->
-![](docs/img/about/release6.4.png)
+<!--![](docs/img/about/release6.4.png)-->
+<!--![](docs/img/about/release6.5.png)-->
+![](docs/img/about/release6.6.png)
 
 Quick Links
 =====================

Studio/Analysis/AnalysisTool.cpp

@@ -1679,7 +1679,9 @@ void AnalysisTool::on_metrics_open_button_toggled() {
 //---------------------------------------------------------------------------
 void AnalysisTool::initialize_mesh_warper() {
   if (session_->particles_present() && session_->get_groomed_present()) {
-    compute_stats();
+    if (!compute_stats()) {
+      return;
+    }
 
     auto params = session_->get_project()->get_parameters(Parameters::ANALYSIS_PARAMS);
 

Studio/Interface/ShapeWorksStudioApp.cpp

@@ -1528,7 +1528,6 @@ void ShapeWorksStudioApp::open_project(QString filename) {
   }
 
   analysis_tool_->reset_stats();
-  analysis_tool_->initialize_mesh_warper();
 
   block_update_ = true;
 
@@ -1565,6 +1564,7 @@ void ShapeWorksStudioApp::open_project(QString filename) {
   on_zoom_slider_valueChanged();
 
   session_->set_loading(false);
+  analysis_tool_->initialize_mesh_warper();
 
   if (ui_->action_analysis_mode->isChecked() && !ui_->action_analysis_mode->isEnabled()) {
     on_action_import_mode_triggered();