+/*# ---------------------------------------------------------------------
+#
+# 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 "wxMaracasRenderTabbedPanel.h"
#include "HistogramDialogComboBox.h"
#include "wxMaracasMultipleVolumeRendererPanel.h"
#include "wxMaracasSurfaceRenderingPanel.h"
#include "wxMaracasSurfaceRenderingProp3DMHD.h"
-#include "wxMaracasMultipleVolumeRendererManagerData.h"
+#include "volumerenderermanagerdata.h"
#include "wxMaracasDialog_NViewers.h"
#include "wxVtkMPR3DViewCntrlPanel.h"
#include <OpenImage.xpm>
#include "Color.xpm"
-#include "creaSystem.h"
-
+//#include "creaSystem.h"
+#include "creaWx.h"
+ BEGIN_EVENT_TABLE( wxMaracasRenderTabbedPanel, wxPanel )
+ EVT_MENU( 12121, wxMaracasRenderTabbedPanel::OnRefreshView )
+ //EVT_MENU( 12122, wxMaracasRenderTabbedPanel::OnDClickLeft )
+ END_EVENT_TABLE( );
/**
** Class constructor
**/
wxMaracasRenderTabbedPanel::wxMaracasRenderTabbedPanel(wxWindow* parent, int id, wxVtk3DBaseView* _baseView)
-: wxPanel(parent, -1, wxDefaultPosition, wxDefaultSize)
+ : wxPanel(parent, -1, wxDefaultPosition, wxDefaultSize)
{
_id = id;
baseView = _baseView;
dialog = NULL;
- volmanager = new wxMaracasMultipleVolumeRendererManager();
+ volmanager = new VolumeRendererManager();
surrendmanager1 = new wxMaracasSurfaceRenderingManager();
surrendmanager2 = new wxMaracasSurfaceRenderingManager();
surrendmanager3 = new wxMaracasSurfaceRenderingManager();
//wxMaracasRenderTabbedPanel::getInstance()->addRemoveActorSA(_propid, false);
//wxMaracasRenderTabbedPanel::getInstance()->addRemoveActorSB(_propid, false);
//wxMaracasRenderTabbedPanel::getInstance()->addRemoveActorSC(_propid, false);
- if( vtkmpr3Ddataviewer ) { delete vtkmpr3Ddataviewer; }
- if( mwxvtkmpr3Dview ) { delete mwxvtkmpr3Dview; }
+ addRemoveActorMPR(false);
+ if( vtkmpr3Ddataviewer ) { delete vtkmpr3Ddataviewer; }
+ if( mwxvtkmpr3Dview ) { delete mwxvtkmpr3Dview; }
this->deleteVolume(_id);
delete dialog;
- delete wxtabs;
+ delete wxtabs;
}
/**
//vtkImageData* img3 = surrendmanager3->getImageData(pathfile);
if(img!=NULL /*&& img1!=NULL && img2!=NULL && img3!=NULL*/)
{
- addVolume(img, filename);
+ addVolume(img, filename);
addSurface1(img, filename);
addSurface2(img, filename);
addSurface3(img, filename);
addMPROptions();
- volname = (wxString) filename;
+ volname = crea::std2wx(filename);
wxtabs->Refresh();
}
}
{
mwxvtkmpr3Dview ->SetVtkMPR3DDataViewer(vtkmpr3Ddataviewer);
mwxvtkmpr3Dview ->Configure();
- mwxvtkmpr3Dview ->ResetCamera(ext,org,spc);
+//EED 27/05/2013
+ mwxvtkmpr3Dview ->GetWxvtk3Dbaseview()->ResetCamera(ext ,spc);
+ vtkInteractorStyleBaseView* vtkInteractorBV = (vtkInteractorStyleBaseView*)mwxvtkmpr3Dview->GetWxvtk3Dbaseview()->GetInteractorStyleBaseView();
+ vtkInteractorBV->AddParentToReport(this);
}
int id = 4;
((wxVtkMPR3DViewCntrlPanel*)controlPanelMPR3D)->SetVisibleZ(true);
((wxVtkMPR3DViewCntrlPanel*)controlPanelMPR3D)->SetVisibleXYZ(true);
- mwxvtkmpr3Dview->showOutlineActor(true);
+ mwxvtkmpr3Dview->showOutlineBoxActor(true);
mwxvtkmpr3Dview->Refresh();
}
diag->ShowModal();
delete diag;
}
-}
+}
+
+void wxMaracasRenderTabbedPanel::addRemoveActorMPR(bool addremove)
+{
+ int id = 4;
+ wxtabs->SetSelection(id);
+ if(addremove)
+ {
+ wxtabs->GetPage(id)->Enable();
+ bool valueX = ((wxVtkMPR3DViewCntrlPanel*) controlPanelMPR3D)->GetVisibleX();
+ bool valueY = ((wxVtkMPR3DViewCntrlPanel*) controlPanelMPR3D)->GetVisibleY();
+ bool valueZ = ((wxVtkMPR3DViewCntrlPanel*) controlPanelMPR3D)->GetVisibleZ();
+ bool valueXYZ = ((wxVtkMPR3DViewCntrlPanel*) controlPanelMPR3D)->GetVisibleXYZ();
+ bool valuePlane = ((wxVtkMPR3DViewCntrlPanel*) controlPanelMPR3D)->GetVisiblePlane();
+ mwxvtkmpr3Dview->VisibleImageActor( 0, valueX );
+ mwxvtkmpr3Dview->VisibleImageActor( 1, valueY );
+ mwxvtkmpr3Dview->VisibleImageActor( 2, valueZ );
+ mwxvtkmpr3Dview->VisiblePointWidget(valueXYZ);
+ mwxvtkmpr3Dview->VisiblePlaneWidget(valuePlane);
+ mwxvtkmpr3Dview->showOutlineBoxActor(true);
+ mwxvtkmpr3Dview->Refresh();
+ } else {
+ wxtabs->GetPage(id)->Disable();
+ mwxvtkmpr3Dview->VisiblePointWidget(false);
+ mwxvtkmpr3Dview->VisiblePlaneWidget(false);
+ mwxvtkmpr3Dview->VisibleImageActor(0, false );
+ mwxvtkmpr3Dview->VisibleImageActor(1, false );
+ mwxvtkmpr3Dview->VisibleImageActor(2, false );
+ mwxvtkmpr3Dview->showOutlineBoxActor(false);
+ mwxvtkmpr3Dview->Refresh();
+ wxCommandEvent newevent1(wxEVT_COMMAND_MENU_SELECTED,12121); // Refresh
+//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+#if wxMAJOR_VERSION <= 2
+ mwxvtkmpr3Dview->GetWxvtk3Dbaseview()->GetWxVTKRenderWindowInteractor()->GetParent()->ProcessEvent(newevent1);
+#else
+ mwxvtkmpr3Dview->GetWxvtk3Dbaseview()->GetWxVTKRenderWindowInteractor()->GetParent()->ProcessWindowEvent(newevent1);
+#endif
+ } // if
+}
/**
if(checkboxSB->GetValue())
{
wxtabs->GetPage(id)->Enable();
- }
- else
- {
+ } else {
wxtabs->GetPage(id)->Disable();
- }
+ } // if checkboxSB
}
catch(char* str){
std::cout << "Exception : " << str << '\n';
**/
void wxMaracasRenderTabbedPanel::onMPROptions(wxCommandEvent& event)
{
+ addRemoveActorMPR(checkboxViewer->IsChecked());
+ /*
int id = 4;
wxtabs->SetSelection(id);
if(checkboxViewer->IsChecked())
{
+
wxtabs->GetPage(id)->Enable();
bool valueX = ((wxVtkMPR3DViewCntrlPanel*) controlPanelMPR3D)->GetVisibleX();
mwxvtkmpr3Dview->Refresh();
- wxCommandEvent newevent1(wxEVT_COMMAND_MENU_SELECTED,12121); // Refresh
- mwxvtkmpr3Dview->GetWxvtk3Dbaseview()->GetWxVTKRenderWindowInteractor()->GetParent()->ProcessEvent(newevent1);
}
else
wxCommandEvent newevent1(wxEVT_COMMAND_MENU_SELECTED,12121); // Refresh
mwxvtkmpr3Dview->GetWxvtk3Dbaseview()->GetWxVTKRenderWindowInteractor()->GetParent()->ProcessEvent(newevent1);
- }
+ }*/
+}
+
+
+void wxMaracasRenderTabbedPanel::OnRefreshView(wxCommandEvent & event)
+{
+ printf("CPR wxMaracasRenderTabbedPanel::OnRefreshView \n");
+ mwxvtkmpr3Dview->RefreshView();
+ wxCommandEvent newevent1(wxEVT_COMMAND_MENU_SELECTED,12121); // Refresh
+//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+#if wxMAJOR_VERSION <= 2
+ mwxvtkmpr3Dview->GetWxvtk3Dbaseview()->GetWxVTKRenderWindowInteractor()->GetParent()->ProcessEvent(newevent1);
+#else
+ mwxvtkmpr3Dview->GetWxvtk3Dbaseview()->GetWxVTKRenderWindowInteractor()->GetParent()->ProcessWindowEvent(newevent1);
+#endif
}
/**
type.push_back(0);
wxMaracasDialog_NViewers* dialog1 = new wxMaracasDialog_NViewers(this, img, &type, wxString(_T("Cut Module") ));
- dialog1->SetSize(800, 700);
+ //dialog1->SetSize(800, 700);
- std::string path = crea::System::GetDllAppPath("bbcreaMaracasVisu.dll");
+ /**std::string path = crea::System::GetDllAppPath("bbcreaMaracasVisu.dll");
cutter = CutModelMainPanel::getInstance(dialog1->getinternalPanel(), path);
cutter->setRenderer( dialog1->getViewer()->GetwxVtkBaseView(1)->GetRenderer() );
cutter->setInteractor( dialog1->getViewer()->GetwxVtkBaseView(1)->GetWxVTKRenderWindowInteractor() );
cutter->setImageData(getVolImage());
-
- dialog1->AddPanel(cutter);
+ **/
+ //dialog1->AddPanel(cutter);
dialog1->Show();
}
int wxMaracasRenderTabbedPanel::getPropIdV()
{
return _id;
-}
\ No newline at end of file
+}
git://git.creatis.insa-lyon.fr / creaMaracasVisu.git / blobdiff