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
3e19ccb1
Commit
3e19ccb1
authored
Oct 28, 2019
by
潘栩锋
🚴
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
解决 追边测厚 调膜距离的界面 立体旋转 永远被显示问题
parent
da6d0999
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
50 additions
and
44 deletions
+50
-44
CalFilmLen.cs
...ick.Blowing/FLY.Thick.Blowing.UI.Fix.Client/CalFilmLen.cs
+0
-1
PgBlowingExt.xaml
...Y.Thick.Blowing.UI.Fix.Client/PgBlowing/PgBlowingExt.xaml
+50
-43
No files found.
Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Client/CalFilmLen.cs
View file @
3e19ccb1
...
@@ -163,7 +163,6 @@ namespace FLY.Thick.Blowing.UI.Fix.Client
...
@@ -163,7 +163,6 @@ namespace FLY.Thick.Blowing.UI.Fix.Client
DataBestMinute
=
(
int
)
Math
.
Round
((
mRDetect
.
RenZiJiaPeriod
.
TotalMinutes
*
3
));
DataBestMinute
=
(
int
)
Math
.
Round
((
mRDetect
.
RenZiJiaPeriod
.
TotalMinutes
*
3
));
});
});
Misc
.
BindingOperations
.
SetBinding
(
mCurrRDetect
,
"Is3D"
,
this
,
"Is3D"
);
}
}
...
...
Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Client/PgBlowing/PgBlowingExt.xaml
View file @
3e19ccb1
...
@@ -138,7 +138,8 @@
...
@@ -138,7 +138,8 @@
IsEnabled="{Binding Cfl.IsDataReady}"
IsEnabled="{Binding Cfl.IsDataReady}"
/>
/>
</StackPanel>
</StackPanel>
<StackPanel Orientation="Horizontal" Grid.Column="1" >
<StackPanel Grid.Column="1">
<StackPanel Orientation="Horizontal" >
<StackPanel Orientation="Horizontal" Margin="5">
<StackPanel Orientation="Horizontal" Margin="5">
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" Text="最大值:" />
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" Text="最大值:" />
<StackPanel Orientation="Horizontal">
<StackPanel Orientation="Horizontal">
...
@@ -161,11 +162,13 @@
...
@@ -161,11 +162,13 @@
</StackPanel>
</StackPanel>
</StackPanel>
</StackPanel>
</StackPanel>
</StackPanel>
</StackPanel>
</Grid>
</Grid>
<lvc:CartesianChart Height="150" DisableAnimations="True" Margin="5" Hoverable="False" DataTooltip="{x:Null}" >
<lvc:CartesianChart Height="150" DisableAnimations="True" Margin="5" Hoverable="False" DataTooltip="{x:Null}" >
<lvc:CartesianChart.Series>
<lvc:CartesianChart.Series>
<lvc:LineSeries Values="{Binding VelocityValue}" Configuration="{Binding MapperTv}" />
<lvc:LineSeries Values="{Binding VelocityValue
s
}" Configuration="{Binding MapperTv}" />
</lvc:CartesianChart.Series>
</lvc:CartesianChart.Series>
<lvc:CartesianChart.AxisX>
<lvc:CartesianChart.AxisX>
<lvc:Axis LabelFormatter="{Binding DateTimeFormatter}"
<lvc:Axis LabelFormatter="{Binding DateTimeFormatter}"
...
@@ -205,7 +208,8 @@
...
@@ -205,7 +208,8 @@
IsEnabled="{Binding Cfl.IsDataReady}"
IsEnabled="{Binding Cfl.IsDataReady}"
/>
/>
</StackPanel>
</StackPanel>
<StackPanel Orientation="Horizontal" Grid.Column="1" >
<StackPanel Grid.Column="1" >
<StackPanel Orientation="Horizontal">
<StackPanel Orientation="Horizontal" Margin="5">
<StackPanel Orientation="Horizontal" Margin="5">
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" Text="最大值:" />
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" Text="最大值:" />
<StackPanel Orientation="Horizontal">
<StackPanel Orientation="Horizontal">
...
@@ -228,6 +232,8 @@
...
@@ -228,6 +232,8 @@
</StackPanel>
</StackPanel>
</StackPanel>
</StackPanel>
</StackPanel>
</StackPanel>
</StackPanel>
</Grid>
</Grid>
<lvc:CartesianChart
<lvc:CartesianChart
...
@@ -253,7 +259,7 @@
...
@@ -253,7 +259,7 @@
</Border>
</Border>
<Border
<Border
Style="{StaticResource CardBorderStyle}"
Style="{StaticResource CardBorderStyle}"
Visibility="{Binding
Cfl.
Is3D,Converter={StaticResource visbilityconv}, ConverterParameter=Collapsed}">
Visibility="{Binding Is3D,Converter={StaticResource visbilityconv}, ConverterParameter=Collapsed}">
<StackPanel >
<StackPanel >
<TextBlock Style="{StaticResource CardTitleStyle}" Text="参数膜距离增量"/>
<TextBlock Style="{StaticResource CardTitleStyle}" Text="参数膜距离增量"/>
<StackPanel Orientation="Horizontal">
<StackPanel Orientation="Horizontal">
...
@@ -309,10 +315,11 @@
...
@@ -309,10 +315,11 @@
IsEnabled="{Binding Cfl.IsCaling,Converter={StaticResource e2bconv},ConverterParameter={StaticResource False}}"
IsEnabled="{Binding Cfl.IsCaling,Converter={StaticResource e2bconv},ConverterParameter={StaticResource False}}"
/>
/>
<Button Content="应用" Style="{StaticResource AccentedSquareButtonStyle2}" Command="{Binding ApplyFilmLengthCmd}"/>
<Button Content="应用" Style="{StaticResource AccentedSquareButtonStyle2}" Command="{Binding ApplyFilmLengthCmd}"/>
</StackPanel>
<StackPanel >
<StackPanel >
<TextBlock Text="{Binding Cfl.Msg}" Style="{StaticResource TextBlockStyle_FieldContent_mm}"/>
<TextBlock Text="{Binding Cfl.Msg}" Style="{StaticResource TextBlockStyle_FieldContent_mm}"/>
</StackPanel>
</StackPanel>
</StackPanel>
<lvc:CartesianChart
<lvc:CartesianChart
Height="200"
Height="200"
DisableAnimations="True" Margin="5" Hoverable="False" DataTooltip="{x:Null}" Series="{Binding FrameSeries}"
DisableAnimations="True" Margin="5" Hoverable="False" DataTooltip="{x:Null}" Series="{Binding FrameSeries}"
...
...
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