X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxMaracas_ViewerWidget.cxx;h=bf749e6620b70d7eced6ca83f1921234ade995b7;hb=e2509516e281249369e6792239847216068556c4;hp=ec78d433541b2b3935eeb5d8c3a74d8c555bbeb3;hpb=07623a7a63de849c2b44e64cd80106da8567bbd5;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 ec78d43..bf749e6 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: 2010/04/15 17:54:04 $
-  Version:   $Revision: 1.25 $
+  Date:      $Date: 2010/04/29 16:05:34 $
+  Version:   $Revision: 1.28 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -24,7 +24,6 @@
 // Other includes
 //------------------------------------------------------------------------------------------------------------
 
-
 	//------------------------------------------------------------------------------------------------------------
 	// Constructors & Destructors
 	//------------------------------------------------------------------------------------------------------------
@@ -33,7 +32,7 @@
 		: wxPanel( parent, -1, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL)
 	{
 		wxPanel *panel = this;
-		wxWindow *wxwindow = NULL, *window3D	= 0;		
+		wxWindow *wxwindow = NULL, *window3D	= 0;
 		wxSplitterWindow	*panelClipping3D= 0;
 //		wxPanel	*panelControl			= 0;
 //		wxFlexGridSizer  *sizerCtrol		= 0;		
@@ -45,16 +44,16 @@
 		wxBoxSizer *sizer			= 0;
 
 		mType = type;
-		
+
 		if (vtkmprbasedata==NULL)
 		{
-			minternalVtkmprbasedata		= true;
-			mvtkmprbasedata			= new vtkMPRBaseData(); 
+			minternalVtkmprbasedata = true;
+			mvtkmprbasedata	        = new vtkMPRBaseData();
 			marImageData	*marimagedata	= new marImageData( imagedata );			
 			mvtkmprbasedata->SetMarImageData(marimagedata);
 		} else {
 			minternalVtkmprbasedata		= false;
-			mvtkmprbasedata			= vtkmprbasedata; 
+			mvtkmprbasedata			= vtkmprbasedata;
 		}
 
 		mvtk2Dbaseview			= NULL;
@@ -66,8 +65,8 @@
 		mwxsphereview			= NULL;
 		mwxvtkclipping3Dview		= NULL;
 		mwxvtk3Dbaseview_Clipping3D	= NULL;
-		mwxvtkmpr3Dview			= NULL;
-		vtkmpr3Ddataviewer		= NULL;
+		mwxvtkmpr3Dview			    = NULL;
+		vtkmpr3Ddataviewer		    = NULL;
 
 		if (type==-1)
 		{
@@ -120,7 +119,7 @@
 
 			window3D = mwxvtk3Dbaseview_Clipping3D->GetWxVTKRenderWindowInteractor();
 
-//--			
+//--
 			wxNotebook *notebook = new wxNotebook(panelClipping3D, -1);
 
 			// First tab
@@ -138,7 +137,7 @@
 
 			panelClipping3D->SplitHorizontally( notebook , window3D , 10  );
 			//panelClipping3D->SetMinimumPaneSize( 15 );
-			panelClipping3D->SetMinimumPaneSize( 35 ); // JPR
+			panelClipping3D->SetMinimumPaneSize( 70 ); // JPR 
 			
 	/*		EED 04 / Febrary / 2010
 			panelControl			= new wxPanel(panelClipping3D,-1);	
@@ -173,18 +172,18 @@
 			wxPanel	*controlPanelMPR3D = mwxvtkmpr3Dview->CreateControlPanel(panelControl, false);
 
 			wxFlexGridSizer  *sizerCtrol     = new wxFlexGridSizer(1);
-			sizerCtrol->Add(controlPanelMPR3D		, 1, wxALL|wxEXPAND, 2);
+			sizerCtrol->Add(controlPanelMPR3D, 1, wxALL|wxEXPAND, 2);
 
 			panelControl->SetAutoLayout(true);
 			panelControl->SetSizer(sizerCtrol);
 			panelControl->SetSize(400,350);
 			panelControl->Layout();
-			//panelClipping3D	-> SetMinimumPaneSize( 5 );
-			panelClipping3D->SetMinimumPaneSize( 35 );  // JPR
+			//panelClipping3D->SetMinimumPaneSize( 5 );
+			panelClipping3D->SetMinimumPaneSize( 100 );  // JPR
+
 			panelClipping3D->SplitHorizontally( panelControl , window3D , 10  );
 			wxwindow=panelClipping3D;
 
-
 			vtkmpr3Ddataviewer->SetVtkMPRBaseData(mvtkmprbasedata);			
 			//vtkmpr3Ddataviewer->Configure();
 
@@ -207,14 +206,14 @@
 	//   mbbtkViewerMaracas= NULL;
 	}
 	//-------------------------------------------------------------------------
-	  
+
 	wxMaracas_ViewerWidget::~wxMaracas_ViewerWidget()
 	{
 		if (minternalVtkmprbasedata==true)
 		{
 		   if (mvtkmprbasedata)         { delete mvtkmprbasedata;}
 		}	
-		
+
 		if (mvtk2Dbaseview)             { delete mvtk2Dbaseview; }
 		if (mvtkmpr2Dview_X)            { delete mvtkmpr2Dview_X;}
 		if (mvtkmpr2Dview_Y)            { delete mvtkmpr2Dview_Y;}
@@ -231,10 +230,11 @@
 	//------------------------------------------------------------------------------------------------------------
 
 	//-------------------------------------------------------------------------
-	
+
 	void wxMaracas_ViewerWidget::ConfigureVTK()
 	{
   		int x=0,y=0,z=0;
+		/*
 		int ext[6];
 		ext[0]=0;
 		ext[1]=0;
@@ -242,23 +242,28 @@
 		ext[3]=0;
 		ext[4]=0;
 		ext[5]=0;
-		double org[3],spc[3];
+		*/
+		int ext[] = {0, 0, 0, 0, 0, 0}; //JPR
+		
+		/*double org[3],spc[3];
 		org[0]=0;
 		org[1]=0;
 		org[2]=0;
 		spc[0]=0;
 		spc[1]=0;
 		spc[2]=0;
-		
+		*/
+		double org[]={0.0, 0.0, 0.0}; //JPR
+		double spc[]={0.0, 0.0, 0.0}; //JPR
 		if (mvtkmprbasedata!=NULL)
 		{
 			mvtkmprbasedata->Configure();
 			/*
-			x = mvtkmprbasedata	->	GetMaxPositionX()/2;
-			y = mvtkmprbasedata	->	GetMaxPositionY()/2;
-			z = mvtkmprbasedata	->	GetMaxPositionZ()/2;		
+			x = mvtkmprbasedata->GetMaxPositionX()/2;
+			y = mvtkmprbasedata->GetMaxPositionY()/2;
+			z = mvtkmprbasedata->GetMaxPositionZ()/2;		
 			*/	
-			
+
 			if(mvtkmprbasedata->GetImageData() != NULL)
 			{
 				mvtkmprbasedata->GetImageData()->GetExtent(ext);
@@ -281,22 +286,22 @@
 			}
 		}
 		
-		if ( mvtk2Dbaseview			!=NULL ) { mvtk2Dbaseview->Configure();			}
-		if ( mvtkmpr2Dview_X			!=NULL ) { mvtkmpr2Dview_X->Configure();		}
-		if ( mvtkmpr2Dview_Y			!=NULL ) { mvtkmpr2Dview_Y->Configure();		}
-		if ( mvtkmpr2Dview_Z			!=NULL ) { mvtkmpr2Dview_Z->Configure();		}
-		if ( mvtkplane2Dview			!=NULL ) { mvtkplane2Dview->Configure();		}
-		if ( mwidgetMesure			!=NULL ) { mwidgetMesure->ConfigureA(mvtkplane2Dview);  }
-		if ( mwidgetMesure			!=NULL ) { mwidgetMesure->ConfigureA(mvtkplane2Dview);  }
-		if ( mwidgetMesure			!=NULL ) { mwidgetMesure->SetActiveLink(true);		}
-		if ( mwidgetMesure			!=NULL ) { mwidgetMesure->SetMesureScale( 1 );		}
-		if ( mwxsphereview			!=NULL ) { mwxsphereview->Configure();			}
+		if ( mvtk2Dbaseview      !=NULL ) { mvtk2Dbaseview->Configure();                }
+		if ( mvtkmpr2Dview_X     !=NULL ) { mvtkmpr2Dview_X->Configure();               }
+		if ( mvtkmpr2Dview_Y     !=NULL ) { mvtkmpr2Dview_Y->Configure();               }
+		if ( mvtkmpr2Dview_Z     !=NULL ) { mvtkmpr2Dview_Z->Configure();               }
+		if ( mvtkplane2Dview     !=NULL ) { mvtkplane2Dview->Configure();               }
+		if ( mwidgetMesure       !=NULL ) { mwidgetMesure->ConfigureA(mvtkplane2Dview); }
+		if ( mwidgetMesure       !=NULL ) { mwidgetMesure->ConfigureA(mvtkplane2Dview); }
+		if ( mwidgetMesure       !=NULL ) { mwidgetMesure->SetActiveLink(true);         }
+		if ( mwidgetMesure       !=NULL ) { mwidgetMesure->SetMesureScale( 1 );         }
+		if ( mwxsphereview       !=NULL ) { mwxsphereview->Configure();                 }
 
 		if (mwxvtk3Dbaseview_Clipping3D	!=NULL)	{
 			mwxvtk3Dbaseview_Clipping3D->Configure();	
 			
 		}
-		
+
 		if (vtkmpr3Ddataviewer			!=NULL) { 			
 			vtkmpr3Ddataviewer->Configure();
 			
@@ -305,8 +310,7 @@
 			
 			mwxvtkmpr3Dview->Configure();
 			mwxvtkmpr3Dview->ResetCamera(ext,org,spc);
-			
-			
+
 		}
 
 		if (mwxvtkclipping3Dview		!=NULL)	{ mwxvtkclipping3Dview->Configure();	}
@@ -317,7 +321,6 @@
 		//if (mwxvtkmpr3Dview				!=NULL)	{
 		//	mwxvtkmpr3Dview->ResetCamera();
 		//}
-
 	}
 
 	//-------------------------------------------------------------------------
@@ -341,7 +344,6 @@
 			if (mwxvtkmpr3Dview		!=NULL ){ mwxvtkmpr3Dview->RefreshView();	}
 			if (mwxvtkclipping3Dview	!=NULL ){ mwxvtkclipping3Dview->Refresh();	}
 			if (mwxvtk3Dbaseview_Clipping3D !=NULL ){ mwxvtk3Dbaseview_Clipping3D->Refresh();}
-
 	}
 
 	//-------------------------------------------------------------------------