Bug #1373

[creaMaracasVisu.git] / lib / maracasVisuLib / src / interface / wxWindows / widgets / wxMaracas_ViewerWidget.cxx

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_ViewerWidget.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_ViewerWidget.cxx
index a0ca639899ac8173d90700ba1658e3bd88ce469d..4097c98766638a93c54e87298517ac04ff012cbd 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_ViewerWidget.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_ViewerWidget.cxx
@@ -3,8 +3,8 @@
   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/14 07:30:52 $
+  Version:   $Revision: 1.37 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -259,11 +259,6 @@
                if (mvtkmprbasedata!=NULL)
                {
                        mvtkmprbasedata->Configure();
-                       /*
-                       x = mvtkmprbasedata->GetMaxPositionX()/2;
-                       y = mvtkmprbasedata->GetMaxPositionY()/2;
-                       z = mvtkmprbasedata->GetMaxPositionZ()/2;
-                       */
 
                        if(mvtkmprbasedata->GetImageData() != NULL)
                        {
@@ -330,12 +325,11 @@
 
        }
 
-       //-------------------------------------------------------------------------
-
-  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()
@@ -453,47 +447,64 @@
 //             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);
-               }*/
-    }