X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FimageUndoRedo%2FimageInfoUR.cxx;h=69c3811aceebfd4d63d639de64aa977187d2189e;hb=d725af03e25b41e03b212c26068be2c04dacd270;hp=3d1093752f0a67b7085eefb0e35d7e74bcd06568;hpb=b37bd791f88bd4c1a6146fadcb88864d7cd1a5c3;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/imageUndoRedo/imageInfoUR.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/imageUndoRedo/imageInfoUR.cxx
index 3d10937..69c3811 100755
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/imageUndoRedo/imageInfoUR.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/imageUndoRedo/imageInfoUR.cxx
@@ -17,8 +17,8 @@ ImageInfoUR::~ImageInfoUR() {
 void ImageInfoUR::SetImageName(const StringType &imgName) {
 	this->m_ImageName = imgName;
 }
-void ImageInfoUR::SetRegion(const RegionStructUR &region) {
-	this->m_Region = region;
+void ImageInfoUR::SetImageMManager(ImageMManagerType* imMManager) {
+	this->m_ImageMManager = imMManager;
 }
 void ImageInfoUR::SetStatus(const bool& onMemory) {
 	this->m_OnMemory = onMemory;
@@ -35,8 +35,8 @@ ImageInfoUR::VTKImageDataPointerType ImageInfoUR::GetImage() {
 	return (this->m_Image);
 }
 
-RegionStructUR ImageInfoUR::GetRegion() {
-	return (this->m_Region);
+ImageInfoUR::ImageMManagerType* ImageInfoUR::GetImageMManager() {
+	return (this->m_ImageMManager);
 }
 bool ImageInfoUR::GetStatus() {
 	return (this->m_OnMemory);
@@ -50,14 +50,19 @@ void ImageInfoUR::RemoveImageFromMemory(const StringType& gPath) {
 }
 void ImageInfoUR::LoadImageMHDToMemory(const StringType& gPath) {
 	StringType filename = gPath + this->m_ImageName;
+	filename.append(".mhd");
 	VTKMetaImageReaderPointerType reader = VTKMetaImageReaderPointerType::New();
 	reader->SetFileName(filename.c_str());
 	this->m_Image = reader->GetOutput();
+	this->m_Image->Update();
 	this->m_OnMemory = true;
 }
 void ImageInfoUR::SaveImageAsMHD(const StringType& gPath) {
 	this->m_OnDisk = true;
 	StringType filename = gPath + this->m_ImageName;
+	filename.append(".mhd");
+	//managing temporary files
+//EED-11/11/2011	mkstemp((char*) filename.c_str());
 	VTKMetaImageWriterPointerType w = VTKMetaImageWriterPointerType::New();
 	w->SetInput(this->m_Image);
 	w->SetCompression(false);
@@ -67,5 +72,11 @@ void ImageInfoUR::SaveImageAsMHD(const StringType& gPath) {
 }
 
 void ImageInfoUR::RemoveImageFromDisk(const StringType& gPath) {
-
+	StringType filename = gPath + this->m_ImageName;
+	filename.append(".mhd");
+	StringType filenameRaw = gPath + this->m_ImageName;
+	filenameRaw.append(".raw");
+//EED-11/11/2011	mkstemp((char*) filenameRaw.c_str());
+	unlink((char*) filename.c_str());
+	unlink((char*) filenameRaw.c_str());
 }