*** empty log message ***

diff --git a/bbtk/CMakeLists.txt b/bbtk/CMakeLists.txt
index ef95a144d692ad890b01ba31d7795b52f8fbf70f..a146c52b76536db7686c35197c8c4fdb468bb38f 100644 (file)
--- a/bbtk/CMakeLists.txt
+++ b/bbtk/CMakeLists.txt
@@ -134,6 +134,8 @@ SET(${BBTK_PACKAGE_NAME}_INCLUDE_DIRS
        ../lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour
        ../lib/maracasVisuLib/src/CutModule/interface
        ../lib/maracasVisuLib/src/CutModule/kernel
+       ../lib/maracasVisuLib/src/CutModule2/interface
+       ../lib/maracasVisuLib/src/CutModule2/kernel
 ###    ${MaracasSrcDir}/ILPD/src/wxInterface
     )
   #===========================================================================
@@ -363,6 +365,8 @@ SET(${BBTK_PACKAGE_NAME}_LIBS
   creaMaracasVisu
   creaMaracasVisu_CutModule_interface
   creaMaracasVisu_CutModule_kernel
+  creaMaracasVisu_CutModule2_interface
+  creaMaracasVisu_CutModule2_kernel
 ###  ILPDModel.lib
 ###  ILPDInterface
 ###  ILPDcontrolerInterface

diff --git a/lib/maracasVisuLib/src/CMakeLists.txt b/lib/maracasVisuLib/src/CMakeLists.txt
index b3b3a69235f54ac2578b9348c05cb41a123473d7..9ad88912eead49507e3c664dbf409a152c977713 100644 (file)
--- a/lib/maracasVisuLib/src/CMakeLists.txt
+++ b/lib/maracasVisuLib/src/CMakeLists.txt
@@ -1 +1,2 @@
 SUBDIRS(CutModule)
+SUBDIRS(CutModule2)

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererManager.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererManager.cxx
index b7b11357d924a7a0513dbf5cba2a83fefbb28713..3158ef9e6808dd866eb7bd079373f9998e73bd5b 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/17 10:22:26 $
-  Version:   $Revision: 1.7 $
+  Date:      $Date: 2009/11/18 13:13:25 $
+  Version:   $Revision: 1.8 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -70,7 +70,7 @@ int wxMaracasMultipleVolumeRendererManager::addVolume(int idTP, vtkImageData* vo
                {
                        data->setId(idTP);
                }
-               printf("wxMaracasMultipleVolumeRendererManager::addVolume->idVolumeRenderer: %i", data->getId());
+               printf("wxMaracasMultipleVolumeRendererManager::addVolume->idVolumeRenderer: %i\n", data->getId());
                return data->getId();
        }else{
                throw "Check mhd imagefile file or input";

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererPanel.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererPanel.cxx
index 0844b784a1b3c2541e58829614ef758f02b95aed..bbbd73bb962a0e6492e5b717e83fd37a1daae82d 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererPanel.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererPanel.cxx
@@ -198,8 +198,8 @@ void wxMaracasMultipleVolumeRendererPanel::onColorChange(wxCommandEvent& event){
 **/
 void wxMaracasMultipleVolumeRendererPanel::onViewImage(wxCommandEvent& event)
 {      
-       printf("wxMaracasMultipleVolumeRendererPanel->onViewImage: Test View Image");
-       vtkImageData* img = (wxMaracasRendererView::getInstance())->getTabbedPanel(this->_propid)->getVolImage(_propid);
+       printf("wxMaracasMultipleVolumeRendererPanel->onViewImage: Test View Image /n");
+       vtkImageData* img = (wxMaracasRendererView::getInstance())->getTabbedPanel(_propid)->getVolImage();
        /*wxMaracasDialog_NViewers* dialog = new wxMaracasDialog_NViewers(this);
 
        std::vector<int> type;
@@ -230,7 +230,6 @@ void wxMaracasMultipleVolumeRendererPanel::onCheckBoxChange(wxCommandEvent& even
                wxMaracasMultipleVolumeRendererView::getInstance()->addRemoveActor(this->getPropId(), checkbox->GetValue());    
 }
 
-
 /**
 ** Gets the propId
 **/

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.cpp
index eb97a9e421f75f442962ed379a7de1672ab361f0..83c26f26f1ac306e141b6a69a48095a76907bac0 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.cpp
@@ -81,14 +81,12 @@ 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)
                {
-                       //s = std::string(filename.mb_str());
                        addVolume(img, filename);
                        addSurface1(img1, filename);
                        addSurface2(img2, filename);
@@ -98,7 +96,6 @@ void wxMaracasRenderTabbedPanel::createControls(vtkImageData* inImg, std::string
        }       
        else
        {
-               //s = std::string(filename.mb_str());
                addVolume(inImg, filename);
                addSurface1(inImg, filename);
                addSurface2(inImg, filename);
@@ -546,7 +543,7 @@ void wxMaracasRenderTabbedPanel::onColorChange(wxCommandEvent& event)
 /**
 ** 
 **/
-vtkImageData* wxMaracasRenderTabbedPanel::getVolImage(int id)
+vtkImageData* wxMaracasRenderTabbedPanel::getVolImage()
 {      
        return volmanager->getImageData();
 }
@@ -554,7 +551,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 +559,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 +567,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 +586,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

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.h
index 424f678bc5b963e6e4f44bb92e1b88be1d5e7732..811d6dbd181725c8eb53b392a79e2484242ccb1f 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.h
@@ -57,15 +57,12 @@ public:
        void onColorChange(wxCommandEvent& event);
        void onOpenCutter(wxCommandEvent& event);
 
-       vtkImageData* getVolImage(int id);
-       vtkImageData* getSurfAImage(int id);
-       vtkImageData* getSurfBImage(int id);
-       vtkImageData* getSurfCImage(int id);
+       vtkImageData* getVolImage();
+       vtkImageData* getSurfAImage();
+       vtkImageData* getSurfBImage();
+       vtkImageData* getSurfCImage();
 
        int getPropIdV();
-       int getPropIdSA();
-       int getPropIdSB();
-       int getPropIdSC();
        
 private:
        wxCheckBox* checkboxVol;

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasSurfaceRenderingProp3D.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasSurfaceRenderingProp3D.cxx
index 1200c68261699a8802df5f4dec4013dbede192bc..efcf931303e7ea0193ca5487668a941c8cf8ac34 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasSurfaceRenderingProp3D.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasSurfaceRenderingProp3D.cxx
@@ -159,8 +159,8 @@ void wxMaracasSurfaceRenderingProp3D::onOpacityRelease(wxScrollEvent& event ){
 ** Loads the volume in a separate window
 **/
 void wxMaracasSurfaceRenderingProp3D::onViewImage(wxCommandEvent& event){      
-       printf("wxMaracasSurfaceRenderingProp3D->onViewImage: Test View Image");
-       vtkImageData* image = ((wxMaracasRendererView::getInstance())->getTabbedPanel(this->_propid))->getVolImage(this->_propid);
-       
-}
+       printf("wxMaracasSurfaceRenderingProp3D->onViewImage: Test View Image \n");
+       vtkImageData* image = ((wxMaracasRendererView::getInstance())->getTabbedPanel(this->_propid))->getVolImage();
 
+               
+}
\ No newline at end of file