添加 孙工 报告 程序中 修改

OTSIncAReportApp/FunctionClass/Union/DrawFuncation.cs

@@ -487,7 +487,7 @@ namespace OTSIncAReportGraph.Class
             Mat src = OpenCvSharp.Extensions.BitmapConverter.ToMat(in_bp);
             Mat dst = new Mat();
 
-            Cv2.AdaptiveThreshold(src, dst, 255, AdaptiveThresholdTypes.MeanC, ThresholdTypes.Binary, 11, 5);
+            Cv2.AdaptiveThreshold(src, dst, 255, AdaptiveThresholdTypes.MeanC, ThresholdTypes.Binary, 27, 25);
 
             //绝对缩放,
             Mat dst2 = new Mat();

OTSIncAReportApp/OTSTemplateDesigner/Export_ReportTemplate.cs

@@ -223,6 +223,10 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
                     Bitmap bp_particle = new Bitmap(1, 1);
                     string str_path = str_resultPath + "\\FIELD_FILES\\";
                     string str_imagePath = str_path + "Field" + str_fieldid.ToString() + ".bmp";
+
+                    if (str_fieldid == "-1")
+                        continue;
+
                     if (str_subparticles != null && str_subparticles != "")
                     {
                         //合并大颗粒

OTSIncAReportTemplate/OTSIncAReportTemplate.cs

@@ -42,26 +42,26 @@ namespace OTSIncAReportTemplate
         {
             InitializeComponent();
 
-            if (args.Length == 0)
-            {
-                MessageBox.Show("请使用报告程序打开模板程序!");
-                return;
-            }
-
-            if (args.Length != 5)
-            {
-                string str = "";
-                for (int i = 0; i < args.Length; i++)
-                {
-                    str = str + "参数" + (i + 1).ToString() + ":" + args[i].ToString() + Environment.NewLine;
-                }
-
-                MessageBox.Show("传入的参数数量不正确，应为5个参数：" + Environment.NewLine + str);
-                return;
-            }
+            //if (args.Length == 0)
+            //{
+            //    MessageBox.Show("请使用报告程序打开模板程序!");
+            //    return;
+            //}
+
+            //if (args.Length != 5)
+            //{
+            //    string str = "";
+            //    for (int i = 0; i < args.Length; i++)
+            //    {
+            //        str = str + "参数" + (i + 1).ToString() + ":" + args[i].ToString() + Environment.NewLine;
+            //    }
+
+            //    MessageBox.Show("传入的参数数量不正确，应为5个参数：" + Environment.NewLine + str);
+            //    return;
+            //}
 
             //方便测试代码分岐
-            bool bDebug = false;
+            bool bDebug = true;
             if (bDebug == false)
             {
                 m_arg1 = args[0].Replace("^", " ");
@@ -85,10 +85,10 @@ namespace OTSIncAReportTemplate
                 //m_arg4 = "0-983";
                 //m_arg5 = "";
 
-                m_arg1 = "E:\\ResultFile\\beijing20201217\\1-18\\Sample1\\ReportTemplateDB.db";
+                m_arg1 = "E:\\ResultFile\\beijing20210708\\Sample4\\ReportTemplateDB.db";
                 m_arg2 = "./Config/ProData/ReportTemplateConfig.xml";
                 m_arg3 = "MainReport";
-                m_arg4 = "1031";
+                m_arg4 = "100";
                 m_arg5 = "0-100";
             }
 
@@ -143,6 +143,7 @@ namespace OTSIncAReportTemplate
 
             //关闭查看报告，则退出进程
             this.Close();
+            Application.Exit();
         }
         #endregion
 
@@ -368,7 +369,7 @@ namespace OTSIncAReportTemplate
 
                 ds.Tables.Add(ls_dt_fielddt);
                 ds.Tables.Add(ls_dt_frame);
-                myRela1 = new DataRelation("Rela1", ls_dt_fielddt.Columns["FieldId"], ls_dt_frame.Columns["FieldId"]);
+                myRela1 = new DataRelation("Rela1", ls_dt_fielddt.Columns["FieldId"], ls_dt_frame.Columns["FieldId"],false);
                 ds.Relations.Add(myRela1);
                 rmReport1.AddDataSet(ls_dt_fielddt, "CustomersDS");
                 rmReport1.AddDetailDataSet(ls_dt_frame, "OrdersDS", "CustomersDS", myRela1);

OTSPartA_STDEditor/OTSPartA_STDEditor.csproj

@@ -19,7 +19,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\Bin\Win32\Debug\</OutputPath>
+    <OutputPath>..\Bin\x64\Release_oxford50\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>