*** 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 f1fa7e1b8a25e3f55dbf73c78e0dac07c6872b27..0844b784a1b3c2541e58829614ef758f02b95aed 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererPanel.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererPanel.cxx
@@ -1,8 +1,12 @@
 #include "wxMaracasMultipleVolumeRendererPanel.h"
-
-#include <wx/colordlg.h>
 #include "wxMaracasMultipleVolumeRendererView.h"
 #include "wxMaracasRendererView.h"
+
+#include <wx/colordlg.h>
+
+#include "vtkImageData.h"
+#include "vtkRenderer.h"
+
 #include <OpenImage.xpm>
 #include <Add.xpm>
 #include "Color.xpm"
@@ -44,9 +48,6 @@ void wxMaracasMultipleVolumeRendererPanel::createControls(vtkImageData* img){
        
        if(!isComplexBox)
        {
-               //wxString choices[2];
-               //choices[0] = wxString(_T("On"));
-               //choices[1] = wxString(_T("Off"));
                wxStaticText* label = new wxStaticText(this, -1, wxString(_T("")));     
                wxStaticText* label2 = new wxStaticText(this, -1, wxString(_T("")));
                checkbox = new  wxCheckBox(this,-1,wxString(_T("Show Actor")));
@@ -72,10 +73,6 @@ void wxMaracasMultipleVolumeRendererPanel::createControls(vtkImageData* img){
        Connect(_viewimage->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, (wxObjectEventFunction)&wxMaracasMultipleVolumeRendererPanel::onViewImage);                  
        sizerirmprop->Add(_viewimage,wxFIXED_MINSIZE);  
 
-       wxBitmap bitmap1(OpenImage_xpm);
-       wxBitmapButton* _openParameters = new wxBitmapButton(this, -1, bitmap1, wxDefaultPosition, wxSize(30,30));      
-       Connect(_openParameters->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, (wxObjectEventFunction)&wxMaracasMultipleVolumeRendererPanel::onOpenParameters);                        
-       sizerirmprop->Add(_openParameters,wxFIXED_MINSIZE);     
        //std::string iconsdir = wxMaracasMultipleVolumeRendererView::getInstance()->getPath();
        //iconsdir+="/data/Icons/Add.xmp";
        //wxBitmap* bitmap = new wxBitmap(wxString(iconsdir.c_str(),wxConvUTF8), wxBITMAP_TYPE_XPM);
@@ -175,8 +172,8 @@ void wxMaracasMultipleVolumeRendererPanel::updateVolume(){
 
        if(this->isComplexBox)
        {
-               ((wxMaracasRenderTabbedPanel*)(wxMaracasRendererView::getInstance())->getTabbedPanel())->SetValuesColorPointsFunction(this->_propid,greylevelcolors, red, green, blue);
-               ((wxMaracasRenderTabbedPanel*)(wxMaracasRendererView::getInstance())->getTabbedPanel())->SetValuesPointsFunction(this->_propid, greylevel, values);
+               ( (wxMaracasRendererView::getInstance())->getTabbedPanel(this->_propid) )->SetValuesColorPointsFunction(this->_propid,greylevelcolors, red, green, blue);
+               ( (wxMaracasRendererView::getInstance())->getTabbedPanel(this->_propid) )->SetValuesPointsFunction(this->_propid, greylevel, values);
        }
        else
        {       
@@ -199,17 +196,28 @@ void wxMaracasMultipleVolumeRendererPanel::onColorChange(wxCommandEvent& event){
 /**
 **
 **/
-void wxMaracasMultipleVolumeRendererPanel::onViewImage(wxCommandEvent& event){ 
-       
-}
-
-/**
-**
-**/
-void wxMaracasMultipleVolumeRendererPanel::onOpenParameters(wxCommandEvent& event){    
-       dialog = new wxMaracasRenderImageManagementPanel(this);
-       dialog->SetSize(400,580);
-       dialog->Show();
+void wxMaracasMultipleVolumeRendererPanel::onViewImage(wxCommandEvent& event)
+{      
+       printf("wxMaracasMultipleVolumeRendererPanel->onViewImage: Test View Image");
+       vtkImageData* img = (wxMaracasRendererView::getInstance())->getTabbedPanel(this->_propid)->getVolImage(_propid);
+       /*wxMaracasDialog_NViewers* dialog = new wxMaracasDialog_NViewers(this);
+
+       std::vector<int> type;
+       std::vector<int> point;
+
+       type.push_back(6);
+       dialog->SetImage(  );
+       dialog->SetType(type);
+
+       point.clear();
+       point.push_back((int)dialog->GetX());
+       point.push_back((int)dialog->GetY());
+       point.push_back((int)dialog->GetZ());
+
+       wxVtkBaseView *wvbv1 = dialog->GetwxVtkBaseView(1);
+       wxVtkBaseView *wvbv2 = dialog->GetwxVtkBaseView(2);
+       wxVtkBaseView *wvbv3 = dialog->GetwxVtkBaseView(3);
+       wxVtkBaseView *wvbv4 = dialog->GetwxVtkBaseView(4);*/
 }
 
 /**
@@ -217,11 +225,12 @@ void wxMaracasMultipleVolumeRendererPanel::onOpenParameters(wxCommandEvent& even
 **/
 void wxMaracasMultipleVolumeRendererPanel::onCheckBoxChange(wxCommandEvent& event){    
        if(this->isComplexBox)
-               ((wxMaracasRenderTabbedPanel*)(wxMaracasRendererView::getInstance())->getTabbedPanel())->addRemoveActorV(this->getPropId(), checkbox->GetValue());
+               ( (wxMaracasRendererView::getInstance())->getTabbedPanel(this->_propid) )->addRemoveActorV(this->getPropId(), checkbox->GetValue());
        else
                wxMaracasMultipleVolumeRendererView::getInstance()->addRemoveActor(this->getPropId(), checkbox->GetValue());    
 }
 
+
 /**
 ** Gets the propId
 **/