Commit 0dee0611 authored by 潘栩锋's avatar 潘栩锋 🚴

1.修复 环型图 没有绑定复位区号

2.优化 环型图 1号加热棒显示红色,复位区号显示红色
parent f1229387
......@@ -361,6 +361,10 @@ new PropertyChangedCallback(delegate (DependencyObject d, DependencyPropertyChan
t.SetValue(Canvas.LeftProperty, p.X - t.Width / 2);
t.SetValue(Canvas.TopProperty, p.Y - t.Height / 2);
if ((i + 1) == 1) {
arc.Fill = System.Windows.Media.Brushes.Red;
}
if ((i + 1) == (int)OrgBoltNo)
{
//凸显!!!!!!
......@@ -377,17 +381,26 @@ new PropertyChangedCallback(delegate (DependencyObject d, DependencyPropertyChan
{
double w = arc_org.EndAngle - arc_org.StartAngle;
arc_org.Fill = Brushes.White;// new SolidColorBrush(Color.FromRgb(0x57, 0x9a, 0xab));
if (OrgBoltNo == 1)
{
arc_org.Fill = Brushes.Red;
}
arc_org.Stroke = Brushes.Black;
arc_org.Width += arc_org.ArcThickness;
arc_org.ArcThickness *= 2;
arc_org.Height = arc_org.Width;
arc_org.Margin = new Thickness(Radius - arc_org.Width / 2);
arc_org.StartAngle -= w / 2;
arc_org.EndAngle += w / 2;
arc_org.StartAngle -= w / 4;
arc_org.EndAngle += w / 4;
LayoutRoot.Children.Add(arc_org);
t_org.Foreground = Brushes.Black;
if (OrgBoltNo == 1)
{
t_org.Foreground = Brushes.White;
}
LayoutRoot.Children.Add(t_org);
}
}
......
......@@ -106,8 +106,8 @@ namespace FLY.Thick.Blowing.UI.Fix.Client.UiModule
graph.SetBinding(PolarChart.MPIsRightProperty, new Binding(nameof(graphparam.MPIsRight)) { Source = graphparam });
graph.SetBinding(PolarChart.YRangePercentProperty, new Binding(nameof(graphparam.YRangePercent)) { Source = graphparam });
graph.SetBinding(GraphScanCircular.BoltCntProperty, new Binding(nameof(blowingService.NBolts)) { Source = blowingService });
graph.SetBinding(GraphScanCircular.OrgBoltNoProperty, new Binding(nameof(blowingService.OrgBoltNo)) { Source = blowingService });
graph.SetBinding(PolarChart.BoltCntProperty, new Binding(nameof(blowingService.NBolts)) { Source = blowingService });
graph.SetBinding(PolarChart.OrgBoltNoProperty, new Binding(nameof(blowingService.OrgBoltNo)) { Source = blowingService });
graph.Values = Values;
Misc.BindingOperations.SetBinding(graphparam, nameof(graphparam.Mix), this, nameof(Mix));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment