#3331 creaMaracasVisu Bug New Normal - Select contour with 2 points, HelpViewerNV

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

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/imageUndoRedo/imageInfoUR.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/imageUndoRedo/imageInfoUR.cxx
index 3e39e532942506600d6d26e3760dddad875f0881..fd668577e9ced6496832e80f23bc2e5e1f2738af 100755 (executable)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/imageUndoRedo/imageInfoUR.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/imageUndoRedo/imageInfoUR.cxx
@@ -34,61 +34,71 @@
 #include "imageInfoUR.h"
 
 // ----------------------------------------------------------------------------------
-ImageInfoUR::ImageInfoUR() {
+ImageInfoUR::ImageInfoUR() 
+{
        this->m_OnMemory = false;
        this->m_OnDisk = false;
 }
 // ----------------------------------------------------------------------------------
-ImageInfoUR::~ImageInfoUR() {
+ImageInfoUR::~ImageInfoUR() 
+{
 }
 // ----------------------------------------------------------------------------------
-void ImageInfoUR::SetImageName(const StringType &imgName) {
+void ImageInfoUR::SetImageName(const StringType &imgName) 
+{
        this->m_ImageName = imgName;
 }
 // ----------------------------------------------------------------------------------
-void ImageInfoUR::SetImageMManager(ImageMManagerType* imMManager) {
+void ImageInfoUR::SetImageMManager(ImageMManagerType* imMManager) 
+{
        this->m_ImageMManager = imMManager;
 }
 // ----------------------------------------------------------------------------------
-void ImageInfoUR::SetStatus(const bool& onMemory) {
+void ImageInfoUR::SetStatus(const bool& onMemory) 
+{
        this->m_OnMemory = onMemory;
 }
 // ----------------------------------------------------------------------------------
-ImageInfoUR::StringType ImageInfoUR::GetImageName() {
+ImageInfoUR::StringType ImageInfoUR::GetImageName() 
+{
        return (this->m_ImageName);
 }
 // ----------------------------------------------------------------------------------
-ImageInfoUR::VTKImageDataPointerType ImageInfoUR::GetUndoImage() {
+ImageInfoUR::VTKImageDataPointerType ImageInfoUR::GetUndoImage() 
+{
        return (this->m_UndoImage);
 }
 // ----------------------------------------------------------------------------------
-ImageInfoUR::VTKImageDataPointerType ImageInfoUR::GetRedoImage() {
+ImageInfoUR::VTKImageDataPointerType ImageInfoUR::GetRedoImage() 
+{
        return (this->m_RedoImage);
 }
 // ----------------------------------------------------------------------------------
-ImageInfoUR::ImageMManagerType* ImageInfoUR::GetImageMManager() {
+ImageInfoUR::ImageMManagerType* ImageInfoUR::GetImageMManager() 
+{
        return (this->m_ImageMManager);
 }
 // ----------------------------------------------------------------------------------
-bool ImageInfoUR::GetStatus() {
+bool ImageInfoUR::GetStatus() 
+{
        return (this->m_OnMemory);
 }
 // ----------------------------------------------------------------------------------
-void ImageInfoUR::SetImages(VTKImageDataPointerType imgUndo,
-               VTKImageDataPointerType imgRedo) {
+void ImageInfoUR::SetImages(VTKImageDataPointerType imgUndo, VTKImageDataPointerType imgRedo) 
+{
        this->m_UndoImage = imgUndo;
        this->m_RedoImage = imgRedo;
        this->SetStatus(true);
 }
 // ----------------------------------------------------------------------------------
-void ImageInfoUR::LoadImagesToMemory(const StringType& gPath) {
+void ImageInfoUR::LoadImagesToMemory(const StringType& gPath) 
+{
        //setting paths
        StringType filename = gPath + this->m_ImageName;
        StringType undoImagePath = filename + "_Undo.mhd";
        StringType redoImagePath = filename + "_Redo.mhd";
        //Loading Undo Image
-       VTKMetaImageReaderPointerType readerUndo =
-                       VTKMetaImageReaderPointerType::New();
+       VTKMetaImageReaderPointerType readerUndo = VTKMetaImageReaderPointerType::New();
        readerUndo->SetFileName(undoImagePath.c_str());
        this->m_UndoImage = readerUndo->GetOutput();
 //EED 2017-01-01 Migration VTK7
@@ -98,8 +108,7 @@ void ImageInfoUR::LoadImagesToMemory(const StringType& gPath) {
        // ..
 #endif
        //Loading Redo Image
-       VTKMetaImageReaderPointerType readerRedo =
-                       VTKMetaImageReaderPointerType::New();
+       VTKMetaImageReaderPointerType readerRedo = VTKMetaImageReaderPointerType::New();
        readerRedo->SetFileName(redoImagePath.c_str());
 //EED 2017-01-01 Migration VTK7
 #if VTK_MAJOR_VERSION <= 5
@@ -119,8 +128,10 @@ void ImageInfoUR::LoadImagesToMemory(const StringType& gPath) {
        this->m_OnMemory = true;
 }
 // ----------------------------------------------------------------------------------
-void ImageInfoUR::RemoveImagesFromMemory(const StringType& gPath) {
-       if (!this->m_OnDisk) {
+void ImageInfoUR::RemoveImagesFromMemory(const StringType& gPath) 
+{
+       if (!this->m_OnDisk) 
+       {
                this->SaveImagesOnDisk(gPath);
        }
        this->m_UndoImage = NULL;
@@ -128,16 +139,20 @@ void ImageInfoUR::RemoveImagesFromMemory(const StringType& gPath) {
        this->SetStatus(false);
 }
 // ----------------------------------------------------------------------------------
-void ImageInfoUR::SaveImagesOnDisk(const StringType& gPath) {
+void ImageInfoUR::SaveImagesOnDisk(const StringType& gPath) 
+{
+       printf("EED ImageInfoUR::SaveImagesOnDisk Start  \n");
        this->m_OnDisk = true;
        StringType filename = gPath + this->m_ImageName;
        StringType undoImagePath = filename + "_Undo.mhd";
        StringType redoImagePath = filename + "_Redo.mhd";
        this->SaveImageAsMHD(undoImagePath, this->m_UndoImage);
        this->SaveImageAsMHD(redoImagePath, this->m_RedoImage);
+       printf("EED ImageInfoUR::SaveImagesOnDisk %s \n", undoImagePath.c_str() );
 }
 // ----------------------------------------------------------------------------------
-void ImageInfoUR::RemoveImagesFromDisk(const StringType& gPath) {
+void ImageInfoUR::RemoveImagesFromDisk(const StringType& gPath) 
+{
        StringType filename = gPath + this->m_ImageName;
        StringType undoImagePathMHD = filename + "_Undo.mhd";
        StringType redoImagePathMHD = filename + "_Redo.mhd";
@@ -149,8 +164,8 @@ void ImageInfoUR::RemoveImagesFromDisk(const StringType& gPath) {
        remove(redoImagePathRAW.c_str());
 }
 // ----------------------------------------------------------------------------------
-void ImageInfoUR::SaveImageAsMHD(const StringType& filename,
-               VTKImageDataPointerType image) {
+void ImageInfoUR::SaveImageAsMHD(const StringType& filename, VTKImageDataPointerType image) 
+{
        VTKMetaImageWriterPointerType w = VTKMetaImageWriterPointerType::New();
 //EED 2017-01-01 Migration VTK7
 #if VTK_MAJOR_VERSION <= 5