X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxMaracas_ViewerWidget.cxx;h=b8aac4632ca32d93ad410ede07033416673dbe5e;hb=88000c43d09de22761bb0ca9e19995e72dc2ebce;hp=c899c9ba9d0bda21dce1ae74ef02d52f9400452d;hpb=80b04dc9e3b981e24fe9ae0d81cdeb8af6e6f8c1;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 c899c9b..b8aac46 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_ViewerWidget.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_ViewerWidget.cxx
@@ -187,14 +187,14 @@
 			wxwindow=panelClipping3D;
 
 		} 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);
+			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);
@@ -360,15 +360,16 @@ void wxMaracas_ViewerWidget::Refresh(bool eraseBackground ,const wxRect* rect  )
 	//-------------------------------------------------------------------------
 	void wxMaracas_ViewerWidget::RefreshView()
 	{
-		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();			 }
+//printf("EED wxMaracas_ViewerWidget::RefreshView %p\n", this);
+		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					->RefreshView();	}
 	}
 
 	//-------------------------------------------------------------------------
@@ -445,14 +446,14 @@ void wxMaracas_ViewerWidget::SetImage( vtkImageData *image )
 	{
 		mwxsphereview->SetImage();
 	}
-	if (mwxvtkclipping3Dview!=NULL)
-	{
-		mwxvtkclipping3Dview->GetVtkClipping3DDataViewer()->SetImage();
-	}		
 	if (mwxvtkmpr3Dview!=NULL)
 	{
 		mwxvtkmpr3Dview->SetImage();
 	}
+	if (mwxvtkclipping3Dview!=NULL)
+	{
+		mwxvtkclipping3Dview->GetVtkClipping3DDataViewer()->SetImage();
+	}		
 		
 //EED 26/11/2009
 //		ConfigureVTK();
@@ -525,34 +526,6 @@ void wxMaracas_ViewerWidget::SetColorWindowLevel(double colorWindow, double colo
 {
 	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);
-	}
- */
 }