Skip to content

Commit

Permalink
Release 2.0.35
Browse files Browse the repository at this point in the history
See changelog for details
  • Loading branch information
terjeio committed Oct 26, 2021
1 parent 7f454de commit 19fdd92
Show file tree
Hide file tree
Showing 112 changed files with 1,532 additions and 521 deletions.
2 changes: 1 addition & 1 deletion CNC AppLaunch/CNC AppLaunch/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Io Engineering")]
[assembly: AssemblyProduct("CNC AppLaunch")]
[assembly: AssemblyProduct("ioSender")]
[assembly: AssemblyCopyright("Copyright © 2021 Io Engineering")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,9 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup>
<UICulture>en-US</UICulture>
<ApplicationIcon>App.ico</ApplicationIcon>
<Localizable>False</Localizable>
</PropertyGroup>
<ItemGroup>
<Reference Include="AForge">
Expand Down
2 changes: 1 addition & 1 deletion CNC Controls Camera/CNC Controls Camera/CameraControl.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
</Grid.ColumnDefinitions>
<Image Width="400" Height="300" HorizontalAlignment="Left" Name="frameHolder" VerticalAlignment="Top" Margin="10,10,0,0"/>
<Slider x:Name="sldcircle" Orientation="Vertical" HorizontalAlignment="Left" Value="{Binding Path=GuideScale, Mode=TwoWay}" Margin="28,30,0,0" VerticalAlignment="Top" Height="118" Width="30" Grid.Column="1" ValueChanged="sldcircle_ValueChanged" Maximum="100" Minimum="5" LargeChange="10" SmallChange="1"/>
<Button x:Name="btnMove" Content="Move offset" IsEnabled="{Binding Path=IsMoveEnabled}" HorizontalAlignment="Left" Margin="10,4,0,0" Grid.Row="1" VerticalAlignment="Top" Width="75" Click="btnMove_Click" Height="22"/>
<Button x:Uid="btn_moveOffset" x:Name="btnMove" Content="Move offset" IsEnabled="{Binding Path=IsMoveEnabled}" HorizontalAlignment="Left" Margin="10,4,0,0" Grid.Row="1" VerticalAlignment="Top" Width="75" Click="btnMove_Click" Height="22"/>
<ComboBox x:Name="cbxCamera" ItemsSource="{Binding Path=Cameras}" DisplayMemberPath="Name" SelectedValuePath="Camera" HorizontalAlignment="Left" Margin="100,4,0,0" Grid.Row="1" VerticalAlignment="Top" Width="300" SelectionChanged="cbxCamera_SelectionChanged" Height="22"/>
</Grid>
</UserControl>
10 changes: 5 additions & 5 deletions CNC Controls Camera/CNC Controls Camera/ConfigControl.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,19 @@
xmlns:Controls="clr-namespace:CNC.Controls;assembly=CNC.Controls.WPF" x:Class="CNC.Controls.Camera.ConfigControl"
mc:Ignorable="d"
d:DesignHeight="140" d:DesignWidth="250">
<GroupBox x:Name="grpCamera" Header="Camera" HorizontalAlignment="Left" VerticalAlignment="Top" Height="Auto" Width="250">
<GroupBox x:Uid="grp_camera" x:Name="grpCamera" Header="Camera" HorizontalAlignment="Left" VerticalAlignment="Top" Height="Auto" Width="250">
<StackPanel HorizontalAlignment="Left" Height="115" Margin="0,3,0,0" VerticalAlignment="Top" Width="235">
<Controls:NumericField x:Name="xOffset" Label="X offset:" ColonAt="90" Value="{Binding Path=Camera.XOffset, Mode=TwoWay}"/>
<Controls:NumericField x:Name="yOffset" Label="Y offset:" ColonAt="90" Value="{Binding Path=Camera.YOffset, Mode=TwoWay}"/>
<Controls:NumericField x:Uid="fld_xOffset" x:Name="xOffset" Label="X offset:" ColonAt="90" Value="{Binding Path=Camera.XOffset, Mode=TwoWay}"/>
<Controls:NumericField x:Uid="fld_yOffset" x:Name="yOffset" Label="Y offset:" ColonAt="90" Value="{Binding Path=Camera.YOffset, Mode=TwoWay}"/>
<Grid Height="29">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="90"/>
<ColumnDefinition Width="100*"/>
</Grid.ColumnDefinitions>
<Label Content="Offset motion:" HorizontalAlignment="Right" Margin="0,0,0,0" VerticalAlignment="Top"/>
<Label x:Uid="lbl_offsetMotion" Content="Offset motion:" HorizontalAlignment="Right" Margin="0,0,0,0" VerticalAlignment="Top"/>
<ComboBox x:Name="comboBox" ItemsSource="{Binding Path=Camera.MoveModes}" SelectedItem="{Binding Path=Camera.MoveMode, Mode=TwoWay}" Grid.Column="1" HorizontalAlignment="Left" Margin="0,2,0,0" VerticalAlignment="Top" Width="80"/>
</Grid>
<Button x:Name="getPosition" Content="Get current position" Width="150" Margin="0,4,0,0" Click="getPosition_Click"/>
<Button x:Uid="btn_getPosition" x:Name="getPosition" Content="Get current position" Width="150" Margin="0,4,0,0" Click="getPosition_Click"/>
</StackPanel>
</GroupBox>
</UserControl>
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,11 @@
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Io Engineering")]
[assembly: AssemblyProduct("CNC Camera Control")]
[assembly: AssemblyProduct("ioSender")]
[assembly: AssemblyCopyright("Copyright © 2021 Io Engineering")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]

// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
Expand Down Expand Up @@ -51,5 +52,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("2.0.33.0")]
[assembly: AssemblyFileVersion("2.0.33.0")]
[assembly: AssemblyVersion("2.0.35.0")]
[assembly: AssemblyFileVersion("2.0.35.0")]
3 changes: 3 additions & 0 deletions CNC Controls Dragknife/CNC Controls Dragknife.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup>
<UICulture>en-US</UICulture>
</PropertyGroup>
<ItemGroup>
<Reference Include="RP.Math.Vector3">
<HintPath>..\Vector-master\RP.Math.Vector3\bin\Release\RP.Math.Vector3.dll</HintPath>
Expand Down
23 changes: 12 additions & 11 deletions CNC Controls Dragknife/DragKnifeDialog.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,27 +8,28 @@
mc:Ignorable="d"
d:DesignHeight="320" d:DesignWidth="300"
SizeToContent="WidthAndHeight" ResizeMode="NoResize"
x:Uid="dlg_dragKnife"
Title="Drag knife parameters" Loaded="Window_Loaded" Icon="App.ico">
<Grid Background="#FFE5E5E5">
<StackPanel HorizontalAlignment="Left" VerticalAlignment="Top" Height="Auto" Margin="5,5">
<GroupBox Header="Knife" HorizontalAlignment="Left" Margin="5,5,0,0" VerticalAlignment="Top" Height="Auto" Width="280">
<GroupBox x:Uid="grp_knife" Header="Knife" HorizontalAlignment="Left" Margin="5,5,0,0" VerticalAlignment="Top" Height="Auto" Width="280">
<StackPanel>
<Controls:NumericField Label="Tip offset:" ColonAt="90" Unit="mm" Format="#0.###" Value="{Binding Path=KnifeTipOffset, Mode=TwoWay}"/>
<Controls:NumericField Label="Cut depth:" ColonAt="90" Unit="mm" Format="-###0.###" Value="{Binding Path=CutDepth, Mode=TwoWay}"/>
<Controls:NumericField Label="Swivel angle:" ColonAt="90" Unit="deg" Format="##0" Value="{Binding Path=SwivelAngle, Mode=TwoWay}"/>
<Controls:NumericField Label="Dent length:" ColonAt="90" Unit="mm" Format="###0.###" Value="{Binding Path=DentLength, Mode=TwoWay}"/>
<Controls:NumericField x:Uid="fld_tipOffset" Label="Tip offset:" ColonAt="90" Unit="mm" Format="#0.###" Value="{Binding Path=KnifeTipOffset, Mode=TwoWay}"/>
<Controls:NumericField x:Uid="fld_cutDepth" Label="Cut depth:" ColonAt="90" Unit="mm" Format="-###0.###" Value="{Binding Path=CutDepth, Mode=TwoWay}"/>
<Controls:NumericField x:Uid="fld_swivelAngle" Label="Swivel angle:" ColonAt="90" Unit="deg" Format="##0" Value="{Binding Path=SwivelAngle, Mode=TwoWay}"/>
<Controls:NumericField x:Uid="fld_dentLength" Label="Dent length:" ColonAt="90" Unit="mm" Format="###0.###" Value="{Binding Path=DentLength, Mode=TwoWay}"/>
</StackPanel>
</GroupBox>
<GroupBox Header="Retract" HorizontalAlignment="Left" Margin="5,5,0,0" VerticalAlignment="Top" Height="Auto" Width="280">
<GroupBox x:Uid="grp_retract" Header="Retract" HorizontalAlignment="Left" Margin="5,5,0,0" VerticalAlignment="Top" Height="Auto" Width="280">
<StackPanel>
<CheckBox Content="Retract enable" IsChecked="{Binding Path=RetractEnable, Mode=TwoWay}" Margin="90,5,0,0"/>
<Controls:NumericField Label="Retract angle:" ColonAt="90" Unit="deg" Format="##0" Value="{Binding Path=RetractAngle, Mode=TwoWay}"/>
<Controls:NumericField Label="Retract depth:" ColonAt="90" Unit="mm/min" Format="-###0.###" Value="{Binding Path=RetractDepth, Mode=TwoWay}"/>
<CheckBox x:Uid="lbl_retractEnable" Content="Retract enable" IsChecked="{Binding Path=RetractEnable, Mode=TwoWay}" Margin="90,5,0,0"/>
<Controls:NumericField x:Uid="fld_retractAngle" Label="Retract angle:" ColonAt="90" Unit="deg" Format="##0" Value="{Binding Path=RetractAngle, Mode=TwoWay}"/>
<Controls:NumericField x:Uid="fld_retractDepth" Label="Retract depth:" ColonAt="90" Unit="mm/min" Format="-###0.###" Value="{Binding Path=RetractDepth, Mode=TwoWay}"/>
</StackPanel>
</GroupBox>
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Width="Auto" Margin="0,10">
<Button x:Name="btnOk" Content="Ok" HorizontalAlignment="Left" VerticalAlignment="Top" Width="75" Click="btnOk_Click"/>
<Button x:Name="btnCancel" Content="Cancel" HorizontalAlignment="Left" Margin="5,0,0,0" VerticalAlignment="Top" Width="75" Click="btnCancel_Click"/>
<Button x:Uid="btn_ok" x:Name="btnOk" Content="Ok" HorizontalAlignment="Left" VerticalAlignment="Top" Width="75" Click="btnOk_Click"/>
<Button x:Uid="btn_cancel" x:Name="btnCancel" Content="Cancel" HorizontalAlignment="Left" Margin="5,0,0,0" VerticalAlignment="Top" Width="75" Click="btnCancel_Click"/>
</StackPanel>
</StackPanel>
</Grid>
Expand Down
11 changes: 6 additions & 5 deletions CNC Controls Dragknife/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,12 @@
[assembly: AssemblyTitle("CNC Controls Dragknife")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("CNC Controls Dragknife")]
[assembly: AssemblyCopyright("Copyright © 2020")]
[assembly: AssemblyCompany("Io Engineering")]
[assembly: AssemblyProduct("ioSender")]
[assembly: AssemblyCopyright("Copyright © 2021 Io Engineering")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]

// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
Expand Down Expand Up @@ -51,5 +52,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.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
[assembly: AssemblyVersion("2.0.35.0")]
[assembly: AssemblyFileVersion("2.0.35.0")]
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
</PropertyGroup>
<PropertyGroup>
<ApplicationIcon>App.ico</ApplicationIcon>
<Localizable>False</Localizable>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Io Engineering")]
[assembly: AssemblyProduct("CNC Controls Lathe")]
[assembly: AssemblyProduct("ioSender")]
[assembly: AssemblyCopyright("Copyright © 2021 Io Engineering")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
Expand Down Expand Up @@ -51,5 +51,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("2.0.31.0")]
[assembly: AssemblyFileVersion("2.0.31.0")]
[assembly: AssemblyVersion("2.0.35.0")]
[assembly: AssemblyFileVersion("2.0.35.0")]
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup>
<UICulture>en-US</UICulture>
</PropertyGroup>
<ItemGroup>
<Reference Include="HelixToolkit.Wpf">
<HintPath>..\..\helix-toolkit\HelixToolkit.Wpf.dll</HintPath>
Expand Down Expand Up @@ -58,6 +61,9 @@
<Compile Include="CenterFinderControl.xaml.cs">
<DependentUpon>CenterFinderControl.xaml</DependentUpon>
</Compile>
<Compile Include="ConfigControl.xaml.cs">
<DependentUpon>ConfigControl.xaml</DependentUpon>
</Compile>
<Compile Include="Converters.cs" />
<Compile Include="CsSelectControl.xaml.cs">
<DependentUpon>CsSelectControl.xaml</DependentUpon>
Expand Down Expand Up @@ -104,6 +110,10 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="ConfigControl.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="CsSelectControl.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
Expand Down
28 changes: 14 additions & 14 deletions CNC Controls Probing/CNC Controls Probing/CenterFinderControl.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,22 +31,22 @@
<StackPanel Orientation="Vertical" Margin="5" HorizontalAlignment="Left" Width="330">
<DockPanel>
<local:CsSelectControl/>
<GroupBox Header="Passes" ToolTip="More than one pass is usually needed to get accurate dimensions." HorizontalAlignment="Stretch">
<Controls:NumericField Label="Passes:" Value="{Binding Path=Passes, Mode=TwoWay}" Unit="" Format="0" Margin="0,5,0,0" HorizontalAlignment="Left" VerticalAlignment="Top" Style="{StaticResource ErrorStyle}"/>
<GroupBox x:Uid="grp_passes" Header="Passes" ToolTip="More than one pass is usually needed to get accurate dimensions." HorizontalAlignment="Stretch">
<Controls:NumericField x:Uid="fld_passes" Label="Passes:" Value="{Binding Path=Passes, Mode=TwoWay}" Unit="" Format="0" Margin="0,5,0,0" HorizontalAlignment="Left" VerticalAlignment="Top" Style="{StaticResource ErrorStyle}"/>
</GroupBox>
</DockPanel>
<GroupBox Header="Workpiece dimensions">
<GroupBox x:Uid="grp_dimensions" Header="Workpiece dimensions">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="30"/>
<RowDefinition Height="30"/>
</Grid.RowDefinitions>
<Controls:NumericField Grid.Row="0" Label="X size:" Format="{Binding Path=Grbl.Format}" Value="{Binding Path=WorkpieceSizeX, Mode=TwoWay}" Margin="0,5,0,0" HorizontalAlignment="Left" VerticalAlignment="Top" Style="{StaticResource ErrorStyle}"/>
<Controls:NumericField Grid.Row="1" Label="Y size:" Format="{Binding Path=Grbl.Format}" Value="{Binding Path=WorkpieceSizeY, Mode=TwoWay}" Margin="0,2,0,0" HorizontalAlignment="Left" VerticalAlignment="Top" Style="{StaticResource ErrorStyle}"/>
<CheckBox Content="Lock" Grid.RowSpan="2" IsChecked="{Binding Path=WorkpiecLockXY, Mode=TwoWay}" ToolTip="Unlock and set X or Y size to 0 to probe in one direction only." Margin="170,4,0,0" HorizontalAlignment="Left" VerticalAlignment="Center" Width="100"/>
<Controls:NumericField x:Uid="fld_xSize" Grid.Row="0" Label="X size:" Format="{Binding Path=Grbl.Format}" Value="{Binding Path=WorkpieceSizeX, Mode=TwoWay}" Margin="0,5,0,0" HorizontalAlignment="Left" VerticalAlignment="Top" Style="{StaticResource ErrorStyle}"/>
<Controls:NumericField x:Uid="fld_ySize" Grid.Row="1" Label="Y size:" Format="{Binding Path=Grbl.Format}" Value="{Binding Path=WorkpieceSizeY, Mode=TwoWay}" Margin="0,2,0,0" HorizontalAlignment="Left" VerticalAlignment="Top" Style="{StaticResource ErrorStyle}"/>
<CheckBox x:Uid="lbl_lock" Content="Lock" Grid.RowSpan="2" IsChecked="{Binding Path=WorkpiecLockXY, Mode=TwoWay}" ToolTip="Unlock and set X or Y size to 0 to probe in one direction only." Margin="170,4,0,0" HorizontalAlignment="Left" VerticalAlignment="Center" Width="100"/>
</Grid>
</GroupBox>
<StackPanel Orientation="Horizontal" HorizontalAlignment="Left" Margin="0,5,0,0" ToolTip="Click to select probing action.">
<StackPanel x:Uid="grd_action" Orientation="Horizontal" HorizontalAlignment="Left" Margin="0,5,0,0" ToolTip="Click to select probing action.">
<StackPanel.Resources>
<Style x:Key="RadioImage" TargetType="RadioButton">
<Style.Triggers>
Expand Down Expand Up @@ -77,15 +77,15 @@
</StackPanel>
</StackPanel>
<StackPanel Margin="5,0,0,5" Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Bottom" Height="Auto" Width="Auto">
<Button Content="Start" IsEnabled="{Binding Path=Grbl.IsJobRunning, Converter={StaticResource IsNotRunningConverter}}" Margin="2,0" Width="75" Click="start_Click"/>
<Button Content="Stop" IsEnabled="{Binding Path=Grbl.IsJobRunning}" Margin="2,0" Width="75" Click="stop_Click"/>
<Button x:Uid="btn_start" Content="Start" IsEnabled="{Binding Path=Grbl.IsJobRunning, Converter={StaticResource IsNotRunningConverter}}" Margin="2,0" Width="75" Click="start_Click"/>
<Button x:Uid="btn_stop" Content="Stop" IsEnabled="{Binding Path=Grbl.IsJobRunning}" Margin="2,0" Width="75" Click="stop_Click"/>
</StackPanel>
<CheckBox Content="Preview" Margin="345,10,0,0" IsChecked="{Binding Path=PreviewEnable}"/>
<GroupBox Header="Preview" Margin="345,30,0,0" Visibility="{Binding Path=PreviewEnable, Converter={StaticResource ToVisibleConverter}}" VerticalAlignment="Top">
<CheckBox x:Uid="lbl_preview" Content="Preview" Margin="345,10,0,0" IsChecked="{Binding Path=PreviewEnable}"/>
<GroupBox x:Uid="grp_preview" Header="Preview" Margin="345,30,0,0" Visibility="{Binding Path=PreviewEnable, Converter={StaticResource ToVisibleConverter}}" VerticalAlignment="Top">
<TextBox IsReadOnly="True" Text="{Binding Path=PreviewText, Mode=OneWay}" TextWrapping="NoWrap" Margin="0,5,0,0" VerticalAlignment="Top" HorizontalAlignment="Left" Width="235" Height="300"
FontSize="10" FontFamily="Verdana"
ScrollViewer.VerticalScrollBarVisibility="Auto"
ScrollViewer.HorizontalScrollBarVisibility="Auto">
FontSize="10" FontFamily="Verdana"
ScrollViewer.VerticalScrollBarVisibility="Auto"
ScrollViewer.HorizontalScrollBarVisibility="Auto">
</TextBox>
</GroupBox>
</Grid>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,7 @@ private bool OnCompleted()
}

if (!ok || pass == 1)
probing.Program.End(ok ? string.Format("Probing completed: X distance {0}, Y distance {1}", X_distance.ToInvariantString(), Y_distance.ToInvariantString()) : "Probing failed");
probing.Program.End(ok ? string.Format("Probing completed: X distance {0}, Y distance {1}", X_distance.ToInvariantString(), Y_distance.ToInvariantString()) : "Probing failed");
}

return ok;
Expand All @@ -373,7 +373,7 @@ private void PreviewOnCompleted()
probing.Program.Add(string.Format("G10L2P{0}{1}", probing.CoordinateSystem, probing.StartPosition.ToString(axisflags)));
}

private void start_Click(object sender, RoutedEventArgs e)
private void start_Click(object sender, RoutedEventArgs e)
{
Start((DataContext as ProbingViewModel).PreviewEnable);
}
Expand Down
Loading

0 comments on commit 19fdd92

Please sign in to comment.