X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxMaracas_N_ViewersWidget.cxx;h=4e6cd1923c56611ed93c62e348ed11d4031cdcd5;hb=f200c6250f9267d1996d1dd6c1209d7586bb63ab;hp=ee3c4e07b2083f6a8e1d6c75920bf465fa74c4e1;hpb=acfa60fa044ebc12067c4daba555d18c7d66b2d5;p=creaMaracasVisu.git

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 ee3c4e0..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/25 08:50:32 $
-  Version:   $Revision: 1.15 $
+  Date:      $Date: 2010/05/03 13:46:48 $
+  Version:   $Revision: 1.17 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -165,9 +165,9 @@
 			delete mvtkmprbasedata;
 		}
 		
-		/*marImageData	*marimagedata	= new marImageData( imagedata );			
+		marImageData	*marimagedata	= new marImageData( imagedata );			
 		mvtkmprbasedata					= new vtkMPRBaseData(); 
-		mvtkmprbasedata->SetMarImageData(marimagedata);*/
+		mvtkmprbasedata->SetMarImageData(marimagedata);
 		
 		if(_currentwxw != NULL){
 			_currentwxw->Show(false);
@@ -179,15 +179,15 @@
 		//std::cout<<"size "<<nTypeView->size()<<std::endl;
 		if (nTypeView->size()==1)
 		{
-			wxwindow1 = new wxMaracas_ViewerWidget(this, imagedata, (*nTypeView)[0]);
+			wxwindow1 = new wxMaracas_ViewerWidget(this, imagedata, (*nTypeView)[0], mvtkmprbasedata);
 
 			wxwindow1->ConfigureVTK();
 			wxwindow = wxwindow1;
 		}else	if (nTypeView->size()==2)	{
 			wxSplitterWindow	*spliter	= new wxSplitterWindow( this , -1);
 			spliter->SetMinimumPaneSize(1);
- 			wxwindow1 = new wxMaracas_ViewerWidget(spliter, imagedata, (*nTypeView)[0]);
- 			wxwindow2 = new wxMaracas_ViewerWidget(spliter, imagedata, (*nTypeView)[1]);
+ 			wxwindow1 = new wxMaracas_ViewerWidget(spliter, imagedata, (*nTypeView)[0], mvtkmprbasedata);
+ 			wxwindow2 = new wxMaracas_ViewerWidget(spliter, imagedata, (*nTypeView)[1], mvtkmprbasedata);
 			wxwindow1->ConfigureVTK();
 			wxwindow2->ConfigureVTK();
 			spliter	-> SplitVertically( wxwindow1 , wxwindow2  );
@@ -198,9 +198,9 @@
 			wxSplitterWindow	*spliterA	= new wxSplitterWindow( spliter , -1);
 			spliter->SetMinimumPaneSize(1);
 			spliterA->SetMinimumPaneSize(1);
- 			wxwindow1 = new wxMaracas_ViewerWidget(spliter , imagedata, (*nTypeView)[0]);
- 			wxwindow2 = new wxMaracas_ViewerWidget(spliterA, imagedata, (*nTypeView)[1]);
- 			wxwindow3 = new wxMaracas_ViewerWidget(spliterA, imagedata, (*nTypeView)[2]);
+ 			wxwindow1 = new wxMaracas_ViewerWidget(spliter , imagedata, (*nTypeView)[0], mvtkmprbasedata);
+ 			wxwindow2 = new wxMaracas_ViewerWidget(spliterA, imagedata, (*nTypeView)[1], mvtkmprbasedata);
+ 			wxwindow3 = new wxMaracas_ViewerWidget(spliterA, imagedata, (*nTypeView)[2], mvtkmprbasedata);
 			wxwindow1->ConfigureVTK();
 			wxwindow2->ConfigureVTK();
 			wxwindow3->ConfigureVTK();
@@ -214,10 +214,10 @@
 			spliter->SetMinimumPaneSize(1);
 			spliterA->SetMinimumPaneSize(1);
 			spliterB->SetMinimumPaneSize(1);
- 			wxwindow1 = new wxMaracas_ViewerWidget(spliterA, imagedata, (*nTypeView)[0]);
- 			wxwindow2 = new wxMaracas_ViewerWidget(spliterA, imagedata, (*nTypeView)[1]);
- 			wxwindow3 = new wxMaracas_ViewerWidget(spliterB, imagedata, (*nTypeView)[2]);
- 			wxwindow4 = new wxMaracas_ViewerWidget(spliterB, imagedata, (*nTypeView)[3]);
+ 			wxwindow1 = new wxMaracas_ViewerWidget(spliterA, imagedata, (*nTypeView)[0], mvtkmprbasedata);
+ 			wxwindow2 = new wxMaracas_ViewerWidget(spliterA, imagedata, (*nTypeView)[1], mvtkmprbasedata);
+ 			wxwindow3 = new wxMaracas_ViewerWidget(spliterB, imagedata, (*nTypeView)[2], mvtkmprbasedata);
+ 			wxwindow4 = new wxMaracas_ViewerWidget(spliterB, imagedata, (*nTypeView)[3], mvtkmprbasedata);
 			wxwindow1->ConfigureVTK();
 			wxwindow2->ConfigureVTK();
 			wxwindow3->ConfigureVTK();
@@ -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);