|
@@ -392,7 +392,6 @@ namespace OTSIncAReportGrids
|
|
|
.Select(row => row["TypeName"].ToString()));
|
|
.Select(row => row["TypeName"].ToString()));
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
// 新增:为 userSTDDbData 建立索引以加速查找
|
|
// 新增:为 userSTDDbData 建立索引以加速查找
|
|
|
private Dictionary<string, DataRow> BuildUserStdLookup()
|
|
private Dictionary<string, DataRow> BuildUserStdLookup()
|
|
|
{
|
|
{
|
|
@@ -729,7 +728,7 @@ namespace OTSIncAReportGrids
|
|
|
private void ProcessParticleImageColumn(int rowIndex, int gridRowIndex, int columnIndex, Dictionary<string, Bitmap> fieldPics)
|
|
private void ProcessParticleImageColumn(int rowIndex, int gridRowIndex, int columnIndex, Dictionary<string, Bitmap> fieldPics)
|
|
|
{
|
|
{
|
|
|
string subParticleString = Convert.ToString(particlesFilter.Rows[rowIndex]["SubParticles"]);
|
|
string subParticleString = Convert.ToString(particlesFilter.Rows[rowIndex]["SubParticles"]);
|
|
|
- dgV_ParticlesDevidePage.Rows[gridRowIndex].Height = 150;
|
|
|
|
|
|
|
+ dgV_ParticlesDevidePage.Rows[gridRowIndex].Height = 70;
|
|
|
dgV_ParticlesDevidePage.Rows[gridRowIndex].Cells[columnIndex].Style.BackColor = Color.Azure;
|
|
dgV_ParticlesDevidePage.Rows[gridRowIndex].Cells[columnIndex].Style.BackColor = Color.Azure;
|
|
|
|
|
|
|
|
Bitmap bmap = null;
|
|
Bitmap bmap = null;
|
|
@@ -885,6 +884,10 @@ namespace OTSIncAReportGrids
|
|
|
|
|
|
|
|
|
|
|
|
|
#endregion
|
|
#endregion
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
#region 健壮性判断
|
|
#region 健壮性判断
|
|
|
private bool IsNumericColumn(string columnName)
|
|
private bool IsNumericColumn(string columnName)
|
|
|
{
|
|
{
|
|
@@ -1057,7 +1060,7 @@ namespace OTSIncAReportGrids
|
|
|
if (src != null)
|
|
if (src != null)
|
|
|
{
|
|
{
|
|
|
var bmap = fldImgAccess.CapturePic(src, rectangle);
|
|
var bmap = fldImgAccess.CapturePic(src, rectangle);
|
|
|
- dgV_ParticlesDevidePage.Rows[0].Height = bmap.Height + 20;
|
|
|
|
|
|
|
+ //dgV_ParticlesDevidePage.Rows[0].Height = bmap.Height + 20;
|
|
|
return bmap;
|
|
return bmap;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -1243,10 +1246,6 @@ namespace OTSIncAReportGrids
|
|
|
if (columnName== "Element") return;
|
|
if (columnName== "Element") return;
|
|
|
var cellValue = particlesFilter.Rows[rowIndex][columnName];
|
|
var cellValue = particlesFilter.Rows[rowIndex][columnName];
|
|
|
if (cellValue == null) return;
|
|
if (cellValue == null) return;
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
if (double.TryParse(cellValue.ToString(), out double num))
|
|
if (double.TryParse(cellValue.ToString(), out double num))
|
|
|
{
|
|
{
|
|
|
dgV_ParticlesDevidePage.Rows[gridRowIndex].Cells[columnIndex].Value = Math.Round(num, 2);
|
|
dgV_ParticlesDevidePage.Rows[gridRowIndex].Cells[columnIndex].Value = Math.Round(num, 2);
|