Delete invalid codes

OTSIncAReportApp/1-UI/OTSDisplaySourceGridData/frmReportConditionChoose.cs

@@ -55,11 +55,11 @@ namespace OTSIncAReportApp
             m_sourceGrid = new OTSSourceGrid(this);
             
             m_rstDataMgr = ReportApp.m_rstDataMgr;
+
             #region 国际化语言
             Language lan = new Language(this);
             resTable = lan.GetNameTable(this.Name);
             m_CurrentConditions = new Dictionary<OTS_REPORT_PROP_GRID_ITEMS, ConditionItem>();
-           
             #endregion
         }
         #endregion
@@ -334,7 +334,6 @@ namespace OTSIncAReportApp
                     break;
                 case DisplayPicutureType.AnalyzeSheetandChart:
                     data.TabIndex = DisplayPicutureType.AnalyzeSheetandChart;
-                    //var sampleData3 = m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.CALCULATE_TABLE_TYPE];
                     data.ConditionItemList = GetSourceGridData(DisplayPicutureType.AnalyzeSheetandChart);
                     break;
                 case DisplayPicutureType.OverviewTable:
@@ -578,6 +577,7 @@ namespace OTSIncAReportApp
             String m_fileName=m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE].itemDisplayVal.ToString();
 
 
+
             #region 对各窗体模块进行实际加载的代码
             switch (tabindex)
             {
@@ -697,21 +697,12 @@ namespace OTSIncAReportApp
                 case DisplayPicutureType.AnalyzeDataTable:
                     #region 第二页选项窗体，分析数据表
                     m_ReportApp.m_RibbonFun.SetRibbonButnStatu_ByModule(DisplayPicutureType.AnalyzeDataTable);
-                    //if (m_ReportApp.im_ParticlesGridDevidePage != null && m_ReportApp.im_ParticlesGridDevidePage.FileName == m_fileName && (m_ReportApp.im_Control_DrawDistrbutionImageAndBSE == null || !m_ReportApp.im_Control_DrawDistrbutionImageAndBSE.WhetherThereAreDeleteParticles()))
-                    //{
-                    //    m_ReportApp.m_ParticlesListWindow.Controls.Clear();
-                    //    m_ReportApp.m_ParticlesListWindow.Controls.Add(m_ReportApp.im_ParticlesGridDevidePage);
-                    //    m_ReportApp.m_ParticlesListWindow.Activate();
-                    //}
-                    //else
-                    //{
-                        m_ReportApp.m_ParticlesListWindow.Controls.Clear();
-                        m_ReportApp.im_ParticlesGridDevidePage = new OTSIncAReportGrids.ParticlesGridDevidePage(m_ReportApp);
-                        m_ReportApp.im_ParticlesGridDevidePage.FileName = m_fileName;
-                        m_ReportApp.im_ParticlesGridDevidePage.Dock = DockStyle.Fill;
-                        m_ReportApp.m_ParticlesListWindow.Controls.Add(m_ReportApp.im_ParticlesGridDevidePage);
-                        m_ReportApp.m_ParticlesListWindow.Activate();
-                    //}
+                    m_ReportApp.m_ParticlesListWindow.Controls.Clear();
+                    m_ReportApp.im_ParticlesGridDevidePage = new OTSIncAReportGrids.ParticlesGridDevidePage(m_ReportApp);
+                    m_ReportApp.im_ParticlesGridDevidePage.FileName = m_fileName;
+                    m_ReportApp.im_ParticlesGridDevidePage.Dock = DockStyle.Fill;
+                    m_ReportApp.m_ParticlesListWindow.Controls.Add(m_ReportApp.im_ParticlesGridDevidePage);
+                    m_ReportApp.m_ParticlesListWindow.Activate();
                     break;
                 #endregion
                 //分析数据图
@@ -902,13 +893,7 @@ namespace OTSIncAReportApp
                             break;
                         case CALCULATE_TABLE_TYPE.YB6156:
                             var eve = m_ReportApp.m_conditionChoose.m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE].itemDisplayVal.ToString();
-                            //if (!eve.Contains("+"))
-                            //{
-                            //    MessageBox.Show("This standard requires at least 6 measurements!");
-                            //    return;
-                            //}
-
-
+                            
                             //德标
                             Cursor.Current = Cursors.WaitCursor;
                             int index5 = m_ReportApp.m_conditionChoose.m_conditionData.GetComboDownListIndexByItemName(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE);

OTSIncAReportApp/1-UI/frmTables.cs

@@ -13,7 +13,6 @@ namespace OTSIncAReportApp
     public partial class frmTables : DockContent
     {
         #region 变量定义
-        //private frmReportApp m_ReportApp = null;
         private frmReportApp m_ReportApp { get; set; }
 
         Hashtable table;
@@ -35,29 +34,14 @@ namespace OTSIncAReportApp
             OTSSourceGrid m_SampleGrid = m_ReportApp.m_conditionChoose.m_sourceGrid;
             m_SampleGrid.InitGrid();
             m_SampleGrid.InitGroupTitle(0, table["generalparameters"].ToString());
-            System.Windows.Forms.Control ctl=(System.Windows.Forms.Control)sender;
+            System.Windows.Forms.Control ctl = (System.Windows.Forms.Control)sender;
             m_SampleGrid.SetPictureType((DisplayPicutureType)ctl.TabIndex);
             m_ReportApp.m_conditionChoose.DisCurrentPicProperty();//先添加属性
             //根据标签索引 显示默认的数据图表
             if (m_ReportApp.m_ParticlesListWindow.Controls != null)
             {
-
-                //if (m_ReportApp.im_Control_DrawDistrbutionImageAndBSE != null)
-                //{
-                //    if (m_ReportApp.m_ParticlesListWindow.Controls.Count == 0 || m_ReportApp.im_Control_DrawDistrbutionImageAndBSE.WhetherThereAreDeleteParticles())
-                //    {
-                //        m_ReportApp.m_conditionChoose.tabIndex = (DisplayPicutureType)ctl.TabIndex;
-                //        m_ReportApp.m_conditionChoose.ShowsTheDefaultPic();
-                //    }
-                //}
-                //else
-                //{
-                    //if (m_ReportApp.m_ParticlesListWindow.Controls.Count == 0)
-                    //{
-                        m_ReportApp.m_conditionChoose.tabIndex = (DisplayPicutureType)ctl.TabIndex;
-                        m_ReportApp.m_conditionChoose.ShowsTheDefaultPic();
-                    //}
-                //}
+                m_ReportApp.m_conditionChoose.tabIndex = (DisplayPicutureType)ctl.TabIndex;
+                m_ReportApp.m_conditionChoose.ShowsTheDefaultPic();
             }
 
             m_ReportApp.m_RstWindow.SelectWorkSampleNode();