X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxMaracasSurfaceRenderingProp3DMHD.cxx;fp=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxMaracasSurfaceRenderingProp3DMHD.cxx;h=507e8e838493bd87eac6e740e99010b1cd38be35;hb=28c74ab5eb531ce001260e9bc3fcb0151fcfc56b;hp=7357c6b4544c769c5bb4b3894321a72c00b75354;hpb=8e28248048ebb13908702adb87a319047af16939;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasSurfaceRenderingProp3DMHD.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasSurfaceRenderingProp3DMHD.cxx
index 7357c6b..507e8e8 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasSurfaceRenderingProp3DMHD.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasSurfaceRenderingProp3DMHD.cxx
@@ -1,18 +1,28 @@
 #include "wxMaracasSurfaceRenderingProp3DMHD.h"
 
 #include "wxMaracasSurfaceRendering.h"
+#include "wxMaracasRendererView.h"
 #include <OpenImage.xpm>
 /**
 **	SurfaceRenderingProp3DMHD implementation
 **/
-wxMaracasSurfaceRenderingProp3DMHD::wxMaracasSurfaceRenderingProp3DMHD(wxWindow* parent, int propid)
-: wxMaracasSurfaceRenderingProp3D(parent, propid)
-{
+wxMaracasSurfaceRenderingProp3DMHD::wxMaracasSurfaceRenderingProp3DMHD(wxWindow* parent, int propid, bool _isComplexBox, int _panID)
+: wxMaracasSurfaceRenderingProp3D(parent, propid, _isComplexBox, _panID){
 	
 }
 wxMaracasSurfaceRenderingProp3DMHD::~wxMaracasSurfaceRenderingProp3DMHD(){
 	//this->Show(false);
-	//wxMaracasSurfaceRendering::getInstance()->addRemoveActor(_propid, false);
+	if(this->isComplex())
+	{
+		//if(this->getPanId() == 1)
+		//	((wxMaracasRenderTabbedPanel*)(wxMaracasRendererView::getInstance())->getTabbedPanel())->addRemoveActorSA(_propid, false);
+		//if(this->getPanId() == 2)
+		//	((wxMaracasRenderTabbedPanel*)(wxMaracasRendererView::getInstance())->getTabbedPanel())->addRemoveActorSB(_propid, false);
+		//if(this->getPanId() == 3)
+		//	((wxMaracasRenderTabbedPanel*)(wxMaracasRendererView::getInstance())->getTabbedPanel())->addRemoveActorSC(_propid, false);
+	}
+	//else
+		//wxMaracasSurfaceRendering::getInstance()->addRemoveActor(_propid, false);
 }
 void wxMaracasSurfaceRenderingProp3DMHD::createControls(int maxisovalue){
 	
@@ -25,21 +35,24 @@ void wxMaracasSurfaceRenderingProp3DMHD::createControls(int maxisovalue){
 	sizer->Add(isovalue, wxFIXED_MINSIZE);
 	//this->addControl(isovalue);
 
-	wxBitmap bitmap(OpenImage_xpm);
-	_viewimage = new wxBitmapButton(this, -1, bitmap, wxDefaultPosition, wxSize(30,30));	
-	Connect(_viewimage->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, (wxObjectEventFunction)&wxMaracasSurfaceRenderingProp3DMHD::onViewImage);			
-	sizer->Add(_viewimage,wxFIXED_MINSIZE);
-
 	this->addControl(sizer);	
 	Connect(isovalue->GetId(), wxEVT_SCROLL_CHANGED, (wxObjectEventFunction)&wxMaracasSurfaceRenderingProp3DMHD::onIsoValueRelease);	
 
-	
-
 }
 
-void wxMaracasSurfaceRenderingProp3DMHD::onIsoValueRelease(wxScrollEvent& event ){
-
-	wxMaracasSurfaceRendering::getInstance()->changeIsoValue(this->getPropId(), isovalue->GetValue()/1.0);
+void wxMaracasSurfaceRenderingProp3DMHD::onIsoValueRelease(wxScrollEvent& event )
+{
+	if(this->isComplex())
+	{
+		if(this->getPanId() == 1)
+			((wxMaracasRenderTabbedPanel*)(wxMaracasRendererView::getInstance())->getTabbedPanel())->changeIsoValueA(this->getPropId(),isovalue->GetValue()/1.0);
+		if(this->getPanId() == 2)
+			((wxMaracasRenderTabbedPanel*)(wxMaracasRendererView::getInstance())->getTabbedPanel())->changeIsoValueB(this->getPropId(),isovalue->GetValue()/1.0);
+		if(this->getPanId() == 3)
+			((wxMaracasRenderTabbedPanel*)(wxMaracasRendererView::getInstance())->getTabbedPanel())->changeIsoValueC(this->getPropId(),isovalue->GetValue()/1.0);
+	}
+	else
+		wxMaracasSurfaceRendering::getInstance()->changeIsoValue(this->getPropId(), isovalue->GetValue()/1.0);
 	
 }