*** empty log message ***

[creaMaracasVisu.git] / lib / maracasVisuLib / src / interface / wxWindows / widgets / wxMaracasRenderTabbedPanel.cpp

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.cpp
index 83c26f26f1ac306e141b6a69a48095a76907bac0..106f2a5d40c61e886a9a4c0754b0884674eae613 100644 (file)
--- 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();
@@ -82,15 +85,16 @@ void wxMaracasRenderTabbedPanel::createControls(vtkImageData* inImg, std::string
        if(inImg == NULL)
        {
                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*/)
                {
                        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();
                }
        }       
@@ -520,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
 **/