Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
T
Thick-Common
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
潘栩锋
Thick-Common
Commits
3d8e7538
Commit
3d8e7538
authored
Jun 12, 2020
by
潘栩锋
🚴
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复 GraphRange Title 不会显示
parent
ee2b44d5
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
5 deletions
+16
-5
GraphRange.xaml
...ect.FLY.ControlLibrary/FLY.ControlLibrary/GraphRange.xaml
+2
-2
GraphRange.xaml.cs
....FLY.ControlLibrary/FLY.ControlLibrary/GraphRange.xaml.cs
+14
-3
No files found.
Project.FLY.ControlLibrary/FLY.ControlLibrary/GraphRange.xaml
View file @
3d8e7538
...
@@ -37,8 +37,8 @@
...
@@ -37,8 +37,8 @@
<Rectangle Name="rectangle" Grid.ColumnSpan="2" Fill="#FF579aab"/>
<Rectangle Name="rectangle" Grid.ColumnSpan="2" Fill="#FF579aab"/>
<TextBlock Grid.ColumnSpan="2" HorizontalAlignment="Center" FontSize="18" VerticalAlignment="Bottom" Grid.RowSpan="2">
<TextBlock Grid.ColumnSpan="2" HorizontalAlignment="Center" FontSize="18" VerticalAlignment="Bottom" Grid.RowSpan="2">
<TextBlock.Inlines>
<TextBlock.Inlines>
<Run Name="run_title"
Text="{Binding Title}"
FontWeight="SemiBold" />
<Run Name="run_title" FontWeight="SemiBold" />
<Run Name="run_title2"
Text="{Binding Title2}"
Foreground="#FF585858" />
<Run Name="run_title2" Foreground="#FF585858" />
</TextBlock.Inlines>
</TextBlock.Inlines>
</TextBlock>
</TextBlock>
...
...
Project.FLY.ControlLibrary/FLY.ControlLibrary/GraphRange.xaml.cs
View file @
3d8e7538
...
@@ -515,26 +515,37 @@ namespace FLY.ControlLibrary
...
@@ -515,26 +515,37 @@ namespace FLY.ControlLibrary
mRefresh
.
UpdateY
=
true
;
mRefresh
.
UpdateY
=
true
;
CheckDataSourceEmpty
();
CheckDataSourceEmpty
();
run_title
.
Text
=
Title
;
run_title2
.
Text
=
Title2
;
}
}
void
GraphRange_PropertyChanged
(
object
sender
,
PropertyChangedEventArgs
e
)
void
GraphRange_PropertyChanged
(
object
sender
,
PropertyChangedEventArgs
e
)
{
{
if
((
e
.
PropertyName
==
"Target"
)
||
if
((
e
.
PropertyName
==
"Target"
)
||
(
e
.
PropertyName
==
"Alarm"
)
||
(
e
.
PropertyName
==
"Alarm"
)
||
(
e
.
PropertyName
==
"YRangePercent"
)
||
(
e
.
PropertyName
==
"YRangePercent"
)
||
(
e
.
PropertyName
==
"AutoTarget"
)
||
(
e
.
PropertyName
==
"AutoTarget"
)
||
(
e
.
PropertyName
==
"IsAutoTarget"
)
||
(
e
.
PropertyName
==
"IsAutoTarget"
)
||
(
e
.
PropertyName
==
"IsPercent"
)
||
(
e
.
PropertyName
==
"IsPercent"
)
||
(
e
.
PropertyName
==
"Type"
))
(
e
.
PropertyName
==
"Type"
))
{
{
mRefresh
.
UpdateY
=
true
;
mRefresh
.
UpdateY
=
true
;
mRefresh
.
UpdateData
=
true
;
mRefresh
.
UpdateData
=
true
;
}
}
else
if
((
e
.
PropertyName
==
"DataCnt"
)||
else
if
((
e
.
PropertyName
==
"DataCnt"
)
||
(
e
.
PropertyName
==
"XAxisType"
))
(
e
.
PropertyName
==
"XAxisType"
))
{
{
mRefresh
.
UpdateX
=
true
;
mRefresh
.
UpdateX
=
true
;
}
}
else
if
(
e
.
PropertyName
==
"Title"
)
{
run_title
.
Text
=
Title
;
}
else
if
(
e
.
PropertyName
==
"Title2"
)
{
run_title2
.
Text
=
Title2
;
}
}
}
void
InitializeComponent2
()
void
InitializeComponent2
()
...
...
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