Skip to content

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

测试完成，吹膜扫描. 自动计算膜距离选择角度 完成

parent dafdd73a
Expand all Show whitespace changes
Inline Side-by-side
Showing with 507 additions and 167 deletions
Project.FLY.Thick.BlowingScan/FLY.Thick.BlowingScan.UI.Client/PgBlowing/PgBufList.xaml
View file @ e6a071a8
...@@ -177,6 +177,7 @@ ...@@ -177,6 +177,7 @@
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="auto"/> <RowDefinition Height="auto"/>
<RowDefinition/> <RowDefinition/>
<RowDefinition Height="auto"/>
<RowDefinition/> <RowDefinition/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Grid Grid.ColumnSpan="2"> <Grid Grid.ColumnSpan="2">
...@@ -341,7 +342,8 @@ ...@@ -341,7 +342,8 @@
<WindowsFormsHost Grid.Row="1"> <WindowsFormsHost Grid.Row="1">
<Chr:Chart x:Name="chart1" /> <Chr:Chart x:Name="chart1" />
</WindowsFormsHost> </WindowsFormsHost>
<Grid Grid.Row="2"> <TextBlock Grid.Row="2" Style="{StaticResource TextBlockStyle_FieldHeader2}" Text="{Binding SearchMsg}" />
<Grid Grid.Row="3">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition/> <ColumnDefinition/>
<ColumnDefinition/> <ColumnDefinition/>
...@@ -403,14 +405,7 @@ ...@@ -403,14 +405,7 @@
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
<StackPanel Orientation="Horizontal">
<StackPanel Orientation="Vertical" Margin="5">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeader2}" Text="自相关性" />
<StackPanel Orientation="Horizontal">
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent2}" Text="{Binding R, StringFormat=\{0:F5\}}" />
</StackPanel>
</StackPanel>
</StackPanel>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
<StackPanel x:Name="stackpanel_markno2" Orientation="Vertical" Grid.Column="1" > <StackPanel x:Name="stackpanel_markno2" Orientation="Vertical" Grid.Column="1" >
...@@ -470,21 +465,13 @@ ...@@ -470,21 +465,13 @@
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
<StackPanel Orientation="Horizontal">
<StackPanel Orientation="Vertical" Margin="5">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeader2}" Text="自相关性" />
<StackPanel Orientation="Horizontal">
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent2}" Text="{Binding R, StringFormat=\{0:F5\}}" />
</StackPanel>
</StackPanel>
</StackPanel>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
</Grid> </Grid>
<GroupBox Header="调整" FontSize="20" Grid.Row="1" Grid.Column="1" Grid.RowSpan="2" > <GroupBox Header="调整" FontSize="20" Grid.Row="1" Grid.Column="1" Grid.RowSpan="3" >
<ScrollViewer VerticalScrollBarVisibility="Auto">
<StackPanel Orientation="Vertical"> <StackPanel>
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<StackPanel Orientation="Vertical" Margin="5"> <StackPanel Orientation="Vertical" Margin="5">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeader2}" Text="相关性" /> <TextBlock Style="{StaticResource TextBlockStyle_FieldHeader2}" Text="相关性" />
...@@ -520,11 +507,8 @@ ...@@ -520,11 +507,8 @@
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" Text="m" FontSize="15" /> <TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" Text="m" FontSize="15" />
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
<Button Click="button_left_Click" > <Button Click="button_calFl_Click" >
<Path Data="{StaticResource Geometry_arrow-left}" /> <Path Data="{StaticResource Geometry_auto-fix}" />
</Button>
<Button Click="button_right_Click" >
<Path Data="{StaticResource Geometry_arrow-right}" />
</Button> </Button>
</StackPanel> </StackPanel>
...@@ -533,29 +517,32 @@ ...@@ -533,29 +517,32 @@
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="旋转角度" /> <TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="旋转角度" />
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding RAngle}" /> <TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding RAngle,StringFormat={}{0:F1}}" />
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" Text="°" VerticalAlignment="Top" /> <TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" Text="°" VerticalAlignment="Top" />
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
<Button Click="button_collapse_Click" > <Button Click="button_calRa_Click" >
<Path Data="{StaticResource Geometry_arrow-collapse-horizontal}" /> <Path Data="{StaticResource Geometry_auto-fix}" />
</Button>
<Button Click="button_expand_Click" >
<Path Data="{StaticResource Geometry_arrow-expand-horizontal}" />
</Button> </Button>
</StackPanel> </StackPanel>
<StackPanel Orientation="Vertical" > <StackPanel Orientation="Vertical" >
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<Button Style="{StaticResource ButtonStyle2}" Width="auto" Click="button_solve_Click" FontSize="30"> <Button Style="{StaticResource ButtonStyle2}" Width="auto" Click="button_solve_Click" FontSize="30">
<Grid> <Grid>
<TextBlock Text="更新参数"/> <TextBlock Text="更新参数"/>
<Grid HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="20" x:Name="grid_solveprogress" Visibility="{Binding IsRunning,Converter={StaticResource visbilityconv}}"> <Grid HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="10" x:Name="grid_solveprogress" Visibility="{Binding IsRunning,Converter={StaticResource visbilityconv}}">
<ed:Arc Width="45" Height="45" Opacity="0.9" <ed:Arc Width="40" Height="40" Opacity="0.9"
ArcThickness="4" ArcThickness="4"
ArcThicknessUnit="Pixel" ArcThicknessUnit="Pixel"
StartAngle="0" EndAngle="360" StartAngle="0" EndAngle="360"
Fill="White" Stretch="None" Stroke="#FF988585" /> Fill="White" Stretch="None" Stroke="#FF988585" />
<ed:Arc Width="45" Height="45" <ed:Arc Width="40" Height="40"
ArcThickness="4" ArcThickness="4"
ArcThicknessUnit="Pixel" ArcThicknessUnit="Pixel"
StartAngle="0" StartAngle="0"
...@@ -565,10 +552,21 @@ ...@@ -565,10 +552,21 @@
</Grid> </Grid>
</Grid> </Grid>
</Button> </Button>
<Button Grid.Column="1" Style="{StaticResource ButtonStyle2}" Width="auto" Click="button_calAuto_Click" FontSize="30">
<StackPanel>
<TextBlock Text="全自动"/>
<TextBlock Text="计算"/>
</StackPanel> </StackPanel>
</Button>
</Grid>
</StackPanel> </StackPanel>
</StackPanel>
</ScrollViewer>
</GroupBox> </GroupBox>
</Grid> </Grid>
......
Project.FLY.Thick.BlowingScan/FLY.Thick.BlowingScan.UI.Client/PgBlowing/PgBufList.xaml.cs
View file @ e6a071a8
...@@ -1268,38 +1268,9 @@ namespace FLY.Thick.BlowingScan.UI.Client ...@@ -1268,38 +1268,9 @@ namespace FLY.Thick.BlowingScan.UI.Client
} }
} }
private void button_left_Click(object sender, RoutedEventArgs e)
{
if (mAnaylze.FilmLength > 10)
{
mAnaylze.FilmLength -= 0.1;
}
}
private void button_right_Click(object sender, RoutedEventArgs e)
{
if (mAnaylze.FilmLength < 30)
{
mAnaylze.FilmLength += 0.1;
}
}
private void button_collapse_Click(object sender, RoutedEventArgs e)
{
if (mAnaylze.RAngle > 300)
{
mAnaylze.RAngle -= 1;
}
}
private void button_expand_Click(object sender, RoutedEventArgs e)
{
if (mAnaylze.RAngle < 358)
{
mAnaylze.RAngle += 1;
}
}
private void button_pre1_Click(object sender, RoutedEventArgs e) private void button_pre1_Click(object sender, RoutedEventArgs e)
...@@ -1385,6 +1356,45 @@ namespace FLY.Thick.BlowingScan.UI.Client ...@@ -1385,6 +1356,45 @@ namespace FLY.Thick.BlowingScan.UI.Client
mAnaylze.MarkNo2.IsFocus = true; mAnaylze.MarkNo2.IsFocus = true;
mAnaylze.MarkNo1.IsFocus = false; mAnaylze.MarkNo1.IsFocus = false;
} }
private void button_calRa_Click(object sender, RoutedEventArgs e)
{
if (IsRunning)
return;
if (mAnaylze.IsStep2Ing)
return;
//第2步，修改 旋转角度，膜距离 执行 解方程
Thread t = new Thread(mAnaylze.StepAutoSearchRAngle);
t.IsBackground = true;
t.Start();
}
private void button_calFl_Click(object sender, RoutedEventArgs e)
{
if (IsRunning)
return;
if (mAnaylze.IsStep2Ing)
return;
//第2步，修改 旋转角度，膜距离 执行 解方程
Thread t = new Thread(mAnaylze.StepAutoSearchFilmLength);
t.IsBackground = true;
t.Start();
}
private void button_calAuto_Click(object sender, RoutedEventArgs e)
{
if (IsRunning)
return;
if (mAnaylze.IsStep2Ing)
return;
//第2步，修改 旋转角度，膜距离 执行 解方程
Thread t = new Thread(mAnaylze.StepAutoSearchParams);
t.IsBackground = true;
t.Start();
}
} }
......
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