X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxMaracasRenderTabbedPanel.cpp;h=fd6463b8b8b17a90615aac22737a93ad95912d55;hb=d8edef346f2d6c64f6ed3bea7225aeb3a8b3970c;hp=0889c620d6cf25bffe46d5c32cf6bb588f43e5f6;hpb=241ec043d82df169705445f317b332207fd1b6b2;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.cpp
index 0889c62..fd6463b 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.cpp
@@ -14,22 +14,26 @@
 #include <OpenImage.xpm>
 
 #include "Color.xpm"
-#include "creaSystem.h"
-
+//#include "creaSystem.h"
 
+#include "creaWx.h"
 
+	BEGIN_EVENT_TABLE( wxMaracasRenderTabbedPanel, wxPanel )
+		EVT_MENU( 12121, wxMaracasRenderTabbedPanel::OnRefreshView )
+		//EVT_MENU( 12122, wxMaracasRenderTabbedPanel::OnDClickLeft  )
+	END_EVENT_TABLE( );
 
 /**
 ** Class constructor
 **/
 wxMaracasRenderTabbedPanel::wxMaracasRenderTabbedPanel(wxWindow* parent, int id, wxVtk3DBaseView* _baseView)
-: wxPanel(parent, -1, wxDefaultPosition, wxDefaultSize)
+  : wxPanel(parent, -1, wxDefaultPosition, wxDefaultSize)
 {
 	_id = id;
 	baseView = _baseView;
 	dialog = NULL;
 
-	volmanager = new wxMaracasMultipleVolumeRendererManager();
+	volmanager =      new wxMaracasMultipleVolumeRendererManager();
 	surrendmanager1 = new wxMaracasSurfaceRenderingManager();
 	surrendmanager2 = new wxMaracasSurfaceRenderingManager();
 	surrendmanager3 = new wxMaracasSurfaceRenderingManager();
@@ -44,12 +48,13 @@ wxMaracasRenderTabbedPanel::~wxMaracasRenderTabbedPanel()
 	//wxMaracasRenderTabbedPanel::getInstance()->addRemoveActorSA(_propid, false);
 	//wxMaracasRenderTabbedPanel::getInstance()->addRemoveActorSB(_propid, false);
 	//wxMaracasRenderTabbedPanel::getInstance()->addRemoveActorSC(_propid, false);
-	if( vtkmpr3Ddataviewer	)	{ delete vtkmpr3Ddataviewer;	}
-	if( mwxvtkmpr3Dview		)	{ delete mwxvtkmpr3Dview;		}
+	addRemoveActorMPR(false);
+	if( vtkmpr3Ddataviewer	)   { delete vtkmpr3Ddataviewer; }
+	if( mwxvtkmpr3Dview	)   { delete mwxvtkmpr3Dview;    }
 
 	this->deleteVolume(_id);
 	delete dialog;
-	delete wxtabs;	
+	delete wxtabs;
 }
 
 /**
@@ -106,12 +111,12 @@ void wxMaracasRenderTabbedPanel::createControls(vtkImageData* inImg, std::string
 		//vtkImageData* img3 = surrendmanager3->getImageData(pathfile);
 		if(img!=NULL /*&& img1!=NULL && img2!=NULL && img3!=NULL*/)
 		{
-			addVolume(img, filename);
+			addVolume(img,   filename);
 			addSurface1(img, filename);
 			addSurface2(img, filename);
 			addSurface3(img, filename);	
 			addMPROptions();
-			volname = (wxString) filename;
+			volname = crea::std2wx(filename);
 			wxtabs->Refresh();
 		}
 	}	
@@ -343,6 +348,8 @@ void wxMaracasRenderTabbedPanel::addMPROptions()
 		mwxvtkmpr3Dview		->SetVtkMPR3DDataViewer(vtkmpr3Ddataviewer);		
 		mwxvtkmpr3Dview		->Configure();
 		mwxvtkmpr3Dview		->ResetCamera(ext,org,spc);
+		vtkInteractorStyleBaseView* vtkInteractorBV = (vtkInteractorStyleBaseView*)mwxvtkmpr3Dview->GetWxvtk3Dbaseview()->GetInteractorStyleBaseView();
+		vtkInteractorBV->AddParentToReport(this);
 	}
 
 	int id = 4;
@@ -441,7 +448,49 @@ void wxMaracasRenderTabbedPanel::addRemoveActorSC(int id, bool addremove)
 		diag->ShowModal();
 		delete diag;
 	}
-}	
+}
+
+void wxMaracasRenderTabbedPanel::addRemoveActorMPR(bool addremove)
+{
+	int id = 4;
+	wxtabs->SetSelection(id);
+	if(addremove)
+	{
+		wxtabs->GetPage(id)->Enable();
+
+		bool valueX = ((wxVtkMPR3DViewCntrlPanel*) controlPanelMPR3D)->GetVisibleX();
+		bool valueY = ((wxVtkMPR3DViewCntrlPanel*) controlPanelMPR3D)->GetVisibleY();
+		bool valueZ = ((wxVtkMPR3DViewCntrlPanel*) controlPanelMPR3D)->GetVisibleZ();
+		bool valueXYZ = ((wxVtkMPR3DViewCntrlPanel*) controlPanelMPR3D)->GetVisibleXYZ();
+		bool valuePlane = ((wxVtkMPR3DViewCntrlPanel*) controlPanelMPR3D)->GetVisiblePlane();
+
+		mwxvtkmpr3Dview->VisibleImageActor( 0, valueX );
+		mwxvtkmpr3Dview->VisibleImageActor( 1, valueY );
+		mwxvtkmpr3Dview->VisibleImageActor( 2, valueZ );
+		mwxvtkmpr3Dview->VisiblePointWidget(valueXYZ);
+		mwxvtkmpr3Dview->VisiblePlaneWidget(valuePlane);
+		mwxvtkmpr3Dview->showOutlineActor(true);
+		
+		mwxvtkmpr3Dview->Refresh();
+
+
+	}
+	else
+	{
+		wxtabs->GetPage(id)->Disable();
+
+		mwxvtkmpr3Dview->VisiblePointWidget(false);
+		mwxvtkmpr3Dview->VisiblePlaneWidget(false);
+		mwxvtkmpr3Dview->VisibleImageActor(0, false );
+		mwxvtkmpr3Dview->VisibleImageActor(1, false );
+		mwxvtkmpr3Dview->VisibleImageActor(2, false );
+		mwxvtkmpr3Dview->showOutlineActor(false);
+		mwxvtkmpr3Dview->Refresh();
+
+		wxCommandEvent newevent1(wxEVT_COMMAND_MENU_SELECTED,12121);  // Refresh
+ 		mwxvtkmpr3Dview->GetWxvtk3Dbaseview()->GetWxVTKRenderWindowInteractor()->GetParent()->ProcessEvent(newevent1);
+	}
+}
 
 
 /**
@@ -705,10 +754,13 @@ void wxMaracasRenderTabbedPanel::onCheckBoxSCChange(wxCommandEvent& event)
 **/
 void wxMaracasRenderTabbedPanel::onMPROptions(wxCommandEvent& event)
 {
+	addRemoveActorMPR(checkboxViewer->IsChecked());
+	/*
 	int id = 4;
 	wxtabs->SetSelection(id);
 	if(checkboxViewer->IsChecked())
 	{
+		
 		wxtabs->GetPage(id)->Enable();
 
 		bool valueX = ((wxVtkMPR3DViewCntrlPanel*) controlPanelMPR3D)->GetVisibleX();
@@ -726,8 +778,6 @@ void wxMaracasRenderTabbedPanel::onMPROptions(wxCommandEvent& event)
 		
 		mwxvtkmpr3Dview->Refresh();
 
-		wxCommandEvent newevent1(wxEVT_COMMAND_MENU_SELECTED,12121);  // Refresh
- 		mwxvtkmpr3Dview->GetWxvtk3Dbaseview()->GetWxVTKRenderWindowInteractor()->GetParent()->ProcessEvent(newevent1);
 
 	}
 	else
@@ -744,7 +794,16 @@ void wxMaracasRenderTabbedPanel::onMPROptions(wxCommandEvent& event)
 
 		wxCommandEvent newevent1(wxEVT_COMMAND_MENU_SELECTED,12121);  // Refresh
  		mwxvtkmpr3Dview->GetWxvtk3Dbaseview()->GetWxVTKRenderWindowInteractor()->GetParent()->ProcessEvent(newevent1);
-	}
+	}*/
+}
+
+void wxMaracasRenderTabbedPanel::OnRefreshView(wxCommandEvent & event) 
+{
+	printf("CPR wxMaracasRenderTabbedPanel::OnRefreshView \n");
+	mwxvtkmpr3Dview->RefreshView();
+
+	wxCommandEvent newevent1(wxEVT_COMMAND_MENU_SELECTED,12121);  // Refresh
+ 	mwxvtkmpr3Dview->GetWxvtk3Dbaseview()->GetWxVTKRenderWindowInteractor()->GetParent()->ProcessEvent(newevent1);
 }
 
 /**
@@ -776,15 +835,15 @@ void wxMaracasRenderTabbedPanel::onOpenCutter(wxCommandEvent& event)
 	type.push_back(0);
 	
 	wxMaracasDialog_NViewers* dialog1 = new wxMaracasDialog_NViewers(this, img, &type, wxString(_T("Cut Module") ));
-	dialog1->SetSize(800, 700);
+	//dialog1->SetSize(800, 700);
 	
-	std::string path = crea::System::GetDllAppPath("bbcreaMaracasVisu.dll");
+	/**std::string path = crea::System::GetDllAppPath("bbcreaMaracasVisu.dll");
 	cutter = CutModelMainPanel::getInstance(dialog1->getinternalPanel(), path);
 	cutter->setRenderer( dialog1->getViewer()->GetwxVtkBaseView(1)->GetRenderer() );
 	cutter->setInteractor( dialog1->getViewer()->GetwxVtkBaseView(1)->GetWxVTKRenderWindowInteractor() );
 	cutter->setImageData(getVolImage());
-	
-	dialog1->AddPanel(cutter);
+	**/
+	//dialog1->AddPanel(cutter);
 	dialog1->Show();
 }
 
@@ -839,4 +898,4 @@ vtkImageData* wxMaracasRenderTabbedPanel::getSurfCImage()
 int wxMaracasRenderTabbedPanel::getPropIdV()
 {
 	return _id;
-}
\ No newline at end of file
+}