From 5d3149fdf909da63747a9bb4b1cb7229cf50e4fa Mon Sep 17 00:00:00 2001
From: Juan Prieto <Juan.Prieto@creatis.insa-lyon.fr>
Date: Mon, 3 May 2010 13:46:48 +0000
Subject: [PATCH] open image dialog

---
 .../wxWindows/widgets/OpenImageDialog.cxx         |  8 ++++++--
 .../interface/wxWindows/widgets/OpenImageDialog.h |  5 ++++-
 .../widgets/wxMaracas_N_ViewersWidget.cxx         | 15 ++++++++++++---
 .../wxWindows/widgets/wxMaracas_N_ViewersWidget.h |  7 ++++---
 4 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/OpenImageDialog.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/OpenImageDialog.cxx
index 6b635e1..bffcd1f 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/OpenImageDialog.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/OpenImageDialog.cxx
@@ -14,7 +14,7 @@ namespace creaMaracasVisuKernel{
 	OpenImageDialog::OpenImageDialog(bool usegimmick)
 	{
 		img = NULL;		
-		
+		_filename = "";
 		bool gimmickfound = false;
 
 		if(usegimmick){
@@ -82,6 +82,7 @@ namespace creaMaracasVisuKernel{
 				vtkMetaImageReader* reader =  vtkMetaImageReader::New();
 				reader->SetFileName(path.c_str());
 				reader->Update();
+				_filename = path;
 				img = vtkImageData::New();
 				img->DeepCopy(reader->GetOutput());
 				//reader->GetOutput()->Delete();
@@ -105,7 +106,7 @@ namespace creaMaracasVisuKernel{
 					}
 				}*/
 				
-				std::cout<<"image reference count "<<img->GetReferenceCount()<<std::endl;
+				/*std::cout<<"image reference count "<<img->GetReferenceCount()<<std::endl;*/
 			}
 			//delete FD;
 		}
@@ -120,4 +121,7 @@ namespace creaMaracasVisuKernel{
 	vtkImageData* OpenImageDialog::getImageData(){		
 		return img;
 	}
+	std::string OpenImageDialog::getFilename(){
+		return _filename;
+	}
 }
diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/OpenImageDialog.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/OpenImageDialog.h
index 7ae3fd3..40fc363 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/OpenImageDialog.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/OpenImageDialog.h
@@ -14,10 +14,13 @@ public:
 	~OpenImageDialog();
 
 	vtkImageData* getImageData();
+	
+	std::string getFilename();
 protected:
 
 private:
-	vtkImageData* img;	
+	vtkImageData* img;
+	std::string _filename;
 };
 
 }
diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_N_ViewersWidget.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_N_ViewersWidget.cxx
index 5971665..4e6cd19 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_N_ViewersWidget.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_N_ViewersWidget.cxx
@@ -3,8 +3,8 @@
   Program:   wxMaracas
   Module:    $RCSfile: wxMaracas_N_ViewersWidget.cxx,v $
   Language:  C++
-  Date:      $Date: 2010/03/26 14:52:24 $
-  Version:   $Revision: 1.16 $
+  Date:      $Date: 2010/05/03 13:46:48 $
+  Version:   $Revision: 1.17 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -266,7 +266,8 @@
 
 //-----------------------------------------------------------------------------------
 double wxMaracas_N_ViewersWidget :: GetX()
-{
+{	
+	invariant();
 	return mvtkmprbasedata->GetX();
 //	return wxwindow1->GetX();
 }
@@ -274,6 +275,7 @@ double wxMaracas_N_ViewersWidget :: GetX()
 //-----------------------------------------------------------------------------------
 double wxMaracas_N_ViewersWidget :: GetY()
 {
+	invariant();
 	return mvtkmprbasedata->GetY();
 //	return wxwindow1->GetY();
 }
@@ -282,10 +284,17 @@ double wxMaracas_N_ViewersWidget :: GetY()
 //-----------------------------------------------------------------------------------
 double wxMaracas_N_ViewersWidget :: GetZ()
 {
+	invariant();
 	return mvtkmprbasedata->GetZ();
 //	return wxwindow1->GetZ();
 }
 
+void wxMaracas_N_ViewersWidget :: invariant(){
+	if(mvtkmprbasedata == 0){
+		throw "The image has not been set in the viewer";
+	}
+}
+
 void wxMaracas_N_ViewersWidget::setColorTransferFunction(vtkColorTransferFunction* colortable){
     if (wxwindow1!=NULL) {
 		wxwindow1->setColorTransferFunction(colortable);
diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_N_ViewersWidget.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_N_ViewersWidget.h
index 0a624e7..f938a38 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_N_ViewersWidget.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_N_ViewersWidget.h
@@ -3,8 +3,8 @@
   Program:   wxMaracas
   Module:    $RCSfile: wxMaracas_N_ViewersWidget.h,v $
   Language:  C++
-  Date:      $Date: 2009/11/30 20:52:51 $
-  Version:   $Revision: 1.9 $
+  Date:      $Date: 2010/05/03 13:46:48 $
+  Version:   $Revision: 1.10 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -101,7 +101,8 @@ class creaMaracasVisu_EXPORT wxMaracas_N_ViewersWidget : public wxPanel
 	std::vector<int> *nTypeView;
 
 	vtkMPRBaseData* mvtkmprbasedata;  
-	  
+	 
+	void invariant();
   DECLARE_EVENT_TABLE( );
   };
 
-- 
2.45.1