+/*# ---------------------------------------------------------------------
+#
+# 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: 2012/10/11 10:45:16 $
- Version: $Revision: 1.36 $
+ Date: $Date: 2012/11/15 14:14:35 $
+ Version: $Revision: 1.38 $
Copyright: (c) 2002, 2003
License:
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);
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;
if (mvtkmprbasedata!=NULL)
{
mvtkmprbasedata->Configure();
- /*
- x = mvtkmprbasedata->GetMaxPositionX()/2;
- y = mvtkmprbasedata->GetMaxPositionY()/2;
- z = mvtkmprbasedata->GetMaxPositionZ()/2;
- */
if(mvtkmprbasedata->GetImageData() != NULL)
{
}
- //-------------------------------------------------------------------------
-
- 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()
// 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