From 897a0bac598efea92fed1b94f4eeaa8adb337757 Mon Sep 17 00:00:00 2001
From: perez <perez>
Date: Thu, 19 Nov 2009 17:00:21 +0000
Subject: [PATCH] *** empty log message ***

---
 bbtk/CMakeLists.txt                           |  4 ----
 .../interface/CutModel2MainPanel.cxx          | 24 +++++++++----------
 .../CutModule/interface/CutModel2MainPanel.h  | 14 +++++------
 3 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/bbtk/CMakeLists.txt b/bbtk/CMakeLists.txt
index a146c52..ef95a14 100644
--- a/bbtk/CMakeLists.txt
+++ b/bbtk/CMakeLists.txt
@@ -134,8 +134,6 @@ 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
     )
   #===========================================================================
@@ -365,8 +363,6 @@ 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/CutModule/interface/CutModel2MainPanel.cxx b/lib/maracasVisuLib/src/CutModule/interface/CutModel2MainPanel.cxx
index 4b0367f..5f8cb2d 100644
--- a/lib/maracasVisuLib/src/CutModule/interface/CutModel2MainPanel.cxx
+++ b/lib/maracasVisuLib/src/CutModule/interface/CutModel2MainPanel.cxx
@@ -3,8 +3,8 @@
   Program:   wxMaracas
   Module:    $RCSfile: CutModel2MainPanel.cxx,v $
   Language:  C++
-  Date:      $Date: 2009/11/19 16:34:43 $
-  Version:   $Revision: 1.3 $
+  Date:      $Date: 2009/11/19 17:00:27 $
+  Version:   $Revision: 1.4 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -79,7 +79,7 @@ void CutModel2MainPanel::setImageData(vtkImageData* img){
 	try{
 		checkInvariant();
 		cutmanager->setImageData(img);
-	}catch(CutModel2Exception e){
+	}catch(CutModelException e){
 		showErrorDialog(e.getCause());
 	}
 }
@@ -97,7 +97,7 @@ void CutModel2MainPanel::setRenderer(vtkRenderer* renderer){
     try{
 		checkInvariant();
 		cutmanager->setRenderer(renderer);
-	}catch(CutModel2Exception e){
+	}catch(CutModelException e){
 		showErrorDialog(e.getCause());
 	}
 }
@@ -130,7 +130,7 @@ void CutModel2MainPanel::RemoveActor(int id){
 
 		cutmanager->RemoveActor(id);
 
-	}catch(CutModel2Exception e){
+	}catch(CutModelException e){
 		showErrorDialog(e.getCause());
 	}
 }
@@ -146,7 +146,7 @@ void CutModel2MainPanel::onAddCutModel2(){
 
 		ShowCurrentPanel(id);
 
-	}catch(CutModel2Exception e){
+	}catch(CutModelException e){
 		showErrorDialog(e.getCause());
 	}
 }
@@ -176,7 +176,7 @@ int CutModel2MainPanel::addNewViewPanel()throw( CutModelException){
 	
 	
 }
-CutModel2View* CutModel2MainPanel::getModelView(int id)throw( CutModel2Exception){
+CutModelView* CutModel2MainPanel::getModelView(int id)throw( CutModelException){
 
 	CutModelView* current = NULL;
 	for(int i = 0; i < viewpanels.size();i++){
@@ -186,7 +186,7 @@ CutModel2View* CutModel2MainPanel::getModelView(int id)throw( CutModel2Exception
 	}
 	if(current == NULL){
 		std::string s = "Id not found";
-		throw CutModel2Exception(s);
+		throw CutModelException(s);
 	}
 	return current;
 }
@@ -241,7 +241,7 @@ void CutModel2MainPanel::changeColor(int id,double r,double g,double b){
 		checkInvariant();		
 		cutmanager->changeColor(id, r, g, b);
 
-	}catch(CutModel2Exception e){
+	}catch(CutModelException e){
 		showErrorDialog(e.getCause());
 	}
 	
@@ -252,7 +252,7 @@ void CutModel2MainPanel::ChangeShape(int id,int selection){
 		
 		cutmanager->ChangeShape(id, selection);
 
-	}catch(CutModel2Exception e){
+	}catch(CutModelException e){
 		showErrorDialog(e.getCause());
 	}
 }
@@ -262,7 +262,7 @@ void CutModel2MainPanel::updateActorDirection(int id){
 		
 		cutmanager->updateActorDirection(id);
 
-	}catch(CutModel2Exception e){
+	}catch(CutModelException e){
 		showErrorDialog(e.getCause());
 	}
 }
@@ -287,7 +287,7 @@ vtkImageData* CutModel2MainPanel::GetResultImage(){
     try{
 		checkInvariant();
 		return cutmanager->GetResultImage();
-	}catch(CutModel2Exception e){
+	}catch(CutModelException e){
 		showErrorDialog(e.getCause());
 	}
 	return NULL;
diff --git a/lib/maracasVisuLib/src/CutModule/interface/CutModel2MainPanel.h b/lib/maracasVisuLib/src/CutModule/interface/CutModel2MainPanel.h
index 286f686..85eea14 100644
--- a/lib/maracasVisuLib/src/CutModule/interface/CutModel2MainPanel.h
+++ b/lib/maracasVisuLib/src/CutModule/interface/CutModel2MainPanel.h
@@ -3,8 +3,8 @@
   Program:   wxMaracas
   Module:    $RCSfile: CutModel2MainPanel.h,v $
   Language:  C++
-  Date:      $Date: 2009/11/19 16:34:43 $
-  Version:   $Revision: 1.3 $
+  Date:      $Date: 2009/11/19 17:00:27 $
+  Version:   $Revision: 1.4 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -27,9 +27,9 @@
 #include "marTypes.h"
 
 
-#include "CutModel2Manager.h"
-#include "CutModel2Exception.h"
-#include "CutModel2View.h"
+#include "CutModelManager.h"
+#include "CutModelException.h"
+#include "CutModelView.h"
 
 #include "vtkImageData.h"
 #include "vtkRenderWindowInteractor.h"
@@ -101,12 +101,12 @@ private:
 
 	void LoadCutModel2Data(std::string filename);
 
-	std::vector<CutModel2View*> viewpanels;
+	std::vector<CutModelView*> viewpanels;
 
 	wxAuiManager* _wxauimanager;
 
 
-	 int addNewViewPanel()throw( CutModel2Exception);
+	 int addNewViewPanel()throw( CutModelException);
 
 	 CutModelView* getModelView(int id)throw( CutModelException);
 
-- 
2.46.0