X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FEditorGraphicBBS%2FbbsKernelEditorGraphic%2FGObjectModel.cxx;h=e4b77adede5e31ea6d0fe31f81fa6853615a16ac;hb=d48bd5af65756f8d826169d9d975ac29a042984c;hp=d2212d4a860497a721de25b445d3426a54c6e297;hpb=1b3060e78b445e19d51933556fb072cc90e30c99;p=bbtkGEditor.git

diff --git a/lib/EditorGraphicBBS/bbsKernelEditorGraphic/GObjectModel.cxx b/lib/EditorGraphicBBS/bbsKernelEditorGraphic/GObjectModel.cxx
index d2212d4..e4b77ad 100644
--- a/lib/EditorGraphicBBS/bbsKernelEditorGraphic/GObjectModel.cxx
+++ b/lib/EditorGraphicBBS/bbsKernelEditorGraphic/GObjectModel.cxx
@@ -1,3 +1,28 @@
+/*
+# ---------------------------------------------------------------------
+#
+# 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$
@@ -46,11 +71,10 @@ namespace bbtk
 
 		_xInic = 0;
 		_yInic = 0;
-		_zInic = 900;
+		_zInic = GPOSITION_Z;
 		_xFin = 0;
 		_yFin = 0;
-		_zFin = 900;
-		_state = NOTHING_HAPPENS;
+		_zFin = GPOSITION_Z;
 	}
 
 	//=========================================================================
@@ -75,6 +99,14 @@ namespace bbtk
 	}
 	//=========================================================================
 
+	void GObjectModel::getCenter(double& x, double& y, double& z)
+	{
+		x = (_xInic+_xFin)/2;
+		y = (_yInic+_yFin)/2;
+		z = (_zInic+_zFin)/2;
+	}
+	//=========================================================================
+
 	void GObjectModel::setInicPoint(double& x, double& y, double& z)
 	{
 		_xInic = x;
@@ -92,20 +124,6 @@ namespace bbtk
 	}
 	//=========================================================================
 
-	void GObjectModel::setState(int state)
-	{
-		_state = state;
-	}
-
-	//=========================================================================
-
-	int GObjectModel::getState()
-	{
-		return _state;
-	}
-
-	//=========================================================================
-
 	void GObjectModel::setGObjectType(int gObjectType)
 	{
 		_gObjectType = gObjectType;
@@ -134,12 +152,6 @@ namespace bbtk
 
 	//=========================================================================
 
-	void GObjectModel::updateBlackBox(BlackBoxDescriptor::Pointer descriptor)//virtual
-	{
-	}
-
-	//=========================================================================
-
 	void GObjectModel::move(double xx,double yy,double zz)//virtual
 	{
 		setInicPoint(xx,yy,zz);
@@ -174,6 +186,49 @@ namespace bbtk
 	}
 
 	//=========================================================================
+	
+	std::string GObjectModel::getBBTKDescription()
+	{
+		return _bbtkDescription;
+	}
+	
+	//=========================================================================
+	
+	void GObjectModel::setBBTKDescription(std::string obdescription)
+	{
+		_bbtkDescription = obdescription;
+	}
+	
+	//=========================================================================
+
+	std::string GObjectModel::getStatusText()//virtual
+	{
+		std::string virt = "";
+		return virt;
+	}
+
+	//=========================================================================
+
+	int GObjectModel::getObjectId()
+	{
+		return _objectId;
+	}
+
+	//=========================================================================
+	
+	void GObjectModel::setObjectId(int id)
+	{
+		_objectId=id;
+	}
+
+	//=========================================================================
+
+	void GObjectModel::save(std::string &content)
+	{
+		//virtual
+	}
+	
+	//=========================================================================
 
 }  // EO namespace bbtk