Merge branch 'TestForSelpa' into cxs

Bin/x64/Debug/Config/ProData/HardwareConfig.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <XMLData PathName="HardwareConfig.xml" ID="1">
-  <Member RegName="SemControllerName" drive="Bruker" ImageInputSources="BSE" />
-  <Member RegName="EDSName" drive="Bruker" />
+  <Member RegName="SemControllerName" drive="OffLine" ImageInputSources="BSE" />
+  <Member RegName="EDSName" drive="OffLine" />
 </XMLData>

Bin/x64/Debug/Config/SysData/OTSProgMgrParam.pmf

@@ -7,7 +7,7 @@
     <Member RegName="ParticleGray" end="150" start="0" />
   </Member>
   <Member RegName="ImageScanParam" FieldAreaPercentage="0" FieldLargeParticlePercentage="0" FieldLargeParticles="0" FieldSmallParticlePercentage="0" FieldSmallParticles="0" FieldStopMode="0" ImagePixelSize="2" SatrtImageMode="0" ScanImageSpeed="0" StopMode="0" StopParamFields="200" StopParamMeasTime="360" StopParamParticles="5000" />
-  <Member RegName="StageData" MinMag="45" scanFieldSize="1970" xAxisDir="1" yAxisDir="0">
+  <Member RegName="StageData" MinMag="140" scanFieldSize="1970" xAxisDir="0" yAxisDir="1">
     <Member RegName="XAxis" end="100000" start="-10000" />
     <Member RegName="YAxis" end="100000" start="-10000" />
   </Member>

OTSIncAMeasureApp/0-OTSModel/Measure/2-OTSCleanliness/SmplMeasureCleanliness.cs

@@ -30,19 +30,19 @@ namespace OTSModelSharp
             int nNewFieldId;
             nNewFieldId = m_pSampleRstFile.GetIdForANewField();
             //first step:remove background of the bse image and compound all the finded particles.
-            CFieldDataClean curFldDataMgr = new CFieldDataClean( a_BSEImg,m_Sample.CalculatePixelSize());
-            curFldDataMgr.SetId(nNewFieldId);
-            curFldDataMgr.SetPosition(fldCenter);
+            curFldData = new CFieldDataClean( a_BSEImg,m_Sample.CalculatePixelSize());
+            curFldData.SetId(nNewFieldId);
+            curFldData.SetPosition(fldCenter);
             GetOriginalParticles();
  
             // second step :filter the finded particles.
-            FilterParticles(curFldDataMgr);
+            FilterParticles((CFieldDataClean)curFldData);
             COTSXRayParam pXRayParam = m_Sample.GetMsrParams().GetXRayParam();
             //collect xray data.
             if (pXRayParam.GetUsingXray() == (int)OTS_USING_X_RAY.Yes)
             {
                 Thread.Sleep(100);
-                CollectParticlesXrayData(curFldDataMgr);
+                CollectParticlesXrayData((CFieldDataClean)curFldData);
                 Thread.Sleep(100);
             }
       
@@ -50,17 +50,17 @@ namespace OTSModelSharp
             //special treatment.
             //ParticleSpecialTreatment();
             loger.Info("Begin to Calculate the image property of every particle!");
-            var analysisparts = curFldDataMgr.ListBigParticles;
-            curFldDataMgr.CalParticleImageProp(analysisparts);//calculate particle image property such as feret diameter, DMAX etc.
+            var analysisparts = curFldData.ListAnalysisParticles;
+            curFldData.CalParticleImageProp(analysisparts);//calculate particle image property such as feret diameter, DMAX etc.
 
-            ClassifyParticles(curFldDataMgr);
+            ClassifyParticles(curFldData.ListAnalysisParticles);
 
   
 
             // save field files
             m_Sample.GetMsrStatus() .SetStatus(OTS_MSR_SAMPLE_STATUS.SUCCESSED);
 
-            StartSaveFileThread(curFldDataMgr);
+            StartSaveFileThread(curFldData);
 
             return true;
 
@@ -386,7 +386,7 @@ namespace OTSModelSharp
 
 
 
-            pDBFileMgr.BeginTransaction();
+            //pDBFileMgr.BeginTransaction();
             pDBFileMgr.SaveStatusDataToDB();
 
             if (!pDBFileMgr.SaveIncADataToDB(f.ListAnalysisParticles, f.GetPosition()))
@@ -453,7 +453,7 @@ namespace OTSModelSharp
                 smallPartDB.SaveAKindOfSmallParticle(smallp, new CPosXrayClr(), new System.Drawing.Point(0, 0));
             }
 
-            pDBFileMgr.CommitTransaction();
+            //pDBFileMgr.CommitTransaction();
 
             return true;
         }

OTSIncAMeasureApp/0-OTSModel/Measure/GetParticleData/IncAFileMgr.cs

@@ -244,6 +244,10 @@ namespace OTSModelSharp
         }
        public bool SaveIncADataToDB(List<COTSParticleClr> m_listParticle , System.Drawing.Point m_FieldPos)
         {
+            if (m_listParticle.Count == 0)
+            {
+                return true;
+            }
             BeginTransaction();
 
             foreach (var pParticle in m_listParticle)

OTSIncAMeasureApp/0-OTSModel/OTSDataType/COTSSample.cs

@@ -1570,7 +1570,7 @@ namespace OTSDataType
                             //using xray
                             poPropItem = new CPropItem();
                             nItemId = OTS_SAMPLE_PROP_GRID_ITEMS.USING_XRAY;
-                            poPropItem.SetSmplParameter(modelResource, nItemId, OTS_ITEM_TYPES.COMBO, false, bShow);
+                            poPropItem.SetSmplParameter(modelResource, nItemId, OTS_ITEM_TYPES.BOOL, false, bShow);
                             a_listPropItems.Add(poPropItem);
 
                             // scan mode 

OTSIncAMeasureApp/OTSIncAMeasureAppForm.cs

@@ -161,6 +161,8 @@ namespace OTSMeasureApp
                         m_RibbonFun.SetAllRibbonButnStatus(true);
                
                         m_SamplepaceWindow.InitStageDisplay(m_ProjData.GetStage(),m_ProjData.GetSEMStageData());
+
+                        this.Text += " -- SystemMode: " + m_ProjParam.m_DefaultParam.m_nPackId;
                     }
                     else
                     {

OTSIncAReportApp/frmMeasureRstMgr.cs

@@ -349,6 +349,7 @@ namespace OTSIncAReportApp
                 m_ReportApp.DisCurrentPicProperty();
                 //根据标签索引 显示默认的数据图表for test
                 m_ReportApp.m_DataMgrFun.ShowsTheDefaultPic();//显示图表
+
             }
             else
             {

OTSIncAReportApp/frmReportApp.cs

@@ -293,6 +293,7 @@ namespace OTSIncAReportApp
                 }
             }
 
+
         }
 
         #endregion