aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml.cs
diff options
context:
space:
mode:
authorRoy Ben-Shabat <Roy@Twine-s.com>2018-07-16 20:01:10 +0300
committerRoy Ben-Shabat <Roy@Twine-s.com>2018-07-16 20:01:10 +0300
commit69bbedacee151090d5d0b6665b3a1614e65f1997 (patch)
tree9f4197b563edb7153de1e0077d0b937686c29d30 /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml.cs
parent13e34402f91fae6229b2d9719ddb48ced1d37fbf (diff)
downloadTango-69bbedacee151090d5d0b6665b3a1614e65f1997.tar.gz
Tango-69bbedacee151090d5d0b6665b3a1614e65f1997.zip
Added color conversion to Machine Studio.
Fixed issue with segments cloning.
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml.cs')
-rw-r--r--Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml.cs23
1 files changed, 23 insertions, 0 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml.cs
index b48e91f31..bb17a502d 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml.cs
@@ -242,5 +242,28 @@ namespace Tango.MachineStudio.Developer.Views
editor.ParameterizedObject = draggedItem.ParameterizedObject;
}
}
+
+ private void PopupButton_Checked(object sender, RoutedEventArgs e)
+ {
+ _vm.OnHivePopupOpened();
+ }
+
+ private void BrushPicker_ColorChanged(object sender, BrushPicker.ColorChangedEventArgs e)
+ {
+
+ }
+
+ private void ColorCanvas_SelectedColorChanged(object sender, RoutedPropertyChangedEventArgs<Color?> e)
+ {
+ if (e.NewValue.HasValue)
+ {
+ _vm.OnSelectedBrushColorChanged((Color)e.NewValue);
+ }
+ }
+
+ private void PopupButton_Unchecked(object sender, RoutedEventArgs e)
+ {
+ _vm.OnHivePopupClosed();
+ }
}
}