+/*# ---------------------------------------------------------------------
+#
+# 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.
+# ------------------------------------------------------------------------ */
+
/*=========================================================================
Program: wxMaracas
Module: $RCSfile: wxMaracas_ViewerWidget.cxx,v $
Language: C++
- Date: $Date: 2009/12/01 21:22:12 $
- Version: $Revision: 1.21 $
+ Date: $Date: 2012/11/15 14:14:35 $
+ Version: $Revision: 1.38 $
Copyright: (c) 2002, 2003
License:
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+
+ This software is distributed WITHOUT ANY WARRANTY; without even
+ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE. See the above copyright notice for more information.
=========================================================================*/
// Definition includes
//------------------------------------------------------------------------------------------------------------
#include "wxMaracas_ViewerWidget.h"
-
+#include <wx/notebook.h>
//------------------------------------------------------------------------------------------------------------
// Other includes
//------------------------------------------------------------------------------------------------------------
-
-
//------------------------------------------------------------------------------------------------------------
// Constructors & Destructors
//------------------------------------------------------------------------------------------------------------
-
wxMaracas_ViewerWidget::wxMaracas_ViewerWidget(wxWindow *parent, vtkImageData* imagedata, int type, vtkMPRBaseData *vtkmprbasedata)
: wxPanel( parent, -1, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL)
{
- wxPanel *panel = this;
- wxWindow *wxwindow = NULL;
+ wxPanel *panel = this;
+ wxWindow *wxwindow = NULL;
+ wxWindow *window3D = NULL;
+ wxSplitterWindow *panelClipping3D = NULL;
+// wxPanel *panelControl = NULL;
+// wxFlexGridSizer *sizerCtrol = NULL;
+ wxPanel *controlPanelMPR3D = NULL;
+ wxPanel *controlPanelClippingSurf3D = NULL;
+ //RaC 03-2010 Adding a tab
+ wxPanel *controlPanelClippingVol3D = NULL;
+
+ wxBoxSizer *sizer = 0;
mType = type;
-
if (vtkmprbasedata==NULL)
{
- minternalVtkmprbasedata = true;
- mvtkmprbasedata = new vtkMPRBaseData();
- marImageData *marimagedata = new marImageData( imagedata );
+ minternalVtkmprbasedata = true;
+ mvtkmprbasedata = new vtkMPRBaseData();
+ marImageData *marimagedata = new marImageData( imagedata );
mvtkmprbasedata->SetMarImageData(marimagedata);
} else {
- minternalVtkmprbasedata = false;
- mvtkmprbasedata = vtkmprbasedata;
- }
-
-
- mvtk2Dbaseview = NULL;
- mvtkmpr2Dview_X = NULL;
- mvtkmpr2Dview_Y = NULL;
- mvtkmpr2Dview_Z = NULL;
- mvtkplane2Dview = NULL;
- mwidgetMesure = NULL;
- mwxsphereview = NULL;
- mwxvtkclipping3Dview = NULL;
- mwxvtk3Dbaseview_Clipping3D = NULL;
- mwxvtkmpr3Dview = NULL;
- vtkmpr3Ddataviewer = NULL;
-
+ minternalVtkmprbasedata = false;
+ mvtkmprbasedata = vtkmprbasedata;
+ }
+
+ mvtk2Dbaseview = NULL;
+ mvtkmpr2Dview_X = NULL;
+ mvtkmpr2Dview_Y = NULL;
+ mvtkmpr2Dview_Z = NULL;
+ mvtkplane2Dview = NULL;
+ mwidgetMesure = NULL;
+ mwxsphereview = NULL;
+ mwxvtkclipping3Dview = NULL;
+ mwxvtk3Dbaseview_Clipping3D = NULL;
+ mwxvtkmpr3Dview = NULL;
+ vtkmpr3Ddataviewer = NULL;
if (type==-1)
{
mvtk2Dbaseview = new wxVtk2DBaseView(panel);
mvtk2Dbaseview->SetVtkBaseData(mvtkmprbasedata);
- wxwindow = mvtk2Dbaseview->GetWxVTKRenderWindowInteractor();
- }
-
-
- if (type==0)
+ wxwindow = mvtk2Dbaseview->GetWxVTKRenderWindowInteractor();
+ }else if (type==0)
{
mvtkmpr2Dview_Z = new wxVtkMPR2DView(panel,2);
mvtkmpr2Dview_Z->SetVtkBaseData(mvtkmprbasedata);
- wxwindow = mvtkmpr2Dview_Z->GetWxVTKRenderWindowInteractor();
- }
- if (type==1)
+ wxwindow = mvtkmpr2Dview_Z->GetWxVTKRenderWindowInteractor();
+ }else if (type==1)
{
mvtkmpr2Dview_X = new wxVtkMPR2DView(panel,0);
mvtkmpr2Dview_X->SetVtkBaseData(mvtkmprbasedata);
- wxwindow = mvtkmpr2Dview_X->GetWxVTKRenderWindowInteractor();
- }
-
- if (type==2)
+ wxwindow = mvtkmpr2Dview_X->GetWxVTKRenderWindowInteractor();
+ }else if (type==2)
{
mvtkmpr2Dview_Y = new wxVtkMPR2DView(panel,1);
mvtkmpr2Dview_Y->SetVtkBaseData(mvtkmprbasedata);
- wxwindow = mvtkmpr2Dview_Y->GetWxVTKRenderWindowInteractor();
- }
-
-
- if (type==3)
+ wxwindow = mvtkmpr2Dview_Y->GetWxVTKRenderWindowInteractor();
+ }else if (type==3)
{
- mwidgetMesure = new wxWidgetMesure2D_Plane_in_MPR(panel);
- mvtkplane2Dview = new vtkPlane2DView( mwidgetMesure->GetWindow2());
+ mwidgetMesure = new wxWidgetMesure2D_Plane_in_MPR(panel);
+ mvtkplane2Dview = new vtkPlane2DView( mwidgetMesure->GetWindow2());
mwidgetMesure -> SetVtkPlane2DView( mvtkplane2Dview );
mvtkplane2Dview -> SetImgSize( 200 );
mvtkplane2Dview -> SetVtkBaseData(mvtkmprbasedata);
- wxwindow = mwidgetMesure;
- }
- if (type==4)
+ wxwindow = mwidgetMesure;
+ }else if (type==4)
{
- mwxsphereview = new wxSphereView( panel , mvtkmprbasedata, mvtkmprbasedata->GetImageData() );
+//EED
+// mwxsphereview = new wxSphereView( panel , mvtkmprbasedata , mvtkmprbasedata->GetImageData() );
+ mwxsphereview = new wxSphereView( panel , mvtkmprbasedata );
wxwindow=mwxsphereview->GetWxVTKRenderWindowInteractor();
- }
-
-
- if (type==5)
+ }else if (type==5)
{
- wxSplitterWindow *panelClipping3D = new wxSplitterWindow( panel , -1);
- mwxvtk3Dbaseview_Clipping3D = new wxVtk3DBaseView( panelClipping3D );
-
- mwxvtkclipping3Dview = new wxVtkClipping3DView(mwxvtk3Dbaseview_Clipping3D);
- vtkClipping3DDataViewer *vtkclipping3Ddataviewer = new vtkClipping3DDataViewer();
- vtkclipping3Ddataviewer->SetVtkMPRBaseData(mvtkmprbasedata);
+ panelClipping3D = new wxSplitterWindow( panel , -1);
+ mwxvtk3Dbaseview_Clipping3D = new wxVtk3DBaseView( panelClipping3D , vtkmprbasedata);
+ mwxvtkclipping3Dview = new wxVtkClipping3DView(mwxvtk3Dbaseview_Clipping3D);
+ vtkClipping3DDataViewer *vtkclipping3Ddataviewer= new vtkClipping3DDataViewer();
+ vtkclipping3Ddataviewer->SetVtkMPRBaseData(mvtkmprbasedata);
vtkclipping3Ddataviewer->Configure();
mwxvtkclipping3Dview->SetVtkClipping3DDataViewer(vtkclipping3Ddataviewer);
mwxvtkmpr3Dview = new wxVtkMPR3DView( mwxvtk3Dbaseview_Clipping3D );
- vtkMPR3DDataViewer *vtkmpr3Ddataviewer = new vtkMPR3DDataViewer();
+ vtkMPR3DDataViewer *vtkmpr3Ddataviewer = new vtkMPR3DDataViewer();
vtkmpr3Ddataviewer->SetVtkMPRBaseData(mvtkmprbasedata);
vtkmpr3Ddataviewer->Configure();
mwxvtkmpr3Dview->SetVtkMPR3DDataViewer(vtkmpr3Ddataviewer);
- wxWindow *window3D = mwxvtk3Dbaseview_Clipping3D->GetWxVTKRenderWindowInteractor();
+ window3D = mwxvtk3Dbaseview_Clipping3D->GetWxVTKRenderWindowInteractor();
+
+//--
+ wxNotebook *notebook = new wxNotebook(panelClipping3D, -1);
+
+ // First tab
+ controlPanelMPR3D = mwxvtkmpr3Dview->CreateControlPanel(notebook, true);
+ notebook->AddPage(controlPanelMPR3D, _T("Planes") );
+
+ // Second Tab
+ controlPanelClippingSurf3D = mwxvtkclipping3Dview->CreateSurfControlPanel(notebook);
+ notebook->AddPage(controlPanelClippingSurf3D, _T("Surface") );
+
+ //Third tab
+ //RaC 03-2010 Moving the volume functionnality to other tab. The changes were realized only in the wxVtkClipping3DViewCntrlPanel class
+ controlPanelClippingVol3D = mwxvtkclipping3Dview->CreateVolControlPanel(notebook);
+ notebook->AddPage(controlPanelClippingVol3D, _T("Volume") );
- wxPanel *panelControl = new wxPanel(panelClipping3D,-1);
- wxPanel *controlPanelMPR3D = mwxvtkmpr3Dview->CreateControlPanel(panelControl, false);
- wxPanel *controlPanelClipping3D = mwxvtkclipping3Dview->CreateControlPanel(panelControl);
+ panelClipping3D->SplitHorizontally( notebook , window3D , 10 );
+ //panelClipping3D->SetMinimumPaneSize( 15 );
+ panelClipping3D->SetMinimumPaneSize( 70 ); // JPR
+ //RaC Nov2012 Correctly resize internal panels with the window resize event
+ panelClipping3D->SetSashGravity(0.5);
+
+ /* EED 04 / Febrary / 2010
+ panelControl = new wxPanel(panelClipping3D,-1);
+ controlPanelMPR3D = mwxvtkmpr3Dview->CreateControlPanel(panelControl, false);
+ controlPanelClipping3D = mwxvtkclipping3Dview->CreateControlPanel(panelControl);
// mbtnCutImageData = new wxCheckBox(panelControl,-1,_T("Cut Module"));
// Connect(_btnCutImageData->GetId() , wxEVT_COMMAND_CHECKBOX_CLICKED , (wxObjectEventFunction) &wxMPRWidget::OnCutImagaData );
-
- wxFlexGridSizer *sizerCtrol = new wxFlexGridSizer(1);
- sizerCtrol->Add(controlPanelMPR3D , 1, wxALL|wxEXPAND, 2);
+ sizerCtrol = new wxFlexGridSizer(1);
+ sizerCtrol->Add(controlPanelMPR3D , 1, wxALL|wxEXPAND, 2);
sizerCtrol->Add(controlPanelClipping3D , 1, wxALL|wxEXPAND, 2);
- // sizerCtrol->Add( mbtnCutImageData , 1, wxALL, 2);
-
+ // sizerCtrol->Add( mbtnCutImageData , 1, wxALL, 2);
panelControl->SetAutoLayout(true);
panelControl->SetSizer(sizerCtrol);
panelControl->SetSize(400,350);
panelControl->Layout();
- panelClipping3D -> SetMinimumPaneSize( 5 );
panelClipping3D -> SplitHorizontally( panelControl , window3D , 10 );
+ panelClipping3D -> SetMinimumPaneSize( 5 );
+ */
wxwindow=panelClipping3D;
- }
-
- if (type==6)
- {
- wxSplitterWindow *panelClipping3D = new wxSplitterWindow( panel , -1);
- mwxvtk3Dbaseview_Clipping3D = new wxVtk3DBaseView( panelClipping3D );
- mwxvtkmpr3Dview = new wxVtkMPR3DView( mwxvtk3Dbaseview_Clipping3D );
-
-
- vtkmpr3Ddataviewer = new vtkMPR3DDataViewer();
-
-
-
- wxWindow *window3D = mwxvtk3Dbaseview_Clipping3D->GetWxVTKRenderWindowInteractor();
-
- wxPanel *panelControl = new wxPanel(panelClipping3D,-1);
- wxPanel *controlPanelMPR3D = mwxvtkmpr3Dview->CreateControlPanel(panelControl, false);
-
- wxFlexGridSizer *sizerCtrol = new wxFlexGridSizer(1);
- sizerCtrol->Add(controlPanelMPR3D , 1, wxALL|wxEXPAND, 2);
+ } else if (type==6) {
+ panelClipping3D = new wxSplitterWindow( panel , -1);
+ mwxvtk3Dbaseview_Clipping3D = new wxVtk3DBaseView( panelClipping3D , vtkmprbasedata);
+ mwxvtkmpr3Dview = new wxVtkMPR3DView( mwxvtk3Dbaseview_Clipping3D );
+ vtkmpr3Ddataviewer = new vtkMPR3DDataViewer();
+ wxWindow *window3D = mwxvtk3Dbaseview_Clipping3D->GetWxVTKRenderWindowInteractor();
+ wxPanel *panelControl = new wxPanel(panelClipping3D,-1);
+ wxPanel *controlPanelMPR3D = mwxvtkmpr3Dview->CreateControlPanel(panelControl, true);
+ wxFlexGridSizer *sizerCtrol = new wxFlexGridSizer(1);
+ sizerCtrol->Add(controlPanelMPR3D, 1, wxALL|wxEXPAND, 2);
panelControl->SetAutoLayout(true);
panelControl->SetSizer(sizerCtrol);
panelControl->SetSize(400,350);
panelControl->Layout();
- panelClipping3D -> SetMinimumPaneSize( 5 );
- panelClipping3D -> SplitHorizontally( panelControl , window3D , 10 );
+ //panelClipping3D->SetMinimumPaneSize( 5 );
+ panelClipping3D->SetMinimumPaneSize( 130 ); // FCY
+ panelClipping3D->SplitHorizontally( panelControl , window3D , 0 );
+ //panelClipping3D->SetSashSize(10);
+
+ //RaC Nov2012 Correctly resize internal panels with the window resize event
+ panelClipping3D->SetSashGravity(0.5);
+ panelClipping3D->UpdateSize(); //FCY
wxwindow=panelClipping3D;
-
- vtkmpr3Ddataviewer->SetVtkMPRBaseData(mvtkmprbasedata);
+ vtkmpr3Ddataviewer->SetVtkMPRBaseData(mvtkmprbasedata);
//vtkmpr3Ddataviewer->Configure();
mwxvtkmpr3Dview->SetVtkMPR3DDataViewer(vtkmpr3Ddataviewer);
-
- }
- if (type==7)
+ }else if (type==7)
{
- mwxvtk3Dbaseview_Clipping3D = new wxVtk3DBaseView( panel );
- wxWindow *window3D = mwxvtk3Dbaseview_Clipping3D->GetWxVTKRenderWindowInteractor();
- wxwindow=window3D;
-
-/*Borrame
- wxSplitterWindow *panelClipping3D = new wxSplitterWindow( panel , -1);
- mwxvtk3Dbaseview_Clipping3D = new wxVtk3DBaseView( panelClipping3D );
- wxWindow *window3D = mwxvtk3Dbaseview_Clipping3D->GetWxVTKRenderWindowInteractor();
- panelClipping3D ->SetMinimumPaneSize( 5 );
- panelClipping3D ->SplitHorizontally( new wxPanel(panelClipping3D,-1) , window3D , 10 );
- wxwindow=panelClipping3D;
-*/
-
-/*Borrame
- wxSplitterWindow *panelClipping3D = new wxSplitterWindow( panel , -1);
- mwxvtk3Dbaseview_Clipping3D = new wxVtk3DBaseView( panelClipping3D );
- mwxvtkmpr3Dview = new wxVtkMPR3DView( mwxvtk3Dbaseview_Clipping3D );
- vtkmpr3Ddataviewer = new vtkMPR3DDataViewer();
- wxWindow *window3D = mwxvtk3Dbaseview_Clipping3D->GetWxVTKRenderWindowInteractor();
- wxPanel *panelControl = new wxPanel(panelClipping3D,-1);
- wxPanel *controlPanelMPR3D = mwxvtkmpr3Dview->CreateControlPanel(panelControl);
- wxFlexGridSizer *sizerCtrol = new wxFlexGridSizer(1);
- sizerCtrol->Add(controlPanelMPR3D , 1, wxALL|wxEXPAND, 2);
- panelControl->SetAutoLayout(true);
- panelControl->SetSizer(sizerCtrol);
- panelControl->SetSize(400,350);
- panelControl->Layout();
- panelClipping3D -> SetMinimumPaneSize( 5 );
- panelClipping3D -> SplitHorizontally( panelControl , window3D , 10 );
- wxwindow=panelClipping3D;
- vtkmpr3Ddataviewer->SetVtkMPRBaseData(mvtkmprbasedata);
- //vtkmpr3Ddataviewer->Configure();
- mwxvtkmpr3Dview->SetVtkMPR3DDataViewer(vtkmpr3Ddataviewer);
-*/
+ mwxvtk3Dbaseview_Clipping3D = new wxVtk3DBaseView( panel ,vtkmprbasedata);
+ wxwindow = (wxWindow*) mwxvtk3Dbaseview_Clipping3D->GetWxVTKRenderWindowInteractor();
}
-
- wxBoxSizer *sizer = new wxBoxSizer(wxVERTICAL);
- sizer->Add( wxwindow , 1, wxGROW);
+ sizer = new wxBoxSizer(wxVERTICAL);
+ sizer->Add( wxwindow, 1, wxGROW);
panel->SetSizer(sizer);
panel->SetAutoLayout(true);
sizer->Layout();
// mbbtkViewerMaracas= NULL;
}
//-------------------------------------------------------------------------
-
+
wxMaracas_ViewerWidget::~wxMaracas_ViewerWidget()
{
-
if (minternalVtkmprbasedata==true)
{
- if (mvtkmprbasedata) { delete mvtkmprbasedata; }
- }
+ if (mvtkmprbasedata) { delete mvtkmprbasedata;}
+ }
- if (mvtk2Dbaseview) { delete mvtk2Dbaseview; }
- if (mvtkmpr2Dview_X) { delete mvtkmpr2Dview_X; }
- if (mvtkmpr2Dview_Y) { delete mvtkmpr2Dview_Y; }
- if (mvtkmpr2Dview_Z) { delete mvtkmpr2Dview_Z; }
- if (mwidgetMesure) { delete mwidgetMesure; }
- if (mvtkplane2Dview) { delete mvtkplane2Dview; }
- if (mwxsphereview) { delete mwxsphereview; }
- if (mwxvtkmpr3Dview) { delete mwxvtkmpr3Dview; }
- if (mwxvtkclipping3Dview) { delete mwxvtkclipping3Dview; }
+ if (mvtk2Dbaseview) { delete mvtk2Dbaseview; }
+ if (mvtkmpr2Dview_X) { delete mvtkmpr2Dview_X;}
+ if (mvtkmpr2Dview_Y) { delete mvtkmpr2Dview_Y;}
+ if (mvtkmpr2Dview_Z) { delete mvtkmpr2Dview_Z;}
+ if (mwidgetMesure) { delete mwidgetMesure; }
+ if (mvtkplane2Dview) { delete mvtkplane2Dview;}
+ if (mwxsphereview) { delete mwxsphereview; }
+ if (mwxvtkmpr3Dview) { delete mwxvtkmpr3Dview;}
+ if (mwxvtkclipping3Dview) { delete mwxvtkclipping3Dview;}
if (mwxvtk3Dbaseview_Clipping3D){ delete mwxvtk3Dbaseview_Clipping3D; mwxvtk3Dbaseview_Clipping3D=NULL;}
+ if (vtkmpr3Ddataviewer) { delete vtkmpr3Ddataviewer;}
}
//------------------------------------------------------------------------------------------------------------
// Methods
void wxMaracas_ViewerWidget::ConfigureVTK()
{
int x=0,y=0,z=0;
+ /*
int ext[6];
ext[0]=0;
ext[1]=0;
ext[3]=0;
ext[4]=0;
ext[5]=0;
- double org[3],spc[3];
+ */
+ int ext[] = {0, 0, 0, 0, 0, 0}; //JPR
+
+ /*double org[3],spc[3];
org[0]=0;
org[1]=0;
org[2]=0;
spc[0]=0;
spc[1]=0;
spc[2]=0;
-
-
-
+ */
+ double org[]={0.0, 0.0, 0.0}; //JPR
+ double spc[]={0.0, 0.0, 0.0}; //JPR
if (mvtkmprbasedata!=NULL)
{
mvtkmprbasedata->Configure();
- /*x = mvtkmprbasedata -> GetMaxPositionX()/2;
- y = mvtkmprbasedata -> GetMaxPositionY()/2;
- z = mvtkmprbasedata -> GetMaxPositionZ()/2; */
-
+
if(mvtkmprbasedata->GetImageData() != NULL)
{
mvtkmprbasedata->GetImageData()->GetExtent(ext);
mvtkmprbasedata->SetZ( 0 );
}
}
-
- if ( mvtk2Dbaseview !=NULL ) { mvtk2Dbaseview -> Configure(); }
- if ( mvtkmpr2Dview_X !=NULL ) { mvtkmpr2Dview_X -> Configure(); }
- if ( mvtkmpr2Dview_Y !=NULL ) { mvtkmpr2Dview_Y -> Configure(); }
- if ( mvtkmpr2Dview_Z !=NULL ) { mvtkmpr2Dview_Z -> Configure(); }
- if ( mvtkplane2Dview !=NULL ) { mvtkplane2Dview -> Configure(); }
- if ( mwidgetMesure !=NULL ) { mwidgetMesure -> ConfigureA(mvtkplane2Dview);}
- if ( mwidgetMesure !=NULL ) { mwidgetMesure -> ConfigureA(mvtkplane2Dview);}
- if ( mwidgetMesure !=NULL ) { mwidgetMesure -> SetActiveLink(true); }
- if ( mwidgetMesure !=NULL ) { mwidgetMesure -> SetMesureScale( 1 ); }
- if ( mwxsphereview !=NULL ) { mwxsphereview -> Configure(); }
-
- if (mwxvtk3Dbaseview_Clipping3D !=NULL) { mwxvtk3Dbaseview_Clipping3D -> Configure();
- }
+ if ( mvtk2Dbaseview !=NULL ) { mvtk2Dbaseview->Configure(); }
+ if ( mvtkmpr2Dview_X !=NULL ) { mvtkmpr2Dview_X->Configure(); }
+ if ( mvtkmpr2Dview_Y !=NULL ) { mvtkmpr2Dview_Y->Configure(); }
+ if ( mvtkmpr2Dview_Z !=NULL ) { mvtkmpr2Dview_Z->Configure(); }
+ if ( mvtkplane2Dview !=NULL ) { mvtkplane2Dview->Configure(); }
+ if ( mwidgetMesure !=NULL ) { mwidgetMesure->ConfigureA(mvtkplane2Dview); }
+ if ( mwidgetMesure !=NULL ) { mwidgetMesure->ConfigureA(mvtkplane2Dview); }
+ if ( mwidgetMesure !=NULL ) { mwidgetMesure->SetActiveLink(true); }
+ if ( mwidgetMesure !=NULL ) { mwidgetMesure->SetMesureScale( 1 ); }
+ if ( mwxsphereview !=NULL ) { mwxsphereview->Configure(); }
+
- if (vtkmpr3Ddataviewer !=NULL) {
+ if (mwxvtk3Dbaseview_Clipping3D !=NULL)
+ {
+ mwxvtk3Dbaseview_Clipping3D->Configure();
+ }
+
+ if (vtkmpr3Ddataviewer !=NULL)
+ {
vtkmpr3Ddataviewer->Configure();
-
+
}
- if (mwxvtkmpr3Dview !=NULL) {
-
- mwxvtkmpr3Dview -> Configure();
- mwxvtkmpr3Dview ->ResetCamera(ext,org,spc);
-
-
+
+ if (mwxvtkmpr3Dview !=NULL)
+ {
+ mwxvtkmpr3Dview->Configure();
+//EED??? mwxvtkmpr3Dview->ResetCamera(ext,org,spc);
}
- if (mwxvtkclipping3Dview !=NULL) { mwxvtkclipping3Dview -> Configure(); }
-
-
+ if (mwxvtkclipping3Dview !=NULL)
+ {
+ mwxvtkclipping3Dview->Configure();
+ }
-
//if(vtkmpr3Ddataviewer!=NULL){vtkmpr3Ddataviewer->Configure();}
// RefreshView();
}
- //-------------------------------------------------------------------------
-
- void wxMaracas_ViewerWidget::Refresh(bool eraseBackground ,const wxRect* rect ) // virtual eraseBackground=true , rect=NULL
- {
- wxPanel::Refresh(false);
- }
+//-------------------------------------------------------------------------
+void wxMaracas_ViewerWidget::Refresh(bool eraseBackground ,const wxRect* rect ) // virtual eraseBackground=true , rect=NULL
+{
+ wxPanel::Refresh(false);
+}
//-------------------------------------------------------------------------
void wxMaracas_ViewerWidget::RefreshView()
{
-
- if (mvtk2Dbaseview !=NULL ){ mvtk2Dbaseview -> Refresh(); }
- if (mvtkmpr2Dview_X !=NULL ){ mvtkmpr2Dview_X -> Refresh(); }
- if (mvtkmpr2Dview_Y !=NULL ){ mvtkmpr2Dview_Y -> Refresh(); }
- if (mvtkmpr2Dview_Z !=NULL ){ mvtkmpr2Dview_Z -> Refresh(); }
- if (mvtkplane2Dview !=NULL ){ mvtkplane2Dview -> Refresh(); }
- if (mwxsphereview !=NULL ){ mwxsphereview -> Refresh(); }
-
- if (mwxvtkmpr3Dview !=NULL ){ mwxvtkmpr3Dview -> RefreshView(); }
- if (mwxvtkclipping3Dview !=NULL ){ mwxvtkclipping3Dview -> Refresh(); }
- if (mwxvtk3Dbaseview_Clipping3D !=NULL ){ mwxvtk3Dbaseview_Clipping3D -> Refresh(); }
-
+ if (mwxvtk3Dbaseview_Clipping3D !=NULL ){ mwxvtk3Dbaseview_Clipping3D->Refresh(); }
+ if (mwxvtkclipping3Dview !=NULL ){ mwxvtkclipping3Dview->Refresh(); }
+ if (mwxvtkmpr3Dview !=NULL ){ mwxvtkmpr3Dview->RefreshView(); }
+ if (mvtk2Dbaseview !=NULL ){ mvtk2Dbaseview->Refresh(); }
+ if (mvtkmpr2Dview_X !=NULL ){ mvtkmpr2Dview_X->Refresh(); }
+ if (mvtkmpr2Dview_Y !=NULL ){ mvtkmpr2Dview_Y->Refresh(); }
+ if (mvtkmpr2Dview_Z !=NULL ){ mvtkmpr2Dview_Z->Refresh(); }
+ if (mvtkplane2Dview !=NULL ){ mvtkplane2Dview->Refresh(); }
+ if (mwxsphereview !=NULL ){ mwxsphereview ->RefreshView(); }
}
//-------------------------------------------------------------------------
wxVtkBaseView *wxMaracas_ViewerWidget::GetwxVtkBaseView()
{
wxVtkBaseView *wxvtkbaseview=NULL;
- if (mvtk2Dbaseview!=NULL) {
- wxvtkbaseview = mvtk2Dbaseview;
+ if (mvtk2Dbaseview!=NULL){
+ wxvtkbaseview = mvtk2Dbaseview;
}
- if (mvtkmpr2Dview_X!=NULL){
+ if (mvtkmpr2Dview_X!=NULL){
wxvtkbaseview = mvtkmpr2Dview_X;
}
- if (mvtkmpr2Dview_Y!=NULL){
+ if (mvtkmpr2Dview_Y!=NULL){
wxvtkbaseview = mvtkmpr2Dview_Y;
}
- if (mvtkmpr2Dview_Z!=NULL){
- wxvtkbaseview = mvtkmpr2Dview_Z;
+ if (mvtkmpr2Dview_Z!=NULL){
+ wxvtkbaseview = mvtkmpr2Dview_Z;
}
if (mvtkplane2Dview!=NULL){
- wxvtkbaseview = mvtkplane2Dview;
+ wxvtkbaseview = mvtkplane2Dview;
}
- if (mwxsphereview!=NULL){
+ if (mwxsphereview!=NULL){
wxvtkbaseview = mwxsphereview;
}
- if (mwxvtk3Dbaseview_Clipping3D!=NULL) {
+ if (mwxvtk3Dbaseview_Clipping3D!=NULL){
wxvtkbaseview = mwxvtk3Dbaseview_Clipping3D;
}
return wxvtkbaseview ;
}
- void wxMaracas_ViewerWidget::SetImage( vtkImageData *image )
+
+
+//-------------------------------------------------------------------------
+ void wxMaracas_ViewerWidget::SetImage( vtkImageData *image )
{
if(mvtkmprbasedata !=NULL)
{
mar->removeImageData(0);
mar->AddImageData(image);
}
-
+
+ if (mvtk2Dbaseview!=NULL)
+ {
+ mvtk2Dbaseview->SetImageToVtkViewer(image);
+ }
+
+ if (mvtkmpr2Dview_X!=NULL)
+ {
+ mvtkmpr2Dview_X->SetImageToVtkViewer(image);
+ }
+ if (mvtkmpr2Dview_Y!=NULL)
+ {
+ mvtkmpr2Dview_Y->SetImageToVtkViewer(image);
+ }
+ if (mvtkmpr2Dview_Z!=NULL)
+ {
+ mvtkmpr2Dview_Z->SetImageToVtkViewer(image);
+ }
+
+ if (mvtkplane2Dview!=NULL)
+ {
+ // ??? EED 10 oct 2012
+ }
+ if (mwxsphereview!=NULL)
+ {
+ mwxsphereview->SetImage();
+ }
+ if (mwxvtkclipping3Dview!=NULL)
+ {
+ mwxvtkclipping3Dview->GetVtkClipping3DDataViewer()->SetImage();
+ }
+
+ if (mwxvtkmpr3Dview!=NULL)
+ {
+ mwxvtkmpr3Dview->SetImage();
+ }
+
//EED 26/11/2009
// ConfigureVTK();
// RefreshView();
+
}
+ //-------------------------------------------------------------------------
+
double wxMaracas_ViewerWidget :: GetX()
{
double value = -1;
return value;
}
- double wxMaracas_ViewerWidget :: GetY()
+ //-------------------------------------------------------------------------
+
+ double wxMaracas_ViewerWidget::GetY()
{
double value = -1;
if(mvtkmprbasedata !=NULL)
return value;
}
- double wxMaracas_ViewerWidget :: GetZ()
+ //-------------------------------------------------------------------------
+
+ double wxMaracas_ViewerWidget::GetZ()
{
double value = -1;
if(mvtkmprbasedata !=NULL)
// return mvtk2Dbaseview->GetVtkBaseData()->GetZ();
}
- void wxMaracas_ViewerWidget::setColorTransferFunction(vtkColorTransferFunction* colortable){
- if(mvtkmpr2Dview_X!=NULL){
- mvtkmpr2Dview_X->setColorTransferFunction(colortable);
- }
- if(mvtkmpr2Dview_Y!=NULL){
- mvtkmpr2Dview_Y->setColorTransferFunction(colortable);
- }
- if(mvtkmpr2Dview_Z!=NULL){
- mvtkmpr2Dview_Z->setColorTransferFunction(colortable);
- }
- if(mwxvtkmpr3Dview!=NULL){
- mwxvtkmpr3Dview->setColorTransferFunction(colortable);
- }
+//-------------------------------------------------------------------------------------------
+void wxMaracas_ViewerWidget::setColorTransferFunction(vtkColorTransferFunction* colortable)
+{
+ if(mvtkmpr2Dview_X!=NULL)
+ {
+ mvtkmpr2Dview_X->setColorTransferFunction(colortable);
}
-
- void wxMaracas_ViewerWidget::setWindowLevel(double level){
- if(mvtkmpr2Dview_X!=NULL){
- mvtkmpr2Dview_X->setWindowLevel(level);
- }
- if(mvtkmpr2Dview_Y!=NULL){
- mvtkmpr2Dview_Y->setWindowLevel(level);
- }
- if(mvtkmpr2Dview_Z!=NULL){
- mvtkmpr2Dview_Z->setWindowLevel(level);
- }
- /*if(mwxvtkmpr3Dview!=NULL){
- mwxvtkmpr3Dview->setWindowLevel(level);
- }*/
+
+ if(mvtkmpr2Dview_Y!=NULL)
+ {
+ mvtkmpr2Dview_Y->setColorTransferFunction(colortable);
}
+
+ if(mvtkmpr2Dview_Z!=NULL)
+ {
+ mvtkmpr2Dview_Z->setColorTransferFunction(colortable);
+ }
+
+ if(mwxvtkmpr3Dview!=NULL)
+ {
+ mwxvtkmpr3Dview->setColorTransferFunction(colortable);
+ }
+}
+
+//-------------------------------------------------------------------------------------------
+void wxMaracas_ViewerWidget::SetColorWindowLevel(double colorWindow, double colorLevel)
+{
+ mvtkmprbasedata->SetColorWindow(colorWindow);
+ mvtkmprbasedata->SetColorLevel(colorLevel);
+//EED Borrame
+/*
+ RefreshView();
+ if(mvtk2Dbaseview!=NULL)
+ {
+ mvtk2Dbaseview->SetColorWindow(level);
+ }
+
+ if(mvtkmpr2Dview_X!=NULL)
+ {
+ mvtkmpr2Dview_X->SetColorWindow(level);
+ }
+
+ if(mvtkmpr2Dview_Y!=NULL)
+ {
+ mvtkmpr2Dview_Y->SetColorWindow(level);
+ }
+
+ if(mvtkmpr2Dview_Z!=NULL)
+ {
+ mvtkmpr2Dview_Z->SetColorWindow(level);
+ }
+
+ if(mwxvtkmpr3Dview!=NULL)
+ {
+ mwxvtkmpr3Dview->SetColorWindow(level);
+ }
+ */
+}
+
+
- void wxMaracas_ViewerWidget::setColorLevel(double level){
- if(mvtkmpr2Dview_X!=NULL){
- mvtkmpr2Dview_X->setColorLevel(level);
- }
- if(mvtkmpr2Dview_Y!=NULL){
- mvtkmpr2Dview_Y->setColorLevel(level);
- }
- if(mvtkmpr2Dview_Z!=NULL){
- mvtkmpr2Dview_Z->setColorLevel(level);
- }
- /*if(mwxvtkmpr3Dview!=NULL){
- mwxvtkmpr3Dview->setColorLevel(level);
- }*/
- }
-
git://git.creatis.insa-lyon.fr / creaMaracasVisu.git / blobdiff