From: perez <perez>
Date: Tue, 8 Dec 2009 13:42:39 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: CREATOOLS.2-0-3~89
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=241ec043d82df169705445f317b332207fd1b6b2;p=creaMaracasVisu.git

*** empty log message ***
---

diff --git a/bbtk/src/bbcreaMaracasVisuCutModule.cxx b/bbtk/src/bbcreaMaracasVisuCutModule.cxx
index cc06cf6..ebcfce3 100644
--- a/bbtk/src/bbcreaMaracasVisuCutModule.cxx
+++ b/bbtk/src/bbcreaMaracasVisuCutModule.cxx
@@ -9,7 +9,6 @@ BBTK_ADD_BLACK_BOX_TO_PACKAGE(creaMaracasVisu,CutModule)
 BBTK_BLACK_BOX_IMPLEMENTATION(CutModule,bbtk::WxBlackBox);
 void CutModule::Process()
 {
- 
 	vtkImageData* img = bbGetInputIn();
 	vtkRenderWindowInteractor* interactor = bbGetInputInteractor();
 	vtkRenderer* render = bbGetInputRenderer();
@@ -33,6 +32,7 @@ void CutModule::CreateWidget(wxWindow* parent)
 
 	std::string path = crea::System::GetDllAppPath("bbcreaMaracasVisu.dll");
 	_mainpanel = CutModelMainPanel::getInstance(parent, path);
+	_mainpanel->SetType(0);
 	
    bbSetOutputWidget( _mainpanel); 
    Process(); 
diff --git a/bbtk/src/bbcreaMaracasVisuCutModule2.cxx b/bbtk/src/bbcreaMaracasVisuCutModule2.cxx
index 3934593..ae894ae 100644
--- a/bbtk/src/bbcreaMaracasVisuCutModule2.cxx
+++ b/bbtk/src/bbcreaMaracasVisuCutModule2.cxx
@@ -29,7 +29,8 @@ namespace bbcreaMaracasVisu
 	{
 
 		std::string path = crea::System::GetDllAppPath("bbcreaMaracasVisu.dll");
-		_mainpanel = CutModel2MainPanel::getInstance(parent, path);
+		_mainpanel = CutModelMainPanel::getInstance(parent, path);
+		_mainpanel->SetType(1);
 		
 	   bbSetOutputWidget( _mainpanel); 
 	   Process(); 
diff --git a/bbtk/src/bbcreaMaracasVisuCutModule2.h b/bbtk/src/bbcreaMaracasVisuCutModule2.h
index fc70f98..a6d04e2 100644
--- a/bbtk/src/bbcreaMaracasVisuCutModule2.h
+++ b/bbtk/src/bbcreaMaracasVisuCutModule2.h
@@ -3,7 +3,7 @@
 #define __bbcreaMaracasVisuCutModule_h_INCLUDED__
 #include "bbcreaMaracasVisu_EXPORT.h"
 #include "bbtkWxBlackBox.h"
-#include "CutModel2MainPanel.h"
+#include "CutModelMainPanel.h"
 
 namespace bbcreaMaracasVisu
 {
@@ -24,7 +24,7 @@ class bbcreaMaracasVisu_EXPORT CutModule2
   void CreateWidget(wxWindow*);
 
 private:
-	CutModel2MainPanel* _mainpanel;
+	CutModelMainPanel* _mainpanel;
 	vtkImageData* _currentimage;
 };
 
diff --git a/bbtk/src/bbmaracasvisuViewerNV.cxx b/bbtk/src/bbmaracasvisuViewerNV.cxx
index 695ef94..08c084b 100644
--- a/bbtk/src/bbmaracasvisuViewerNV.cxx
+++ b/bbtk/src/bbmaracasvisuViewerNV.cxx
@@ -31,7 +31,7 @@ bbwxMaracas_N_ViewersWidget::~bbwxMaracas_N_ViewersWidget()
 //-------------------------------------------------------------
 void bbwxMaracas_N_ViewersWidget::OnRefreshView(wxCommandEvent & event)
 {
-	
+	printf("CPR: bbwxMaracas_N_ViewersWidget::OnRefreshView -> actualiza X, Y y Z\n");
 	mbbViewerNV->point.clear();
 
 	mbbViewerNV->point.push_back( (int)GetX() );
diff --git a/lib/maracasVisuLib/src/CutModule/interface/CutModelMainPanel.cxx b/lib/maracasVisuLib/src/CutModule/interface/CutModelMainPanel.cxx
index c30a641..4594e2f 100644
--- a/lib/maracasVisuLib/src/CutModule/interface/CutModelMainPanel.cxx
+++ b/lib/maracasVisuLib/src/CutModule/interface/CutModelMainPanel.cxx
@@ -3,8 +3,8 @@
   Program:   wxMaracas
   Module:    $RCSfile: CutModelMainPanel.cxx,v $
   Language:  C++
-  Date:      $Date: 2009/11/25 16:35:36 $
-  Version:   $Revision: 1.4 $
+  Date:      $Date: 2009/12/08 13:42:48 $
+  Version:   $Revision: 1.5 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -39,7 +39,7 @@ CutModelMainPanel::CutModelMainPanel( wxWindow* parent, std::string path)
 : wxPanel(parent, -1, wxDefaultPosition, wxDefaultSize){
 
 	cutmanager=NULL;
-
+	
 	initialize(path);
 
 }
@@ -278,7 +278,7 @@ void CutModelMainPanel::ExecuteCut(int id, double* range, bool isinside){
 }
 
 void CutModelMainPanel::ExecuteAll(){
-	for(int i = 0; i < viewpanels.size();i++){
+	for(int i = 0; i < viewpanels.size(); i++){
 		viewpanels[i]->ExecuteCut();
 	}
 
@@ -312,10 +312,18 @@ void CutModelMainPanel::SaveCutModelData(std::string filename){
 void CutModelMainPanel::LoadCutModelData(std::string filename){
     cutmanager->LoadCutModelData(filename);
 }
+
+void CutModelMainPanel::SetType(int type){
+	_type = type;
+}
+
+int CutModelMainPanel::GetType(){
+	return _type;
+}
+
 /**
 **
 **/
-
 ToolBarCutModel::ToolBarCutModel(wxWindow * parent)
 : wxToolBar(parent, -1, wxDefaultPosition, wxDefaultSize)
 {
diff --git a/lib/maracasVisuLib/src/CutModule/interface/CutModelMainPanel.h b/lib/maracasVisuLib/src/CutModule/interface/CutModelMainPanel.h
index 92f30cd..96891b2 100644
--- a/lib/maracasVisuLib/src/CutModule/interface/CutModelMainPanel.h
+++ b/lib/maracasVisuLib/src/CutModule/interface/CutModelMainPanel.h
@@ -3,8 +3,8 @@
   Program:   wxMaracas
   Module:    $RCSfile: CutModelMainPanel.h,v $
   Language:  C++
-  Date:      $Date: 2009/09/08 08:14:25 $
-  Version:   $Revision: 1.3 $
+  Date:      $Date: 2009/12/08 13:42:48 $
+  Version:   $Revision: 1.4 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -84,6 +84,10 @@ public:
 
 	void ShowStatistics(int id);
 
+	void SetType(int type);
+
+	int GetType();
+
 	
 private:
 
@@ -111,6 +115,8 @@ private:
 	 CutModelView* getModelView(int id)throw( CutModelException);
 
 	 int _panelid;
+
+	 int _type;
 };
 
 
diff --git a/lib/maracasVisuLib/src/CutModule/kernel/CutModel2Manager.cxx b/lib/maracasVisuLib/src/CutModule/kernel/CutModel2Manager.cxx
index 0cbe88a..6e00b2f 100644
--- a/lib/maracasVisuLib/src/CutModule/kernel/CutModel2Manager.cxx
+++ b/lib/maracasVisuLib/src/CutModule/kernel/CutModel2Manager.cxx
@@ -3,8 +3,8 @@
   Program:   wxMaracas
   Module:    $RCSfile: CutModel2Manager.cxx,v $
   Language:  C++
-  Date:      $Date: 2009/11/23 13:00:30 $
-  Version:   $Revision: 1.3 $
+  Date:      $Date: 2009/12/08 13:42:39 $
+  Version:   $Revision: 1.4 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -22,7 +22,7 @@
 CutModel2Manager::CutModel2Manager(std::string path){
 	_path = path;
 	_img = NULL;
-	_copyimg = NULL;
+	_img2 = NULL;
 	_interactor = NULL;	
 	_render = NULL;
 	_currentaction=0;
@@ -31,20 +31,25 @@ CutModel2Manager::~CutModel2Manager(){
 	std::string files = _path;
     files+="/infounrd_0_fig_0.info";	
 	remove(files.c_str());
+	_vectordata.clear();
+	_img = NULL;
+	_img2 = NULL;
+	_interactor = NULL;	
+	_render = NULL;
 }
 
 
 void CutModel2Manager::setImageData(vtkImageData* img){
     _img = img;
-	if(_copyimg!=NULL){
-		_copyimg->Delete();
+	if(_img2!=NULL){
+		_img2->Delete();
 	}
-	_copyimg = vtkImageData::New();
-	_copyimg->SetExtent(_img->GetExtent());
-	_copyimg->SetSpacing(_img->GetSpacing());
-	_copyimg->AllocateScalars();
+	_img2 = vtkImageData::New();
+	_img2->SetExtent(_img->GetExtent());
+	_img2->SetSpacing(_img->GetSpacing());
+	_img2->AllocateScalars();
 
-	_copyimg->DeepCopy(_img);
+	_img2->DeepCopy(_img);
 
 }
 
@@ -59,8 +64,7 @@ void CutModel2Manager::setRenderer(vtkRenderer* renderer){
 void CutModel2Manager::onAddCutModel2(int id, vtkCommand* observer) throw( CutModelException){
 	checkInvariant();
 
-	
-	CutModelData* data = new CutModelData(id,_interactor, observer, _copyimg);
+	CutModelData* data = new CutModelData(id,_interactor, observer, _img2);
 	_vectordata.push_back(data);
 
 	_render->AddActor(data->getActor());
@@ -73,7 +77,7 @@ void CutModel2Manager::checkInvariant() throw( CutModelException){
 	if(_img==NULL){
 		throw CutModelException("The image is not set");
 	}
-	if(_copyimg==NULL){
+	if(_img2==NULL){
 		throw CutModelException("The copyimage is not set");
 	}
 	if(_interactor==NULL){
@@ -86,7 +90,7 @@ void CutModel2Manager::checkInvariant() throw( CutModelException){
 
 double* CutModel2Manager::getImageRange()throw( CutModelException){
 	checkInvariant();
-	return _copyimg->GetScalarRange();
+	return _img2->GetScalarRange();
 }
 
 void CutModel2Manager::changeOpacity(int id,int opacity)throw( CutModelException){
@@ -178,7 +182,7 @@ void CutModel2Manager::ExecuteCut(int id, double* range, bool isinside)throw( Cu
 
 vtkImageData* CutModel2Manager::GetResultImage(){
 	 checkInvariant();
-     return _copyimg;
+     return _img2;
 }
 
 void CutModel2Manager::RefreshActor(int id){
@@ -246,7 +250,7 @@ int CutModel2Manager::Undo()	throw( CutModelException){
 
 			currentmodel->setCurrentShape(currentundo->getCurrentShape());
 
-			currentmodel->ExecuteUnCut(currentundo->getIsInside(), _copyimg, _img);
+			currentmodel->ExecuteUnCut(currentundo->getIsInside(), _img2, _img);
 
 		}
 		//Every thing ok
@@ -268,9 +272,9 @@ int CutModel2Manager::Redo()	throw( CutModelException){
 			//Redo the cut
 			vtkTransform* transform = currentundo->getTransformFromMatrixFile();
 			currentmodel = getCutModelData(currentundo->getId());
-			currentmodel->setTransform(transform, _copyimg);
+			currentmodel->setTransform(transform, _img2);
 			currentmodel->setCurrentShape(currentundo->getCurrentShape());
-			currentmodel->ExecuteCut(currentundo->getRange(), currentundo->getIsInside(), _copyimg);
+			currentmodel->ExecuteCut(currentundo->getRange(), currentundo->getIsInside(), _img2);
 		}
 
 		_currentaction++;
diff --git a/lib/maracasVisuLib/src/CutModule/kernel/CutModel2Manager.h b/lib/maracasVisuLib/src/CutModule/kernel/CutModel2Manager.h
index 0e4e614..91c02b1 100644
--- a/lib/maracasVisuLib/src/CutModule/kernel/CutModel2Manager.h
+++ b/lib/maracasVisuLib/src/CutModule/kernel/CutModel2Manager.h
@@ -3,8 +3,8 @@
   Program:   wxMaracas
   Module:    $RCSfile: CutModel2Manager.h,v $
   Language:  C++
-  Date:      $Date: 2009/11/23 13:00:31 $
-  Version:   $Revision: 1.3 $
+  Date:      $Date: 2009/12/08 13:42:39 $
+  Version:   $Revision: 1.4 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -86,7 +86,7 @@ private:
 	void checkInvariant() throw( CutModelException);
 	std::string _path;
 	vtkImageData* _img;
-	vtkImageData* _copyimg;
+	vtkImageData* _img2;
 	vtkRenderer* _render;
 	vtkRenderWindowInteractor* _interactor;
 
diff --git a/lib/maracasVisuLib/src/CutModule/kernel/CutModelManager.cxx b/lib/maracasVisuLib/src/CutModule/kernel/CutModelManager.cxx
index 101afaa..af04535 100644
--- a/lib/maracasVisuLib/src/CutModule/kernel/CutModelManager.cxx
+++ b/lib/maracasVisuLib/src/CutModule/kernel/CutModelManager.cxx
@@ -3,8 +3,8 @@
   Program:   wxMaracas
   Module:    $RCSfile: CutModelManager.cxx,v $
   Language:  C++
-  Date:      $Date: 2009/11/25 16:35:37 $
-  Version:   $Revision: 1.4 $
+  Date:      $Date: 2009/12/08 13:42:39 $
+  Version:   $Revision: 1.5 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -15,6 +15,7 @@
 
 =========================================================================*/
 #include "CutModelManager.h"
+#include "CutModelMainPanel.h"
 
 /**
 **	Start of the manager class
@@ -22,10 +23,11 @@
 CutModelManager::CutModelManager(std::string path){
 	_path = path;
 	_img = NULL;
-	_copyimg = NULL;
+	_img2 = NULL;
 	_interactor = NULL;	
 	_render = NULL;
 	_currentaction=0;
+	
 }
 CutModelManager::~CutModelManager(){
 	std::string files = _path;
@@ -33,24 +35,42 @@ CutModelManager::~CutModelManager(){
 	remove(files.c_str());	
 	_vectordata.clear();
 	_img = NULL;
-	_copyimg = NULL;
+	_img2 = NULL;
 	_interactor = NULL;	
 	_render = NULL;
 }
 
 
 void CutModelManager::setImageData(vtkImageData* img){
-    _img = img;
-	if(_copyimg!=NULL){
-		_copyimg->Delete();
+	int type = CutModelMainPanel::getInstance()->GetType();
+	if( type == 0)
+	{
+		_img = img;
+
+		if(_img2!=NULL){
+		_img2->Delete();
+		}
+		_img2 = vtkImageData::New();
+		_img2->SetExtent(_img->GetExtent());
+		_img2->SetSpacing(_img->GetSpacing());
+		_img2->AllocateScalars();
+
+		_img2->DeepCopy(_img);
 	}
-	_copyimg = vtkImageData::New();
-	_copyimg->SetExtent(_img->GetExtent());
-	_copyimg->SetSpacing(_img->GetSpacing());
-	_copyimg->AllocateScalars();
+	else
+	{
+		_img2 = img;
 
-	_copyimg->DeepCopy(_img);
+		if(_img!=NULL){
+			_img->Delete();
+		}
+		_img = vtkImageData::New();
+		_img->SetExtent(_img2->GetExtent());
+		_img->SetSpacing(_img2->GetSpacing());
+		_img->AllocateScalars();
 
+		_img->DeepCopy(_img2);
+	}
 }
 
 void CutModelManager::setInteractor(vtkRenderWindowInteractor* interactor){
@@ -64,6 +84,7 @@ void CutModelManager::setRenderer(vtkRenderer* renderer){
 void CutModelManager::onAddCutModel(int id, vtkCommand* observer) throw( CutModelException){
 	checkInvariant();
 
+	
 	CutModelData* data = new CutModelData(id,_interactor, observer, _img);
 	_vectordata.push_back(data);
 
@@ -77,7 +98,7 @@ void CutModelManager::checkInvariant() throw( CutModelException){
 	if(_img==NULL){
 		throw CutModelException("The image is not set");
 	}
-	if(_copyimg==NULL){
+	if(_img2==NULL){
 		throw CutModelException("The image is not set");
 	}
 	if(_interactor==NULL){
@@ -170,7 +191,7 @@ void CutModelManager::ExecuteCut(int id, double* range, bool isinside)throw( Cut
     checkInvariant();
 		
 	CutModelData* current = getCutModelData(id);
-	current->ExecuteCut(range, isinside,_copyimg);
+	current->ExecuteCut(range, isinside,_img2);
 
 
 	/*
@@ -184,7 +205,7 @@ void CutModelManager::ExecuteCut(int id, double* range, bool isinside)throw( Cut
 
 vtkImageData* CutModelManager::GetResultImage(){
 	 checkInvariant();
-     return _copyimg;
+     return _img2;
 }
 
 void CutModelManager::RefreshActor(int id){
@@ -248,11 +269,11 @@ int CutModelManager::Undo()	throw( CutModelException){
 
 			currentmodel = getCutModelData(currentundo->getId());
 
-			currentmodel->setTransform(transform, _copyimg);
+			currentmodel->setTransform(transform, _img2);
 
 			currentmodel->setCurrentShape(currentundo->getCurrentShape());
 
-			currentmodel->ExecuteUnCut(currentundo->getIsInside(), _img, _copyimg);
+			currentmodel->ExecuteUnCut(currentundo->getIsInside(), _img, _img2);
 
 		}
 		//Every thing ok
@@ -274,9 +295,9 @@ int CutModelManager::Redo()	throw( CutModelException){
 			//Redo the cut
 			vtkTransform* transform = currentundo->getTransformFromMatrixFile();
 			currentmodel = getCutModelData(currentundo->getId());
-			currentmodel->setTransform(transform, _copyimg);
+			currentmodel->setTransform(transform, _img2);
 			currentmodel->setCurrentShape(currentundo->getCurrentShape());
-			currentmodel->ExecuteCut(currentundo->getRange(), currentundo->getIsInside(), _copyimg);
+			currentmodel->ExecuteCut(currentundo->getRange(), currentundo->getIsInside(), _img2);
 		}
 
 		_currentaction++;
diff --git a/lib/maracasVisuLib/src/CutModule/kernel/CutModelManager.h b/lib/maracasVisuLib/src/CutModule/kernel/CutModelManager.h
index 14907c5..3d84c8f 100644
--- a/lib/maracasVisuLib/src/CutModule/kernel/CutModelManager.h
+++ b/lib/maracasVisuLib/src/CutModule/kernel/CutModelManager.h
@@ -3,8 +3,8 @@
   Program:   wxMaracas
   Module:    $RCSfile: CutModelManager.h,v $
   Language:  C++
-  Date:      $Date: 2009/09/08 08:14:27 $
-  Version:   $Revision: 1.3 $
+  Date:      $Date: 2009/12/08 13:42:39 $
+  Version:   $Revision: 1.4 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -79,6 +79,7 @@ public:
 	int Undo()throw( CutModelException);
 
 	int Redo()throw( CutModelException);
+
 private:
 	
 	int _currentaction;
@@ -86,7 +87,7 @@ private:
 	void checkInvariant() throw( CutModelException);
 	std::string _path;
 	vtkImageData* _img;
-	vtkImageData* _copyimg;
+	vtkImageData* _img2;
 	vtkRenderer* _render;
 	vtkRenderWindowInteractor* _interactor;
 
diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasDialog_NViewers.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasDialog_NViewers.cpp
index 086d31c..270fbbd 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasDialog_NViewers.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasDialog_NViewers.cpp
@@ -15,10 +15,11 @@ wxMaracasDialog_NViewers::wxMaracasDialog_NViewers(wxWindow* parent, vtkImageDat
 : wxFrame(parent, -1, title)
 {
 	panelcut = new wxPanel(this, -1);
+	panelcut->SetSize(800, 700);
 	viewer = new wxMaracas_N_ViewersWidget(panelcut, img, type);
-	sizer = new wxFlexGridSizer(2);
+	sizer = new wxFlexGridSizer(2, 1);
 
-	sizer->Add(viewer, wxALL|wxEXPAND, 1);
+	sizer->Add(viewer, wxGROW, 1);
 	panelcut->SetSizer( sizer, true );		
 	panelcut->SetAutoLayout( true );
 	//viewer->SetSize(wxSizer(wxALL|wxEXPAND));
@@ -39,7 +40,7 @@ void wxMaracasDialog_NViewers::AddPanel(wxWindow* panel)
 
 	panel->SetSize(400, 200);
 
-	sizer->Add(panel, wxALL|wxEXPAND);
+	sizer->Add(panel, wxGROW);
 	panelcut->SetSizer( sizer, true );		
 	panelcut->SetAutoLayout( true );
 }
diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.cpp
index 80eb7e5..0889c62 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.cpp
@@ -1,21 +1,23 @@
 #include "wxMaracasRenderTabbedPanel.h"
-#include "HistogramDialogComboBox.h"
 
+#include "HistogramDialogComboBox.h"
 #include "wxMaracasMultipleVolumeRendererPanel.h"
 #include "wxMaracasSurfaceRenderingPanel.h"
 #include "wxMaracasSurfaceRenderingProp3DMHD.h"
 #include "wxMaracasMultipleVolumeRendererManagerData.h"
 #include "wxMaracasDialog_NViewers.h"
+#include "wxVtkMPR3DViewCntrlPanel.h"
 
 #include <wx/colordlg.h>
 #include <wx/button.h> 
-
+#include <vtkProp3D.h>
 #include <OpenImage.xpm>
+
 #include "Color.xpm"
 #include "creaSystem.h"
 
-#include <vtkProp3D.h>
-#include "wxVtkMPR3DViewCntrlPanel.h"
+
+
 
 /**
 ** Class constructor
@@ -259,23 +261,7 @@ void wxMaracasRenderTabbedPanel::addSurface3(vtkImageData* img, std::string data
 **/
 void wxMaracasRenderTabbedPanel::addMPROptions()
 {
-	int x = 0,y = 0,z = 0;
-	int ext[6];
-	ext[0] = 0;
-	ext[1] = 0;
-	ext[2] = 0;
-	ext[3] = 0;
-	ext[4] = 0;
-	ext[5] = 0;
-
-	double org[3],spc[3];
-	org[0] = 0;
-	org[1] = 0;
-	org[2] = 0;
-	spc[0] = 0;
-	spc[1] = 0;
-	spc[2] = 0;
-
+	//Panel Construction
 	vtkMPRBaseData* mvtkmprbasedata = new vtkMPRBaseData(); 
 	marImageData*	marimagedata	= new marImageData( getVolImage() );			
 	mvtkmprbasedata					->SetMarImageData(marimagedata);
@@ -295,6 +281,24 @@ void wxMaracasRenderTabbedPanel::addMPROptions()
 	panelControl->SetSize(400,350);
 	panelControl->Layout();
 
+	//Configure MPR
+	int x = 0,y = 0,z = 0;
+	int ext[6];
+	ext[0] = 0;
+	ext[1] = 0;
+	ext[2] = 0;
+	ext[3] = 0;
+	ext[4] = 0;
+	ext[5] = 0;
+
+	double org[3],spc[3];
+	org[0] = 0;
+	org[1] = 0;
+	org[2] = 0;
+	spc[0] = 0;
+	spc[1] = 0;
+	spc[2] = 0;
+
 	if (mvtkmprbasedata!=NULL)
 	{
 		mvtkmprbasedata->Configure();
@@ -325,7 +329,9 @@ void wxMaracasRenderTabbedPanel::addMPROptions()
 	}
 
 	if (baseView!=NULL)	
+	{
 		baseView			->Configure();	
+	}
 
 	if (vtkmpr3Ddataviewer	!=NULL) 
 	{
@@ -461,7 +467,6 @@ void wxMaracasRenderTabbedPanel::SetValuesPointsFunction(int volid, std::vector<
 		diag->ShowModal();
 		delete diag;
 	}
-	
 }
 
 /**
@@ -766,15 +771,15 @@ void wxMaracasRenderTabbedPanel::onOpenCutter(wxCommandEvent& event)
 	vtkImageData* img = getVolImage();	
 	std::vector<int> type;
 	type.push_back(5);
-	type.push_back(0);
 	type.push_back(1);
-	type.push_back(3);
+	type.push_back(2);
+	type.push_back(0);
 	
 	wxMaracasDialog_NViewers* dialog1 = new wxMaracasDialog_NViewers(this, img, &type, wxString(_T("Cut Module") ));
 	dialog1->SetSize(800, 700);
 	
 	std::string path = crea::System::GetDllAppPath("bbcreaMaracasVisu.dll");
-	cutter = CutModel2MainPanel::getInstance(dialog1->getinternalPanel(), path);
+	cutter = CutModelMainPanel::getInstance(dialog1->getinternalPanel(), path);
 	cutter->setRenderer( dialog1->getViewer()->GetwxVtkBaseView(1)->GetRenderer() );
 	cutter->setInteractor( dialog1->getViewer()->GetwxVtkBaseView(1)->GetWxVTKRenderWindowInteractor() );
 	cutter->setImageData(getVolImage());
diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.h
index 4118b75..097d54a 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.h
@@ -5,7 +5,7 @@
 #include <wx/notebook.h> 
 
 #include "wxMaracasRenderImageManagementPanel.h"
-#include "CutModel2MainPanel.h"
+#include "CutModelMainPanel.h"
 #include "wxMaracasMultipleVolumeRendererManager.h"
 #include "wxMaracasSurfaceRenderingManager.h"
 #include "wxVtkBaseView.h"
@@ -73,20 +73,18 @@ private:
 	wxCheckBox* checkboxSB;
 	wxCheckBox* checkboxSC;
 	wxCheckBox* checkboxViewer;
-	//wxBitmapButton* _viewimage;
-
+	wxPanel*	controlPanelMPR3D;
 	wxNotebook* wxtabs;
 	wxString	volname;
 	
 	wxVtk3DBaseView*	baseView;
 	wxVtkMPR3DView*		mwxvtkmpr3Dview;
 	vtkMPR3DDataViewer* vtkmpr3Ddataviewer;
-	wxPanel*			controlPanelMPR3D;
 
 	bool first;
 	int _id;
 
-	CutModel2MainPanel* cutter;
+	CutModelMainPanel*						cutter;
 	wxMaracasRenderImageManagementPanel*	dialog;
 	wxMaracasMultipleVolumeRendererManager* volmanager;
 	wxMaracasSurfaceRenderingManager*		surrendmanager1;
@@ -94,5 +92,4 @@ private:
 	wxMaracasSurfaceRenderingManager*		surrendmanager3;
 };
 
-#endif /*wxMaracasMultipleVolumeRendererPanel_H_*/
-
+#endif /*wxMaracasMultipleVolumeRendererPanel_H_*/
\ No newline at end of file
diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRendererView.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRendererView.cxx
index 8f7c5aa..8de5499 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRendererView.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRendererView.cxx
@@ -165,38 +165,6 @@ void wxMaracasRendererView::deleteVolume(int volid)
 	getTabbedPanel(volid)->deleteVolume(volid);
 }
 
-/**
-** Adds or removes a volume rendering actor
-**/
-void wxMaracasRendererView::addRemoveActorVol(int id, bool addremove)
-{
-	//wxtabs->addRemoveActorV(id, addremove);
-}
-
-/**
-** Adds or removes a surface rendering actor
-**/
-void wxMaracasRendererView::addRemoveSurf1Actor(int id, bool addremove)
-{
-	//wxtabs->addRemoveActorSA(id, addremove);
-}
-
-/**
-** Adds or removes a surface rendering actor
-**/
-void wxMaracasRendererView::addRemoveSurf2Actor(int id, bool addremove)
-{
-	//wxtabs->addRemoveActorSB(id, addremove);
-}
-
-/**
-** Adds or removes a surface rendering actor
-**/
-void wxMaracasRendererView::addRemoveSurf3Actor(int id, bool addremove)
-{
-	//wxtabs->addRemoveActorSC(id, addremove);
-}
-
 /**
 ** Gets opened file names
 **/
diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRendererView.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRendererView.h
index fed3eee..766bf7e 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRendererView.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRendererView.h
@@ -21,8 +21,6 @@
 #include "wxMaracasRenderTabbedPanel.h"
 #include "wxMaracasMultipleVolumeRendererManager.h"
 #include "wxMaracasSurfaceRenderingManager.h"
-//#include "wxMaracasMultipleVolumeRendererPanel.h"
-//#include "wxMaracasSurfaceRenderingProp3DMHD.h"
 
 class  creaMaracasVisu_EXPORT  wxMaracasRendererView : public wxPanel
 {
@@ -44,11 +42,6 @@ public:
 	void addPanels(wxMaracasRenderTabbedPanel* wxtabs, vtkImageData* img, std::string pathfile, std::string filename);
 
 	void deleteVolume(int volid);
-	void addRemoveActorVol(int id, bool remove);
-	void addRemoveSurf1Actor(int id, bool addremove);
-	void addRemoveSurf2Actor(int id, bool addremove);
-	void addRemoveSurf3Actor(int id, bool addremove);
-
 	std::vector<std::string> getFiles();
 
 private: