Skip to content

H
hemei
Commit 3e19ccb1 authored by 潘栩锋's avatar 潘栩锋 🚴
Browse files
Options

解决 追边测厚 调膜距离的界面 立体旋转 永远被显示问题

parent da6d0999
Hide whitespace changes
Inline Side-by-side
Showing with 50 additions and 44 deletions
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
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,34 +138,37 @@
IsEnabled="{Binding Cfl.IsDataReady}"
/>
</StackPanel>
<StackPanel Orientation="Horizontal" Grid.Column="1" >
<StackPanel Orientation="Horizontal" Margin="5">
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" Text="最大值:" />
<StackPanel Orientation="Horizontal">
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent}" Text="{Binding VMax,StringFormat={}{0:F1}}"/>
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" Text="m/min" />
<StackPanel Grid.Column="1">
<StackPanel Orientation="Horizontal" >
<StackPanel Orientation="Horizontal" Margin="5">
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" Text="最大值:" />
<StackPanel Orientation="Horizontal">
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent}" Text="{Binding VMax,StringFormat={}{0:F1}}"/>
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" Text="m/min" />
</StackPanel>
</StackPanel>
</StackPanel>
<StackPanel Orientation="Horizontal" Margin="5">
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" Text="最小值:" />
<StackPanel Orientation="Horizontal">
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent}" Text="{Binding VMin,StringFormat={}{0:F1}}"/>
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" Text="m/min" />
<StackPanel Orientation="Horizontal" Margin="5">
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" Text="最小值:" />
<StackPanel Orientation="Horizontal">
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent}" Text="{Binding VMin,StringFormat={}{0:F1}}"/>
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" Text="m/min" />
</StackPanel>
</StackPanel>
</StackPanel>
<StackPanel Orientation="Horizontal" Margin="5">
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" Text="平均值:" />
<StackPanel Orientation="Horizontal">
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent}" Text="{Binding VAvg,StringFormat={}{0:F1}}"/>
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" Text="m/min" />
<StackPanel Orientation="Horizontal" Margin="5">
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" Text="平均值:" />
<StackPanel Orientation="Horizontal">
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent}" Text="{Binding VAvg,StringFormat={}{0:F1}}"/>
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" Text="m/min" />
</StackPanel>
</StackPanel>
</StackPanel>
</StackPanel>
</Grid>
<lvc:CartesianChart Height="150" DisableAnimations="True" Margin="5" Hoverable="False" DataTooltip="{x:Null}" >
<lvc:CartesianChart.Series>
<lvc:LineSeries Values="{Binding VelocityValue}" Configuration="{Binding MapperTv}" />
<lvc:LineSeries Values="{Binding VelocityValues}" Configuration="{Binding MapperTv}" />
</lvc:CartesianChart.Series>
<lvc:CartesianChart.AxisX>
<lvc:Axis LabelFormatter="{Binding DateTimeFormatter}"
......@@ -184,7 +187,7 @@
</Border>
<Border Style="{StaticResource CardBorderStyle}"
Visibility="{Binding Is3D,Converter={StaticResource visbilityconv}, ConverterParameter=Collapsed}" >
Visibility="{Binding Is3D,Converter={StaticResource visbilityconv}, ConverterParameter=Collapsed}" >
<StackPanel>
<TextBlock Style="{StaticResource CardTitleStyle}" Text="立体式膜距离增量趋势"/>
<Grid>
......@@ -205,29 +208,32 @@
IsEnabled="{Binding Cfl.IsDataReady}"
/>
</StackPanel>
<StackPanel Orientation="Horizontal" Grid.Column="1" >
<StackPanel Orientation="Horizontal" Margin="5">
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" Text="最大值:" />
<StackPanel Orientation="Horizontal">
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent}" Text="{Binding FMax,StringFormat={}{0:F1}}"/>
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" Text="m" />
<StackPanel Grid.Column="1" >
<StackPanel Orientation="Horizontal">
<StackPanel Orientation="Horizontal" Margin="5">
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" Text="最大值:" />
<StackPanel Orientation="Horizontal">
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent}" Text="{Binding FMax,StringFormat={}{0:F1}}"/>
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" Text="m" />
</StackPanel>
</StackPanel>
</StackPanel>
<StackPanel Orientation="Horizontal" Margin="5">
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" Text="最小值:" />
<StackPanel Orientation="Horizontal">
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent}" Text="{Binding FMin,StringFormat={}{0:F1}}"/>
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" Text="m" />
<StackPanel Orientation="Horizontal" Margin="5">
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" Text="最小值:" />
<StackPanel Orientation="Horizontal">
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent}" Text="{Binding FMin,StringFormat={}{0:F1}}"/>
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" Text="m" />
</StackPanel>
</StackPanel>
</StackPanel>
<StackPanel Orientation="Horizontal" Margin="5">
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" Text="平均值:" />
<StackPanel Orientation="Horizontal">
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent}" Text="{Binding FAvg,StringFormat={}{0:F1}}"/>
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" Text="m" />
<StackPanel Orientation="Horizontal" Margin="5">
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" Text="平均值:" />
<StackPanel Orientation="Horizontal">
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent}" Text="{Binding FAvg,StringFormat={}{0:F1}}"/>
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" Text="m" />
</StackPanel>
</StackPanel>
</StackPanel>
</StackPanel>
</Grid>
<lvc:CartesianChart
......@@ -253,7 +259,7 @@
</Border>
<Border
Style="{StaticResource CardBorderStyle}"
Visibility="{Binding Cfl.Is3D,Converter={StaticResource visbilityconv}, ConverterParameter=Collapsed}">
Visibility="{Binding Is3D,Converter={StaticResource visbilityconv}, ConverterParameter=Collapsed}">
<StackPanel >
<TextBlock Style="{StaticResource CardTitleStyle}" Text="参数膜距离增量"/>
<StackPanel Orientation="Horizontal">
......@@ -309,10 +315,11 @@
IsEnabled="{Binding Cfl.IsCaling,Converter={StaticResource e2bconv},ConverterParameter={StaticResource False}}"
/>
<Button Content="应用" Style="{StaticResource AccentedSquareButtonStyle2}" Command="{Binding ApplyFilmLengthCmd}"/>
</StackPanel>
<StackPanel >
<TextBlock Text="{Binding Cfl.Msg}" Style="{StaticResource TextBlockStyle_FieldContent_mm}"/>
</StackPanel>
<StackPanel >
<TextBlock Text="{Binding Cfl.Msg}" Style="{StaticResource TextBlockStyle_FieldContent_mm}"/>
</StackPanel>
</StackPanel>
<lvc:CartesianChart
Height="200"
DisableAnimations="True" Margin="5" Hoverable="False" DataTooltip="{x:Null}" Series="{Binding FrameSeries}"
......
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