X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxVtkClipping3DViewVolCntrlPanel.cxx;h=66cdf06b84307070764fbf05cb6e482b02686b90;hb=d725af03e25b41e03b212c26068be2c04dacd270;hp=f140661cb7aab57dbeacf71e42204165b583d6a9;hpb=e9163fc688996aa392f7211cf6e49d3962149246;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkClipping3DViewVolCntrlPanel.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkClipping3DViewVolCntrlPanel.cxx
index f140661..66cdf06 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkClipping3DViewVolCntrlPanel.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkClipping3DViewVolCntrlPanel.cxx
@@ -18,8 +18,8 @@ wxVtkClipping3DViewVolCntrlPanel::wxVtkClipping3DViewVolCntrlPanel(wxWindow *par
 	_wxvtkclipping3Dview	= wxvtkclipping3Dview;
 
 
-	wxCheckBox		*ckVolum		= new wxCheckBox(panel,-1,_T("Volume"));
-	wxCheckBox		*ckBoxVolume	= new wxCheckBox(panel,-1,_T("Volume Box"));
+	ckVolum		= new wxCheckBox(panel,-1,_T("Volume"));
+	ckBoxVolume	= new wxCheckBox(panel,-1,_T("Volume Box"));
 
 	ckBoxVolume->Disable();
 
@@ -30,6 +30,7 @@ wxVtkClipping3DViewVolCntrlPanel::wxVtkClipping3DViewVolCntrlPanel(wxWindow *par
     ckShade = new wxCheckBox(panel, -1, _T("Shade"));
 
     rbRayCasting->Disable();
+
     rbMIP->Disable();
     ckInterpolation->Disable();
     ckShade->Disable();
@@ -81,6 +82,11 @@ wxVtkClipping3DViewVolCntrlPanel::wxVtkClipping3DViewVolCntrlPanel(wxWindow *par
 
 	panel->SetEventHandler((wxEvtHandler*)this);
 
+	rbRayCasting->SetValue(true);
+
+//	_volumerendererdata = VolumeRendererData::New();
+//	_volumerendererdata->SetImageData(_wxvtkclipping3Dview->GetVtkClipping3DDataViewer()->GetVtkMPRBaseData()->GetImageData());
+
 }
 //-------------------------------------------------------------------
 wxVtkClipping3DViewVolCntrlPanel::~wxVtkClipping3DViewVolCntrlPanel()
@@ -94,24 +100,44 @@ void wxVtkClipping3DViewVolCntrlPanel::Refresh()
 //-------------------------------------------------------------------
 void wxVtkClipping3DViewVolCntrlPanel::OnVisibleVolume(wxCommandEvent& event)
 {
-    cout<<"JPRG::wxVtkClipping3DViewVolCntrlPanel::OnVisibleVolume::event_value::"<<event.IsChecked()<<endl;
-	_wxvtkclipping3Dview->VisibleVolumeActor( event.IsChecked()  );
-	if(event.IsChecked())
-	{
-	    rbRayCasting->Enable();
-        rbMIP->Enable();
-        ckInterpolation->Enable();
-        ckShade->Enable();
-	}
-	else
-	{
-        rbRayCasting->Disable();
-        rbMIP->Disable();
-        ckInterpolation->Disable();
-        ckShade->Disable();
-	}
+
+
+
+    if(event.IsChecked())
+    {
+        ckBoxVolume->Enable();
+    }
+    else{
+        ckBoxVolume->Disable();
+    }
+
+  //  _wxvtkclipping3Dview->GetWxvtk3Dbaseview()->GetRenderer()->RemoveAllViewProps();
+
+
+
+        _wxvtkclipping3Dview->VisibleVolumeActor( event.IsChecked()  );
+        if(event.IsChecked())
+        {
+            rbRayCasting->Enable();
+            rbMIP->Enable();
+            ckInterpolation->Enable();
+            ckShade->Enable();
+        }
+        else
+        {
+            rbRayCasting->Disable();
+            rbMIP->Disable();
+            ckInterpolation->Disable();
+            ckShade->Disable();
+            if(ckBoxVolume->IsChecked())
+            {
+               ckBoxVolume->SetValue(false);
+            }
+        }
+
 	_wxvtkclipping3Dview->Refresh();
 
+
 	wxCommandEvent newevent1(wxEVT_COMMAND_MENU_SELECTED,12121);  // Refresh
 	_wxvtkclipping3Dview->GetWxvtk3Dbaseview()->GetWxVTKRenderWindowInteractor()->GetParent()->ProcessEvent(newevent1);
 }
@@ -119,8 +145,32 @@ void wxVtkClipping3DViewVolCntrlPanel::OnVisibleVolume(wxCommandEvent& event)
 //-------------------------------------------------------------------
 void wxVtkClipping3DViewVolCntrlPanel::OnVisibleBoxVolume(wxCommandEvent& event)
 {
-	_wxvtkclipping3Dview->SetVisibleBoxVolume(event.IsChecked() );
-	_wxvtkclipping3Dview->Refresh();
+
+  //cout<<"JPRG::wxVtkClipping3DViewVolCntrlPanel::OnVisibleVolume::event_value::"<<event.IsChecked()<<endl;
+
+
+    if(event.IsChecked())
+    {
+           // rbRayCasting->Disable();
+           // rbMIP->Disable();
+            ckInterpolation->Disable();
+            ckShade->Disable();
+    }
+    else
+    {
+            //rbRayCasting->Enable();
+            //rbMIP->Enable();
+            ckInterpolation->Enable();
+            ckShade->Enable();
+
+    }
+
+    _wxvtkclipping3Dview->VisibleVolumeBoxActor(event.IsChecked());
+
+    _wxvtkclipping3Dview->Refresh();
+    wxCommandEvent newevent1(wxEVT_COMMAND_MENU_SELECTED,12121);  // Refresh
+    _wxvtkclipping3Dview->GetWxvtk3Dbaseview()->GetWxVTKRenderWindowInteractor()->GetParent()->ProcessEvent(newevent1);
+
 }
 
 //EED 22 Fevrier 2007
@@ -241,6 +291,15 @@ void wxVtkClipping3DViewVolCntrlPanel::OnBtnVolumeFunctions(wxCommandEvent& even
 			// Refreshing and sending the event
 			//---------------------------------
 			//_wxvtkclipping3Dview->GetVtkClipping3DDataViewer()->ReadVolumeFunctions();
+
+			//test
+
+
+         //   _volumerendererdata->OpacityChanged(*gtf, *itf);
+            _wxvtkclipping3Dview->UpdateVolumeBox(*gtf, *itf, ctfun);
+
+//test end
+
 			_wxvtkclipping3Dview->Refresh();
 			wxCommandEvent newevent1(wxEVT_COMMAND_MENU_SELECTED,12121);  // Refresh
 			_wxvtkclipping3Dview->GetWxvtk3Dbaseview()->GetWxVTKRenderWindowInteractor()->GetParent()->ProcessEvent(newevent1);
@@ -282,10 +341,12 @@ void wxVtkClipping3DViewVolCntrlPanel::OnBtnVolumeFunctions(wxCommandEvent& even
 			// Refreshing and sending the event
 			//---------------------------------
 			//_wxvtkclipping3Dview->GetVtkClipping3DDataViewer()->ReadVolumeFunctions();
-			_wxvtkclipping3Dview->Refresh();
+
 			wxCommandEvent newevent1(wxEVT_COMMAND_MENU_SELECTED,12121);  // Refresh
 			_wxvtkclipping3Dview->GetWxvtk3Dbaseview()->GetWxVTKRenderWindowInteractor()->GetParent()->ProcessEvent(newevent1);
 
+	     	_wxvtkclipping3Dview->Refresh();
+
 			/*
 			volumeMapper->Update();
 			newvol->Update();
@@ -294,6 +355,7 @@ void wxVtkClipping3DViewVolCntrlPanel::OnBtnVolumeFunctions(wxCommandEvent& even
 
 	}
 	//destroy the dialog
+
 	hDlg->Destroy();
 }
 
@@ -301,6 +363,10 @@ void    wxVtkClipping3DViewVolCntrlPanel::OnRayCastingActive(wxCommandEvent& eve
     //If Ray Casting is active, others options are disabled. Only RayCasting is true
     _wxvtkclipping3Dview->SetRayCasting(true);
     _wxvtkclipping3Dview->SetMIPActive(false);
+
+    wxCommandEvent newevent1(wxEVT_COMMAND_MENU_SELECTED,12121);  // Refresh
+
+    _wxvtkclipping3Dview->GetWxvtk3Dbaseview()->GetWxVTKRenderWindowInteractor()->GetParent()->ProcessEvent(newevent1);
     _wxvtkclipping3Dview->Refresh();
 }
 
@@ -309,6 +375,9 @@ void    wxVtkClipping3DViewVolCntrlPanel::OnMIPActive(wxCommandEvent& event){
     _wxvtkclipping3Dview->SetMIPActive(true);
     _wxvtkclipping3Dview->SetRayCasting(false);
 
+    wxCommandEvent newevent1(wxEVT_COMMAND_MENU_SELECTED,12121);  // Refresh
+    _wxvtkclipping3Dview->GetWxvtk3Dbaseview()->GetWxVTKRenderWindowInteractor()->GetParent()->ProcessEvent(newevent1);
+
     _wxvtkclipping3Dview->Refresh();
 }
 
@@ -316,11 +385,17 @@ void    wxVtkClipping3DViewVolCntrlPanel::OnMIPActive(wxCommandEvent& event){
 
 void    wxVtkClipping3DViewVolCntrlPanel::OnInterpolationActive(wxCommandEvent& event){
     _wxvtkclipping3Dview->SetInterpolation(event.IsChecked());
+
+    wxCommandEvent newevent1(wxEVT_COMMAND_MENU_SELECTED,12121);  // Refresh
+    _wxvtkclipping3Dview->GetWxvtk3Dbaseview()->GetWxVTKRenderWindowInteractor()->GetParent()->ProcessEvent(newevent1);
     _wxvtkclipping3Dview->Refresh();
 }
 
 void    wxVtkClipping3DViewVolCntrlPanel::OnShadeActive(wxCommandEvent& event){
     _wxvtkclipping3Dview->SetShade(event.IsChecked());
+
+    wxCommandEvent newevent1(wxEVT_COMMAND_MENU_SELECTED,12121);  // Refresh
+    _wxvtkclipping3Dview->GetWxvtk3Dbaseview()->GetWxVTKRenderWindowInteractor()->GetParent()->ProcessEvent(newevent1);
     _wxvtkclipping3Dview->Refresh();
 }