*** empty log message ***

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

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererPanel.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererPanel.cxx
index 3327a852fc274172cbd9fe62fa369fa671dadbdb..6337f764210bbe01be1d5354aaf34b9e1599a489 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererPanel.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererPanel.cxx
@@ -3,6 +3,7 @@
 #include <wx/colordlg.h>
 #include "wxMaracasMultipleVolumeRendererView.h"
 #include "Color.xpm"
+//#include <vtkImageCast.h>
 /**
 **     Implementation of viewProp3D
 **/
@@ -18,6 +19,7 @@ wxMaracasMultipleVolumeRendererPanel::wxMaracasMultipleVolumeRendererPanel(wxWin
 wxMaracasMultipleVolumeRendererPanel::~wxMaracasMultipleVolumeRendererPanel(){ 
        //wxMaracasIRMView::getInstance()->addRemoveActor(_propid, false);
        wxMaracasMultipleVolumeRendererView::getInstance()->deleteVolume(_propid);
+       delete mwxwidget;
 }
 
 void wxMaracasMultipleVolumeRendererPanel::createControls(vtkImageData* img){
@@ -31,9 +33,7 @@ void wxMaracasMultipleVolumeRendererPanel::createControls(vtkImageData* img){
        Connect(checkbox->GetId(), wxEVT_COMMAND_CHECKBOX_CLICKED, (wxObjectEventFunction)&wxMaracasMultipleVolumeRendererPanel::onCheckBoxChange);     
        checkbox->SetValue(true);       
 
-       sizerirmprop->Add(checkbox,wxFIXED_MINSIZE);
-
-       //this->addControl(checkbox);   
+       sizerirmprop->Add(checkbox,wxFIXED_MINSIZE);    
        
        wxBitmap bitmap(Color_xpm);
        _colorchoose = new wxBitmapButton(this, -1, bitmap,wxDefaultPosition,wxSize(30,30));    
@@ -46,22 +46,39 @@ void wxMaracasMultipleVolumeRendererPanel::createControls(vtkImageData* img){
 
     
 
-       _frame = new wxFrame(this, 10, _T("Configure Transfer Functions"));     
+       //_frame = new wxFrame(this, 10, _T("Configure Transfer Functions"));   
 
-       wxButton* button1 = new wxButton(_frame,20,_T("OK"));
+       /*wxButton* button1 = new wxButton(_frame,20,_T("OK"));
        Connect(button1->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, (wxObjectEventFunction)&wxMaracasMultipleVolumeRendererPanel::onOK);                            
        wxButton* button2 = new wxButton(_frame,30,_T("Cancel") );
        Connect(button2->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, (wxObjectEventFunction)&wxMaracasMultipleVolumeRendererPanel::onCancel);                                
        wxButton* button3 = new wxButton(_frame,40,_T("Update"));
-       Connect(button3->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, (wxObjectEventFunction)&wxMaracasMultipleVolumeRendererPanel::onUpdate);                                
-
+       Connect(button3->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, (wxObjectEventFunction)&wxMaracasMultipleVolumeRendererPanel::onUpdate);                                */
 
-       mwxwidget = new HistogramWidget(_frame, -1);
 
+       mwxwidget = new HistogramDialog(this, _T("Color Transfer Function"));
        mwxwidget->initializeHistogram(img);
-       mwxwidget->Refresh();
 
-       wxBoxSizer* boxSizer0 = new wxBoxSizer(wxHORIZONTAL);
+       mwxwidget->erasePointsTransferenceFunction();
+       double range[2];
+       img->GetScalarRange(range);
+       double max = range[1];
+
+       /*
+       adding the poinst of the transference function
+       */
+       //X
+       mwxwidget->addPointToTransferenceFunction(max * 0/2,0.0);
+       mwxwidget->addPointToTransferenceFunction(max * 1/2,100.0);
+       mwxwidget->addPointToTransferenceFunction(max * 2/2,100.0);
+
+       mwxwidget->addColorPoint(max*0/4,(int)(0.0*255),(int)(0.0*255),(int)(0.0*255));
+       mwxwidget->addColorPoint(max*1/4,(int)(1.0*255),(int)(0.0*255),(int)(0.0*255));
+       mwxwidget->addColorPoint(max*2/4,(int)(0.0*255),(int)(0.0*255),(int)(1.0*255));
+       mwxwidget->addColorPoint(max*3/4,(int)(0.0*255),(int)(1.0*255),(int)(0.0*255));
+       mwxwidget->addColorPoint(max*4/4,(int)(0.0*255),(int)(0.0*255),(int)(0.2*255)); 
+
+       /*wxBoxSizer* boxSizer0 = new wxBoxSizer(wxHORIZONTAL);
        boxSizer0->Add(mwxwidget, 4, wxGROW);
 
        wxBoxSizer* boxSizer = new wxBoxSizer(wxHORIZONTAL);
@@ -82,15 +99,17 @@ void wxMaracasMultipleVolumeRendererPanel::createControls(vtkImageData* img){
     _frame->SetSizer(boxsizer2);
 
        _frame->Refresh();
-       _frame->Update();
-       
+       _frame->Update();*/     
+       mwxwidget->SetFunctions(wxMaracasMultipleVolumeRendererView::getInstance()->GetTransferFunction(getPropId()),
+                                                       wxMaracasMultipleVolumeRendererView::getInstance()->GetColorFunction(getPropId()));
+       mwxwidget->Refresh();   
 }
 void wxMaracasMultipleVolumeRendererPanel::onOK(wxCommandEvent& event){
     updateVolume();
-       _frame->Show(false);
+       //_frame->Show(false);
 }
 void wxMaracasMultipleVolumeRendererPanel::onCancel(wxCommandEvent& event){
-       _frame->Show(false);
+       //_frame->Show(false);
 }
 void wxMaracasMultipleVolumeRendererPanel::onUpdate(wxCommandEvent& event){
        updateVolume();    
@@ -112,8 +131,12 @@ void wxMaracasMultipleVolumeRendererPanel::updateVolume(){
        wxMaracasMultipleVolumeRendererView::getInstance()->SetValuesPointsFunction(this->_propid, greylevel, values);
 
 }
-void wxMaracasMultipleVolumeRendererPanel::onColorChange(wxCommandEvent& event){
-    _frame->Show(true);    
+void wxMaracasMultipleVolumeRendererPanel::onColorChange(wxCommandEvent& event){       
+
+       if(mwxwidget->ShowModal()==wxID_OK){
+        updateVolume();
+               mwxwidget->Show(false);
+       }       
 }
 void wxMaracasMultipleVolumeRendererPanel::onCheckBoxChange(wxCommandEvent& event){    
        wxMaracasMultipleVolumeRendererView::getInstance()->addRemoveActor(this->getPropId(), checkbox->GetValue());