X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxMaracas_ViewerWidget.cxx;h=a0ca639899ac8173d90700ba1658e3bd88ce469d;hb=40dfa1616e1203ecccb8163e7722c76769eddfe3;hp=62d2fc75cca10a1575da22cc933ffb45f1d7a693;hpb=76e2ec73c0cbddf9c9d55af7e36bc2a6a67f6fb8;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_ViewerWidget.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_ViewerWidget.cxx
index 62d2fc7..a0ca639 100644
--- 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/05/30 17:23:12 $
-  Version:   $Revision: 1.35 $
+  Date:      $Date: 2012/10/11 10:45:16 $
+  Version:   $Revision: 1.36 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -313,7 +313,6 @@
 		if (mwxvtkmpr3Dview			!=NULL)
 		{
 			mwxvtkmpr3Dview->Configure();
-printf("EED wxMaracas_ViewerWidget::ConfigureVTK \n");			
 //EED???			mwxvtkmpr3Dview->ResetCamera(ext,org,spc);
 		}
 
@@ -341,16 +340,15 @@ printf("EED wxMaracas_ViewerWidget::ConfigureVTK \n");
 	//-------------------------------------------------------------------------
 	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 (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();	}
 	}
 
 	//-------------------------------------------------------------------------
@@ -391,6 +389,34 @@ printf("EED wxMaracas_ViewerWidget::ConfigureVTK \n");
 			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){
+			// ???  EED 10 oct 2012
+		}
+		if (mwxvtk3Dbaseview_Clipping3D!=NULL){
+			// ???  EED 10 oct 2012
+		}
+		
+		
+		
 //EED 26/11/2009
 //		ConfigureVTK();
 //		RefreshView();