Merge branch 'GSP' of http://36.129.163.148:10080/gaoshipeng/OTS2_0 into GSP

OTSCPP/OTSClrInterface/ControlClr/COTSSimuControlClr.cpp

@@ -1,72 +0,0 @@
-#include "COTSSimuControlClr.h";
-#include "OTSControlFunExport.h"
-
-namespace OTSCLRINTERFACE
-{
-	COTSHardwareMgrPtr g_ControllerMgrPtr = nullptr;
-	CSemBasePtr g_SemBasePtr = nullptr;
-
-
-	COTSSimuControlClr::COTSSimuControlClr()
-	{
-		g_ControllerMgrPtr = COTSHardwareMgrPtr(new COTSHardwareMgr);
-		g_SemBasePtr = g_ControllerMgrPtr->GetSemControllerMgrPtr();
-	}
-
-	COTSSimuControlClr::~COTSSimuControlClr()
-	{
-		this->!COTSSimuControlClr();
-	}
-
-	COTSSimuControlClr::!COTSSimuControlClr()
-	{
-
-	}
-
-	bool COTSSimuControlClr::Connect()
-	{
-
-		if (nullptr == g_SemBasePtr)
-		{
-			return false;
-		}
-		return g_SemBasePtr->Connect();
-	}
-
-
-
-	bool COTSSimuControlClr::DisConnect()
-	{
-		if (nullptr == g_SemBasePtr)
-		{
-			return false;
-		}
-		return g_SemBasePtr->Disconnect();
-	}
-
-	bool COTSSimuControlClr::SetWorkingDistance(double a_dWorkingDistance)
-	{
-		return g_SemBasePtr->SetWorkingDistance(a_dWorkingDistance);
-	}
-
-	bool COTSSimuControlClr::GetWorkingDistance(double% a_dWorkingDistance)
-	{
-		double WDistance;
-		bool bRev = g_SemBasePtr->GetWorkingDistance(WDistance);
-		a_dWorkingDistance = WDistance;
-		return bRev;
-	}
-
-	bool COTSSimuControlClr::SetMagnification(double a_dMag)
-	{
-		return g_SemBasePtr->SetMagnification(a_dMag);
-	}
-
-	bool COTSSimuControlClr::GetMagnification(double% a_dMag)
-	{
-		double dMag;
-		bool bRev = g_SemBasePtr->GetMagnification(dMag);
-		a_dMag = dMag;
-		return bRev;
-	}
-}

OTSCPP/OTSClrInterface/ControlClr/COTSSimuControlClr.h

@@ -1,36 +0,0 @@
-#pragma once
-#include "BSEImg.h"
-#include "COTSHardwareMgr.h"
-#include "Bruker/OTSBrukerImpl_const.h"
-#include <OTSFeatureClr.h>
-#include <BSEImgClr.h>
-#include <OTSParticleClr.h>
-using namespace System;
-using namespace System::Drawing;
-using namespace System::Collections::Generic;
-
-namespace OTSCLRINTERFACE
-{
-	using namespace OTSController;
-
-
-
-
-	public ref class COTSSimuControlClr
-	{
-	public:
-		COTSSimuControlClr();
-		~COTSSimuControlClr();
-		!COTSSimuControlClr();
-
-	public:
-		bool Connect();
-		bool DisConnect();
-		bool SetWorkingDistance(double a_dWorkingDistance);
-		bool GetWorkingDistance(double% a_dWorkingDistance);
-		bool SetMagnification(double a_dMag);
-		bool GetMagnification(double% a_dMag);
-
-
-	};
-}