*** empty log message ***

[creaContours.git] / lib / Interface_ManagerContour_NDimensions / wxContourMainFrame.cxx

diff --git a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx
index 8941bde86d9e44287e06a66071e3e4e6164291c1..a1276c02d64c391390055a37a38fd98ebd07023c 100644 (file)
--- a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx
+++ b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx
@@ -68,7 +68,8 @@ char wxContourMainFrame::COPY = 'C';
                _viewMaskImagePanel                     = NULL;
                _viewThresholdImage                     = NULL;
                _viewThresholdImagePanel        = NULL;
-
+               _viewColorLayerImage            = NULL;
+               _viewColorLayerImagePanel       = 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)         
@@ -88,6 +89,8 @@ char wxContourMainFrame::COPY = 'C';
                _viewMaskImagePanel                     = NULL;
                _viewThresholdImage                     = NULL;
                _viewThresholdImagePanel        = NULL;
+               _viewColorLayerImage            = NULL;
+               _viewColorLayerImagePanel       = NULL;
 
                // set up default notebook style
                m_notebook_style =wxAUI_NB_TAB_SPLIT | wxAUI_NB_TAB_EXTERNAL_MOVE | wxNO_BORDER;
@@ -153,7 +156,8 @@ void wxContourMainFrame::setVectImages(std::vector<vtkImageData*> imgs)
 }
 
 
-       wxContourMainFrame* wxContourMainFrame :: getInstance(wxWindow* parent, wxWindowID id,const wxString& title,const wxPoint& pos,const wxSize& size,std::vector<vtkImageData*> images, long style,std::string datadir ){
+       wxContourMainFrame* wxContourMainFrame :: getInstance(wxWindow* parent, wxWindowID id,const wxString& title,const wxPoint& pos,const wxSize& size,std::vector<vtkImageData*> images, long style,std::string datadir )
+       {
                if(instance == NULL){
                        instance = new wxContourMainFrame(parent, id, title, pos, size, images, style,datadir);
                }
@@ -669,7 +673,15 @@ void wxContourMainFrame::changeInstant()
                                _viewThresholdImage->onThreshold();
                        }
                }
-       
+
+       // Refresh Threshold image
+               if(_viewColorLayerImage!=NULL){
+                       _viewColorLayerImage->SetZ(actualSlice);                        
+                       if (_viewColorLayerImagePanel->IsVisible()==true){
+                               _viewColorLayerImage->onThreshold();
+                       }
+               }
+
                updateInstantOutlines();
                updateInstantImageData();
                updateInstantAxes();
@@ -1007,6 +1019,17 @@ void wxContourMainFrame::onImport(){
 
        }
 }
+void wxContourMainFrame::onTest(){
+       std::string filename, filenamecontours;
+       wxFileDialog dialog(NULL, _T("Choose a File"), _T(""), _T(""), _T("*.*"), wxOPEN );
+
+       if (dialog.ShowModal() == wxID_OK)
+       {
+               filename = dialog.GetPath().mb_str();           
+               std::cout << "This is the filename: " << filename << std::endl;
+       }
+}
+
 
 //AD: 29-05-09
 void wxContourMainFrame::onSave(){
@@ -2896,8 +2919,10 @@ void wxContourMainFrame::SaveImageResult(std::string directory,std::string namef
 // Image Value
        vtkMetaImageWriter *writerValueImage = vtkMetaImageWriter::New( );
        writerValueImage->SetInput( value );
+       writerValueImage->SetInput( value );
        writerValueImage->SetFileName( (const char *)filename.mb_str() );
        writerValueImage->SetFileDimensionality( 3 );
+       writerValueImage->SetCompression(false);
        writerValueImage->Write( );
 
 // Image Mask
@@ -2917,6 +2942,7 @@ void wxContourMainFrame::SaveImageResult(std::string directory,std::string namef
        writerMaskImage->SetInput( mask );
        writerMaskImage->SetFileName( (const char *)filename.mb_str() );
        writerMaskImage->SetFileDimensionality( 3 );
+       writerValueImage->SetCompression(false);
        writerMaskImage->Write( );
 
        interfMainPanel::getInstance()->setStringInfoPanel( _T("") );
@@ -3008,6 +3034,25 @@ wxPanel *wxContourMainFrame::getMaskImageViewPanel(wxWindow *parent)
        return _viewMaskImagePanel;
 }
 
+
+wxPanel *wxContourMainFrame::getColorLayerImageViewPanel(wxWindow *parent)
+{
+       if      (_viewColorLayerImagePanel==NULL)
+       {
+               double range[2];
+               _theViewPanel->getImageData()->GetScalarRange(range);
+               int min = (int)floor (range[0]);
+               int max = (int)ceil (range[1]);         
+               _viewColorLayerImagePanel = new ColorLayerImageViewPanel( parent, min, max , 1);
+               _viewColorLayerImage = new ColorLayerImageView();
+               _viewColorLayerImage->SetImage( _theViewPanel->getImageData() );
+               _viewColorLayerImagePanel->SetColorLayerImageView( _viewColorLayerImage );
+               _viewColorLayerImage->SetwxVtkBaseView( _theViewPanel->getWxVtkBaseView() );
+       }
+       return _viewColorLayerImagePanel;
+}
+
+
 wxPanel *wxContourMainFrame::getThresholdImageViewPanel(wxWindow *parent)
 {
        if      (_viewThresholdImagePanel==NULL)
@@ -3106,4 +3151,4 @@ void wxContourMainFrame::SetFileLocation(std::string newFileLocation)
        _fileLocation = newFileLocation;
        std::cout<<"GETFILELOCATION:"<<_fileLocation<<std::endl;
 }
-//------------------------------------------------------------------------------------------------------------
\ No newline at end of file
+//------------------------------------------------------------------------------------------------------------