diff options
| author | Roy <roy.mail.net@gmail.com> | 2018-03-03 00:52:22 +0200 |
|---|---|---|
| committer | Roy <roy.mail.net@gmail.com> | 2018-03-03 00:52:22 +0200 |
| commit | 79ffa1774217400bd750f6a85df9f969429580c3 (patch) | |
| tree | 1d093fcaa82c2f1940a330a6a5852d879ffe5409 /Software/Visual_Studio/MachineStudio/Modules | |
| parent | 65d7f918b273a572d2d9a1d08a2797ea76b10850 (diff) | |
| download | Tango-79ffa1774217400bd750f6a85df9f969429580c3.tar.gz Tango-79ffa1774217400bd750f6a85df9f969429580c3.zip | |
Added Delta Resolution for Hive Color Picker.
Implemented Embroidery PMR.
Implemented Embroidery Native Adapter.
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules')
2 files changed, 10 insertions, 13 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml index 64d20a62c..49444750f 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml @@ -157,7 +157,7 @@ </StackPanel> </ToggleButton> <Popup x:Name="Popup" MouseDown="Popup_MouseDown" PopupAnimation="Fade" StaysOpen="False" PlacementTarget="{Binding ElementName=PopupButton}" Placement="Bottom" AllowsTransparency="True"> - <Border Background="#E6FFFFFF" Height="250" Width="500" CornerRadius="5" Margin="10"> + <Border Background="#E6FFFFFF" Height="250" Width="550" CornerRadius="5" Margin="10"> <Border.Effect> <DropShadowEffect ShadowDepth="0" BlurRadius="10" /> </Border.Effect> @@ -737,12 +737,7 @@ </mahapps:NumericUpDown> </ContentControl> - <Rectangle Margin="30 0 0 0" Width="50" Height="50" StrokeThickness="1" Stroke="Gray"> - <Rectangle.Fill> - <SolidColorBrush Color="{Binding Color}"> - </SolidColorBrush> - </Rectangle.Fill> - </Rectangle> + <ContentControl Style="{StaticResource colorPicker}"></ContentControl> </StackPanel> </Setter.Value> </Setter> @@ -775,12 +770,7 @@ </mahapps:NumericUpDown> </ContentControl> - <Rectangle Margin="30 0 0 0" Width="50" Height="50" StrokeThickness="1" Stroke="Gray"> - <Rectangle.Fill> - <SolidColorBrush Color="{Binding Color}"> - </SolidColorBrush> - </Rectangle.Fill> - </Rectangle> + <ContentControl Style="{StaticResource colorPicker}"></ContentControl> </StackPanel> </Setter.Value> </Setter> diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/ViewModels/MainViewVM.cs index 64fc359ea..a2c7e4460 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/ViewModels/MainViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/ViewModels/MainViewVM.cs @@ -186,10 +186,12 @@ namespace Tango.MachineStudio.HardwareDesigner.ViewModels realVersion.HardwareDancers.ToList().ForEach(x => x.DefferedDelete(Adapter.Context)); realVersion.HardwareMotors.ToList().ForEach(x => x.DefferedDelete(Adapter.Context)); realVersion.HardwarePidControls.ToList().ForEach(x => x.DefferedDelete(Adapter.Context)); + realVersion.HardwareWinders.ToList().ForEach(x => x.DefferedDelete(Adapter.Context)); realVersion.HardwareDancers.Clear(); realVersion.HardwareMotors.Clear(); realVersion.HardwarePidControls.Clear(); + realVersion.HardwareWinders.Clear(); foreach (var item in CurrentVersion.HardwareDancers.ToList().Select(x => x.Clone())) @@ -209,6 +211,11 @@ namespace Tango.MachineStudio.HardwareDesigner.ViewModels item.HardwareVersionGuid = realVersion.Guid; realVersion.HardwarePidControls.Add(item); } + foreach (var item in CurrentVersion.HardwareWinders.ToList().Select(x => x.Clone())) + { + item.HardwareVersionGuid = realVersion.Guid; + realVersion.HardwareWinders.Add(item); + } } |