瀏覽代碼

add log message to setexternal on off.

gsp 3 年之前
父節點
當前提交
bb4794e2ea

+ 4 - 0
OTSCPP/OTSClrInterface/ControlClr/OTSControlFunExport.h

@@ -107,6 +107,10 @@ namespace OTSCLRINTERFACE
 				{
 					return true;
 				}
+				else
+				{
+					return false;
+				}
 				
 			}
 			return bRev;

+ 2 - 0
OTSCPP/OTSControl/Bruker/OTSBrukerImpl.cpp

@@ -480,6 +480,7 @@ namespace OTSController {
 		if (m_pBrukerDllHandle->SetSEMExternalOn(m_nClientID))
 		{
 			m_bSEMExternal = true;
+			LogWarn(__FILE__, __LINE__, _T("SetExternal On"));
 		}
 		else
 		{
@@ -508,6 +509,7 @@ namespace OTSController {
 		if (m_pBrukerDllHandle->SetSEMExternalOff(m_nClientID))
 		{
 			m_bSEMExternal = false;
+			LogWarn(__FILE__, __LINE__, _T("SetExternal Off"));
 		}
 		else
 		{

+ 1 - 5
OTSCPP/OTSControl/Bruker/OTSScanBrucker.cpp

@@ -15,11 +15,7 @@ namespace OTSController {
 	{
 	}
 
-	/// instance termination
-	//void COTSScanBrucker::FinishedInstance()
-	//{
-	//	m_pBrukerImpl.reset();
-	//}
+
 
 	// initialization
 	BOOL COTSScanBrucker::Init()

+ 1 - 1
OTSCPP/OTSControl/Oxford/OTSOxfordImpl.cpp

@@ -321,7 +321,7 @@
 				LogErrorTrace(__FILE__, __LINE__, _T("SetExternal command failed."));
 				return false;
 			}
-
+			LogWarn(__FILE__, __LINE__, _T("SetExternal: ") + CString(std::to_string(a_bExternal).c_str()));
 			return true;
         }
 

+ 19 - 0
OTSCPP/OTSLog/COTSUtilityDllFunExport.cpp

@@ -105,7 +105,26 @@ void  LogTrace(LPCTSTR szFile, long lLine, LPCTSTR lpTraceLog, ...)
 
 	//g_LpLogFile->TraceProgress(szFileName, lLine, (LPCSTR)strLog.c_str());
 }
+void  LogWarn(LPCTSTR szFile, long lLine, LPCTSTR lpTraceLog, ...)
+{
+	
+	std::string strLog;
+	va_list arglist;
+	va_start(arglist, lpTraceLog);
+	strLog = getFormattedStr(lpTraceLog, arglist);
+	va_end(arglist);
 
+
+	LPCTSTR szFileName = ::PathFindFileName(szFile);
+
+
+	CString str;
+	str.Format("%s(%ld) ", szFileName, lLine);
+	str.Append((LPCTSTR)strLog.c_str());
+	SendLogMessageToNlog(str, (int)PostLogLevel::warn);
+
+
+}
 void  LogInfoTrace(LPCTSTR szFile, long lLine, LPCTSTR lpTraceLog, ...)
 {
 #ifdef LOGINFO_SWITCH

+ 1 - 0
OTSCPP/OTSLog/COTSUtilityDllFunExport.h

@@ -21,6 +21,7 @@
 extern "C" __declspec(dllexport) void InitLogFile(LPCTSTR lpLogName);     // 由APP加载DLL成功后设置路径,设置Log文件保存的路径,如 "C:\\OPTON\\APP"      (APP为保存的log名字
 extern "C" __declspec(dllexport) void  LogToFile(LPCTSTR szFile, long lLine, LPCTSTR lpTraceLog, ...);
 extern "C" __declspec(dllexport) void LogTrace(LPCTSTR szFile, long lLine, LPCTSTR lpTraceLog, ...);       //记录日志
+extern "C" __declspec(dllexport) void  LogWarn(LPCTSTR szFile, long lLine, LPCTSTR lpTraceLog, ...);
 extern "C" __declspec(dllexport) void LogInfoTrace(LPCTSTR szFile, long lLine, LPCTSTR lpTraceLog, ...);       //记录日志
 extern "C" __declspec(dllexport) void LogErrorTrace(LPCTSTR szFile, long lLine, LPCTSTR lpErrorTrace, ...);   // 记录错误或者异常
 extern "C"  __declspec(dllexport) void LogBinaryTrace(LPCTSTR szHead, BYTE* pbyData, UINT nLen);  //记录二进制数据 日志

+ 1 - 2
OTSIncAMeasureApp/0-OTSModel/Measure/3-MeasureFlow/CMeasure.cs

@@ -182,8 +182,7 @@ namespace OTSModelSharp
             //MsrMsg.STMThreadStu.csMsrEndTime = timeEnd.ToShortDateString();
             MsrMsg.STMThreadStu.csMsrEndTime = timeEnd.ToString("yyyy-MM-dd HH:mm:ss");
             ProgressEvent(MsrMsg);
-            //disconnect the semcontroller when we exit this task.
-            //m_SemController.DisConnect();
+        
         }
         void SetWorkingFolderStr()
         {

File diff suppressed because it is too large
+ 262 - 233
OTSSysMgrApp/SemTestForms.Designer.cs


+ 20 - 0
OTSSysMgrApp/SemTestForms.cs

@@ -1314,5 +1314,25 @@ namespace OTSSysMgrApp
             bool result = cfun.GetSemHTOnOff(ref a_HTValue);
             MessageBox.Show("电压当前状态:" + Convert.ToBoolean(a_HTValue).ToString());
         }
+
+        private void button1_Click(object sender, EventArgs e)
+        {
+            bool result = cfun.SetSemScanExternal(true);
+            if (!result)
+            {
+                MessageBox.Show("SetExternalOn failed!");
+            
+            }
+        }
+
+        private void button2_Click(object sender, EventArgs e)
+        {
+            bool result = cfun.SetSemScanExternal(false);
+            if (!result)
+            {
+                MessageBox.Show("SetExternalOn failed!");
+
+            }
+        }
     }
 }

Some files were not shown because too many files changed in this diff