Selaa lähdekoodia

报告程序引用尺寸和粒级默认功能,完成

zhangjiaxin 1 vuosi sitten
vanhempi
commit
714eff235a

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <XMLData PathName="HardwareConfig.xml" ID="1">
-  <Member RegName="SemControllerName" Value="Oxford" ImageInputSources="SE" />
-  <Member RegName="EDSName" Value="Oxford" DelayQuantify="true" WeightPercentageToAtomicPercentage="false" />
+  <Member RegName="SemControllerName" Value="OffLine" ImageInputSources="SE" />
+  <Member RegName="EDSName" Value="OffLine" DelayQuantify="true" WeightPercentageToAtomicPercentage="false" />
   <Member RegName="BrukerDllVersion" Version="Bruker.API.Esprit64.dll" />
   <Member RegName="FEIIP" Value="192.168.0.1" />
   <Member RegName="FEIPORT" Value="7520" />

BIN
Bin/x64/Debug/Config/SysData/OTSCleanlinessSTD1.db


+ 1 - 1
Bin/x64/Debug/Config/SysData/OTSReportMgrParam.rpf

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<XMLData systype="CleannessA">
+<XMLData systype="IncA">
   <Member RegName="Scale" strValue="1000" />
   <Member RegName="DefaultComputedColName" strValue="Area,EquivalentCircleDiameter,MaxDiameter,MinDiameter,DiameterRatio,FerretDiameter,PERP,PERI,INSCR,MEAN,ELONG,ASPECT_ELONG,Orientation" />
   <Member RegName="ElementsColName" strValue="O,Fe" />

+ 2 - 26
Bin/x64/Debug/Config/SysData/OTSStage.stg

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<XMLData Modify="true" PathName=".\Config\SysData\OTSStage.stg" WorkingStageId="3">
+<XMLData Modify="true" PathName=".\Config\SysData\OTSStage.stg" WorkingStageId="0">
   <Collection RegName="Stagelist">
     <Member strName="圆形九圆孔50mm">
       <Member RegName="boundary" PolygonPoint="" rectDomian="0,0,50000,0" shape="0:ROUND" />
@@ -54,7 +54,7 @@
         <Member HoleName="7" rectDomian="-23000,0,15000,0" shape="0" />
       </Collection>
     </Member>
-    <Member strName="Apero90mm">
+    <Member strName="Apero12_90">
       <Member RegName="boundary" PolygonPoint="" rectDomian="0,0,90000,90000" shape="1:RECTANGLE" />
       <Member RegName="std" PolygonPoint="" rectDomian="6300,0,2,0" shape="0:ROUND" />
       <Collection RegName="Holes">
@@ -78,29 +78,5 @@
         <Member HoleName="18" rectDomian="-14500,-24500,12000,0" shape="0" />
       </Collection>
     </Member>
-    <Member strName="Apero">
-      <Member RegName="boundary" PolygonPoint="" rectDomian="0,0,130000,120000" shape="1:RECTANGLE" />
-      <Member RegName="std" PolygonPoint="" rectDomian="6300,0,2,0" shape="0:ROUND" />
-      <Collection RegName="Holes">
-        <Member HoleName="9" rectDomian="0,0,10000,0" shape="0" />
-        <Member HoleName="2" rectDomian="0,25000,10000,0" shape="0" />
-        <Member HoleName="3" rectDomian="-15000,25000,10000,0" shape="0" />
-        <Member HoleName="1" rectDomian="15000,25500,10000,0" shape="0" />
-        <Member HoleName="4" rectDomian="22000,13000,10000,0" shape="0" />
-        <Member HoleName="5" rectDomian="7000,13000,10000,0" shape="0" />
-        <Member HoleName="6" rectDomian="-7500,13000,10000,0" shape="0" />
-        <Member HoleName="7" rectDomian="-22500,13000,10000,0" shape="0" />
-        <Member HoleName="8" rectDomian="14000,0,10000,0" shape="0" />
-        <Member HoleName="10" rectDomian="-15000,0,10000,0" shape="0" />
-        <Member HoleName="11" rectDomian="-30000,0,10000,0" shape="0" />
-        <Member HoleName="12" rectDomian="22000,-12500,10000,0" shape="0" />
-        <Member HoleName="13" rectDomian="7000,-12500,10000,0" shape="0" />
-        <Member HoleName="14" rectDomian="-7500,-12500,10000,0" shape="0" />
-        <Member HoleName="15" rectDomian="-22500,-12500,10000,0" shape="0" />
-        <Member HoleName="16" rectDomian="14500,-24500,10000,0" shape="0" />
-        <Member HoleName="17" rectDomian="-500,-24500,10000,0" shape="0" />
-        <Member HoleName="18" rectDomian="-14500,-24500,10000,0" shape="0" />
-      </Collection>
-    </Member>
   </Collection>
 </XMLData>

+ 5 - 3
OTSIncAReportApp/1-UI/OTSReportExport/DataIntegration/TernaryDiagram.cs

@@ -94,7 +94,7 @@ namespace OTSIncAReportApp._1_UI.OTSReportExport.DataIntegration
 
         public Bitmap DrawATernaryPicture(int selectindex, c_TemplateClass m_mbszclass, List<Color> Color_list,OTSReport_Export m_otsreport_export,string a_PartSizeFile)
         {
-            initialization(m_otsreport_export, a_PartSizeFile);
+            initialization(m_otsreport_export);
           
           
 
@@ -235,10 +235,12 @@ namespace OTSIncAReportApp._1_UI.OTSReportExport.DataIntegration
             return map;
         }
 
-        private void initialization(OTSReport_Export m_otsreport_export,string a_PartSizeFile)
+        private void initialization(OTSReport_Export m_otsreport_export)
         {
             //加载三元相图各项
-            string pathtpf = m_otsreport_export.m_ReportApp.m_rstDataMgr.m_RptConfigFile.TrigTemplateFileFolder + "\\" + a_PartSizeFile;// Application.StartupPath + "\\Config\\ProData\\DefaultTriTemplateFile.tpf";
+            //string pathtpf = m_otsreport_export.m_ReportApp.m_rstDataMgr.m_RptConfigFile.TrigTemplateFileFolder + /*"\\" +*/ a_PartSizeFile;// Application.StartupPath + "\\Config\\ProData\\DefaultTriTemplateFile.tpf";
+            string pathtpf = m_otsreport_export.m_ReportApp.m_rstDataMgr.m_RptConfigFile.TrigTemplateFileFolder + "\\" + m_otsreport_export.m_ReportApp.m_rstDataMgr.m_RptConfigFile.TriTempFile;
+
             TemplateList = new List<string>();
             DataSet ds = DataOperation.DataAccess.XMLoperate.GetXmlData(pathtpf, "XMLData");
             DataTable dt = ds.Tables["Member"];

+ 1 - 1
OTSIncAReportApp/1-UI/OTSReportExport/Template/DataTemplate.cs

@@ -1603,7 +1603,7 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             XRPictureBox xRPicture = new XRPictureBox();
             xRPicture.LocationF = position;
             xRPicture.SizeF = new SizeF(321f, 330.2f);
-            ImageSource imageSource = new ImageSource(ternaryDiagram.DrawATernaryPicture(index, TemplateClass, Color_list,m_otsreport_export));
+            ImageSource imageSource = new ImageSource(ternaryDiagram.DrawATernaryPicture(index, TemplateClass, Color_list,m_otsreport_export, PartSizeFile));
             xRPicture.ImageSource = imageSource;
             xRPicture.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
             xRPicture.Visible = true;