X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FimageUndoRedo%2Fimage3DDequeUR.cxx;h=d1d959d251faa709fb5cc9dd2728293ab9b615a3;hb=2725f81fc97c9faa92749159bdbaf9cedeef7af4;hp=a497b1673450b0e029bfc3041b8c1a89704acf3f;hpb=b37bd791f88bd4c1a6146fadcb88864d7cd1a5c3;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/imageUndoRedo/image3DDequeUR.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/imageUndoRedo/image3DDequeUR.cxx
index a497b16..d1d959d 100755
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/imageUndoRedo/image3DDequeUR.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/imageUndoRedo/image3DDequeUR.cxx
@@ -3,151 +3,88 @@
 #include <sstream>
 
 Image3DDequeUR::Image3DDequeUR() {
-	this->m_GlobalPath = "/home/caceres/temporal/";
-	this->m_CurrentUndoPos = -1;
-	this->m_CurrentRedoPos = -1;
+	this->m_GlobalPath = "/home/pechan/temporal/";
+	this->m_CurrentURPos = -1;
 }
 //virtual
 Image3DDequeUR::~Image3DDequeUR() {
-
+	this->CleanHardDisk();
 }
 //virtual
-void Image3DDequeUR::AddImageToUndoContainer(VTKImageDataPointerType img,
-		const RegionS& region) {
-	//managing memory
-	if (this->m_ImgUndoDeque.size() > 0) {
-	 this->m_ImgUndoDeque.back()->RemoveImageFromMemory(this->m_GlobalPath);
-	 } //fi
+void Image3DDequeUR::AddImagesToURContainer(VTKImageDataPointerType imgUndo,
+		VTKImageDataPointerType imgRedo, ImageMManager* imMManager) {
+	this->CleanURContainerFromIndex(this->m_CurrentURPos + 1);
 	//Adding image
 	ImageInfoUR* imageInfo = new ImageInfoUR();
 	imageInfo->SetImageName(
-			this->GetImageName(this->m_ImgUndoDeque.size(), true));
-	imageInfo->SetImage(img);
-	imageInfo->SetRegion(region);
-	imageInfo->SaveImageAsMHD(this->m_GlobalPath);
-	//cleaning deque from current position
-	this->CleanUndoContainerFromIndex(this->m_CurrentUndoPos + 1);
-	this->CleanRedoContainerFromIndex(0);
-	this->m_ImgRedoDeque.clear();
+			this->GetImageName(this->m_ImgURDeque.size(), true));
+	imageInfo->SetImages(imgUndo, imgRedo);
+	imageInfo->SetImageMManager(imMManager);
 	//Adding to deque
-	this->m_ImgUndoDeque.push_back(imageInfo);
-	this->m_CurrentUndoPos = this->m_ImgUndoDeque.size() - 1;
+	this->m_ImgURDeque.push_back(imageInfo);
+	this->m_CurrentURPos = this->m_ImgURDeque.size() - 1;
+	//Managing memory
+	this->ManageMemory();
 }
-//virtual
-void Image3DDequeUR::AddImageToRedoContainer(VTKImageDataPointerType img,
-		const RegionS& region) {
-	//managing memory
-	/*if (this->m_ImgRedoDeque.size() > 0) {
-		this->m_ImgRedoDeque.back()->RemoveImageFromMemory(this->m_GlobalPath);
-	} //fi
-	  //adding image
-	ImageInfoUR* imageInfo = new ImageInfoUR();
-	imageInfo->SetImageName(
-			this->GetImageName(this->m_ImgRedoDeque.size(), false));
-	imageInfo->SetImage(img);
-	imageInfo->SetRegion(region);
-	imageInfo->SaveImageAsMHD(this->m_GlobalPath);
-	//Adding to deque
-	this->m_ImgRedoDeque.push_back(imageInfo);
-	this->m_CurrentUndoPos = this->m_ImgRedoDeque.size() - 1;*/
-}
-//virtual
-void Image3DDequeUR::CleanUndoContainerFromIndex(const int& index) {
-	for (int i = index; i < this->m_ImgUndoDeque.size(); i++) {
-		this->m_ImgUndoDeque[i]->RemoveImageFromMemory(this->m_GlobalPath);
-		this->m_ImgUndoDeque[i]->RemoveImageFromDisk(this->m_GlobalPath);
-		this->m_ImgUndoDeque.pop_back();
-	}
-}
-//virtual
-void Image3DDequeUR::CleanRedoContainerFromIndex(const int& index) {
-	for (int i = index; i < this->m_ImgRedoDeque.size(); i++) {
-		this->m_ImgRedoDeque[i]->RemoveImageFromMemory(this->m_GlobalPath);
-		this->m_ImgRedoDeque[i]->RemoveImageFromDisk(this->m_GlobalPath);
-		this->m_ImgRedoDeque.pop_back();
-	}
-}
-
 //virtual
 ImageInfoUR* Image3DDequeUR::Undo() {
 	ImageInfoUR* imgRet = NULL;
-	if ((this->m_ImgUndoDeque.size() > 0) && (this->m_CurrentUndoPos != -1)) {
-		std::cout<<"Controooool"<<std::endl;
-		//removing from memory
-		if ((this->m_CurrentUndoPos + 1) < this->m_ImgUndoDeque.size()) {
-		 this->m_ImgUndoDeque[(m_CurrentUndoPos + 1)]->RemoveImageFromMemory(
-		 this->m_GlobalPath);
-		 } //fi
-		imgRet = this->m_ImgUndoDeque[m_CurrentUndoPos];
-		std::cout << "imageName:  " << imgRet->GetImageName() << std::endl;
-		this->m_CurrentUndoPos--;
-		//adding to memory
-		if (this->m_CurrentUndoPos != -1) {
-			//Loading image
-			StringType fullPath = this->m_GlobalPath
-					+ this->m_ImgUndoDeque[m_CurrentUndoPos]->GetImageName();
-			this->m_ImgUndoDeque[m_CurrentUndoPos]->LoadImageMHDToMemory(
-					this->m_GlobalPath);
-		} //fi
+	if ((this->m_ImgURDeque.size() > 0) && (this->m_CurrentURPos != -1)) {
+		imgRet = this->m_ImgURDeque[m_CurrentURPos];
+		this->m_CurrentURPos--;
 	} //fi
 	return (imgRet);
 }
+
 //virtual
 ImageInfoUR* Image3DDequeUR::Redo() {
-
-	ImageInfoUR* imgRet = new ImageInfoUR();
-	//managing undo deque
-	if (this->m_ImgUndoDeque.size() > 0) {
-		if ((m_CurrentUndoPos - 1) != -1) {
-			this->m_ImgUndoDeque[m_CurrentUndoPos - 1]->RemoveImageFromMemory(
-					this->m_GlobalPath);
-		} //fi
-		this->m_CurrentUndoPos++; //ready to do undo
-		if (this->m_CurrentUndoPos < ((int) this->m_ImgUndoDeque.size())) {
-			this->m_ImgUndoDeque[m_CurrentUndoPos]->LoadImageMHDToMemory(
-					this->m_GlobalPath);
-		} //fi
-		  //end of undo management
-	} //fi
-	  //managing redo
-	if ((this->m_ImgRedoDeque.size() > 0) && (this->m_CurrentRedoPos != -1)) {
-		if ((this->m_CurrentRedoPos + 1) < this->m_ImgRedoDeque.size()) {
-			this->m_ImgRedoDeque[(m_CurrentRedoPos + 1)]->RemoveImageFromMemory(
-					this->m_GlobalPath);
-		} //fi
-		imgRet = this->m_ImgRedoDeque[this->m_CurrentRedoPos];
-		this->m_CurrentRedoPos--;
-		if (this->m_CurrentRedoPos != -1) {
-			this->m_ImgRedoDeque[m_CurrentRedoPos]->LoadImageMHDToMemory(
-					this->m_GlobalPath);
-		} //fi
-		  //end of redo management
-	}
+	ImageInfoUR* imgRet = NULL;
 	return (imgRet);
 }
 //virtual
-void Image3DDequeUR::CleanContainers() {
-	for (unsigned int i = 0; i < this->m_ImgUndoDeque.size(); i++) {
-		this->m_ImgUndoDeque[i]->RemoveImageFromMemory(this->m_GlobalPath);
-		this->m_ImgUndoDeque[i]->RemoveImageFromDisk(this->m_GlobalPath);
+void Image3DDequeUR::CleanURContainerFromIndex(const int& index) {
+	int count = 0;
+	for (unsigned int i = index; i < this->m_ImgURDeque.size(); i++) {
+		this->m_ImgURDeque[i]->RemoveImagesFromMemory(this->m_GlobalPath);
+		this->m_ImgURDeque[i]->RemoveImagesFromDisk(this->m_GlobalPath);
+		count++;
+	}
+	for (int i = 0; i < count; i++) {
+		this->m_ImgURDeque.pop_back();
 	} //rof
-	for (unsigned int i = 0; i < this->m_ImgRedoDeque.size(); i++) {
-		this->m_ImgRedoDeque[i]->RemoveImageFromMemory(this->m_GlobalPath);
-		this->m_ImgRedoDeque[i]->RemoveImageFromDisk(this->m_GlobalPath);
+}
+
+//virtual
+void Image3DDequeUR::ManageMemory() {
+	for (int i = 0; (unsigned int) i < this->m_ImgURDeque.size(); i++) {
+		if (this->m_ImgURDeque[i]->GetStatus()) {
+			this->m_ImgURDeque[i]->RemoveImagesFromMemory(this->m_GlobalPath);
+		} //fi
 	} //rof
-	this->m_ImgRedoDeque.clear();
-	this->m_ImgUndoDeque.clear();
+	  //Adding CurrentUndoPos to memory
+	if ((this->m_CurrentURPos != -1)
+			&& !(this->m_ImgURDeque[this->m_CurrentURPos]->GetStatus())) {
+		this->m_ImgURDeque[this->m_CurrentURPos]->LoadImagesToMemory(
+				this->m_GlobalPath);
+	}
 }
 
 void Image3DDequeUR::SetGlobalPath(const StringType& globalPath) {
 	this->m_GlobalPath = globalPath;
 }
 
-StringType Image3DDequeUR::GetGlobalPath() {
+void Image3DDequeUR::CleanHardDisk() {
+	for (unsigned int i = 0; i < this->m_ImgURDeque.size(); i++) {
+		this->m_ImgURDeque[i]->RemoveImagesFromDisk(this->m_GlobalPath);
+	}
+}
+
+Image3DDequeUR::StringType Image3DDequeUR::GetGlobalPath() {
 	return (this->m_GlobalPath);
 }
 
-StringType Image3DDequeUR::GetImageName(const int & pos, const bool& undo) {
+Image3DDequeUR::StringType Image3DDequeUR::GetImageName(const int & pos,
+		const bool& undo) {
 //Giving a name to an image using the date and time
 	if (this->m_IDImages.empty()) {
 		time_t rawtime;
@@ -162,13 +99,6 @@ StringType Image3DDequeUR::GetImageName(const int & pos, const bool& undo) {
 	}
 	std::stringstream ss; //create a stringstream
 	ss << pos; //add number to the stream
-	StringType imgType;
-	if (undo) {
-		imgType = "undo";
-	} else {
-		imgType = "redo";
-	}
-	StringType imageName = this->m_IDImages + imgType + ss.str();
-	imageName.append(".mhd");
+	StringType imageName = this->m_IDImages + ss.str();
 	return (imageName);
 }