X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2FCutModule%2Finterface%2FCutModelMainPanel.cxx;h=f917adc1129203c094a8b35be586354b61d173b0;hb=5ee06060d12cfbb4096989a2c320fed39b898bde;hp=188d243b465f98ac4ed33f6bb6603cc7a719c25a;hpb=1fadbd2eff9144dd071f862fb268809dda2400d1;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/CutModule/interface/CutModelMainPanel.cxx b/lib/maracasVisuLib/src/CutModule/interface/CutModelMainPanel.cxx
index 188d243..f917adc 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: 2010/03/05 17:54:39 $
-Version:   $Revision: 1.7 $
+Date:      $Date: 2010/09/29 21:21:03 $
+Version:   $Revision: 1.11 $
 
 Copyright: (c) 2002, 2003
 License:
@@ -126,10 +126,11 @@ void CutModelMainPanel::RemoveActor(int id){
 		checkInvariant();
 
 		if(!this->IsBeingDeleted()){
-			for(int i = 0; i < viewpanels.size()-1;i++){
+			int i,j;
+			for(i = 0; i < (int)viewpanels.size()-1;i++){
 				CutModelView* view = viewpanels[i];
 				if(view->getId()==id){
-					for(int j = i; j < viewpanels.size()-1;j++){
+					for(j = i; j < (int)viewpanels.size()-1;j++){
 						viewpanels[j]=viewpanels[j+1];
 					}
 					i = viewpanels.size();
@@ -255,24 +256,21 @@ void CutModelMainPanel::onUndo()
 	{
 	try{
 		checkInvariant();		
-		int result = cutmanager->Undo();
+		/*int result = */ cutmanager->Undo(); // result unused// JPR
 
 	}catch(CutModelException e){
 		showErrorDialog(e.getCause());
 	}
-
 }
 
 void CutModelMainPanel::onRedo(){
-
 	try{
 		checkInvariant();		
-		int result = cutmanager->Redo();
+		/*int result = */ cutmanager->Redo();
 
 	}catch(CutModelException e){
 		showErrorDialog(e.getCause());
 	}
-
 }
 
 void CutModelMainPanel::changeOpacity(int id,int opacity){
@@ -294,9 +292,11 @@ void CutModelMainPanel::ShowViewBox(int id,bool check){
 		showErrorDialog(e.getCause());
 	}
 }
+
 void CutModelMainPanel::ShowPopUpMenu(int id){
 	showErrorDialog("test");
 }
+
 void CutModelMainPanel::changeColor(int id,double r,double g,double b){
 
 	try{
@@ -306,8 +306,8 @@ void CutModelMainPanel::changeColor(int id,double r,double g,double b){
 	}catch(CutModelException e){
 		showErrorDialog(e.getCause());
 	}
-
 }
+
 void CutModelMainPanel::ChangeShape(int id,int selection){
 	try{
 		checkInvariant();
@@ -344,8 +344,8 @@ void CutModelMainPanel::ExecuteAll(){
 	for(i = 0; i < (int)viewpanels.size(); i++){
 		viewpanels[i]->ExecuteCut();
 	}
-
 }
+
 vtkImageData* CutModelMainPanel::GetResultImage(){
 	try{
 		checkInvariant();
@@ -409,12 +409,9 @@ void CutModelMainPanel::addPolygonCutterTab(){
 	Connect(btnExecutePolygonCut->GetId(), wxEVT_COMMAND_BUTTON_CLICKED,(wxObjectEventFunction)(&PolygonCutterEventHandlerCutModel::onExecuteCutPolygon));	
 	sizer->Add(btnExecutePolygonCut, 0, wxALIGN_LEFT);
 
-
 	_notebook->AddPage(panel, _T("Polygon Cutter"), false);
-
 }
 
-
 void PolygonCutterEventHandlerCutModel::onCheckChanged(wxCommandEvent& event){
 	CutModelMainPanel::getInstance()->onCheckChanged();
 }
@@ -423,8 +420,6 @@ void PolygonCutterEventHandlerCutModel::onExecuteCutPolygon(wxCommandEvent& even
 	CutModelMainPanel::getInstance()->onExecuteCutPolygon();
 }
 
-
-
 /**
 **
 **/
@@ -451,7 +446,6 @@ ToolBarCutModel::ToolBarCutModel(wxWindow * parent)
 
 	_evthand = new ToolBarEventHandlerCutModel();
 	this->SetEventHandler(_evthand);
-
 }
 
 ToolBarCutModel::~ToolBarCutModel(void){
@@ -479,11 +473,9 @@ void ToolBarEventHandlerCutModel::onExecuteAll(wxCommandEvent& event){
 	CutModelMainPanel::getInstance()->ExecuteAll();
 }
 
-
 BEGIN_EVENT_TABLE(ToolBarEventHandlerCutModel, wxEvtHandler)
 	EVT_MENU(10, ToolBarEventHandlerCutModel::onAdd)
 	EVT_MENU(20, ToolBarEventHandlerCutModel::onUndo)
 	EVT_MENU(30, ToolBarEventHandlerCutModel::onRedo)
 	EVT_MENU(40, ToolBarEventHandlerCutModel::onExecuteAll)
 END_EVENT_TABLE()
-