-#include "wxMaracasMultipleVolumeRendererPanel.h"
+/*# ---------------------------------------------------------------------
+#
+# 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 <wx/colordlg.h>
+#include "wxMaracasMultipleVolumeRendererPanel.h"
#include "wxMaracasMultipleVolumeRendererView.h"
+#include "wxMaracas_N_ViewersWidget.h"
+#include "wxMaracasDialog_NViewers.h"
#include "wxMaracasRendererView.h"
+
+#include <wx/colordlg.h>
+
+#include "vtkImageData.h"
+#include "vtkRenderer.h"
+
#include <OpenImage.xpm>
#include <Add.xpm>
#include "Color.xpm"
+#include <vector>
//#include <vtkImageCast.h>
/**
** Implementation of viewProp3D
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("")));
+// 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")));
Connect(checkbox->GetId(), wxEVT_COMMAND_CHECKBOX_CLICKED, (wxObjectEventFunction)&wxMaracasMultipleVolumeRendererPanel::onCheckBoxChange);
checkbox->SetValue(true);
+ wxString choices[] = {_T("Composite"), _T("MIP")};
+ _radiobox = new wxRadioBox(this, -1, wxString(_T("Function")), wxDefaultPosition, wxDefaultSize, 2, choices);
+ Connect(_radiobox->GetId(), wxEVT_COMMAND_RADIOBOX_SELECTED, (wxObjectEventFunction)&wxMaracasMultipleVolumeRendererPanel::onRadioBoxSelectFunction);
+
sizerirmprop->Add(checkbox,wxFIXED_MINSIZE);
- sizerirmprop->Add(label,wxFIXED_MINSIZE);
- sizerirmprop->Add(label2,wxFIXED_MINSIZE);
+ sizerirmprop->AddSpacer(5);
+ sizerirmprop->Add(_radiobox,wxFIXED_MINSIZE);
+ //sizerirmprop->Add(label2,wxFIXED_MINSIZE);
}
//wxBitmap bitmap(Color_xpm);
//_colorchoose = new wxBitmapButton(this, -1, bitmap,wxDefaultPosition,wxSize(30,30));
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);
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
{
/**
**
**/
-void wxMaracasMultipleVolumeRendererPanel::onViewImage(wxCommandEvent& event){
-
-}
+void wxMaracasMultipleVolumeRendererPanel::onViewImage(wxCommandEvent& event)
+{
+ vtkImageData* img;
+ std::vector<int> type;
+ type.push_back(6);
-/**
-**
-**/
-void wxMaracasMultipleVolumeRendererPanel::onOpenParameters(wxCommandEvent& event){
- dialog = new wxMaracasRenderImageManagementPanel(this);
- dialog->SetSize(400,580);
- dialog->Show();
+ wxFrame* frame = new wxFrame(this, -1, wxString(_T("Volume Visualization")));
+ frame->SetSize(wxDefaultSize);
+
+ if(this->isComplexBox)
+ {
+ img = (wxMaracasRendererView::getInstance())->getTabbedPanel(_propid)->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();
}
/**
**/
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());
}
return _propid;
}
+void wxMaracasMultipleVolumeRendererPanel::onRadioBoxSelectFunction(wxCommandEvent& event){
+
+ wxMaracasMultipleVolumeRendererView::getInstance()->changeCompositeMIPFunction(this->getPropId(), _radiobox->GetSelection());
+}
+
/**
** Carolina Perez: Recently added method
**/
HistogramDialogComboBox* wxMaracasMultipleVolumeRendererPanel::getMwxwidget()
{
return mwxwidget;
-}
\ No newline at end of file
+}
+
git://git.creatis.insa-lyon.fr / creaMaracasVisu.git / blobdiff