*** empty log message ***

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/HistogramDialogComboBox.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/HistogramDialogComboBox.cxx
index 99b43ec3266524e7916842067fa185b703b8144c..2809b4e7c5c17c6bd1a99a7fdb8bf7bf3fb0bb98 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/HistogramDialogComboBox.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/HistogramDialogComboBox.cxx
@@ -338,7 +338,7 @@ void HistogramDialogComboBox::OnLoadComboBoxData(std::vector<HistogramDialogComb
 
                                item->SetColors(greyvect,redvect,greenvect,bluevect);
                                item->SetTransferFunction(greyvecttransfunct,value);
-                               for(int i = 0; i < greyvecttransfunct.size();i++){
+                               /*for(int i = 0; i < greyvecttransfunct.size();i++){
                                        std::cout<<"HistogramDialogComboBox::OnLoadComboBoxData("<<greyvecttransfunct[i]<<std::endl;
                                        std::cout<<value[i]<<std::endl;
                                }
@@ -347,7 +347,7 @@ void HistogramDialogComboBox::OnLoadComboBoxData(std::vector<HistogramDialogComb
                                        std::cout<<redvect[i]<<std::endl;
                                        std::cout<<greenvect[i]<<std::endl;
                                        std::cout<<bluevect[i]<<std::endl;
-                               }
+                               }*/
                                
                                itembitmaps.push_back(item);
 

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererManager.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererManager.cxx
index ccee7cd76c2756a45a3c2ebfe67e5cc080d5c9e4..b7b11357d924a7a0513dbf5cba2a83fefbb28713 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererManager.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererManager.cxx
@@ -3,8 +3,8 @@
   Program:   wxMaracas
   Module:    $RCSfile: wxMaracasMultipleVolumeRendererManager.cxx,v $
   Language:  C++
-  Date:      $Date: 2009/11/09 19:14:56 $
-  Version:   $Revision: 1.6 $
+  Date:      $Date: 2009/11/17 10:22:26 $
+  Version:   $Revision: 1.7 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -54,15 +54,23 @@ void wxMaracasMultipleVolumeRendererManager::Update(int ppid){
 /**
 **     Adds a prop3D to the manager and returns the identifier
 **/
-int wxMaracasMultipleVolumeRendererManager::addVolume(vtkImageData* vol, std::string dataname) throw(char*){
+int wxMaracasMultipleVolumeRendererManager::addVolume(int idTP, vtkImageData* vol, std::string dataname) throw(char*){
        checkInvariant();
        image = vol;
        if(vol != NULL){
                wxMaracasMultipleVolumeRendererManagerData* data = new wxMaracasMultipleVolumeRendererManagerData(vol, dataname);
                prop3Dvect.push_back(data);
                _renderer->AddActor(data->getProp3D());
-               data->setId(_idCount);
-               _idCount++;
+               if(idTP == -1)
+               {
+                       data->setId(_idCount);
+                       _idCount++;
+               }
+               else
+               {
+                       data->setId(idTP);
+               }
+               printf("wxMaracasMultipleVolumeRendererManager::addVolume->idVolumeRenderer: %i", data->getId());
                return data->getId();
        }else{
                throw "Check mhd imagefile file or input";

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererManager.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererManager.h
index 93e476324e8340075d101a03fa8f5f98bc916815..6b881ece3b840f101b894c17b4b0b7ee89f3ef48 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererManager.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererManager.h
@@ -3,8 +3,8 @@
   Program:   wxMaracas
   Module:    $RCSfile: wxMaracasMultipleVolumeRendererManager.h,v $
   Language:  C++
-  Date:      $Date: 2009/11/09 19:14:56 $
-  Version:   $Revision: 1.5 $
+  Date:      $Date: 2009/11/17 10:22:59 $
+  Version:   $Revision: 1.6 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -47,7 +47,7 @@ public:
        /**
        **      Adds a volume
        **/
-       int addVolume(vtkImageData* img, std::string dataname) throw (char*);   
+       int addVolume(int idTP, vtkImageData* img, std::string dataname) throw (char*); 
        
        /**
        **      loads a prop3D from a nSTL file

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererView.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererView.cxx
index b2630c3f7e97fadb9bdf7e55cf0ea25643c6ef5a..e062749ff9841b8df0e402525e6922d583723613 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererView.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererView.cxx
@@ -3,8 +3,8 @@
   Program:   wxMaracas
   Module:    $RCSfile: wxMaracasMultipleVolumeRendererView.cxx,v $
   Language:  C++
-  Date:      $Date: 2009/11/09 19:14:56 $
-  Version:   $Revision: 1.6 $
+  Date:      $Date: 2009/11/17 10:23:35 $
+  Version:   $Revision: 1.7 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -115,7 +115,7 @@ void wxMaracasMultipleVolumeRendererView::addVolumeViewPanel(wxMaracasMultipleVo
 void wxMaracasMultipleVolumeRendererView::addVolume(vtkImageData* img, std::string dataname){
 
        try{
-               int id = volmanager->addVolume(img,dataname);           
+               int id = volmanager->addVolume(-1, img,dataname);               
                if(id!=-1){
                        wxMaracasMultipleVolumeRendererPanel* controlpan = new wxMaracasMultipleVolumeRendererPanel(this, id,img, false);
                        addVolumeViewPanel(controlpan, dataname);

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderImageManagementPanel.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderImageManagementPanel.cpp
index a69e44f86d21eec94b5ba33f94c7687843bc3d3f..94eed6af650946137f84bd43f648d29fc64c6585 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderImageManagementPanel.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderImageManagementPanel.cpp
@@ -63,21 +63,21 @@ void wxMaracasRenderImageManagementPanel::createControls()
        sizersliders->Add(sliderRotateZ,wxSizerFlags().Expand().Center());
 
        wxStaticText* sx = new wxStaticText(this, -1, wxString(_T("  Scale X  ")));
-       sliderScaleX = new wxSlider(this, -1, 0, -100, 100, wxDefaultPosition, wxDefaultSize, wxSL_LABELS);
+       sliderScaleX = new wxSlider(this, -1, 100, 1, 200, wxDefaultPosition, wxDefaultSize, wxSL_LABELS);
        sliderScaleX->SetLineSize(1);
        Connect(sliderScaleX->GetId(), wxEVT_SCROLL_THUMBTRACK, (wxObjectEventFunction)&wxMaracasRenderImageManagementPanel::Scale);
        sizersliders->Add(sx, wxFIXED_MINSIZE);
        sizersliders->Add(sliderScaleX,wxSizerFlags().Expand().Center());
 
        wxStaticText* sy = new wxStaticText(this, -1, wxString(_T("  Scale Y  ")));
-       sliderScaleY = new wxSlider(this, -1, 0, -100, 100, wxDefaultPosition, wxDefaultSize, wxSL_LABELS);
+       sliderScaleY = new wxSlider(this, -1, 100, 1, 200, wxDefaultPosition, wxDefaultSize, wxSL_LABELS);
        sliderScaleY->SetLineSize(1);
        Connect(sliderScaleY->GetId(), wxEVT_SCROLL_THUMBTRACK, (wxObjectEventFunction)&wxMaracasRenderImageManagementPanel::Scale);
        sizersliders->Add(sy, wxFIXED_MINSIZE);
        sizersliders->Add(sliderScaleY,wxSizerFlags().Expand().Center());
 
        wxStaticText* sz = new wxStaticText(this, -1, wxString(_T("  Scale Z  ")));
-       sliderScaleZ = new wxSlider(this, -1, 0, -100, 100, wxDefaultPosition, this->GetSize(), wxSL_LABELS);
+       sliderScaleZ = new wxSlider(this, -1, 100, 1, 200, wxDefaultPosition, this->GetSize(), wxSL_LABELS);
        sliderScaleZ->SetLineSize(1);
        Connect(sliderScaleZ->GetId(), wxEVT_SCROLL_THUMBTRACK, (wxObjectEventFunction)&wxMaracasRenderImageManagementPanel::Scale);
        sizersliders->Add(sz, wxFIXED_MINSIZE);
@@ -130,9 +130,9 @@ wxMaracasRenderImageManagementPanel::~wxMaracasRenderImageManagementPanel()
 **/
 void wxMaracasRenderImageManagementPanel::Translate(wxCommandEvent& event)
 {
-       printf("wxMaracasRenderImageManagementPanel::Translate translateX = %d \n", sliderTranslateX->GetValue());
-       printf("wxMaracasRenderImageManagementPanel::Translate translatey = %d \n", sliderTranslateY->GetValue());
-       printf("wxMaracasRenderImageManagementPanel::Translate translatez = %d \n", sliderTranslateZ->GetValue());
+       //printf("wxMaracasRenderImageManagementPanel::Translate translateX = %d \n", sliderTranslateX->GetValue());
+       //printf("wxMaracasRenderImageManagementPanel::Translate translatey = %d \n", sliderTranslateY->GetValue());
+       //printf("wxMaracasRenderImageManagementPanel::Translate translatez = %d \n", sliderTranslateZ->GetValue());
        try{
                wxtrasform->Translate(sliderTranslateX->GetValue(), sliderTranslateY->GetValue(), sliderTranslateZ->GetValue());
        }
@@ -148,9 +148,9 @@ void wxMaracasRenderImageManagementPanel::Translate(wxCommandEvent& event)
 **/
 void wxMaracasRenderImageManagementPanel::Rotate(wxCommandEvent& event)
 {
-       printf("wxMaracasRenderImageManagementPanel::Rotate rotateX = %d \n", sliderRotateX->GetValue());
-       printf("wxMaracasRenderImageManagementPanel::Rotate rotateY = %d \n", sliderRotateY->GetValue());
-       printf("wxMaracasRenderImageManagementPanel::Rotate rotateZ = %d \n", sliderRotateZ->GetValue());
+       //printf("wxMaracasRenderImageManagementPanel::Rotate rotateX = %d \n", sliderRotateX->GetValue());
+       //printf("wxMaracasRenderImageManagementPanel::Rotate rotateY = %d \n", sliderRotateY->GetValue());
+       //printf("wxMaracasRenderImageManagementPanel::Rotate rotateZ = %d \n", sliderRotateZ->GetValue());
        
        try{
                wxtrasform->Rotate( sliderRotateX->GetValue(), sliderRotateY->GetValue(), sliderRotateZ->GetValue() );
@@ -167,12 +167,12 @@ void wxMaracasRenderImageManagementPanel::Rotate(wxCommandEvent& event)
 **/
 void wxMaracasRenderImageManagementPanel::Scale(wxCommandEvent& event)
 {
-       printf("wxMaracasRenderImageManagementPanel::Rotate rotateX = %d \n", sliderScaleX->GetValue());
-       printf("wxMaracasRenderImageManagementPanel::Rotate rotateY = %d \n", sliderRotateY->GetValue());
-       printf("wxMaracasRenderImageManagementPanel::Rotate rotateZ = %d \n", sliderRotateZ->GetValue());
+       //printf("wxMaracasRenderImageManagementPanel::Rotate rotateX = %d \n", sliderScaleX->GetValue());
+       //printf("wxMaracasRenderImageManagementPanel::Rotate rotateY = %d \n", sliderRotateY->GetValue());
+       //printf("wxMaracasRenderImageManagementPanel::Rotate rotateZ = %d \n", sliderRotateZ->GetValue());
 
        try{
-               wxtrasform->Scale( sliderScaleX->GetValue(), sliderScaleY->GetValue(), sliderScaleZ->GetValue() );
+               wxtrasform->Scale( sliderScaleX->GetValue(), sliderScaleY->GetValue(), sliderScaleZ->GetValue());
        }
        catch(char* str){
                std::cout << "Exception : " << str << '\n';

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderImageTransformation.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderImageTransformation.cpp
index 132b887cad36d619f6e004d178e13121ca875b79..ada5c497fd1ba52f027fe948549444ad747509ae 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderImageTransformation.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderImageTransformation.cpp
@@ -1,4 +1,3 @@
-
 #include "wxMaracasRenderImageTransformation.h"
 
 /**
@@ -79,19 +78,34 @@ void wxMaracasRenderImageTransformation::Rotate(int x, int y, int z)
 **/
 void wxMaracasRenderImageTransformation::Scale(int x, int y, int z)
 {
+       float resultX = x/100.0;
+       float resultY = y/100.0;
+       float resultZ = z/100.0;
+
+       //printf("wxMaracasRenderImageManagementPanel::Rotate int:scaleX = %d \n",x);
+       //printf("wxMaracasRenderImageManagementPanel::Rotate int:scaleY = %d \n", y);
+       //printf("wxMaracasRenderImageManagementPanel::Rotate int:scaleZ = %d \n", z);
+
+       //printf("wxMaracasRenderImageManagementPanel::Rotate float:scaleX = %f \n", resultX);
+       //printf("wxMaracasRenderImageManagementPanel::Rotate float:scaleY = %f \n", resultY);
+       //printf("wxMaracasRenderImageManagementPanel::Rotate float:scaleZ = %f \n", resultZ);
+
        transformV->Identity();
        transformS1->Identity();
        transformS2->Identity();
        transformS3->Identity();
 
-       transformV->Scale( x, y, z );
-       transformS1->Scale( x, y, z );
-       transformS2->Scale( x, y, z );
-       transformS3->Scale( x, y, z );
+       transformV->Scale( (x/100.0), (y/100.0), (z/100.0) );
+       transformS1->Scale( (x/100.0), (y/100.0), (z/100.0) );
+       transformS2->Scale( (x/100.0), (y/100.0), (z/100.0) );
+       transformS3->Scale( (x/100.0), (y/100.0), (z/100.0) );
 
        Refresh();
 }
 
+/**
+** Updates each Matrix
+**/
 void wxMaracasRenderImageTransformation::Refresh()throw(char*)
 {
        transformV->Update();
@@ -100,15 +114,14 @@ void wxMaracasRenderImageTransformation::Refresh()throw(char*)
        transformS3->Update();
 
        vol->getViewData(propID)->getProp3D()->SetUserMatrix(transformV->GetMatrix());
-       vol->getRenderer()->Render();
+       //vol->getRenderer()->Render();
 
        surface1->getViewData(propID)->getProp3D()->SetUserMatrix(transformV->GetMatrix());
-       surface1->getRenderer()->Render();
+       //surface1->getRenderer()->Render();
 
        surface2->getViewData(propID)->getProp3D()->SetUserMatrix(transformV->GetMatrix());
-       surface2->getRenderer()->Render();
+       //surface2->getRenderer()->Render();
 
        surface3->getViewData(propID)->getProp3D()->SetUserMatrix(transformV->GetMatrix());
        surface3->getRenderer()->Render();
 }
-

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.cpp
index bdeba81ba16c63f27219778cc808d1d32abf877f..eb97a9e421f75f442962ed379a7de1672ab361f0 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.cpp
@@ -17,10 +17,10 @@
 /**
 ** Class constructor
 **/
-wxMaracasRenderTabbedPanel::wxMaracasRenderTabbedPanel(wxWindow* parent)
+wxMaracasRenderTabbedPanel::wxMaracasRenderTabbedPanel(wxWindow* parent, int id)
 : wxPanel(parent, -1, wxDefaultPosition, wxDefaultSize)
 {
-       //_propid = propid;
+       _id = id;
        volmanager = new wxMaracasMultipleVolumeRendererManager();
        surrendmanager1 = new wxMaracasSurfaceRenderingManager();
        surrendmanager2 = new wxMaracasSurfaceRenderingManager();
@@ -36,7 +36,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;  
 }
 
@@ -131,7 +131,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 +155,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 +181,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 +207,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 +477,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 +493,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 +509,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';
@@ -588,7 +588,7 @@ void wxMaracasRenderTabbedPanel::onOpenCutter(wxCommandEvent& event)
 **/
 int wxMaracasRenderTabbedPanel::getPropIdV()
 {
-       return _propidV;
+       return _id;
 }
 
 /**
@@ -596,7 +596,7 @@ int wxMaracasRenderTabbedPanel::getPropIdV()
 **/
 int wxMaracasRenderTabbedPanel::getPropIdSA()
 {
-       return _propidSA;
+       return -1;
 }
 
 /**
@@ -604,7 +604,7 @@ int wxMaracasRenderTabbedPanel::getPropIdSA()
 **/
 int wxMaracasRenderTabbedPanel::getPropIdSB()
 {
-       return _propidSB;
+       return -1;
 }
 
 /**
@@ -612,6 +612,5 @@ int wxMaracasRenderTabbedPanel::getPropIdSB()
 **/
 int wxMaracasRenderTabbedPanel::getPropIdSC()
 {
-       return _propidSC;
-}
-
+       return -1;
+}
\ No newline at end of file

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.h
index a22e5616885ef8e5b5ff70f86309050f3c654074..424f678bc5b963e6e4f44bb92e1b88be1d5e7732 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.h
@@ -14,7 +14,7 @@ class wxMaracasRenderTabbedPanel : public wxPanel
 {
        
 public:
-       wxMaracasRenderTabbedPanel(wxWindow* parent);
+       wxMaracasRenderTabbedPanel(wxWindow* parent, int id);
        ~wxMaracasRenderTabbedPanel();
 
        void createControls(vtkImageData* inImg, std::string pathfile, std::string filename);
@@ -77,17 +77,14 @@ private:
        wxNotebook* wxtabs;
        wxMaracasRenderImageManagementPanel* dialog;
 
-       int _propidV;
-       int _propidSA;
-       int _propidSB;
-       int _propidSC;
-
        bool first;
 
        wxMaracasMultipleVolumeRendererManager* volmanager;
        wxMaracasSurfaceRenderingManager* surrendmanager1;
        wxMaracasSurfaceRenderingManager* surrendmanager2;
        wxMaracasSurfaceRenderingManager* surrendmanager3;
+
+       int _id;
 };
 
 #endif /*wxMaracasMultipleVolumeRendererPanel_H_*/

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRendererView.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRendererView.cxx
index 939a376cce0ed84f194a91d5fad0ec93672e4fcd..a786294da881208d53df4de3ead6388e777df961 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRendererView.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRendererView.cxx
@@ -24,6 +24,7 @@ wxMaracasRendererView::wxMaracasRendererView(wxWindow* parent,std::string path)
 
        wxauimanager = new wxAuiManager(this);
 
+       _idCount = 0;
        _path = path;
 
        std::string iconsdir = path;
@@ -117,6 +118,7 @@ void wxMaracasRendererView::onLoadImageFile()
                {
                        std::string sPath = std::string(pathfile.mb_str());
                        std::string sFileName = std::string(filename.mb_str());
+                       printf("wxMaracasRendererView::onLoadImageFile->Opening file... \n");
                        addVolumes(NULL, sPath, sFileName);
                }
        }
@@ -141,11 +143,13 @@ void wxMaracasRendererView::addPanels(wxMaracasRenderTabbedPanel* wxtabs, vtkIma
 **/
 void wxMaracasRendererView::addVolumes(vtkImageData* img, std::string pathfile, std::string filename)
 {
-       wxMaracasRenderTabbedPanel* wxtabs = new wxMaracasRenderTabbedPanel(this);
+       wxMaracasRenderTabbedPanel* wxtabs = new wxMaracasRenderTabbedPanel(this, _idCount);
        wxtabs->setRenderer(_renderer);
 
        tabsVector.push_back(wxtabs);
        addPanels(wxtabs, img, pathfile, filename);     
+
+       _idCount++;
 }
 /**
 ** Deletes current volume
@@ -209,15 +213,6 @@ ToolBarRenderer::ToolBarRenderer(wxWindow * parent,std::string iconsdir)
        wxBitmap bitmap0(OpenImage_xpm);
        this->AddTool(1, wxString(_T("test")),bitmap0, NULL, wxITEM_NORMAL, wxString(_T("Open File")));
 
-       /*iconfil+= "/Open.png";
-       wxBitmap* bitmap2 = new wxBitmap(wxString(iconfil.c_str(),wxConvUTF8), wxBITMAP_TYPE_PNG);
-       this->AddTool(2, wxString(_T("test")),*bitmap2);        */
-
-       /*iconfil = iconsdir;
-       iconfil+= "/Open.png";
-       wxBitmap* bitmap30 = new wxBitmap(wxString(iconfil.c_str(),wxConvUTF8), wxBITMAP_TYPE_PNG);
-       this->AddTool(30, wxString(_T("test")),*bitmap30);*/
-
        this->Realize();
 
        _evthand = new ToolBarEventHandlerRenderer();

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRendererView.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRendererView.h
index edd3309169d9ae4b659c7da52e0f102998bd89e8..1031d5f8c9e3b2390cbbfff956cc4ea46d20a70d 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRendererView.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRendererView.h
@@ -60,6 +60,8 @@ private:
 
        vtkRenderer*  _renderer;
        std::string _path;
+
+       int _idCount;
 };
 
 class ToolBarEventHandlerRenderer : public wxEvtHandler

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasSurfaceRendering.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasSurfaceRendering.cxx
index fc13b85644a3dee56b42dfe3c4d1007eeef174f9..b6e79b30f5bf34eb3aadb73a4182e8ee14627e48 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasSurfaceRendering.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasSurfaceRendering.cxx
@@ -3,8 +3,8 @@
   Program:   wxMaracas
   Module:    $RCSfile: wxMaracasSurfaceRendering.cxx,v $
   Language:  C++
-  Date:      $Date: 2009/11/13 11:47:41 $
-  Version:   $Revision: 1.6 $
+  Date:      $Date: 2009/11/17 10:24:23 $
+  Version:   $Revision: 1.7 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -183,7 +183,7 @@ void wxMaracasSurfaceRendering::loadPropMHD(wxString filename, wxString dataname
 
 void wxMaracasSurfaceRendering::addPropMHD(vtkImageData* imgdata, std::string dataname){
        try{
-               int id = surrendmanager->addPropMHD(imgdata,dataname);
+               int id = surrendmanager->addPropMHD(-1, imgdata,dataname);
                if(id!=-1){
 
                        wxMaracasSurfaceRenderingPanel* controlpan = new wxMaracasSurfaceRenderingProp3DMHD(this, id, false, -1);
@@ -214,7 +214,7 @@ void wxMaracasSurfaceRendering::loadProp3D(wxString filename, wxString dataname)
 
 void wxMaracasSurfaceRendering::addProp3D(vtkProp3D* prop3D, std::string dataname){
        try{
-               int id = surrendmanager->addProp3D(prop3D,dataname);
+               int id = surrendmanager->addProp3D(-1, prop3D,dataname);
                if(id!=-1){
                        wxMaracasSurfaceRenderingPanel* controlpan = new wxMaracasSurfaceRenderingProp3D(this, id, false, -1);
                        addSurfaceRenderingPanel(controlpan, dataname);

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasSurfaceRenderingManager.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasSurfaceRenderingManager.cxx
index 55aa4e63c607cb229604f5eb5550e7f870c86fd5..53b81d4a355b1b4fdf1466ffd41ef66495a7b5c1 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasSurfaceRenderingManager.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasSurfaceRenderingManager.cxx
@@ -3,8 +3,8 @@
   Program:   wxMaracas
   Module:    $RCSfile: wxMaracasSurfaceRenderingManager.cxx,v $
   Language:  C++
-  Date:      $Date: 2009/11/13 11:47:41 $
-  Version:   $Revision: 1.5 $
+  Date:      $Date: 2009/11/17 10:24:35 $
+  Version:   $Revision: 1.6 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -62,35 +62,49 @@ void wxMaracasSurfaceRenderingManager::Update(int pid)throw(char*){
 /**
 **     Adds a prop3D to the manager and returns the identifier
 **/
-int wxMaracasSurfaceRenderingManager::addProp3D(vtkProp3D* prop3D, std::string dataname)  throw(char*){
+int wxMaracasSurfaceRenderingManager::addProp3D(int idTP, vtkProp3D* prop3D, std::string dataname)  throw(char*){
        checkInvariant();
        if(prop3D != NULL){
                wxMaracasSurfaceRenderingManagerData* data = new wxMaracasSurfaceRenderingManagerData(prop3D, dataname, _interactor);
                prop3Dvect.push_back(data);
                _renderer->AddActor(data->getProp3D());
-               data->setId(_idCount);
-               _idCount++;
+               if(idTP == -1)
+               {
+                       data->setId(_idCount);
+                       _idCount++;
+               }
+               else
+               {
+                       data->setId(idTP);
+               }
                return data->getId();
        }else{
                throw "Check vtkProp3D file or input";
        }
        return -1;
 }
-int wxMaracasSurfaceRenderingManager::addPropMHD(vtkImageData* imagedata, std::string dataname) throw(char*){
+int wxMaracasSurfaceRenderingManager::addPropMHD(int idTP, vtkImageData* imagedata, std::string dataname) throw(char*){
        checkInvariant();
        if(imagedata != NULL){
                image = imagedata;
                wxMaracasSurfaceRenderingManagerData* data = new wxMaracasSurfaceRenderingManagerDataMhd(imagedata, dataname, _interactor);
                prop3Dvect.push_back(data);     
                _renderer->AddActor(data->getProp3D());
-               data->setId(_idCount);
-               _idCount++;
+               if(idTP == -1)
+               {
+                       data->setId(_idCount);
+                       _idCount++;
+               }
+               else
+               {
+                       data->setId(idTP);
+               }
+               printf("wxMaracasSurfaceRenderingManager::addPropMHD->idSurfaceRender: %i\n", data->getId());
                return data->getId();
        }else{
                throw "Check ImageData file or input";
        }
        return -1;
-
 }
 /**
 **     adds or removes an actor depending of the bool value

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasSurfaceRenderingManager.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasSurfaceRenderingManager.h
index d1ec89d4ec379fd227ad6b4c3b9d23311847eaf5..fe1ac98c56794ee530fdffbcd7c48f581a7df061 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasSurfaceRenderingManager.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasSurfaceRenderingManager.h
@@ -3,8 +3,8 @@
   Program:   wxMaracas
   Module:    $RCSfile: wxMaracasSurfaceRenderingManager.h,v $
   Language:  C++
-  Date:      $Date: 2009/11/13 11:47:41 $
-  Version:   $Revision: 1.3 $
+  Date:      $Date: 2009/11/17 10:23:24 $
+  Version:   $Revision: 1.4 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -52,11 +52,11 @@ public:
        /**
        **      Adds a prop3D to the manager and returns the identifier
        **/
-       int addProp3D(vtkProp3D* prop3D, std::string dataname) throw (char*);
+       int addProp3D(int idTP, vtkProp3D* prop3D, std::string dataname) throw (char*);
        /**
        **      Adds a prop3D to the manager and returns the identifier
        **/
-       int addPropMHD(vtkImageData* imagedata, std::string dataname) throw(char*);
+       int addPropMHD(int idTP, vtkImageData* imagedata, std::string dataname) throw(char*);
        /**
        **      Changes the opacity in a prop3D
        **/