]> Creatis software - creaContours.git/blobdiff - lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx
no message
[creaContours.git] / lib / Interface_ManagerContour_NDimensions / wxContourMainFrame.cxx
index b6d2133f84b044328d314268bc7d81e88f567c84..5596ea4a2b6c5a9c4871ebac77672f5014fe4480 100644 (file)
@@ -15,6 +15,8 @@
 #include "ConceptDataWrap.h"
 #include <creaWx.h>
 
+
+
 //----------------------------------------------------------------------------------------------------------------
 // Class implementation
 //----------------------------------------------------------------------------------------------------------------
@@ -33,6 +35,7 @@ char wxContourMainFrame::COPY = 'C';
                : wxPanel(parent, id, pos, size, style)
        {
                m_mgr.SetManagedWindow(this);
+               _contourGroup                           = 1;
                _creatingContoursActive         = false;
                _theViewPanel                           = NULL;
 //             _modelManager                           = NULL;
@@ -52,11 +55,7 @@ char wxContourMainFrame::COPY = 'C';
                _refLineControl                         = NULL;
                _refLineModel                           = NULL;
                _refLineView                            = NULL;
-               _imageReslicer                          = NULL;
-               _thresholdTable                         = NULL;
-               _thresholdMapper                        = NULL;
-               _thresholdActor                         = NULL;
-               _actorPresent                           = false;
+//             _actorPresent                           = false;
 
                // set up default notebook style
 //             m_notebook_style =wxAUI_NB_TAB_SPLIT | wxAUI_NB_TAB_EXTERNAL_MOVE | wxNO_BORDER;
@@ -64,12 +63,18 @@ char wxContourMainFrame::COPY = 'C';
                //wxContour_ActionCommandsID a;
                
                _contourextractdata                     = NULL;
+               _viewMaskImage                          = NULL;
+               _viewMaskImagePanel                     = NULL;
+               _viewThresholdImage                     = NULL;
+               _viewThresholdImagePanel        = NULL;
+
        }
 
        wxContourMainFrame :: wxContourMainFrame(wxWindow* parent, wxWindowID id,const wxString& title,const wxPoint& pos,const wxSize& size,std::vector<vtkImageData*> images, long style,std::string datadir)         
                : wxPanel(parent, id, pos, size, style)
        {
                m_mgr.SetManagedWindow(this);
+               _contourGroup                           = 1;
                _creatingContoursActive         = false;
                _theViewPanel                           = NULL;
 
@@ -77,11 +82,11 @@ char wxContourMainFrame::COPY = 'C';
                _refLineControl                         = NULL;
                _refLineModel                           = NULL;
                _refLineView                            = NULL;
-               _imageReslicer                          = NULL;
-               _thresholdTable                         = NULL;
-               _thresholdMapper                        = NULL;
-               _thresholdActor                         = NULL;
-               _actorPresent                           = false;
+//             _actorPresent                           = false;
+               _viewMaskImage                          = NULL;
+               _viewMaskImagePanel                     = NULL;
+               _viewThresholdImage                     = NULL;
+               _viewThresholdImagePanel        = NULL;
 
                // set up default notebook style
                m_notebook_style =wxAUI_NB_TAB_SPLIT | wxAUI_NB_TAB_EXTERNAL_MOVE | wxNO_BORDER;
@@ -505,11 +510,6 @@ void wxContourMainFrame :: deleteContour( std::string theKeyName ){
                //cViewer               = conwrapviewControl->getViewer();
                //_theViewPanel->getSceneManager()->removeWrap( theKeyName );
                //cControler* conwrapviewControl->getControler();                       
-//EED Borrame
-//FILE *ff = fopen("c:/temp/wxVtkBaseView_SceneManagerStadistics.txt","a+");
-//fprintf(ff,"EED wxContourEventHandler::deleteContours() \n" );
-//fprintf(ff,"    %s %p\n",keyNamesVector[i].c_str(),  cControler );
-//fclose(ff);
        //      delete cModel;
        //      delete cViewer;
        //      delete cControler;
@@ -593,11 +593,11 @@ bool wxContourMainFrame::getIfConceptCheckedAt( std::string name, int pos ){
 
 
 
-void wxContourMainFrame::ShowResultImages(int typeContourGroup)
+void wxContourMainFrame::ShowResultImages(int typeContourGroup, int selection, int minZ, int maxZ)
 {
        vtkImageData * mask;
        vtkImageData * value;
-       this->getMaskValue(&mask, &value, typeContourGroup);
+       this->getMaskValue(&mask, &value, typeContourGroup, selection, minZ, maxZ);
        
        std::vector<int> nTypeView;
        nTypeView.push_back(5);
@@ -629,15 +629,29 @@ void wxContourMainFrame::changeInstant()
 {
                std::vector<int> instantVect;
                _instantPanel->getInstant( instantVect );
-//             Instant * theInstant = new Instant ( &instantVect );
-               
-               //Setting the actual instant
-               //_actualInstant = theInstant;
+               int actualSlice = instantVect[1];
 
                kernelManager->setInstant(instantVect);
-               //_modelManager->setInstant( _actualInstant );
-               
-           onThresholdChange();
+                       
+           // Refresh Mask image
+               if(_viewMaskImage!=NULL){
+                       _viewMaskImage->SetZ(actualSlice);                      
+                       if (_viewMaskImagePanel->IsVisible()==true)
+                       {
+                               vtkImageData *mask, *value;
+                               getMaskValue(&mask,&value, _contourGroup , 0, -1, -1);
+                               _viewMaskImage->onThreshold();
+                       }
+               }
+       
+       // Refresh Threshold image
+               if(_viewThresholdImage!=NULL){
+                       _viewThresholdImage->SetZ(actualSlice);                 
+                       if (_viewThresholdImagePanel->IsVisible()==true){
+                               _viewThresholdImage->onThreshold();
+                       }
+               }
+       
                updateInstantOutlines();
                updateInstantImageData();
                updateInstantAxes();
@@ -810,8 +824,6 @@ void wxContourMainFrame ::loadContours( FILE *pFile, bool staticContour )
 {
        char tmp[255];
 
-       if (staticContour==false)
-       {
        fscanf(pFile,"%s",tmp); // ImageDimensions
        fscanf(pFile,"%s",tmp); // X
        fscanf(pFile,"%s",tmp); // Y
@@ -821,7 +833,6 @@ void wxContourMainFrame ::loadContours( FILE *pFile, bool staticContour )
        fscanf(pFile,"%s",tmp); // X
        fscanf(pFile,"%s",tmp); // Y
        fscanf(pFile,"%s",tmp); // Z
-       }
        
        fscanf(pFile,"%s",tmp); // NumberOfContours 
        fscanf(pFile,"%s",tmp); // ##
@@ -2013,192 +2024,6 @@ void wxContourMainFrame::onMirror()
        //_refName = "";
 }
 
-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)
 {
@@ -2371,18 +2196,13 @@ std::vector<std::string> wxContourMainFrame::getOutlinesName(int slide){
 }
 
 
-void wxContourMainFrame::GenerateContourExtractData()
-{
-       if (_contourextractdata==NULL) { _contourextractdata = new ContourExtractData(true); }
-}
-
 
-void wxContourMainFrame::onInformationContourLabels(int typeContourGroup,int selection,int minimumZ,int maximumZ)
+void wxContourMainFrame::onInformationContourLabels(int typeContourGroup,int selection,int minimumZ,int maximumZ,int grayRangeMin, int grayRangeMax)
 {
-       GenerateContourExtractData();
+//EED01Juillet2009     GenerateContourExtractData();
        
+       wxString tempString;
        int maxContourGroup     =       0;
-
        
        _contourextractdata ->SetTypeOperation( typeContourGroup % 3 );
 
@@ -2404,8 +2224,8 @@ void wxContourMainFrame::onInformationContourLabels(int typeContourGroup,int sel
        std::vector<int> tempVector;
        _instantPanel->getInstant( tempVector );
 
-       vtkImageData *imagedata = _theViewPanel->getImageData();
-       int sizeZ = _theViewPanel->GetImageDataSizeZ();
+//EED01Juillet2009     vtkImageData *imagedata = _theViewPanel->getImageData();
+//     int sizeZ = _theViewPanel->GetImageDataSizeZ();
        int z;
        int ii,sizeLstContourThings;
 
@@ -2415,31 +2235,23 @@ void wxContourMainFrame::onInformationContourLabels(int typeContourGroup,int sel
        double porcent; 
        wxString tmpString;
 
-       
 
        if (selection==0 ) // actual slice
        {
-               std::vector<int> tempVector;
-               _instantPanel->getInstant( tempVector );
                int actualSlice = tempVector[1];
                minZ    = actualSlice;
                maxZ    = actualSlice;
-       }
-       else if (selection==2 ) // All slices
-       {
-               minZ    = 0;
-               maxZ    = sizeZ-1;
-       }
-       else if (selection==1 ) // slice range
-       {
+       }       else  {  // slice range
                minZ    = minimumZ;
                maxZ    = maximumZ;
        }
        
 
        totalZ  = maxZ-minZ+1;
-       _contourextractdata->SetImage( imagedata);
+//EED01Juillet2009     _contourextractdata->SetImage( imagedata);
 
+       _contourextractdata->InitVolumeStatistics();
+       
 // For each slice..
        for ( z=minZ ; z<=maxZ ; z++ )
        {
@@ -2467,7 +2279,6 @@ void wxContourMainFrame::onInformationContourLabels(int typeContourGroup,int sel
                lstManConModExp =  kernelManager->ExploseEachModel( lstManConMod );
 
 
-               wxString tempString;
                tempString.Printf(_T("%d - %d"),z, sizeLstContourThings);
                interfMainPanel::getInstance()->setRowLabelInfoPanel(z, tempString);
                //_grid->SetRowLabelValue(z, tempString );
@@ -2510,8 +2321,8 @@ void wxContourMainFrame::onInformationContourLabels(int typeContourGroup,int sel
                                                                                                                &pLstValuePosZ);
                        // Statistics of each slice.
                        _contourextractdata->Statistics( &pLstValue,
-                                                                                       minimumZ,
-                                                                                       maximumZ,
+                                                                                       grayRangeMin,
+                                                                                       grayRangeMax,
                                                                                        &resultGrayRangeCount, 
                                                                                        &resultSize, 
                                                                                        &resultMin, 
@@ -2548,6 +2359,45 @@ void wxContourMainFrame::onInformationContourLabels(int typeContourGroup,int sel
                } // for iContourGroup
        } // for z
 
+       // Print Volume Statistics
+
+
+       int             vol_rCountRange; 
+       int             vol_rsize;
+       double  vol_minValue;
+       double  vol_maxValue;
+       double  vol_average;
+       double  vol_standardeviation;
+       
+       if (selection!=0 ) // actual slice
+       {
+
+               _contourextractdata->GetVolumeStatistics(&vol_rCountRange, &vol_rsize,
+                                                                                                &vol_minValue, &vol_maxValue,
+                                                                                                &vol_average, &vol_standardeviation);
+
+               interfMainPanel::getInstance()->setRowLabelInfoPanel(maxZ+2, _T("Total:"));
+       
+               tempString.Printf(_T("%d"),vol_rsize);
+               interfMainPanel::getInstance()->setCellValueInfoPanel(maxZ+2, 0, tempString);   
+       
+               tempString.Printf(_T("%d"),vol_rCountRange);
+               interfMainPanel::getInstance()->setCellValueInfoPanel(maxZ+2, 1, tempString);
+       
+               tempString.Printf(_T("%f"),vol_minValue);
+               interfMainPanel::getInstance()->setCellValueInfoPanel(maxZ+2, 2, tempString);
+       
+               tempString.Printf(_T("%f"),vol_maxValue);
+               interfMainPanel::getInstance()->setCellValueInfoPanel(maxZ+2, 3, tempString);
+       
+               tempString.Printf(_T("%f"),vol_average);
+               interfMainPanel::getInstance()->setCellValueInfoPanel(maxZ+2, 4, tempString);
+       
+               tempString.Printf(_T("%f"),vol_standardeviation);
+               interfMainPanel::getInstance()->setCellValueInfoPanel(maxZ+2, 5, tempString);
+       }
+       //-----------------------------------------
+       
        int iTitleGroup;
        wxString tmpTitleString;
        int tmpIntB;
@@ -2564,14 +2414,13 @@ void wxContourMainFrame::onInformationContourLabels(int typeContourGroup,int sel
                interfMainPanel::getInstance()->setColLableInfoPanel( tmpIntB + 4, _T("Average") );
                interfMainPanel::getInstance()->setColLableInfoPanel( tmpIntB + 5, _T("St.Dev.") );
                interfMainPanel::getInstance()->setColLableInfoPanel( tmpIntB + 6, _T(" ") );
-       }
-
+       }// for title
        interfMainPanel::getInstance()->setStringInfoPanel( _T("") );
 }
 
 //AD: 29-05-09
 void wxContourMainFrame::onSaveResults(std::string directory,std::string namefile, std::string filename, 
-       int typeContourGroup, bool XYZValues, bool contourImage, bool statistics)
+       int typeContourGroup, int selection, int minZ, int maxZ, bool XYZValues, bool contourImage, bool statistics)
 {
        if (XYZValues)
        {
@@ -2582,7 +2431,7 @@ void wxContourMainFrame::onSaveResults(std::string directory,std::string namefil
        {
                vtkImageData * mask;
                vtkImageData * value;
-               this->getMaskValue(&mask, &value, typeContourGroup);
+               this->getMaskValue(&mask, &value, typeContourGroup,selection,minZ,maxZ);
                this->SaveImageResult( directory , namefile, mask, value);
        }
        
@@ -2594,23 +2443,37 @@ void wxContourMainFrame::onSaveResults(std::string directory,std::string namefil
 
                FILE *pFile=fopen(name.str().c_str(),"w+");
 
-               int sizeZ = _theViewPanel->GetImageDataSizeZ();
 
                wxString tmpString;
-               int i,j,maxX,maxY=sizeZ;
+               int i,j,maxX;
+               
+//             int sizeZ = _theViewPanel->GetImageDataSizeZ();
+//             int maxY=sizeZ+2;
+               
                maxX= interfMainPanel::getInstance()->getNumberColsInformationPanel();//this->_grid->GetNumberCols();
 
+               // -- Title --
                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,"slice\t %d-Size \t SizeRange \t Min \t Max \t Ave \t StDv \t" , iTitle );
                }
-               fprintf(pFile,"\n" );
-
-
+               fprintf(pFile,"\n\n" );
 
-               for ( j=0; j<maxY ; j++)
+               
+               
+               if (selection==0 ) // actual slice
+               {
+                       std::vector<int> tempVector;
+                       _instantPanel->getInstant( tempVector );
+                       int actualSlice = tempVector[1];
+                       minZ    = actualSlice;
+                       maxZ    = actualSlice;
+               }
+               
+               // Stadistics...
+               for ( j=minZ; j<=maxZ ; j++)
                {
                        fprintf(pFile,"%d\t" , j );
                        for (i=0 ; i<maxX ; i++){
@@ -2620,6 +2483,18 @@ void wxContourMainFrame::onSaveResults(std::string directory,std::string namefil
                        fprintf(pFile,"\n"  );
                } // for j
 
+               
+               // Total of stadistics.....
+               if (selection!=0)
+               {
+                       fprintf(pFile,"\n Total:\t"  );
+                       for (i=0 ; i<maxX ; i++){
+                               tmpString = interfMainPanel::getInstance()->getCellValue(maxZ+2, i);//_grid->GetCellValue( maxZ+2 , i );
+                               fprintf(pFile,"%s\t" , (const char *)(tmpString.mb_str()) );
+                       } // for i
+                       fprintf(pFile,"\n"  );
+               }
+               
                fclose(pFile);
        }
 }
@@ -2628,7 +2503,7 @@ void wxContourMainFrame::onSaveResults(std::string directory,std::string namefil
 void wxContourMainFrame::SaveValuesXYZ(std::string directory,std::string namefile,int typeContourGroup)
 {
        wxBusyCursor wait;
-       GenerateContourExtractData();
+//EED01Juillet2009     GenerateContourExtractData();
        
        //int typeContourGroup = this->_radiolstboxContourGroup->GetSelection();
        _contourextractdata ->SetTypeOperation( typeContourGroup % 3 );
@@ -2644,7 +2519,7 @@ void wxContourMainFrame::SaveValuesXYZ(std::string directory,std::string namefil
        std::vector<int> tempVector;
        _instantPanel->getInstant( tempVector );
 
-       vtkImageData *imagedata = _theViewPanel->getSceneManager()->GetImageData();
+//EED01Juillet2009     vtkImageData *imagedata = _theViewPanel->getSceneManager()->GetImageData();
        int sizeZ = _theViewPanel->getSceneManager()->GetImageDataSizeZ();
        int z;
        int ii,sizeLstContourThings;
@@ -2658,7 +2533,7 @@ void wxContourMainFrame::SaveValuesXYZ(std::string directory,std::string namefil
        maxZ    = sizeZ;//_mbarrange->GetEnd();
        totalZ  = maxZ-minZ+1;
 
-       _contourextractdata->SetImage( imagedata);
+//EED01Juillet2009     _contourextractdata->SetImage( imagedata);
 
 // For each slice..
        for ( z=0 ; z<sizeZ ; z++)
@@ -2752,9 +2627,9 @@ void wxContourMainFrame::SaveValuesXYZ(std::string directory,std::string namefil
 
 }
 
-void wxContourMainFrame::getMaskValue(vtkImageData ** mask,vtkImageData ** value,int typeContourGroup){
+void wxContourMainFrame::getMaskValue(vtkImageData ** mask,vtkImageData ** value,int typeContourGroup, int selection, int minZ, int maxZ){
        wxBusyCursor wait;
-       GenerateContourExtractData();
+//EED01Juillet2009     GenerateContourExtractData();
 
        //int typeContourGroup = this->_radiolstboxContourGroup->GetSelection();
        if (typeContourGroup==3)
@@ -2770,26 +2645,43 @@ void wxContourMainFrame::getMaskValue(vtkImageData ** mask,vtkImageData ** value
        std::vector<int> tempVector;
        _instantPanel->getInstant( tempVector );
 
-       vtkImageData *imagedata = _theViewPanel->getImageData();
-       int sizeZ = _theViewPanel->GetImageDataSizeZ();
+    vtkImageData *imagedata = _theViewPanel->getImageData();
+       int ext[6];
+       imagedata->GetExtent(ext);
+       int sizeZimage = ext[5]-ext[4]+1;
        int z;
        int ii,sizeLstContourThings;
 
 
-       int minZ,maxZ;
        double totalZ;
        double porcent; 
 
        wxString tmpString;
+       
+       
+       if (selection==0 ) // actual slice
+       {
+               int actualSlice = tempVector[1];
+               minZ    = actualSlice;
+               maxZ    = actualSlice;
+       }       
+       
+       totalZ  = maxZ-minZ;
 
-       minZ    = 0;// _mbarrange->GetStart();
-       maxZ    = sizeZ;//_mbarrange->GetEnd();
-       totalZ  = maxZ-minZ+1;
-
-       _contourextractdata->SetImage( imagedata);
+//EED01Juillet2009     _contourextractdata->SetImage( imagedata);
 
+       // cleanning image before range 
+       for (z=0; z<minZ; z++){
+               _contourextractdata->ResetImageResult(z);
+       }
+       // cleanning image after range 
+       for (z=maxZ+1; z<sizeZimage; z++){
+               _contourextractdata->ResetImageResult(z);
+       }
+       
+       
 // For each slice..
-       for ( z=0 ; z<sizeZ ; z++)
+       for ( z=minZ ; z<=maxZ ; z++)
        {
 
                porcent = 100.0* (z-minZ)/totalZ;
@@ -2936,3 +2828,62 @@ void wxContourMainFrame::ShowToolsPanel(bool show){
        _pannew->Show(show);
 }
 
+
+
+void wxContourMainFrame::SetContourGroup(int contourGroup)
+{
+       _contourGroup = contourGroup;
+}
+
+
+wxPanel *wxContourMainFrame::getMaskImageViewPanel(wxWindow *parent)
+{
+       
+       if      (_viewMaskImagePanel==NULL)
+       {
+               _contourextractdata = new ContourExtractData(true);
+               _contourextractdata->SetImage( _theViewPanel->getImageData() );
+               
+//             double range[2];
+//             _theViewPanel->getImageData()->GetScalarRange(range);
+               //int min = (int)floor (range[0]);
+               //int max = (int)ceil (range[1]);
+               int min = 254;
+               int max = 256;
+               
+               _viewMaskImagePanel = new ThresholdImageViewPanel( parent, -1, -1 , 0);
+               _viewMaskImage = new ThresholdImageView();
+               _viewMaskImage->SetImage(_contourextractdata->GetVtkImageMaskResult() );
+               _viewMaskImage->SetminMaxValue( min, max);
+               _viewMaskImage->SetBaseColor( 0,0,1 );
+               _viewMaskImagePanel->SetThresholdImageView( _viewMaskImage );
+               _viewMaskImage->SetwxVtkBaseView( _theViewPanel->getWxVtkBaseView() );
+               
+       }
+       return _viewMaskImagePanel;
+}
+
+wxPanel *wxContourMainFrame::getThresholdImageViewPanel(wxWindow *parent)
+{
+       if      (_viewThresholdImagePanel==NULL)
+       {
+               double range[2];
+               _theViewPanel->getImageData()->GetScalarRange(range);
+               int min = (int)floor (range[0]);
+               int max = (int)ceil (range[1]);         
+               _viewThresholdImagePanel = new ThresholdImageViewPanel( parent, min, max , 1);
+               _viewThresholdImage = new ThresholdImageView();
+               _viewThresholdImage->SetImage( _theViewPanel->getImageData() );
+               _viewThresholdImage->SetminMaxValue( min, max);
+               _viewThresholdImage->SetBaseColor( 1,0,0 );
+               _viewThresholdImagePanel->SetThresholdImageView( _viewThresholdImage );
+               _viewThresholdImage->SetwxVtkBaseView( _theViewPanel->getWxVtkBaseView() );
+       }
+       return _viewThresholdImagePanel;
+}
+
+
+
+
+
+