aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views
diff options
context:
space:
mode:
authorRoy Ben-Shabat <Roy@Twine-s.com>2018-02-08 13:11:43 +0200
committerRoy Ben-Shabat <Roy@Twine-s.com>2018-02-08 13:11:43 +0200
commit4cf9cd72047bbb5a1c83255721870d29bbdb03f7 (patch)
tree62f9088a8342270eb585015a75cd171a04c390bb /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views
parent0907f58b81e29d9c0f415e2c7660ad60787f281b (diff)
downloadTango-4cf9cd72047bbb5a1c83255721870d29bbdb03f7.tar.gz
Tango-4cf9cd72047bbb5a1c83255721870d29bbdb03f7.zip
Added new tech tables..
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views')
-rw-r--r--Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml2
-rw-r--r--Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml.cs4
2 files changed, 3 insertions, 3 deletions
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 9f0927c63..4cbae2941 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:Graph}">
+ <DataTemplate DataType="{x:Type observables:TechMonitor}">
<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 3922d80b2..d47a7ecb1 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 Graph)
+ if (e.Draggable.DataContext is TechMonitor)
{
- _vm.OnDropAvailableGraph(e.Draggable.DataContext as Graph);
+ _vm.OnDropAvailableGraph(e.Draggable.DataContext as TechMonitor);
}
}