From d27a0bac82a94b9f7cc380b03cc4c73012aaacd7 Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Wed, 7 Feb 2018 16:18:30 +0200 Subject: Changes Sensors Table to IOS. Added IO TYPE field for IOS Table. --- .../Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs | 10 +++++----- .../Modules/Tango.MachineStudio.Developer/Views/MainView.xaml | 2 +- .../Tango.MachineStudio.Developer/Views/MainView.xaml.cs | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer') 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 e1d4bc7fa..100880cec 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 _availableSensors; + private ObservableCollection _availableSensors; /// /// Gets or sets the available sensors. /// - public ObservableCollection AvailableSensors + public ObservableCollection AvailableSensors { get { return _availableSensors; } set { _availableSensors = value; RaisePropertyChangedAuto(); } @@ -475,7 +475,7 @@ namespace Tango.MachineStudio.Developer.ViewModels if (!this.DesignMode) { Adapter = ObservablesEntitiesAdapter.Instance; - AvailableSensors = Adapter.Sensors.ToObservableCollection(); + AvailableSensors = Adapter.Ios.ToObservableCollection(); } Graphs = new ObservableCollection(); @@ -1124,7 +1124,7 @@ namespace Tango.MachineStudio.Developer.ViewModels /// Add sensor graph from available sensors to displayed graphs. /// /// The sensor. - public void OnDropAvailableSensor(Sensor sensor) + public void OnDropAvailableSensor(Io sensor) { if (Graphs.Count < 8) { @@ -1208,7 +1208,7 @@ namespace Tango.MachineStudio.Developer.ViewModels /// The graph. public void RemoveGraph(IRealTimeGraph graph) { - var sensor = graph.Tag as Sensor; + var sensor = graph.Tag as Io; _controllers.Remove(sensor.Name); graph.InnerGraph.Dispose(); Graphs.Remove(graph); diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml index 820c5bb18..f92f96160 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml @@ -1796,7 +1796,7 @@ - + diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml.cs index 1df4728d3..9a0a4dc0e 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml.cs @@ -106,9 +106,9 @@ namespace Tango.MachineStudio.Developer.Views private void OnDropAvailableSensor(object sender, DropEventArgs e) { - if (e.Draggable.DataContext is Sensor) + if (e.Draggable.DataContext is Io) { - _vm.OnDropAvailableSensor(e.Draggable.DataContext as Sensor); + _vm.OnDropAvailableSensor(e.Draggable.DataContext as Io); } } -- cgit v1.3.1