remove some useless comment

OTSCPP/OTSControl/OTSControl.vcxproj

@@ -172,7 +172,7 @@
     <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
     <UseOfMfc>Dynamic</UseOfMfc>
-    <CLRSupport>true</CLRSupport>
+    <CLRSupport>false</CLRSupport>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_oxford62|x64'" Label="Configuration">
@@ -270,7 +270,7 @@
     <IntDir>$(SolutionDir)\Obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
     <OutDir>$(SolutionDir)\Bin\$(Platform)\$(Configuration)\OTSCPPDll</OutDir>
     <IncludePath>$(SolutionDir)\OTSCPP\OTSControl;$(SolutionDir)OTSCPP\OTSData;$(SolutionDir)OTSCPP\Tools;$(SolutionDir)OTSCPP\OTSLog;$(IncludePath)</IncludePath>
-    <ReferencePath>$(SolutionDir)OTSCPP\OpenDll\OxfordApi61Dll;$(ReferencePath)</ReferencePath>
+    <ReferencePath>$(ReferencePath)</ReferencePath>
     <LibraryPath>$(SolutionDir)\Bin\$(Platform)\$(Configuration)\OTSCPPDll;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_oxford50|x64'">
@@ -294,7 +294,7 @@
     <IntDir>$(SolutionDir)\Obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
     <OutDir>$(SolutionDir)\Bin\$(Platform)\$(Configuration)\OTSCPPDll</OutDir>
     <IncludePath>$(SolutionDir)\OTSCPP\OTSControl;$(SolutionDir)OTSCPP\OTSData;$(SolutionDir)OTSCPP\Tools;$(SolutionDir)OTSCPP\OTSLog;$(IncludePath)</IncludePath>
-    <ReferencePath>$(SolutionDir)OTSCPP\OpenDll\OxfordApi61Dll;$(ReferencePath)</ReferencePath>
+    <ReferencePath>$(ReferencePath)</ReferencePath>
     <LibraryPath>$(SolutionDir)\Bin\$(Platform)\$(Configuration)\OTSCPPDll;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_oxford62|x64'">

OTSIncAMeasureApp/5-OTSMeasureStatuImageFun/OTSMeasureStatusWindow.cs

@@ -558,16 +558,11 @@ namespace OTSMeasureApp
             if (!bfResult) { return; }
 
 
-            //用于线扫描曲线
-
-            //UpdateImageOrChart(m_imagetype);
+       
             ShowBitmap(m_iWidth, m_iHeight, coloredParticleImage);
-            //Imagedata = new byte[m_iWidth];
+         
             IsShowGrayLevelLine = false;
-            //获取默认Y轴
-            //GetYSize();
-            ////获取行数据
-            //GetLineImage(YSize, m_iWidth, ref Imagedata);
+      
 
             myChart.Visible = false;
             picBox.Show();
@@ -1058,8 +1053,7 @@ namespace OTSMeasureApp
                 //Y值
                 double rate = (double)picBox.Image.Height / (double)rectangle.Height;
                 int YSize = Convert.ToInt32((rate * (double)e.Y));
-                //显示线扫描 黄色线的曲线数据
-                //GetLineImage(YSize, m_iWidth, ref Imagedata);
+          
                 string strGrayValue = grayValue.ToString();
                 switch (strGrayValue.ToString().Length)
                 {
@@ -1306,23 +1300,6 @@ namespace OTSMeasureApp
         }
         #endregion
 
-        #region 获取SEM当前位置
-        //public void GetSEMLocation(ref double dPositionX, ref double dPositionY, ref double dPositionR)
-        //{
-        //    try
-        //    {
-        //        COTSControlFunExport cfun = COTSControlFunExport.GetControllerInstance();
-        //        //获取SEM当前位置
-        //        cfun.GetSemPositionXY(ref dPositionX, ref dPositionY, ref dPositionR);
-        //        //m_ImageData.GetSemPositionXY(ref dPositionX, ref dPositionY, ref dPositionR);
-        //    }
-        //    catch (Exception ex)
-        //    {
-
-        //        MessageBox.Show(table["message24"].ToString() + ex.ToString());
-        //    }
-        //}
-        #endregion
 
 
 
@@ -1464,11 +1441,7 @@ namespace OTSMeasureApp
             //1.连接电镜
             if (m_EDSHardwareMgr.Init())
             {
-                bool initResult = false;
-                //线程调用 加载
-                initResult = m_EDSHardwareMgr.Init();
-                if (initResult)
-                {
+                
                     COTSMsrPrjResultData cProjMgr = m_MeasureAppForm.m_ProjParam.GetResultData();
                     //获取工作样品对象
                     COTSSample sampleClr = cProjMgr.GetWorkingSample();
@@ -1550,7 +1523,7 @@ namespace OTSMeasureApp
                     }
                     ExportScanInfoMenuItem.Enabled = true;
                     this.Invalidate();
-                }
+                
 
 
 

OTSIncAReportApp/1-UI/Control_ECharts/EChart_Trianglediagram.cs

@@ -203,7 +203,7 @@ namespace OTSIncAReportApp.Control_ECharts
                     list.Add(list_json_str);
 
                 }
-                url = "Resources/HTML/chartsMore.html";
+                url = "CefSharp\\Resources/HTML/chartsMore.html";
                 m_ReportApp.data = JsonConvert.SerializeObject(list);
             }
             else

OTSIncAReportApp/1-UI/Control_Graph/Controls/Control_DrawDistrbutionImageAndBSE.resx

@@ -118,6 +118,6 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <metadata name="CMenuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>12, 22</value>
+    <value>16, 16</value>
   </metadata>
 </root>