]> Creatis software - creaContours.git/blobdiff - lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx
*** empty log message ***
[creaContours.git] / lib / Interface_ManagerContour_NDimensions / wxContourMainFrame.cxx
index 4cfa08134be989b9946325c498bb01b7ab4ca905..3536b2b0da69a62213b11f81e2c7f046ac8faa9e 100644 (file)
 #include "NameWrapper.h"
 #include "wx/artprov.h"
 #include "ConceptDataWrap.h"
-
-#include <manualContour.h>
-//#include "ImageSourceThing.h"
-//#include "wxContour_ActionCommandsID.h"
-//#include "OutlineModelBuilder.h"
-//#include "wxContourEventHandler.h"
 #include <creaWx.h>
 
 //----------------------------------------------------------------------------------------------------------------
@@ -58,6 +52,11 @@ char wxContourMainFrame::COPY = 'C';
                _refLineControl                         = NULL;
                _refLineModel                           = NULL;
                _refLineView                            = NULL;
+               _imageReslicer                          = NULL;
+               _thresholdTable                         = NULL;
+               _thresholdMapper                        = NULL;
+               _thresholdActor                         = NULL;
+               _actorPresent                           = false;
 
                // set up default notebook style
 //             m_notebook_style =wxAUI_NB_TAB_SPLIT | wxAUI_NB_TAB_EXTERNAL_MOVE | wxNO_BORDER;
@@ -77,6 +76,11 @@ char wxContourMainFrame::COPY = 'C';
                _refLineControl                         = NULL;
                _refLineModel                           = NULL;
                _refLineView                            = NULL;
+               _imageReslicer                          = NULL;
+               _thresholdTable                         = NULL;
+               _thresholdMapper                        = NULL;
+               _thresholdActor                         = NULL;
+               _actorPresent                           = false;
 
                // set up default notebook style
                m_notebook_style =wxAUI_NB_TAB_SPLIT | wxAUI_NB_TAB_EXTERNAL_MOVE | wxNO_BORDER;
@@ -87,21 +91,22 @@ char wxContourMainFrame::COPY = 'C';
                _datadir = datadir;
 
        
-       inredo = 0;
-       inundo = 0;
-
-       interfMainPanel* pannew = interfMainPanel::getInstance(parent,datadir+"/data/Icons");//, eventHandler);
-       _performingOperation                    = new PerformingOperation();
-
+               inredo = 0;
+               inundo = 0;
 
+               _pannew = interfMainPanel::getInstance(this,datadir+"/data/Icons");//, eventHandler);
+               _performingOperation = new PerformingOperation();
 
-       if(images.size() > 0){
-               this->setVectImages(images);
-       }
+               if(images.size() > 0)
+               {
+                       _images = images;
+                       this->setVectImages(images);
+               }
 
 }
 
-void wxContourMainFrame::setVectImages( std::vector<vtkImageData*> images ){
+void wxContourMainFrame::setVectImages(std::vector<vtkImageData*> imgs)
+{
 
        #if defined(__GNUC__)
                std::string str_home(getenv("HOME"));
@@ -113,10 +118,10 @@ void wxContourMainFrame::setVectImages( std::vector<vtkImageData*> images ){
        std::vector<std::string> conceptNameVect;
        std::vector<int> conceptSizeVect;
 
-       wxAuiNotebook * notebook = this->createNotebook();              
+       notebook = this->createNotebook();              
 
 
-       kernelManager = new KernelManagerContour( images , _datadir+"/data/" , strCreaContourDataTmp );
+       kernelManager = new KernelManagerContour( imgs , _datadir+"/data/" , strCreaContourDataTmp );
 
 
        _instantPanel                           = new wxInstantChooserPanel( notebook, "Instant Chooser", true, false, "c" );
@@ -134,7 +139,7 @@ void wxContourMainFrame::setVectImages( std::vector<vtkImageData*> images ){
        //*******************changeInstant();
        _theViewPanel->setVerticalConcept( "Axe Depth", data->getMinValue(), data->getMaxValue(), data->getMinShowedValue(),  data->getMaxShowedValue(), data->getActualValue() );
 
-       this->configurePanels( notebook );
+       this->configurePanels( );
 
 }
 
@@ -146,25 +151,42 @@ void wxContourMainFrame::setVectImages( std::vector<vtkImageData*> images ){
                return instance;
        }
 
-       std::vector<vtkImageData*> wxContourMainFrame ::getVectImages(){
+       std::vector<vtkImageData*> wxContourMainFrame ::getVectImages()
+       {
                return kernelManager->getVectImages();
        }
-       wxContourMainFrame* wxContourMainFrame :: getInstance(){
-               return instance;
-               
+
+       wxContourMainFrame* wxContourMainFrame :: getInstance()
+       {
+               return instance;        
+       }
+
+       void wxContourMainFrame :: resetInstance()
+       {
+               instance->Destroy();
        }
 
        wxContourMainFrame :: ~wxContourMainFrame()
        {
-                 m_mgr.UnInit();
-                 //El problema al cerrar la aplicacion puede estar asociado 
-                 //a que  wxAUINotebook esta en la aplicacion 
-                 //principal (wxContourGUIExample)tambien
-//EED????              delete _theViewPanel;             
-//EED????              delete _instantPanel;
-//EED????              delete _buttonsBar;
-//EED????              delete _actualInstant;           
-//EED????              delete _sceneManager;
+               deleteAllContours();
+               _pannew->Close();
+               interfMainPanel::resetInstance();
+               delete kernelManager;
+               instance = NULL;
+               //_pannew->Destroy();
+               //delete _pannew;
+
+               m_mgr.UnInit();
+               //delete m_mgr;
+
+               //El problema al cerrar la aplicacion puede estar asociado 
+               //a que  wxAUINotebook esta en la aplicacion 
+               //principal (wxContourGUIExample)tambien
+               //EED????               delete _theViewPanel;             
+               //EED????               delete _instantPanel;
+               //EED????               delete _buttonsBar;
+               //EED????               delete _actualInstant;           
+               //EED????               delete _sceneManager;
        }
 
 
@@ -184,45 +206,44 @@ void wxContourMainFrame::setVectImages( std::vector<vtkImageData*> images ){
        //------------------------------------------------------------------------------------------------------------
        // Creational and initialization methods 
        //------------------------------------------------------------------------------------------------------------
-       bool wxContourMainFrame :: configurePanels(wxAuiNotebook* theNoteBook)
+       bool wxContourMainFrame :: configurePanels( )
        {
                bool configured = _theViewPanel!=NULL;
                                        
                configured &= _theViewPanel!=NULL;
                if( _theViewPanel!=NULL )
                {
-                       theNoteBook->AddPage( _theViewPanel, wxT("       View       ") );               
+                       notebook->AddPage( _theViewPanel, wxT("       View       ") );          
                        m_mgr.Update();
                }
 
 
                if( configured )
                {
-                       theNoteBook->AddPage( _instantPanel, wxT("Instant Page") );
+                       notebook->AddPage( _instantPanel, wxT("Instant Page") );
                        m_mgr.Update();
                }
 
-               m_mgr.AddPane(theNoteBook, wxAuiPaneInfo().Name(wxT("notebook_content")).CenterPane().PaneBorder(false));
+               m_mgr.AddPane(notebook, wxAuiPaneInfo().Name(wxT("notebook_content")).CenterPane().PaneBorder(false));
                m_mgr.Update();
-/*             configured &= _buttonsBar!=NULL;
-               if( _buttonsBar!=NULL )
-               {                       
-                       m_mgr.AddPane(_buttonsBar, wxAuiPaneInfo().
-                                       Name(wxT("TB")).Caption(wxT("Buttons Bar")).
-                                       ToolbarPane().Top().
-                                       LeftDockable(  ).RightDockable( false ).CloseButton(false));
-                       m_mgr.Update();
-               }*/
-               //CreateStatusBar();
-                        
+                
                SetMinSize(wxSize(300,300));
                m_mgr.Update();
                return configured;
        }
 
-       void wxContourMainFrame :: setNotebook( wxAuiNotebook * noteBook )
-       {
 
+       bool wxContourMainFrame::addNewPanel(wxPanel* panel)
+               {
+               bool configured = panel!=NULL;
+               configured &= panel!=NULL;
+               
+               if( configured )
+               {
+                       notebook->AddPage( panel, wxT("       Viewer       "), true );
+                       m_mgr.Update();
+               }
+               return configured;
        }
 
        //------------------------------------------------------------------------------------------------------------
@@ -563,7 +584,8 @@ bool wxContourMainFrame::getIfConceptCheckedAt( std::string name, int pos ){
        return _instantPanel->getIfConceptCheckedAt( name, pos );
 }
 
-void wxContourMainFrame::changeInstant(){
+void wxContourMainFrame::changeInstant()
+{
                std::vector<int> instantVect;
                _instantPanel->getInstant( instantVect );
 //             Instant * theInstant = new Instant ( &instantVect );
@@ -574,14 +596,15 @@ void wxContourMainFrame::changeInstant(){
                kernelManager->setInstant(instantVect);
                //_modelManager->setInstant( _actualInstant );
                
+           onThresholdChange();
                updateInstantOutlines();
                updateInstantImageData();
                updateInstantAxes();
-
-               
 }
-void wxContourMainFrame :: updateInstantOutlines(){
-       
+
+
+void wxContourMainFrame :: updateInstantOutlines()
+{
        _theViewPanel->removeSceneContours();
        _theViewPanel->addNameWrapperToScene();
 
@@ -598,7 +621,8 @@ std::string wxContourMainFrame::getNameWrapping(int i){
        return kernelManager->getNameWrapping(i);
 }
 
-void wxContourMainFrame::updateInstantImageData(){
+void wxContourMainFrame::updateInstantImageData()
+{
        std::vector<int> inst;
        _instantPanel->getInstant(inst);
 
@@ -611,9 +635,12 @@ void wxContourMainFrame::updateInstantImageData(){
                _theViewPanel->setImageSlice(z);
        }
 }
-void wxContourMainFrame::updateInstantAxes(){
+
+void wxContourMainFrame::updateInstantAxes()
+{
 }
 
+
 void wxContourMainFrame::onChangeDeep(int val){
        _instantPanel->setConceptValue( "Axe Depth", (int)val );        
        changeInstant();
@@ -755,11 +782,18 @@ void wxContourMainFrame::onLoad(){
                fscanf(pFile,"%s",tmp); // --CreaContour--
 
                fscanf(pFile,"%s",tmp); // Version
-               fscanf(pFile,"%s",tmp); // 1.0.1
+               fscanf(pFile,"%s",tmp); // 1.0.1 || 1.0.0
                std::string version(tmp);
-
-               openContours(pFile,false);
-               if (version!="1.0.0"){
+               
+               //AD:02-06-09
+               if (version=="1.0.1")
+               {
+                       openContours(pFile,false);
+               }
+               
+               //AD:02-06-09
+               else if (version=="1.0.0")
+               {
                        openContours(pFile,true);
                }
 //                       _theViewPanel->getSceneManager()->openFileWithContours(ff);
@@ -769,6 +803,8 @@ void wxContourMainFrame::onLoad(){
        _theViewPanel->getSceneManager()->removeSceneContours();
        changeInstant();
 }
+
+//AD: 29-05-09
 void wxContourMainFrame::onSave(){
        wxFileDialog dialog(NULL, _T("Choose a file"), _T(""), _T(""), _T("*.roi"), wxSAVE );
        if (dialog.ShowModal() == wxID_OK)
@@ -778,7 +814,10 @@ void wxContourMainFrame::onSave(){
                saveFileWithContours( fileNameContourROI );
        }
 }
-void wxContourMainFrame::saveFileWithContours( std::string filename ){
+
+//AD: 29-05-09
+void wxContourMainFrame::saveFileWithContours( std::string filename )
+{
 
        FILE *pFile=fopen(filename.c_str(),"w+");
        std::vector< std::string > lstNameThings;
@@ -791,6 +830,19 @@ void wxContourMainFrame::saveFileWithContours( std::string filename ){
        lstNameThings           = kernelManager->GetLstNameThings();
        sizeLstNameThings       = lstNameThings.size(); 
        fprintf(pFile,"NumberOfContours %d\n", sizeLstNameThings );
+
+       vtkImageData *image = _images[0];
+
+       int dimRange[3];
+       image->GetDimensions(dimRange);
+
+       fprintf(pFile,"ImageDimensions %d %d %d\n", dimRange[0], dimRange[1], dimRange[2] );
+
+       double spaRange[3];
+       image->GetSpacing(spaRange);
+
+       fprintf(pFile,"ImageSpacing %f %f %f\n", spaRange[0], spaRange[1], spaRange[2] );
+
        for (i=0 ; i<sizeLstNameThings ; i++) 
        {
                kernelManager->SaveThingName( pFile, lstNameThings[i] );
@@ -809,6 +861,7 @@ void wxContourMainFrame::saveFileWithContours( std::string filename ){
        fclose(pFile);
 }
 
+//AD:02-06-09: TODO: Adjust spacing and dimensions to Rois comming from images with different specifications
 void wxContourMainFrame::openContours( FILE *pFile, bool staticContour ){
        char tmp[255];
        fscanf(pFile,"%s",tmp); // NumberOfContours 
@@ -820,64 +873,105 @@ void wxContourMainFrame::openContours( FILE *pFile, bool staticContour ){
        manualContourModel *manModelContour;
        int typeView;
 
-       int i;
-       for (i=0;i<numberOfContours;i++)
+       vtkImageData *image = _images[0];
+       int imageDim[3];
+       image->GetDimensions(imageDim);
+       double imageSpac[3];
+       image->GetSpacing(imageSpac);
+
+       int tempDim[3];
+       double tempSpac[3];
+
+       fscanf(pFile,"%s",tmp); // ImageDimensions
+       fscanf(pFile,"%s",tmp); // X
+       tempDim[0] = atoi(tmp);
+       fscanf(pFile,"%s",tmp); // Y
+       tempDim[1] = atoi(tmp);
+       fscanf(pFile,"%s",tmp); // Z
+       tempDim[2] = atoi(tmp);
+
+       fscanf(pFile,"%s",tmp); // ImageSpacing
+       fscanf(pFile,"%s",tmp); // X
+       tempSpac[0] = atof(tmp);
+       fscanf(pFile,"%s",tmp); // Y
+       tempSpac[1] = atof(tmp);
+       fscanf(pFile,"%s",tmp); // Z
+       tempSpac[2] = atof(tmp);
+
+       bool compatible = true;
+
+       //Compare Spacing and Dims in X and Y (Necessary in Z?)
+       if (imageDim[0]!=tempDim[0] || imageDim[1]!=tempDim[1] || 
+               imageSpac[0]!=tempSpac[0] || imageSpac[1]!=tempSpac[1])
        {
-               instantVector.clear();
-               fscanf(pFile,"%s",tmp); // Instant
+               compatible = false;
+       }
 
-               fscanf(pFile,"%s",tmp); // 1
-               instantVector.push_back( atoi(tmp) );
-               fscanf(pFile,"%s",tmp); // 2
-               instantVector.push_back( atoi(tmp) );
-               fscanf(pFile,"%s",tmp); // 3
-               instantVector.push_back( atoi(tmp) );
-               fscanf(pFile,"%s",tmp); // 4
-               instantVector.push_back( atoi(tmp) );
-               fscanf(pFile,"%s",tmp); // 5
-               instantVector.push_back( atoi(tmp) );
-               fscanf(pFile,"%s",tmp); // 6
-               instantVector.push_back( atoi(tmp) );
+       if (compatible==true)
+       {
+               int i;
+               for (i=0;i<numberOfContours;i++)
+               {
+                       instantVector.clear();
+                       fscanf(pFile,"%s",tmp); // Instant
 
+                       fscanf(pFile,"%s",tmp); // 1
+                       instantVector.push_back( atoi(tmp) );
+                       fscanf(pFile,"%s",tmp); // 2
+                       instantVector.push_back( atoi(tmp) );
+                       fscanf(pFile,"%s",tmp); // 3
+                       instantVector.push_back( atoi(tmp) );
+                       fscanf(pFile,"%s",tmp); // 4
+                       instantVector.push_back( atoi(tmp) );
+                       fscanf(pFile,"%s",tmp); // 5
+                       instantVector.push_back( atoi(tmp) );
+                       fscanf(pFile,"%s",tmp); // 6
+                       instantVector.push_back( atoi(tmp) );
 
-               fscanf(pFile,"%s",tmp); // TypeContourModel
-               fscanf(pFile,"%s",tmp); // ##
-               typeContourModel = atoi(tmp);
 
-               manModelContour =  kernelManager->factoryManualContourModel(typeContourModel);
-               manModelContour->Open(pFile);
+                       fscanf(pFile,"%s",tmp); // TypeContourModel
+                       fscanf(pFile,"%s",tmp); // ##
+                       typeContourModel = atoi(tmp);
 
-               fscanf(pFile,"%s",tmp); // TypeView
-               fscanf(pFile,"%s",tmp); // ##
-               typeView = atoi(tmp);  
+                       manModelContour =  kernelManager->factoryManualContourModel(typeContourModel);
+                       manModelContour->Open(pFile);
 
+                       fscanf(pFile,"%s",tmp); // TypeView
+                       fscanf(pFile,"%s",tmp); // ##
+                       typeView = atoi(tmp);  
 
-//                     if (typeView==1) 
-//                     {
-//                     }
 
+       //                      if (typeView==1) 
+       //                      {
+       //                      }
 
-               std::string theName;
-               theName = kernelManager->createOutline( manModelContour, instantVector );
-               bool addedModel = theName.compare("") != 0;
-               if( addedModel )
-               {
-                       double spc[3];//Si no hay imagen pero hay contornos que spacing se pone por default
-                       _theViewPanel->getSpacing(spc);                                 
-                       //Adding the manualContourControler to interface objects structure
-                       //Adding the manualViewContour to interface objects structure           
-                       //_theViewPanel->getSceneManager()->setControlActiveStateOfALL( false );//This call is being done here because if the ROI is created underneath the previously created ROIS will still be active.
-                       _theViewPanel->getSceneManager()->configureViewControlTo( theName, manModelContour,spc , typeView) ;
-               }       
 
-               if (staticContour==true)
-               {
-                       Instant instant(&instantVector);
-                       kernelManager->changeContourOfManager( theName , &instant );
-               }
+                       std::string theName;
+                       theName = kernelManager->createOutline( manModelContour, instantVector );
+                       bool addedModel = theName.compare("") != 0;
+                       if( addedModel )
+                       {
+                               double spc[3];//Si no hay imagen pero hay contornos que spacing se pone por default
+                               _theViewPanel->getSpacing(spc);                                 
+                               //Adding the manualContourControler to interface objects structure
+                               //Adding the manualViewContour to interface objects structure           
+                               //_theViewPanel->getSceneManager()->setControlActiveStateOfALL( false );//This call is being done here because if the ROI is created underneath the previously created ROIS will still be active.
+                               _theViewPanel->getSceneManager()->configureViewControlTo( theName, manModelContour,spc , typeView) ;
+                       }       
+
+                       if (staticContour==true)
+                       {
+                               Instant instant(&instantVector);
+                               kernelManager->changeContourOfManager( theName , &instant );
+                       }
 
-       }// for  numberOfContours
+               }// for  numberOfContours
+       }
 
+       else if (compatible==false)
+       {
+               wxMessageBox(_T("The actual image is not compatible with the selected Roi file"), _T("Error"), wxICON_ERROR | wxOK);
+       }
 }
 
 void wxContourMainFrame::RefreshInterface(){
@@ -907,177 +1001,176 @@ void wxContourMainFrame::onSegmentationOneSliceITK(wxString distance, wxString s
 
 void wxContourMainFrame::SegmentationOneSliceITK(int x, int y, int z, wxString distanc, wxString sigm, wxString alf, wxString bet, wxString prop, wxString iter, wxString inflation)
 {
-       
        int typeofcontour = 1;
        //Image Data
        vtkImageData    *imagedata      = getImageData();
        
        //Tipo de pixeles a utilizar internamente en ITK
-  typedef   float  InternalPixelType;
-  const     unsigned int    Dimension = 2;
-  typedef itk::Image< InternalPixelType, Dimension >  InternalImageType;
+       typedef   float  InternalPixelType;
+       const     unsigned int    Dimension = 2;
+       typedef itk::Image< InternalPixelType, Dimension >  InternalImageType;
 
-  //Tipo de pixeles de salida 1
-  typedef unsigned char OutputPixelType;
-  typedef itk::Image< OutputPixelType, Dimension > OutputImageType;
+       //Tipo de pixeles de salida 1
+       typedef unsigned char OutputPixelType;
+       typedef itk::Image< OutputPixelType, Dimension > OutputImageType;
 
-  //Tipo de pixeles de salida 2
-  typedef unsigned short OutputPixelType2;
-  typedef itk::Image< OutputPixelType2, Dimension > OutputImageType2;
+       //Tipo de pixeles de salida 2
+       typedef unsigned short OutputPixelType2;
+       typedef itk::Image< OutputPixelType2, Dimension > OutputImageType2;
 
-  //Definición del thresholder
-  typedef itk::BinaryThresholdImageFilter< 
-                        InternalImageType, 
-                        OutputImageType    >    ThresholdingFilterType;
-  
-  //Definición del primer filtro de conversión de pixeles
-  typedef itk::CastImageFilter<
-               OutputImageType, OutputImageType2 >  CastFilterType;
+       //DefiniciÛn del thresholder
+       typedef itk::BinaryThresholdImageFilter< 
+                                                       InternalImageType, 
+                                                       OutputImageType    >    ThresholdingFilterType;
+         
+       //DefiniciÛn del primer filtro de conversiÛn de pixeles
+       typedef itk::CastImageFilter<
+                               OutputImageType, OutputImageType2 >  CastFilterType;
 
-  //Definición del segundo tipo de conversión de pixeles
-  typedef itk::CastImageFilter<
-               OutputImageType2, InternalImageType >  CastFilterType2;
+       //DefiniciÛn del segundo tipo de conversiÛn de pixeles
+       typedef itk::CastImageFilter<
+                               OutputImageType2, InternalImageType >  CastFilterType2;
 
-  //Tercer tipo de conversión
-  typedef itk::RescaleIntensityImageFilter< 
-                               InternalImageType, 
-                               OutputImageType >   CastFilterType3;
+       //Tercer tipo de conversiÛn
+       typedef itk::RescaleIntensityImageFilter< 
+                                                               InternalImageType, 
+                                                               OutputImageType >   CastFilterType3;
 
-  //Cuarto tipo de conversión
-  typedef itk::RescaleIntensityImageFilter< 
-                               OutputImageType, 
-                               OutputImageType >   CastFilterType4;
+       //Cuarto tipo de conversiÛn
+       typedef itk::RescaleIntensityImageFilter< 
+                                                               OutputImageType, 
+                                                               OutputImageType >   CastFilterType4;
 
-  ThresholdingFilterType::Pointer thresholder = ThresholdingFilterType::New();
-                        
-  thresholder->SetLowerThreshold( 0.0 );
-  thresholder->SetUpperThreshold( 128 );
+       ThresholdingFilterType::Pointer thresholder = ThresholdingFilterType::New();
+                               
+       thresholder->SetLowerThreshold( 0.0 );
+       thresholder->SetUpperThreshold( 128 );
 
-  thresholder->SetOutsideValue(  255  );
-  thresholder->SetInsideValue(  0 );
+       thresholder->SetOutsideValue(  255  );
+       thresholder->SetInsideValue(  0 );
 
-  //Definción de conexiónes entre VTK e ITK y el writer
-  typedef itk::VTKImageToImageFilter<OutputImageType2> ConnectorType;
-  typedef itk::ImageToVTKImageFilter<OutputImageType> ConnectorType2;
-  typedef  itk::ImageFileWriter<  OutputImageType  > WriterType;
+       //DefinciÛn de conexiÛnes entre VTK e ITK y el writer
+       typedef itk::VTKImageToImageFilter<OutputImageType2> ConnectorType;
+       typedef itk::ImageToVTKImageFilter<OutputImageType> ConnectorType2;
+       typedef  itk::ImageFileWriter<  OutputImageType  > WriterType;
 
-  ConnectorType::Pointer connector= ConnectorType::New();
-  ConnectorType2::Pointer connector2= ConnectorType2::New();
-  
+       ConnectorType::Pointer connector= ConnectorType::New();
+       ConnectorType2::Pointer connector2= ConnectorType2::New();
+         
 
-  CastFilterType::Pointer filter=CastFilterType::New();
-  CastFilterType2::Pointer filter2=CastFilterType2::New();
+       CastFilterType::Pointer filter=CastFilterType::New();
+       CastFilterType2::Pointer filter2=CastFilterType2::New();
 
-  connector->SetInput( imagedata );
-  filter2->SetInput(connector->GetOutput());
+       connector->SetInput( imagedata );
+       filter2->SetInput(connector->GetOutput());
 
-  typedef   itk::CurvatureAnisotropicDiffusionImageFilter< 
-                               InternalImageType, 
-                               InternalImageType >  SmoothingFilterType;
+       typedef   itk::CurvatureAnisotropicDiffusionImageFilter< 
+                                                               InternalImageType, 
+                                                               InternalImageType >  SmoothingFilterType;
 
-  SmoothingFilterType::Pointer smoothing = SmoothingFilterType::New();
+       SmoothingFilterType::Pointer smoothing = SmoothingFilterType::New();
 
-  typedef   itk::GradientMagnitudeRecursiveGaussianImageFilter< 
-                               InternalImageType, 
-                               InternalImageType >  GradientFilterType;
+       typedef   itk::GradientMagnitudeRecursiveGaussianImageFilter< 
+                                                               InternalImageType, 
+                                                               InternalImageType >  GradientFilterType;
 
-  typedef   itk::SigmoidImageFilter<                               
-                               InternalImageType, 
-                               InternalImageType >  SigmoidFilterType;
+       typedef   itk::SigmoidImageFilter<                               
+                                                               InternalImageType, 
+                                                               InternalImageType >  SigmoidFilterType;
 
-  GradientFilterType::Pointer  gradientMagnitude = GradientFilterType::New();
+       GradientFilterType::Pointer  gradientMagnitude = GradientFilterType::New();
 
-  SigmoidFilterType::Pointer sigmoid = SigmoidFilterType::New();
+       SigmoidFilterType::Pointer sigmoid = SigmoidFilterType::New();
 
-  sigmoid->SetOutputMinimum(  0.0  );
-  sigmoid->SetOutputMaximum(  255.0  );
+       sigmoid->SetOutputMinimum(  0.0  );
+       sigmoid->SetOutputMaximum(  255.0  );
 
 
-  typedef  itk::FastMarchingImageFilter< 
-                              InternalImageType, 
-                              InternalImageType >    FastMarchingFilterType;
+       typedef  itk::FastMarchingImageFilter< 
+                                                               InternalImageType, 
+                                                               InternalImageType >    FastMarchingFilterType;
 
 
-  FastMarchingFilterType::Pointer  fastMarching = FastMarchingFilterType::New();
+       FastMarchingFilterType::Pointer  fastMarching = FastMarchingFilterType::New();
 
-  typedef  itk::GeodesicActiveContourLevelSetImageFilter< InternalImageType, 
-                InternalImageType >    GeodesicActiveContourFilterType;
-  GeodesicActiveContourFilterType::Pointer geodesicActiveContour = 
-                                     GeodesicActiveContourFilterType::New();
+       typedef  itk::GeodesicActiveContourLevelSetImageFilter< InternalImageType, 
+                                       InternalImageType >    GeodesicActiveContourFilterType;
+       GeodesicActiveContourFilterType::Pointer geodesicActiveContour = 
+                                                                               GeodesicActiveContourFilterType::New();
 
-  typedef  itk::ZeroCrossingImageFilter< 
-                              InternalImageType, 
-                              InternalImageType >    ZeroCrossingFilterType;
-ZeroCrossingFilterType::Pointer zeroCrossing =
-                                                                       ZeroCrossingFilterType::New();
+       typedef  itk::ZeroCrossingImageFilter< 
+                                                               InternalImageType, 
+                                                               InternalImageType >    ZeroCrossingFilterType;
+       ZeroCrossingFilterType::Pointer zeroCrossing =
+                                                       ZeroCrossingFilterType::New();
 
-const double propagationScaling = atof( prop );
+       const double propagationScaling = atof( crea::wx2std(prop).c_str() );
 
-  geodesicActiveContour->SetPropagationScaling( propagationScaling );
-  geodesicActiveContour->SetCurvatureScaling( 1.0 );
-  geodesicActiveContour->SetAdvectionScaling( 1.0 );
+       geodesicActiveContour->SetPropagationScaling( propagationScaling );
+       geodesicActiveContour->SetCurvatureScaling( 1.0 );
+       geodesicActiveContour->SetAdvectionScaling( 1.0 );
 
-  geodesicActiveContour->SetMaximumRMSError( 0.02 );
-  int it=atoi( iter );
-  geodesicActiveContour->SetNumberOfIterations( it );
+       geodesicActiveContour->SetMaximumRMSError( 0.02 );
+       int it=atoi(  crea::wx2std(iter).c_str() );
+       geodesicActiveContour->SetNumberOfIterations( it );
 
-  smoothing->SetInput( filter2->GetOutput() );
-  gradientMagnitude->SetInput( smoothing->GetOutput() );
-  sigmoid->SetInput( gradientMagnitude->GetOutput() );
-  fastMarching->SetInput( sigmoid->GetOutput() );
-  geodesicActiveContour->SetInput(  fastMarching->GetOutput() );
-  geodesicActiveContour->SetFeatureImage( sigmoid->GetOutput() );
-  
-  zeroCrossing->SetInput( geodesicActiveContour->GetOutput() );
-  //thresholder->SetInput( zeroCrossing->GetOutput() );
-  thresholder->SetInput( geodesicActiveContour->GetOutput() );
-  connector2->SetInput( thresholder->GetOutput()  );
-  
+       smoothing->SetInput( filter2->GetOutput() );
+       gradientMagnitude->SetInput( smoothing->GetOutput() );
+       sigmoid->SetInput( gradientMagnitude->GetOutput() );
+       fastMarching->SetInput( sigmoid->GetOutput() );
+       geodesicActiveContour->SetInput( fastMarching->GetOutput() );
+       geodesicActiveContour->SetFeatureImage( sigmoid->GetOutput() );
+         
+       zeroCrossing->SetInput( geodesicActiveContour->GetOutput() );
+       //thresholder->SetInput( zeroCrossing->GetOutput() );
+       thresholder->SetInput( geodesicActiveContour->GetOutput() );
+       connector2->SetInput( thresholder->GetOutput()  );
+         
 
-  smoothing->SetTimeStep( 0.125 );
-  smoothing->SetNumberOfIterations(  5 );
-  smoothing->SetConductanceParameter( 9.0 );
+       smoothing->SetTimeStep( 0.125 );
+       smoothing->SetNumberOfIterations(  5 );
+       smoothing->SetConductanceParameter( 9.0 );
 
 
-  const double sigma = atof( sigm );
-  gradientMagnitude->SetSigma(  sigma  );
+       const double sigma = atof(  crea::wx2std(sigm).c_str() );
+       gradientMagnitude->SetSigma(  sigma  );
 
-  const double alpha =  atof( alf );
-  const double beta  =  atof( bet );
+       const double alpha =  atof(  crea::wx2std(alf).c_str() );
+       const double beta  =  atof(  crea::wx2std(bet).c_str() );
 
-  sigmoid->SetAlpha( alpha );
-  sigmoid->SetBeta(  beta  );
-  
-  typedef FastMarchingFilterType::NodeContainer  NodeContainer;
-  typedef FastMarchingFilterType::NodeType       NodeType;
+       sigmoid->SetAlpha( alpha );
+       sigmoid->SetBeta(  beta  );
+         
+       typedef FastMarchingFilterType::NodeContainer  NodeContainer;
+       typedef FastMarchingFilterType::NodeType       NodeType;
 
-  NodeContainer::Pointer seeds = NodeContainer::New();
+       NodeContainer::Pointer seeds = NodeContainer::New();
 
-  InternalImageType::IndexType  seedPosition;
-  seedPosition[0] = x;
-  seedPosition[1] = y;
+       InternalImageType::IndexType  seedPosition;
+       seedPosition[0] = x;
+       seedPosition[1] = y;
 
-  const double initialDistance = atof( distanc );
+       const double initialDistance = atof( crea::wx2std(distanc).c_str() );
 
-  NodeType node;
+       NodeType node;
 
-  const double seedValue = - initialDistance;
+       const double seedValue = - initialDistance;
 
-  node.SetValue( seedValue );
-  node.SetIndex( seedPosition );
-       
-  seeds->Initialize();
-  seeds->InsertElement( 0, node );
-
-  fastMarching->SetTrialPoints(  seeds  );
-
-  fastMarching->SetSpeedConstant( 1.0 );
-  
-  fastMarching->SetOutputSize( 
-           connector->GetOutput()->GetBufferedRegion().GetSize() );
-  
-  fastMarching->SetStoppingValue( 800 );
-  try
+       node.SetValue( seedValue );
+       node.SetIndex( seedPosition );
+               
+       seeds->Initialize();
+       seeds->InsertElement( 0, node );
+
+       fastMarching->SetTrialPoints( seeds );
+
+       fastMarching->SetSpeedConstant( 1.0 );
+         
+       fastMarching->SetOutputSize( 
+                       connector->GetOutput()->GetBufferedRegion().GetSize() );
+         
+       fastMarching->SetStoppingValue( 800 );
+       try
     {
                
        connector2->Update();
@@ -1110,26 +1203,26 @@ const double propagationScaling = atof( prop );
 
 
        vtkPolyData* polyDataResult =  cntVTK->GetOutput();
-       std::cout<<"Points "<<polyDataResult->GetNumberOfPoints()<<std::endl;
+       //std::cout<<"Points "<<polyDataResult->GetNumberOfPoints()<<std::endl;
        polyDataResult->Update( );
        polyDataResult->UpdateInformation();
 
-//EED
-       /*
-ofstream myfile;
-myfile.open ("C:/Creatis/example.txt");
-myfile << "\n";
-polyDataResult->Print(myfile);
-myfile << "-------------------------------------\n";
-polyDataResult->GetLines()->Print(myfile);
-myfile.close();*/
+       //EED
+               /*
+       ofstream myfile;
+       myfile.open ("C:/Creatis/example.txt");
+       myfile << "\n";
+       polyDataResult->Print(myfile);
+       myfile << "-------------------------------------\n";
+       polyDataResult->GetLines()->Print(myfile);
+       myfile.close();*/
 
        cntVTK          -> Delete();
        cpd                     -> Delete();
        conn            -> Delete();
 
 
-//--Calculating control points
+       //--Calculating control points
 
        std::vector<double> vecX;
        std::vector<double> vecY;
@@ -1148,8 +1241,8 @@ myfile.close();*/
        double xAct=0;
        double yAct=0;
        int ii,size=polyDataResult->GetNumberOfPoints();
-ofstream myfile;
-myfile.open ("C:/Creatis/example2.txt");
+       ofstream myfile;
+       myfile.open ("C:/Creatis/example2.txt");
 
        size=polyDataResult->GetNumberOfPoints();
        for (ii=0;ii<size;ii++)
@@ -1172,7 +1265,7 @@ myfile.open ("C:/Creatis/example2.txt");
                        std::cout<<" x Anterior "<<xAct<<" x actual "<<x<<std::endl;
                std::cout<<" y Anterior "<<yAct<<" y actual "<<y<<std::endl;
                std::cout<<" x "<<p[0]<<" y "<<p[1]<<std::endl;
-                       vecZ.push_back( -900 );
+                       vecZ.push_back( 900 );
                        xAct=x;
                        yAct=y;
                        }
@@ -1192,11 +1285,11 @@ myfile.open ("C:/Creatis/example2.txt");
                {
                vecX.push_back( p[0] );
                myfile <<p[0]<<","<<p[1]<<"\n";
-               std::cout<<" x Anterior "<<xAct<<" x actual "<<x<<std::endl;
-               std::cout<<" y Anterior "<<yAct<<" y actual "<<y<<std::endl;
-               std::cout<<" x "<<p[0]<<" y "<<p[1]<<std::endl;
+               //std::cout<<" x Anterior "<<xAct<<" x actual "<<x<<std::endl;
+               //std::cout<<" y Anterior "<<yAct<<" y actual "<<y<<std::endl;
+               //std::cout<<" x "<<p[0]<<" y "<<p[1]<<std::endl;
                vecY.push_back( p[1] );
-               vecZ.push_back( -900 );
+               vecZ.push_back( 900 );
                xAct=x;
                yAct=y;
                }
@@ -1207,9 +1300,9 @@ myfile.open ("C:/Creatis/example2.txt");
        while(!vecXo.empty())
        {
                vecX.push_back(vecXo.back());
-               std::cout<<" x Siguiente "<<vecXo.back();
+               //std::cout<<" x Siguiente "<<vecXo.back();
                vecXo.pop_back();
-               vecZ.push_back( -900 );
+               vecZ.push_back( 900 );
        }
        while(!vecYo.empty())
        {
@@ -1238,7 +1331,7 @@ myfile.open ("C:/Creatis/example2.txt");
 
        extractcontrolpoints2d->SetContour( &vecX , &vecY , &vecZ );
        
-int method=2;
+       int method=2;
        if (method==0){
                extractcontrolpoints2d->GetInitialControlPoints( &vecCtrlPointX , &vecCtrlPointY , &vecCtrlPointZ );
        }
@@ -1463,7 +1556,7 @@ myfile.close();
 //             double y=p[1];
                vecX.push_back( p[0] );
                vecY.push_back( p[1] );
-               vecZ.push_back( -900 );
+               vecZ.push_back( 900 );
 //                     vecZ.push_back( p[2] );
        }
 
@@ -1524,7 +1617,6 @@ myfile.close();
                }       // if addedModel
        } // if sizeCtrPt
 }
-
 int wxContourMainFrame::GetImageDataSizeZ(){
        return _theViewPanel->GetImageDataSizeZ();
 }
@@ -1561,49 +1653,53 @@ void wxContourMainFrame::onSegmentationAllSlice(int minZ,int maxZ,int isovalue,i
 //Creates a reference line to be used as the axis of the mirroring
 void wxContourMainFrame::referenceLine()
 {
-    wxBusyCursor wait;
-       double spc[3];
+       if (_refLineControl==NULL)
+       {
+               wxBusyCursor wait;
+               double spc[3];
 
-       vtkImageData *vtkimagedata = _theViewPanel->getImageData();
-       vtkimagedata->GetSpacing(spc);
+               vtkImageData *vtkimagedata = _theViewPanel->getImageData();
+               vtkimagedata->GetSpacing(spc);
 
-       wxVtkBaseView * viewer2D = _theViewPanel->getWxVtkBaseView();
+               wxVtkBaseView * viewer2D = _theViewPanel->getWxVtkBaseView();
 
-       _refLineControl = new manualLineControler();
-       _refLineModel   = new manualContourModelLine();
-       _refLineView = new manualViewLine();
-       _refLineView->SetModel( _refLineModel );
-       _refLineView->SetWxVtkBaseView( viewer2D );
-       _refLineView->SetRange( 2 );
-       _refLineView->SetZ( 1200 );
+               _refLineControl = new manualLineControler();
+               _refLineModel   = new manualContourModelLine();
+               _refLineView = new manualViewLine();
+               _refLineView->SetModel( _refLineModel );
+               _refLineView->SetWxVtkBaseView( viewer2D );
+               _refLineView->SetRange( 2 );
+               _refLineView->SetZ( 1200 );
 
-       _refLineView->SetSpacing(spc);
+               _refLineView->SetSpacing(spc);
 
-       _refLineView->SetColorNormalContour(0, 0, 1);
-       _refLineView->SetColorEditContour(0, 0.5, 0.5);
-       _refLineView->SetWidthLine(4);
+               _refLineView->SetColorNormalContour(0, 0, 1);
+               _refLineView->SetColorEditContour(0, 0.5, 0.5);
+               _refLineView->SetWidthLine(4);
 
-       _refLineControl->SetModelView( _refLineModel , _refLineView );
-       viewer2D->GetInteractorStyleBaseView()->AddInteractorStyleMaracas( _refLineControl );
-       _refLineModel->SetCloseContour(false);
-       _refLineControl->CreateNewManualContour();
+               _refLineControl->SetModelView( _refLineModel , _refLineView );
+               vtkInteractorStyleBaseView* style = (vtkInteractorStyleBaseView*)viewer2D->GetInteractorStyleBaseView();
+               style->AddInteractorStyleMaracas( _refLineControl );
+               _refLineModel->SetCloseContour(false);
+               _refLineControl->CreateNewManualContour();
 
-       double z = _refLineControl->GetZ();
-/*
-       _refLineControl->AddPoint(50,100,z);
-       _refLineControl->AddPoint(80,40,z);
-       _refLineControl->SetCompleteCreation(true);
+//EED??                double z = _refLineControl->GetZ();
+       /*
+               _refLineControl->AddPoint(50,100,z);
+               _refLineControl->AddPoint(80,40,z);
+               _refLineControl->SetCompleteCreation(true);
 
-       _refLineModel->AddPoint(50,100,z);
-       _refLineModel->AddPoint(80,40,z);
-       _refLineModel->UpdateSpline();
+               _refLineModel->AddPoint(50,100,z);
+               _refLineModel->AddPoint(80,40,z);
+               _refLineModel->UpdateSpline();
 
-       _refLineView->UpdateViewPoint(0);
-       _refLineView->UpdateViewPoint(1);
-*/
+               _refLineView->UpdateViewPoint(0);
+               _refLineView->UpdateViewPoint(1);
+       */
 
-       _refLineControl->SetActive(true);
-       _refLineView->RefreshContour();
+               _refLineControl->SetActive(true);
+               _refLineView->RefreshContour();
+       }
 }
 
 //Hides the referenceLine
@@ -1611,9 +1707,14 @@ void wxContourMainFrame::refLineHide()
 {
        if (_refLineControl!=NULL)
        {
-               _refLineView->RemoveCompleteContourActor();
-               _refLineControl->SetEditable(false);
-               _refLineControl->SetActive(false);
+               if (_refLineControl->GetActive())
+               {
+                       _refLineView->RemoveCompleteContourActor();
+                       _refLineControl->SetEditable(false);
+                       _refLineControl->SetActive(false);
+
+                       RefreshInterface();
+               }
        }
 }
 
@@ -1622,21 +1723,36 @@ void wxContourMainFrame::refLineShow()
 {
        if (_refLineControl!=NULL)
        {
-               wxVtkBaseView * viewer2D = _theViewPanel->getWxVtkBaseView();
+               if (_refLineControl->GetActive()==false)
+               {
+                       wxVtkBaseView * viewer2D = _theViewPanel->getWxVtkBaseView();
 
-               _refLineView->SetModel( _refLineModel );
-               _refLineView->SetWxVtkBaseView( viewer2D );
-               _refLineView->SetRange( 2 );
-               _refLineView->SetZ( 1200 );
+                       _refLineView->SetModel( _refLineModel );
+                       _refLineView->SetWxVtkBaseView( viewer2D );
+                       _refLineView->SetRange( 2 );
+                       _refLineView->SetZ( 1200 );
 
-               _refLineControl->SetModelView( _refLineModel , _refLineView );
-               viewer2D->GetInteractorStyleBaseView()->AddInteractorStyleMaracas( _refLineControl );
-               _refLineControl->CreateNewManualContour();
-               _refLineControl->SetActive(true);
-               _refLineView->RefreshContour();
+                       _refLineControl->SetModelView( _refLineModel , _refLineView );
+                       vtkInteractorStyleBaseView* style = (vtkInteractorStyleBaseView*)viewer2D->GetInteractorStyleBaseView();
+                       style->AddInteractorStyleMaracas( _refLineControl );
+                       _refLineControl->CreateNewManualContour();
+                       _refLineControl->SetActive(true);
+                       _refLineView->RefreshContour();
+
+                       RefreshInterface();
+               }
        }
 }
 
+void wxContourMainFrame::refLineChangeWidth(int width)
+{
+       _refLineView->SetWidthLine(width);
+       _refLineView->RefreshContour();
+
+       RefreshInterface();
+}
+
+
 void wxContourMainFrame::onMirror()
 {
        //AD:02-09
@@ -1671,7 +1787,195 @@ void wxContourMainFrame::onMirror()
        //_refName = "";
 }
 
-void wxContourMainFrame::showAxis(bool show){
+void wxContourMainFrame::onThreshold()
+{
+       int     z = _theViewPanel->GetZ();
+       double range[2];
+
+       vtkImageData * img = getImageData();
+       img->GetScalarRange(range);
+
+       int minTot = floor (range[0]);
+       int maxTot = ceil (range[1]);
+
+       double minMax[2];
+       _pannew->onThresholdInstantChange(minMax);
+       int minVal = floor (minMax[0]);
+       int maxVal = floor (minMax[1]);
+
+       if (!_actorPresent)
+       {
+               if (_imageReslicer==NULL)
+               {
+                       _imageReslicer = vtkImageReslice::New();
+                       _imageReslicer->SetInput( img );
+                       _imageReslicer->SetInformationInput(img);
+                       _imageReslicer->SetResliceAxesDirectionCosines(1,0,0, 0,1,0 ,0,0,1);
+                       _imageReslicer->SetOutputDimensionality(2);
+                       _imageReslicer->SetInterpolationModeToLinear();
+               }
+
+               _imageReslicer->SetResliceAxesOrigin(0,0,z);
+
+               img = _imageReslicer->GetOutput();
+               img->Update();
+               img->UpdateInformation();
+
+               wxVtkBaseView * baseView = _theViewPanel->getWxVtkBaseView();
+
+               if (_thresholdTable==NULL)
+               {
+                       //Lookup Table
+                       _thresholdTable = vtkLookupTable::New();
+                       _thresholdTable->SetNumberOfTableValues(maxTot+1);
+                       _thresholdTable->SetTableRange(range); 
+                       _thresholdTable->SetAlphaRange(0, 1);
+                       _thresholdTable->SetValueRange(0, 1);
+                       _thresholdTable->SetSaturationRange(0, 0); 
+                       _thresholdTable->SetRampToLinear( );
+               }
+
+               //Assign a fake color for the upper image, and set the white as transparent
+               int i;
+               for(i = minTot; i <= maxTot; i++)
+               {
+                       if( i >= minVal && i <= maxVal )
+                       {
+                               _thresholdTable->SetTableValue(i, 1.0, 0.0, 0.0, 1);
+                       }
+                       else if( i >= minTot && i < minVal )
+                       {
+                               _thresholdTable->SetTableValue(i, 1.0, 1.0, 1.0, 0); //transparent
+                       }
+                       else if( i > maxVal && i < maxTot )
+                       {
+                               _thresholdTable->SetTableValue(i, 1.0, 1.0, 1.0, 0); //transparent
+                       }
+                       else
+                       {
+                               _thresholdTable->SetTableValue(i, 1.0, 1.0, 1.0, 0); //transparent
+                       }
+               }
+               _thresholdTable->Build( );
+       
+               if (_thresholdMapper==NULL)
+               {
+                       _thresholdMapper = vtkImageMapToColors::New( );
+               }
+               
+               _thresholdMapper->SetLookupTable( _thresholdTable );
+               _thresholdMapper->SetInput( img );
+
+               if (_thresholdActor==NULL)
+               {
+                       _thresholdActor = vtkImageActor::New( );
+                       _thresholdActor->SetOpacity( 0.6 );
+                       _thresholdActor->InterpolateOn(  );
+                       _thresholdActor->SetPosition( 0,0, 900-1 );
+               }
+               
+               _thresholdActor->SetInput( _thresholdMapper->GetOutput() );
+
+               baseView->GetRenderer()->AddActor( _thresholdActor );
+               _actorPresent = true;
+       }
+
+       else
+       {
+               _imageReslicer->SetResliceAxesOrigin(0,0,z);
+               img = _imageReslicer->GetOutput();
+               img->Update();
+               img->UpdateInformation();
+
+               //Assign a fake color for the upper image, and set the white as transparent
+               int i;
+               for(i = minTot; i <= maxTot; i++)
+               {
+                       if( i >= minVal && i <= maxVal )
+                       {
+                               _thresholdTable->SetTableValue(i, 1.0, 0.0, 0.0, 1);
+                       }
+                       else if( i >= minTot && i < minVal )
+                       {
+                               _thresholdTable->SetTableValue(i, 1.0, 1.0, 1.0, 0); //transparent
+                       }
+                       else if( i > maxVal && i < maxTot )
+                       {
+                               _thresholdTable->SetTableValue(i, 1.0, 1.0, 1.0, 0); //transparent
+                       }
+                       else
+                       {
+                               _thresholdTable->SetTableValue(i, 1.0, 1.0, 1.0, 0); //transparent
+                       }
+               }
+
+               _thresholdTable->Build( );
+               _thresholdMapper->SetLookupTable( _thresholdTable );
+               _thresholdMapper->SetInput( img );
+               _thresholdActor->SetInput( _thresholdMapper->GetOutput() );
+       }
+                       /*
+                               vtkImageViewer2* viewer = vtkImageViewer2::New();        
+                               viewer->SetInput( upperImageActor->GetInput() ); 
+                               viewer->SetColorLevel((range[1]-range[0])/2);
+                               viewer->SetColorWindow(range[1]);
+                               viewer->GetRenderer()->AddActor( upperImageActor );
+                               viewer->Render();
+                       */
+       _theViewPanel->RefreshInterface();
+}
+
+
+void wxContourMainFrame::onThresholdChange()
+{
+       if (_actorPresent)
+       {
+               onThreshold();
+       }
+}
+
+void wxContourMainFrame::onThresholdInterpolation(bool interpolate)
+{
+       if (_thresholdActor!=NULL)
+       {
+               if (interpolate)
+               {
+                       _thresholdActor->InterpolateOn( );
+               }
+
+               else
+               {
+                       _thresholdActor->InterpolateOff( );
+               }
+
+               _theViewPanel->RefreshInterface();
+       }
+}
+
+void wxContourMainFrame::onThresholdChangeOpacity (int opacity)
+{
+       if (_actorPresent)
+       {
+               _thresholdActor->SetOpacity(opacity*0.1);
+       }
+
+       _theViewPanel->RefreshInterface();
+}
+
+void wxContourMainFrame::onThresholdRemove()
+{
+       if (_actorPresent)
+       {
+               wxVtkBaseView * baseView = _theViewPanel->getWxVtkBaseView();
+               baseView->GetRenderer()->RemoveActor( _thresholdActor );
+               _actorPresent = false;
+       }
+
+       _theViewPanel->RefreshInterface();
+}
+
+void wxContourMainFrame::showAxis(bool show)
+{
        _theViewPanel->SetVisibleAxis(show);
        _theViewPanel->Refresh();
 }
@@ -1707,17 +2011,38 @@ void wxContourMainFrame::onWidthOfContour(double width){
 
        RefreshInterface();
 }
-int wxContourMainFrame::getColorWindow(){
+
+int wxContourMainFrame::getColorWindow()
+{
+       /*
+       double range[2];
+       vtkImageData * img = getImageData();
+       img->GetScalarRange(range);
+
+       std::cout<<"Val 1: "<<range[0]<<" Val 2: "<<range[1]<<std::endl;
+       
+       return (int)range[1];
+       */
        return _theViewPanel->getColorWindow();
 }
-int wxContourMainFrame::getWindowLevel(){
+
+int wxContourMainFrame::getWindowLevel()
+{
+       /*
+       double range[2];
+       vtkImageData * img = getImageData();
+       img->GetScalarRange(range);
+
+       std::cout<<"Val 1: "<<range[0]<<" Val 2: "<<range[1]<<std::endl;
+       
+       return (int)range[1];
+       */
        return _theViewPanel->getWindowLevel();
 }
 
 void wxContourMainFrame::onBrigthnessColorWindowLevel(int colorwindow,int windowlevel){
        _theViewPanel->onBrigthnessColorWindowLevel(colorwindow, windowlevel);
 
-       
        RefreshInterface();
 }
 
@@ -1819,7 +2144,8 @@ std::vector<std::string> wxContourMainFrame::getOutlinesName(int slide){
        return kernelManager->getOutlinesNameAtInstant(tempVector);
 }
 
-void wxContourMainFrame::onInformationContourLabels(int typeContourGroup,int selection,int minimumZ,int maximumZ){
+void wxContourMainFrame::onInformationContourLabels(int typeContourGroup,int selection,int minimumZ,int maximumZ)
+{
        int maxContourGroup     =       0;
 
        ContourExtractData      *contourextractdata = new ContourExtractData();
@@ -1891,7 +2217,7 @@ void wxContourMainFrame::onInformationContourLabels(int typeContourGroup,int sel
                //_staticTextInformation->SetLabel(tmpString);
 
                //Extraction data from contours of each slice
-               contourextractdata->SetZtoBeAnalys( z);
+               contourextractdata->SetZtoBeAnalys(z);
 
                tempVector[1]=z;
                Instant instant(&tempVector);
@@ -2010,42 +2336,62 @@ void wxContourMainFrame::onInformationContourLabels(int typeContourGroup,int sel
        delete contourextractdata;
 }
 
-void wxContourMainFrame::onSaveResults(std::string directory,std::string namefile, std::string filename, int typeContourGroup){
-    SaveValuesXYZ( directory , namefile, typeContourGroup );
-       SaveImageResult( directory , namefile, typeContourGroup);
+//AD: 29-05-09
+void wxContourMainFrame::onSaveResults(std::string directory,std::string namefile, std::string filename, 
+       int typeContourGroup, bool XYZValues, bool contourImage, bool statistics)
+{
+       if (XYZValues)
+       {
+               SaveValuesXYZ( directory , namefile, typeContourGroup );
+       }
 
+       if (contourImage)
+       {
+               vtkImageData * mask;
+               vtkImageData * value;
+               this->getMaskValue(&mask, &value, typeContourGroup);
+               this->SaveImageResult( directory , namefile, mask, value);
+       }
        
-       FILE *pFile=fopen(filename.c_str(),"w+");
+       if (statistics)
+       {
+               std::ostringstream name;
+               name << filename << ".xls";
+               
 
-       int sizeZ = _theViewPanel->GetImageDataSizeZ();
+               FILE *pFile=fopen(name.str().c_str(),"w+");
 
-       wxString tmpString;
-       int i,j,maxX,maxY=sizeZ;
-       maxX= interfMainPanel::getInstance()->getNumberColsInformationPanel();//this->_grid->GetNumberCols();
+               int sizeZ = _theViewPanel->GetImageDataSizeZ();
 
-       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.c_str() );
-               fprintf(pFile,"-- \t %d-Size \t SizeRange \t Min \t Max \t Ave \t StDv \t" , iTitle );
-       }
-       fprintf(pFile,"\n" );
+               wxString tmpString;
+               int i,j,maxX,maxY=sizeZ;
+               maxX= interfMainPanel::getInstance()->getNumberColsInformationPanel();//this->_grid->GetNumberCols();
 
+               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.c_str() );
+                               fprintf(pFile,"-- \t %d-Size \t SizeRange \t Min \t Max \t Ave \t StDv \t" , iTitle );
+               }
+               fprintf(pFile,"\n" );
 
 
-       for ( j=0; j<maxY ; j++)
-       {
-               fprintf(pFile,"%d\t" , j );
-               for (i=0 ; i<maxX ; i++){
-                       tmpString = interfMainPanel::getInstance()->getCellValue(j, i);//_grid->GetCellValue( j , i );
-                       fprintf(pFile,"%s\t" , (const char *)(tmpString.mb_str()) );
-               } // for i
-               fprintf(pFile,"\n"  );
-       } // for j
 
-       fclose(pFile);
+               for ( j=0; j<maxY ; j++)
+               {
+                       fprintf(pFile,"%d\t" , j );
+                       for (i=0 ; i<maxX ; i++){
+                               tmpString = interfMainPanel::getInstance()->getCellValue(j, i);//_grid->GetCellValue( j , i );
+                               fprintf(pFile,"%s\t" , (const char *)(tmpString.mb_str()) );
+                       } // for i
+                       fprintf(pFile,"\n"  );
+               } // for j
+
+               fclose(pFile);
+       }
 }
 
+//AD: 29-05-09
 void wxContourMainFrame::SaveValuesXYZ(std::string directory,std::string namefile,int typeContourGroup)
 {
        wxBusyCursor wait;
@@ -2172,8 +2518,7 @@ void wxContourMainFrame::SaveValuesXYZ(std::string directory,std::string namefil
        delete contourextractdata;
 }
 
-void wxContourMainFrame::SaveImageResult(std::string directory,std::string namefile, int typeContourGroup)
-{
+void wxContourMainFrame::getMaskValue(vtkImageData ** mask,vtkImageData ** value,int typeContourGroup){
        wxBusyCursor wait;
        ContourExtractData      *contourextractdata = new ContourExtractData( true );
        //int typeContourGroup = this->_radiolstboxContourGroup->GetSelection();
@@ -2252,20 +2597,19 @@ void wxContourMainFrame::SaveImageResult(std::string directory,std::string namef
                        }
 
                        contourextractdata->SetLstManualContourModel( lstManConModTmp );
-
-
-//                             for (ii=0 ; ii<sizeLstContourThings ; ii++)
-//                             {
-//                                     ContourThing **contourthing = lstContourThings[ii];
-//                                     lstManConMod.push_back( (*contourthing)->getModel() );
-//                             }
-//                             contourextractdata->SetLstManualContourModel( lstManConMod );
-
                        contourextractdata->CalculateImageResult(); // with actual Z
 
                } // for  iContourGroup
        } // for z
 
+       (*value) = contourextractdata->GetVtkImageValueResult();
+       (*mask) = contourextractdata->GetVtkImageMaskResult();
+       delete contourextractdata;
+}
+
+void wxContourMainFrame::SaveImageResult(std::string directory,std::string namefile, vtkImageData* mask,vtkImageData* value)
+{
+       
        std::string temp = directory + "/" + namefile + "-Value.mhd";
 
        wxString filename = crea::std2wx(temp);
@@ -2279,7 +2623,7 @@ void wxContourMainFrame::SaveImageResult(std::string directory,std::string namef
 
 // Image Value
        vtkMetaImageWriter *writerValueImage = vtkMetaImageWriter::New( );
-       writerValueImage->SetInput( contourextractdata->GetVtkImageValueResult() );
+       writerValueImage->SetInput( value );
        writerValueImage->SetFileName( (const char *)filename.mb_str() );
        writerValueImage->SetFileDimensionality( 3 );
        writerValueImage->Write( );
@@ -2298,15 +2642,17 @@ void wxContourMainFrame::SaveImageResult(std::string directory,std::string namef
        filename.append(_T("-Mask.mhd"));*/
 
        vtkMetaImageWriter *writerMaskImage = vtkMetaImageWriter::New( );
-       writerMaskImage->SetInput( contourextractdata->GetVtkImageMaskResult() );
+       writerMaskImage->SetInput( mask );
        writerMaskImage->SetFileName( (const char *)filename.mb_str() );
        writerMaskImage->SetFileDimensionality( 3 );
        writerMaskImage->Write( );
 
        interfMainPanel::getInstance()->setStringInfoPanel( _T("") );
-       delete contourextractdata;
+       
 }
 
+
+
 void wxContourMainFrame::onChangeInstantInstantPanel(std::string name,int value, int minshow, int maxshow){
        if( name.compare( _theViewPanel->getVerticalConceptName() ) == 0){
                _theViewPanel->setActualVertical( value);
@@ -2350,4 +2696,8 @@ void wxContourMainFrame::saveFileWithContoursAutomatique(){
        }else{
                onSave();
        }
-}
\ No newline at end of file
+}
+void wxContourMainFrame::ShowToolsPanel(bool show){
+       _pannew->Show(show);
+}
+