Merge pull request #42 from NIRALUser/master

DTIPrep version 1.2.8
NIRALUser · May 31, 2017 · 7dc1435 · 7dc1435
2 parents 94569da + cd26951
commit 7dc1435
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 6 deletions.
diff --git a/SuperBuild/External_TIFF.cmake b/SuperBuild/External_TIFF.cmake
@@ -83,8 +83,8 @@ if(NOT ( DEFINED "USE_SYSTEM_${extProjName}" AND "${USE_SYSTEM_${extProjName}}"
   AutoConf_FLAGS(${proj}_CXXFLAGS CXX "${APPLE_CFLAGS}")
 
   ### --- End Project specific additions
-  set(${proj}_URL "http://download.osgeo.org/libtiff/tiff-4.0.3.tar.gz")
-  set(${proj}_MD5 "051c1068e6a0627f461948c365290410")
+  set(${proj}_URL "http://download.osgeo.org/libtiff/tiff-4.0.4.tar.gz")
+  set(${proj}_MD5 "9aee7107408a128c0c7b24286c0db900")
   ExternalProject_Add(${proj}
     URL ${${proj}_URL}
     ${URL_HASH_CLAUSE}

diff --git a/SuperBuild/External_VTK.cmake b/SuperBuild/External_VTK.cmake
@@ -161,7 +161,7 @@ if(NOT ( DEFINED "USE_SYSTEM_${extProjName}" AND "${USE_SYSTEM_${extProjName}}"
     )
   ### --- End Project specific additions
 
-  set(${proj}_GIT_TAG "v7.0.0")
+  set(${proj}_GIT_TAG "v7.1.1")
   set(${proj}_REPOSITORY ${git_protocol}://vtk.org/VTK.git)
 
   ExternalProject_Add(${proj}
@@ -197,7 +197,7 @@ if(NOT ( DEFINED "USE_SYSTEM_${extProjName}" AND "${USE_SYSTEM_${extProjName}}"
   #   -P ${VTKPatchScript}
   #   )
 
-set(${extProjName}_DIR ${CMAKE_BINARY_DIR}/${proj}-install/lib/cmake/vtk-7.0)
+set(${extProjName}_DIR ${CMAKE_BINARY_DIR}/${proj}-install/lib/cmake/vtk-7.1)
 
 else()
   if(${USE_SYSTEM_${extProjName}})

diff --git a/src/DTIPrep.xml b/src/DTIPrep.xml
@@ -5,7 +5,7 @@
   <description>
     The DWI/DTI Quality Control Processes from dicom data to qualified dwi image.
   </description>
-  <version>1.2.7</version>
+  <version>1.2.8</version>
   <license></license>
   <contributor>Mahshid Farzinfar (1), Zhexing Liu (1), Martin Styner(1),Hans Johnson(2,3,4), Joy Matsui(2), Kent Williams(2); (1=Department of Psychiatry, University of North Carolina at Chapel Hill, 2=University of Iowa Department of Psychiatry, 3=University of Iowa Department of Biomedical Engineering, 4=University of Iowa Department of Electrical and Computer Engineering)
 </contributor>

diff --git a/src/IntensityMotionCheckPanel.cxx b/src/IntensityMotionCheckPanel.cxx
@@ -3732,6 +3732,10 @@ void IntensityMotionCheckPanel::QCedResultUpdate()
 
     }
 
+    //When the QC is loaded then we set the variable has computed to indicate that a processing has been done before. 
+    std::cout<<std::endl<<"QC LOADED!"<<std::endl;
+    myIntensityThread.SetHasComputed(true);
+
   // outfile.close();
 }
 

diff --git a/src/ThreadIntensityMotionCheck.cxx b/src/ThreadIntensityMotionCheck.cxx
@@ -225,5 +225,5 @@ void CThreadIntensityMotionCheck::run()
   emit LoadQCedDWI( QString::fromStdString( m_IntensityMotionCheck->GetOutputDWIFileName() ) );
   emit QCedResultUpdate();
   emit Set_VCStatus();  // initialize the VC_Status in DTIPanel
-  m_hasComputedOnce = true ;
+  this->SetHasComputed(true);
 }
diff --git a/src/ThreadIntensityMotionCheck.h b/src/ThreadIntensityMotionCheck.h
@@ -39,6 +39,9 @@ class CThreadIntensityMotionCheck : public QThread
   }
 
   bool HasComputed() ;
+  void SetHasComputed(bool computed){
+    m_hasComputedOnce = computed;
+  }
   void SetRecompute( bool val ) ;
   void SetRecomputeOutputFileName( std::string filename ) ;