X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxVtkMPR3DViewCntrlPanel.cxx;h=68c7ee1b444a22f3bf7a5c7260d8de5654977cee;hb=0e9c6cea471e235717da5cac8b924254ed3f4f75;hp=11fb1977d857f61982ccb0ce426d7fa9fd0fbb9a;hpb=eb9b8072280bdbfe4bf4d747a28c98472b68451b;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR3DViewCntrlPanel.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR3DViewCntrlPanel.cxx
index 11fb197..68c7ee1 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR3DViewCntrlPanel.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR3DViewCntrlPanel.cxx
@@ -36,8 +36,8 @@ wxVtkMPR3DViewCntrlPanel::wxVtkMPR3DViewCntrlPanel(wxWindow *parent, wxVtkMPR3DV
 	_positionZ		= new wxSlider(panel,-1,maxZ/2,0,maxZ, wxDefaultPosition, wxSize(300,40), wxSL_HORIZONTAL | wxSL_LABELS);
 	wxButton		*btnColorTable  = new wxButton (panel, -1, _T("Color Table") );
 
-	_ckBoxXYZ		= new wxCheckBox(panel,-1,_T("XYZ                  "));
-	_ckBoxPlane		= new wxCheckBox(panel,-1,_T("Plane"));
+	_ckBoxXYZ		= new wxCheckBox(panel,-1,_T("Show XYZ axis         "));
+	_ckBoxPlane		= new wxCheckBox(panel,-1,_T("Show Planes"));
 
 	_ckFreePlaneX= new wxCheckBox(panel,-1,_T("free X"));;
 	_ckFreePlaneY= new wxCheckBox(panel,-1,_T("free Y"));;
@@ -62,16 +62,16 @@ wxVtkMPR3DViewCntrlPanel::wxVtkMPR3DViewCntrlPanel(wxWindow *parent, wxVtkMPR3DV
 	_positionY->SetSize(400,20);
 	_positionZ->SetSize(400,20);
 
-	Connect(ckBoxX->GetId()			, wxEVT_COMMAND_CHECKBOX_CLICKED	  , (wxObjectEventFunction) &wxVtkMPR3DViewCntrlPanel::OnVisibleAxisX	);
-	Connect(_positionX->GetId()		, wxEVT_COMMAND_SLIDER_UPDATED		  , (wxObjectEventFunction) &wxVtkMPR3DViewCntrlPanel::OnPositionX		);
-	Connect(ckBoxY->GetId()			, wxEVT_COMMAND_CHECKBOX_CLICKED 	  , (wxObjectEventFunction) &wxVtkMPR3DViewCntrlPanel::OnVisibleAxisY	);
-	Connect(_positionY->GetId()		, wxEVT_COMMAND_SLIDER_UPDATED		  , (wxObjectEventFunction) &wxVtkMPR3DViewCntrlPanel::OnPositionY		);
-	Connect(ckBoxZ->GetId()			, wxEVT_COMMAND_CHECKBOX_CLICKED	  , (wxObjectEventFunction) &wxVtkMPR3DViewCntrlPanel::OnVisibleAxisZ	);
-	Connect(_positionZ->GetId()		, wxEVT_COMMAND_SLIDER_UPDATED		  , (wxObjectEventFunction) &wxVtkMPR3DViewCntrlPanel::OnPositionZ		);
-	Connect(btnColorTable->GetId()	, wxEVT_COMMAND_BUTTON_CLICKED		  , (wxObjectEventFunction) &wxVtkMPR3DViewCntrlPanel::OnEditColorTable	);
+	Connect(ckBoxX->GetId(),        wxEVT_COMMAND_CHECKBOX_CLICKED, (wxObjectEventFunction) &wxVtkMPR3DViewCntrlPanel::OnVisibleAxisX	);
+	Connect(_positionX->GetId(),    wxEVT_COMMAND_SLIDER_UPDATED,   (wxObjectEventFunction) &wxVtkMPR3DViewCntrlPanel::OnPositionX		);
+	Connect(ckBoxY->GetId(),        wxEVT_COMMAND_CHECKBOX_CLICKED, (wxObjectEventFunction) &wxVtkMPR3DViewCntrlPanel::OnVisibleAxisY	);
+	Connect(_positionY->GetId(),    wxEVT_COMMAND_SLIDER_UPDATED,   (wxObjectEventFunction) &wxVtkMPR3DViewCntrlPanel::OnPositionY		);
+	Connect(ckBoxZ->GetId(),        wxEVT_COMMAND_CHECKBOX_CLICKED, (wxObjectEventFunction) &wxVtkMPR3DViewCntrlPanel::OnVisibleAxisZ	);
+	Connect(_positionZ->GetId(),    wxEVT_COMMAND_SLIDER_UPDATED,   (wxObjectEventFunction) &wxVtkMPR3DViewCntrlPanel::OnPositionZ		);
+	Connect(btnColorTable->GetId(), wxEVT_COMMAND_BUTTON_CLICKED,   (wxObjectEventFunction) &wxVtkMPR3DViewCntrlPanel::OnEditColorTable	);
 
-	Connect(_ckBoxXYZ->GetId()		, wxEVT_COMMAND_CHECKBOX_CLICKED	  , (wxObjectEventFunction) &wxVtkMPR3DViewCntrlPanel::OnVisibleAxisXYZ	);
-	Connect(_ckBoxPlane->GetId()	, wxEVT_COMMAND_CHECKBOX_CLICKED	  , (wxObjectEventFunction) &wxVtkMPR3DViewCntrlPanel::OnVisiblePlane	);
+	Connect(_ckBoxXYZ->GetId(),     wxEVT_COMMAND_CHECKBOX_CLICKED, (wxObjectEventFunction) &wxVtkMPR3DViewCntrlPanel::OnVisibleAxisXYZ	);
+	Connect(_ckBoxPlane->GetId(),   wxEVT_COMMAND_CHECKBOX_CLICKED, (wxObjectEventFunction) &wxVtkMPR3DViewCntrlPanel::OnVisiblePlane	);
 
 	Connect(_ckFreePlaneX->GetId()			, wxEVT_COMMAND_CHECKBOX_CLICKED	  , (wxObjectEventFunction) &wxVtkMPR3DViewCntrlPanel::OnVisibleFreePlaneX	);
 	Connect(_ckFreePlaneY->GetId()			, wxEVT_COMMAND_CHECKBOX_CLICKED	  , (wxObjectEventFunction) &wxVtkMPR3DViewCntrlPanel::OnVisibleFreePlaneY	);
@@ -204,8 +204,6 @@ void wxVtkMPR3DViewCntrlPanel::UpdateControlPanel()
 		int maxY = y1-y0;//basedata->GetMaxPositionY();
 		int maxZ = z1-z0;//basedata->GetMaxPositionZ();*/
 
-		
-
 		//std::cout<<"wxVtkMPR3DViewCntrlPanel::UpdateControlPanel() maxX="<<maxX<<" maxY="<<maxY<<" maxZ="<<maxZ<<std::endl;
 		/*_positionX->SetRange(0,maxX);
 		_positionY->SetRange(0,maxY);
@@ -560,4 +558,4 @@ void wxVtkMPR3DViewCntrlPanel::SetVisiblePlane(bool value)
 {
 	_ckBoxPlane->SetValue(value);
 	_wxvtkmpr3Dview->VisiblePlaneWidget(value);
-}
\ No newline at end of file
+}