add margin to new height map window

see #141

Author: martin2250

OpenCNCPilot/NewHeightMapWindow.xaml

@@ -7,7 +7,7 @@
         mc:Ignorable="d"
 		DataContext="{Binding RelativeSource={RelativeSource Self}}"
 		ResizeMode="NoResize"
-        Title="New HeightMap" Height="237" Width="197"
+        Title="New HeightMap" Height="315" Width="197"
 		FocusManager.FocusedElement="{Binding ElementName=FirstTextBox}">
 	<Grid>
 		<Label Content="X:" HorizontalAlignment="Left" Margin="10,8,0,0" VerticalAlignment="Top"/>
@@ -28,7 +28,13 @@
 			<TextBox Margin="5" Text="{Binding TestPattern}" IsEnabled="{Binding ElementName=checkBoxGenTest, Path=IsChecked}" VerticalContentAlignment="Center"/>
 		</GroupBox>
 
-		<Button Content="Size From GCode" Click="ButtonSizeFromCode_Click" Margin="10,0,75,10" VerticalContentAlignment="Center" Height="23" VerticalAlignment="Bottom"/>
 		<Button Content="Ok" Click="ButtonOK_Click" HorizontalAlignment="Right" Margin="0,0,10,10" VerticalContentAlignment="Center" Width="60" Height="23" VerticalAlignment="Bottom"/>
+		<GroupBox Header="Size from Gcode" HorizontalAlignment="Left" Height="80" Margin="10,163,0,0" VerticalAlignment="Top" Width="171">
+			<Grid>
+				<Label Content="Margin (mm):" HorizontalAlignment="Left" VerticalAlignment="Top"/>
+				<TextBox VerticalContentAlignment="Center" Height="23" Margin="87,1,10,0" TextWrapping="Wrap" Text="{Binding GCodeMargin}" VerticalAlignment="Top"/>
+				<Button Content="Apply" Click="ButtonSizeFromCode_Click" Margin="109,0,10,6" VerticalContentAlignment="Center" Height="23" VerticalAlignment="Bottom"/>
+			</Grid>
+		</GroupBox>
 	</Grid>
 </Window>

OpenCNCPilot/NewHeightMapWindow.xaml.cs

@@ -26,6 +26,8 @@ public partial class NewHeightMapWindow : Window
 		public Vector2 ToolPathMin = LastMin;
 		public Vector2 ToolPathMax = LastMax;
 
+		public double GCodeMargin { get; set; } = 0;
+
 		public bool Ok { get; set; } = false;
 		public bool GenerateTestPattern { get; set; } = LastGenTestPattern;
 		public string TestPattern { get; set; } = LastTestPattern;
@@ -169,11 +171,17 @@ private void ButtonOK_Click(object sender, RoutedEventArgs e)
 
 		private void ButtonSizeFromCode_Click(object sender, RoutedEventArgs e)
 		{
-			MinX = Math.Floor(ToolPathMin.X * 100) / 100.0;
-			MinY = Math.Floor(ToolPathMin.Y * 100) / 100.0;
+			if (GCodeMargin < 0)
+			{
+				MessageBox.Show("Margin must be greater than or equal to zero");
+				return;
+			}
+
+			MinX = Math.Floor((ToolPathMin.X - GCodeMargin) * 100) / 100.0;
+			MinY = Math.Floor((ToolPathMin.Y - GCodeMargin) * 100) / 100.0;
 
-			MaxX = Math.Ceiling(ToolPathMax.X * 100) / 100.0;
-			MaxY = Math.Ceiling(ToolPathMax.Y * 100) / 100.0;
+			MaxX = Math.Ceiling((ToolPathMax.X + GCodeMargin) * 100) / 100.0;
+			MaxY = Math.Ceiling((ToolPathMax.Y + GCodeMargin) * 100) / 100.0;
 
 			UpdateTextboxes();
 		}