X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FEditorGraphicBBS%2FbbsKernelEditorGraphic%2FGObjectModel.h;h=a6300386d4986ac813f46198ed41624775a82abb;hb=a6d479881eeb637cd06afa3b2177e430fa05571e;hp=bdffa0667547ab778e2963200ba7a075d47d65a2;hpb=c8402dc4438aae412055d54bacf221c1449a83d6;p=bbtkGEditor.git

diff --git a/lib/EditorGraphicBBS/bbsKernelEditorGraphic/GObjectModel.h b/lib/EditorGraphicBBS/bbsKernelEditorGraphic/GObjectModel.h
index bdffa06..a630038 100644
--- a/lib/EditorGraphicBBS/bbsKernelEditorGraphic/GObjectModel.h
+++ b/lib/EditorGraphicBBS/bbsKernelEditorGraphic/GObjectModel.h
@@ -45,18 +45,20 @@ Version:   $Revision$
 
 //Includes same project
 #include "GlobalConstants.h"
+#include "Observable.h"
 
 //Includes creaMaracasVisu
 
 //Includes std
 #include <iostream>
 
+//Includes bbtk
 #include <bbtkBlackBoxDescriptor.h>
 
 namespace bbtk
 {
 
-	class GObjectModel 
+	class GObjectModel : public Observable
 	{
 
 	public: 
@@ -69,13 +71,29 @@ namespace bbtk
 		
 		void getInicPoint(double& x, double& y, double& z);
 		void getFinalPoint(double& x, double& y, double& z);
-		void setInicPoint(double& x, double& y, double& z);
-		void setFinalPoint(double& x, double& y, double& z);
-		void setState(int state);
-		int getState();
+		void getCenter(double& x, double& y, double& z);
+		virtual void setInicPoint(double& x, double& y, double& z);
+		virtual void setFinalPoint(double& x, double& y, double& z);
+		
+		virtual void move(double xx,double yy,double zz);
+
 		virtual bool isPointInside(double x,double y, double z);
 		virtual void updateBlackBox(BlackBoxDescriptor::Pointer descriptor);
 
+		int getGObjectType();
+		void setGObjectType(int obtype);
+
+		std::string getBBTKType();
+		void setBBTKType(std::string obtype);
+		
+		std::string getBBTKName();
+		void setBBTKName(std::string obname);
+
+		int getObjectId();
+		void setObjectId(int id);
+
+		virtual std::string getStatusText();
+		
 	private:
 
 		//Private Attributes
@@ -93,7 +111,11 @@ namespace bbtk
 		double _yFin;
 		double _zFin;
 
-		int  _state;
+		int  _gObjectType;
+		int _objectId;
+
+		std::string _bbtkType;
+		std::string _bbtkName;
 
 		//Protected methods