X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FcreaVtk%2FMeshManagerModel.cpp;h=6af6e932b42bbd438df149c21b3ff977ebb7a03b;hb=b00e934a843a756fb0d6d5f763642816df0aaff4;hp=c03e9e8b2268567199c8b62237d72bd8fb469b35;hpb=cc1075b3a78bdc5339b919450b88178bbf9ff1f7;p=creaVtk.git

diff --git a/lib/creaVtk/MeshManagerModel.cpp b/lib/creaVtk/MeshManagerModel.cpp
index c03e9e8..6af6e93 100644
--- a/lib/creaVtk/MeshManagerModel.cpp
+++ b/lib/creaVtk/MeshManagerModel.cpp
@@ -27,6 +27,9 @@
 
 #include "MeshManagerModel.h"
 
+//
+//HISTORY HANDLER
+//
 template <class T>
 HistoryHandler<T>::HistoryHandler(int maxElements)
 {
@@ -52,27 +55,31 @@ void HistoryHandler<T>::CleanHistory()
 }
 
 template <class T>
-T* HistoryHandler<T>::Undo()
+T* HistoryHandler<T>::Undo(T* state)
 {
-	if(!undoStack.empty() && undoStack.size()>1)
+	if(!undoStack.empty())
 	{
 		auto lastElem = undoStack.back();
 		undoStack.pop_back();
-		redoStack.push_back(lastElem);
-		return undoStack.back();
+		redoStack.push_back(state);
+		return lastElem;//undoStack.back();
+	}else{
+		delete state;
 	}
 	return NULL;
 }
 
 template <class T>
-T* HistoryHandler<T>::Redo()
+T* HistoryHandler<T>::Redo(T* state)
 {
 	if(!redoStack.empty())
 	{
 		auto lastElem = redoStack.back();
 		redoStack.pop_back();
-		undoStack.push_back(lastElem);
+		undoStack.push_back(state);
 		return lastElem;
+	}else{
+		delete state;
 	}
 	return NULL;
 }
@@ -91,6 +98,24 @@ void HistoryHandler<T>::Save(T* state)
 	}
 }
 
+template <class T>
+T* HistoryHandler<T>::GetPrevious()
+{
+	if(!undoStack.empty()){	
+		return undoStack.back();
+	}
+	return NULL;
+}
+
+template <class T>
+T* HistoryHandler<T>::GetNext()
+{
+	if(!redoStack.empty()){	
+		return redoStack.back();
+	}
+	return NULL;
+}
+
 template <class T>
 int HistoryHandler<T>::UndoSize()
 {
@@ -118,7 +143,8 @@ MeshModel::MeshModel(int id)
 MeshModel::MeshModel(vtkPolyData* mesh, int id)
 {
 	if(mesh != NULL){	
-		_meshBase = mesh;
+		_meshBase = vtkPolyData::New();//mesh;
+		_meshBase->DeepCopy(mesh);
 		_meshTemp = vtkPolyData::New();
 		_meshTemp->DeepCopy(_meshBase);
 		_meshId = id;
@@ -175,24 +201,24 @@ void MeshModel::SetMeshBase(vtkPolyData* mesh)
     	if(_meshBase != NULL){
     		_meshBase->Delete();
     	}
-        _meshBase = mesh;
+        _meshBase = vtkPolyData::New();
+        _meshBase->DeepCopy(mesh);
         ResetMeshTemp_();
     } // if mesh
 }
 
 void MeshModel::SetMeshMemoryMode(vtkPolyData* mesh)
 {
-	//if(_meshBase != NULL)
-	//{
-	//	_meshBase->Delete();
-	//	_meshBase = NULL;
-	//}
-	//if (_meshTemp != NULL)
-    //{
-    //    _meshTemp->Delete();
-    //    _meshTemp = NULL;
-   	//}
-	_meshBase = mesh;
+	if(_meshBase != NULL)
+	{
+		_meshBase->Delete();
+		_meshBase = NULL;
+	}
+	if(mesh != NULL)
+	{
+		_meshBase = vtkPolyData::New();
+		_meshBase->DeepCopy(mesh);
+	}
 }
 
 void MeshModel::ResetMeshTemp()
@@ -240,6 +266,7 @@ MeshManagerModel::MeshManagerModel()
 	currentMesh = 0;
 	meshId = 0;
 	history = new HistoryHandler<ManagerState>(20);
+	lastModified = 0;
 }
 
 MeshManagerModel::~MeshManagerModel()
@@ -254,13 +281,7 @@ void MeshManagerModel::RefreshOutputs(bool signalBox) // virtual
 void MeshManagerModel::ResetHistory()
 {
 	history->CleanHistory();
-	Save();
-}
-
-void MeshManagerModel::UpdateMeshReference(vtkPolyData* mesh)
-{
-	_meshes.at(currentMesh)->SetMeshBase(mesh);
-	RefreshOutputs(true);
+	//Save();
 }
 
 int MeshManagerModel::GetNumberOfMeshes()
@@ -281,8 +302,9 @@ void MeshManagerModel::AddMesh_(vtkPolyData* mesh)
 
 void MeshManagerModel::AddMesh(vtkPolyData* mesh)
 {
-	AddMesh_(mesh);
 	Save();
+	AddMesh_(mesh);
+	lastModified = currentMesh;
 	RefreshOutputs(true);
 }
 
@@ -302,8 +324,9 @@ void MeshManagerModel::AddMeshes_(std::vector<vtkPolyData*> meshList)
 
 void MeshManagerModel::AddMeshes(std::vector<vtkPolyData*> meshList)
 {
-	AddMeshes_(meshList);
 	Save();
+	AddMeshes_(meshList);
+	lastModified = currentMesh;
 	RefreshOutputs(true);
 }
 
@@ -315,8 +338,9 @@ void MeshManagerModel::AddEmptyMesh_()
 
 void MeshManagerModel::AddEmptyMesh()
 {
-	AddEmptyMesh_();
 	Save();
+	AddEmptyMesh_();
+	lastModified = currentMesh;
 	RefreshOutputs(true);
 }
 
@@ -338,8 +362,9 @@ void MeshManagerModel::InsertMeshesAtCurrent_(std::vector<vtkPolyData*> meshList
 
 void MeshManagerModel::InsertMeshesAtCurrent(std::vector<vtkPolyData*> meshList)
 {
-	InsertMeshesAtCurrent_(meshList);
 	Save();
+	InsertMeshesAtCurrent_(meshList);
+	lastModified = currentMesh;
 	RefreshOutputs(true);
 }
 
@@ -383,8 +408,9 @@ void MeshManagerModel::DeleteMesh_(int position)
 
 void MeshManagerModel::DeleteMesh(int position)
 {
-	DeleteMesh_(position);
 	Save();
+	DeleteMesh_(position);
+	lastModified = currentMesh;
 	RefreshOutputs(true);
 }
 
@@ -405,20 +431,22 @@ void MeshManagerModel::DeleteMeshByName(std::string meshName)
 void MeshManagerModel::DeleteCurrentMesh()
 {
 	if(!_meshes.empty()){
-		DeleteMesh_(currentMesh);
 		Save();
+		DeleteMesh_(currentMesh);
+		lastModified = currentMesh;
 		RefreshOutputs(true);
 	}
 }
 
 void MeshManagerModel::ReplaceMesh(std::vector<vtkPolyData*> meshList)
 {
+	Save();
 	if(GetNumberOfMeshes() >= 1)
 	{
 		DeleteMesh_(currentMesh);
 	}
 	InsertMeshesAtCurrent_(meshList);
-	Save();
+	lastModified = currentMesh;
 	RefreshOutputs(true);
 }
 
@@ -434,8 +462,9 @@ void MeshManagerModel::DeleteAll_()
 
 void MeshManagerModel::DeleteAll()
 {
-	DeleteAll_();
 	Save();
+	DeleteAll_();
+	lastModified = currentMesh;
 	RefreshOutputs(true);
 }
 
@@ -485,9 +514,10 @@ vtkPolyData*  MeshManagerModel::GetMeshTemp()
 void MeshManagerModel::SetMeshBase(vtkPolyData* mesh)
 {
     if(!_meshes.empty()){
+        Save();
         _meshes.at(currentMesh) = std::make_shared<MeshModel>(_meshes.at(currentMesh).get());
         _meshes.at(currentMesh)->SetMeshBase(mesh);
-        Save();
+        lastModified = currentMesh;
         RefreshOutputs(true);
     }else{
     	printf("PG MeshManagerModel::SetMeshBase Mesh vector is empty \n");
@@ -523,9 +553,10 @@ void MeshManagerModel::CopySetMeshBase(vtkPolyData* mesh)
 {
 	if(!_meshes.empty())
 	{
+		Save();
 		_meshes.at(currentMesh) = std::make_shared<MeshModel>(_meshes.at(currentMesh).get());
 		_meshes.at(currentMesh)->CopySetMeshBase(mesh);
-		Save();
+		lastModified = currentMesh;
 		RefreshOutputs(true);
 	}
 	else{
@@ -542,21 +573,41 @@ std::vector<std::string> MeshManagerModel::GetMeshNames()
 	return names;
 }
 
+std::vector<vtkPolyData*> MeshManagerModel::GetAllPolyDatas()
+{
+	std::vector<vtkPolyData*> polydatas;
+	for(int i = 0; i < _meshes.size(); i++){
+		polydatas.push_back(_meshes.at(i)->GetMeshBase());
+	}
+	return polydatas;
+}
+
+int MeshManagerModel::GetCurrentMesh()
+{
+	return currentMesh;
+}
+
 void MeshManagerModel::Undo()
 {	
-	RestoreState(history->Undo());
-	RefreshOutputs(true);
+	if(history->UndoSize() > 0){	
+		RestoreState(history->Undo(new ManagerState(_meshes, meshId, lastModified)));
+		RefreshOutputs(true);
+	}
 }
 
 void MeshManagerModel::Redo()
 {
-	RestoreState(history->Redo());
-	RefreshOutputs(true);
+	if(history->RedoSize() > 0)
+	{	
+		RestoreState(history->Redo(new ManagerState(_meshes, meshId, lastModified)));
+		RefreshOutputs(true);
+	}
 }
 
 void MeshManagerModel::Save()
 {
 	history->Save(new ManagerState(_meshes, meshId, currentMesh));
+	//lastModified = currentMesh;
 }
 
 void MeshManagerModel::RestoreState(ManagerState* state)
@@ -565,18 +616,20 @@ void MeshManagerModel::RestoreState(ManagerState* state)
 	{	
 		_meshes = state->GetMeshes();
 		meshId = state->GetMeshId();
-		currentMesh = state->GetCurrentMesh();
+		currentMesh = state->GetModifiedPos();
+		lastModified = state->GetModifiedPos();
+//		cout << "PG MeshManagerModel::RestoreState currentMesh: " << currentMesh << endl;
 	}
 }
 
 //
 //Manager State
 //
-MeshManagerModel::ManagerState::ManagerState(std::vector<std::shared_ptr<MeshModel>> meshesToSave, int meshId, int currentMesh)
+MeshManagerModel::ManagerState::ManagerState(std::vector<std::shared_ptr<MeshModel>> meshesToSave, int meshId, int modifiedPos)
 {
 	savedMeshes = meshesToSave;
 	savedId = meshId;
-	savedCurrentMesh = currentMesh;
+	savedModifiedPos = modifiedPos;
 }
 
 MeshManagerModel::ManagerState::~ManagerState()
@@ -592,8 +645,8 @@ int MeshManagerModel::ManagerState::GetMeshId()
 {
 	return savedId;
 }
-int MeshManagerModel::ManagerState::GetCurrentMesh()
+int MeshManagerModel::ManagerState::GetModifiedPos()
 {
-	return savedCurrentMesh;
+	return savedModifiedPos;
 }