Przeglądaj źródła

add missing files

gsp 3 lat temu
rodzic
commit
841005b5c0

+ 0 - 18
Bin/x64/Debug/Config/SysData/RegistrationProofreading.txt

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<infos>
-  <info>
-    <ID>ID</ID>
-    <filelist>
-      <filed>66,00,70,00,69,00,66,00,70,00,66,00,70,00,70,00,48,00,48,00,48,00,56,00,48,00,54,00,69,00,67,00</filed>
-      <filed>68,00,69,00,50,00,57,00,52,00,56,00,70,00,70,00</filed>
-    </filelist>
-  </info>
-  <info>
-    <ID>Time</ID>
-    <filelist>
-      <filed>50,00,48,00,50,00,52,00</filed>
-      <filed>48,00,52,00</filed>
-      <filed>48,00,49,00</filed>
-    </filelist>
-  </info>
-</infos>

+ 72 - 0
OTSCPP/OTSClrInterface/ControlClr/COTSSimuControlClr.cpp

@@ -0,0 +1,72 @@
+#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;
+	}
+}

+ 36 - 0
OTSCPP/OTSClrInterface/ControlClr/COTSSimuControlClr.h

@@ -0,0 +1,36 @@
+#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);
+
+
+	};
+}

+ 2 - 2
OTSCPP/OTSClrInterface/OTSClrInterface.vcxproj

@@ -219,8 +219,8 @@
     <ClCompile Include="CommonClr\SEMDataMsrClr.cpp" />
     <ClCompile Include="CommonClr\SEMStageDataClr.cpp" />
     <ClCompile Include="CommonClr\StageClr.cpp" />
+    <ClCompile Include="ControlClr\COTSSimuControlClr.cpp" />
     <ClCompile Include="ControlClr\OTSControlFunExport.cpp" />
-    <ClCompile Include="COTSSimuControlClr.cpp" />
     <ClCompile Include="ImageProClr\FieldMgrClr.cpp" />
     <ClCompile Include="ImageProClr\ImageProForClr.cpp" />
     <ClCompile Include="ImageProClr\OTSImgProcPrmClr.cpp" />
@@ -258,8 +258,8 @@
     <ClInclude Include="CommonClr\SEMDataMsrClr.h" />
     <ClInclude Include="CommonClr\SEMStageDataClr.h" />
     <ClInclude Include="CommonClr\StageClr.h" />
+    <ClInclude Include="ControlClr\COTSSimuControlClr.h" />
     <ClInclude Include="ControlClr\OTSControlFunExport.h" />
-    <ClInclude Include="COTSSimuControlClr.h" />
     <ClInclude Include="ImageProClr\FieldMgrClr.h" />
     <ClInclude Include="ImageProClr\ImageProForClr.h" />
     <ClInclude Include="ImageProClr\OTSImgProcPrmClr.h" />

+ 2 - 2
OTSCPP/OTSClrInterface/OTSClrInterface.vcxproj.filters

@@ -138,7 +138,7 @@
     <ClCompile Include="ReportCalculateClr\SmplMsrResultFileMgrClr.cpp">
       <Filter>OTSREPORTCLR</Filter>
     </ClCompile>
-    <ClCompile Include="COTSSimuControlClr.cpp">
+    <ClCompile Include="ControlClr\COTSSimuControlClr.cpp">
       <Filter>ControlClr</Filter>
     </ClCompile>
   </ItemGroup>
@@ -251,7 +251,7 @@
     <ClInclude Include="ReportCalculateClr\SmplMsrResultFileMgrClr.h">
       <Filter>OTSREPORTCLR</Filter>
     </ClInclude>
-    <ClInclude Include="COTSSimuControlClr.h">
+    <ClInclude Include="ControlClr\COTSSimuControlClr.h">
       <Filter>ControlClr</Filter>
     </ClInclude>
   </ItemGroup>