X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FEditorGraphicBBS%2FbbsVtkGUIEditorGraphic%2FvtkGObjectView.cxx;h=d9d784edee1c657624a76a68c3e8132972799aa5;hb=511369e67cf26244fc8768a727a03f42ff42865f;hp=db905de37425c75e0cf4bce7efa68893e5fd6353;hpb=878ac6ad472bc459f4e364c16890e5026c401944;p=bbtkGEditor.git

diff --git a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGObjectView.cxx b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGObjectView.cxx
index db905de..d9d784e 100644
--- a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGObjectView.cxx
+++ b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGObjectView.cxx
@@ -1,3 +1,29 @@
+/*
+# ---------------------------------------------------------------------
+#
+# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image 
+#                        pour la Santé)
+# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+#
+#  This software is governed by the CeCILL-B license under French law and 
+#  abiding by the rules of distribution of free software. You can  use, 
+#  modify and/ or redistribute the software under the terms of the CeCILL-B 
+#  license as circulated by CEA, CNRS and INRIA at the following URL 
+#  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html 
+#  or in the file LICENSE.txt.
+#
+#  As a counterpart to the access to the source code and  rights to copy,
+#  modify and redistribute granted by the license, users are provided only
+#  with a limited warranty  and the software's author,  the holder of the
+#  economic rights,  and the successive licensors  have only  limited
+#  liability. 
+#
+#  The fact that you are presently reading this means that you have had
+#  knowledge of the CeCILL-B license and that you accept its terms.
+# ------------------------------------------------------------------------  
+*/
+
+
 /*=========================================================================                                                                               
 Program:   bbtk
 Module:    $RCSfile$
@@ -39,15 +65,15 @@ Version:   $Revision$
 namespace bbtk
 {
 
-
 	//=========================================================================
 	vtkGObjectView::vtkGObjectView()
 	{
-		_baseView=NULL;
-		_objectActor=NULL;
-		_isStartDragging=false;
+		_baseView			= NULL;
+//		_borderObjectActor	= NULL;
+		_fillObjectActor	= NULL;
+		_isStartDragging	= false;
 		
-		_state = NOTHING_HAPPENS;
+		_state				= NOTHING_HAPPENS;
 	}
 
 	//=========================================================================
@@ -55,28 +81,24 @@ namespace bbtk
 	{
 	}
 	//=========================================================================
-
-	void vtkGObjectView::update(int idObservable,int command)//virtual
+	void vtkGObjectView::update(int idController,int command)//virtual
 	{
 		//virtual
 	}
 
 	//=========================================================================
-	
 	void vtkGObjectView::setModel(GObjectModel *model)
 	{
-		_model=model;
+		_model = model;
 	}
 
 	//=========================================================================
-	
 	void vtkGObjectView::setBaseView(wxVtkBaseView* baseView)
 	{
-		_baseView=baseView;
+		_baseView = baseView;
 	}
 
 	//=========================================================================
-
 	void vtkGObjectView::initVtkObjects()
 	{
 		createVtkObjects();
@@ -84,47 +106,46 @@ namespace bbtk
 	}
 
 	//=========================================================================
-
 	void vtkGObjectView::createVtkObjects() //virtual
 	{
 		//virtual
 	}
 
 	//=========================================================================
-
 	void vtkGObjectView::updateColors() //virtual
 	{
 		//virtual
 	}
 
 	//=========================================================================
-
 	void vtkGObjectView::addVtkActors()//virtual
-	{
-		_baseView->GetRenderer()->AddActor(_objectActor);
-		_baseView->GetRenderer()->Render();
+	{		
+		_baseView->GetRenderer()->AddActor(_fillObjectActor);
+//EED2017		_baseView->GetRenderer()->Render();
 	}
 
 	//=========================================================================
+	void vtkGObjectView::removeVtkActors()//virtual
+	{
+		_baseView->GetRenderer()->RemoveActor(_fillObjectActor);
+//EED2017		_baseView->GetRenderer()->Render();
+	}
 
+	//=========================================================================
 	bool vtkGObjectView::isPointInside(int X,int Y) //virtual
 	{
-		// RaC In the actual version, always z=900
-		double xx=X,yy=Y,zz=900;
+		// RaC In the actual version, always z=GPOSITION_Z
+		double xx=X,yy=Y,zz=GPOSITION_Z;
 		_baseView->TransCoordScreenToWorld(xx,yy,zz);
 		return _model->isPointInside(xx,yy,zz);
 	}
 
 	//=========================================================================
-
 	void vtkGObjectView::moveObject(int X,int Y) //virtual
 	{		
-		// RaC In the actual version, always z=900
-		double xx=X,yy=Y,zz=900;
+		// RaC In the actual version, always z=GPOSITION_Z
+		double xx=X,yy=Y,zz=GPOSITION_Z;
 		_baseView->TransCoordScreenToWorld(xx,yy,zz);
-
-		
-
 		if(_isStartDragging)
 		{
 			_isStartDragging=false;
@@ -134,14 +155,11 @@ namespace bbtk
 			dragDifX=xx-xInic;
 			dragDifY=yy-yInic;	
 		}
-
 		_model->move(xx-dragDifX,yy-dragDifY,zz);
-
 	}
 
 	//=========================================================================
-
-	void vtkGObjectView::isStartDragging(bool param)
+	void vtkGObjectView::setStartDragging(bool param)
 	{
 		_isStartDragging=param;
 		dragDifX=0;
@@ -149,27 +167,31 @@ namespace bbtk
 	}
 
 	//=========================================================================
-
 	void vtkGObjectView::setState(int state)
 	{
 		_state = state;
 	}
 
 	//=========================================================================
-
 	int vtkGObjectView::getState()
 	{
 		return _state;
 	}
 
 	//=========================================================================
-
 	void vtkGObjectView::setRefreshWaiting()
 	{
 		((vtkInteractorStyleBaseView*)_baseView->GetInteractorStyleBaseView())->SetRefresh_waiting();
 	}
 
 	//=========================================================================
+	void vtkGObjectView::removeFromScene()
+	{
+		removeVtkActors();
+		setRefreshWaiting();
+	}
+
+	//=========================================================================
 
 
 }  // EO namespace bbtk