~chenluhua/Bond2.git

			@@ -1,6 +1,8 @@
			#pragma once
			#include "Configuration.h"
			#include "HsmsPassive.h"
			#include "CMaster.h"
			#include "CGlassPool.h"

			class CModel
			{
			@@ -10,7 +12,9 @@

			public:
			IObservable* getObservable();
			SERVO::CMaster& getMaster();
			void setWorkDir(const char* pszWorkDir);
			void loadPortParams();
			int init();
			int term();

			@@ -31,6 +35,8 @@
			public:
			CConfiguration m_configuration;
			CHsmsPassive m_hsmsPassive;
			SERVO::CGlassPool m_glassPool;
			SERVO::CMaster m_master;

			private:
			IObservable* m_pObservable;