Merge branch 'dev' of http://172.16.3.77:10080/gaoshipeng/OTS2_0 into dev

Bin/x64/Debug/Resources/XMLData/AppResource_ZH.xml

@@ -189,6 +189,8 @@
       <Control name="AddSample" text="增加样品测量结果" />
       <Control name="button1" text="多选数据源" />
       <Control name="frmMeasureRstMgr" text="测量结果窗口" />
+      <Control name="str1" text="Delete  " />
+      <Control name="str2" text=" file?" />
     </Controls>
  </Form>
  <Form>
@@ -1210,8 +1212,7 @@
 	  <Control name="partcletype6" text="不含分析元素的颗粒" />
       <Control name="partcletype7" text="非夹杂物颗粒SiC" />
 	  <Control name="partcletype8" text="非夹杂物颗粒FeO" />
-	  <Control name="partcletype9" text="未识别颗粒" />
-	  
+	  <Control name="partcletype9" text="未识别颗粒" /> 
 	  <Control name="str21" text="面积μm²" />
 	  <Control name="str22" text="等效圆直径μm" />
 	  <Control name="str23" text="最长直径μm" />

OTSIncAReportApp/OTSIncAReportApp.csproj

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\EntityFramework.6.3.0\build\EntityFramework.props" Condition="Exists('..\packages\EntityFramework.6.3.0\build\EntityFramework.props')" />
+  <Import Project="..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -122,10 +122,10 @@
       <HintPath>..\Bin\x64\Debug\CefSharp.WinForms.dll</HintPath>
     </Reference>
     <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\packages\EntityFramework.6.3.0\lib\net45\EntityFramework.dll</HintPath>
+      <HintPath>..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>
     </Reference>
     <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\packages\EntityFramework.6.3.0\lib\net45\EntityFramework.SqlServer.dll</HintPath>
+      <HintPath>..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll</HintPath>
     </Reference>
     <Reference Include="ICSharpCode.SharpZipLib, Version=0.86.0.518, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -151,9 +151,8 @@
       <HintPath>..\OpenDll\Json\Newtonsoft.Json.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\Bin\x64\Release\NLog.dll</HintPath>
+    <Reference Include="NLog">
+      <HintPath>..\Bin\x64\Debug\NLog.dll</HintPath>
     </Reference>
     <Reference Include="NPOI, Version=2.1.3.1, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -188,9 +187,8 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\Bin\x64\Debug\OpenCvSharp.Extensions.dll</HintPath>
     </Reference>
-    <Reference Include="OTS.WinFormsUI.Docking, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\Bin\x64\Release\OTS.WinFormsUI.Docking.dll</HintPath>
+    <Reference Include="OTS.WinFormsUI.Docking">
+      <HintPath>..\Bin\x64\Debug\OTS.WinFormsUI.Docking.dll</HintPath>
     </Reference>
     <Reference Include="SourceGrid, Version=4.40.7083.30975, Culture=neutral, PublicKeyToken=df6f5e538749e85d, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -200,14 +198,14 @@
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Data.SQLite, Version=1.0.113.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=AMD64">
-      <HintPath>..\packages\System.Data.SQLite.x64.1.0.113.0\lib\net46\System.Data.SQLite.dll</HintPath>
+    <Reference Include="System.Data.SQLite, Version=1.0.115.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=AMD64">
+      <HintPath>..\packages\System.Data.SQLite.x64.1.0.115.0\lib\net46\System.Data.SQLite.dll</HintPath>
     </Reference>
-    <Reference Include="System.Data.SQLite.EF6, Version=1.0.113.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Data.SQLite.EF6.1.0.113.0\lib\net46\System.Data.SQLite.EF6.dll</HintPath>
+    <Reference Include="System.Data.SQLite.EF6, Version=1.0.115.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Data.SQLite.EF6.1.0.115.0\lib\net46\System.Data.SQLite.EF6.dll</HintPath>
     </Reference>
-    <Reference Include="System.Data.SQLite.Linq, Version=1.0.113.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Data.SQLite.Linq.1.0.113.0\lib\net46\System.Data.SQLite.Linq.dll</HintPath>
+    <Reference Include="System.Data.SQLite.Linq, Version=1.0.115.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Data.SQLite.Linq.1.0.115.0\lib\net46\System.Data.SQLite.Linq.dll</HintPath>
     </Reference>
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.ServiceModel" />
@@ -1293,8 +1291,8 @@
     <PropertyGroup>
       <ErrorText>这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息，请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\EntityFramework.6.3.0\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.3.0\build\EntityFramework.props'))" />
-    <Error Condition="!Exists('..\packages\EntityFramework.6.3.0\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.3.0\build\EntityFramework.targets'))" />
+    <Error Condition="!Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.4.4\build\EntityFramework.props'))" />
+    <Error Condition="!Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.4.4\build\EntityFramework.targets'))" />
   </Target>
-  <Import Project="..\packages\EntityFramework.6.3.0\build\EntityFramework.targets" Condition="Exists('..\packages\EntityFramework.6.3.0\build\EntityFramework.targets')" />
+  <Import Project="..\packages\EntityFramework.6.4.4\build\EntityFramework.targets" Condition="Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" />
 </Project>

OTSIncAReportApp/OTSTemplateDesigner/Export_ReportTemplate.cs

@@ -713,7 +713,7 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
         /// 向 模板设计器 中插入 颗粒成份图
         /// </summary>
         /// <returns></returns>
-        public bool InsertReportTemplateChart_ParticalesCompositionChart(string a_AnalyticGraphics)
+        public bool InsertReportTemplateChart_ParticlesCompositionChart(string a_GraphicStyle)
         {
             try
             {
@@ -721,7 +721,7 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
                 //加载模块
                 m_otsreport_export.m_ReportApp.im_EChart_ParticlesComposition = new EChart_ParticlesComposition(m_otsreport_export.m_ReportApp, "PComponent");
                 m_otsreport_export.m_ReportApp.m_reportname = "InclusionClassification";
-                m_otsreport_export.m_ReportApp.type = a_AnalyticGraphics;
+                m_otsreport_export.m_ReportApp.type = a_GraphicStyle;
                 m_otsreport_export.m_ReportApp.timerKG = true;
                 m_otsreport_export.m_ReportApp.m_CChartsWindow.Controls.Add(m_otsreport_export.m_ReportApp.im_EChart_ParticlesComposition);
 
@@ -770,7 +770,7 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
         /// 向 模板设计器 中插入 元素成份图
         /// </summary>
         /// <returns></returns>
-        public bool InsertReportTemplateChart_ElementCompositionChart(string a_AnalyticGraphics)
+        public bool InsertReportTemplateChart_ElementCompositionChart(string a_GraphicStyle)
         {
             try
             {
@@ -778,7 +778,7 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
                 //加载模块
                 m_otsreport_export.m_ReportApp.im_EChart_ParticlesComposition = new EChart_ParticlesComposition(m_otsreport_export.m_ReportApp, "EComponent");
                 m_otsreport_export.m_ReportApp.m_reportname = "ElementComposition";
-                m_otsreport_export.m_ReportApp.type = a_AnalyticGraphics;
+                m_otsreport_export.m_ReportApp.type = a_GraphicStyle;
                 m_otsreport_export.m_ReportApp.timerKG = true;
                 m_otsreport_export.m_ReportApp.m_CChartsWindow.Controls.Add(m_otsreport_export.m_ReportApp.im_EChart_ParticlesComposition);
 

OTSIncAReportApp/OTSTemplateDesigner/OTSReport_Export.cs

@@ -1947,7 +1947,7 @@ namespace OTSIncAReportApp
 
                     if (ls_str.IndexOf("颗粒成份图") > -1)
                     {
-                        m_export_reporttemplate.InsertReportTemplateChart_ParticalesCompositionChart(AnalyticGraphics(m_mbszclass.M_KLFXJG.index_cb_jzwfl_xstx));
+                        m_export_reporttemplate.InsertReportTemplateChart_ParticlesCompositionChart(AnalyticGraphics(m_mbszclass.M_KLFXJG.index_cb_jzwfl_xstx));
                         lock (m_thread_flag)
                             m_thread_flag = "无";
                     }

OTSIncAReportApp/OTSTemplateDesigner/OTSReport_TemplateDesignerRM.cs

@@ -182,15 +182,9 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
 
         private void button1_Click(object sender, EventArgs e)
         {
-            //另存
-            if (VerifyControlValue() == false)
-                return;
-
-            
-
-           if ( SaveControlsToXml())
+           if ( SaveTemplateParametersToXml())
             {
-                SaveControls();
+                SaveTemplateParameters();
             }
         }
 
@@ -216,7 +210,7 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
         #endregion
 
         #region 另存到文件
-        private bool SaveControlsToXml()
+        private bool SaveTemplateParametersToXml()
         {
             string path = string.Empty;
             SaveFileDialog save = new SaveFileDialog();
@@ -544,7 +538,7 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
             }
         }
 
-        private void SaveControls()
+        private void SaveTemplateParameters()
         {
 
             //首页
@@ -1006,7 +1000,7 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
             if (VerifyControlValue() == false)
                 return;
 
-            SaveControls();
+            SaveTemplateParameters();
 
 
             this.DialogResult = DialogResult.Yes;

OTSIncAReportApp/packages.config

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="EntityFramework" version="6.3.0" targetFramework="net472" />
-  <package id="System.Data.SQLite.EF6" version="1.0.113.0" targetFramework="net472" />
-  <package id="System.Data.SQLite.Linq" version="1.0.113.0" targetFramework="net472" />
-  <package id="System.Data.SQLite.x64" version="1.0.113.0" targetFramework="net472" />
+  <package id="EntityFramework" version="6.4.4" targetFramework="net472" />
+  <package id="System.Data.SQLite.EF6" version="1.0.115.0" targetFramework="net472" />
+  <package id="System.Data.SQLite.Linq" version="1.0.115.0" targetFramework="net472" />
+  <package id="System.Data.SQLite.x64" version="1.0.115.0" targetFramework="net472" />
 </packages>

OTSIncAReportTemplate/OTSIncAReportTemplate.cs

@@ -85,7 +85,7 @@ namespace OTSIncAReportTemplate
                 //m_arg4 = "0-983";
                 //m_arg5 = "";
 
-                m_arg1 = "D:\\夹杂物\\ReportTemplateDB.db";
+                m_arg1 = "C:\\Users\\admin\\Desktop\\ots2.0测量结果\\曹磊\\曹磊\\1\\Sample1\\ReportTemplateDB.db";
                 m_arg2 = "./Config/ProData/ReportTemplateConfig.xml";
                 m_arg3 = "MainReport";
                 m_arg4 = "100";

OTSIncAReportTemplate/OTSIncAReportTemplate.csproj

@@ -91,7 +91,9 @@
     <Reference Include="RM.ReportEngine">
       <HintPath>..\Bin\x64\Release_oxford50\RM.ReportEngine.dll</HintPath>
     </Reference>
-    <Reference Include="System" />
+    <Reference Include="System">
+      <HintPath>C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.7.2\System.dll</HintPath>
+    </Reference>
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Core" />
     <Reference Include="System.Data.SQLite, Version=1.0.86.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">