X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxVtkMPR3DViewCntrlPanel.cxx;h=055a12f743c926fd1c5e0f34e248b79dc7fe518f;hb=241ec043d82df169705445f317b332207fd1b6b2;hp=04ebd6ce39f1485ff7293bd1dce9a942404419b9;hpb=d2fc2645728a4aea4f0aa0febfa1d7a894ab3ff1;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR3DViewCntrlPanel.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR3DViewCntrlPanel.cxx
index 04ebd6c..055a12f 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR3DViewCntrlPanel.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR3DViewCntrlPanel.cxx
@@ -73,20 +73,20 @@ wxVtkMPR3DViewCntrlPanel::wxVtkMPR3DViewCntrlPanel(wxWindow *parent, wxVtkMPR3DV
 		sizer	 = new wxFlexGridSizer(2);
 
 		sizerH4 = new wxFlexGridSizer(2);
-		sizerH4->Add( _positionX			,1,wxGROW					, 0 );
+		sizerH4->Add( _positionX			,1,wxGROW							, 0 );
 		sizerH4->Add( ckBoxX				,0,wxALIGN_CENTER_VERTICAL|wxSHAPED , 0 );
-		sizerH4->Add( _positionY			,1,wxGROW					, 0 );
+		sizerH4->Add( _positionY			,1,wxGROW							, 0 );
 		sizerH4->Add( ckBoxY				,0,wxALIGN_CENTER_VERTICAL|wxSHAPED	, 0 );
-		sizerH4->Add( _positionZ			,1,wxGROW					, 0 );
+		sizerH4->Add( _positionZ			,1,wxGROW							, 0 );
 		sizerH4->Add( ckBoxZ				,0,wxALIGN_CENTER_VERTICAL|wxSHAPED	, 0 );
 		
 		sizerH5 = new wxFlexGridSizer(1);
-		sizerH5->Add( new wxStaticText(panel, -1,_T("      "))			, 1, wxALL|wxEXPAND, 0);
-		sizerH5->Add( _ckBoxXYZ				,  1, wxALL|wxEXPAND, 0);
-		sizerH5->Add( new wxStaticText(panel, -1,_T("      "))			, 1, wxALL|wxEXPAND, 0);
-		sizerH5->Add( _ckBoxPlane			,  1, wxALL|wxEXPAND, 0);
-		sizerH5->Add( new wxStaticText(panel, -1,_T("      "))			, 1, wxALL|wxEXPAND, 0);
-		sizerH5->Add( btnColorTable								,0,wxALIGN_CENTER_VERTICAL|wxSHAPED	, 0 );
+		sizerH5->Add( new wxStaticText(panel, -1,_T("      "))	, 1, wxALL|wxEXPAND			, 0);
+		sizerH5->Add( _ckBoxXYZ									, 1, wxALL|wxEXPAND			, 0);
+		sizerH5->Add( new wxStaticText(panel, -1,_T("      "))	, 1, wxALL|wxEXPAND			, 0);
+		sizerH5->Add( _ckBoxPlane								, 1, wxALL|wxEXPAND			, 0);
+		sizerH5->Add( new wxStaticText(panel, -1,_T("      "))	, 1, wxALL|wxEXPAND			, 0);
+		sizerH5->Add( btnColorTable								, 0,wxALIGN_CENTER_VERTICAL|wxSHAPED, 0 );
 		//sizerH5->Add( new wxStaticText(panel, -1,_T("      "))			, 1, wxALL|wxEXPAND, 0);
 	}
 	else
@@ -96,17 +96,17 @@ wxVtkMPR3DViewCntrlPanel::wxVtkMPR3DViewCntrlPanel(wxWindow *parent, wxVtkMPR3DV
 		sizerH4 = new wxFlexGridSizer(10);
 		sizerH5 = new wxFlexGridSizer(10);
 
-		sizerH4->Add( _positionX			,1,wxGROW					, 0 );
-		sizerH4->Add( ckBoxX				,0,wxALIGN_CENTER_VERTICAL|wxSHAPED 	, 0 );
-		sizerH4->Add( _positionY			,1,wxGROW					, 0 );
-		sizerH4->Add( ckBoxY				,0,wxALIGN_CENTER_VERTICAL|wxSHAPED	, 0 );
-		sizerH4->Add( _positionZ			,1,wxGROW					, 0 );
-		sizerH4->Add( ckBoxZ				,0,wxALIGN_CENTER_VERTICAL|wxSHAPED	, 0 );
-		sizerH4->Add( btnColorTable			,0,wxALIGN_CENTER_VERTICAL|wxSHAPED	, 0 );
-
-		sizerH5->Add( _ckBoxXYZ				,  1, wxALL|wxEXPAND, 0);
-		sizerH5->Add( _ckBoxPlane			,  1, wxALL|wxEXPAND, 0);
-		sizerH5->Add( new wxStaticText(panel, -1,_T("      "))			, 1, wxALL|wxEXPAND, 0);
+		sizerH4->Add( _positionX	, 1, wxGROW							 , 0 );
+		sizerH4->Add( ckBoxX		, 0, wxALIGN_CENTER_VERTICAL|wxSHAPED, 0 );
+		sizerH4->Add( _positionY	, 1, wxGROW							 , 0 );
+		sizerH4->Add( ckBoxY		, 0, wxALIGN_CENTER_VERTICAL|wxSHAPED, 0 );
+		sizerH4->Add( _positionZ	, 1, wxGROW							 , 0 );
+		sizerH4->Add( ckBoxZ		, 0, wxALIGN_CENTER_VERTICAL|wxSHAPED, 0 );
+		sizerH4->Add( btnColorTable	, 0, wxALIGN_CENTER_VERTICAL|wxSHAPED, 0 );
+
+		sizerH5->Add( _ckBoxXYZ									, 1, wxALL|wxEXPAND, 0);
+		sizerH5->Add( _ckBoxPlane								, 1, wxALL|wxEXPAND, 0);
+		sizerH5->Add( new wxStaticText(panel, -1,_T("      "))	, 1, wxALL|wxEXPAND, 0);
 	}
 	
 
@@ -139,8 +139,8 @@ wxVtkMPR3DViewCntrlPanel::wxVtkMPR3DViewCntrlPanel(wxWindow *parent, wxVtkMPR3DV
 	//	sizerH5->Add( ckBoxY				,  1, wxALL|wxEXPAND, 0);
 	//	sizerH5->Add( ckBoxZ				,  1, wxALL|wxEXPAND, 0);
 
-	sizer->Add( sizerH4					,  1, wxALL|wxGROW, 2);
-	sizer->Add( sizerH5					,  1, wxALL|wxEXPAND, 2);
+	sizer->Add( sizerH4,  1, wxALL|wxGROW,	2);
+	sizer->Add( sizerH5,  1, wxALL|wxEXPAND,2);
 
 	panel->SetSize(400,50);
 	panel->SetAutoLayout(true);
@@ -150,7 +150,6 @@ wxVtkMPR3DViewCntrlPanel::wxVtkMPR3DViewCntrlPanel(wxWindow *parent, wxVtkMPR3DV
 	panel->SetEventHandler((wxEvtHandler*)this);
 
 	//this->UpdateControlPanel();
-
 }
 void wxVtkMPR3DViewCntrlPanel::UpdateControlPanel()
 {
@@ -247,7 +246,7 @@ void wxVtkMPR3DViewCntrlPanel::OnEditColorTable(wxCommandEvent& event)
 	HistogramDialog* hDlg=new HistogramDialog(NULL,_T("Color table"),imagedata,2);
 	
 		
-	hDlg->erasePointsTransferenceFunction();	
+	hDlg->erasePointsTransferenceFunction();		
 	int ctfSize=ctfunVectorRed->size();
 	if(ctfSize>0)
 	{
@@ -258,9 +257,10 @@ void wxVtkMPR3DViewCntrlPanel::OnEditColorTable(wxCommandEvent& event)
 				double gr	= (*ctfunVectorPoint)[i];
 				double r	= (*ctfunVectorRed)[i];
 				double g	= (*ctfunVectorGreen)[i];
-				double b	= (*ctfunVectorBlue)[i];
-			
+				double b	= (*ctfunVectorBlue)[i];			
+
 				hDlg->addColorPoint(gr,(int)(r*255),(int)(g*255),(int)(b*255));
+
 				i++;
 			}
 	}
@@ -353,7 +353,6 @@ void wxVtkMPR3DViewCntrlPanel::OnVisibleAxisX(wxCommandEvent& event)
 	}catch(char* e){
 		std::cout<<e<<std::endl;
 	}
-
 }
 //-------------------------------------------------------------------
 void wxVtkMPR3DViewCntrlPanel::OnVisibleAxisY(wxCommandEvent& event)
@@ -386,8 +385,8 @@ void wxVtkMPR3DViewCntrlPanel::OnVisibleAxisXYZ(wxCommandEvent& event)
 void wxVtkMPR3DViewCntrlPanel::OnVisiblePlane(wxCommandEvent& event)
 {
 	_wxvtkmpr3Dview->VisiblePlaneWidget(event.IsChecked());
-}
 
+}
 
 //-------------------------------------------------------------------
 void wxVtkMPR3DViewCntrlPanel::OnPositionX(wxScrollEvent& event)
@@ -431,4 +430,67 @@ bool wxVtkMPR3DViewCntrlPanel::GetVisibleY()
 bool wxVtkMPR3DViewCntrlPanel::GetVisibleZ()
 {
 	return ckBoxZ->GetValue();
+}
+
+//-------------------------------------------------------------------
+bool wxVtkMPR3DViewCntrlPanel::GetVisibleXYZ()
+{
+	return _ckBoxXYZ->GetValue();
+}
+
+//-------------------------------------------------------------------
+bool wxVtkMPR3DViewCntrlPanel::GetVisiblePlane()
+{
+	return _ckBoxPlane->GetValue();
+}
+
+//-------------------------------------------------------------------
+void wxVtkMPR3DViewCntrlPanel::SetVisibleX(bool value)
+{
+	ckBoxX->SetValue(value);
+	
+	_wxvtkmpr3Dview->VisibleImageActor(0, value );
+	_wxvtkmpr3Dview->Refresh();
+
+	wxCommandEvent newevent1(wxEVT_COMMAND_MENU_SELECTED,12121); // Refresh
+ 	_wxvtkmpr3Dview->GetWxvtk3Dbaseview()->GetWxVTKRenderWindowInteractor()->GetParent()->ProcessEvent(newevent1);
+}
+
+//-------------------------------------------------------------------
+void wxVtkMPR3DViewCntrlPanel::SetVisibleY(bool value)
+{
+	ckBoxY->SetValue(value);
+	
+	_wxvtkmpr3Dview->VisibleImageActor(1, value );
+	_wxvtkmpr3Dview->Refresh();
+
+	wxCommandEvent newevent1(wxEVT_COMMAND_MENU_SELECTED,12121); // Refresh
+ 	_wxvtkmpr3Dview->GetWxvtk3Dbaseview()->GetWxVTKRenderWindowInteractor()->GetParent()->ProcessEvent(newevent1);
+}
+
+//-------------------------------------------------------------------
+void wxVtkMPR3DViewCntrlPanel::SetVisibleZ(bool value)
+{
+	ckBoxZ->SetValue(value);
+
+	_wxvtkmpr3Dview->VisibleImageActor(2, value );
+	_wxvtkmpr3Dview->Refresh();
+
+	wxCommandEvent newevent1(wxEVT_COMMAND_MENU_SELECTED,12121); // Refresh
+ 	_wxvtkmpr3Dview->GetWxvtk3Dbaseview()->GetWxVTKRenderWindowInteractor()->GetParent()->ProcessEvent(newevent1);
+}
+
+//-------------------------------------------------------------------
+void wxVtkMPR3DViewCntrlPanel::SetVisibleXYZ(bool value)
+{
+	_ckBoxXYZ->SetValue(value);
+	_wxvtkmpr3Dview->VisiblePointWidget(value);
+
+}
+
+//-------------------------------------------------------------------
+void wxVtkMPR3DViewCntrlPanel::SetVisiblePlane(bool value)
+{
+	_ckBoxPlane->SetValue(value);
+	_wxvtkmpr3Dview->VisiblePlaneWidget(value);
 }
\ No newline at end of file