三元图重新修改背景颜色

OTSIncAReportApp/1-UI/Control_DEVCharts/DEVChart_Trianglediagram.Designer.cs

@@ -28,42 +28,43 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.panel1 = new System.Windows.Forms.Panel();
-            this.button1 = new System.Windows.Forms.Button();
-            this.panel1.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // panel1
-            // 
-            this.panel1.AutoScroll = true;
-            this.panel1.Controls.Add(this.button1);
-            this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.panel1.Location = new System.Drawing.Point(0, 0);
-            this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(946, 655);
-            this.panel1.TabIndex = 0;
-            // 
-            // button1
-            // 
-            this.button1.Location = new System.Drawing.Point(20, 800);
-            this.button1.Name = "button1";
-            this.button1.Size = new System.Drawing.Size(75, 23);
-            this.button1.TabIndex = 0;
-            this.button1.Text = "导出数据";
-            this.button1.UseVisualStyleBackColor = true;
-            this.button1.Click += new System.EventHandler(this.button1_Click_1);
-            // 
-            // EChart_Trianglediagram
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.Controls.Add(this.panel1);
-            this.Margin = new System.Windows.Forms.Padding(2);
-            this.Name = "EChart_Trianglediagram";
-            this.Size = new System.Drawing.Size(946, 655);
-            this.Load += new System.EventHandler(this.EChart_Trianglediagram_Load);
-            this.panel1.ResumeLayout(false);
-            this.ResumeLayout(false);
+			this.panel1 = new System.Windows.Forms.Panel();
+			this.button1 = new System.Windows.Forms.Button();
+			this.panel1.SuspendLayout();
+			this.SuspendLayout();
+			// 
+			// panel1
+			// 
+			this.panel1.AutoScroll = true;
+			this.panel1.BackColor = System.Drawing.Color.White;
+			this.panel1.Controls.Add(this.button1);
+			this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.panel1.Location = new System.Drawing.Point(0, 0);
+			this.panel1.Name = "panel1";
+			this.panel1.Size = new System.Drawing.Size(946, 655);
+			this.panel1.TabIndex = 0;
+			// 
+			// button1
+			// 
+			this.button1.Location = new System.Drawing.Point(20, 800);
+			this.button1.Name = "button1";
+			this.button1.Size = new System.Drawing.Size(75, 23);
+			this.button1.TabIndex = 0;
+			this.button1.Text = "导出数据";
+			this.button1.UseVisualStyleBackColor = true;
+			this.button1.Click += new System.EventHandler(this.button1_Click_1);
+			// 
+			// DEVChart_Trianglediagram
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			this.Controls.Add(this.panel1);
+			this.Margin = new System.Windows.Forms.Padding(2);
+			this.Name = "DEVChart_Trianglediagram";
+			this.Size = new System.Drawing.Size(946, 655);
+			this.Load += new System.EventHandler(this.EChart_Trianglediagram_Load);
+			this.panel1.ResumeLayout(false);
+			this.ResumeLayout(false);
 
         }
 

OTSIncAReportApp/1-UI/Control_Grids/CompositionDistributionGrid.cs

@@ -449,11 +449,8 @@ namespace OTSIncAReportGrids
             indexGraphicType = stdIdIndex;
             GraphicType = stdId;
 
-			//int idx = m_ReportApp.m_DataMgrFun.GetPropIndexByPropItemName(m_ReportApp.SourceGridData.ConditionItemList, OTSIncAReportApp.OTSSampleReportInfo.OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE);
-			//string sou = m_ReportApp.m_conditionChoose.m_SourceGridData.GetPropItemValueByPropItemName(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE).ToString();
 			string sou = m_condition.m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE].itemDisplayVal.ToString();
 
-			//string sou = m_ReportApp.m_conditionChoose.m_SourceGridData.GetPropItemDisplayValueByPropItemName(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE).ToString();
 			if (sou.Contains("+"))
 			{
 				for (int i = 0; i < sou.Split('+').Length; i++)
@@ -474,10 +471,6 @@ namespace OTSIncAReportGrids
 						BindDataGridView(m_ReportApp.m_rstDataMgr.ResultFilesList[i].FilePath, 0, m_ReportApp.m_rstDataMgr.ResultFilesList[i].anotherFileName, stdId);
 					}
 				}
-
-				//BindDataGridView(m_ReportApp.m_rstDataMgr.ResultFilesList[m_ReportApp.m_rstDataMgr.GetWorkingResult()].FilePath, 0, m_ReportApp.m_rstDataMgr.ResultFilesList[m_ReportApp.m_rstDataMgr.GetWorkingResult()].FileName);
-				////设置grid风格
-				//SetDataGridViewStyle();
 			}
 		}
 
@@ -551,9 +544,6 @@ namespace OTSIncAReportGrids
                     panel1.Controls.Remove((OTSGridView)item);
                 }
             }
-
-            //int idx = m_ReportApp.m_DataMgrFun.GetPropIndexByPropItemName(m_ReportApp.SourceGridData.ConditionItemList, OTSIncAReportApp.OTSSampleReportInfo.OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE);
-            //string sou = source.GetPropItemValueByPropItemName(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE).ToString();
             string sou = source.GetPropItemDisplayValueByPropItemName(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE).ToString();
             if (sou.Contains("+"))
             {

OTSIncAReportApp/1-UI/Control_Grids/ElementCompositionAvgGrid.cs

@@ -92,7 +92,6 @@ namespace OTSIncAReportGrids
             List<int> FLID = new List<int>() { 0, 1, 2, 4, 6, 7, 8, 9 };
             List<string> NameList = new List<string>() { table["partcletype0"].ToString(), table["partcletype1"].ToString(), table["partcletype2"].ToString(), table["partcletype4"].ToString(), table["partcletype6"].ToString(), table["partcletype7"].ToString(), table["partcletype8"].ToString(), table["partcletype9"].ToString() };
 
-            //int idx = m_ReportApp.m_DataMgrFun.GetPropIndexByPropItemName(m_ReportApp.SourceGridData.ConditionItemList, OTSIncAReportApp.OTSSampleReportInfo.OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE_TYPE);
              string filedAndParticl = "";
             gridView.MergeColumnNames.Add(filename);
             gridView.AddSpanHeader(1, gridView.Columns.Count - 1, filename);
@@ -255,10 +254,7 @@ namespace OTSIncAReportGrids
             gridView.ContextMenuStrip = this.contextMenuStrip1;
             gridView.BorderStyle = 0;
 
-			//gridView.Dock = System.Windows.Forms.DockStyle.Fill;
-			//gridView.Location = new System.Drawing.Point(0, 0);
 			int outpos = gridwidth;
-			//gridView.Location = new System.Drawing.Point(0, gridheight);
 			gridView.Location = new System.Drawing.Point(gridwidth, 0);
 			gridView.Margin = new System.Windows.Forms.Padding(2);
             gridView.MergeColumnHeaderBackColor = System.Drawing.SystemColors.ButtonHighlight;
@@ -275,10 +271,8 @@ namespace OTSIncAReportGrids
 				gridView_Width = gridView_Width + gridView.Columns[i].Width;
 
 			}
-			//gridView.Size = new System.Drawing.Size(667, 520);
-			//gridView.Size = new System.Drawing.Size(gridView.ColumnCount * 100 + 60, gridView.RowCount * 30 + 30);
+
 			gridView.Size = new System.Drawing.Size(gridView_Width+60, gridView.RowCount * 30);
-			//gridheight = gridheight + gridView.RowCount * 30 + 80;
 			gridheight = gridheight + gridView.RowCount * 30 + 5;
 			gridwidth = gridwidth + gridView.ColumnCount * 100;
 			gridView.TabIndex = 0;
@@ -335,7 +329,6 @@ namespace OTSIncAReportGrids
             }
             Report = false;
 
-            //string sou = m_ReportApp.m_conditionChoose.m_SourceGridData.GetPropItemDisplayValueByPropItemName(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE).ToString();
             list_fileName.Clear();
 
 
@@ -362,21 +355,8 @@ namespace OTSIncAReportGrids
 						list_fileName.Add(m_ReportApp.m_rstDataMgr.ResultFilesList[i].anotherFileName);
 					}
                 }
-
-                //BindDataGridView(m_ReportApp.m_rstDataMgr.ResultFilesList[m_ReportApp.m_rstDataMgr.GetWorkingResult()].FilePath, 0, m_ReportApp.m_rstDataMgr.ResultFilesList[m_ReportApp.m_rstDataMgr.GetWorkingResult()].FileName);
-                ////设置grid风格
-                //SetDataGridViewStyle();
             }
 
-
-
-
-            //particledata = new OTSIncAReportApp.DataOperation.DataAccess.ParticleData(result.FilePath);
-            ////创建datatable的列数据，及分栏,及相关行数据
-            //BindDataGridView();
-
-            ////设置grid风格
-            //SetDataGridViewStyle();
         }
 
 		public void SetGraphicType(ReportCondition sourceGridData)

OTSIncAReportApp/1-UI/Control_Grids/ParticlesSizeGrid.cs

@@ -369,8 +369,7 @@ namespace OTSIncAReportGrids
             list_table_size.Clear();
             list_table_Point.Clear();
             list_fileName.Clear();
-			//int idx = m_ReportApp.m_DataMgrFun.GetPropIndexByPropItemName(m_ReportApp.SourceGridData.ConditionItemList, OTSIncAReportApp.OTSSampleReportInfo.OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE);
-			//string sou = m_ReportApp.SourceGridData.ConditionItemList[idx].itemVal.ToString();
+	
 			string sou = source.GetPropItemDisplayValueByPropItemName(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE).ToString();
             if (sou.Contains("+"))
             {
@@ -396,7 +395,6 @@ namespace OTSIncAReportGrids
 					}
                  
                 }
-                //BindDataGridView(m_ReportApp.m_rstDataMgr.ResultFilesList[m_ReportApp.m_rstDataMgr.GetWorkingResult()].FilePath, 0, m_ReportApp.m_rstDataMgr.ResultFilesList[m_ReportApp.m_rstDataMgr.GetWorkingResult()].FileName);
             }