From 92e56b9bd05631c53d3eb242f13cf56568b67cf5 Mon Sep 17 00:00:00 2001
From: deHarro <harry0001@satharo.de>
Date: Wed, 4 Oct 2023 18:34:39 +0200
Subject: [PATCH 01/11] small usability changes

- increased the grid size from 500x500 to 800x800 to fix problem of thecuress (issue #183)
- increased the listbox width in order to make long lines readable
- activate horizontal scrollbar in order to make long lines readable
---
 OpenCNCPilot/MainWindow.xaml            | 15 ++++++++-------
 OpenCNCPilot/Properties/AssemblyInfo.cs |  4 ++--
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/OpenCNCPilot/MainWindow.xaml b/OpenCNCPilot/MainWindow.xaml
index 4023989..90b2efa 100644
--- a/OpenCNCPilot/MainWindow.xaml
+++ b/OpenCNCPilot/MainWindow.xaml
@@ -52,7 +52,7 @@
 			<StackPanel Orientation="Vertical" HorizontalAlignment="Left">
 				<Border Style="{StaticResource stylePanelOut}">
 					<Expander Header="File" Width="Auto" IsExpanded="{util:SettingBinding FileExpanderOpen}">
-						<Grid Width="210" Height="260">
+						<Grid Width="230" Height="260">     <!-- increased the listbox width in order to make long lines readable, deHarro, 2023-10-04 -->
 							<Button Name="ButtonFileOpen" Click="ButtonOpen_Click" Content="Open" Style="{StaticResource styleButton}" HorizontalAlignment="Left" Margin="5,5,0,0" VerticalAlignment="Top"/>
 							<Button Name="ButtonFileSave" Click="ButtonSave_Click" Content="Save" Style="{StaticResource styleButton}" HorizontalAlignment="Left" Margin="48,5,0,0" VerticalAlignment="Top"/>
 							<Button Name="ButtonFileClear" Click="ButtonClear_Click" Content="Clear" Style="{StaticResource styleButton}" HorizontalAlignment="Left" Margin="87,5,0,0" VerticalAlignment="Top"/>
@@ -62,9 +62,9 @@
 								<Run Name="RunFileLength"  Text="0"/>
 							</TextBlock>
 
-							<ListView Name="ListViewFile"  Margin="0,53" ScrollViewer.HorizontalScrollBarVisibility="Disabled" Background="Transparent"/>
+                            <ListView Name="ListViewFile"  Margin="0,53" ScrollViewer.HorizontalScrollBarVisibility="Auto" Background="Transparent"/> <!-- activate horizontal scrollbar in order to make long lines readable, deHarro, 2023-10-04 -->
 
-							<Button Name="ButtonFileStart" Click="ButtonFileStart_Click" Content="Start" Style="{StaticResource styleButton}" HorizontalAlignment="Left" Margin="5,0,0,25" Height="23" VerticalAlignment="Bottom"/>
+                            <Button Name="ButtonFileStart" Click="ButtonFileStart_Click" Content="Start" Style="{StaticResource styleButton}" HorizontalAlignment="Left" Margin="5,0,0,25" Height="23" VerticalAlignment="Bottom"/>
 							<Button Name="ButtonFilePause" Click="ButtonFilePause_Click" Content="Pause" Style="{StaticResource styleButton}" HorizontalAlignment="Left" Margin="48,0,0,25" Height="23" VerticalAlignment="Bottom"/>
 							<Button Name="ButtonFileGoto" Click="ButtonFileGoto_Click" Content="Go To" Style="{StaticResource styleButton}" HorizontalAlignment="Left" Margin="93,0,0,25" Height="23" VerticalAlignment="Bottom"/>
 							<CheckBox Name="CheckBoxPauseOnM0" Content="Pause" ToolTip="Pause the Program on M0/M1/M30" IsChecked="{util:SettingBinding PauseFileOnHold}" HorizontalAlignment="Left" Margin="138,0,-24,20" Height="23" VerticalAlignment="Bottom"/>
@@ -297,7 +297,7 @@
 					<Expander Header="About" IsExpanded="{util:SettingBinding AboutExpanderOpen}">
 						<StackPanel>
 							<TextBlock TextAlignment="Center" FontSize="14" Padding="5">
-								<Span FontWeight="Bold" FontSize="15">OpenCNCPilot <Run Text="{Binding Version,Mode=OneWay}"/> by martin2250</Span><LineBreak/>
+								<Span FontWeight="Bold" FontSize="15">OpenCNCPilot <Run Text="{Binding Version, Mode=OneWay}"/> by martin2250</Span><LineBreak/>
 								<Hyperlink RequestNavigate="Hyperlink_RequestNavigate" NavigateUri="https://github.com/martin2250/OpenCNCPilot">Project Page</Hyperlink>
 								<Hyperlink RequestNavigate="Hyperlink_RequestNavigate" NavigateUri="https://github.com/martin2250/OpenCNCPilot/issues">Help</Hyperlink>
 							</TextBlock>
@@ -348,9 +348,10 @@
 			<h:LinesVisual3D Thickness="1" Color="Black" x:Name="ModelLine"/>
 			<h:LinesVisual3D Thickness="1" Color="Blue" x:Name="ModelArc"/>
 			<h:ArrowVisual3D x:Name="ModelTool" Direction="0,0,-10"/>
-			<h:GridLinesVisual3D 
-				x:Name="ModelGrid"
-				Width="500" Length="500"
+            <!--increased the grid size from 500x500 to 800x800 to fix problem of thecuress (issue #183), deHarro, 2023-10-04 -->
+            <h:GridLinesVisual3D
+                x:Name="ModelGrid"
+				Width="800" Length="800" 
 				Thickness="{util:SettingBinding GridThickness}"/>
 			<h:MeshGeometryVisual3D
 				x:Name="ModelHeightMap">
diff --git a/OpenCNCPilot/Properties/AssemblyInfo.cs b/OpenCNCPilot/Properties/AssemblyInfo.cs
index f46a144..822aa89 100644
--- a/OpenCNCPilot/Properties/AssemblyInfo.cs
+++ b/OpenCNCPilot/Properties/AssemblyInfo.cs
@@ -49,5 +49,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.5.12.0")]
-[assembly: AssemblyFileVersion("1.5.12.0")]
+[assembly: AssemblyVersion("1.5.13.0")]
+[assembly: AssemblyFileVersion("1.5.13.0")]

From 1ae51c4ca42235b9e914f3fb6c202f03bc103c28 Mon Sep 17 00:00:00 2001
From: deHarro <harry0001@satharo.de>
Date: Fri, 23 Aug 2024 11:50:37 +0200
Subject: [PATCH 02/11] Added option to lay flat and center the 3D viewport

In the debug panel there is a new option "Lay flat 3D Viewport". Clicking centers the viewport and places the camera vertically over the center, looking straight down.
---
 OpenCNCPilot/MainWindow.xaml    | 3 ++-
 OpenCNCPilot/MainWindow.xaml.cs | 7 +++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/OpenCNCPilot/MainWindow.xaml b/OpenCNCPilot/MainWindow.xaml
index 90b2efa..0091812 100644
--- a/OpenCNCPilot/MainWindow.xaml
+++ b/OpenCNCPilot/MainWindow.xaml
@@ -315,7 +315,8 @@
 							<Button Style="{StaticResource styleButton}" Content="Save Viewport Orientation" HorizontalAlignment="Left" Margin="10,3,0,0" Click="ButtonSaveViewport_Click" ToolTip="Save viewport orientation, persistent across restarts "/>
 							<Button Style="{StaticResource styleButton}" Content="Restore Viewport" HorizontalAlignment="Left" Margin="10,5,0,0" Click="ButtonRestoreViewport_Click" ToolTip="Restore viewport from settings"/>
 							<Button Style="{StaticResource styleButton}" Content="Reset 3D Viewport" HorizontalAlignment="Left" Margin="10,5,0,0" Click="ButtonResetViewport_Click" ToolTip="Restore viewport to factory default"/>
-						</StackPanel>
+                            <Button Style="{StaticResource styleButton}" Content="Lay flat 3D Viewport" HorizontalAlignment="Left" Margin="10,5,0,0" Click="ButtonLayFlatViewport_Click" ToolTip="Restore viewport to centered from top"/>      <!-- deHarro, 2024-08-23 -->
+                        </StackPanel>
 					</Expander>
 				</Border>
 			</StackPanel>
diff --git a/OpenCNCPilot/MainWindow.xaml.cs b/OpenCNCPilot/MainWindow.xaml.cs
index 0158721..901f9c1 100644
--- a/OpenCNCPilot/MainWindow.xaml.cs
+++ b/OpenCNCPilot/MainWindow.xaml.cs
@@ -343,6 +343,13 @@ private void ButtonResetViewport_Click(object sender, RoutedEventArgs e)
 			viewport.Camera.UpDirection = new System.Windows.Media.Media3D.Vector3D(0, 0, 1);
 		}
 
+		private void ButtonLayFlatViewport_Click(object sender, RoutedEventArgs e)                  // deHarro, 2024-08-23
+        {
+			viewport.Camera.Position = new System.Windows.Media.Media3D.Point3D(0, 10, 250);
+			viewport.Camera.LookDirection = new System.Windows.Media.Media3D.Vector3D(0, 1, -250);
+			viewport.Camera.UpDirection = new System.Windows.Media.Media3D.Vector3D(0, 0, 1);
+		}
+
 		private void ButtonRestoreViewport_Click(object sender, RoutedEventArgs e)
 		{
 			string[] scoords = Properties.Settings.Default.ViewPortPos.Split(';');

From e6c6ff578ef4bc9562558964084143a649e6091d Mon Sep 17 00:00:00 2001
From: deHarro <harry0001@satharo.de>
Date: Fri, 23 Aug 2024 13:48:30 +0200
Subject: [PATCH 03/11] Updated VersionInfo

---
 OpenCNCPilot/Properties/AssemblyInfo.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/OpenCNCPilot/Properties/AssemblyInfo.cs b/OpenCNCPilot/Properties/AssemblyInfo.cs
index 822aa89..3403901 100644
--- a/OpenCNCPilot/Properties/AssemblyInfo.cs
+++ b/OpenCNCPilot/Properties/AssemblyInfo.cs
@@ -49,5 +49,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.5.13.0")]
-[assembly: AssemblyFileVersion("1.5.13.0")]
+[assembly: AssemblyVersion("1.5.14.0")]
+[assembly: AssemblyFileVersion("1.5.14.0")]

From b4d87c333385912be83ccaee5fe41fae25c66d7c Mon Sep 17 00:00:00 2001
From: deHarro <harry0001@satharo.de>
Date: Tue, 27 Aug 2024 17:39:51 +0200
Subject: [PATCH 04/11] made listbox width adapting to line length

To see all info in the gcode file, the line length has to be expanded horizontally. Since there is no mouse dragging feature available, next best solution is, to adapt window width dynamically to the line length.
---
 OpenCNCPilot/MainWindow.xaml | 660 ++++++++++++++++++-----------------
 1 file changed, 333 insertions(+), 327 deletions(-)

diff --git a/OpenCNCPilot/MainWindow.xaml b/OpenCNCPilot/MainWindow.xaml
index 0091812..692ece1 100644
--- a/OpenCNCPilot/MainWindow.xaml
+++ b/OpenCNCPilot/MainWindow.xaml
@@ -13,214 +13,219 @@
 		DataContext="{Binding RelativeSource={RelativeSource Self}}"
 		PreviewKeyDown="Window_PreviewKeyDown"
 		Title="{Binding WindowTitle,Mode=OneWay}" Height="{util:SettingBinding WindowHeight}" Width="{util:SettingBinding WindowWidth}" Closing="Window_Closing">
-	<Window.Resources>
-		<ResourceDictionary Source="MainWindow.Resources.xaml"/>
-	</Window.Resources>
-	<Grid>
-		<Grid Panel.ZIndex="1">
-			<Border Style="{StaticResource stylePanelOut}" VerticalAlignment="Top" HorizontalAlignment="Center">
-				<StackPanel>
-					<StackPanel Orientation="Horizontal">
-						<Button Name="ButtonDistanceMode" Content="Absolute" Click="ButtonDistanceMode_Click" Style="{StaticResource styleButton}" Margin="5,5,0,5" ToolTip="Distance Mode - Click to Toggle"/>
-						<Button Name="ButtonArcPlane" Content="XY-Plane" Click="ButtonArcPlane_Click" Style="{StaticResource styleButton}" Margin="5,5,0,5" ToolTip="Arc Plane - Click to Reset to XY"/>
-						<Button Name="ButtonUnit" Content="Metric" Click="ButtonUnit_Click" Style="{StaticResource styleButton}" Margin="5,5,0,5"  ToolTip="Unit System - Click to Toggle"/>
-						<Button Name="ButtonStatus" Content="Disconnected" Click="ButtonStatus_Click" Style="{StaticResource styleButton}" Margin="5,5,0,5"  ToolTip="Machine Status - Click to send $X to unlock"/>
-						<Button Name="ButtonFeedRateOvr" Content="Feed: 100%" Click="ButtonFeedOverride_Click" Tag="100%" Style="{StaticResource styleButton}" Margin="5,5,0,5"  ToolTip="Feed Rate Override - Click to reset"/>
+    <Window.Resources>
+        <ResourceDictionary Source="MainWindow.Resources.xaml"/>
+    </Window.Resources>
+    <Grid>
+        <Grid Panel.ZIndex="1">
+            <Border Style="{StaticResource stylePanelOut}" VerticalAlignment="Top" HorizontalAlignment="Center">
+                <StackPanel>
+                    <StackPanel Orientation="Horizontal">
+                        <Button Name="ButtonDistanceMode" Content="Absolute" Click="ButtonDistanceMode_Click" Style="{StaticResource styleButton}" Margin="5,5,0,5" ToolTip="Distance Mode - Click to Toggle"/>
+                        <Button Name="ButtonArcPlane" Content="XY-Plane" Click="ButtonArcPlane_Click" Style="{StaticResource styleButton}" Margin="5,5,0,5" ToolTip="Arc Plane - Click to Reset to XY"/>
+                        <Button Name="ButtonUnit" Content="Metric" Click="ButtonUnit_Click" Style="{StaticResource styleButton}" Margin="5,5,0,5"  ToolTip="Unit System - Click to Toggle"/>
+                        <Button Name="ButtonStatus" Content="Disconnected" Click="ButtonStatus_Click" Style="{StaticResource styleButton}" Margin="5,5,0,5"  ToolTip="Machine Status - Click to send $X to unlock"/>
+                        <Button Name="ButtonFeedRateOvr" Content="Feed: 100%" Click="ButtonFeedOverride_Click" Tag="100%" Style="{StaticResource styleButton}" Margin="5,5,0,5"  ToolTip="Feed Rate Override - Click to reset"/>
 
-						<Button Name="ButtonFeedHold" Click="ButtonFeedHold_Click" Content="Hold" Style="{StaticResource styleButton}" Margin="35,5,0,5"/>
-						<Button Name="ButtonCycleStart" Click="ButtonCycleStart_Click" Content="Start" Style="{StaticResource styleButton}" Margin="5,5,0,5"/>
-						<Button Name="ButtonSoftReset" Click="ButtonSoftReset_Click" Content="Soft Reset" Style="{StaticResource styleButton}" Margin="5,5,0,5"/>
-					</StackPanel>
-					<StackPanel Orientation="Horizontal">
-						<TextBlock Text=" X: " VerticalAlignment="Center"/>
-						<TextBox Name="LabelPosX" Width="55" Text="0.0" IsReadOnly="True" VerticalContentAlignment="Center" Height="22"/>
-						<TextBlock Text=" Y: " VerticalAlignment="Center"/>
-						<TextBox Name="LabelPosY" Width="55" Text="0.0" IsReadOnly="True" VerticalContentAlignment="Center" Height="22"/>
-						<TextBlock Text=" Z: " VerticalAlignment="Center"/>
-						<TextBox Name="LabelPosZ" Width="55" Text="0.0" IsReadOnly="True" VerticalContentAlignment="Center" Height="22"/>
-						<TextBlock Text="   MX: " VerticalAlignment="Center"/>
-						<TextBox Name="LabelPosMX" Width="55" Text="0.0" IsReadOnly="True" VerticalContentAlignment="Center" Height="22"/>
-						<TextBlock Text=" MY: " VerticalAlignment="Center"/>
-						<TextBox Name="LabelPosMY" Width="55" Text="0.0" IsReadOnly="True" VerticalContentAlignment="Center" Height="22"/>
-						<TextBlock Text=" MZ: " VerticalAlignment="Center"/>
-						<TextBox Name="LabelPosMZ" Width="55" Text="0.0" IsReadOnly="True" VerticalContentAlignment="Center" Height="22"/>
-						<TextBlock Text=" F:" VerticalAlignment="Center"/>
-						<TextBlock Name="LabelFeedRateRealtime" Width="45" Text="0" VerticalAlignment="Center"/>
-					</StackPanel>
-				</StackPanel>
-			</Border>
-			<StackPanel Orientation="Vertical" HorizontalAlignment="Left">
-				<Border Style="{StaticResource stylePanelOut}">
-					<Expander Header="File" Width="Auto" IsExpanded="{util:SettingBinding FileExpanderOpen}">
-						<Grid Width="230" Height="260">     <!-- increased the listbox width in order to make long lines readable, deHarro, 2023-10-04 -->
-							<Button Name="ButtonFileOpen" Click="ButtonOpen_Click" Content="Open" Style="{StaticResource styleButton}" HorizontalAlignment="Left" Margin="5,5,0,0" VerticalAlignment="Top"/>
-							<Button Name="ButtonFileSave" Click="ButtonSave_Click" Content="Save" Style="{StaticResource styleButton}" HorizontalAlignment="Left" Margin="48,5,0,0" VerticalAlignment="Top"/>
-							<Button Name="ButtonFileClear" Click="ButtonClear_Click" Content="Clear" Style="{StaticResource styleButton}" HorizontalAlignment="Left" Margin="87,5,0,0" VerticalAlignment="Top"/>
-							<TextBlock  VerticalAlignment="Top" Margin="128,9,0,0">
+                        <Button Name="ButtonFeedHold" Click="ButtonFeedHold_Click" Content="Hold" Style="{StaticResource styleButton}" Margin="35,5,0,5"/>
+                        <Button Name="ButtonCycleStart" Click="ButtonCycleStart_Click" Content="Start" Style="{StaticResource styleButton}" Margin="5,5,0,5"/>
+                        <Button Name="ButtonSoftReset" Click="ButtonSoftReset_Click" Content="Soft Reset" Style="{StaticResource styleButton}" Margin="5,5,0,5"/>
+                    </StackPanel>
+                    <StackPanel Orientation="Horizontal">
+                        <TextBlock Text=" X: " VerticalAlignment="Center"/>
+                        <TextBox Name="LabelPosX" Width="55" Text="0.0" IsReadOnly="True" VerticalContentAlignment="Center" Height="22"/>
+                        <TextBlock Text=" Y: " VerticalAlignment="Center"/>
+                        <TextBox Name="LabelPosY" Width="55" Text="0.0" IsReadOnly="True" VerticalContentAlignment="Center" Height="22"/>
+                        <TextBlock Text=" Z: " VerticalAlignment="Center"/>
+                        <TextBox Name="LabelPosZ" Width="55" Text="0.0" IsReadOnly="True" VerticalContentAlignment="Center" Height="22"/>
+                        <TextBlock Text="   MX: " VerticalAlignment="Center"/>
+                        <TextBox Name="LabelPosMX" Width="55" Text="0.0" IsReadOnly="True" VerticalContentAlignment="Center" Height="22"/>
+                        <TextBlock Text=" MY: " VerticalAlignment="Center"/>
+                        <TextBox Name="LabelPosMY" Width="55" Text="0.0" IsReadOnly="True" VerticalContentAlignment="Center" Height="22"/>
+                        <TextBlock Text=" MZ: " VerticalAlignment="Center"/>
+                        <TextBox Name="LabelPosMZ" Width="55" Text="0.0" IsReadOnly="True" VerticalContentAlignment="Center" Height="22"/>
+                        <TextBlock Text=" F:" VerticalAlignment="Center"/>
+                        <TextBlock Name="LabelFeedRateRealtime" Width="45" Text="0" VerticalAlignment="Center"/>
+                    </StackPanel>
+                </StackPanel>
+            </Border>
+            <StackPanel Orientation="Vertical" HorizontalAlignment="Left">
+                <Border Style="{StaticResource stylePanelOut}">
+                    <Expander Header="File" Width="Auto" IsExpanded="{util:SettingBinding FileExpanderOpen}">
+                        <!--<Grid Width="230" Height="260">     --> <!-- increased the listbox width in order to make long lines readable, deHarro, 2023-10-04 -->
+                        <Grid Height="260">
+                            <Grid.ColumnDefinitions> <!-- made listbox width adapt to line length, deHarro, 2024-08-27 -->
+                                <ColumnDefinition Width="Auto" MinWidth="189"/>
+                                <ColumnDefinition Width="0"/>
+                            </Grid.ColumnDefinitions>
+                            <Button Name="ButtonFileOpen" Click="ButtonOpen_Click" Content="Open" Style="{StaticResource styleButton}" HorizontalAlignment="Left" Margin="5,5,0,0" VerticalAlignment="Top" Width="38"/>
+                            <Button Name="ButtonFileSave" Click="ButtonSave_Click" Content="Save" Style="{StaticResource styleButton}" HorizontalAlignment="Left" Margin="48,5,0,0" VerticalAlignment="Top" Width="34"/>
+                            <Button Name="ButtonFileClear" Click="ButtonClear_Click" Content="Clear" Style="{StaticResource styleButton}" HorizontalAlignment="Left" Margin="87,5,0,0" VerticalAlignment="Top" Width="36"/>
+                            <TextBlock  VerticalAlignment="Top" Margin="128,9,0,0" Height="16">
 								<Run Name="RunFilePosition" Text="0"/>
 								<Run Text="/"/>
 								<Run Name="RunFileLength"  Text="0"/>
-							</TextBlock>
+                            </TextBlock>
 
-                            <ListView Name="ListViewFile"  Margin="0,53" ScrollViewer.HorizontalScrollBarVisibility="Auto" Background="Transparent"/> <!-- activate horizontal scrollbar in order to make long lines readable, deHarro, 2023-10-04 -->
+                            <ListView Name="ListViewFile"  Margin="0,33,0,50" ScrollViewer.HorizontalScrollBarVisibility="Auto" Background="Transparent"/> <!-- activate horizontal scrollbar in order to make long lines readable, deHarro, 2023-10-04 -->
 
-                            <Button Name="ButtonFileStart" Click="ButtonFileStart_Click" Content="Start" Style="{StaticResource styleButton}" HorizontalAlignment="Left" Margin="5,0,0,25" Height="23" VerticalAlignment="Bottom"/>
-							<Button Name="ButtonFilePause" Click="ButtonFilePause_Click" Content="Pause" Style="{StaticResource styleButton}" HorizontalAlignment="Left" Margin="48,0,0,25" Height="23" VerticalAlignment="Bottom"/>
-							<Button Name="ButtonFileGoto" Click="ButtonFileGoto_Click" Content="Go To" Style="{StaticResource styleButton}" HorizontalAlignment="Left" Margin="93,0,0,25" Height="23" VerticalAlignment="Bottom"/>
-							<CheckBox Name="CheckBoxPauseOnM0" Content="Pause" ToolTip="Pause the Program on M0/M1/M30" IsChecked="{util:SettingBinding PauseFileOnHold}" HorizontalAlignment="Left" Margin="138,0,-24,20" Height="23" VerticalAlignment="Bottom"/>
+                            <Button Name="ButtonFileStart" Click="ButtonFileStart_Click" Content="Start" Style="{StaticResource styleButton}" HorizontalAlignment="Left" Margin="5,0,0,25" Height="23" VerticalAlignment="Bottom" Width="33"/>
+                            <Button Name="ButtonFilePause" Click="ButtonFilePause_Click" Content="Pause" Style="{StaticResource styleButton}" HorizontalAlignment="Left" Margin="48,0,0,25" Height="23" VerticalAlignment="Bottom" Width="40"/>
+                            <Button Name="ButtonFileGoto" Click="ButtonFileGoto_Click" Content="Go To" Style="{StaticResource styleButton}" HorizontalAlignment="Left" Margin="93,0,0,25" Height="23" VerticalAlignment="Bottom" Width="40"/>
+                            <CheckBox Name="CheckBoxPauseOnM0" Content="Pause" ToolTip="Pause the Program on M0/M1/M30" IsChecked="{util:SettingBinding PauseFileOnHold}" HorizontalAlignment="Left" Margin="138,0,0,20" Height="23" VerticalAlignment="Bottom" Width="51"/>
 
-							<TextBlock  VerticalAlignment="Bottom" Margin="10,0,0,4" HorizontalAlignment="Left">
+                            <TextBlock  VerticalAlignment="Bottom" Margin="10,0,0,4" HorizontalAlignment="Left" Height="16" Width="150">
 								<Run Text="Runtime:"/>
 								<Run Name="RunFileRunTime" Text="00:00:00"/>
 								<Run Text="/"/>
 								<Run Name="RunFileDuration" Text="00:00:00"/>
-							</TextBlock>
-						</Grid>
-					</Expander>
-				</Border>
-				<Border Style="{StaticResource stylePanelOut}">
-					<Expander Header="Edit" IsExpanded="{util:SettingBinding EditExpanderOpen}">
-						<WrapPanel Width="180">
-							<Button Name="ButtonEditSimplify" Click="ButtonEditSimplify_Click" Content="Simplify" Style="{StaticResource styleButton}" ToolTip="Simplifies GCode"/>
-							<Button Name="ButtonEditApplyHeightMap" Click="ButtonEditApplyHeightMap_Click" Content="Apply HeightMap" Style="{StaticResource styleButton}"/>
-							<Button Name="ButtonEditArcToLines" Click="ButtonEditArcToLines_Click" Content="ArcsToLines" Style="{StaticResource styleButton}" ToolTip="Replaces all Arcs with G1 straight moves"/>
-							<Button Name="ButtonEditSplit" Click="ButtonEditSplit_Click" Content="Split" Style="{StaticResource styleButton}" ToolTip="Splits all motions into motions with a maximum user-selectable length"/>
-							<Button Name="ButtonEditRotateCW" Click="ButtonEditRotateCW_Click" Content="RotateCW" Style="{StaticResource styleButton}" ToolTip="rotates the toolpath by 90° in the XY plane, doesn't support G18/G19"/>
-						</WrapPanel>
-					</Expander>
-				</Border>
-				<Border Style="{StaticResource stylePanelOut}">
-					<Expander Header="Overrides" IsExpanded="{util:SettingBinding OverrideExpanderOpen}">
-						<StackPanel Name="StackPanelOverrides">
-							<TextBlock>
+                            </TextBlock>
+                        </Grid>
+                    </Expander>
+                </Border>
+                <Border Style="{StaticResource stylePanelOut}">
+                    <Expander Header="Edit" IsExpanded="{util:SettingBinding EditExpanderOpen}">
+                        <WrapPanel Width="180">
+                            <Button Name="ButtonEditSimplify" Click="ButtonEditSimplify_Click" Content="Simplify" Style="{StaticResource styleButton}" ToolTip="Simplifies GCode"/>
+                            <Button Name="ButtonEditApplyHeightMap" Click="ButtonEditApplyHeightMap_Click" Content="Apply HeightMap" Style="{StaticResource styleButton}"/>
+                            <Button Name="ButtonEditArcToLines" Click="ButtonEditArcToLines_Click" Content="ArcsToLines" Style="{StaticResource styleButton}" ToolTip="Replaces all Arcs with G1 straight moves"/>
+                            <Button Name="ButtonEditSplit" Click="ButtonEditSplit_Click" Content="Split" Style="{StaticResource styleButton}" ToolTip="Splits all motions into motions with a maximum user-selectable length"/>
+                            <Button Name="ButtonEditRotateCW" Click="ButtonEditRotateCW_Click" Content="RotateCW" Style="{StaticResource styleButton}" ToolTip="rotates the toolpath by 90° in the XY plane, doesn't support G18/G19"/>
+                        </WrapPanel>
+                    </Expander>
+                </Border>
+                <Border Style="{StaticResource stylePanelOut}">
+                    <Expander Header="Overrides" IsExpanded="{util:SettingBinding OverrideExpanderOpen}">
+                        <StackPanel Name="StackPanelOverrides">
+                            <TextBlock>
 								<Run Text="Rapid:"/>
 								<Run Name="RunRapidOvr"/>
-							</TextBlock>
-							<StackPanel Orientation="Horizontal">
-								<Button Click="ButtonRapidOverride_Click" Content="100%" Style="{StaticResource styleButton}" Tag="100"/>
-								<Button Click="ButtonRapidOverride_Click" Content="50%" Style="{StaticResource styleButton}"  Tag="50"/>
-								<Button Click="ButtonRapidOverride_Click" Content="25%" Style="{StaticResource styleButton}" Tag="25"/>
-							</StackPanel>
-							<TextBlock>
+                            </TextBlock>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Click="ButtonRapidOverride_Click" Content="100%" Style="{StaticResource styleButton}" Tag="100"/>
+                                <Button Click="ButtonRapidOverride_Click" Content="50%" Style="{StaticResource styleButton}"  Tag="50"/>
+                                <Button Click="ButtonRapidOverride_Click" Content="25%" Style="{StaticResource styleButton}" Tag="25"/>
+                            </StackPanel>
+                            <TextBlock>
 								<Run Text="Feed:"/>
 								<Run Name="RunFeedOvr"/>
-							</TextBlock>
-							<StackPanel Orientation="Horizontal">
-								<Button Click="ButtonFeedOverride_Click" Content="+10%" Style="{StaticResource styleButton}" Tag="+10%"/>
-								<Button Click="ButtonFeedOverride_Click" Content="+1%" Style="{StaticResource styleButton}" Tag="+1%"/>
-								<Button Click="ButtonFeedOverride_Click" Content="100%" Style="{StaticResource styleButton}" Tag="100%"/>
-								<Button Click="ButtonFeedOverride_Click" Content="-1%" Style="{StaticResource styleButton}" Tag="-1%"/>
-								<Button Click="ButtonFeedOverride_Click" Content="-10%" Style="{StaticResource styleButton}" Tag="-10%"/>
-							</StackPanel>
-							<TextBlock>
+                            </TextBlock>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Click="ButtonFeedOverride_Click" Content="+10%" Style="{StaticResource styleButton}" Tag="+10%"/>
+                                <Button Click="ButtonFeedOverride_Click" Content="+1%" Style="{StaticResource styleButton}" Tag="+1%"/>
+                                <Button Click="ButtonFeedOverride_Click" Content="100%" Style="{StaticResource styleButton}" Tag="100%"/>
+                                <Button Click="ButtonFeedOverride_Click" Content="-1%" Style="{StaticResource styleButton}" Tag="-1%"/>
+                                <Button Click="ButtonFeedOverride_Click" Content="-10%" Style="{StaticResource styleButton}" Tag="-10%"/>
+                            </StackPanel>
+                            <TextBlock>
 								<Run Text="Spindle:"/>
 								<Run Name="RunSpindleOvr"/>
-							</TextBlock>
-							<StackPanel Orientation="Horizontal">
-								<Button Click="ButtonSpindleOverride_Click" Content="+10%" Style="{StaticResource styleButton}" Tag="+10%"/>
-								<Button Click="ButtonSpindleOverride_Click" Content="+1%" Style="{StaticResource styleButton}" Tag="+1%"/>
-								<Button Click="ButtonSpindleOverride_Click" Content="100%" Style="{StaticResource styleButton}" Tag="100%"/>
-								<Button Click="ButtonSpindleOverride_Click" Content="-1%" Style="{StaticResource styleButton}" Tag="-1%"/>
-								<Button Click="ButtonSpindleOverride_Click" Content="-10%" Style="{StaticResource styleButton}" Tag="-10%"/>
-							</StackPanel>
-						</StackPanel>
-					</Expander>
-				</Border>
-				<Border Style="{StaticResource stylePanelOut}">
-					<Expander Header="Probing" IsExpanded="{util:SettingBinding ProbingExpanderOpen}">
-						<Grid Width="200" Margin="0,0,0,5">
-							<Button Name="ButtonHeightMapCreateNew" Click="ButtonHeightmapCreateNew_Click" Content="Create New" Style="{StaticResource styleButton}" HorizontalAlignment="Left" Margin="5,5,0,0" VerticalAlignment="Top"/>
-							<Button Name="ButtonHeightMapLoad" Click="ButtonHeightmapLoad_Click" Content="Load" Style="{StaticResource styleButton}" HorizontalAlignment="Left" Margin="81,5,0,0" VerticalAlignment="Top" Height="24"/>
-							<Button Name="ButtonHeightMapSave" Click="ButtonHeightmapSave_Click" Content="Save" Style="{StaticResource styleButton}" HorizontalAlignment="Left" Margin="121,5,0,0" VerticalAlignment="Top"/>
-							<Button Name="ButtonHeightMapClear" Click="ButtonHeightmapClear_Click" Content="Clear" Style="{StaticResource styleButton}" HorizontalAlignment="Left" Margin="160,5,0,0" VerticalAlignment="Top"/>
+                            </TextBlock>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Click="ButtonSpindleOverride_Click" Content="+10%" Style="{StaticResource styleButton}" Tag="+10%"/>
+                                <Button Click="ButtonSpindleOverride_Click" Content="+1%" Style="{StaticResource styleButton}" Tag="+1%"/>
+                                <Button Click="ButtonSpindleOverride_Click" Content="100%" Style="{StaticResource styleButton}" Tag="100%"/>
+                                <Button Click="ButtonSpindleOverride_Click" Content="-1%" Style="{StaticResource styleButton}" Tag="-1%"/>
+                                <Button Click="ButtonSpindleOverride_Click" Content="-10%" Style="{StaticResource styleButton}" Tag="-10%"/>
+                            </StackPanel>
+                        </StackPanel>
+                    </Expander>
+                </Border>
+                <Border Style="{StaticResource stylePanelOut}">
+                    <Expander Header="Probing" IsExpanded="{util:SettingBinding ProbingExpanderOpen}">
+                        <Grid Width="200" Margin="0,0,0,5">
+                            <Button Name="ButtonHeightMapCreateNew" Click="ButtonHeightmapCreateNew_Click" Content="Create New" Style="{StaticResource styleButton}" HorizontalAlignment="Left" Margin="5,5,0,0" VerticalAlignment="Top"/>
+                            <Button Name="ButtonHeightMapLoad" Click="ButtonHeightmapLoad_Click" Content="Load" Style="{StaticResource styleButton}" HorizontalAlignment="Left" Margin="81,5,0,0" VerticalAlignment="Top" Height="24"/>
+                            <Button Name="ButtonHeightMapSave" Click="ButtonHeightmapSave_Click" Content="Save" Style="{StaticResource styleButton}" HorizontalAlignment="Left" Margin="121,5,0,0" VerticalAlignment="Top"/>
+                            <Button Name="ButtonHeightMapClear" Click="ButtonHeightmapClear_Click" Content="Clear" Style="{StaticResource styleButton}" HorizontalAlignment="Left" Margin="160,5,0,0" VerticalAlignment="Top"/>
 
-							<Grid Name="GridProbingControls" Margin="0,33,0,0">
-								<Label Content="Points:" HorizontalAlignment="Left" Margin="10,10,0,0" VerticalAlignment="Top"/>
-								<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>
-							</Grid>
-						</Grid>
-					</Expander>
-				</Border>
-				<Border Style="{StaticResource stylePanelOut}">
-					<Expander Header="Manual" IsExpanded="{util:SettingBinding ManualExpanderOpen}">
-						<StackPanel>
-							<Grid Margin="3,0,3,0">
-								<TextBox Name="TextBoxManual" Height="23" HorizontalAlignment="Stretch" PreviewKeyDown="TextBoxManual_PreviewKeyDown" TextChanged="TextBoxManual_TextChanged" Margin="0,5,41,5"/>
-								<Button Name="ButtonManualSend" Click="ButtonManualSend_Click" Style="{StaticResource styleButton}" Height="23" Content="Send" HorizontalAlignment="Right"/>
-							</Grid>
-							<TextBox Name="TextBoxPreview" IsReadOnly="True" Margin="3,0,3,3" Background="LightYellow"/>
-							<CheckBox Name="CheckBoxUseExpressions" Content="Use Expressions" Margin="3,0,3,3" IsChecked="{util:SettingBinding ManualUseExpressions}" Checked="CheckBoxUseExpressions_Changed" Unchecked="CheckBoxUseExpressions_Changed"/>
-							<StackPanel Orientation="Horizontal">
-								<Button Name="ButtonManualSetG10Zero" Click="ButtonManualSetG10Zero_Click" Style="{StaticResource styleButton}" Content="Zero (G10)"
+                            <Grid Name="GridProbingControls" Margin="0,33,0,0">
+                                <Label Content="Points:" HorizontalAlignment="Left" Margin="10,10,0,0" VerticalAlignment="Top"/>
+                                <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>
+                            </Grid>
+                        </Grid>
+                    </Expander>
+                </Border>
+                <Border Style="{StaticResource stylePanelOut}">
+                    <Expander Header="Manual" IsExpanded="{util:SettingBinding ManualExpanderOpen}">
+                        <StackPanel>
+                            <Grid Margin="3,0,3,0">
+                                <TextBox Name="TextBoxManual" Height="23" HorizontalAlignment="Stretch" PreviewKeyDown="TextBoxManual_PreviewKeyDown" TextChanged="TextBoxManual_TextChanged" Margin="0,5,41,5"/>
+                                <Button Name="ButtonManualSend" Click="ButtonManualSend_Click" Style="{StaticResource styleButton}" Height="23" Content="Send" HorizontalAlignment="Right"/>
+                            </Grid>
+                            <TextBox Name="TextBoxPreview" IsReadOnly="True" Margin="3,0,3,3" Background="LightYellow"/>
+                            <CheckBox Name="CheckBoxUseExpressions" Content="Use Expressions" Margin="3,0,3,3" IsChecked="{util:SettingBinding ManualUseExpressions}" Checked="CheckBoxUseExpressions_Changed" Unchecked="CheckBoxUseExpressions_Changed"/>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Name="ButtonManualSetG10Zero" Click="ButtonManualSetG10Zero_Click" Style="{StaticResource styleButton}" Content="Zero (G10)"
 									    ToolTip="Set Position to (0,0,0) with 'G10 L2 P0 XYZ' where XYZ are the current machine coordinates,&#x0a;this has the advantage that it will be persistent through a reset&#x0a;This button will NOT automatically send the command"/>
-								<Button Name="ButtonManualSetG92Zero" Click="ButtonManualSetG92Zero_Click" Style="{StaticResource styleButton}" Content="Zero (G92)"
+                                <Button Name="ButtonManualSetG92Zero" Click="ButtonManualSetG92Zero_Click" Style="{StaticResource styleButton}" Content="Zero (G92)"
 									    ToolTip="Set Position to (0,0,0) with 'G92 X0 Y0 Z0',&#x0a;this has the disadvantage that it will NOT be persistent through a reset&#x0a;This button will NOT automatically send the command"/>
-								<Button Name="ButtonManualResetG10" Click="ButtonManualResetG10_Click" Style="{StaticResource styleButton}" Content="Reset (G10)"
+                                <Button Name="ButtonManualResetG10" Click="ButtonManualResetG10_Click" Style="{StaticResource styleButton}" Content="Reset (G10)"
 									    ToolTip="Reset Work Coordinate System (G54) with 'G10 L2 P0 X0 Y0 Z0'&#x0a;This button will NOT automatically send the command"/>
-							</StackPanel>
-							<GroupBox>
-								<GroupBox.Header>
-									<CheckBox Name="CheckBoxEnableJog" Content="Enable Keyboard Jogging" Checked="CheckBoxEnableJog_Checked" Unchecked="CheckBoxEnableJog_Unchecked" VerticalAlignment="Top"/>
-								</GroupBox.Header>
-								<Grid IsEnabled="{Binding ElementName=CheckBoxEnableJog, Path=IsChecked}">
-									<TextBox Name="TextBoxJog" HorizontalAlignment="Left" HorizontalContentAlignment="Center" Height="23" Margin="10,5,0,0" Text="Jogging Keyboard Focus" VerticalAlignment="Top" Width="208" VerticalContentAlignment="Center"
+                            </StackPanel>
+                            <GroupBox>
+                                <GroupBox.Header>
+                                    <CheckBox Name="CheckBoxEnableJog" Content="Enable Keyboard Jogging" Checked="CheckBoxEnableJog_Checked" Unchecked="CheckBoxEnableJog_Unchecked" VerticalAlignment="Top"/>
+                                </GroupBox.Header>
+                                <Grid IsEnabled="{Binding ElementName=CheckBoxEnableJog, Path=IsChecked}">
+                                    <TextBox Name="TextBoxJog" HorizontalAlignment="Left" HorizontalContentAlignment="Center" Height="23" Margin="10,5,0,0" Text="Jogging Keyboard Focus" VerticalAlignment="Top" Width="208" VerticalContentAlignment="Center"
 											 PreviewKeyDown="Jogging_KeyDown" PreviewKeyUp="Jogging_KeyUp" LostKeyboardFocus="Jogging_LostKeyboardFocus">
-										<TextBox.ToolTip>
-											<TextBlock>
+                                        <TextBox.ToolTip>
+                                            <TextBlock>
 												You can only Jog as long as this textbox has the keyboard focus<LineBreak/>
 												Use the arrow keys for XY movement (Right/Up is the positive direction for X/Y)<LineBreak/>
 												Use PgUp/Down for Z movement<LineBreak/>
 												The motion will stop when you release the button (not 100% stable at the moment)<LineBreak/>
 												Esc will issue a soft reset
-											</TextBlock>
-										</TextBox.ToolTip>
-									</TextBox>
-									<Label Content="Feed" HorizontalAlignment="Left" Margin="12,33,0,0" VerticalAlignment="Top"/>
-									<TextBox Name="TextBoxJogFeed" Text="{util:SettingBinding JogFeed}" VerticalContentAlignment="Center" HorizontalAlignment="Left" Height="23" Margin="50,34,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="40"/>
-									<Label Content="Max Distance" HorizontalAlignment="Left" Margin="90,33,0,0" VerticalAlignment="Top"/>
-									<TextBox Name="TextBoxJogDistance" Text="{util:SettingBinding JogDistance}" VerticalContentAlignment="Center"  HorizontalAlignment="Right" Height="23" Margin="0,34,10,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="40"/>
-									<Label Content="CtrlFeed" HorizontalAlignment="Left" Margin="10,61,0,0" VerticalAlignment="Top"/>
-									<TextBox Name="TextBoxJogFeedFine" Text="{util:SettingBinding JogFeedCtrl}" VerticalContentAlignment="Center" HorizontalAlignment="Left" Height="23" Margin="69,62,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="40"/>
-									<Label Content="Distance" HorizontalAlignment="Left" Margin="116,61,0,0" VerticalAlignment="Top"/>
-									<TextBox Name="TextBoxJogDistanceFine" Text="{util:SettingBinding JogDistanceCtrl}" VerticalContentAlignment="Center"  HorizontalAlignment="Right" Height="23" Margin="0,62,10,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="40"/>
-								</Grid>
-							</GroupBox>
-						</StackPanel>
-					</Expander>
-				</Border>
-				<Border Style="{StaticResource stylePanelOut}">
-					<Expander Header="Manual Probing" IsExpanded="{util:SettingBinding ManualProbingExpanderOpen}">
-						<StackPanel>
-							<GroupBox Header="Last Probe Position">
-								<StackPanel>
-									<Label Content="Machine:"/>
-									<StackPanel  Orientation="Horizontal">
-										<TextBox Width="60" Margin="5,0,0,0" IsReadOnly="True" Text="{Binding LastProbePosMachine.X, StringFormat=N3}"/>
-										<TextBox Width="60" Margin="5,0,0,0" IsReadOnly="True" Text="{Binding LastProbePosMachine.Y, StringFormat=N3}"/>
-										<TextBox Width="60" Margin="5,0,5,0" IsReadOnly="True" Text="{Binding LastProbePosMachine.Z, StringFormat=N3}"/>
-									</StackPanel>
-									<Label Content="Work:"/>
-									<StackPanel  Orientation="Horizontal">
-										<TextBox Width="60" Margin="5,0,0,0" IsReadOnly="True" Text="{Binding LastProbePosWork.X, StringFormat=N3}"/>
-										<TextBox Width="60" Margin="5,0,0,0" IsReadOnly="True" Text="{Binding LastProbePosWork.Y, StringFormat=N3}"/>
-										<TextBox Width="60" Margin="5,0,5,0" IsReadOnly="True" Text="{Binding LastProbePosWork.Z, StringFormat=N3}"/>
-									</StackPanel>
-								</StackPanel>
-							</GroupBox>
-							<GroupBox Header="Tool Length Offset" Name="groupBoxTLO">
-								<Grid>
-									<CheckBox Content="Use Actual Position vs Probe" IsChecked="{util:SettingBinding TLSUseActualPos}" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="5,5,0,0"/>
-									<Button Content="Save Pos" HorizontalAlignment="Left" VerticalAlignment="Top"  Style="{StaticResource styleButton}" Click="ButtonSaveTLOPos_Click" Margin="5,25,0,0">
-										<Button.ToolTip>
-											<TextBlock>
+                                            </TextBlock>
+                                        </TextBox.ToolTip>
+                                    </TextBox>
+                                    <Label Content="Feed" HorizontalAlignment="Left" Margin="12,33,0,0" VerticalAlignment="Top"/>
+                                    <TextBox Name="TextBoxJogFeed" Text="{util:SettingBinding JogFeed}" VerticalContentAlignment="Center" HorizontalAlignment="Left" Height="23" Margin="50,34,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="40"/>
+                                    <Label Content="Max Distance" HorizontalAlignment="Left" Margin="90,33,0,0" VerticalAlignment="Top"/>
+                                    <TextBox Name="TextBoxJogDistance" Text="{util:SettingBinding JogDistance}" VerticalContentAlignment="Center"  HorizontalAlignment="Right" Height="23" Margin="0,34,10,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="40"/>
+                                    <Label Content="CtrlFeed" HorizontalAlignment="Left" Margin="10,61,0,0" VerticalAlignment="Top"/>
+                                    <TextBox Name="TextBoxJogFeedFine" Text="{util:SettingBinding JogFeedCtrl}" VerticalContentAlignment="Center" HorizontalAlignment="Left" Height="23" Margin="69,62,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="40"/>
+                                    <Label Content="Distance" HorizontalAlignment="Left" Margin="116,61,0,0" VerticalAlignment="Top"/>
+                                    <TextBox Name="TextBoxJogDistanceFine" Text="{util:SettingBinding JogDistanceCtrl}" VerticalContentAlignment="Center"  HorizontalAlignment="Right" Height="23" Margin="0,62,10,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="40"/>
+                                </Grid>
+                            </GroupBox>
+                        </StackPanel>
+                    </Expander>
+                </Border>
+                <Border Style="{StaticResource stylePanelOut}">
+                    <Expander Header="Manual Probing" IsExpanded="{util:SettingBinding ManualProbingExpanderOpen}">
+                        <StackPanel>
+                            <GroupBox Header="Last Probe Position">
+                                <StackPanel>
+                                    <Label Content="Machine:"/>
+                                    <StackPanel  Orientation="Horizontal">
+                                        <TextBox Width="60" Margin="5,0,0,0" IsReadOnly="True" Text="{Binding LastProbePosMachine.X, StringFormat=N3}"/>
+                                        <TextBox Width="60" Margin="5,0,0,0" IsReadOnly="True" Text="{Binding LastProbePosMachine.Y, StringFormat=N3}"/>
+                                        <TextBox Width="60" Margin="5,0,5,0" IsReadOnly="True" Text="{Binding LastProbePosMachine.Z, StringFormat=N3}"/>
+                                    </StackPanel>
+                                    <Label Content="Work:"/>
+                                    <StackPanel  Orientation="Horizontal">
+                                        <TextBox Width="60" Margin="5,0,0,0" IsReadOnly="True" Text="{Binding LastProbePosWork.X, StringFormat=N3}"/>
+                                        <TextBox Width="60" Margin="5,0,0,0" IsReadOnly="True" Text="{Binding LastProbePosWork.Y, StringFormat=N3}"/>
+                                        <TextBox Width="60" Margin="5,0,5,0" IsReadOnly="True" Text="{Binding LastProbePosWork.Z, StringFormat=N3}"/>
+                                    </StackPanel>
+                                </StackPanel>
+                            </GroupBox>
+                            <GroupBox Header="Tool Length Offset" Name="groupBoxTLO">
+                                <Grid>
+                                    <CheckBox Content="Use Actual Position vs Probe" IsChecked="{util:SettingBinding TLSUseActualPos}" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="5,5,0,0"/>
+                                    <Button Content="Save Pos" HorizontalAlignment="Left" VerticalAlignment="Top"  Style="{StaticResource styleButton}" Click="ButtonSaveTLOPos_Click" Margin="5,25,0,0">
+                                        <Button.ToolTip>
+                                            <TextBlock>
                                                 Tool Length Offsets:<LineBreak/>
                                                 1) load inital tool<LineBreak/>
                                                 2) move machine to tool length sensor<LineBreak/>
@@ -230,167 +235,168 @@
                                                 6) change tool<LineBreak/>
                                                 7) move to TLS and touch off again (new tool needs to be at same height as initial tool)<LineBreak/>
                                                 8) hit 'Apply TLO', this will use the position of the last received probe message and the saved position from earlier to compute the correct offset
-											</TextBlock>
-										</Button.ToolTip>
-									</Button>
-									<TextBlock Text="@MZ: " HorizontalAlignment="Left" VerticalAlignment="Top" Margin="65,29,0,0"/>
-									<TextBlock Text="{util:SettingBinding ToolLengthSetterPos, StringFormat=N3}" HorizontalAlignment="Left" VerticalAlignment="Top"  Margin="105,29,0,0" Width="60"/>
-									<Button Content="Apply TLO" HorizontalAlignment="Left" VerticalAlignment="Top" Style="{StaticResource styleButton}" Margin="5,53,0,0" Click="ButtonApplyTLO_Click"/>
-									<Button Content="Clear TLO" HorizontalAlignment="Left" VerticalAlignment="Top" Style="{StaticResource styleButton}" Margin="73,53,0,0" Click="ButtonClearTLO_Click"/>
-									<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>
-							<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}">
-					<Expander Header="Macros" IsExpanded="{util:SettingBinding MacroExpanderOpen}">
-						<StackPanel Name="stackPanelMacros">
-							<Button Content="Add Macro" Name="ButtonAddMacro" Click="ButtonAddMacro_Click" Margin="2"/>
-							<StackPanel MinWidth="120" Name="StackPanelMacros">
+                                            </TextBlock>
+                                        </Button.ToolTip>
+                                    </Button>
+                                    <TextBlock Text="@MZ: " HorizontalAlignment="Left" VerticalAlignment="Top" Margin="65,29,0,0"/>
+                                    <TextBlock Text="{util:SettingBinding ToolLengthSetterPos, StringFormat=N3}" HorizontalAlignment="Left" VerticalAlignment="Top"  Margin="105,29,0,0" Width="60"/>
+                                    <Button Content="Apply TLO" HorizontalAlignment="Left" VerticalAlignment="Top" Style="{StaticResource styleButton}" Margin="5,53,0,0" Click="ButtonApplyTLO_Click"/>
+                                    <Button Content="Clear TLO" HorizontalAlignment="Left" VerticalAlignment="Top" Style="{StaticResource styleButton}" Margin="73,53,0,0" Click="ButtonClearTLO_Click"/>
+                                    <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>
+                            <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}">
+                    <Expander Header="Macros" IsExpanded="{util:SettingBinding MacroExpanderOpen}">
+                        <StackPanel Name="stackPanelMacros">
+                            <Button Content="Add Macro" Name="ButtonAddMacro" Click="ButtonAddMacro_Click" Margin="2"/>
+                            <StackPanel MinWidth="120" Name="StackPanelMacros">
 
-							</StackPanel>
-						</StackPanel>
-					</Expander>
-				</Border>
-			</StackPanel>
+                            </StackPanel>
+                        </StackPanel>
+                    </Expander>
+                </Border>
+            </StackPanel>
 
-			<StackPanel Orientation="Vertical" HorizontalAlignment="Right" FlowDirection="RightToLeft">
-				<Border Style="{StaticResource stylePanelOut}">
-					<Expander Header="Machine" IsExpanded="{util:SettingBinding MachineExpanderOpen}">
-						<StackPanel>
-							<StackPanel Orientation="Horizontal">
-								<Button Name="ButtonSettings" Content="Settings" Style="{StaticResource styleButton}" Click="ButtonSettings_Click"/>
-								<Button Name="ButtonConnect" Content="Connect" Style="{StaticResource styleButton}" Click="ButtonConnect_Click"/>
-								<Button Name="ButtonDisconnect" Visibility="Collapsed" Content="Disconnect" Style="{StaticResource styleButton}" Click="ButtonDisconnect_Click"/>
-							</StackPanel>
-							<Button Name="ButtonSyncBuffer" Click="ButtonSyncBuffer_Click" Margin="0,0,0,3" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" FlowDirection="LeftToRight" ToolTip="Sync Buffer Status&#xA;(requires bit 1 of $10 to be set)">
-								<Grid Margin="-2" IsHitTestVisible="False">
-									<ProgressBar Name="ProgressBarBufferCapacity" Maximum="{util:SettingBinding ControllerBufferSize}" Background="Transparent"/>
-									<StackPanel Orientation="Horizontal" HorizontalAlignment="Center" >
-										<Label Name="LabelBufferState" Content="0" Margin="0,0,-6,0"/>
-										<Label Content="/"/>
-										<Label Content="{util:SettingBinding ControllerBufferSize}" Margin="-8,0,0,0"/>
-									</StackPanel>
-								</Grid>
-							</Button>
-							<StackPanel Orientation="Horizontal">
-								<Button Content="GRBL Settings" Style="{StaticResource styleButton}" Click="ShowGrblSettings_Click" Name="ButtonGrblSettings"/>
-							</StackPanel>
-							<StackPanel Orientation="Horizontal" Margin="0,-5,0,0">
-								<Button Content="Home Machine" Style="{StaticResource styleButton}" Click="ButtonMachineHome_Click" Name="ButtonMachineHome"/>
-							</StackPanel>
-						</StackPanel>
-					</Expander>
-				</Border>
-				<Border Style="{StaticResource stylePanelOut}">
-					<Expander Header="About" IsExpanded="{util:SettingBinding AboutExpanderOpen}">
-						<StackPanel>
-							<TextBlock TextAlignment="Center" FontSize="14" Padding="5">
+            <StackPanel Orientation="Vertical" HorizontalAlignment="Right" FlowDirection="RightToLeft">
+                <Border Style="{StaticResource stylePanelOut}">
+                    <Expander Header="Machine" IsExpanded="{util:SettingBinding MachineExpanderOpen}">
+                        <StackPanel>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Name="ButtonSettings" Content="Settings" Style="{StaticResource styleButton}" Click="ButtonSettings_Click"/>
+                                <Button Name="ButtonConnect" Content="Connect" Style="{StaticResource styleButton}" Click="ButtonConnect_Click"/>
+                                <Button Name="ButtonDisconnect" Visibility="Collapsed" Content="Disconnect" Style="{StaticResource styleButton}" Click="ButtonDisconnect_Click"/>
+                            </StackPanel>
+                            <Button Name="ButtonSyncBuffer" Click="ButtonSyncBuffer_Click" Margin="0,0,0,3" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" FlowDirection="LeftToRight" ToolTip="Sync Buffer Status&#xA;(requires bit 1 of $10 to be set)">
+                                <Grid Margin="-2" IsHitTestVisible="False">
+                                    <ProgressBar Name="ProgressBarBufferCapacity" Maximum="{util:SettingBinding ControllerBufferSize}" Background="Transparent"/>
+                                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" >
+                                        <Label Name="LabelBufferState" Content="0" Margin="0,0,-6,0"/>
+                                        <Label Content="/"/>
+                                        <Label Content="{util:SettingBinding ControllerBufferSize}" Margin="-8,0,0,0"/>
+                                    </StackPanel>
+                                </Grid>
+                            </Button>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Content="GRBL Settings" Style="{StaticResource styleButton}" Click="ShowGrblSettings_Click" Name="ButtonGrblSettings"/>
+                            </StackPanel>
+                            <StackPanel Orientation="Horizontal" Margin="0,-5,0,0">
+                                <Button Content="Home Machine" Style="{StaticResource styleButton}" Click="ButtonMachineHome_Click" Name="ButtonMachineHome"/>
+                            </StackPanel>
+                        </StackPanel>
+                    </Expander>
+                </Border>
+                <Border Style="{StaticResource stylePanelOut}">
+                    <Expander Header="About" IsExpanded="{util:SettingBinding AboutExpanderOpen}">
+                        <StackPanel>
+                            <TextBlock TextAlignment="Center" FontSize="14" Padding="5">
 								<Span FontWeight="Bold" FontSize="15">OpenCNCPilot <Run Text="{Binding Version, Mode=OneWay}"/> by martin2250</Span><LineBreak/>
 								<Hyperlink RequestNavigate="Hyperlink_RequestNavigate" NavigateUri="https://github.com/martin2250/OpenCNCPilot">Project Page</Hyperlink>
 								<Hyperlink RequestNavigate="Hyperlink_RequestNavigate" NavigateUri="https://github.com/martin2250/OpenCNCPilot/issues">Help</Hyperlink>
-							</TextBlock>
-						</StackPanel>
-					</Expander>
-				</Border>
-				<Border Style="{StaticResource stylePanelOut}">
-					<Expander Header="Debug" IsExpanded="{util:SettingBinding DebugExpanderOpen}">
-						<StackPanel HorizontalAlignment="Left" Margin="0,0,0,5">
-							<CheckBox Content="Show Status Messages" IsChecked="{util:SettingBinding ShowStatusLines}" Margin="10,0,0,0"/>
-							<StackPanel Orientation="Horizontal">
-								<TextBox Text="{util:SettingBinding ConsoleFadeTime}" VerticalContentAlignment="Center" Width="40" Margin="10,3,0,3"/>
-								<Label Content="Console Fade Time (s)" FlowDirection="LeftToRight"/>
-							</StackPanel>
-							<Button Style="{StaticResource styleButton}" Content="Save Viewport Orientation" HorizontalAlignment="Left" Margin="10,3,0,0" Click="ButtonSaveViewport_Click" ToolTip="Save viewport orientation, persistent across restarts "/>
-							<Button Style="{StaticResource styleButton}" Content="Restore Viewport" HorizontalAlignment="Left" Margin="10,5,0,0" Click="ButtonRestoreViewport_Click" ToolTip="Restore viewport from settings"/>
-							<Button Style="{StaticResource styleButton}" Content="Reset 3D Viewport" HorizontalAlignment="Left" Margin="10,5,0,0" Click="ButtonResetViewport_Click" ToolTip="Restore viewport to factory default"/>
-                            <Button Style="{StaticResource styleButton}" Content="Lay flat 3D Viewport" HorizontalAlignment="Left" Margin="10,5,0,0" Click="ButtonLayFlatViewport_Click" ToolTip="Restore viewport to centered from top"/>      <!-- deHarro, 2024-08-23 -->
+                            </TextBlock>
+                        </StackPanel>
+                    </Expander>
+                </Border>
+                <Border Style="{StaticResource stylePanelOut}">
+                    <Expander Header="Debug" IsExpanded="{util:SettingBinding DebugExpanderOpen}">
+                        <StackPanel HorizontalAlignment="Left" Margin="0,0,0,5">
+                            <CheckBox Content="Show Status Messages" IsChecked="{util:SettingBinding ShowStatusLines}" Margin="10,0,0,0"/>
+                            <StackPanel Orientation="Horizontal">
+                                <TextBox Text="{util:SettingBinding ConsoleFadeTime}" VerticalContentAlignment="Center" Width="40" Margin="10,3,0,3"/>
+                                <Label Content="Console Fade Time (s)" FlowDirection="LeftToRight"/>
+                            </StackPanel>
+                            <Button Style="{StaticResource styleButton}" Content="Save Viewport Orientation" HorizontalAlignment="Left" Margin="10,3,0,0" Click="ButtonSaveViewport_Click" ToolTip="Save viewport orientation, persistent across restarts "/>
+                            <Button Style="{StaticResource styleButton}" Content="Restore Viewport" HorizontalAlignment="Left" Margin="10,5,0,0" Click="ButtonRestoreViewport_Click" ToolTip="Restore viewport from settings"/>
+                            <Button Style="{StaticResource styleButton}" Content="Reset 3D Viewport" HorizontalAlignment="Left" Margin="10,5,0,0" Click="ButtonResetViewport_Click" ToolTip="Restore viewport to factory default"/>
+                            <Button Style="{StaticResource styleButton}" Content="Lay flat 3D Viewport" HorizontalAlignment="Left" Margin="10,5,0,0" Click="ButtonLayFlatViewport_Click" ToolTip="Restore viewport to centered from top"/>
+                            <!-- deHarro, 2024-08-23 -->
                         </StackPanel>
-					</Expander>
-				</Border>
-			</StackPanel>
+                    </Expander>
+                </Border>
+            </StackPanel>
 
-			<ListBox Name="ListBoxHistory" HorizontalContentAlignment="Right"  HorizontalAlignment="Right" VerticalAlignment="Bottom" IsHitTestVisible="False" BorderThickness="0" Background="Transparent" ScrollViewer.HorizontalScrollBarVisibility="Disabled" ScrollViewer.VerticalScrollBarVisibility="Disabled">
-				<ListBox.ItemsPanel>
-					<ItemsPanelTemplate>
-						<VirtualizingStackPanel VerticalAlignment="Bottom"/>
-					</ItemsPanelTemplate>
-				</ListBox.ItemsPanel>
-			</ListBox>
-		</Grid>
-		<StackPanel Panel.ZIndex="2" VerticalAlignment="Bottom" HorizontalAlignment="Center" Orientation="Horizontal" Margin="446,0,420,0">
-			<Label Name="LabelStateProbe" Content="Probe" FontWeight="ExtraBold" FontSize="40" Foreground="Red" Visibility="Collapsed"/>
-			<Label Name="LabelStateLimitX" Content="LimitX" FontWeight="ExtraBold" FontSize="40" Foreground="Red" Visibility="Collapsed"/>
-			<Label Name="LabelStateLimitY" Content="LimitY" FontWeight="ExtraBold" FontSize="40" Foreground="Red" Visibility="Collapsed"/>
-			<Label Name="LabelStateLimitZ" Content="LimitZ" FontWeight="ExtraBold" FontSize="40" Foreground="Red" Visibility="Collapsed"/>
-		</StackPanel>
-		<h:HelixViewport3D Name="viewport" ShowViewCube="False" Panel.ZIndex="0" PreviewKeyDown="viewport_PreviewKeyDown" Grid.ColumnSpan="2" ZoomAroundMouseDownPoint="true">
-			<h:HelixViewport3D.Camera>
-				<PerspectiveCamera
+            <ListBox Name="ListBoxHistory" HorizontalContentAlignment="Right"  HorizontalAlignment="Right" VerticalAlignment="Bottom" IsHitTestVisible="False" BorderThickness="0" Background="Transparent" ScrollViewer.HorizontalScrollBarVisibility="Disabled" ScrollViewer.VerticalScrollBarVisibility="Disabled">
+                <ListBox.ItemsPanel>
+                    <ItemsPanelTemplate>
+                        <VirtualizingStackPanel VerticalAlignment="Bottom"/>
+                    </ItemsPanelTemplate>
+                </ListBox.ItemsPanel>
+            </ListBox>
+        </Grid>
+        <StackPanel Panel.ZIndex="2" VerticalAlignment="Bottom" HorizontalAlignment="Center" Orientation="Horizontal" Margin="446,0,420,0">
+            <Label Name="LabelStateProbe" Content="Probe" FontWeight="ExtraBold" FontSize="40" Foreground="Red" Visibility="Collapsed"/>
+            <Label Name="LabelStateLimitX" Content="LimitX" FontWeight="ExtraBold" FontSize="40" Foreground="Red" Visibility="Collapsed"/>
+            <Label Name="LabelStateLimitY" Content="LimitY" FontWeight="ExtraBold" FontSize="40" Foreground="Red" Visibility="Collapsed"/>
+            <Label Name="LabelStateLimitZ" Content="LimitZ" FontWeight="ExtraBold" FontSize="40" Foreground="Red" Visibility="Collapsed"/>
+        </StackPanel>
+        <h:HelixViewport3D Name="viewport" ShowViewCube="False" Panel.ZIndex="0" PreviewKeyDown="viewport_PreviewKeyDown" Grid.ColumnSpan="2" ZoomAroundMouseDownPoint="true">
+            <h:HelixViewport3D.Camera>
+                <PerspectiveCamera
 					Position="50, -150, 250"
 					LookDirection="-50, 150,-250"
 					UpDirection="0,0,1"/>
-			</h:HelixViewport3D.Camera>
+            </h:HelixViewport3D.Camera>
 
-			<h:DefaultLights/>
-			<h:CoordinateSystemVisual3D ArrowLengths="5"/>
-			<h:LinesVisual3D Thickness="0.5" Color="Gray" x:Name="ModelRapid"/>
-			<h:LinesVisual3D Thickness="1" Color="Black" x:Name="ModelLine"/>
-			<h:LinesVisual3D Thickness="1" Color="Blue" x:Name="ModelArc"/>
-			<h:ArrowVisual3D x:Name="ModelTool" Direction="0,0,-10"/>
+            <h:DefaultLights/>
+            <h:CoordinateSystemVisual3D ArrowLengths="5"/>
+            <h:LinesVisual3D Thickness="0.5" Color="Gray" x:Name="ModelRapid"/>
+            <h:LinesVisual3D Thickness="1" Color="Black" x:Name="ModelLine"/>
+            <h:LinesVisual3D Thickness="1" Color="Blue" x:Name="ModelArc"/>
+            <h:ArrowVisual3D x:Name="ModelTool" Direction="0,0,-10"/>
             <!--increased the grid size from 500x500 to 800x800 to fix problem of thecuress (issue #183), deHarro, 2023-10-04 -->
             <h:GridLinesVisual3D
                 x:Name="ModelGrid"
 				Width="800" Length="800" 
 				Thickness="{util:SettingBinding GridThickness}"/>
-			<h:MeshGeometryVisual3D
+            <h:MeshGeometryVisual3D
 				x:Name="ModelHeightMap">
-				<h:MeshGeometryVisual3D.Material>
-					<MaterialGroup>
-						<DiffuseMaterial>
-							<DiffuseMaterial.Brush>
-								<LinearGradientBrush StartPoint="0,0" EndPoint="0, 1" Opacity="{util:SettingBinding HeightMapOpacity}">
-									<LinearGradientBrush.GradientStops>
-										<GradientStop Color="Blue" Offset="0"/>
-										<GradientStop Color="Cyan" Offset="0.2"/>
-										<GradientStop Color="Green" Offset="0.4"/>
-										<GradientStop Color="Yellow" Offset="0.6"/>
-										<GradientStop Color="Red" Offset="0.8"/>
-										<GradientStop Color="Purple" Offset="1"/>
-									</LinearGradientBrush.GradientStops>
-								</LinearGradientBrush>
-							</DiffuseMaterial.Brush>
-						</DiffuseMaterial>
-					</MaterialGroup>
-				</h:MeshGeometryVisual3D.Material>
-			</h:MeshGeometryVisual3D>
-			<h:LinesVisual3D x:Name="ModelHeightMapBoundary" Thickness="2" Color="Lime"/>
-			<h:PointsVisual3D x:Name="ModelHeightMapPoints" Color="Red" Size="4"/>
-			<h:LinesVisual3D x:Name="ModelFileBoundary" Color="GreenYellow" Thickness="2.5"/>
-			<h:PointsVisual3D x:Name="ModelFileBoundaryPoints" Color="Green" Size="8"/>
-			<h:TextVisual3D x:Name="ModelTextMinPoint" UpDirection="0,1,0" Height="7" VerticalAlignment="Top" HorizontalAlignment="Left"/>
-			<h:TextVisual3D x:Name="ModelTextMaxPoint" UpDirection="0,1,0" Height="7" VerticalAlignment="Bottom" HorizontalAlignment="Right"/>
-			<h:QuadVisual3D Point1="-1000,-1000,0" Point2="1000,-1000,0" Point3="1000,1000,0"  Point4="-1000,1000,0">
-				<h:QuadVisual3D.Material>
-					<DiffuseMaterial Brush="Transparent">
-					</DiffuseMaterial>
-				</h:QuadVisual3D.Material>
-				<h:QuadVisual3D.BackMaterial>
-					<DiffuseMaterial Brush="Transparent">
-					</DiffuseMaterial>
-				</h:QuadVisual3D.BackMaterial>
-			</h:QuadVisual3D>
-		</h:HelixViewport3D>
-	</Grid>
+                <h:MeshGeometryVisual3D.Material>
+                    <MaterialGroup>
+                        <DiffuseMaterial>
+                            <DiffuseMaterial.Brush>
+                                <LinearGradientBrush StartPoint="0,0" EndPoint="0, 1" Opacity="{util:SettingBinding HeightMapOpacity}">
+                                    <LinearGradientBrush.GradientStops>
+                                        <GradientStop Color="Blue" Offset="0"/>
+                                        <GradientStop Color="Cyan" Offset="0.2"/>
+                                        <GradientStop Color="Green" Offset="0.4"/>
+                                        <GradientStop Color="Yellow" Offset="0.6"/>
+                                        <GradientStop Color="Red" Offset="0.8"/>
+                                        <GradientStop Color="Purple" Offset="1"/>
+                                    </LinearGradientBrush.GradientStops>
+                                </LinearGradientBrush>
+                            </DiffuseMaterial.Brush>
+                        </DiffuseMaterial>
+                    </MaterialGroup>
+                </h:MeshGeometryVisual3D.Material>
+            </h:MeshGeometryVisual3D>
+            <h:LinesVisual3D x:Name="ModelHeightMapBoundary" Thickness="2" Color="Lime"/>
+            <h:PointsVisual3D x:Name="ModelHeightMapPoints" Color="Red" Size="4"/>
+            <h:LinesVisual3D x:Name="ModelFileBoundary" Color="GreenYellow" Thickness="2.5"/>
+            <h:PointsVisual3D x:Name="ModelFileBoundaryPoints" Color="Green" Size="8"/>
+            <h:TextVisual3D x:Name="ModelTextMinPoint" UpDirection="0,1,0" Height="7" VerticalAlignment="Top" HorizontalAlignment="Left"/>
+            <h:TextVisual3D x:Name="ModelTextMaxPoint" UpDirection="0,1,0" Height="7" VerticalAlignment="Bottom" HorizontalAlignment="Right"/>
+            <h:QuadVisual3D Point1="-1000,-1000,0" Point2="1000,-1000,0" Point3="1000,1000,0"  Point4="-1000,1000,0">
+                <h:QuadVisual3D.Material>
+                    <DiffuseMaterial Brush="Transparent">
+                    </DiffuseMaterial>
+                </h:QuadVisual3D.Material>
+                <h:QuadVisual3D.BackMaterial>
+                    <DiffuseMaterial Brush="Transparent">
+                    </DiffuseMaterial>
+                </h:QuadVisual3D.BackMaterial>
+            </h:QuadVisual3D>
+        </h:HelixViewport3D>
+    </Grid>
 </Window>

From dd31e48c3b15f055d5eb61cc45148218231041d0 Mon Sep 17 00:00:00 2001
From: deHarro <harry0001@satharo.de>
Date: Tue, 27 Aug 2024 17:41:41 +0200
Subject: [PATCH 05/11] changes version number to 1.5.15

---
 OpenCNCPilot/Properties/AssemblyInfo.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/OpenCNCPilot/Properties/AssemblyInfo.cs b/OpenCNCPilot/Properties/AssemblyInfo.cs
index 3403901..e5bfd48 100644
--- a/OpenCNCPilot/Properties/AssemblyInfo.cs
+++ b/OpenCNCPilot/Properties/AssemblyInfo.cs
@@ -49,5 +49,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.5.14.0")]
-[assembly: AssemblyFileVersion("1.5.14.0")]
+[assembly: AssemblyVersion("1.5.15.0")]
+[assembly: AssemblyFileVersion("1.5.15.0")]

From b17e8c2e56ffe78630b928fcee3b089011f1e95f Mon Sep 17 00:00:00 2001
From: deHarro <harry0001@satharo.de>
Date: Wed, 28 Aug 2024 16:46:08 +0200
Subject: [PATCH 06/11] Update README.md

---
 README.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/README.md b/README.md
index c1f151f..50e5206 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,11 @@
 # OpenCNCPilot
 
+Additions in this fork:
+- Increased size of the grid, 800x800 instead of 500x500.
+- Width of the file listview adapting dynamically to line length (to see all of the gcode)
+- Button to place viewport centered flat, view orthogonal from top (button is located in Debug Panel)
+-----
+
 OpenCNCPilot is a GRBL compatible G-Code Sender.
 
 It's main feature is it's ability to **probe user-defined areas for warpage and wrap the toolpath around the curved surface**.

From ab40514a4316ff0985f2bf56b96455fc56733271 Mon Sep 17 00:00:00 2001
From: deHarro <harry0001@satharo.de>
Date: Wed, 28 Aug 2024 16:51:57 +0200
Subject: [PATCH 07/11] Update README.md

Added screen dump of v1.5.15
---
 README.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/README.md b/README.md
index 50e5206..fdddf16 100644
--- a/README.md
+++ b/README.md
@@ -4,6 +4,9 @@ Additions in this fork:
 - Increased size of the grid, 800x800 instead of 500x500.
 - Width of the file listview adapting dynamically to line length (to see all of the gcode)
 - Button to place viewport centered flat, view orthogonal from top (button is located in Debug Panel)
+  
+  ![OCP_v1 5 15](https://github.com/user-attachments/assets/6aa39ba0-9929-4fd2-a0f2-f7576931e02c)
+
 -----
 
 OpenCNCPilot is a GRBL compatible G-Code Sender.

From ed96360bb8bcdbb07375b3a2965ad736edf1f4b0 Mon Sep 17 00:00:00 2001
From: deHarro <harry0001@satharo.de>
Date: Wed, 28 Aug 2024 16:52:45 +0200
Subject: [PATCH 08/11] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index fdddf16..4a5204d 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ Additions in this fork:
 - Width of the file listview adapting dynamically to line length (to see all of the gcode)
 - Button to place viewport centered flat, view orthogonal from top (button is located in Debug Panel)
   
-  ![OCP_v1 5 15](https://github.com/user-attachments/assets/6aa39ba0-9929-4fd2-a0f2-f7576931e02c)
+![OCP_v1 5 15](https://github.com/user-attachments/assets/6aa39ba0-9929-4fd2-a0f2-f7576931e02c)
 
 -----
 

From 8d669084ec014347a5959795cea0a80ff8cb5332 Mon Sep 17 00:00:00 2001
From: deHarro <harry0001@satharo.de>
Date: Wed, 28 Aug 2024 18:26:34 +0200
Subject: [PATCH 09/11] Update README.md

linked solutions to issues/discussion at Martins repository
---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 4a5204d..10a1b1c 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,9 @@
 # OpenCNCPilot
 
 Additions in this fork:
-- Increased size of the grid, 800x800 instead of 500x500.
-- Width of the file listview adapting dynamically to line length (to see all of the gcode)
-- Button to place viewport centered flat, view orthogonal from top (button is located in Debug Panel)
+- Increased size of the grid, 800x800 instead of 500x500, resolving [https://github.com/martin2250/OpenCNCPilot/discussions/183#discussion-5693325]
+- Width of the file listview adapting dynamically to line length (to see all of the gcode), partly resolving [https://github.com/martin2250/OpenCNCPilot/issues/134#issue-611203299]
+- Button to place viewport centered flat, view vertically down (button is located in Debug Panel), resolving [https://github.com/martin2250/OpenCNCPilot/issues/177#issue-1705672291] 
   
 ![OCP_v1 5 15](https://github.com/user-attachments/assets/6aa39ba0-9929-4fd2-a0f2-f7576931e02c)
 

From c78b87fc42625f7887f69d71df6864d85c6537c8 Mon Sep 17 00:00:00 2001
From: deHarro <harry0001@satharo.de>
Date: Wed, 28 Aug 2024 18:40:42 +0200
Subject: [PATCH 10/11] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 10a1b1c..bca85dc 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
 Additions in this fork:
 - Increased size of the grid, 800x800 instead of 500x500, resolving [https://github.com/martin2250/OpenCNCPilot/discussions/183#discussion-5693325]
 - Width of the file listview adapting dynamically to line length (to see all of the gcode), partly resolving [https://github.com/martin2250/OpenCNCPilot/issues/134#issue-611203299]
-- Button to place viewport centered flat, view vertically down (button is located in Debug Panel), resolving [https://github.com/martin2250/OpenCNCPilot/issues/177#issue-1705672291] 
+- Button to place viewport centered flat, view direction vertically down (button is located in Debug Panel), resolving [https://github.com/martin2250/OpenCNCPilot/issues/177#issue-1705672291] 
   
 ![OCP_v1 5 15](https://github.com/user-attachments/assets/6aa39ba0-9929-4fd2-a0f2-f7576931e02c)
 

From 231cdf5aac7de04fbd0e55e57f74f1cf053f912f Mon Sep 17 00:00:00 2001
From: Martin Pittermann <martinp2250@gmail.com>
Date: Sun, 1 Sep 2024 21:00:26 +0200
Subject: [PATCH 11/11] make things ready for merging

---
 OpenCNCPilot/MainWindow.xaml            | 3 +--
 OpenCNCPilot/Properties/AssemblyInfo.cs | 4 ++--
 README.md                               | 9 ---------
 3 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/OpenCNCPilot/MainWindow.xaml b/OpenCNCPilot/MainWindow.xaml
index 692ece1..3741fda 100644
--- a/OpenCNCPilot/MainWindow.xaml
+++ b/OpenCNCPilot/MainWindow.xaml
@@ -355,10 +355,9 @@
             <h:LinesVisual3D Thickness="1" Color="Black" x:Name="ModelLine"/>
             <h:LinesVisual3D Thickness="1" Color="Blue" x:Name="ModelArc"/>
             <h:ArrowVisual3D x:Name="ModelTool" Direction="0,0,-10"/>
-            <!--increased the grid size from 500x500 to 800x800 to fix problem of thecuress (issue #183), deHarro, 2023-10-04 -->
             <h:GridLinesVisual3D
                 x:Name="ModelGrid"
-				Width="800" Length="800" 
+				Width="500" Length="500" 
 				Thickness="{util:SettingBinding GridThickness}"/>
             <h:MeshGeometryVisual3D
 				x:Name="ModelHeightMap">
diff --git a/OpenCNCPilot/Properties/AssemblyInfo.cs b/OpenCNCPilot/Properties/AssemblyInfo.cs
index e5bfd48..822aa89 100644
--- a/OpenCNCPilot/Properties/AssemblyInfo.cs
+++ b/OpenCNCPilot/Properties/AssemblyInfo.cs
@@ -49,5 +49,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.5.15.0")]
-[assembly: AssemblyFileVersion("1.5.15.0")]
+[assembly: AssemblyVersion("1.5.13.0")]
+[assembly: AssemblyFileVersion("1.5.13.0")]
diff --git a/README.md b/README.md
index bca85dc..c1f151f 100644
--- a/README.md
+++ b/README.md
@@ -1,14 +1,5 @@
 # OpenCNCPilot
 
-Additions in this fork:
-- Increased size of the grid, 800x800 instead of 500x500, resolving [https://github.com/martin2250/OpenCNCPilot/discussions/183#discussion-5693325]
-- Width of the file listview adapting dynamically to line length (to see all of the gcode), partly resolving [https://github.com/martin2250/OpenCNCPilot/issues/134#issue-611203299]
-- Button to place viewport centered flat, view direction vertically down (button is located in Debug Panel), resolving [https://github.com/martin2250/OpenCNCPilot/issues/177#issue-1705672291] 
-  
-![OCP_v1 5 15](https://github.com/user-attachments/assets/6aa39ba0-9929-4fd2-a0f2-f7576931e02c)
-
------
-
 OpenCNCPilot is a GRBL compatible G-Code Sender.
 
 It's main feature is it's ability to **probe user-defined areas for warpage and wrap the toolpath around the curved surface**.