diff options
| author | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-02-08 13:11:43 +0200 |
|---|---|---|
| committer | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-02-08 13:11:43 +0200 |
| commit | 4cf9cd72047bbb5a1c83255721870d29bbdb03f7 (patch) | |
| tree | 62f9088a8342270eb585015a75cd171a04c390bb /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels | |
| parent | 0907f58b81e29d9c0f415e2c7660ad60787f281b (diff) | |
| download | Tango-4cf9cd72047bbb5a1c83255721870d29bbdb03f7.tar.gz Tango-4cf9cd72047bbb5a1c83255721870d29bbdb03f7.zip | |
Added new tech tables..
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels')
3 files changed, 9 insertions, 9 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/IOVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/IOVM.cs index e2a4fae0e..cc4170827 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/IOVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/IOVM.cs @@ -10,8 +10,8 @@ namespace Tango.MachineStudio.Developer.ViewModels { public class IOVM : ExtendedObject { - private Graph _io; - public Graph IO + private TechMonitor _io; + public TechMonitor IO { get { return _io; } set { _io = value; RaisePropertyChangedAuto(); } @@ -38,7 +38,7 @@ namespace Tango.MachineStudio.Developer.ViewModels set { _value = value; RaisePropertyChanged(nameof(Value)); } } - public IOVM(Graph io, String name) + public IOVM(TechMonitor io, String name) { IO = io; Name = name; diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs index e1166a9bc..3c83579ec 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs @@ -209,11 +209,11 @@ namespace Tango.MachineStudio.Developer.ViewModels set { _isSideBarOpened = value; RaisePropertyChangedAuto(); } } - private ObservableCollection<Graph> _availableGraphs; + private ObservableCollection<TechMonitor> _availableGraphs; /// <summary> /// Gets or sets the available sensors. /// </summary> - public ObservableCollection<Graph> AvailableGraphs + public ObservableCollection<TechMonitor> AvailableGraphs { get { return _availableGraphs; } set { _availableGraphs = value; RaisePropertyChangedAuto(); } @@ -475,7 +475,7 @@ namespace Tango.MachineStudio.Developer.ViewModels if (!this.DesignMode) { Adapter = ObservablesEntitiesAdapter.Instance; - AvailableGraphs = Adapter.Graphs.ToObservableCollection(); + AvailableGraphs = Adapter.TechMonitors.ToObservableCollection(); } Graphs = new ObservableCollection<IRealTimeGraph>(); @@ -1124,7 +1124,7 @@ namespace Tango.MachineStudio.Developer.ViewModels /// Add sensor graph from available sensors to displayed graphs. /// </summary> /// <param name="sensor">The sensor.</param> - public void OnDropAvailableGraph(Graph sensor) + public void OnDropAvailableGraph(TechMonitor sensor) { if (Graphs.Count < 8) { @@ -1208,7 +1208,7 @@ namespace Tango.MachineStudio.Developer.ViewModels /// <param name="graph">The graph.</param> public void RemoveGraph(IRealTimeGraph graph) { - var sensor = graph.Tag as Graph; + var sensor = graph.Tag as TechMonitor; _controllers.Remove(sensor.Name); graph.InnerGraph.Dispose(); Graphs.Remove(graph); diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MonitoringViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MonitoringViewVM.cs index a0cba6b6b..99fbc5114 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MonitoringViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MonitoringViewVM.cs @@ -47,7 +47,7 @@ namespace Tango.MachineStudio.Developer.ViewModels if (!this.DesignMode) { Adapter = ObservablesEntitiesAdapter.Instance; - AvailableControllers = Adapter.Graphs.Select(x => new IOVM(x, x.Name)).ToObservableCollection(); + AvailableControllers = Adapter.TechMonitors.Select(x => new IOVM(x, x.Name)).ToObservableCollection(); } Controllers = new ObservableCollection<IOVM>(); |
