diff --git a/Rs.Controls/RsTray.cs b/Rs.Controls/RsTray.cs index 34ca0bc..ee998e1 100644 --- a/Rs.Controls/RsTray.cs +++ b/Rs.Controls/RsTray.cs @@ -117,6 +117,17 @@ namespace Rs.Controls } } + private Color _StatusBackColor; + public Color StatusBackColor + { + get { return _StatusBackColor; } + set + { + _StatusBackColor= value; + lblStatus.BackColor= _StatusBackColor; + } + } + private bool _ShowRowNumber; /// /// 是否显示行号 @@ -802,7 +813,7 @@ namespace Rs.Controls g.DrawRectangle(Pens.White, Bound.X, Bound.Y, Bound.Width, Bound.Height); if (isShowText) { - g.DrawString(Index.ToString(), new Font("宋体", 8), new SolidBrush(Color.Yellow), _Bound, sf); + g.DrawString(Index.ToString(), new Font("宋体", 7), new SolidBrush(Color.Yellow), _Bound, sf); } } else diff --git a/Rs.Motion/GugaoPulse/GugaoPulseAxis.cs b/Rs.Motion/GugaoPulse/GugaoPulseAxis.cs index d8300a7..793ec15 100644 --- a/Rs.Motion/GugaoPulse/GugaoPulseAxis.cs +++ b/Rs.Motion/GugaoPulse/GugaoPulseAxis.cs @@ -1770,7 +1770,7 @@ namespace Rs.Motion.GugaoPulse } else { - apiResult = mc_pulse.GT_2DComparePulse((short)Config.CardMc, (short)(channel - 1), 1, (short)(dp ? 1 : 0), (short)Config.HcmpPulseWidth); + apiResult = mc_pulse.GT_2DComparePulse((short)Config.CardId, (short)(channel - 1), 1, (short)(dp ? 1 : 0), (short)Config.HcmpPulseWidth); //apiResult = mc_pulse.GT_ComparePulse((short)Config.CardId, (short)(1 << (channel - 1)), (short)(dp ? 1 : 0), (short)Config.HcmpPulseWidth); if (apiResult != 0) {