Authors belong to:
- University of LYON http://www.universite-lyon.fr/
- - Léon Bérard cancer center http://oncora1.lyon.fnclcc.fr
+ - Léon Bérard cancer center http://www.centreleonberard.fr
- CREATIS CNRS laboratory http://www.creatis.insa-lyon.fr
This software is distributed WITHOUT ANY WARRANTY; without even
- BSD See included LICENSE.txt file
- CeCILL-B http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
-======================================================================-====*/
+===========================================================================**/
#include <sstream>
#include <cstdlib>
#include <string>
#include "vtkVOXImageWriter.h"
#include <vtkImageData.h>
+#include <vtkVersion.h>
#include "clitkCommon.h"
#include "vvSlicerManager.h"
void vvDeformableRegistration::abort()
{
aborted=true;
- std::system("killall deformableregistration");
- std::system("killall clitkVFMerge");
+ int tempReturn = std::system("killall deformableregistration");
+ tempReturn = std::system("killall clitkVFMerge");
}
unsigned int vvDeformableRegistration::getProgress()
for (int i=0; i<frame_number; i++) {
std::stringstream filename;
filename << temp_dir << "/deformation_" << i << ".vf";
- std::system((std::string("rm ") + filename.str()).c_str());
+ int tempReturn = std::system((std::string("rm ") + filename.str()).c_str());
}
for (int i=0; i<frame_number; i++) {
std::stringstream filename;
filename << temp_dir << "/temp_" << i << ".vox";
- std::system(("rm " + filename.str()).c_str());
+ int tempReturn = std::system(("rm " + filename.str()).c_str());
}
std::stringstream filename;
filename << temp_dir;
- std::system(("rm -r " + filename.str()).c_str());
+ int tempReturn = std::system(("rm -r " + filename.str()).c_str());
}
void vvDeformableRegistration::partial_run(int low_index,int high_index,int refimage,std::string ref_file)
registration_command << " --vf=" << old_vf.str();
}
DD(registration_command.str());
- std::system(registration_command.str().c_str());
+ int tempReturn = std::system(registration_command.str().c_str());
progress_mutex.lock();
progress++;
progress_mutex.unlock();
for (unsigned int i=0; i<images.size(); i++) {
std::stringstream filename;
filename << temp_dir << "/temp_" << i << ".vox";
+#if VTK_MAJOR_VERSION <= 5
vox->SetInput(images[i]);
+#else
+ vox->SetInputData(images[i]);
+#endif
vox->SetFileName(filename.str().c_str());
if (i==refimage)
ref_file=filename.str();
command << "clitkZeroVF -i " << temp_dir << "/deformation_" << computed_vf << ".vf -o " << temp_dir <<
"/deformation_" << refimage << ".vf";
DD(command.str()); //create zero VF for the ref image
- std::system(command.str().c_str());
+ int tempReturn = std::system(command.str().c_str());
command.str("");
command << "clitkVFMerge ";
for (unsigned int i=0; i<images.size(); i++) command << temp_dir << "/deformation_" << i << ".vf ";
command << " --zorigin " << images[0]->GetOrigin()[2];
command << " -o " << output_filename << std::endl;
DD(command.str());
- std::system(command.str().c_str());
+ tempReturn = std::system(command.str().c_str());
cleanup(images.size());
if (aborted) {
- std::system(("rm " + output_filename).c_str());
+ tempReturn = std::system(("rm " + output_filename).c_str());
return;
}
- vvImageReader reader;
- reader.SetInputFilename(output_filename);
- reader.Update(VECTORFIELD);
+ vvImageReader::Pointer reader = vvImageReader::New();
+ reader->SetInputFilename(output_filename);
+ reader->Update(vvImageReader::VECTORFIELD);
finish=clock();
DD((finish - start)/static_cast<double>(CLOCKS_PER_SEC));
- mOutput=reader.GetOutput();
+ mOutput = reader->GetOutput();
}