Modified IO Table To Graphs. Starting to IO's to separate components...

5 files changed, 12 insertions, 13 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 83eee1333..e2a4fae0e 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 Io _io;
-        public Io IO
+        private Graph _io;
+        public Graph 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(Io io, String name)
+        public IOVM(Graph 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 cf3cbab7d..e1166a9bc 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
@@ -28,7 +28,6 @@ using Tango.Transport;
 using Tango.Integration.Printing;
 using Tango.Integration.Diagnostics;
 using Microsoft.Win32;
-using Tango.Integration.Observables.Enumerations;
 
 namespace Tango.MachineStudio.Developer.ViewModels
 {
@@ -210,11 +209,11 @@ namespace Tango.MachineStudio.Developer.ViewModels
             set { _isSideBarOpened = value; RaisePropertyChangedAuto(); }
         }
 
-        private ObservableCollection<Io> _availableGraphs;
+        private ObservableCollection<Graph> _availableGraphs;
         /// <summary>
         /// Gets or sets the available sensors.
         /// </summary>
-        public ObservableCollection<Io> AvailableGraphs
+        public ObservableCollection<Graph> AvailableGraphs
         {
             get { return _availableGraphs; }
             set { _availableGraphs = value; RaisePropertyChangedAuto(); }
@@ -476,7 +475,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
             if (!this.DesignMode)
             {
                 Adapter = ObservablesEntitiesAdapter.Instance;
-                AvailableGraphs = Adapter.Ios.Where(x => (IOType)x.Type == IOType.Input || (IOType)x.Type == IOType.InputOutput).ToObservableCollection();
+                AvailableGraphs = Adapter.Graphs.ToObservableCollection();
             }
 
             Graphs = new ObservableCollection<IRealTimeGraph>();
@@ -1125,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(Io sensor)
+        public void OnDropAvailableGraph(Graph sensor)
         {
             if (Graphs.Count < 8)
             {
@@ -1209,7 +1208,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
         /// <param name="graph">The graph.</param>
         public void RemoveGraph(IRealTimeGraph graph)
         {
-            var sensor = graph.Tag as Io;
+            var sensor = graph.Tag as Graph;
             _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 8edbd7b83..a0cba6b6b 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.Ios.Select(x => new IOVM(x, x.Name)).ToObservableCollection();
+                AvailableControllers = Adapter.Graphs.Select(x => new IOVM(x, x.Name)).ToObservableCollection();
             }
 
             Controllers = new ObservableCollection<IOVM>();
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 1ef6928f5..9f0927c63 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 @@
                                                         </ItemsPanelTemplate>
                                                     </ItemsControl.ItemsPanel>
                                                     <ItemsControl.ItemTemplate>
-                                                        <DataTemplate DataType="{x:Type observables:Io}">
+                                                        <DataTemplate DataType="{x:Type observables:Graph}">
                                                             <Border dragAndDrop:DragAndDropService.Draggable="True" dragAndDrop:DragAndDropService.DraggingSurface="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DraggingSurface}" Margin="5" CornerRadius="3" Height="120" BorderThickness="1" BorderBrush="Silver" ClipToBounds="True">
                                                                 <Border.Background>
                                                                     <ImageBrush ImageSource="../Images/line_graph.png" Stretch="Fill"></ImageBrush>
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 e9111c86c..3922d80b2 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 OnDropAvailableGraph(object sender, DropEventArgs e)
         {
-            if (e.Draggable.DataContext is Io)
+            if (e.Draggable.DataContext is Graph)
             {
-                _vm.OnDropAvailableGraph(e.Draggable.DataContext as Io);
+                _vm.OnDropAvailableGraph(e.Draggable.DataContext as Graph);
             }
         }