*** empty log message ***

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

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR3DView.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR3DView.cxx
index 806bc12d368a64d2f2f48778980cc104ce027fa1..cd40b5243bace01c74835373c4da0c036d54e1f2 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR3DView.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR3DView.cxx
@@ -64,7 +64,9 @@ void wxVtkMPR3DView::Configure(){
 
        _wxvtk3Dbaseview->Configure();
        _wxvtkmpr3DviewCntrlPanel->UpdateControlPanel();
-       _wxvtk3Dbaseview->GetRenderer()->Clear();               
+       
+//EED 27 Mai 2009 
+//     _wxvtk3Dbaseview->GetRenderer()->Clear();    
        
        // Actors are added to the renderer. 
        vtkActor* _outlineActor = _vtkmpr3Ddataviewer->GetOutlineActor();
@@ -181,6 +183,9 @@ void wxVtkMPR3DView::Configure(){
 //-------------------------------------------------------------------
 wxVtkMPR3DView::~wxVtkMPR3DView()
 {
+       VisiblePointWidget( false );
+       VisiblePlaneWidget( false );
+       
        if(_pointWidget!=NULL){
                _pointWidget->Delete();
        }
@@ -196,7 +201,9 @@ wxVtkMPR3DView::~wxVtkMPR3DView()
        }
 
 }
-
+void wxVtkMPR3DView::setColorTransferFunction(vtkColorTransferFunction* colortable){
+       GetVtkMPR3DDataViewer ()->setColorTransferFunction(colortable); 
+}
 //-------------------------------------------------------------------
 void wxVtkMPR3DView::Refresh()   // virtual
 {
@@ -239,9 +246,9 @@ void wxVtkMPR3DView::RefreshView()   // virtual
        _planeWidget->GetPolyData(_vtkplane);
 }
 //-------------------------------------------------------------------
-wxPanel* wxVtkMPR3DView::CreateControlPanel(wxWindow *parent)
+wxPanel* wxVtkMPR3DView::CreateControlPanel(wxWindow *parent, bool align)
 {
-       _wxvtkmpr3DviewCntrlPanel = new wxVtkMPR3DViewCntrlPanel(parent,this);
+       _wxvtkmpr3DviewCntrlPanel = new wxVtkMPR3DViewCntrlPanel(parent,this, align);
        return _wxvtkmpr3DviewCntrlPanel;
 }
 //-------------------------------------------------------------------
@@ -261,6 +268,14 @@ wxVtk3DBaseView* wxVtkMPR3DView::GetWxvtk3Dbaseview() throw (char*)
 
 //-------------------------------------------------------------------
 void wxVtkMPR3DView::VisibleImageActor(int idPosition, bool visible){
+       /*if(visible == false)
+               printf("CPR: wxVtkMPR3DView::VisibleImageActor-> visibleActor == false \n");
+       else
+       {
+               printf("CPR: wxVtkMPR3DView::VisibleImageActor-> visibleActor == true\n");
+               printf("CPR: wxVtkMPR3DView::VisibleImageActor-> idPosition == %d\n", idPosition);
+       }
+       */
        if (visible!=_vtkmpr3Ddataviewer->GetVisiblePosition(idPosition)){
                if (visible==false){
                        _wxvtk3Dbaseview->GetRenderer()->RemoveActor( _vtkmpr3Ddataviewer->GetImageActor(idPosition)  );        
@@ -297,6 +312,20 @@ void wxVtkMPR3DView::VisiblePlaneWidget( bool visible )
        }
 }
 
+//CPR: Method added 30 Nov 2009
+void wxVtkMPR3DView::showOutlineActor(bool value)
+{
+       vtkActor* _outlineActor = _vtkmpr3Ddataviewer->GetOutlineActor();
+       if(value == true)
+       {
+               _wxvtk3Dbaseview->GetRenderer()->AddActor( _outlineActor );     
+       }
+       else
+       {
+               _wxvtk3Dbaseview->GetRenderer()->RemoveActor( _outlineActor );  
+       }
+}
+
 //-------------------------------------------------------------------
 void wxVtkMPR3DView::SetVtkMPR3DDataViewer(vtkMPR3DDataViewer *vtkmpr3Ddataviewer)
 {
@@ -501,4 +530,5 @@ void wxVtkMPR3DView::TestLoic2()
   iren->Start();
 
 
-}
\ No newline at end of file
+}
+