删除注释

OTSIncAReportApp/1-UI/Control_Graph/OTSIncAReportGraphFuncation/OTSImageDisHelp.cs

@@ -23,10 +23,6 @@ namespace OTSIncAReportGraph.OTSIncAReportGraphFuncation
 {
   public  class OTSImageDisHelp
     {
-        #region 枚举定义
-     
-        #endregion
-
         #region 定义变量
 
         public ResultFile resultFile = null;
@@ -158,7 +154,6 @@ namespace OTSIncAReportGraph.OTSIncAReportGraphFuncation
            
             var screenPoint = new PointF(OTSPoint.X/(float)m_pixelSize, Convert.ToSingle(screenHeight));
 
-            //var curP = new Point((int)(screenPoint.X + m_wholeBackRect.X), (int)(screenPoint.Y + m_wholeBackRect.Y));
             var curP = new PointF((screenPoint.X + m_originalBackRect.X), (screenPoint.Y + m_originalBackRect.Y));
 
             return curP;
@@ -180,7 +175,6 @@ namespace OTSIncAReportGraph.OTSIncAReportGraphFuncation
             int height = resultFile.GetImageHeight();
             double retioOfHeightWidth =(double) height;
             retioOfHeightWidth /= width;
-            //string scanfeldsize = resultFile.GetScanFieldSizeX();
             double d_scanFieldSize_width = resultFile.GetScanFieldSizeX();
 
             double d_scanFieldSize_height = 0;
@@ -276,7 +270,6 @@ namespace OTSIncAReportGraph.OTSIncAReportGraphFuncation
         /// <param name="Analysis_xray"></param>
         public void GetXrayByParticleTagIDAndFieldID_ForDrawDistrbutionImageAndBSE(int in_clr_tagid, int in_clr_fieldid, out uint[] Search_xray, out uint[] Analysis_xray, out int xray_id, out List<Element> list_celementchemistryclr)
         {
-
             Search_xray = new uint[2000];
             Analysis_xray = new uint[2000];
             xray_id = 0;
@@ -286,10 +279,7 @@ namespace OTSIncAReportGraph.OTSIncAReportGraphFuncation
             if (resultFile.List_OTSField == null)
                 return;
             Particle particle = resultFile.List_OTSField.Find(x => x.FieldID == in_clr_fieldid).ParticleList.Find(x => x.ParticleId == in_clr_tagid);
-            //if (particle == null)
-            //{
-            //    return;
-            //}
+            
             var tmpPart = new ParticleData(resultFile.FilePath).GetParticleXrayDataByFidAndPid(Convert.ToString(particle.FieldId), Convert.ToString(particle.XrayId));
             if (tmpPart != null)
             {
@@ -300,12 +290,10 @@ namespace OTSIncAReportGraph.OTSIncAReportGraphFuncation
                     {
                         Analysis_xray[i] = BitConverter.ToUInt32(particle.XRayData, i * 4);
                     }
-
                     Search_xray = Analysis_xray;
                     xray_id = particle.XrayId;
                     list_celementchemistryclr = particle.ElementList;
                 }
-
             }
            
 

OTSIncAReportApp/1-UI/Control_Grids/OTSIncAReportGridsFuncation/OTSReportGridsFun.cs

@@ -15,15 +15,7 @@ namespace OTSIncAReportGrids.OTSIncAReportGridsFuncation
 {
     public class OTSReportGridsFun
     {
-        #region 枚举定义
-        ////切换窗体枚举定义
-       
-        #endregion
-
         #region 定义变量
-        //电镜设置对象
-       
-
         //为了加快颗粒列表抠图的速度，这里保存一个全局变量
         public List<Field> m_list_COTSFieldMgrClr = null;
         //是否已经连接到了电镜
@@ -240,18 +232,5 @@ namespace OTSIncAReportGrids.OTSIncAReportGridsFuncation
         }
 
         #endregion
-
-        #region 获取数据_测量结果概况
-
-        #endregion
-
-
-        #region 保留国标Clr部份代码
-
-        #endregion
-
-
-
-
     }
 }

OTSIncAReportApp/1-UI/Control_Grids/ParticlesGridDevidePage/ModifyCategoryForm.cs

@@ -1,13 +1,6 @@
-using DevExpress.XtraEditors;
-using NPOI.SS.Formula.Functions;
-using System;
+using System;
 using System.Collections.Generic;
-using System.ComponentModel;
 using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Forms;
 
 namespace OTSIncAReportApp._1_UI.Control_Grids.ParticlesGridDevidePage

OTSIncAReportApp/1-UI/Control_Grids/ParticlesGridDevidePage/ParticleClassificationSelect.cs

@@ -1,14 +1,9 @@
 using OTSIncAReportApp.DataOperation.DataAccess;
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
 using System.Data;
 using System.Drawing;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Forms;
-using static DevExpress.Diagram.Core.Native.Either;
 
 namespace OTSIncAReportApp._1_UI.Control_Grids.ParticlesGridDevidePage
 {
@@ -31,12 +26,6 @@ namespace OTSIncAReportApp._1_UI.Control_Grids.ParticlesGridDevidePage
         private void ParticleClassificationSelect_Load(object sender, EventArgs e)
         {
             DataTable table = Particledata.GetClassificationOfAllParticles();
-            //for (int i = 0; i < 30; i++)
-            //{
-            //    DataRow row = table.NewRow();
-            //    row["TypeName"] = "aa" + i.ToString();
-            //    table.Rows.Add(row);
-            //}
             if (table != null)
             {
                 if (table.Rows.Count > 0)

OTSIncAReportApp/1-UI/Control_Grids/ParticlesGridDevidePage/ParticlesGridDevidePageShowConfig.cs

@@ -1,5 +1,4 @@
-using OTSCommon.DBOperate.Model;
-using OTSIncAReportApp.OTSRstMgrFunction;
+using OTSIncAReportApp.OTSRstMgrFunction;
 using OTSIncAReportApp.SysMgrTools;
 using OTSPeriodicTable;
 using System;

OTSIncAReportApp/1-UI/GBCalculate/YB6156ABCD.cs

@@ -473,8 +473,12 @@ namespace OTSIncAReportGB
         private void button_export_Click(object sender, EventArgs e)
         {
             XtraReport_yb6156 Report_yb6156 = new XtraReport_yb6156(dt_yb6156);
-            DevExpress.XtraReports.UI.ReportPrintTool tool = new DevExpress.XtraReports.UI.ReportPrintTool(Report_yb6156);
-            tool.ShowPreview();
+            //DevExpress.XtraReports.UI.ReportPrintTool tool = new DevExpress.XtraReports.UI.ReportPrintTool(Report_yb6156);
+            //tool.ShowPreview();
+
+            XRDesignForm designForm = new XRDesignForm();
+            designForm.OpenReport(Report_yb6156);
+            designForm.Show();
         }
     }
 }

OTSIncAReportApp/1-UI/OTSDisplaySourceGridData/frmReportConditionChoose.Designer.cs

@@ -65,7 +65,6 @@
             this.RightToLeftLayout = true;
             this.Text = "查询参数窗口";
             this.WindowState = System.Windows.Forms.FormWindowState.Minimized;
-            this.Load += new System.EventHandler(this.frmReportConditionChoose_Load);
             this.Resize += new System.EventHandler(this.OTSPropertyWindow_Resize);
             this.ResumeLayout(false);
 

OTSIncAReportApp/1-UI/OTSDisplaySourceGridData/frmReportConditionChoose.cs

@@ -10,7 +10,6 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using System.Windows.Forms;
-using System.Windows.Media;
 using static OTSDataType.otsdataconst;
 
 namespace OTSIncAReportApp
@@ -80,7 +79,6 @@ namespace OTSIncAReportApp
             if(itemVal!=null)
                 sampleData.itemVal = itemVal;
             m_CurrentConditions.Add(ID, sampleData);
-            //return sampleData;
         }
         public List<string> GetSampleListName()
         {
@@ -199,7 +197,6 @@ namespace OTSIncAReportApp
             //数据表类型
             List<string> list2 = new List<string>() { surveyResults, sampleMeasurementInformation, granularComponent, particleSizeDistribution, averageElementComposition };
             ResultFile resultinfo = m_rstDataMgr.ResultFilesList[m_rstDataMgr.GetWorkingResultId()];
-            //var Systype = ((Dictionary<string, object>)((Dictionary<string, object>)((Dictionary<string, object>)(Dictionary<string, object>)resultinfo.ResultInfo["Sample"])["Members"])["MsrParams"])["SysType"].ToString();
             var Systype = RptConfigFile.GetRptConfig().Systype;
 
             if (Systype == OTS_SysType_ID.IncA)
@@ -236,9 +233,6 @@ namespace OTSIncAReportApp
             //颗粒列表数据类型
             List<string> list_PARTICE_LIST = new List<string>() { analyticalParticle, otherParticles, MergeParticles, allParticles };
             AddGridData(OTS_REPORT_PROP_GRID_ITEMS.PARTICE_LIST, dataSourceType, OTS_ITEM_TYPES.COMBO, false, "data source type", list_PARTICE_LIST[0], list_PARTICE_LIST, 0);
-
-            //List<string> list_InitialRatingLevel = new List<string>() { "0", "1", "2", "3", "4", "5", "6", "7", "8", "9", };
-            //AddGridData(OTS_REPORT_PROP_GRID_ITEMS.PARTICE_LIST, dataSourceType, OTS_ITEM_TYPES.COMBO, false, "InitialRatingLevel", list_InitialRatingLevel[0], list_InitialRatingLevel, 0);
         }
         #region 属性Grid相关方法
         public void ShowsTheDefaultPic()
@@ -371,8 +365,6 @@ namespace OTSIncAReportApp
 
             }
             m_conditionData = data;
-            //SMeasureInfo = data;
-               
             return true;
         }
         /// <summary>
@@ -658,10 +650,6 @@ namespace OTSIncAReportApp
                             {
                                 m_ReportApp.im_Control_DrawDistrbutionImageAndBSE.DrawDistrbutionImageAndBSE_ByQuery(m_conditionData);
                             }
-                            //if (m_ReportApp.im_ParticlesGridDevidePage != null)
-                            //{
-                            //    m_ReportApp.im_Control_DrawDistrbutionImageAndBSE.DisplayParticleByParticlelist(m_ReportApp.im_ParticlesGridDevidePage.GetParticleslist_select());
-                            //}
                         }
                         else if (m_ReportApp.im_Control_DrawDistrbutionImageAndBSE == null)
                         {
@@ -673,10 +661,7 @@ namespace OTSIncAReportApp
                             m_ReportApp.m_SImageWindow.Controls.Add(m_ReportApp.im_Control_DrawDistrbutionImageAndBSE);
                             m_ReportApp.m_SImageWindow.Activate();
                             m_ReportApp.im_Control_DrawDistrbutionImageAndBSE.DrawDistrbutionImageAndBSE_ByQuery(m_conditionData);
-                            //if (m_ReportApp.im_ParticlesGridDevidePage != null)
-                            //{
-                            //    m_ReportApp.im_Control_DrawDistrbutionImageAndBSE.DisplayParticleByParticlelist(m_ReportApp.im_ParticlesGridDevidePage.GetParticleslist_select());
-                            //}
+
                             m_ReportApp.im_Control_DrawDistrbutionImageAndBSE.FullGraphMatch();
                         }
 
@@ -714,12 +699,6 @@ namespace OTSIncAReportApp
                             //判断当前点击测量结果中的数据源名，是否与已经加载的排序图显示的数据源名相同
                             if (m_fileName == m_ReportApp.im_Control_DrawDistrbutionSortImage.ShowSourceName)
                             {
-                                ////相同，加载计算条件
-                                //if (m_ReportApp.im_ParticlesGridDevidePage != null)
-                                //{
-                                //    m_ReportApp.im_Control_DrawDistrbutionSortImage.SetSelectParticle(m_ReportApp.im_ParticlesGridDevidePage.GetParticleslist_select());
-                                //}
-
                                 ConditionItem itm =m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.IMAGE_TYPE];
                                 //切换BSE和分类，两种影像的显示方式
                                 if ((int)itm.itemVal == (int)DISTRIBUTION_IMAGE_SHOW_MODE.BSE)
@@ -743,10 +722,6 @@ namespace OTSIncAReportApp
                             m_ReportApp.m_SImageWindow.Controls.Add(m_ReportApp.im_Control_DrawDistrbutionSortImage);
                             m_ReportApp.m_SImageWindow.Activate();
                             m_ReportApp.im_Control_DrawDistrbutionSortImage.GetDistrbutionSortimage_ByQuery(m_CurrentConditions);
-                            //if (m_ReportApp.im_ParticlesGridDevidePage != null)
-                            //{
-                            //    m_ReportApp.im_Control_DrawDistrbutionSortImage.SetSelectParticle(m_ReportApp.im_ParticlesGridDevidePage.GetParticleslist_select());
-                            //}
                         }
                     }
 
@@ -935,7 +910,6 @@ namespace OTSIncAReportApp
                             }
 
                             OTSCLRINTERFACE.CPropParamClr clr_prop4 = m_ReportApp.m_rstDataMgr.m_ReportMgr.GetPropertyParamTable();
-                            //List<string> datasourcelist4 = m_ReportApp.m_conditionChoose.m_conditionData.GetComboDownListByItemName(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE);
                             List<string> datasourcelist4 = new List<string>();
                             datasourcelist4.Add(m_ReportApp.m_conditionChoose.m_conditionData.GetComboDownListByItemName(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE)[index4]);
                             clr_prop4.SetDataSourceList(datasourcelist4);
@@ -1105,10 +1079,5 @@ namespace OTSIncAReportApp
             }
         }
         #endregion
-
-        private void frmReportConditionChoose_Load(object sender, EventArgs e)
-        {
-
-        }
     }
 }

OTSIncAReportApp/1-UI/frmReportApp.cs

@@ -6,15 +6,12 @@ using OTSIncAReportApp.OTSRstMgrFunction;
 using OTSIncAReportApp.OTSRibbon;
 using OTSIncAReportApp.OTSSampleReportInfo;
 using OTSIncAReportApp.SysMgrTools;
-using OTSIncAReportGraph;
 using OTSIncAReportGraph.OTSIncAReportGraphFuncation;
 using OTSIncAReprotCharts;
 
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Data;
-using System.Diagnostics;
 using System.Drawing;
 using System.IO;
 using System.Runtime.InteropServices;
@@ -911,7 +908,6 @@ namespace OTSIncAReportApp
             m_RstWindow.Show(DockWindowPanel, OTS.WinFormsUI.Docking.DockState.DockLeft);
             m_conditionChoose.Show(DockWindowPanel);
            
-            //m_StandardLibrary.Visible = true;`
             DockWindowPanel.DockLeftPortion = 300;
             DockWindowPanel.DockRightPortion = 351;
         }
@@ -1163,12 +1159,6 @@ namespace OTSIncAReportApp
                 log.Error("OTSExtremum:" + ex.ToString());
             }
         }
-
-        private void rbHelp_Click(object sender, EventArgs e)
-        {
-            Help help = new Help();
-            help.ShowDialog();
-        }
         protected override void DefWndProc(ref Message m)
         {
             switch (m.Msg)

OTSIncAReportApp/3-ServiceCenter/DataOperation/DataAccess/FieldData.cs

@@ -10,7 +10,6 @@ namespace OTSIncAReportApp.DataOperation.DataAccess
     public class FieldData
     {
         private SqlHelper dbHelper;
-        //private frmReportApp m_Report=null;
         //测量文件地址
         private string filePath;
         public FieldData(string path)
@@ -30,8 +29,7 @@ namespace OTSIncAReportApp.DataOperation.DataAccess
             //获取field信息
             string sql = "select fieldid,fieldposx,fieldposy from field ";//select fieldid,fieldposx,fieldposy from field
             DataTable DT = dbHelper.ExecuteDataTable(sql, null);
-            //获取Particle信息
-            //string sqlp = "select a.*,b.XrayData from IncAData a left join XRayData b on a.FieldId =b.FieldId and a.XrayId= b.XrayIndex";
+
             string sqlp = "select * from IncAData ";
             DataTable DTP = dbHelper.ExecuteDataTable(sqlp, null);
             //获取Segment信息

OTSIncAReportApp/3-ServiceCenter/DataOperation/DataAccess/ParticleData.cs

@@ -1,9 +1,7 @@
-using DevExpress.Xpo.Helpers;
-using OTSCommon.DBOperate.Model;
+using OTSCommon.DBOperate.Model;
 using System;
 using System.Collections.Generic;
 using System.Data;
-using System.Data.SqlClient;
 using System.Data.SQLite;
 using System.Drawing;
 using System.Drawing.Imaging;
@@ -50,9 +48,6 @@ namespace OTSIncAReportApp.DataOperation.DataAccess
         /// <returns></returns>
         public List<Particle> GetParticleListByCon(string con, string max, string min, int display)
         {
-
-            //string sqlp = "select a.*,b.XrayData from IncAData a left join XRayData b on a.FieldId =b.FieldId and a.XrayId= b.XrayIndex";
-            //string where = " where 1=1 ";
             string sqlp = "select a.* from IncAData a ";
             string where = " where 1=1 ";
             if (display == 1)
@@ -551,8 +546,6 @@ namespace OTSIncAReportApp.DataOperation.DataAccess
                 }
                 particlesAll.Rows[i]["Element"] = ConcatenatedString;
             }
-            //string sqlliteString = "select * from INcAData";
-            //DataTable dt = dbHelper.ExecuteQuery(sqlliteString);
             return particlesAll;
         }
 

OTSIncAReportApp/OTSIncAReportApp.csproj

@@ -603,6 +603,12 @@
     <Compile Include="1-UI\OTSReportExport\DataIntegration\BasicData.cs" />
     <Compile Include="1-UI\OTSReportExport\DataIntegration\ImageProcessor.cs" />
     <Compile Include="1-UI\OTSReportExport\DataIntegration\TCCleannessA.cs" />
+    <Compile Include="1-UI\OTSReportExport\ExportYB6156Preview.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="1-UI\OTSReportExport\ExportYB6156Preview.Designer.cs">
+      <DependentUpon>ExportYB6156Preview.cs</DependentUpon>
+    </Compile>
     <Compile Include="1-UI\OTSReportExport\XtraReport_yb6156.cs">
       <SubType>Component</SubType>
     </Compile>
@@ -1005,6 +1011,9 @@
     <EmbeddedResource Include="1-UI\OTSReportExport\ClassificationOrderAdjuster.resx">
       <DependentUpon>ClassificationOrderAdjuster.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="1-UI\OTSReportExport\ExportYB6156Preview.resx">
+      <DependentUpon>ExportYB6156Preview.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="1-UI\OTSReportExport\XtraReport_yb6156.resx">
       <DependentUpon>XtraReport_yb6156.cs</DependentUpon>
     </EmbeddedResource>