From: Juan Prieto <Juan.Prieto@creatis.insa-lyon.fr>
Date: Thu, 17 Dec 2009 10:19:20 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: CREATOOLS.2-0-3~83
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=641bab7ee015a554fa99e678d713d66273756557;p=creaMaracasVisu.git

*** empty log message ***
---

diff --git a/bbtk/src/bbcreaMaracasVisuOpenImageDialog.cxx b/bbtk/src/bbcreaMaracasVisuOpenImageDialog.cxx
index 1099679..11667ed 100644
--- a/bbtk/src/bbcreaMaracasVisuOpenImageDialog.cxx
+++ b/bbtk/src/bbcreaMaracasVisuOpenImageDialog.cxx
@@ -22,7 +22,7 @@ void OpenImageDialog::Process()
 //      (the one provided in the attribute 'type' of the tag 'input')
 
 
-	OpenLoadImageDialog diag = OpenLoadImageDialog();
+	creaMaracasVisuKernel::OpenImageDialog diag = creaMaracasVisuKernel::OpenImageDialog();
 
 
 
diff --git a/bbtk/src/bbcreaMaracasVisuOpenImageDialog.h b/bbtk/src/bbcreaMaracasVisuOpenImageDialog.h
index e0e9681..5ddbcd0 100644
--- a/bbtk/src/bbcreaMaracasVisuOpenImageDialog.h
+++ b/bbtk/src/bbcreaMaracasVisuOpenImageDialog.h
@@ -3,7 +3,7 @@
 #include "bbcreaMaracasVisu_EXPORT.h"
 #include "bbtkAtomicBlackBox.h"
 #include "iostream"
-#include "OpenLoadImageDialog.h"
+#include "OpenImageDialog.h"
 
 namespace bbcreaMaracasVisu
 {
diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/OpenImageDialog.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/OpenImageDialog.cxx
new file mode 100644
index 0000000..f80bc74
--- /dev/null
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/OpenImageDialog.cxx
@@ -0,0 +1,64 @@
+
+#include "OpenImageDialog.h"
+
+typedef vtkImageData* (*GETIMAGEDATADIALOG)();
+
+namespace creaMaracasVisuKernel{
+	OpenImageDialog::OpenImageDialog()
+	{
+
+
+		img = NULL;
+		bool gimmicknotfound = true;
+		
+	#ifdef WIN32
+		HINSTANCE gimmickhandle; 
+		gimmickhandle = LoadLibrary(TEXT("creaImageIO2.dll")); 	
+		std::cout<<"imagehandle "<<gimmickhandle<<std::endl;
+		if(gimmickhandle!=NULL){	
+
+			
+			GETIMAGEDATADIALOG getImageDataDialog;
+
+			getImageDataDialog = (GETIMAGEDATADIALOG)GetProcAddress(gimmickhandle, "getImageDataDialog");
+
+			
+			std::cout<<"imagedatadialog "<<getImageDataDialog<<std::endl;
+
+			if(getImageDataDialog!=NULL){
+				img = getImageDataDialog();
+				gimmicknotfound = false;
+			}
+		}	
+
+	#endif
+
+		if(gimmicknotfound){
+
+			wxFileDialog* FD = 
+			  new wxFileDialog( 0, _T("Read Image"),wxEmptyString,wxEmptyString, _T("*.mhd"));
+			
+			if (FD->ShowModal()==wxID_OK)
+			{
+				std::string  path= FD->GetPath();
+
+				vtkMetaImageReader *reader =  vtkMetaImageReader::New();	
+				reader->SetFileName(path.c_str());		
+				img = reader->GetOutput();		
+			}		
+		}	
+
+
+		
+	}
+
+	//-------------------------------------------------------------------
+	OpenImageDialog::~OpenImageDialog()
+	{
+	}
+
+	vtkImageData* OpenImageDialog::getImageData(){
+		return img;
+	}
+}
+
diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/OpenImageDialog.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/OpenImageDialog.h
new file mode 100644
index 0000000..1b70106
--- /dev/null
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/OpenImageDialog.h
@@ -0,0 +1,27 @@
+#ifndef OpenImageDialog_H_
+#define OpenImageDialog_H_
+
+#include "marTypes.h"
+#include "vtkImageData.h"
+#include "vtkMetaImageReader.h"
+#include "wx/wx.h"
+
+namespace creaMaracasVisuKernel{
+
+class creaMaracasVisu_EXPORT OpenImageDialog {
+public:
+	OpenImageDialog();
+	~OpenImageDialog();
+	
+
+	vtkImageData* getImageData();
+protected:
+
+private:
+	vtkImageData* img;
+	
+};
+
+}
+
+#endif /*OpenImageDialog_H_*/
diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/OpenLoadImageDialog.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/OpenLoadImageDialog.cxx
deleted file mode 100644
index f2a0930..0000000
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/OpenLoadImageDialog.cxx
+++ /dev/null
@@ -1,60 +0,0 @@
-
-#include "OpenLoadImageDialog.h"
-
-typedef vtkImageData* (*GETIMAGEDATADIALOG)();
-
-OpenLoadImageDialog::OpenLoadImageDialog()
-{
-
-
-	img = NULL;
-	bool gimmicknotfound = true;
-	
-#ifdef WIN32
-	HINSTANCE gimmickhandle; 
-	gimmickhandle = LoadLibrary(TEXT("creaImageIO2.dll")); 	
-	if(gimmickhandle!=NULL){	
-
-		
-		GETIMAGEDATADIALOG getImageDataDialog;
-
-		getImageDataDialog = (GETIMAGEDATADIALOG)GetProcAddress(gimmickhandle, "getImageDataDialog");
-
-		std::cout<<"imagehandle "<<gimmickhandle<<std::endl;
-		std::cout<<"imagedatadialog "<<getImageDataDialog<<std::endl;
-
-		if(getImageDataDialog!=NULL){
-			img = getImageDataDialog();
-			gimmicknotfound = false;
-		}
-	}	
-
-#endif
-
-	if(gimmicknotfound){
-
-		wxFileDialog* FD = 
-		  new wxFileDialog( 0, _T("Read Image"),wxEmptyString,wxEmptyString, _T("*.mhd"));
-		
-		if (FD->ShowModal()==wxID_OK)
-		{
-			std::string  path= FD->GetPath();
-
-			vtkMetaImageReader *reader =  vtkMetaImageReader::New();	
-			reader->SetFileName(path.c_str());		
-			img = reader->GetOutput();		
-		}		
-	}	
-
-
-	
-}
-
-//-------------------------------------------------------------------
-OpenLoadImageDialog::~OpenLoadImageDialog()
-{
-}
-
-vtkImageData* OpenLoadImageDialog::getImageData(){
-	return img;
-}
\ No newline at end of file
diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/OpenLoadImageDialog.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/OpenLoadImageDialog.h
deleted file mode 100644
index 1cdcf89..0000000
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/OpenLoadImageDialog.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#ifndef OpenLoadImageDialog_H_
-#define OpenLoadImageDialog_H_
-
-#include "marTypes.h"
-#include "vtkImageData.h"
-#include "vtkMetaImageReader.h"
-#include "wx/wx.h"
-
-
-
-class creaMaracasVisu_EXPORT OpenLoadImageDialog {
-public:
-	OpenLoadImageDialog();
-	~OpenLoadImageDialog();
-	
-
-	vtkImageData* getImageData();
-protected:
-
-private:
-	vtkImageData* img;
-	
-};
-
-#endif /*OpenLoadImageDialog_H_*/
diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasSurfaceRenderingManagerDataMhd.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasSurfaceRenderingManagerDataMhd.cxx
index d3375e8..cb6734c 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasSurfaceRenderingManagerDataMhd.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasSurfaceRenderingManagerDataMhd.cxx
@@ -1,5 +1,6 @@
 
 #include "wxMaracasSurfaceRenderingManagerDataMhd.h"
+
 #include "vtkStripper.h"
 
 wxMaracasSurfaceRenderingManagerDataMhd::wxMaracasSurfaceRenderingManagerDataMhd(vtkImageData* imagedata, std::string dataname, vtkRenderWindowInteractor*  interactor)
@@ -23,8 +24,9 @@ wxMaracasSurfaceRenderingManagerDataMhd::wxMaracasSurfaceRenderingManagerDataMhd
 	_dataMapper = vtkPolyDataMapper::New( );
 	_dataMapper->ScalarVisibilityOff( );
 	_dataMapper->ImmediateModeRenderingOn();
+	vtkActor* dataActor = vtkActor::New();
 
-	if(_boxWidgetS1){
+	if(interactor){
 
 		_boxWidgetS1 = vtkBoxWidget::New();
 		_boxWidgetS1->SetInteractor( interactor );
@@ -32,9 +34,10 @@ wxMaracasSurfaceRenderingManagerDataMhd::wxMaracasSurfaceRenderingManagerDataMhd
 
 		_boxWidgetS1->SetInput( this->_imagedata );
 		_boxWidgetS1->PlaceWidget();	
-		//_boxWidgetS1->AddObserver( vtkCommand::InteractionEvent		 , _vtkclipping3Ddataviewer->GetObserverS(i) );
+		boxSurfaceObserver* observer = boxSurfaceObserver::New();
+		
 		_boxWidgetS1->HandlesOn ();
-		_boxWidgetS1->Off();
+		_boxWidgetS1->On();
 
 		vtkStripper* striper = vtkStripper::New();
 	    striper->SetInput( _cleanFilter->GetOutput() );
@@ -50,6 +53,8 @@ wxMaracasSurfaceRenderingManagerDataMhd::wxMaracasSurfaceRenderingManagerDataMhd
 		this->_imagedata->GetExtent(x1,x2,y1,y2,z1,z2);
 		_tissuePlanes->SetBounds  (x1,x2,y1,y2,z1,z2);
 
+
+		
 		_boxWidgetS1->GetPlanes( _tissuePlanes );
 		
 		_tissueClipper = vtkClipPolyData::New();
@@ -57,16 +62,21 @@ wxMaracasSurfaceRenderingManagerDataMhd::wxMaracasSurfaceRenderingManagerDataMhd
 		_tissueClipper->SetClipFunction( _tissuePlanes );
 		_tissueClipper->InsideOutOn( );
 		_dataMapper->SetInput( _tissueClipper->GetOutput() );
+		observer->SetPlanes( _tissuePlanes );
+		observer->SetActor( dataActor );
+		_boxWidgetS1->AddObserver( vtkCommand::InteractionEvent		 , observer );
+
+
 		
 	}else{		
-		_dataMapper->SetInput(_cleanFilter->GetOutput());		
-		
+		_dataMapper->SetInput(_cleanFilter->GetOutput());				
 	}
-	vtkActor* dataActor = vtkActor::New();
+	
 	dataActor->SetMapper(_dataMapper);	
 	this->_prop3D = dataActor;
 
 	
+	
 
 	this->changeIsoValue(this->_maxgreylevel);	
 
diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasSurfaceRenderingManagerDataMhd.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasSurfaceRenderingManagerDataMhd.h
index 236dab0..fd60ab7 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasSurfaceRenderingManagerDataMhd.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasSurfaceRenderingManagerDataMhd.h
@@ -3,6 +3,7 @@
 
 
 #include "wxMaracasSurfaceRenderingManagerData.h"
+#include "boxSurfaceObserver.h"
 
 #include "vtkMetaImageReader.h"
 #include "vtkMarchingCubes.h"