Working Developer Module...

5 files changed, 0 insertions, 78 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters/DbRmlViewToEntityConverter.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters/DbRmlViewToEntityConverter.cs
deleted file mode 100644
index 1fe3e5ab0..000000000
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters/DbRmlViewToEntityConverter.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Data;
-using Tango.Integration.Observables;
-using Tango.MachineStudio.Developer.ViewModels;
-
-namespace Tango.MachineStudio.Developer.Converters
-{
-    public class DbRmlViewToEntityConverter : IValueConverter
-    {
-        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            if (value != null)
-            {
-                DBViewContextWrapper<Rml> db = value as DBViewContextWrapper<Rml>;
-                return db;
-            }
-
-            return null;
-
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            if (value != null)
-            {
-                Rml entity = value as Rml;
-                return new DBViewContextWrapper<Rml>(entity);
-            }
-
-            return null;
-        }
-    }
-}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Tango.MachineStudio.Developer.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Tango.MachineStudio.Developer.csproj
index f986219e2..3253fc551 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Tango.MachineStudio.Developer.csproj
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Tango.MachineStudio.Developer.csproj
@@ -108,7 +108,6 @@
     <Compile Include="Converters\BrushStopToColorConverter.cs" />
     <Compile Include="Converters\BrushStopToOffsetLimitConverter.cs" />
     <Compile Include="Converters\BrushStopToOffsetValueConverter.cs" />
-    <Compile Include="Converters\DbRmlViewToEntityConverter.cs" />
     <Compile Include="Converters\InkVolumeToLiquidRmlFactor.cs" />
     <Compile Include="Converters\JobProgressToPositionConverter.cs" />
     <Compile Include="Converters\JobToColumnDefinitionsConverter.cs" />
@@ -123,7 +122,6 @@
     <Compile Include="Navigation\DeveloperNavigationManager.cs" />
     <Compile Include="Navigation\DeveloperNavigationView.cs" />
     <Compile Include="ViewModelLocator.cs" />
-    <Compile Include="ViewModels\DBViewContextWrapper.cs" />
     <Compile Include="ViewModels\IOVM.cs" />
     <Compile Include="ViewModels\MainViewVM.cs" />
     <Compile Include="Views\DeveloperView.xaml.cs">
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/DBViewContextWrapper.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/DBViewContextWrapper.cs
deleted file mode 100644
index 21611a493..000000000
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/DBViewContextWrapper.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Tango.Integration.Observables;
-
-namespace Tango.MachineStudio.Developer.ViewModels
-{
-    public class DBViewContextWrapper<T> where T : class, IObservableEntity
-    {
-        public T EditEntity { get; set; }
-
-        public ObservablesEntitiesAdapter Adapter { get; set; }
-
-        public DBViewContextWrapper()
-        {
-            Adapter = ObservablesEntitiesAdapter.Instance;
-        }
-
-        public DBViewContextWrapper(T entity) : this()
-        {
-            EditEntity = entity;
-        }
-
-        public static implicit operator DBViewContextWrapper<T>(T entity)
-        {
-            return new DBViewContextWrapper<T>(entity);
-        }
-
-        public static implicit operator T(DBViewContextWrapper<T> instance)
-        {
-            return instance.EditEntity;
-        }
-    }
-}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/DeveloperView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/DeveloperView.xaml
index 5dbbde482..276f6c99a 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/DeveloperView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/DeveloperView.xaml
@@ -18,7 +18,6 @@
         <converters:BooleanToVisibilityInverseConverter x:Key="BooleanToVisibilityInverseConverter" />
         <converters:ColorToIntegerConverter x:Key="ColorToIntegerConverter"></converters:ColorToIntegerConverter>
         <converters:BooleanInverseConverter x:Key="BooleanInverseConverter" />
-        <localConverters:DbRmlViewToEntityConverter x:Key="DbRmlViewToEntityConverter"></localConverters:DbRmlViewToEntityConverter>
         <converters:NullObjectToBooleanConverter x:Key="NullObjectToBooleanConverter"></converters:NullObjectToBooleanConverter>
         <converters:GreaterThanToBooleanConverter x:Key="GreaterThanToBooleanConverter"></converters:GreaterThanToBooleanConverter>
         <converters:SmallerThanToBooleanConverter x:Key="SmallerThanToBooleanConverter"></converters:SmallerThanToBooleanConverter>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml
index 69f0fed5c..580e2438b 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml
@@ -38,7 +38,6 @@
         <converters:BooleanToVisibilityInverseConverter x:Key="BooleanToVisibilityInverseConverter" />
         <converters:ColorToIntegerConverter x:Key="ColorToIntegerConverter"></converters:ColorToIntegerConverter>
         <converters:BooleanInverseConverter x:Key="BooleanInverseConverter" />
-        <localConverters:DbRmlViewToEntityConverter x:Key="DbRmlViewToEntityConverter"></localConverters:DbRmlViewToEntityConverter>
         <converters:NullObjectToBooleanConverter x:Key="NullObjectToBooleanConverter"></converters:NullObjectToBooleanConverter>
         <converters:GreaterThanToBooleanConverter x:Key="GreaterThanToBooleanConverter"></converters:GreaterThanToBooleanConverter>
         <converters:SmallerThanToBooleanConverter x:Key="SmallerThanToBooleanConverter"></converters:SmallerThanToBooleanConverter>