X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FcreaVtk%2FMeshManagerModel.cpp;h=84713441479ad9dbe9fcfade3da2982d05596f8d;hb=refs%2Fheads%2Fvtk9itk5wx3-macos;hp=c03e9e8b2268567199c8b62237d72bd8fb469b35;hpb=cc1075b3a78bdc5339b919450b88178bbf9ff1f7;p=creaVtk.git diff --git a/lib/creaVtk/MeshManagerModel.cpp b/lib/creaVtk/MeshManagerModel.cpp index c03e9e8..8471344 100644 --- a/lib/creaVtk/MeshManagerModel.cpp +++ b/lib/creaVtk/MeshManagerModel.cpp @@ -27,6 +27,9 @@ #include "MeshManagerModel.h" +// +//HISTORY HANDLER +// template HistoryHandler::HistoryHandler(int maxElements) { @@ -45,42 +48,100 @@ void HistoryHandler::CleanHistory() { delete element; } + redoStack.clear(); for (T* element : undoStack) { delete element; } + undoStack.clear(); } template -T* HistoryHandler::Undo() +T* HistoryHandler::Undo(T* state) { - if(!undoStack.empty() && undoStack.size()>1) + if(state == NULL) + { + return NULL; + } + if(!undoStack.empty()) + { + auto lastElem = undoStack.back(); + undoStack.pop_back(); + redoStack.push_back(state); + return lastElem; + }else{ + delete state; + } + return NULL; +} + +template +T* HistoryHandler::Redo(T* state) +{ + if(state == NULL) + { + return NULL; + } + if(!redoStack.empty()) + { + auto lastElem = redoStack.back(); + redoStack.pop_back(); + undoStack.push_back(state); + return lastElem; + }else{ + delete state; + return NULL; + } +} + +/** +* To be used with RedoKeepCurrent +* Will always maintain the current state in the undo stack as the first element +* Useful when states are saved after actions and the initial state is saved. +*/ +template +T* HistoryHandler::UndoKeepCurrent() +{ + if(undoStack.size() > 1) { auto lastElem = undoStack.back(); undoStack.pop_back(); redoStack.push_back(lastElem); return undoStack.back(); + }else{ + return NULL; } - return NULL; } +/** +* To be used with UndoKeepCurrent +* Will always maintain the current state in the undo stack as the first element +* Useful when states are saved after actions and the initial state is saved. +*/ template -T* HistoryHandler::Redo() +T* HistoryHandler::RedoKeepCurrent() { if(!redoStack.empty()) { auto lastElem = redoStack.back(); redoStack.pop_back(); undoStack.push_back(lastElem); - return lastElem; + return undoStack.back(); + }else{ + return NULL; } - return NULL; } template void HistoryHandler::Save(T* state) { undoStack.push_back(state); + if(undoStack.size() > maxElements) + { + T* frontDel = undoStack.front(); + undoStack.pop_front(); + delete frontDel; + } if(!redoStack.empty()) { for (T* element : redoStack) @@ -91,6 +152,26 @@ void HistoryHandler::Save(T* state) } } +template +T* HistoryHandler::GetPrevious() +{ + if(!undoStack.empty()) + { + return undoStack.back(); + } + return NULL; +} + +template +T* HistoryHandler::GetNext() +{ + if(!redoStack.empty()) + { + return redoStack.back(); + } + return NULL; +} + template int HistoryHandler::UndoSize() { @@ -117,8 +198,10 @@ MeshModel::MeshModel(int id) MeshModel::MeshModel(vtkPolyData* mesh, int id) { - if(mesh != NULL){ - _meshBase = mesh; + if(mesh != NULL) + { + _meshBase = vtkPolyData::New(); + _meshBase->DeepCopy(mesh); _meshTemp = vtkPolyData::New(); _meshTemp->DeepCopy(_meshBase); _meshId = id; @@ -140,11 +223,14 @@ MeshModel::MeshModel(MeshModel* meshModel) _name = "mesh-" + std::to_string(meshModel->GetId()); } -MeshModel::~MeshModel(){ - if(_meshBase != NULL){ +MeshModel::~MeshModel() +{ + if(_meshBase != NULL) + { _meshBase->Delete(); } - if(_meshTemp != NULL){ + if(_meshTemp != NULL) + { _meshTemp->Delete(); } } @@ -172,27 +258,28 @@ void MeshModel::SetMeshBase(vtkPolyData* mesh) { if (mesh!=NULL) { - if(_meshBase != NULL){ + 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() @@ -239,28 +326,56 @@ MeshManagerModel::MeshManagerModel() { currentMesh = 0; meshId = 0; - history = new HistoryHandler(20); + history = new HistoryHandler(15); + lastModified = 0; + memoryMode = false; + referencePoint = {0, 0, 0}; + referenceNormal = {0, 0, 1}; } MeshManagerModel::~MeshManagerModel() { DeleteAll(); + history->CleanHistory(); + delete history; } void MeshManagerModel::RefreshOutputs(bool signalBox) // virtual { } +void MeshManagerModel::SetHistory(int maxCapacity) +{ + if(history != NULL){ + ResetHistory(); + delete history; + } + history = new HistoryHandler(maxCapacity); +} + void MeshManagerModel::ResetHistory() { history->CleanHistory(); - Save(); } -void MeshManagerModel::UpdateMeshReference(vtkPolyData* mesh) +void MeshManagerModel::SetReferencePoint(std::vector point) { - _meshes.at(currentMesh)->SetMeshBase(mesh); - RefreshOutputs(true); + referencePoint = point; +} + +std::vector MeshManagerModel::GetReferencePoint() +{ + return referencePoint; +} + +void MeshManagerModel::SetReferenceNormal(std::vector normal) +{ + referenceNormal = normal; +} + +std::vector MeshManagerModel::GetReferenceNormal() +{ + return referenceNormal; } int MeshManagerModel::GetNumberOfMeshes() @@ -270,19 +385,20 @@ int MeshManagerModel::GetNumberOfMeshes() void MeshManagerModel::AddMesh_(vtkPolyData* mesh) { - if(mesh != NULL){ + if(mesh != NULL) + { _meshes.push_back(std::make_shared(mesh, meshId)); meshId++; - } - else{ + }else{ printf("PG MeshManagerModel::AddMesh Mesh is null \n"); } } void MeshManagerModel::AddMesh(vtkPolyData* mesh) { - AddMesh_(mesh); Save(); + AddMesh_(mesh); + lastModified = currentMesh; RefreshOutputs(true); } @@ -302,8 +418,9 @@ void MeshManagerModel::AddMeshes_(std::vector meshList) void MeshManagerModel::AddMeshes(std::vector meshList) { - AddMeshes_(meshList); Save(); + AddMeshes_(meshList); + lastModified = currentMesh; RefreshOutputs(true); } @@ -315,8 +432,9 @@ void MeshManagerModel::AddEmptyMesh_() void MeshManagerModel::AddEmptyMesh() { - AddEmptyMesh_(); Save(); + AddEmptyMesh_(); + lastModified = currentMesh; RefreshOutputs(true); } @@ -338,17 +456,20 @@ void MeshManagerModel::InsertMeshesAtCurrent_(std::vector meshList void MeshManagerModel::InsertMeshesAtCurrent(std::vector meshList) { - InsertMeshesAtCurrent_(meshList); Save(); + InsertMeshesAtCurrent_(meshList); + lastModified = currentMesh; RefreshOutputs(true); } void MeshManagerModel::SelectMesh(int i) { - if(i >= 0 && i < _meshes.size()){ + if(i >= 0 && i < _meshes.size()) + { int prevCurrent = currentMesh; currentMesh = i; - if(prevCurrent != i){ + if(prevCurrent != i) + { RefreshOutputs(true); } } @@ -359,10 +480,12 @@ void MeshManagerModel::SelectMesh(int i) void MeshManagerModel::SelectMeshByName(std::string meshName) { - if(!_meshes.empty()){ + if(!_meshes.empty()) + { bool found = false; for(int i = 0; i < _meshes.size() && !found; i++){ - if(_meshes.at(i)->GetName() == meshName){ + if(_meshes.at(i)->GetName() == meshName) + { found = true; SelectMesh(i); } @@ -372,10 +495,12 @@ void MeshManagerModel::SelectMeshByName(std::string meshName) void MeshManagerModel::DeleteMesh_(int position) { - if(position >= 0 && position < _meshes.size()){ + if(position >= 0 && position < _meshes.size()) + { _meshes.erase(_meshes.begin() + position); currentMesh = currentMesh + (position <= currentMesh?-1:0); - if(currentMesh < 0){ + if(currentMesh < 0) + { currentMesh = 0; } } @@ -383,17 +508,20 @@ void MeshManagerModel::DeleteMesh_(int position) void MeshManagerModel::DeleteMesh(int position) { - DeleteMesh_(position); Save(); + DeleteMesh_(position); + lastModified = currentMesh; RefreshOutputs(true); } void MeshManagerModel::DeleteMeshByName(std::string meshName) { - if(!_meshes.empty()){ + if(!_meshes.empty()) + { bool found = false; for(int i = 0; i < _meshes.size() && !found; i++){ - if(_meshes.at(i)->GetName() == meshName){ + if(_meshes.at(i)->GetName() == meshName) + { found = true; DeleteMesh_(i); RefreshOutputs(true); @@ -404,21 +532,24 @@ void MeshManagerModel::DeleteMeshByName(std::string meshName) void MeshManagerModel::DeleteCurrentMesh() { - if(!_meshes.empty()){ - DeleteMesh_(currentMesh); + if(!_meshes.empty()) + { Save(); + DeleteMesh_(currentMesh); + lastModified = currentMesh; RefreshOutputs(true); } } void MeshManagerModel::ReplaceMesh(std::vector meshList) { + Save(); if(GetNumberOfMeshes() >= 1) { DeleteMesh_(currentMesh); } InsertMeshesAtCurrent_(meshList); - Save(); + lastModified = currentMesh; RefreshOutputs(true); } @@ -434,15 +565,17 @@ void MeshManagerModel::DeleteAll_() void MeshManagerModel::DeleteAll() { - DeleteAll_(); Save(); + DeleteAll_(); + lastModified = currentMesh; RefreshOutputs(true); } void MeshManagerModel::NextMesh() { currentMesh++; - if(currentMesh >= _meshes.size()){ + if(currentMesh >= _meshes.size()) + { currentMesh = _meshes.size()-1; } RefreshOutputs(true); @@ -451,7 +584,8 @@ void MeshManagerModel::NextMesh() void MeshManagerModel::PreviousMesh() { currentMesh--; - if(currentMesh < 0){ + if(currentMesh < 0) + { currentMesh = 0; } RefreshOutputs(true); @@ -464,7 +598,8 @@ std::shared_ptr MeshManagerModel::GetMeshModel() vtkPolyData* MeshManagerModel::GetMeshBase() { - if(!_meshes.empty()){ + if(!_meshes.empty()) + { return _meshes.at(currentMesh)->GetMeshBase(); } else{ @@ -474,7 +609,8 @@ vtkPolyData* MeshManagerModel::GetMeshBase() vtkPolyData* MeshManagerModel::GetMeshTemp() { - if(!_meshes.empty()){ + if(!_meshes.empty()) + { return _meshes.at(currentMesh)->GetMeshTemp(); } else{ @@ -484,16 +620,28 @@ vtkPolyData* MeshManagerModel::GetMeshTemp() void MeshManagerModel::SetMeshBase(vtkPolyData* mesh) { - if(!_meshes.empty()){ + if(!_meshes.empty()) + { + Save(); _meshes.at(currentMesh) = std::make_shared(_meshes.at(currentMesh).get()); _meshes.at(currentMesh)->SetMeshBase(mesh); - Save(); + lastModified = currentMesh; RefreshOutputs(true); }else{ printf("PG MeshManagerModel::SetMeshBase Mesh vector is empty \n"); } } +void MeshManagerModel::MeshMemoryModeOn() +{ + memoryMode = true; +} + +void MeshManagerModel::MeshMemoryModeOff() +{ + memoryMode = false; +} + void MeshManagerModel::SetMeshMemoryMode(vtkPolyData* mesh) { if(_meshes.size() > 1) @@ -505,6 +653,8 @@ void MeshManagerModel::SetMeshMemoryMode(vtkPolyData* mesh) AddEmptyMesh_(); } _meshes.at(currentMesh)->SetMeshMemoryMode(mesh); + ResetHistory(); + SaveMemoryMode(); RefreshOutputs(true); } @@ -523,9 +673,10 @@ void MeshManagerModel::CopySetMeshBase(vtkPolyData* mesh) { if(!_meshes.empty()) { + Save(); _meshes.at(currentMesh) = std::make_shared(_meshes.at(currentMesh).get()); _meshes.at(currentMesh)->CopySetMeshBase(mesh); - Save(); + lastModified = currentMesh; RefreshOutputs(true); } else{ @@ -542,16 +693,46 @@ std::vector MeshManagerModel::GetMeshNames() return names; } +std::vector MeshManagerModel::GetAllPolyDatas() +{ + std::vector 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) + { + if(memoryMode == false){ + RestoreState(history->Undo(new ManagerState(_meshes, meshId, lastModified))); + RefreshOutputs(true); + } + else if(history->UndoSize() > 1){ + RestoreStateMemoryMode(history->UndoKeepCurrent()); + } + } } void MeshManagerModel::Redo() { - RestoreState(history->Redo()); - RefreshOutputs(true); + if(history->RedoSize() > 0) + { + if(memoryMode == false){ + RestoreState(history->Redo(new ManagerState(_meshes, meshId, lastModified))); + RefreshOutputs(true); + } + else{ + RestoreStateMemoryMode(history->RedoKeepCurrent()); + } + } } void MeshManagerModel::Save() @@ -559,28 +740,71 @@ void MeshManagerModel::Save() history->Save(new ManagerState(_meshes, meshId, currentMesh)); } +void MeshManagerModel::SaveMemoryMode() +{ + if(_meshes.size() == 1 && memoryMode) + { + std::vector> savedMesh; + savedMesh.push_back(std::make_shared(_meshes.at(0).get())); + history->Save(new ManagerState(savedMesh, meshId, 0, referencePoint, referenceNormal)); + } + else{ + printf("PG MeshManagerModel::SaveMemoryMode WARNING Mesh vector has invalid size or memoryMode is not set \n"); + } +} + void MeshManagerModel::RestoreState(ManagerState* state) { if(state != NULL) { _meshes = state->GetMeshes(); meshId = state->GetMeshId(); - currentMesh = state->GetCurrentMesh(); + currentMesh = state->GetModifiedPos(); + lastModified = state->GetModifiedPos(); + delete state; + } + else{ + printf("PG MeshManagerModel::RestoreState WARNING State is NULL \n"); + } +} + +void MeshManagerModel::RestoreStateMemoryMode(ManagerState* state){ + if(_meshes.size() == 1 && state != NULL) + { + vtkPoints* statePoints = vtkPoints::New(); + statePoints->DeepCopy(state->GetMeshes().at(0)->GetMeshBase()->GetPoints()); + _meshes.at(0)->GetMeshBase()->SetPoints(statePoints); + _meshes.at(0)->GetMeshBase()->GetPoints()->Modified(); + _meshes.at(0)->GetMeshBase()->Modified(); + referencePoint = state->GetReferencePoint(); + referenceNormal = state->referenceNormal; + }else{ + printf("PG MeshManagerModel::RestoreStateMemoryMode WARNING Mesh vector has invalid size or state is NULL\n"); } } // //Manager State // -MeshManagerModel::ManagerState::ManagerState(std::vector> meshesToSave, int meshId, int currentMesh) +MeshManagerModel::ManagerState::ManagerState(std::vector> meshesToSave, int meshId, int modifiedPos) +{ + savedMeshes = meshesToSave; + savedId = meshId; + savedModifiedPos = modifiedPos; +} + +MeshManagerModel::ManagerState::ManagerState(std::vector> meshesToSave, int meshId, int modifiedPos, std::vector refPoint, std::vector refNormal) { savedMeshes = meshesToSave; savedId = meshId; - savedCurrentMesh = currentMesh; + savedModifiedPos = modifiedPos; + referencePoint = refPoint; + referenceNormal = refNormal; } MeshManagerModel::ManagerState::~ManagerState() { + savedMeshes.clear(); } std::vector>& MeshManagerModel::ManagerState::GetMeshes() @@ -592,8 +816,12 @@ int MeshManagerModel::ManagerState::GetMeshId() { return savedId; } -int MeshManagerModel::ManagerState::GetCurrentMesh() +int MeshManagerModel::ManagerState::GetModifiedPos() { - return savedCurrentMesh; + return savedModifiedPos; } +std::vector& MeshManagerModel::ManagerState::GetReferencePoint() +{ + return referencePoint; +}