X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxMaracasRenderTabbedPanel.cpp;h=106f2a5d40c61e886a9a4c0754b0884674eae613;hb=1b277d14d9ea0ebab60b44bbab2e0e18ed89db6b;hp=eb97a9e421f75f442962ed379a7de1672ab361f0;hpb=2098cdccd2ed2c0593b36175bf67f4ee5230c327;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.cpp
index eb97a9e..106f2a5 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.cpp
@@ -21,6 +21,9 @@ wxMaracasRenderTabbedPanel::wxMaracasRenderTabbedPanel(wxWindow* parent, int id)
 : wxPanel(parent, -1, wxDefaultPosition, wxDefaultSize)
 {
 	_id = id;
+
+	dialog = NULL;
+
 	volmanager = new wxMaracasMultipleVolumeRendererManager();
 	surrendmanager1 = new wxMaracasSurfaceRenderingManager();
 	surrendmanager2 = new wxMaracasSurfaceRenderingManager();
@@ -81,24 +84,22 @@ void wxMaracasRenderTabbedPanel::createControls(vtkImageData* inImg, std::string
 
 	if(inImg == NULL)
 	{
-		//std::string s = std::string(pathfile.mb_str());
 		vtkImageData* img = volmanager->getImageData(pathfile);
-		vtkImageData* img1 = surrendmanager1->getImageData(pathfile);
-		vtkImageData* img2 = surrendmanager2->getImageData(pathfile);
-		vtkImageData* img3 = surrendmanager3->getImageData(pathfile);
-		if(img!=NULL && img1!=NULL && img2!=NULL && img3!=NULL)
+		//vtkImageData* img1 = surrendmanager1->getImageData(pathfile);
+		//vtkImageData* img2 = surrendmanager2->getImageData(pathfile);
+		//vtkImageData* img3 = surrendmanager3->getImageData(pathfile);
+		if(img!=NULL /*&& img1!=NULL && img2!=NULL && img3!=NULL*/)
 		{
-			//s = std::string(filename.mb_str());
 			addVolume(img, filename);
-			addSurface1(img1, filename);
-			addSurface2(img2, filename);
-			addSurface3(img3, filename);	
+			addSurface1(img, filename);
+			addSurface2(img, filename);
+			addSurface3(img, filename);	
+			volname = (wxString) filename;
 			wxtabs->Refresh();
 		}
 	}	
 	else
 	{
-		//s = std::string(filename.mb_str());
 		addVolume(inImg, filename);
 		addSurface1(inImg, filename);
 		addSurface2(inImg, filename);
@@ -523,13 +524,18 @@ void wxMaracasRenderTabbedPanel::onCheckBoxSCChange(wxCommandEvent& event)
 **
 **/
 void wxMaracasRenderTabbedPanel::onOpenParameters(wxCommandEvent& event){	
-	
-	dialog = new wxMaracasRenderImageManagementPanel(this, volmanager, surrendmanager1, surrendmanager2, surrendmanager3, this->getPropIdV());
-	dialog->SetSize(400, 580);
-	dialog->Show();
+	if(dialog == NULL)
+	{
+		dialog = new wxMaracasRenderImageManagementPanel(this, volmanager, surrendmanager1, surrendmanager2, surrendmanager3, volname, _id);
+		dialog->SetSize(400, 580);
+		dialog->Show();
+	}
+	else if(dialog != NULL)
+	{
+		dialog->Show();
+	}
 }
 
-
 /**
 ** Gets volume rendering image asociated to the given ID
 **/
@@ -546,7 +552,7 @@ void wxMaracasRenderTabbedPanel::onColorChange(wxCommandEvent& event)
 /**
 ** 
 **/
-vtkImageData* wxMaracasRenderTabbedPanel::getVolImage(int id)
+vtkImageData* wxMaracasRenderTabbedPanel::getVolImage()
 {	
 	return volmanager->getImageData();
 }
@@ -554,7 +560,7 @@ vtkImageData* wxMaracasRenderTabbedPanel::getVolImage(int id)
 /**
 ** Gets surface rendering A image asociated to the given ID
 **/
-vtkImageData* wxMaracasRenderTabbedPanel::getSurfAImage(int id)
+vtkImageData* wxMaracasRenderTabbedPanel::getSurfAImage()
 {	
 	return surrendmanager1->getImageData();
 }
@@ -562,7 +568,7 @@ vtkImageData* wxMaracasRenderTabbedPanel::getSurfAImage(int id)
 /**
 ** Gets surface rendering B image asociated to the given ID
 **/
-vtkImageData* wxMaracasRenderTabbedPanel::getSurfBImage(int id)
+vtkImageData* wxMaracasRenderTabbedPanel::getSurfBImage()
 {	
 	return surrendmanager2->getImageData();
 }
@@ -570,7 +576,7 @@ vtkImageData* wxMaracasRenderTabbedPanel::getSurfBImage(int id)
 /**
 ** Gets surface rendering C image asociated to the given ID
 **/
-vtkImageData* wxMaracasRenderTabbedPanel::getSurfCImage(int id)
+vtkImageData* wxMaracasRenderTabbedPanel::getSurfCImage()
 {	
 	return surrendmanager3->getImageData();
 }
@@ -589,28 +595,4 @@ void wxMaracasRenderTabbedPanel::onOpenCutter(wxCommandEvent& event)
 int wxMaracasRenderTabbedPanel::getPropIdV()
 {
 	return _id;
-}
-
-/**
-**
-**/
-int wxMaracasRenderTabbedPanel::getPropIdSA()
-{
-	return -1;
-}
-
-/**
-**
-**/
-int wxMaracasRenderTabbedPanel::getPropIdSB()
-{
-	return -1;
-}
-
-/**
-**
-**/
-int wxMaracasRenderTabbedPanel::getPropIdSC()
-{
-	return -1;
 }
\ No newline at end of file