modify the bruker driver on the Axia platform(do not read the brightness and contrast)

OTSCPP/OTSControl/Bruker/OTSBrukerImpl.cpp

@@ -226,7 +226,7 @@ namespace OTSController {
 		if (BrukerDll::GetSEMBCData(m_nClientID, dBrightness, dContrast) != 0)
 		{
 			// failed to call get SEM data method
-			LogErrorTrace(__FILE__, __LINE__, _T("COTSBrukerImpl::GetBrightness: failed to call GetSEMBCData client id is %d"), m_nClientID);
+			LogTrace(__FILE__, __LINE__, _T("COTSBrukerImpl::GetBrightness: failed to call GetSEMBCData client id is %d"), m_nClientID);
 			return FALSE;
 		}
 		a_dBrightness = dBrightness;
@@ -2393,7 +2393,7 @@ BOOL COTSBrukerImpl::GetXRayByPoints(CPosXrayList& a_listXrayPois, DWORD a_nACTi
 
 		}
 
-
+		return true;
 	
 	
 }
@@ -2504,6 +2504,7 @@ BOOL COTSBrukerImpl::GetXRayByFeatures(CPosXrayList& a_vXPoints, std::vector<Bru
 
 
 	}
+	return true;
 	
 }
 

OTSCPP/OTSControl/Bruker/OTSSEMBruker.cpp

@@ -123,7 +123,7 @@ namespace OTSController {
 		if (!m_pBrukerImplPtr->GetSEMBCData(dBrightness, dContrast))
 		{
 			// failed to call GetSEMBCData method
-			LogErrorTrace(__FILE__, __LINE__, _T("COTSSEMBruker::GetBrightness: failed to call GetSEMBCData method."));
+			LogTrace(__FILE__, __LINE__, _T("COTSSEMBruker::GetBrightness: failed to call GetSEMBCData method."));
 			return FALSE;
 		}
 		a_dBrightness = dBrightness;
@@ -167,7 +167,7 @@ namespace OTSController {
 		if (!m_pBrukerImplPtr->GetSEMBCData(dBrightness, dContrast))
 		{
 			// failed to call GetSEMBCData method
-			LogErrorTrace(__FILE__, __LINE__, _T("COTSSEMBruker::GetContrast: failed to call GetSEMBCData method."));
+			LogTrace(__FILE__, __LINE__, _T("COTSSEMBruker::GetContrast: failed to call GetSEMBCData method."));
 			return FALSE;
 		}
 		a_dContrast = dContrast;

OTSIncAMeasureApp/1-OTSMeasure/Measure/3-MeasureFlow/CSmplMeasure.cs

@@ -109,12 +109,12 @@ namespace OTSModelSharp
 
                 pSEMCtrl.SetMagnification(dMag);
                 pSEMCtrl.SetWorkingDistance(dWorkDis);
-                pSEMCtrl.SetSemBrightness(bri);
-                pSEMCtrl.SetSemContrast(contra);
+                //pSEMCtrl.SetSemBrightness(bri);
+                //pSEMCtrl.SetSemContrast(contra);
                 log.Warn("set magnification " + dMag);
                 log.Warn("set wd "+ dWorkDis);
-                log.Warn("set brightness "+bri);
-                log.Warn("set contrast "+contra);
+                //log.Warn("set brightness "+bri);
+                //log.Warn("set contrast "+contra);
 
             }
             catch (Exception e) 
@@ -128,18 +128,7 @@ namespace OTSModelSharp
             return true;
 
         }
-        bool SetSEMExteralOn()
-        {
-            var pSEMCtrl = m_SemHardwareMgr;
-
-
-
-            log.Warn("Set Scan Exteral on!");
-
-            pSEMCtrl.SetScanExternal(true);
-
-            return true;
-        }
+      
         // set SEM external off
         bool SetSEMExteralOff()
         {
@@ -612,7 +601,7 @@ namespace OTSModelSharp
                     return;
                 }
                 var pSEMDataGnr = new CSEMDataGnr();
-                log.Info("Get Kv, Brightness and Contrast!");
+                log.Info("Get current Kv, Brightness and Contrast!");
                 GetSEMDataGnrFromHw(ref pSEMDataGnr);
 
 
@@ -823,6 +812,12 @@ namespace OTSModelSharp
                         //start db save
                         StartSaveFileThread(ref curFld);
 
+                        // record 
+                        pStatus.AddCompletedFieldCenter(curFld.GetOTSPosition());
+                       
+                      
+                        pStatus.ComputeTime(OTS_MSR_TIME_TYPE.STOPPED);
+
                         SendFieldParticlesInfoToGUI(curFld, m_Sample.GetMsrStatus());
                     }
                     catch (Exception e)
@@ -1387,10 +1382,7 @@ namespace OTSModelSharp
 
             log.Info("Send field data to screen!");
 
-            pStatus.AddCompletedFieldCenter(curFld.GetOTSPosition());
-            //Field Data
-            // record end time
-            pStatus.ComputeTime(OTS_MSR_TIME_TYPE.STOPPED);
+           
             ST_MSTMsg MsgFieldEnd = new ST_MSTMsg(m_Sample,curFld);
             MsgFieldEnd.InitFieldDataMsg();
            

OTSIncAMeasureApp/2-OTSMeasureParamManage/COTSMeasureParam.cs

@@ -294,7 +294,7 @@ namespace OTSMeasureApp
                         }
                       
                     }
-               
+               Sample.SetFieldsData(flds);
 
             }
             var sta = Sample.GetMsrStatus();