compile

diff --git a/lib/Interface_ManagerContour_NDimensions/wxContourEventHandler.cxx b/lib/Interface_ManagerContour_NDimensions/wxContourEventHandler.cxx
index 7ac56e5a918ff26eb84f95723a24849e2915e639..71cc3829a61a8ce6ab1020c563de15b903a8b952 100644 (file)
--- a/lib/Interface_ManagerContour_NDimensions/wxContourEventHandler.cxx
+++ b/lib/Interface_ManagerContour_NDimensions/wxContourEventHandler.cxx
@@ -1773,7 +1773,7 @@ myfile.close();
                        int iTitle,sizeTitle = (maxX / _numberOfVariablesStatistics);
                        for ( iTitle=0; iTitle<sizeTitle ; iTitle++)
                        {
-                               fprintf(pFile,"-- \t %d-Size \t SizeRange \t Min \t Max \t Ave \t StDv \t" , iTitle,tmpString.char_str() );
+                               fprintf(pFile,"-- \t %d-Size \t SizeRange \t Min \t Max \t Ave \t StDv \t" , iTitle,tmpString.c_str() );
                        }
                        fprintf(pFile,"\n" );
 

diff --git a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx
index d277065a803cf8c21ad2946d105a2f05a1e6b2ce..bce09c9fc5b3b168e4cf231c14bd86765ae0a5a8 100644 (file)
--- a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx
+++ b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx
@@ -15,7 +15,7 @@
 #include <manualContour.h>
 #include "ImageSourceThing.h"
 #include "vtkImageData.h"
-
+#include "wxContour_ActionCommandsID.h"
 
 //----------------------------------------------------------------------------------------------------------------
 // Class implementation
@@ -50,6 +50,7 @@
                // set up default notebook style
                m_notebook_style =wxAUI_NB_TAB_SPLIT | wxAUI_NB_TAB_EXTERNAL_MOVE | wxNO_BORDER;
                m_notebook_theme = 0;   
+               wxContour_ActionCommandsID a;
        }
 
        wxContourMainFrame :: ~wxContourMainFrame()

diff --git a/lib/Interface_ManagerContour_NDimensions/wxContour_ActionCommandsID.h b/lib/Interface_ManagerContour_NDimensions/wxContour_ActionCommandsID.h
index 5319432142635b6d7a6399b429af5eabbdead99c..6731a0fdef1190e740e75a8918b4fb84db5adb4c 100644 (file)
--- a/lib/Interface_ManagerContour_NDimensions/wxContour_ActionCommandsID.h
+++ b/lib/Interface_ManagerContour_NDimensions/wxContour_ActionCommandsID.h
@@ -15,35 +15,38 @@ class wxContour_ActionCommandsID {
        //------------------------------------------------------------------------------------------------------------
        // Constructors & Destructors
        //------------------------------------------------------------------------------------------------------------
-               
+       wxContour_ActionCommandsID();
+       ~wxContour_ActionCommandsID();
        //------------------------------------------------------------------------------------------------------------
        // Attributtes
        //------------------------------------------------------------------------------------------------------------
-       const static char CREATE_TOOL                     = 'A'; //Manual contour
-       const static char CREATE_CONTOUR_KEY              = 'B'; //Manual contour
-       const static char DELETE_TOOL                     = 'C';
-       const static char DELETE_KEY                      = 'D';
-       const static char HIDE_TOOL                       = 'E';
-       const static char SHOW_TOOL                       = 'F';
-       const static char COPY_TOOL                       = 'G';
-       const static char PASTE_TOOL                      = 'H';
-       const static char CHANGE_TOOL                     = 'I';
-       const static char SPREAD_TOOL                     = 'J';
-       const static char SELECT_TOOL                     = 'K';
-       const static char EDIT_TOOL                       = 'L';
-       const static char UNDO_TOOL                       = 'M';
-       const static char REDO_TOOL                       = 'N';
-       const static char CREATE_PREDEFINED_4SIDED        = 'O';
-       const static char SAVE_TOOL                       = 'P';
-       const static char SAVE_KEY                        = 'Q';
-       const static char OPEN_TOOL                       = 'R';
-       const static char AUTOMATIQUESEGMENTATION_TOOL    = 'S';
-       const static char INFORMATIONCONTOUR_TOOL         = 'T';
-       const static char INTERFACECONFIGURATION_TOOL     = 'U';
-       const static char TEST_TOOL                       = 'V';
+       const static char CREATE_TOOL; //Manual contour
+       const static char CREATE_CONTOUR_KEY; //Manual contour
+       const static char DELETE_TOOL;
+       const static char DELETE_KEY ;
+       const static char HIDE_TOOL  ;
+       const static char SHOW_TOOL  ;
+       const static char COPY_TOOL  ;
+       const static char PASTE_TOOL ;
+       const static char CHANGE_TOOL;
+       const static char SPREAD_TOOL;
+       const static char SELECT_TOOL;
+       const static char EDIT_TOOL  ;
+       const static char UNDO_TOOL ;
+       const static char REDO_TOOL               ;
+       const static char CREATE_PREDEFINED_4SIDED;
+       const static char SAVE_TOOL               ;
+       const static char SAVE_KEY               ;
+       const static char OPEN_TOOL              ;
+       const static char AUTOMATIQUESEGMENTATION_TOOL;
+       const static char INFORMATIONCONTOUR_TOOL    ;
+       const static char INTERFACECONFIGURATION_TOOL;
+       const static char TEST_TOOL                  ;
 
        const static char * TOOL_CODES[];
 };
+
+
 #endif // __wxContour_ActionCommandsID_HEADER_FILE__
  
  

diff --git a/lib/Interface_ManagerContour_NDimensions/wxVtkBaseView_SceneManager.cxx b/lib/Interface_ManagerContour_NDimensions/wxVtkBaseView_SceneManager.cxx
index f8b9c9f440f216ea25a8d9959f0436417d64cc15..383fc7995639dc937f70fb1d3fe4757419aa9d91 100644 (file)
--- a/lib/Interface_ManagerContour_NDimensions/wxVtkBaseView_SceneManager.cxx
+++ b/lib/Interface_ManagerContour_NDimensions/wxVtkBaseView_SceneManager.cxx
@@ -1100,7 +1100,7 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP )
                int tmpPx,tmpPy;
                wxVTKRenderWindowInteractor *wxVTKiren = _vtkInteractorStyleBaseView->GetWxVtk2DBaseView()->GetWxVTKRenderWindowInteractor();
                wxVTKiren->GetEventPosition( tmpPx , tmpPy );
-               fprintf(ff,"::%s (x,y) = (%i, %i) t(sg): \n  \n",method, tmpPx, tmpPy, sg);
+               fprintf(ff,"::%s (x,y) = (%i, %i) t(sg): \n  \n",method.c_str(), tmpPx, tmpPy, sg);
                fclose(ff);
        }
 

diff --git a/lib/kernel_ManagerContour_NDimensions/ImageSourceThing.cxx b/lib/kernel_ManagerContour_NDimensions/ImageSourceThing.cxx
index be82051c9343e55298165e4f6af39a0d98a5358c..855b196c918e9a73b8257d264b05e9d360433ea2 100644 (file)
--- a/lib/kernel_ManagerContour_NDimensions/ImageSourceThing.cxx
+++ b/lib/kernel_ManagerContour_NDimensions/ImageSourceThing.cxx
@@ -81,7 +81,9 @@
        {
                int x1, x2, y1, y2, z1, z2;
                sourceImage ->GetExtent( x1, x2, y1, y2, z1, z2);
-               int retVal[2] = {x1, x2};
+               int* retVal = new int[2];
+               retVal[0]= x1;
+               retVal[1]= x2;
                return retVal;
        }
 
@@ -116,8 +118,11 @@
        { 
                int x1, x2, y1, y2, z1, z2;
                sourceImage ->GetExtent( x1, x2, y1, y2, z1, z2);
-               int retVal[2] = {y1, y2};
+               int* retVal = new int[2];
+               retVal[0]= y1;
+               retVal[1]= y2;
                return retVal;
+
        }
 
        /**
@@ -151,8 +156,12 @@
        { 
                int x1, x2, y1, y2, z1, z2;
                sourceImage ->GetExtent( x1, x2, y1, y2, z1, z2);
-               int retVal[2] = {z1, z2};
+               int* retVal = new int[2];
+               retVal[0]= z1;
+               retVal[1]= z2;
                return retVal;
+
+
        }