X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxMaracasMultipleVolumeRendererPanel.cxx;h=6ac3f72b6853aed0a6510976ccbad24758003699;hb=4dcdcabb81ce9f9e9b7ccdb86a64995d7b18ea23;hp=de919ee40e6742181ca7281caf722a56dc7ff41d;hpb=f70f07396065237d1d4fabea4e9524ad4d9c7d13;p=creaMaracasVisu.git diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererPanel.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererPanel.cxx index de919ee..6ac3f72 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererPanel.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererPanel.cxx @@ -1,40 +1,98 @@ +/*# --------------------------------------------------------------------- +# +# 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" #include -#include "wxMaracasMultipleVolumeRendererView.h" + +#include "vtkImageData.h" +#include "vtkRenderer.h" + +#include +#include #include "Color.xpm" +#include //#include /** ** Implementation of viewProp3D **/ -wxMaracasMultipleVolumeRendererPanel::wxMaracasMultipleVolumeRendererPanel(wxWindow* parent,int propid, vtkImageData* img) +/** +** Class constructor +**/ +wxMaracasMultipleVolumeRendererPanel::wxMaracasMultipleVolumeRendererPanel(wxWindow* parent,int propid, vtkImageData* img, bool _isComplexBox) : wxPanel(parent, -1, wxDefaultPosition, wxDefaultSize) { _propid = propid; + isComplexBox = _isComplexBox; createControls(img); } +/** +** Class destructor +**/ wxMaracasMultipleVolumeRendererPanel::~wxMaracasMultipleVolumeRendererPanel(){ - //wxMaracasIRMView::getInstance()->addRemoveActor(_propid, false); - wxMaracasMultipleVolumeRendererView::getInstance()->deleteVolume(_propid); + + //if(isComplexBox) + //((wxMaracasRenderTabbedPanel*)(wxMaracasRendererView::getInstance())->getTabbedPanel())->deleteVolume(_propid); + //else + //wxMaracasMultipleVolumeRendererView::getInstance()->deleteVolume(_propid); delete mwxwidget; } +/** +** Sets panel elements +**/ void wxMaracasMultipleVolumeRendererPanel::createControls(vtkImageData* img){ - wxFlexGridSizer* sizerirmprop = new wxFlexGridSizer(1,1,1); - - wxString choices[2]; - choices[0] = wxString(_T("On")); - choices[1] = wxString(_T("Off")); - checkbox = new wxCheckBox(this,-1,wxString(_T("Show Actor"))); - Connect(checkbox->GetId(), wxEVT_COMMAND_CHECKBOX_CLICKED, (wxObjectEventFunction)&wxMaracasMultipleVolumeRendererPanel::onCheckBoxChange); - checkbox->SetValue(true); - - sizerirmprop->Add(checkbox,wxFIXED_MINSIZE); + wxFlexGridSizer* sizerirmprop = new wxFlexGridSizer(3); + if(!isComplexBox) + { +// 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->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(_colorchoose->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, (wxObjectEventFunction)&wxMaracasMultipleVolumeRendererPanel::onColorChange); @@ -45,12 +103,18 @@ void wxMaracasMultipleVolumeRendererPanel::createControls(vtkImageData* img){ Connect(mwxwidget->GetId(), wxEVT_COMMAND_COMBOBOX_SELECTED, (wxObjectEventFunction)&wxMaracasMultipleVolumeRendererPanel::onColorChange); sizerirmprop->Add(mwxwidget,wxFIXED_MINSIZE); - + wxBitmap bitmap0(Add_xpm); + _viewimage = new wxBitmapButton(this, -1, bitmap0, wxDefaultPosition, wxSize(30,30)); + Connect(_viewimage->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, (wxObjectEventFunction)&wxMaracasMultipleVolumeRendererPanel::onViewImage); + sizerirmprop->Add(_viewimage,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); + this->SetSizer(sizerirmprop, true); this->SetAutoLayout( true ); - - //_frame = new wxFrame(this, 10, _T("Configure Transfer Functions")); /*wxButton* button1 = new wxButton(_frame,20,_T("OK")); @@ -60,9 +124,6 @@ void wxMaracasMultipleVolumeRendererPanel::createControls(vtkImageData* img){ wxButton* button3 = new wxButton(_frame,40,_T("Update")); Connect(button3->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, (wxObjectEventFunction)&wxMaracasMultipleVolumeRendererPanel::onUpdate); */ - - - /*mwxwidget->erasePointsTransferenceFunction(); double range[2]; img->GetScalarRange(range); @@ -106,16 +167,32 @@ void wxMaracasMultipleVolumeRendererPanel::createControls(vtkImageData* img){ // wxMaracasMultipleVolumeRendererView::getInstance()->GetColorFunction(getPropId())); mwxwidget->Refresh(); } + +/** +** +**/ void wxMaracasMultipleVolumeRendererPanel::onOK(wxCommandEvent& event){ updateVolume(); //_frame->Show(false); } + +/** +** +**/ void wxMaracasMultipleVolumeRendererPanel::onCancel(wxCommandEvent& event){ //_frame->Show(false); } + +/** +** +**/ void wxMaracasMultipleVolumeRendererPanel::onUpdate(wxCommandEvent& event){ updateVolume(); } + +/** +** +**/ void wxMaracasMultipleVolumeRendererPanel::updateVolume(){ std::vector greylevelcolors; std::vector red; @@ -128,11 +205,21 @@ void wxMaracasMultipleVolumeRendererPanel::updateVolume(){ mwxwidget->GetValuesColorPointsFunction(greylevelcolors, red, green, blue); mwxwidget->GetValuesPointsFunction(greylevel, values); - - wxMaracasMultipleVolumeRendererView::getInstance()->SetValuesColorPointsFunction(this->_propid, greylevelcolors, red, green, blue); - wxMaracasMultipleVolumeRendererView::getInstance()->SetValuesPointsFunction(this->_propid, greylevel, values); - + if(this->isComplexBox) + { + ( (wxMaracasRendererView::getInstance())->getTabbedPanel(this->_propid) )->SetValuesColorPointsFunction(this->_propid,greylevelcolors, red, green, blue); + ( (wxMaracasRendererView::getInstance())->getTabbedPanel(this->_propid) )->SetValuesPointsFunction(this->_propid, greylevel, values); + } + else + { + wxMaracasMultipleVolumeRendererView::getInstance()->SetValuesColorPointsFunction(this->_propid, greylevelcolors, red, green, blue); + wxMaracasMultipleVolumeRendererView::getInstance()->SetValuesPointsFunction(this->_propid, greylevel, values); + } } + +/** +** Updates the volume visualization +**/ void wxMaracasMultipleVolumeRendererPanel::onColorChange(wxCommandEvent& event){ //if(mwxwidget->ShowModal()==wxID_OK){ @@ -140,10 +227,60 @@ void wxMaracasMultipleVolumeRendererPanel::onColorChange(wxCommandEvent& event){ // mwxwidget->Show(false); //} } + +/** +** +**/ +void wxMaracasMultipleVolumeRendererPanel::onViewImage(wxCommandEvent& event) +{ + vtkImageData* img; + std::vector type; + type.push_back(6); + + 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){ - wxMaracasMultipleVolumeRendererView::getInstance()->addRemoveActor(this->getPropId(), checkbox->GetValue()); + if(this->isComplexBox) + ( (wxMaracasRendererView::getInstance())->getTabbedPanel(this->_propid) )->addRemoveActorV(this->getPropId(), checkbox->GetValue()); + else + wxMaracasMultipleVolumeRendererView::getInstance()->addRemoveActor(this->getPropId(), checkbox->GetValue()); } +/** +** Gets the propId +**/ int wxMaracasMultipleVolumeRendererPanel::getPropId(){ return _propid; -} \ No newline at end of file +} + +void wxMaracasMultipleVolumeRendererPanel::onRadioBoxSelectFunction(wxCommandEvent& event){ + + wxMaracasMultipleVolumeRendererView::getInstance()->changeCompositeMIPFunction(this->getPropId(), _radiobox->GetSelection()); +} + +/** +** Carolina Perez: Recently added method +**/ +HistogramDialogComboBox* wxMaracasMultipleVolumeRendererPanel::getMwxwidget() +{ + return mwxwidget; +} +