Bug Interaction color layer

[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 6c7d66f4d19db194a4bbc621b2c8a398b0fe122e..6ac3f72b6853aed0a6510976ccbad24758003699 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererPanel.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererPanel.cxx
@@ -1,5 +1,31 @@
+/*# ---------------------------------------------------------------------
+#
+# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+#                        pour la Sant�)
+# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+# Previous Authors : Laurent Guigues, Jean-Pierre Roux
+# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+#
+#  This software is governed by the CeCILL-B license under French law and
+#  abiding by the rules of distribution of free software. You can  use,
+#  modify and/ or redistribute the software under the terms of the CeCILL-B
+#  license as circulated by CEA, CNRS and INRIA at the following URL
+#  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+#  or in the file LICENSE.txt.
+#
+#  As a counterpart to the access to the source code and  rights to copy,
+#  modify and redistribute granted by the license, users are provided only
+#  with a limited warranty  and the software's author,  the holder of the
+#  economic rights,  and the successive licensors  have only  limited
+#  liability.
+#
+#  The fact that you are presently reading this means that you have had
+#  knowledge of the CeCILL-B license and that you accept its terms.
+# ------------------------------------------------------------------------ */
+
 #include "wxMaracasMultipleVolumeRendererPanel.h"
 #include "wxMaracasMultipleVolumeRendererView.h"
+#include "wxMaracas_N_ViewersWidget.h"
 #include "wxMaracasDialog_NViewers.h"
 #include "wxMaracasRendererView.h"
 
@@ -11,6 +37,7 @@
 #include <OpenImage.xpm>
 #include <Add.xpm>
 #include "Color.xpm"
+#include <vector>
 //#include <vtkImageCast.h>
 /**
 **     Implementation of viewProp3D
@@ -49,8 +76,8 @@ void wxMaracasMultipleVolumeRendererPanel::createControls(vtkImageData* img){
        
        if(!isComplexBox)
        {
-               wxStaticText* label = new wxStaticText(this, -1, wxString(_T("")));     
-               wxStaticText* label2 = new wxStaticText(this, -1, wxString(_T("")));
+//             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")));
@@ -207,18 +234,24 @@ void wxMaracasMultipleVolumeRendererPanel::onColorChange(wxCommandEvent& event){
 void wxMaracasMultipleVolumeRendererPanel::onViewImage(wxCommandEvent& event)
 {      
        vtkImageData* img;
-       if(this->isComplexBox){
-               img = (wxMaracasRendererView::getInstance())->getTabbedPanel(_propid)->getVolImage();   
-               std::vector<int> type;
-               type.push_back(6);
+       std::vector<int> type;
+       type.push_back(6);
+
+       wxFrame* frame = new wxFrame(this, -1, wxString(_T("Volume Visualization")));
+       frame->SetSize(wxDefaultSize);
 
-               wxMaracasDialog_NViewers* dialog1 = new wxMaracasDialog_NViewers(this, img, &type, wxString(_T("Volume Visualization") ));
-               dialog1->SetSize(wxDefaultSize);
-               dialog1->Show();
+       if(this->isComplexBox)
+       {
+               img = (wxMaracasRendererView::getInstance())->getTabbedPanel(_propid)->getVolImage();   
        }
-       else{   
-               //vtkImageData* img = wxMaracasMultipleVolumeRendererView::getInstance()->getVolImage();
+       else
+       {       
+               img = wxMaracasMultipleVolumeRendererView::getInstance()->getVolumeRenderManager()->getImageData();
        }
+
+       //      wxMaracas_N_ViewersWidget* viewer = new wxMaracas_N_ViewersWidget(frame, img, &type);
+       new wxMaracas_N_ViewersWidget(frame, img, &type);
+       frame->Show();
 }
 
 /**