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=e60eea9083457889b9603a815db80af918f983da;hp=5c9d88afc19fac2b00fe672ec8ef5663233f1a15;hpb=8ca44860ac2400e70d2cfcb8afa817080d6da6ee;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.cpp
index 5c9d88a..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();
@@ -91,6 +94,7 @@ void wxMaracasRenderTabbedPanel::createControls(vtkImageData* inImg, std::string
 			addSurface1(img, filename);
 			addSurface2(img, filename);
 			addSurface3(img, filename);	
+			volname = (wxString) filename;
 			wxtabs->Refresh();
 		}
 	}	
@@ -520,14 +524,18 @@ void wxMaracasRenderTabbedPanel::onCheckBoxSCChange(wxCommandEvent& event)
 **
 **/
 void wxMaracasRenderTabbedPanel::onOpenParameters(wxCommandEvent& event){	
-	if(dialog == NULL){
-		dialog = new wxMaracasRenderImageManagementPanel(this, volmanager, surrendmanager1, surrendmanager2, surrendmanager3, this->getPropIdV());
+	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();
 	}
-	dialog->Show();
 }
 
-
 /**
 ** Gets volume rendering image asociated to the given ID
 **/