remove useless code and notations

OTSIncAMeasureApp/0-OTSModel/Measure/3-MeasureFlow/CSmplMsrResult.cs

@@ -664,7 +664,7 @@ namespace OTSModelSharp
             Dictionary<string, List<COTSSegmentClr>> AllSegments = new Dictionary<string, List<COTSSegmentClr>>();
             if (SegmentDB.GetAllSegmentsRecord(AllSegments))
             {
-                int nCol;
+                //int nCol;
                 foreach (var fld in allFlds)
 
                 {

OTSIncAMeasureApp/0-OTSModel/Measure/DBDataTransition/ElementChemistryDB.cs

@@ -207,7 +207,7 @@ namespace OTSModelSharp.DTLBase
                     }
                 }
             }
-            DataTable query;
+            //DataTable query;
             var tableInfoPtr = GetTableInfo();
             var datastorePtr = GetDatastore();
             String sTableName = tableInfoPtr.GetTableName();

OTSIncAMeasureApp/0-OTSModel/Measure/DBDataTransition/GenInfoDB.cs

@@ -231,7 +231,7 @@ namespace OTSModelSharp
 
         public bool DeleteRow(string a_sItemName)
         {
-            System.Data.DataTable query;
+            //System.Data.DataTable query;
             var datastorePtr = GetDatastore();
 
             var tableInfoPtr = GetTableInfo();

OTSIncAMeasureApp/0-OTSModel/Measure/DBDataTransition/SegmentDB.cs

@@ -13,9 +13,7 @@ namespace OTSModelSharp
 {
   public  class CSegmentDB: CSQLiteDB
   {
-      
-        // particle list
-       List< COTSParticleClr> m_listParticle;
+ 
 
 
      public CSegmentDB(IDBStoreBase _conStr, CSQLiteTable _table):base(_conStr,_table)	
@@ -23,237 +21,7 @@ namespace OTSModelSharp
 		
     }
 
-        public COTSFeatureClr GetFeatureById( long a_nXrayId,  long a_nFieldId,  long a_nSegmentSize)
-	{
-
-        COTSFeatureClr pFeatureNew = null;
-
-		if (m_listParticle.Count!=0)
-		{
-			foreach (var pParticle in m_listParticle)
-			{
-			COTSFeatureClr pFeature = pParticle.GetFeature();
-            if (pParticle.GetAnalysisId() == a_nXrayId && pParticle.GetFieldId() == a_nFieldId && (int) pFeature.GetSegmentsList().Count == a_nSegmentSize)
-			{ 	
-            pFeatureNew = new COTSFeatureClr(pFeature);
-    }
-    }
-		}
-		else
-		{
-			// read element list
-			for (int i = 0; i<a_nSegmentSize; i++)
-			{
-				var tableQuery = GetQueryById(a_nXrayId, a_nFieldId, i, a_nSegmentSize); //CElementChemistryDB
-
-
-                COTSParticleClr pParticle = ReadParticleInfo(tableQuery);
-
-
-                COTSFeatureClr pFeature = pParticle.GetFeature();
-
-                pFeatureNew = new COTSFeatureClr(pFeature);
-			}
-
-		}
-
-		return pFeatureNew;
-	}
-
-        public  List< COTSParticleClr>  GetParticleInfoList( bool a_bForce/* = FALSE*/)
-	{
-		if (a_bForce)
-		{
-        m_listParticle.Clear();
-		}
-
-		if (m_listParticle.Count == 0)
-		{
-			ReadParticleInfoList();
-		}
-
-		return m_listParticle;
-	}
-
-        public  COTSParticleClr ReadParticleInfo(DataTable a_query)
-        {
-            int nCol;
-            COTSParticleClr pParticle=new COTSParticleClr();
-
-            int nXrayIdNow;
-            int nFieldIdNow;
-           // CSegmentTable类改完再改此处
-            nCol = (int)CSegmentTable.ColumnID.N_XRAY_INDEX - (int)CSegmentTable.ColumnID.MIN;
-            nXrayIdNow = (int)a_query.Rows[(int)CSegmentTable.ColumnID.N_XRAY_INDEX][0];
-            pParticle.SetAnalysisId(nXrayIdNow);
-
-            nCol = (int)CSegmentTable.ColumnID.N_FIELD_ID - (int)CSegmentTable.ColumnID.MIN;
-            nFieldIdNow = (int)a_query.Rows[(int)CSegmentTable.ColumnID.N_FIELD_ID][0];
-            pParticle.SetFieldId(nFieldIdNow);
-
-            nCol = (int)CSegmentTable.ColumnID.N_SEGMENT_ID - (int)CSegmentTable.ColumnID.MIN;
-            int nSegmentIndex = (int)a_query.Rows[(int)CSegmentTable.ColumnID.N_SEGMENT_ID][0];
-
-            nCol = (int)CSegmentTable.ColumnID.N_SEGMENT_TOTAL - (int)CSegmentTable.ColumnID.MIN;
-            int nSegmentTotal = (int)a_query.Rows[(int)CSegmentTable.ColumnID.N_SEGMENT_TOTAL][0];
-            //pParticle->SetElementNum(nElementTotal);
-
-            if (nSegmentIndex > nSegmentTotal - 1)
-            {
-                return null;
-            }
-
-            COTSSegmentClr pSegment = new COTSSegmentClr();
-
-            nCol = (int)CSegmentTable.ColumnID.N_START - (int)CSegmentTable.ColumnID.MIN;
-            int nStart = (int)a_query.Rows[(int)CSegmentTable.ColumnID.N_START][0];
-            pSegment.SetStart(nStart);
-
-            nCol = (int)CSegmentTable.ColumnID.N_HEIGHT - (int)CSegmentTable.ColumnID.MIN;
-            int nHeight = (int)a_query.Rows[(int)CSegmentTable.ColumnID.N_HEIGHT][0];
-            pSegment.SetHeight(nHeight);
-
-            nCol = (int)CSegmentTable.ColumnID.N_LENGTH - (int)CSegmentTable.ColumnID.MIN;
-            int nLength = (int)a_query.Rows[(int)CSegmentTable.ColumnID.N_LENGTH][0];
-            pSegment.SetLength(nLength);
-
-            List<COTSSegmentClr> listSegment = new List<COTSSegmentClr>();
-            listSegment.Add(pSegment);
-
-            a_query.NewRow();
-
-            int nXrayNew, nFieldIdNew;
-
-            int nRowId = 0;
-
-            
-            for (int i = 0; i < a_query.Rows.Count; i++)
-            {
-                nCol = (int)CSegmentTable.ColumnID.N_XRAY_INDEX - (int)CSegmentTable.ColumnID.MIN;
-                nXrayNew = (int)a_query.Rows[(int)CSegmentTable.ColumnID.N_XRAY_INDEX][0];
-
-                nCol = (int)CSegmentTable.ColumnID.N_FIELD_ID - (int)CSegmentTable.ColumnID.MIN;
-                nFieldIdNew = (int)a_query.Rows[(int)CSegmentTable.ColumnID.N_FIELD_ID][0];
-
-                if (nXrayNew == nXrayIdNow && nFieldIdNew == nFieldIdNow)
-                {
-                    nCol = (int)CSegmentTable.ColumnID.N_SEGMENT_ID - (int)CSegmentTable.ColumnID.MIN;
-                    int nSegmentIndexs = (int)a_query.Rows[(int)CSegmentTable.ColumnID.N_SEGMENT_ID][0];
-
-                    nCol = (int)CSegmentTable.ColumnID.N_SEGMENT_TOTAL - (int)CSegmentTable.ColumnID.MIN;
-                    int nSegmentTotals = (int)a_query.Rows[(int)CSegmentTable.ColumnID.N_SEGMENT_TOTAL][0];
-
-                    if (nSegmentIndex > nSegmentTotal - 1)
-                    {
-                        return null;
-                    }
-                  
-
-                    nCol = (int)CSegmentTable.ColumnID.N_START - (int)CSegmentTable.ColumnID.MIN;
-                    int Start = (int)a_query.Rows[(int)CSegmentTable.ColumnID.N_START][0];
-                    pSegment.SetStart(nStart);
-
-                    nCol = (int)CSegmentTable.ColumnID.N_HEIGHT - (int)CSegmentTable.ColumnID.MIN;
-                    int Height = (int)a_query.Rows[(int)CSegmentTable.ColumnID.N_HEIGHT][0];
-                    pSegment.SetHeight(nHeight);
-
-                    nCol = (int)CSegmentTable.ColumnID.N_LENGTH - (int)CSegmentTable.ColumnID.MIN;
-                    int Length = (int)a_query.Rows[(int)CSegmentTable.ColumnID.N_LENGTH][0];
-                    pSegment.SetLength(nLength);
-
-                    listSegment.Add(pSegment);
-
-                    if (nSegmentIndex == nSegmentTotal - 1)
-                    {
-                        break;
-                    }
-                }
-                else
-                {
-                    continue;
-                }
-
-                a_query.NewRow();
-                nRowId++;
-            }
-
-            COTSFeatureClr pFeature = new COTSFeatureClr();
-            pFeature.SetSegmentsList(listSegment,true);
-
-            pParticle.SetFeature(pFeature);
-
-            return pParticle;
-        }
-
-    public  bool SaveFeature( List<COTSParticleClr> a_ParticleList)
-	{
-            //System.Data.DataTable query;
-            var tableInfoPtr = GetTableInfo();   
-            var datastorePtr = GetDatastore();
-	        String sInsertFormat =tableInfoPtr. GetInsertCommandFormatString(true);//SQLiteTable
-            String sSQLCommand = "";
-		foreach (var pParticle in a_ParticleList)
-		{			
-		COTSFeatureClr pFeature = pParticle.GetFeature();
-	    List< COTSSegmentClr> listSegments = pFeature.GetSegmentsList();
-            int nSize = (int)listSegments.Count;
-            int nSegmentIndex = 0;
-			foreach (var pSegment in listSegments)
-			{
-			sSQLCommand=	String.Format(sInsertFormat,
-                    pParticle.GetAnalysisId(),
-					pParticle.GetFieldId(),
-					nSegmentIndex,
-					nSize,
-					pSegment.GetStart(),
-					pSegment.GetHeight(),
-					pSegment.GetLength(),
-					pParticle.GetTagId());
-                  
-                    datastorePtr.RunCommand(sSQLCommand);
-    
-				nSegmentIndex++;
-			}
-		}
-            return true;
-	}
-
-     public  bool SaveFeature(COTSParticleClr a_pParticle)
-        {
-            //System.Data.DataTable query;
-            var tableInfoPtr = GetTableInfo();
-           
-            var datastorePtr = GetDatastore();
-            
-            String sInsertFormat = tableInfoPtr.GetInsertCommandFormatString(true);//CSQLiteTable修改完再修改此处
-            String sSQLCommand = "";
-
-            COTSFeatureClr pFeature = a_pParticle.GetFeature();
-            List< COTSSegmentClr> listSegments = pFeature.GetSegmentsList();
-           
-            int nSize = (int)listSegments.Count;
-            int nSegmentIndex = 0;
-            foreach (var pSegment in listSegments)
-            {
-                sSQLCommand=String.Format(sInsertFormat,
-                    a_pParticle.GetAnalysisId(),
-                    a_pParticle.GetFieldId(),
-                    nSegmentIndex,
-                    nSize,
-                    pSegment.GetStart(),
-                    pSegment.GetHeight(),
-                    pSegment.GetLength(),
-                    a_pParticle.GetTagId());
-
-               
-                 datastorePtr.RunCommand(sSQLCommand);
-                
-
-                nSegmentIndex++;
-            }
-
-            return true;
-        }
+ 
         public List<KeyValuePair<string,SQLiteParameter[]>> GetSavingFeatureCmd(COTSParticleClr a_pParticle)
         {
             var tableInfoPtr = GetTableInfo();
@@ -301,64 +69,7 @@ namespace OTSModelSharp
         }
 
 
-            public  bool DeleteFeatureById( long a_nFieldId,  long a_nXrayId)
-	{
-            System.Data.DataTable query;
-            if (m_listParticle.Count!=0)
-		{
-
-               
-                for (int itr = 0; itr < m_listParticle.Count; itr++)
-                {
-                    if (m_listParticle[itr].GetTypeName() ==a_nFieldId.ToString())
-                    {
-                        COTSParticleClr particle = new COTSParticleClr();
-                        particle = m_listParticle[itr];
-                        break;
-                    }
-                }
-
-
-            }
-
-       var tableInfoPtr = GetTableInfo();
-		var datastorePtr = GetDatastore();
-
-            String sTableName = tableInfoPtr.GetTableName();
-		if (!IsTableExists(""))
-		{
-
-                return true;
-		}
-        //CSQLiteTable 修改完再修改此处
-		var sXrayIdColumnName = tableInfoPtr.GetColumnName((int)CSegmentTable.ColumnID.N_XRAY_INDEX - (int)CSegmentTable.ColumnID.MIN);
-        var sFieldIdColumnName = tableInfoPtr.GetColumnName((int)CSegmentTable.ColumnID.N_FIELD_ID - (int)CSegmentTable.ColumnID.MIN);
-
-            String sSQLCommand = "";
-            String.Format("DELETE FROM \'%s\' WHERE %s = %d AND %s = %d AND %s = %d AND %s = %d;", (String)tableInfoPtr.GetTableName(), sXrayIdColumnName,
-            a_nXrayId, sFieldIdColumnName, a_nFieldId);
-            //var helper = new SQLiteHelper(datastorePtr);
-            datastorePtr.RunCommand(sSQLCommand);
-           
-            return true;
-	}
-
-       
-
-        public  bool IsTableExists(String a_sTableName)
-        {
-           
-            return tableExists(a_sTableName);//OTSSQLiteDll,SQLiteStore中的GetDBPtr()方法修改完再修改此处
-
-        }
-
-       public bool tableExists(string szTable)
-        {
-            String sSQL = "";
-            string.Format("select count(*) from sqlite_master where type='table' and name='%s'", szTable);
-            int nRet = Convert.ToInt32(sSQL);
-            return (nRet > 0);
-        }
+ 
 
       
 
@@ -373,7 +84,7 @@ namespace OTSModelSharp
                 fldvec+=curFldId.ToString();
                 fldvec += "_";
                 fldvec += curParticleId.ToString();
-            //var itr = mapSegments.ContainsKey(fldvec);                   
+                     
             if (mapSegments.ContainsKey(fldvec))
                 {
                     List<COTSSegmentClr> segments = mapSegments[fldvec];
@@ -381,13 +92,13 @@ namespace OTSModelSharp
                     segment.SetStart(Convert.ToInt32(allRecords.Rows[i][(int)CSegmentTable.ColumnID.N_START]));
                     segment.SetHeight(Convert.ToInt32(allRecords.Rows[i][(int)CSegmentTable.ColumnID.N_HEIGHT]));
                     segment.SetLength(Convert.ToInt32(allRecords.Rows[i][(int)CSegmentTable.ColumnID.N_LENGTH]));
-                    //segment.UpDownConection(segment);
+                 
                     segments.Add(segment);                  
                                  
                 }
                 else
                 {
-                    //auto pairseg = *itr;
+                   
                     List<COTSSegmentClr> segments = new List<COTSSegmentClr>();
                     COTSSegmentClr segment = new COTSSegmentClr();
                     segment.SetStart(Convert.ToInt32(allRecords.Rows[i][(int)CSegmentTable.ColumnID.N_START]));
@@ -400,118 +111,13 @@ namespace OTSModelSharp
 
                    
             }
-            //allRecords.Dispose();                
+                 
             return true;
         }
 
-       public bool ReadParticleInfoList()
-       {
-            var tableInfoPtr = GetTableInfo();
-           
-            var query =GetTableQueryForDataTable (tableInfoPtr.GetTableName());//CElementChemistryDB
-
-            m_listParticle = ReadParticleInfoList(query);
-
-            return true;
-       }
-
-        public List< COTSParticleClr> ReadParticleInfoList(DataTable a_query)
-        {
-            List<COTSParticleClr> listParticle = new List<COTSParticleClr>();
-
-            int nRowId = 0;
-            int nWrongItems = 0;
-
-            DataTable dataTable = new DataTable();
-           foreach(var r in a_query.Rows)
-            {
-                var ParticleInfo = ReadParticleInfo(dataTable);  //current x-ray point		
-
-                if (ParticleInfo != null)
-                {
-                   
-                    nWrongItems++;
-                }
-                else
-                {
-                    if (listParticle.Count!=0)
-                    {
-                        int nXrayId = ParticleInfo.GetAnalysisId();
-                        int nFieldId = ParticleInfo.GetFieldId();
-
-                        COTSFeatureClr pFeature = ParticleInfo.GetFeature();
-                     
-                       List< COTSSegmentClr> listSegmentNew = pFeature.GetSegmentsList();
-
-                        int nIndex = 0;
-
-                        foreach (var pParticle in listParticle)
-                        {
-
-                            listParticle.Remove(pParticle);
-
-                            if ((pParticle.GetAnalysisId() == nXrayId)
-                                && (pParticle.GetFieldId() == nFieldId))
-                            {
-                                COTSFeatureClr apFeature = pParticle.GetFeature();
-                                
-                              List < COTSSegmentClr> listSegmentOld = pFeature.GetSegmentsList();
-
-                                foreach (var pSegment in listSegmentNew)
-                                {
-                                    listSegmentOld.Add(new COTSSegmentClr(pSegment));
-                                }
-
-                                pFeature.SetSegmentsList(listSegmentOld,true);
-
-                                ParticleInfo.SetFeature(pFeature);
-
-                                break;
-                            }
-                            nIndex++;
-                        }
-
-                    }
-
-                    listParticle.Add(ParticleInfo);
-                }
-
-               
-            }
-
-            return listParticle;
-        }
-
-        public DataTable GetQueryById( long a_nXrayId,  long a_nFieldId,  long a_nSegmentId,  long a_nSegmentNum)
-	{
-
-        DataTable query;
-        var datastorePtr = GetDatastore();
-            //var helper = new SQLiteHelper(datastorePtr);
-
-        var tableInfoPtr = GetTableInfo();
-
-            //没有SegmentTable类，有了再修改此处 
-            // String sXrayIdColumnName = tableInfoPtr.columns((int)CSegmentTable.ColumnID.N_XRAY_INDEX - (int)CSegmentTable.ColumnID.MIN);
-            var sXrayIdColumnName = tableInfoPtr.GetColumnName((int)CSegmentTable.ColumnID.N_XRAY_INDEX - (int)CSegmentTable.ColumnID.MIN);
-            //  String sXrayIdColumnName = tableInfoPtr.GetColumnName((int)CSegmentTable.ColumnID.N_XRAY_INDEX - (int)CSegmentTable.ColumnID.MIN);
-            var sFieldIdColumnName = tableInfoPtr.GetColumnName((int)CSegmentTable.ColumnID.N_FIELD_ID - (int)CSegmentTable.ColumnID.MIN);
-        String sElementIdColumnName = tableInfoPtr.GetColumnName((int)CSegmentTable.ColumnID.N_SEGMENT_ID - (int)CSegmentTable.ColumnID.MIN);
-        String sElementNumColumnName = tableInfoPtr.GetColumnName((int)CSegmentTable.ColumnID.N_SEGMENT_TOTAL - (int)CSegmentTable.ColumnID.MIN);
-
-           // String sSQLCommand;
-            String sSQLCommand=String.Format("SELECT * FROM \'{0}\' WHERE {1} = {2} AND {3} ={4} AND {5} ={6} AND {7} = {8};",(String)tableInfoPtr.GetTableName(),
-            (String)sFieldIdColumnName,a_nFieldId,(String)sXrayIdColumnName,a_nXrayId,a_nSegmentId, (String)sElementNumColumnName,
-            a_nSegmentNum);
-
-		    query = datastorePtr.QueryByCmdForDataTable(sSQLCommand);//SQLiteStote在OTSSQLiteDll中修改完再修改此处
-
- 
-
-		return query;
-	}
+      
 
-        public  DataTable GetQueryOfAllRecord()//CDBQueryBase在OTSClassifyEngine中修改完再更改此处
+        public  DataTable GetQueryOfAllRecord()
         {
 
             DataTable query;
@@ -521,11 +127,10 @@ namespace OTSModelSharp
 
 
             String sSQLCommand=String.Format("SELECT * FROM \'{0}\';", tableInfoPtr.GetTableName());
-            //sSQLCommand= tableInfoPtr.GetTableName();
-            //var helper = new SQLiteHelper(datastorestr);
-            query = datastorestr.QueryByCmdForDataTable(sSQLCommand);//SQLiteStote在OTSSQLiteDll中修改完再修改此处
+         
+            query = datastorestr.QueryByCmdForDataTable(sSQLCommand);
             
-            // do the table related valid checking
+        
         
             return query;
         }

OTSIncAMeasureApp/0-OTSModel/Measure/ParamData/COTSMsrPrjResultData.cs

@@ -1280,9 +1280,7 @@ namespace OTSModelSharp
 
             try
             {
-                //find first file
-                //int FindFileData = 0;
-                // int file = FindFirstFile(a_strFolderName, FindFileData);
+            
                 string path = a_strFolderName;
                 List<string> lineStringList = new List<string>();//存储所有读取到的文件
                 DirectoryInfo[] dateDirArr = new DirectoryInfo(path).GetDirectories(); //取指定路径下的所有目录
@@ -1299,38 +1297,7 @@ namespace OTSModelSharp
                         a_listFileName.Add(FileNameWithoutExtension);
                     }
                 }
-                #region 原方法
-                //foreach (DirectoryInfo directoryInfo in dateDirArr)
-                //{
-                //    string fullName = directoryInfo.FullName + a_strFileType;
-                //    if (!File.Exists(fullName))
-                //    {
-                //        continue;//目录下不存在此文件，返回。
-                //    }
-                //    FileInfo file = new FileInfo(fullName);
-                //    StreamReader reader = new StreamReader(file.FullName);
-                //    while (!reader.EndOfStream)//判断是否读取完成
-                //    {
-                //        lineStringList.Add(reader.ReadLine());
-                //    }
-                //    reader.Close();
-                //}
-
-                //int INVALID_HANDLE_VALUE = 0;
-                ////find other file
-                //if (FindFileData != INVALID_HANDLE_VALUE)
-                //{
-                //    a_listFileName.Add(FindFileData.ToString());
-                //    bool bState = false;
-
-                //    FindFile(a_strFolderName, FindFileData.ToString());
-                //    while (bState)
-                //    {
-                //        a_listFileName.Add(FindFileData.ToString());
-                //        FindFile(a_strFolderName, FindFileData.ToString());
-                //    }
-                //} 
-                #endregion
+               
             }
             catch (Exception pe)
             {

OTSIncAMeasureApp/0-OTSModel/Measure/ParamData/DIALOG_CHECK_PARAM_RESULT.cs

@@ -30,11 +30,11 @@ namespace OTSModelSharp
         public DIALOG_CHECK_PARAM_RESULT()
         {
             InitializeComponent();
-            IDC_EDIT_RESULT.Text = "";           //m_strlEditResult(_T(""))
-            IDC_CHECK_WARN_DO.Checked = false;           //m_bCheckWarnDo(FALSE)
-            m_strMessageBase = "";                 //m_strMessageBase(_T(""))
-            m_nTatolMeasuableSmplNo = 0;                    //m_nTatolMeasuableSmplNo(0)
-            m_nWithWarningMeasuableSmplNo = 0;               //m_nWithWarningMeasuableSmplNo(0)
+            IDC_EDIT_RESULT.Text = "";           
+            IDC_CHECK_WARN_DO.Checked = false;   
+            m_strMessageBase = "";               
+            m_nTatolMeasuableSmplNo = 0;         
+            m_nWithWarningMeasuableSmplNo = 0;   
         }
 
 
@@ -61,31 +61,13 @@ namespace OTSModelSharp
             // control data
             SetControlData();
 
-            //CWnd* pWnd = GetDlgItem(IDOK);
-            //if (pWnd)
-            //{
-            //    /*CWnd* pWnd = GetDlgItem(IDD_DIALOG_CHECK_PARAM_RESULT)*/
-            //    pWnd->SetWindowText(MultiLang::GetInstance().GetCStringByKey(GrpOtherParam, DlgCheckParam_OKBtn));
-            //}
+          
             IDOK.Text = XmlResourceData.GetInstance().GetStringByKey(GrpOtherParam, DlgCheckParam_OKBtn);
 
-            //pWnd = GetDlgItem(IDCANCEL);
-            //if (pWnd)
-            //{
-            //    /*CWnd* pWnd = GetDlgItem(IDD_DIALOG_CHECK_PARAM_RESULT)*/
-            //    pWnd->SetWindowText(MultiLang::GetInstance().GetCStringByKey(GrpOtherParam, DlgCheckParam_CancelBtn));
-            //}
+        
             IDCANCEL.Text = XmlResourceData.GetInstance().GetStringByKey(GrpOtherParam, DlgCheckParam_CancelBtn);
 
-            //pWnd = GetDlgItem(IDC_CHECK_WARN_DO);
-            //if (pWnd)
-            //{
-            //    /*CWnd* pWnd = GetDlgItem(IDD_DIALOG_CHECK_PARAM_RESULT)*/
-            //    pWnd->SetWindowText(MultiLang::GetInstance().GetCStringByKey(GrpOtherParam, DlgCheckParam_WarningStr));
-            //}
-            //SetWindowText(MultiLang::GetInstance().GetCStringByKey(GrpOtherParam, DlgCheckParam_Title));
-            //IDC_CHECK_WARN_DO.Text = XmlResourceData.GetInstance().GetStringByKey(GrpOtherParam, DlgCheckParam_Title);
-            //return TRUE;  // return TRUE unless you set the focus to a control
+          
         }
 
         private void IDOK_Click(object sender, EventArgs e)
@@ -107,9 +89,9 @@ namespace OTSModelSharp
             {
                 nMeasurableSampleNo -= m_nWithWarningMeasuableSmplNo;
             }
-            IDC_EDIT_RESULT.Text = string.Format(m_strMessageBase, nMeasurableSampleNo); //m_strlEditResult.Format(m_strMessageBase, nMeasurableSampleNo);
+            IDC_EDIT_RESULT.Text = string.Format(m_strMessageBase, nMeasurableSampleNo); 
             // set data to controls
-            //UpdateData(FALSE);
+           
         }
 
         private void IDC_CHECK_WARN_DO_CheckedChanged(object sender, EventArgs e)

OTSIncAMeasureApp/0-OTSModel/OTSDataType/CElement.cs

@@ -693,7 +693,7 @@ namespace OTSDataType
             // strings to elements
             const int ELEMENT_STRING_NUMBER = 3;
             const int EXTRA_CHAR_NUMBER = 6;
-            int count = 1;
+            //int count = 1;
             foreach (var str in vLineStrings)
             {
                 str.Trim('\n');

OTSIncAMeasureApp/0-OTSModel/OTSDataType/CMsrSampleStatus.cs

@@ -205,7 +205,7 @@ namespace OTSDataType
         // compute time
         public bool ComputeTime(OTS_MSR_TIME_TYPE a_nType)
         {
-            DateTime time = new DateTime();
+            //DateTime time = new DateTime();
 
             if (a_nType == OTS_MSR_TIME_TYPE.START)
             {

OTSIncAMeasureApp/0-OTSModel/OTSDataType/XMLSerialization.cs

@@ -350,15 +350,14 @@ namespace OTSDataType
     {
         public abstract void Serialize(bool isStoring, XmlDocument classDoc, XmlNode rootNode);
 
-        //virtual ~ISlo() = default;
+       
     }
 
-    //typedef std::vector<Slo*>::iterator  __declspec(dllexport) SerializableIterator;  //iterator？
+
 
     public class Slo: ISlo
     {
-        //private (Slo const &s) { }
-        //private Slo operator=(Slo const &s) { return *this; };
+        
 
         public string strReplaceAll(string source, string searchFor, string replaceWith)
         {

OTSIncAMeasureApp/4-OTSSamplespaceGraphicsPanel/OTSSamplespaceWindow.cs

@@ -538,7 +538,7 @@ namespace OTSMeasureApp
         }
         #endregion
 
-        #region 修改样品选择状态
+      
         public  void SetSampleState(Color setColor)
         {
             foreach (var items in m_visualSamples)
@@ -3068,4 +3068,3 @@ namespace OTSMeasureApp
 
     }
 }
-#endregion

OTSIncAMeasureApp/7-OTSProgMgrInfo/Stage/DlgStageEdit.cs

@@ -17,7 +17,7 @@ namespace OTSMeasureApp._7_OTSProgMgrInfo.Stage
     public partial class DlgStageEdit : Form
     {
         // stage file
-        CStageParam m_pStageFile;
+        //CStageParam m_pStageFile;
         public CStage m_pStage;
         StageDisplayHelp stageDisplayHelp;
         OTSCommon.Language lan;
@@ -54,7 +54,7 @@ namespace OTSMeasureApp._7_OTSProgMgrInfo.Stage
             dataGridView_Holes.Columns.Add("Param2", str);
             str = hashtable["str7"].ToString();
             dataGridView_Holes.Rows.Add("1", str, -4250, -16000, 12000, 0);
-            //SetDataGridViewStyle();
+        
             cmb_Temp.Visible = false;
             cmb_Temp.Items.Add(str);
             str = hashtable["str8"].ToString();
@@ -67,14 +67,7 @@ namespace OTSMeasureApp._7_OTSProgMgrInfo.Stage
                 LoadStageData(m_pStage);
             }
             SetHelp();
-            //Object pDC = new Object();
-            //pDC = m_ctrlStagePicture.CreateGraphics();
-            ////消除锯齿
-            //((Graphics)pDC).SmoothingMode = SmoothingMode.AntiAlias;  //图片柔顺模式选择
-            //((Graphics)pDC).InterpolationMode = InterpolationMode.HighQualityBicubic;//高质量
-            //((Graphics)pDC).CompositingQuality = CompositingQuality.HighQuality;//再加一点 
-
-
+       
         }
         void SetHelp()
         {

OTSIncAMeasureApp/7-OTSProgMgrInfo/Stage/DlgStageMgr.cs

@@ -352,7 +352,7 @@ namespace OTSModelSharp.Measure.GetStageInfo
             int nHeight = (int)rc.Height;
             Object pDC = new Object();
 
-            bool DeleteObject = false;
+            //bool DeleteObject = false;
             //paint the DC with white
             Brush pOldBrush = new SolidBrush(Color.FromArgb(50, Color.White));
 

OTSIncAMeasureApp/7-OTSProgMgrInfo/Stage/StageDisplayHelp.cs

@@ -101,7 +101,7 @@ namespace OTSMeasureApp._7_OTSProgMgrInfo.Stage
 
 
             int nRatio = a_nBounderyWidth * (a_nWidth / 2 - RATIO_RECT_LEFT - 10) / (a_nWidth - PIC_EDGE * 2) / 1000; //显示在标尺上的mm数
-            string sRatio;
+            //string sRatio;
 
             Point oRatioStart = new Point();
             oRatioStart.X = RATIO_RECT_LEFT;
@@ -111,60 +111,7 @@ namespace OTSMeasureApp._7_OTSProgMgrInfo.Stage
             oRatioEnd.X = a_nWidth / 2;
             oRatioEnd.Y = a_nHeight - RATIO_RECT_DOWN;
 
-            //标尺
-
-            //Pen pen = new Pen(Color.Black, 10f);
-            //((Graphics)pDC).DrawLine(pen,new Point(oRatioStart.X + 5, oRatioStart.Y + 5),new Point(oRatioStart.X + 5, oRatioEnd.Y - 15));
-            //((Graphics)pDC).DrawLine(pen, new Point(oRatioStart.X + 5, oRatioStart.Y + 10),new Point(oRatioEnd.X - 5, oRatioStart.Y + 10));
-            //((Graphics)pDC).DrawLine(pen, new Point(oRatioEnd.X - 5, oRatioStart.Y + 5),new Point(oRatioEnd.X - 5, oRatioEnd.Y - 15));
-
-
-            //pDC->MoveTo(CPoint(oRatioStart.x + 5, oRatioStart.y + 5));
-            //pDC->LineTo(CPoint(oRatioStart.x + 5, oRatioEnd.y - 15));
-            //pDC->MoveTo(CPoint(oRatioStart.x + 5, oRatioStart.y + 10));
-            //pDC->LineTo(CPoint(oRatioEnd.x - 5, oRatioStart.y + 10));
-            //pDC->MoveTo(CPoint(oRatioEnd.x - 5, oRatioStart.y + 5));
-            //pDC->LineTo(CPoint(oRatioEnd.x - 5, oRatioEnd.y - 15));
-
-            //CFont font;
-            //VERIFY(font.CreateFont(
-            //    12,                        // nHeight
-            //    0,                         // nWidth
-            //    0,                         // nEscapement
-            //    0,                         // nOrientation
-            //    FW_THIN,                 // nWeight
-            //    FALSE,                     // bItalic
-            //    FALSE,                     // bUnderline
-            //    0,                         // cStrikeOut
-            //    ANSI_CHARSET,              // nCharSet
-            //    OUT_DEFAULT_PRECIS,        // nOutPrecision
-            //    CLIP_DEFAULT_PRECIS,       // nClipPrecision
-            //    DEFAULT_QUALITY,           // nQuality
-            //    DEFAULT_PITCH | FF_SWISS,  // nPitchAndFamily
-            //    _T("Arial")));                 // lpszFacename
-
-
-            //CFont* def_font = pDC->SelectObject(&font);
-            //pDC->TextOut(oRatioStart.x + 70, oRatioStart.y + 15, sRatio);
-            //pDC->SelectObject(def_font);
-
-            //// Done with the font.  Delete the font object.
-            //font.DeleteObject();
-
-            //CRect oRect(oRatioStart, oRatioEnd);
-
-            //HDC hDC;
-            //hDC = ::GetDC(pWnd->m_hWnd);
-            //HDC hBitmapDC = CreateCompatibleDC(hDC);
-            //HBITMAP hBitmap = CreateCompatibleBitmap(hDC, rc.Width(), rc.Height());
-            //SelectObject(hBitmapDC, hBitmap);
-
-            //BLENDFUNCTION bf;
-            //bf.BlendOp = AC_SRC_OVER;
-            //bf.BlendFlags = 0;
-            //bf.AlphaFormat = 0;
-            //bf.SourceConstantAlpha = 10;
-            //AlphaBlend(hDC, oRect.left, oRect.top, oRect.Width(), oRect.Height(), hBitmapDC, 0, 0, oRect.Width(), oRect.Height(), bf);
+            
         }
 
         // get pixle rect

OTSIncAMeasureApp/OTSIncAMeasureAppForm.cs

@@ -55,11 +55,6 @@ namespace OTSMeasureApp
 
         public  OTSRibbonFun m_RibbonFun = null;
 
-        //判断信息来源  拍摄样品孔图片 或是 测量开始
-        private MSR_RUN_TYPE runType = MSR_RUN_TYPE.RUNMEASURE;
-
-
-
 
 
         // 初始化日志类
@@ -295,11 +290,7 @@ namespace OTSMeasureApp
             //获取新工作样品属性值
             OTSSamplePropertyInfo SMInfo = new OTSSamplePropertyInfo();
             m_ProjParam.GetWorkSamplePerameter(m_ProjParam.GetWorkSample(), ref SMInfo);
-           
-
-
-            //设置获取帧图状态
-            //m_RunType = MSR_THREAD_RunSTATUS.RUNMEASURE;
+  
             m_SPropertyWindows.DisplaySampleMeasureInfo(SMInfo);
             //发送新的样品名给Treeview
             m_SolutionWindows.SwitchSample(sNewWorkSampleName);
@@ -343,8 +334,7 @@ namespace OTSMeasureApp
             m_SPropertyWindows.DisplaySampleMeasureInfo(SMeasurenfo);
         }
 
-        // string sSampleOldName  :  样品名原名
-        //string  sSampleNewName  :   样品名新名
+    
         public bool EditWorkSampleName(string sSampleOldName, string sSampleNewName)
         {
             if (!m_ProjParam.ChangeWorkSampleName(sSampleNewName))
@@ -364,7 +354,7 @@ namespace OTSMeasureApp
             return true;
         }
 
-        //OTSSolutionWindow窗口给MeasureApp窗口添加样品请求
+     
         public void SoluwindowReqAddSample()
         {
             //Treeview右键点击添加新样品