Przeglądaj źródła

修改报告程序,在原图显示的情况下,选择全图匹配图像有偏差

zhangjiaxin 4 lat temu
rodzic
commit
e06ad30377

+ 1 - 0
Bin/x64/Debug/Config/ProData/DefaultTriTemplateFile.tpf

@@ -6,4 +6,5 @@
   <Member TemplateId="4" TemplateName="MnO.S.Al2O3" Element="Mn.S.Al" Group="MnO-Mn.S-S.Al2O3-Al" />
   <Member TemplateId="5" TemplateName="CaO.TiN.Al2O3" Element="Ca.Ti.Al" Group="CaO-Ca.TiN-Ti.Al2O3-Al" />
   <Member TemplateId="6" TemplateName="Mn.Ni.Co" Element=".Ni." Group="Mn-.Ni-Ni.Co-" />
+  <Member TemplateId="20210913145438" TemplateName="CaO.CaS.Al2O3" Element="Ca.S,Ca.Al" Group="CaO-Ca.CaS-S,Ca.Al2O3-Al" />
 </XMLData>

+ 2 - 2
Bin/x64/Debug/Config/ProData/ReportTemplateConfig.xml

@@ -60,7 +60,7 @@
       <MB2>CaO.SiO2.Al2O3</MB2>
       <MB3>MnO.S.Al2O3</MB3>
       <MB4>CaO.TiN.Al2O3</MB4>
-      <MB5>Mn.Ni.Co</MB5>
+      <MB5>CaO.CaS.Al2O3</MB5>
     </list_lbv_syxt_mblb>
     <list_lbv_syxt_mblb_index>
       <MBIndex0>0</MBIndex0>
@@ -68,7 +68,7 @@
       <MBIndex2>2</MBIndex2>
       <MBIndex3>3</MBIndex3>
       <MBIndex4>4</MBIndex4>
-      <MBIndex5>5</MBIndex5>
+      <MBIndex5>6</MBIndex5>
     </list_lbv_syxt_mblb_index>
   </M_SYXT>
   <M_KLLBXX>

BIN
Bin/x64/Debug/Config/Simulate/SimImage.bmp


+ 10 - 2
OTSIncAReportApp/Control_Graph/Controls/Control_DrawDistrbutionImageAndBSE.cs

@@ -1563,6 +1563,16 @@ namespace OTSIncAReportGraph.Controls
             m_backrectf = new RectangleF(m_backrectf.X - offex_p.X, m_backrectf.Y - offex_p.Y,
                 m_backrectf.Width, m_backrectf.Height);
 
+
+            for (int i =0;i< m_list_dfield.Count;i++)
+            {
+                RectangleF dField = m_list_dfield[i].Current_Rect;
+                dField.X = dField.X-offex_p.X;
+                dField.Y = dField.Y - offex_p.Y;
+                m_list_dfield[i].Current_Rect = dField;
+            }
+
+
             Invalidate();
         }
 
@@ -1901,7 +1911,6 @@ namespace OTSIncAReportGraph.Controls
                         Size size = new Size();
                         string ImageName = originalImageNames[i].ToString();
                         Image Image = originalImages[i];
-
                         string result = System.Text.RegularExpressions.Regex.Replace(ImageName, @"[^0-9]+", "");
                         size.Height = (int)m_list_dfield[Convert.ToInt32(result)].Current_Rect.Height;
                         size.Width = (int)m_list_dfield[Convert.ToInt32(result)].Current_Rect.Width;
@@ -1915,7 +1924,6 @@ namespace OTSIncAReportGraph.Controls
                     }
                 }
             }
-
         }
         #endregion
 

+ 2 - 2
OTSIncAReportTemplate/OTSIncAReportTemplate.cs

@@ -61,7 +61,7 @@ namespace OTSIncAReportTemplate
             //}
 
             //方便测试代码分岐
-            bool bDebug = false;
+            bool bDebug = true;
             if (bDebug == false)
             {
                 m_arg1 = args[0].Replace("^", " ");
@@ -85,7 +85,7 @@ namespace OTSIncAReportTemplate
                 //m_arg4 = "0-983";
                 //m_arg5 = "";
 
-                m_arg1 = "C:\\Users\\admin\\Desktop\\ots2.0测量结果\\曹磊\\曹磊\\1\\Sample1\\ReportTemplateDB.db";
+                m_arg1 = "C:\\Users\\admin\\Desktop\\ots\\ots\\1\\Sample1\\ReportTemplateDB.db";
                 m_arg2 = "./Config/ProData/ReportTemplateConfig.xml";
                 m_arg3 = "MainReport";
                 m_arg4 = "100";