Browse Source

change the "total particle area" to double

gsp 3 years ago
parent
commit
37f4961e86

+ 1 - 10
OTSIncAMeasureApp/0-OTSModel/Measure/1-OTSInclution/SmplMeasureInclution.cs

@@ -287,16 +287,7 @@ namespace OTSModelSharp
             {
                 log.Info(" classify failed. " + e.Message);
             }
-            //var partlist = curFldData.GetListAnalysisParticles();
-            //var validPars = new List<COTSParticleClr>();
-            //foreach (var p in partlist)
-            //{
-            //    if (p.GetGrpId() > INVALIDPART_GROUPID)
-            //    {
-            //        validPars.Add(p);
-            //    }
-            //}
-            //curFldData.SetListAnalysisParticles(validPars);
+         
         }
         public override void ClassifyMergedParticles(List<COTSParticleClr> mergedParts)
         {

+ 1 - 1
OTSIncAMeasureApp/0-OTSModel/OTSDataType/COTSSample.cs

@@ -1287,7 +1287,7 @@ namespace OTSDataType
                                 // total particle area
                                 poPropItem = new CPropItem();
                                 nItemId = OTS_SAMPLE_PROP_GRID_ITEMS.TOTAL_PARTICLE_AREA;
-                                poPropItem.SetSmplParameter(modelResource, nItemId, OTS_ITEM_TYPES.INT, true, true);
+                                poPropItem.SetSmplParameter(modelResource, nItemId, OTS_ITEM_TYPES.DOUBLE, true, true);
                                 a_listPropItems.Add(poPropItem);
                             }
                         }

+ 1 - 50
OTSIncAMeasureApp/0-OTSModel/OTSDataType/CPropItem.cs

@@ -109,56 +109,7 @@ namespace OTSDataType
 
 
 
-	public class CPropItemGrp
-	{
-
-
-		public CPropItemGrp()
-		{ }// constructor
-		public CPropItemGrp(CPropItemGrp g)
-		{ }// copy constructor
-
-
-		// group name 
-		public string GetName() { return m_strName; }
-		public void SetName(string a_strName) { m_strName = a_strName; }
-
-		// items group Id
-		public OTS_SAMPLE_PROP_GRID_ITEM_GROUPS GetGroupId() { return m_nId; }
-		public void SetGroupId(OTS_SAMPLE_PROP_GRID_ITEM_GROUPS a_nId) { m_nId = a_nId; }
-
-	// items list
-	public List<CPropItem> GetItemsList() { return m_listPropItems; }
-		public void SetItemsList(List<CPropItem> a_listPropItems)
-		{
-			m_listPropItems = a_listPropItems;
-		}
-		public void GetItemsIdRange(OTS_SAMPLE_PROP_GRID_ITEMS a_nItemIdMin, OTS_SAMPLE_PROP_GRID_ITEMS a_nItemIdMax)
-		{ }
-
-
-
-		// cleanup 
-		public void Cleanup()
-		{ }
-
-		// initialization
-		public void Init()
-		{ }
-
-		// duplication
-		public void Duplicate(CPropItemGrp a_oSource)
-		{ }
-
-	// group name 
-	string m_strName;
-
-	// group id
-	OTS_SAMPLE_PROP_GRID_ITEM_GROUPS m_nId;
-
-	// items list
-	List<CPropItem> m_listPropItems;
-};
+	
 
 
 

+ 1 - 0
OTSIncAMeasureApp/OTSIncAMeasureApp.csproj

@@ -230,6 +230,7 @@
     <Compile Include="0-OTSModel\OTSDataType\CHole.cs" />
     <Compile Include="0-OTSModel\OTSDataType\CHoleBSEImg.cs" />
     <Compile Include="0-OTSModel\OTSDataType\CIntRange.cs" />
+    <Compile Include="0-OTSModel\OTSDataType\CPropItemGrp.cs" />
     <Compile Include="0-OTSModel\OTSDataType\CMsrSampleStatus.cs" />
     <Compile Include="0-OTSModel\OTSDataType\COTSImageProcParam.cs" />
     <Compile Include="0-OTSModel\OTSDataType\COTSImageScanParam.cs" />