aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels
diff options
context:
space:
mode:
authorRoy Ben-Shabat <Roy@Twine-s.com>2018-03-01 16:05:30 +0200
committerRoy Ben-Shabat <Roy@Twine-s.com>2018-03-01 16:05:30 +0200
commit54c192aac4ce2a49b77a87416b492023f981c856 (patch)
tree25b9caa4f0dfaa1ab3debda13e80357cda0b28ee /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels
parent6e2eeb6829b2b1bf5e1e5334b9dad84f10ce2bc1 (diff)
downloadTango-54c192aac4ce2a49b77a87416b492023f981c856.tar.gz
Tango-54c192aac4ce2a49b77a87416b492023f981c856.zip
Moved Dispensing and Observables to Tango.BL !!!
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels')
-rw-r--r--Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs6
-rw-r--r--Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/SensorsViewVM.cs3
2 files changed, 5 insertions, 4 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs
index 6106e47eb..67db6fb93 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs
@@ -15,8 +15,7 @@ using System.Windows;
using System.Windows.Media;
using Tango.Core.Helpers;
using Tango.Editors;
-using Tango.Integration.Observables;
-using Tango.Integration.Observables.Enumerations;
+using Tango.BL.Observables;
using Tango.Integration.Operators;
using Tango.MachineStudio.Common.Diagnostics;
using Tango.MachineStudio.Common.Notifications;
@@ -27,6 +26,7 @@ using Tango.MachineStudio.Technician.TechItems;
using Tango.PMR.Diagnostics;
using Tango.Settings;
using Tango.SharedUI;
+using Tango.Integration.Services;
namespace Tango.MachineStudio.Technician.ViewModels
{
@@ -206,7 +206,7 @@ namespace Tango.MachineStudio.Technician.ViewModels
/// </summary>
/// <param name="sender">The sender.</param>
/// <param name="machine">The machine.</param>
- private void ApplicationManager_ConnectedMachineChanged(object sender, Integration.Services.IExternalBridgeClient machine)
+ private void ApplicationManager_ConnectedMachineChanged(object sender, IExternalBridgeClient machine)
{
MachineOperator = machine;
}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/SensorsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/SensorsViewVM.cs
index 4480e353b..0836501ef 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/SensorsViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/SensorsViewVM.cs
@@ -5,6 +5,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Tango.Integration.Operators;
+using Tango.Integration.Services;
using Tango.Logging;
using Tango.MachineStudio.Common.Modules;
using Tango.MachineStudio.Common.StudioApplication;
@@ -116,7 +117,7 @@ namespace Tango.MachineStudio.Technician.ViewModels
/// </summary>
/// <param name="sender">The sender.</param>
/// <param name="machineOperator">The machine operator.</param>
- private void ApplicationManager_ConnectedMachineChanged(object sender, Integration.Services.IExternalBridgeClient machineOperator)
+ private void ApplicationManager_ConnectedMachineChanged(object sender, IExternalBridgeClient machineOperator)
{
InitializeConnectedMachine(machineOperator);
}