moved probe offset controls

moved probe offset settings to Manual Probing options box
martin2250 · Apr 26, 2022 · cbafdbc · cbafdbc
1 parent e189e72
commit cbafdbc
Showing 1 changed file with 17 additions and 13 deletions.
diff --git a/OpenCNCPilot/MainWindow.xaml b/OpenCNCPilot/MainWindow.xaml
@@ -139,19 +139,13 @@
 								<Label Name="LabelHeightMapProgress" Content="0/0" HorizontalAlignment="Left" Margin="55,10,0,0" VerticalAlignment="Top" RenderTransformOrigin="0.667,0.538"/>
 								<Button Name="ButtonHeightMapStart" Content=" Run " Click="ButtonHeightMapStart_Click" Style="{StaticResource styleButton}" HorizontalAlignment="Right" Margin="0,10,55,0" VerticalAlignment="Top"/>
 								<Button Name="ButtonHeightMapPause" Content="Pause" Click="ButtonHeightMapPause_Click" Style="{StaticResource styleButton}" HorizontalAlignment="Right" Margin="0,10,10,0" VerticalAlignment="Top"/>
-								<StackPanel Orientation="Horizontal" HorizontalAlignment="Left" Margin="10,32,0,0" VerticalAlignment="Top">
-									<Label Content="MinZ:" Width="40"/>
-									<Label Content="0" Width="50" Name="LabelHeightMapMinZ"/>
-									<Label Content="MaxZ:" Width="43"/>
-									<Label Content="0" Width="50" Name="LabelHeightMapMaxZ"/>
-								</StackPanel>
-                                <StackPanel Orientation="Horizontal" HorizontalAlignment="Left" Margin="10,58,0,0" VerticalAlignment="Top">
-                                    <Label Content="Offset X:" Width="58"/>
-                                    <TextBox Width="34" VerticalContentAlignment="Center" Text="{util:SettingBinding ProbeOffsetX}"/>
-                                    <Label Content="Offset Y:" Width="58"/>
-                                    <TextBox Width="34" VerticalContentAlignment="Center" Text="{util:SettingBinding ProbeOffsetY}"/>
+                                <StackPanel Orientation="Horizontal" HorizontalAlignment="Left" Margin="10,32,0,0" VerticalAlignment="Top">
+                                    <Label Content="MinZ:" Width="40"/>
+                                    <Label Content="0" Width="50" Name="LabelHeightMapMinZ"/>
+                                    <Label Content="MaxZ:" Width="43"/>
+                                    <Label Content="0" Width="50" Name="LabelHeightMapMaxZ"/>
                                 </StackPanel>
-							</Grid>
+                            </Grid>
 						</Grid>
 					</Expander>
 				</Border>
@@ -246,7 +240,17 @@
 									<TextBox Name="TextBoxCurrentTLO" Text="0.000" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="138,53,0,0" Width="52" Height="23" VerticalContentAlignment="Center" IsReadOnly="True" ToolTip="Current TLO (Z)"/>
 								</Grid>
 							</GroupBox>
-						</StackPanel>
+                            <GroupBox Header="Probe Offset" Name="groupBoxProbeOffset">
+                                <Grid>
+                                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Left" Margin="10,5,0,0" VerticalAlignment="Top">
+                                        <Label Content="X:" Width="25"/>
+                                        <TextBox Height="23" Width="60" VerticalContentAlignment="Center" Text="{util:SettingBinding ProbeOffsetX}"/>
+                                        <Label Content="Y:" Width="25"/>
+                                        <TextBox Height="23" Width="60" VerticalContentAlignment="Center" Text="{util:SettingBinding ProbeOffsetY}"/>
+                                    </StackPanel>
+                                </Grid>
+                            </GroupBox>
+                        </StackPanel>
 					</Expander>
 				</Border>
 				<Border Style="{StaticResource stylePanelOut}">