Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
H
hemei
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
潘栩锋
hemei
Commits
0dee0611
Commit
0dee0611
authored
Oct 09, 2020
by
潘栩锋
🚴
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1.修复 环型图 没有绑定复位区号
2.优化 环型图 1号加热棒显示红色,复位区号显示红色
parent
f1229387
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
4 deletions
+17
-4
PolarChart.xaml.cs
....Blowing.UI/UiModule/ScanGraphCircular/PolarChart.xaml.cs
+15
-2
ScanGraphCircularVm.cs
...wing.UI/UiModule/ScanGraphCircular/ScanGraphCircularVm.cs
+2
-2
No files found.
Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI/UiModule/ScanGraphCircular/PolarChart.xaml.cs
View file @
0dee0611
...
@@ -361,6 +361,10 @@ new PropertyChangedCallback(delegate (DependencyObject d, DependencyPropertyChan
...
@@ -361,6 +361,10 @@ new PropertyChangedCallback(delegate (DependencyObject d, DependencyPropertyChan
t
.
SetValue
(
Canvas
.
LeftProperty
,
p
.
X
-
t
.
Width
/
2
);
t
.
SetValue
(
Canvas
.
LeftProperty
,
p
.
X
-
t
.
Width
/
2
);
t
.
SetValue
(
Canvas
.
TopProperty
,
p
.
Y
-
t
.
Height
/
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
)
if
((
i
+
1
)
==
(
int
)
OrgBoltNo
)
{
{
//凸显!!!!!!
//凸显!!!!!!
...
@@ -377,17 +381,26 @@ new PropertyChangedCallback(delegate (DependencyObject d, DependencyPropertyChan
...
@@ -377,17 +381,26 @@ new PropertyChangedCallback(delegate (DependencyObject d, DependencyPropertyChan
{
{
double
w
=
arc_org
.
EndAngle
-
arc_org
.
StartAngle
;
double
w
=
arc_org
.
EndAngle
-
arc_org
.
StartAngle
;
arc_org
.
Fill
=
Brushes
.
White
;
// new SolidColorBrush(Color.FromRgb(0x57, 0x9a, 0xab));
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
.
Stroke
=
Brushes
.
Black
;
arc_org
.
Width
+=
arc_org
.
ArcThickness
;
arc_org
.
Width
+=
arc_org
.
ArcThickness
;
arc_org
.
ArcThickness
*=
2
;
arc_org
.
ArcThickness
*=
2
;
arc_org
.
Height
=
arc_org
.
Width
;
arc_org
.
Height
=
arc_org
.
Width
;
arc_org
.
Margin
=
new
Thickness
(
Radius
-
arc_org
.
Width
/
2
);
arc_org
.
Margin
=
new
Thickness
(
Radius
-
arc_org
.
Width
/
2
);
arc_org
.
StartAngle
-=
w
/
2
;
arc_org
.
StartAngle
-=
w
/
4
;
arc_org
.
EndAngle
+=
w
/
2
;
arc_org
.
EndAngle
+=
w
/
4
;
LayoutRoot
.
Children
.
Add
(
arc_org
);
LayoutRoot
.
Children
.
Add
(
arc_org
);
t_org
.
Foreground
=
Brushes
.
Black
;
t_org
.
Foreground
=
Brushes
.
Black
;
if
(
OrgBoltNo
==
1
)
{
t_org
.
Foreground
=
Brushes
.
White
;
}
LayoutRoot
.
Children
.
Add
(
t_org
);
LayoutRoot
.
Children
.
Add
(
t_org
);
}
}
}
}
...
...
Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI/UiModule/ScanGraphCircular/ScanGraphCircularVm.cs
View file @
0dee0611
...
@@ -106,8 +106,8 @@ namespace FLY.Thick.Blowing.UI.Fix.Client.UiModule
...
@@ -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
.
MPIsRightProperty
,
new
Binding
(
nameof
(
graphparam
.
MPIsRight
))
{
Source
=
graphparam
});
graph
.
SetBinding
(
PolarChart
.
YRangePercentProperty
,
new
Binding
(
nameof
(
graphparam
.
YRangePercent
))
{
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
(
PolarChart
.
BoltCntProperty
,
new
Binding
(
nameof
(
blowingService
.
NBolts
))
{
Source
=
blowingService
});
graph
.
SetBinding
(
GraphScanCircular
.
OrgBoltNoProperty
,
new
Binding
(
nameof
(
blowingService
.
OrgBoltNo
))
{
Source
=
blowingService
});
graph
.
SetBinding
(
PolarChart
.
OrgBoltNoProperty
,
new
Binding
(
nameof
(
blowingService
.
OrgBoltNo
))
{
Source
=
blowingService
});
graph
.
Values
=
Values
;
graph
.
Values
=
Values
;
Misc
.
BindingOperations
.
SetBinding
(
graphparam
,
nameof
(
graphparam
.
Mix
),
this
,
nameof
(
Mix
));
Misc
.
BindingOperations
.
SetBinding
(
graphparam
,
nameof
(
graphparam
.
Mix
),
this
,
nameof
(
Mix
));
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment