DFCH: ManualPaint, ImageUndoRedo (module) 70%.

[creaMaracasVisu.git] / lib / maracasVisuLib / src / interface / wxWindows / widgets / imageUndoRedo / imageUndoRedo.cxx

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/imageUndoRedo.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/imageUndoRedo/imageUndoRedo.cxx
old mode 100644 (file)
new mode 100755 (executable)
similarity index 88%
rename from lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/imageUndoRedo.cxx
rename to lib/maracasVisuLib/src/interface/wxWindows/widgets/imageUndoRedo/imageUndoRedo.cxx
index 94344ab..6a57d07
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/imageUndoRedo.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/imageUndoRedo/imageUndoRedo.cxx
@@ -24,10 +24,8 @@ void ImageUndoRedo::Undo() {
 void ImageUndoRedo::Redo() {
        ImageInfoUR imageInfo = this->m_ImagesDeque->Redo();
        this->DrawUR(imageInfo);
-       imageInfo.RemoveImageFromMemory();
 }
-void ImageUndoRedo::SetImage(vtkImageData *image)
-{
+void ImageUndoRedo::SetImage(vtkImageData *image) {
        this->m_CurrentImage = image;
        this->m_CurrentImage->Update();
        this->m_OriginalImage = ImageType::New();
@@ -35,8 +33,8 @@ void ImageUndoRedo::SetImage(vtkImageData *image)
 }
 //virtual
 void ImageUndoRedo::SetUndoImage(const RegionSType& region) {
-       vtkExtractVOI* extract;
-       extract->New();
+       vtkSmartPointer<vtkExtractVOI> extract =
+                       vtkSmartPointer<vtkExtractVOI>::New();
        extract->SetVOI(region.minX, region.maxX, region.minY, region.maxY,
                        region.minZ, region.maxZ);
        extract->SetSampleRate(1, 1, 1);
@@ -46,8 +44,8 @@ void ImageUndoRedo::SetUndoImage(const RegionSType& region) {
 }
 //virtual
 void ImageUndoRedo::SetRedoImage(const RegionSType& region) {
-       vtkExtractVOI* extract;
-       extract->New();
+       vtkSmartPointer<vtkExtractVOI> extract =
+                       vtkSmartPointer<vtkExtractVOI>::New();
        extract->SetVOI(region.minX, region.maxX, region.minY, region.maxY,
                        region.minZ, region.maxZ);
        extract->SetSampleRate(1, 1, 1);