|
|
@@ -471,24 +471,6 @@ namespace OTSIncAReportGraph.Controls
|
|
|
//g.DrawLine(m_this_p, m_i_draw_start, m_f_rulerX_location - 2, m_i_draw_end* f_js_width, m_f_rulerX_location - 2);
|
|
|
#endregion
|
|
|
|
|
|
- #region 图谱Y轴最高刻度
|
|
|
- //g.DrawLine(m_this_p, m_Y_draw_start, m_Y_draw_start + m_Y_draw_TopDiff, m_Y_draw_Lenght, m_Y_draw_start + m_Y_draw_TopDiff);
|
|
|
- //Font m_Yfont = new Font("微软雅黑", 7, FontStyle.Regular);
|
|
|
- //if(m_kml_fz_top!= 0)
|
|
|
- //{
|
|
|
- // m_Y_MaxValue = m_kml_fz_top;
|
|
|
- //}
|
|
|
- //double MaxValueTemp = Math.Round(Convert.ToDouble(m_Y_MaxValue));
|
|
|
- ////判断四舍五入后的数值 是否小于原最高值
|
|
|
- //if (MaxValueTemp < m_Y_MaxValue)
|
|
|
- //{
|
|
|
- // g.DrawString("Y轴最高值:" + MaxValueTemp+1, m_Yfont, m_this_sb, 0, 0);
|
|
|
- //}
|
|
|
- //else
|
|
|
- //{
|
|
|
- // g.DrawString("Y轴最高值:" + MaxValueTemp, m_Yfont, m_this_sb, 0, 0);
|
|
|
- //}
|
|
|
- #endregion
|
|
|
|
|
|
#endregion //--------------------------------------------------------------------------------------------------------
|
|
|
|
|
|
@@ -505,13 +487,7 @@ namespace OTSIncAReportGraph.Controls
|
|
|
|
|
|
g.DrawLine(m_this_p, ls_pf1, ls_pf2);
|
|
|
|
|
|
- //找到最高值再输出的方式
|
|
|
- //if (list_twopoint1[i].pf2.Y < 60)
|
|
|
- //{
|
|
|
- // g.DrawString(list_twopoint1[i].value.ToString() + "@ev", thisfont_bold, this_sb, ls_pf1.X + 3, ls_pf2.Y);
|
|
|
- //}
|
|
|
-
|
|
|
- //找到峰值，并将该峰值，标记出是什么元素
|
|
|
+
|
|
|
|
|
|
}
|
|
|
}
|
|
|
@@ -654,7 +630,7 @@ namespace OTSIncAReportGraph.Controls
|
|
|
|
|
|
PointF ls_pt = new PointF(m_i_rightdrawlabellocation_x , m_i_rightdrawlabellocation_y + 60);
|
|
|
|
|
|
- ls_pt.X = (ls_pt.X - out_testsizef.Width/2) ;
|
|
|
+ ls_pt.X = (ls_pt.X - out_testsizef.Width/2-10) ;
|
|
|
|
|
|
g.DrawString(str_element, m_thisfont, new SolidBrush(DrawFunction.GetColorByNumber( 1)), ls_pt);
|
|
|
|
