*** 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 bdeba81ba16c63f27219778cc808d1d32abf877f..106f2a5d40c61e886a9a4c0754b0884674eae613 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.cpp
@@ -17,10 +17,13 @@
 /**
 ** Class constructor
 **/
-wxMaracasRenderTabbedPanel::wxMaracasRenderTabbedPanel(wxWindow* parent)
+wxMaracasRenderTabbedPanel::wxMaracasRenderTabbedPanel(wxWindow* parent, int id)
 : wxPanel(parent, -1, wxDefaultPosition, wxDefaultSize)
 {
-       //_propid = propid;
+       _id = id;
+
+       dialog = NULL;
+
        volmanager = new wxMaracasMultipleVolumeRendererManager();
        surrendmanager1 = new wxMaracasSurfaceRenderingManager();
        surrendmanager2 = new wxMaracasSurfaceRenderingManager();
@@ -36,7 +39,7 @@ wxMaracasRenderTabbedPanel::~wxMaracasRenderTabbedPanel()
        //wxMaracasRenderTabbedPanel::getInstance()->addRemoveActorSA(_propid, false);
        //wxMaracasRenderTabbedPanel::getInstance()->addRemoveActorSB(_propid, false);
        //wxMaracasRenderTabbedPanel::getInstance()->addRemoveActorSC(_propid, false);
-       this->deleteVolume(_propidV);
+       this->deleteVolume(_id);
        delete wxtabs;  
 }
 
@@ -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);
@@ -131,7 +132,7 @@ void wxMaracasRenderTabbedPanel::addVolume(vtkImageData* img, std::string datana
 {
        try
        {
-               _propidV = volmanager->addVolume(img, dataname);
+               int _propidV = volmanager->addVolume(_id, img, dataname);
                if(_propidV!=-1)
                {
                        wxMaracasMultipleVolumeRendererPanel* controlpanV = new wxMaracasMultipleVolumeRendererPanel(wxtabs, _propidV, img, true);
@@ -155,7 +156,7 @@ void wxMaracasRenderTabbedPanel::addSurface1(vtkImageData* img, std::string data
 {
        try
        {
-               _propidSA = surrendmanager1->addPropMHD(img, dataname);
+               int _propidSA = surrendmanager1->addPropMHD(_id, img, dataname);
                
                if(_propidSA!=-1)
                {
@@ -181,7 +182,7 @@ void wxMaracasRenderTabbedPanel::addSurface2(vtkImageData* img, std::string data
 {
        try
        {
-               _propidSB = surrendmanager2->addPropMHD(img, dataname);
+               int _propidSB = surrendmanager2->addPropMHD(_id, img, dataname);
                if(_propidSB!=-1)
                {
                        wxMaracasSurfaceRenderingPanel* controlpanSB = new wxMaracasSurfaceRenderingProp3DMHD(wxtabs, _propidSB, true, 2);
@@ -207,7 +208,7 @@ void wxMaracasRenderTabbedPanel::addSurface3(vtkImageData* img, std::string data
 {
        try
        {
-               _propidSC = surrendmanager3->addPropMHD(img, dataname);
+               int _propidSC = surrendmanager3->addPropMHD(_id, img, dataname);
 
                if(_propidSC!=-1)
                {
@@ -477,7 +478,7 @@ void wxMaracasRenderTabbedPanel::onCheckBoxVChange(wxCommandEvent& event)
 void wxMaracasRenderTabbedPanel::onCheckBoxSAChange(wxCommandEvent& event)
 {      
        try{
-               surrendmanager1->addRemoveActor(this->getPropIdSA(), checkboxSA->GetValue());   
+               surrendmanager1->addRemoveActor(this->getPropIdV(), checkboxSA->GetValue());    
        }
        catch(char* str){
                std::cout << "Exception : " << str << '\n';
@@ -493,7 +494,7 @@ void wxMaracasRenderTabbedPanel::onCheckBoxSAChange(wxCommandEvent& event)
 void wxMaracasRenderTabbedPanel::onCheckBoxSBChange(wxCommandEvent& event)
 {      
        try{
-               surrendmanager2->addRemoveActor(this->getPropIdSB(), checkboxSB->GetValue());   
+               surrendmanager2->addRemoveActor(this->getPropIdV(), checkboxSB->GetValue());    
        }
        catch(char* str){
                std::cout << "Exception : " << str << '\n';
@@ -509,7 +510,7 @@ void wxMaracasRenderTabbedPanel::onCheckBoxSBChange(wxCommandEvent& event)
 void wxMaracasRenderTabbedPanel::onCheckBoxSCChange(wxCommandEvent& event)
 {      
        try{
-               surrendmanager3->addRemoveActor(this->getPropIdSC(), checkboxSC->GetValue());   
+               surrendmanager3->addRemoveActor(this->getPropIdV(), checkboxSC->GetValue());    
        }
        catch(char* str){
                std::cout << "Exception : " << str << '\n';
@@ -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();
 }
@@ -588,30 +594,5 @@ void wxMaracasRenderTabbedPanel::onOpenCutter(wxCommandEvent& event)
 **/
 int wxMaracasRenderTabbedPanel::getPropIdV()
 {
-       return _propidV;
-}
-
-/**
-**
-**/
-int wxMaracasRenderTabbedPanel::getPropIdSA()
-{
-       return _propidSA;
-}
-
-/**
-**
-**/
-int wxMaracasRenderTabbedPanel::getPropIdSB()
-{
-       return _propidSB;
-}
-
-/**
-**
-**/
-int wxMaracasRenderTabbedPanel::getPropIdSC()
-{
-       return _propidSC;
-}
-
+       return _id;
+}
\ No newline at end of file