diff options
| author | Roy Ben Shabat <roy.mail.net@gmail.com> | 2025-10-19 16:20:01 +0300 |
|---|---|---|
| committer | Roy Ben Shabat <roy.mail.net@gmail.com> | 2025-10-19 16:20:01 +0300 |
| commit | 72fc39f873de467c1431d928bce4d39442205691 (patch) | |
| tree | fc92559db7b57bb44606e040cd8ed4bd34494256 /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician | |
| parent | 22ddd9e0b6efe5aef685c7fc9886e3d93cb350c0 (diff) | |
| download | Tango-72fc39f873de467c1431d928bce4d39442205691.tar.gz Tango-72fc39f873de467c1431d928bce4d39442205691.zip | |
MS LITE
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician')
26 files changed, 41 insertions, 31 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/BlowerItem.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/BlowerItem.cs index f581988f7..967aca679 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/BlowerItem.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/BlowerItem.cs @@ -16,7 +16,7 @@ namespace Tango.MachineStudio.Technician.TechItems /// Represents a Blower controller item. /// </summary> /// <seealso cref="Tango.MachineStudio.Technician.TechItems.TechItem" /> - [TechItem(16)] + [TechItem(16, true)] public class BlowerItem : TechItem { public event EventHandler<bool> SetCommandClicked; @@ -114,7 +114,7 @@ namespace Tango.MachineStudio.Technician.TechItems SetCommand = new RelayCommand(() => { SetCommandClicked?.Invoke(this, _isActive); }); - ToggleActiveCommand = new RelayCommand(() => + ToggleActiveCommand = new RelayCommand(() => { SetCommandClicked?.Invoke(this, _isActive); }); diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/BreakSensorItem.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/BreakSensorItem.cs index 4a0d1c9c9..4b8c140f4 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/BreakSensorItem.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/BreakSensorItem.cs @@ -15,7 +15,7 @@ namespace Tango.MachineStudio.Technician.TechItems /// Represents a BreakSensor controller item. /// </summary> /// <seealso cref="Tango.MachineStudio.Technician.TechItems.TechItem" /> - [TechItem(17)] + [TechItem(17, false)] public class BreakSensorItem : TechItem { private static List<HardwareBreakSensor> _BreakSensorConfigurations; diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/ControllerItem.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/ControllerItem.cs index 2d8763f74..dcdc79d4e 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/ControllerItem.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/ControllerItem.cs @@ -15,7 +15,7 @@ namespace Tango.MachineStudio.Technician.TechItems /// Represents a single component value controller and monitor. /// </summary> /// <seealso cref="TechItem" /> - [TechItem(10)] + [TechItem(10, true)] public class ControllerItem : TechItem { public event EventHandler SetCommandClicked; @@ -157,7 +157,7 @@ namespace Tango.MachineStudio.Technician.TechItems cloned.OptimalRangeMinimum = OptimalRangeMinimum; cloned.OptimalRangeMaximum = OptimalRangeMaximum; cloned.IsSetToDefault = IsSetToDefault; - + return cloned; } } diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/DancerItem.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/DancerItem.cs index 1115c6dbf..ffcae21f0 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/DancerItem.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/DancerItem.cs @@ -16,7 +16,7 @@ namespace Tango.MachineStudio.Technician.TechItems /// Represents a dancer controller item. /// </summary> /// <seealso cref="Tango.MachineStudio.Technician.TechItems.TechItem" /> - [TechItem(15)] + [TechItem(15, false)] public class DancerItem : TechItem { private static List<HardwareDancer> _dancerConfigurations; diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/DigitalInItem.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/DigitalInItem.cs index bf06aae95..f920ae1e7 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/DigitalInItem.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/DigitalInItem.cs @@ -14,7 +14,7 @@ namespace Tango.MachineStudio.Technician.TechItems /// Represents a digital input pin item. /// </summary> /// <seealso cref="Tango.MachineStudio.Technician.TechItems.TechItem" /> - [TechItem(0)] + [TechItem(0, false)] public class DigitalInItem : TechItem { private TechIo _techIo; diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/DigitalOutItem.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/DigitalOutItem.cs index 42d5afe0a..4321597d3 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/DigitalOutItem.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/DigitalOutItem.cs @@ -14,7 +14,7 @@ namespace Tango.MachineStudio.Technician.TechItems /// Represents a digital output pin item. /// </summary> /// <seealso cref="Tango.MachineStudio.Technician.TechItems.TechItem" /> - [TechItem(1)] + [TechItem(1, true)] public class DigitalOutItem : TechItem { /// <summary> diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/DispenserItem.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/DispenserItem.cs index d3cd9622f..7fec34242 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/DispenserItem.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/DispenserItem.cs @@ -15,7 +15,7 @@ namespace Tango.MachineStudio.Technician.TechItems /// Represents a dispenser controller item. /// </summary> /// <seealso cref="Tango.MachineStudio.Technician.TechItems.TechItem" /> - [TechItem(8)] + [TechItem(8, true)] public class DispenserItem : TechItem { /// <summary> diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/HeaterItem.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/HeaterItem.cs index d419127c5..dbea885fd 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/HeaterItem.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/HeaterItem.cs @@ -16,7 +16,7 @@ namespace Tango.MachineStudio.Technician.TechItems /// Represents a heater controller. /// </summary> /// <seealso cref="Tango.MachineStudio.Technician.TechItems.TechItem" /> - [TechItem(10)] + [TechItem(10, true)] public class HeaterItem : TechItem { public event Action SetCommandClicked; diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/JobRunnerItem.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/JobRunnerItem.cs index 3443c008e..68a101b2f 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/JobRunnerItem.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/JobRunnerItem.cs @@ -13,7 +13,7 @@ using Tango.SharedUI.Helpers; namespace Tango.MachineStudio.Technician.TechItems { - [TechItem(21)] + [TechItem(21,false)] public class JobRunnerItem : TechItem { public event Action StartJob; diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/MeterItem.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/MeterItem.cs index 1eb5469d7..a42f6dace 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/MeterItem.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/MeterItem.cs @@ -15,7 +15,7 @@ namespace Tango.MachineStudio.Technician.TechItems /// Represents an analog style VU meter item. /// </summary> /// <seealso cref="Tango.MachineStudio.Technician.TechItems.TechItem" /> - [TechItem(3)] + [TechItem(3, true)] public class MeterItem : TechItem { private TechMonitor _techMonitor; diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/MonitorItem.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/MonitorItem.cs index 5c302e969..f475876f5 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/MonitorItem.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/MonitorItem.cs @@ -14,7 +14,7 @@ namespace Tango.MachineStudio.Technician.TechItems /// Represents an analog style integer monitor item. /// </summary> /// <seealso cref="Tango.MachineStudio.Technician.TechItems.TechItem" /> - [TechItem(2)] + [TechItem(2, true)] public class MonitorItem : TechItem { private String _format; diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/MonitorRecorderItem.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/MonitorRecorderItem.cs index 321d87632..90f7a6653 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/MonitorRecorderItem.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/MonitorRecorderItem.cs @@ -14,7 +14,7 @@ using Tango.SharedUI.Helpers; namespace Tango.MachineStudio.Technician.TechItems { - [TechItem(25)] + [TechItem(25, true)] public class MonitorRecorderItem : TechItem { private DispatcherTimer _timer; diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/MotorGroupItem.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/MotorGroupItem.cs index a5288e6bc..40d071a4d 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/MotorGroupItem.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/MotorGroupItem.cs @@ -17,7 +17,7 @@ namespace Tango.MachineStudio.Technician.TechItems /// Represents a motors group item. /// </summary> /// <seealso cref="Tango.MachineStudio.Technician.TechItems.TechItem" /> - [TechItem(7)] + [TechItem(7, true)] public class MotorGroupItem : TechItem { /// <summary> diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/MotorItem.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/MotorItem.cs index c097a0b7b..9bb7a7f19 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/MotorItem.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/MotorItem.cs @@ -16,7 +16,7 @@ namespace Tango.MachineStudio.Technician.TechItems /// Represents a motor controller item. /// </summary> /// <seealso cref="Tango.MachineStudio.Technician.TechItems.TechItem" /> - [TechItem(6)] + [TechItem(6, true)] public class MotorItem : TechItem { /// <summary> diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/MultiGraphItem.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/MultiGraphItem.cs index 1412175a0..f514e9096 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/MultiGraphItem.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/MultiGraphItem.cs @@ -19,7 +19,7 @@ namespace Tango.MachineStudio.Technician.TechItems /// Represents a multi channel real-time graph item. /// </summary> /// <seealso cref="Tango.MachineStudio.Technician.TechItems.TechItem" /> - [TechItem(5)] + [TechItem(5, true)] public class MultiGraphItem : TechItem { private DispatcherTimer _timer; @@ -190,7 +190,7 @@ namespace Tango.MachineStudio.Technician.TechItems Description = "Multi channel real-time graph"; Image = ResourceHelper.GetImageFromResources("Images/multi-graph.png"); - ClearCommand = new RelayCommand(() => + ClearCommand = new RelayCommand(() => { if (Editor != null) { @@ -214,7 +214,7 @@ namespace Tango.MachineStudio.Technician.TechItems { if (Editor != null) { - var controller = Editor.InnerGraph.Controller as WpfGraphController<TimeSpanDataPoint,DoubleDataPoint>; + var controller = Editor.InnerGraph.Controller as WpfGraphController<TimeSpanDataPoint, DoubleDataPoint>; controller.Range.MaximumX = new TimeSpanDataPoint(TimeSpan.FromSeconds(_duration)); controller.Range.MinimumY = new DoubleDataPoint(_min); diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/PidItem.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/PidItem.cs index 70ecc1a70..95aeb929a 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/PidItem.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/PidItem.cs @@ -16,7 +16,7 @@ namespace Tango.MachineStudio.Technician.TechItems /// Represents a PID controller item. /// </summary> /// <seealso cref="Tango.MachineStudio.Technician.TechItems.TechItem" /> - [TechItem(12)] + [TechItem(12, false)] public class PidItem : TechItem { private static List<HardwarePidControl> _pidConfigurations; diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/ProcessParametersItem.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/ProcessParametersItem.cs index 5e6bffa82..9c1361b24 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/ProcessParametersItem.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/ProcessParametersItem.cs @@ -18,7 +18,7 @@ namespace Tango.MachineStudio.Technician.TechItems /// Represents a process parameters table item. /// </summary> /// <seealso cref="Tango.MachineStudio.Technician.TechItems.TechItem" /> - [TechItem(20)] + [TechItem(20, false)] public class ProcessParametersItem : TechItem { public static ObservableCollection<ProcessParametersTable> ProcessParametersTables { get; set; } diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/SingleGraphItem.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/SingleGraphItem.cs index 8ccd5e718..50a95be12 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/SingleGraphItem.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/SingleGraphItem.cs @@ -21,7 +21,7 @@ namespace Tango.MachineStudio.Technician.TechItems /// Represents a single channel real-time graph item. /// </summary> /// <seealso cref="Tango.MachineStudio.Technician.TechItems.TechItem" /> - [TechItem(4)] + [TechItem(4, true)] public class SingleGraphItem : TechItem { private DispatcherTimer _timer; diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/SpeedSensorItem.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/SpeedSensorItem.cs index e43a518c1..6ca947157 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/SpeedSensorItem.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/SpeedSensorItem.cs @@ -16,7 +16,7 @@ namespace Tango.MachineStudio.Technician.TechItems /// Represents a SpeedSensor controller item. /// </summary> /// <seealso cref="Tango.MachineStudio.Technician.TechItems.TechItem" /> - [TechItem(15)] + [TechItem(15, false)] public class SpeedSensorItem : TechItem { private static List<HardwareSpeedSensor> _SpeedSensorConfigurations; diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/TechItem.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/TechItem.cs index 95b36eb70..d1248f914 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/TechItem.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/TechItem.cs @@ -12,6 +12,8 @@ using Tango.Core.Helpers; using Tango.BL.Entities; using System.Reflection; using Tango.BL; +using Tango.Core.DI; +using Tango.MachineStudio.Common.Buid; namespace Tango.MachineStudio.Technician.TechItems { @@ -254,7 +256,9 @@ namespace Tango.MachineStudio.Technician.TechItems { List<TechItem> items = new List<TechItem>(); - foreach (var type in typeof(TechItem).Assembly.GetTypes().Where(x => typeof(TechItem).IsAssignableFrom(x) && !x.IsAbstract).OrderBy(x => x.GetCustomAttribute<TechItemAttribute>().Index)) + var buildProvder = TangoIOC.Default.GetInstance<IBuildProvider>(); + + foreach (var type in typeof(TechItem).Assembly.GetTypes().Where(x => typeof(TechItem).IsAssignableFrom(x) && !x.IsAbstract).Where(x => x.GetCustomAttribute<TechItemAttribute>().SupportsLite || buildProvder.BuildType == MSBuildType.Default).OrderBy(x => x.GetCustomAttribute<TechItemAttribute>().Index)) { items.Add(Activator.CreateInstance(type) as TechItem); } diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/TechItemAttribute.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/TechItemAttribute.cs index fafd00954..3011f5907 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/TechItemAttribute.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/TechItemAttribute.cs @@ -17,13 +17,16 @@ namespace Tango.MachineStudio.Technician.TechItems /// </summary> public int Index { get; set; } + public bool SupportsLite { get; set; } + /// <summary> /// Initializes a new instance of the <see cref="TechItemAttribute"/> class. /// </summary> /// <param name="index">The index.</param> - public TechItemAttribute(int index) + public TechItemAttribute(int index, bool supportsLite) { Index = index; + SupportsLite = supportsLite; } } } diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/TextItem.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/TextItem.cs index 939809504..8450901a6 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/TextItem.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/TextItem.cs @@ -8,7 +8,7 @@ using Tango.SharedUI.Helpers; namespace Tango.MachineStudio.Technician.TechItems { - [TechItem(25)] + [TechItem(25,true)] public class TextItem : TechItem { private String _text; diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/ThreadMotionItem.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/ThreadMotionItem.cs index a5789377f..42ad80c2e 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/ThreadMotionItem.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/ThreadMotionItem.cs @@ -13,7 +13,7 @@ namespace Tango.MachineStudio.Technician.TechItems /// Represents a thread motion controller item. /// </summary> /// <seealso cref="Tango.MachineStudio.Technician.TechItems.TechItem" /> - [TechItem(9)] + [TechItem(9, true)] public class ThreadMotionItem : TechItem { /// <summary> diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/ValveItem.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/ValveItem.cs index e2f01565a..9372baaca 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/ValveItem.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/ValveItem.cs @@ -12,7 +12,7 @@ using Tango.SharedUI.Helpers; namespace Tango.MachineStudio.Technician.TechItems { - [TechItem(10)] + [TechItem(10, false)] public class ValveItem : TechItem { /// <summary> diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/WinderItem.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/WinderItem.cs index 2df2d7ad7..51444dcad 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/WinderItem.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/WinderItem.cs @@ -16,7 +16,7 @@ namespace Tango.MachineStudio.Technician.TechItems /// Represents a winder controller item. /// </summary> /// <seealso cref="Tango.MachineStudio.Technician.TechItems.TechItem" /> - [TechItem(14)] + [TechItem(14, false)] public class WinderItem : TechItem { private static List<HardwareWinder> _winderConfigurations; diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Views/MachineTechView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Views/MachineTechView.xaml index 06e0a59fa..e52129de4 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Views/MachineTechView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Views/MachineTechView.xaml @@ -15,6 +15,7 @@ xmlns:items="clr-namespace:Tango.MachineStudio.Technician.TechItems" xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI" xmlns:localConverters="clr-namespace:Tango.MachineStudio.Technician.Converters" + xmlns:commonConverters="clr-namespace:Tango.MachineStudio.Common.Converters;assembly=Tango.MachineStudio.Common" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:local="clr-namespace:Tango.MachineStudio.Technician.Views" mc:Ignorable="d" @@ -24,6 +25,8 @@ <converters:BooleanToVisibilityInverseConverter x:Key="BooleanToVisibilityInverseConverter" /> <converters:NumberToFileSizeConverter x:Key="NumberToFileSizeConverter" /> <localConverters:SecondsToTimeSpanConverter x:Key="SecondsToTimeSpanConverter" /> + <commonConverters:IsLiteToVisibilityInverseConverter x:Key="IsLiteToVisibilityInverseConverter" /> + <commonConverters:IsLiteToVisibilityConverter x:Key="IsLiteToVisibilityConverter" /> <DataTemplate x:Key="TabTemplate"> <Border IsVisibleChanged="Border_IsVisibleChanged"> @@ -231,7 +234,7 @@ </MenuItem> </MenuItem> <MenuItem Header="Tools"> - <MenuItem Header="Upload partial hardware configuration" Command="{Binding UploadPartialHardwareConfigurationCommand}"> + <MenuItem Visibility="{Binding Converter={StaticResource IsLiteToVisibilityInverseConverter}}" Header="Upload partial hardware configuration" Command="{Binding UploadPartialHardwareConfigurationCommand}"> <MenuItem.Icon> <fa:ImageAwesome Icon="Upload" Width="16" Foreground="{StaticResource MainWindow.Foreground}"/> </MenuItem.Icon> @@ -283,7 +286,7 @@ </Menu> - <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0 0 5 10" Height="40"> + <StackPanel Visibility="{Binding Converter={StaticResource IsLiteToVisibilityInverseConverter}}" Orientation="Horizontal" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0 0 5 10" Height="40"> <Button Height="Auto" Margin="0 0 10 0" FontSize="12" Command="{Binding ResetHardwareConfigurationCommand}" ToolTip="Reset all visual elements to the hardware configuration defined for the current machine"> <StackPanel Orientation="Horizontal"> <materialDesign:PackIcon Margin="0 0 2 0" Width="24" Height="24" Kind="Refresh"/> |
