X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FEditorGraphicBBS%2FbbsKernelEditorGraphic%2FGObjectModel.h;h=d1d3ce25175cfe57c29b562b5b9e55f9ebf73cd4;hb=3babfd57a9b4b3cffba34415e928239592e7d4a1;hp=c80da3579933afd396c5a3475a56348022934bc6;hpb=ffd05fb1bcea1c1e0c5ab49e03b34fb387923533;p=bbtkGEditor.git

diff --git a/lib/EditorGraphicBBS/bbsKernelEditorGraphic/GObjectModel.h b/lib/EditorGraphicBBS/bbsKernelEditorGraphic/GObjectModel.h
index c80da35..d1d3ce2 100644
--- a/lib/EditorGraphicBBS/bbsKernelEditorGraphic/GObjectModel.h
+++ b/lib/EditorGraphicBBS/bbsKernelEditorGraphic/GObjectModel.h
@@ -45,6 +45,7 @@ Version:   $Revision$
 
 //Includes same project
 #include "GlobalConstants.h"
+#include "Observable.h"
 
 //Includes creaMaracasVisu
 
@@ -57,7 +58,7 @@ Version:   $Revision$
 namespace bbtk
 {
 
-	class GObjectModel 
+	class GObjectModel : public Observable
 	{
 
 	public: 
@@ -70,13 +71,26 @@ 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);
+
+		virtual std::string getStatusText();
+		
 	private:
 
 		//Private Attributes
@@ -94,7 +108,10 @@ namespace bbtk
 		double _yFin;
 		double _zFin;
 
-		int  _state;
+		int  _gObjectType;
+
+		std::string _bbtkType;
+		std::string _bbtkName;
 
 		//Protected methods