From afb6bbb2123932b3562e1af993eb847d8147bf58 Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Wed, 26 Feb 2020 18:25:52 +0200
Subject: Major Changes Regarding RML & SPOOL parameters changes!

---
 .../Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels')

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 efbcaf5ad..c5df65f59 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
@@ -1622,7 +1622,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
             {
                 LogManager.Log("Invalidating liquid factors, process parameters and process group history...");
 
-                _selectedRML = new RmlBuilder(_activeJobDbContext).Set(SelectedRML.Guid).WithAllParametersGroup().WithCAT(SelectedMachine.Guid).WithCCT().WithLiquidFactors().Build();
+                _selectedRML = new RmlBuilder(_activeJobDbContext).Set(SelectedRML.Guid).WithAllParametersGroup().WithCAT(SelectedMachine.Guid).WithCCT().WithLiquidFactors().WithSpools().Build();
 
                 _selectedRMLBeforeLiquidFactorsSaves = RmlDTO.FromObservable(_selectedRML);
 
-- 
cgit v1.3.1


From 1834b13df30bcf71aab363f9e504c4e79b3f2224 Mon Sep 17 00:00:00 2001
From: Victoria Plitt <Victoria.Plitt@twine-s.com>
Date: Thu, 5 Mar 2020 16:10:17 +0200
Subject: Machine Studio. Fixed lubricant  0 Volume when change to RGB mode.

---
 .../ViewModels/MainViewVM.cs                       | 17 ++++++
 .../Views/JobView.xaml                             |  2 +-
 .../Views/JobView.xaml.cs                          |  5 ++
 .../Converters/DateTimeToStringFormatConverter.cs  | 10 +--
 .../Models/JobRunModel.cs                          |  2 +
 .../ViewModels/JobRunsViewVM.cs                    |  5 +-
 .../Views/JobRunsView.xaml                         |  7 ++-
 .../Tango.Integration/Operation/MachineOperator.cs | 21 +++++++
 Software/Visual_Studio/Tango.sln                   | 55 +++++++++++++++--
 .../Utilities/Tango.CctOptimizer.CLI/App.config    | 28 +++++++++
 .../Utilities/Tango.CctOptimizer.CLI/Program.cs    | 36 +++++++++++
 .../Properties/AssemblyInfo.cs                     | 36 +++++++++++
 .../Tango.CctOptimizer.CLI.csproj                  | 71 ++++++++++++++++++++++
 .../Tango.CctOptimizer.CLI/packages.config         |  4 ++
 14 files changed, 283 insertions(+), 16 deletions(-)
 create mode 100644 Software/Visual_Studio/Utilities/Tango.CctOptimizer.CLI/App.config
 create mode 100644 Software/Visual_Studio/Utilities/Tango.CctOptimizer.CLI/Program.cs
 create mode 100644 Software/Visual_Studio/Utilities/Tango.CctOptimizer.CLI/Properties/AssemblyInfo.cs
 create mode 100644 Software/Visual_Studio/Utilities/Tango.CctOptimizer.CLI/Tango.CctOptimizer.CLI.csproj
 create mode 100644 Software/Visual_Studio/Utilities/Tango.CctOptimizer.CLI/packages.config

(limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels')

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 c5df65f59..9f0ea3423 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
@@ -1681,6 +1681,23 @@ namespace Tango.MachineStudio.Developer.ViewModels
 
         #endregion
 
+        #region Color Space
+
+        public void OnBrushStopColorSpaceChanged(BrushStop stop)
+        {
+            if (stop != null && stop.ColorSpace != null && stop.BrushColorSpace != BL.Enumerations.ColorSpaces.Volume)
+            {
+                var lubricant = stop.LiquidVolumes.SingleOrDefault(x => x.LiquidType == LiquidTypes.Lubricant);
+
+                if (lubricant != null)
+                {
+                    lubricant.Volume = 100;
+                }
+            }
+        }
+
+        #endregion
+
         #region Process Parameters Management
 
         /// <summary>
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 59ad6341d..ed8fc57fe 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
@@ -976,7 +976,7 @@
                                                                                                         <Image Source="../Images/colorspace.png" Width="24"></Image>
                                                                                                         <TextBlock VerticalAlignment="Center" Margin="5 0 0 0" FontSize="10">Color Space</TextBlock>
                                                                                                     </StackPanel>
-                                                                                                    <ComboBox ItemsSource="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.ColorSpaces}" SelectedItem="{Binding ColorSpace}" DisplayMemberPath="Name" Width="100" HorizontalAlignment="Left">
+                                                                                                    <ComboBox SelectionChanged="OnBrushStopColorSpace_SelectionChanged" ItemsSource="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.ColorSpaces}" SelectedItem="{Binding ColorSpace}" DisplayMemberPath="Name" Width="100" HorizontalAlignment="Left">
                                                                                                         <ComboBox.ItemContainerStyle>
                                                                                                             <Style TargetType="ComboBoxItem" BasedOn="{StaticResource {x:Type ComboBoxItem}}">
                                                                                                                 <Setter Property="Background" Value="{StaticResource WhiteBrush100}"></Setter>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml.cs
index a4a8fdcf4..94c1ed802 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml.cs
@@ -281,5 +281,10 @@ namespace Tango.MachineStudio.Developer.Views
         {
             listStops.SelectedItem = (sender as ListBoxItem).DataContext;
         }
+
+        private void OnBrushStopColorSpace_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            _vm.OnBrushStopColorSpaceChanged((sender as ComboBox).DataContext as BrushStop);
+        }
     }
 }
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Converters/DateTimeToStringFormatConverter.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Converters/DateTimeToStringFormatConverter.cs
index 79b8cb92e..6b5154ce3 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Converters/DateTimeToStringFormatConverter.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Converters/DateTimeToStringFormatConverter.cs
@@ -12,12 +12,14 @@ namespace Tango.MachineStudio.Statistics.Converters
     {
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
-            if(value is DateTime)
+            if (value != null)
             {
-                DateTime date = (DateTime)value;
-                return date.ToLocalTime().ToString(@"hh\:mm\:ss");
+                return ((TimeSpan)value).ToString(@"hh\:mm\:ss");
+            }
+            else
+            {
+                return TimeSpan.FromSeconds(0).ToString(@"hh\:mm\:ss");
             }
-            return "";
         }
 
         public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Models/JobRunModel.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Models/JobRunModel.cs
index 2bf3a42a4..28d51ab47 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Models/JobRunModel.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Models/JobRunModel.cs
@@ -19,6 +19,8 @@ namespace Tango.MachineStudio.Statistics.Models
 
         public TimeSpan? HeatingDuration { get; set; }
 
+        public RmlModel Rml { get; set; }
+
         public void Init()
         {
             if (JobRun.HeatingStartDate != null)
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/ViewModels/JobRunsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/ViewModels/JobRunsViewVM.cs
index 567867a80..a51d18909 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/ViewModels/JobRunsViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/ViewModels/JobRunsViewVM.cs
@@ -313,7 +313,7 @@ namespace Tango.MachineStudio.Statistics.ViewModels
                         DateTime endUtc = EndSelectedDate.ToUniversalTime() + offsetTime;
                         string jobName = SelectedJob == null ? "" : SelectedJob.Name;
 
-                        var runs = await new JobRunsCollectionBuilder(db).Set(x => x.ActualStartDate <= DbFunctions.TruncateTime(endUtc) && x.ActualStartDate >= DbFunctions.TruncateTime(startUtc.Date))
+                        var runs = await new JobRunsCollectionBuilder(db).Set(x => x.StartDate <= DbFunctions.TruncateTime(endUtc) && x.StartDate >= DbFunctions.TruncateTime(startUtc.Date))
                         .WithMachines(SelectedMachines.SynchedSource.ToList())
                         .WithJobSource(JobRunSelectedSources.SynchedSource)
                         .WithJobStatus(JobRunSelectedStatuses.SynchedSource)
@@ -329,7 +329,8 @@ namespace Tango.MachineStudio.Statistics.ViewModels
                             JobRun = x,
                             Machine = _allMachines.FirstOrDefault(y => y.Guid == x.MachineGuid),
                             User = _allUsers.SingleOrDefault(y => y.Guid == x.UserGuid),
-                        }).ToList();
+                            Rml = _rmlsModels.SingleOrDefault(y => y.Guid == x.RmlGuid)
+                        }).OrderByDescending(x => x.JobRun.StartDate).ToList();
 
                         modelList.ForEach(x => x.Init());
                         JobRuns = modelList.ToObservableCollection();
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Views/JobRunsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Views/JobRunsView.xaml
index 82043ae72..71e44465a 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Views/JobRunsView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Views/JobRunsView.xaml
@@ -433,11 +433,12 @@
                 <DataGridTextColumn Header="Machine" Binding="{Binding Machine.SerialNumber}" Width="100" ></DataGridTextColumn>
                 <DataGridTextColumn Header="User" Binding="{Binding User.Contact.FullName}" Width="100" ElementStyle="{StaticResource WrapText}" />
                 <DataGridTextColumn Header="Job Name" Binding="{Binding JobRun.JobName}" Width="100" ElementStyle="{StaticResource WrapText}"/>
+                <DataGridTextColumn Header="Thread" Binding="{Binding Rml.Name}" Width="80" ElementStyle="{StaticResource WrapText}"/>
                 <DataGridTextColumn Header="Length" Binding="{Binding JobRun.JobLength, StringFormat={}{0:0.00}}" Width="60" />
                 <DataGridTextColumn Header="Source" Binding="{Binding JobRun.Source, Converter={StaticResource EnumToDescriptionConverter}}" Width="60" />
-                <DataGridTextColumn Header="Upload &#10;Duration" Binding="{Binding UploadDuration, Converter={StaticResource DateTimeToStringFormatConverter}, FallbackValue=5}" Width="90"/>
-                <DataGridTextColumn Header="Heating &#10;Duration" Binding="{Binding HeatingDuration, Converter={StaticResource DateTimeToStringFormatConverter}, FallbackValue=5}" Width="90" />
-                <DataGridTextColumn Header="Start Time" Binding="{Binding JobRun.ActualStartDate, Converter={StaticResource DateTimeUTCToShortDateTimeConverter}}" Width="90" />
+                <DataGridTextColumn Header="Upload &#10;Duration" Binding="{Binding UploadDuration, Converter={StaticResource DateTimeToStringFormatConverter}, FallbackValue='N/A',TargetNullValue='N/A'}" Width="90"/>
+                <DataGridTextColumn Header="Heating &#10;Duration" Binding="{Binding HeatingDuration, Converter={StaticResource DateTimeToStringFormatConverter}, FallbackValue='N/A',TargetNullValue='N/A'}" Width="90" />
+                <DataGridTextColumn Header="Start Time" Binding="{Binding JobRun.ActualStartDate, Converter={StaticResource DateTimeUTCToShortDateTimeConverter}}" Width="95" />
                 <DataGridTextColumn Header="IsGradient" Binding="{Binding JobRun.IsGradient}" Width="70" />
                 <DataGridTextColumn Header="GR" Binding="{Binding JobRun.GradientResolutionCm}" Width="30" />
                 <DataGridTextColumn Header="Status" Binding="{Binding JobRun.JobRunStatus, Converter={StaticResource EnumToDescriptionConverter}}" Width="70"/>
diff --git a/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
index d020fd2a6..96c8e5ccf 100644
--- a/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
+++ b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
@@ -2174,6 +2174,27 @@ namespace Tango.Integration.Operation
                     job.NumberOfUnits = 1;
                 }
 
+                if (job.EnableLubrication)
+                {
+                    try
+                    {
+                        foreach (var stop in job.Segments.SelectMany(x => x.BrushStops).Where(x => x.BrushColorSpace != ColorSpaces.Volume))
+                        {
+                            var lubricantVolume = stop.LiquidVolumes.SingleOrDefault(x => x.IdsPack != null && x.IdsPack.LiquidType != null && x.LiquidType == LiquidTypes.Lubricant);
+
+                            if (lubricantVolume != null)
+                            {
+                                lubricantVolume.Volume = 100;
+                            }
+                        }
+                    }
+                    catch (Exception ex)
+                    {
+                        System.Diagnostics.Debugger.Break();
+                        LogManager.Log(ex, "Error in setting automatic lubrication volumes.");
+                    }
+                }
+
                 //Modify transparent/white brush stops. (Transparent/white stops should be all zeros and 100% TI)
                 foreach (var stop in job.Segments.SelectMany(x => x.BrushStops).Where(x => x.IsTransparent || x.IsWhite).ToList())
                 {
diff --git a/Software/Visual_Studio/Tango.sln b/Software/Visual_Studio/Tango.sln
index b15de90d6..156a607f3 100644
--- a/Software/Visual_Studio/Tango.sln
+++ b/Software/Visual_Studio/Tango.sln
@@ -361,6 +361,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tango.Console", "Tango.Cons
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tango.RemoteDesktop", "Tango.RemoteDesktop\Tango.RemoteDesktop.csproj", "{A78068D4-2061-4376-8EDE-583D8D880DEC}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tango.CctOptimizer.CLI", "Utilities\Tango.CctOptimizer.CLI\Tango.CctOptimizer.CLI.csproj", "{69168924-9AA8-447D-AD64-F07DBF4F0909}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		AppVeyor|Any CPU = AppVeyor|Any CPU
@@ -6413,6 +6415,46 @@ Global
 		{A78068D4-2061-4376-8EDE-583D8D880DEC}.Release|x64.Build.0 = Release|Any CPU
 		{A78068D4-2061-4376-8EDE-583D8D880DEC}.Release|x86.ActiveCfg = Release|Any CPU
 		{A78068D4-2061-4376-8EDE-583D8D880DEC}.Release|x86.Build.0 = Release|Any CPU
+		{69168924-9AA8-447D-AD64-F07DBF4F0909}.AppVeyor|Any CPU.ActiveCfg = Release|Any CPU
+		{69168924-9AA8-447D-AD64-F07DBF4F0909}.AppVeyor|Any CPU.Build.0 = Release|Any CPU
+		{69168924-9AA8-447D-AD64-F07DBF4F0909}.AppVeyor|ARM.ActiveCfg = Release|Any CPU
+		{69168924-9AA8-447D-AD64-F07DBF4F0909}.AppVeyor|ARM.Build.0 = Release|Any CPU
+		{69168924-9AA8-447D-AD64-F07DBF4F0909}.AppVeyor|ARM64.ActiveCfg = Release|Any CPU
+		{69168924-9AA8-447D-AD64-F07DBF4F0909}.AppVeyor|ARM64.Build.0 = Release|Any CPU
+		{69168924-9AA8-447D-AD64-F07DBF4F0909}.AppVeyor|x64.ActiveCfg = Release|Any CPU
+		{69168924-9AA8-447D-AD64-F07DBF4F0909}.AppVeyor|x64.Build.0 = Release|Any CPU
+		{69168924-9AA8-447D-AD64-F07DBF4F0909}.AppVeyor|x86.ActiveCfg = Release|Any CPU
+		{69168924-9AA8-447D-AD64-F07DBF4F0909}.AppVeyor|x86.Build.0 = Release|Any CPU
+		{69168924-9AA8-447D-AD64-F07DBF4F0909}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{69168924-9AA8-447D-AD64-F07DBF4F0909}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{69168924-9AA8-447D-AD64-F07DBF4F0909}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{69168924-9AA8-447D-AD64-F07DBF4F0909}.Debug|ARM.Build.0 = Debug|Any CPU
+		{69168924-9AA8-447D-AD64-F07DBF4F0909}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{69168924-9AA8-447D-AD64-F07DBF4F0909}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{69168924-9AA8-447D-AD64-F07DBF4F0909}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{69168924-9AA8-447D-AD64-F07DBF4F0909}.Debug|x64.Build.0 = Debug|Any CPU
+		{69168924-9AA8-447D-AD64-F07DBF4F0909}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{69168924-9AA8-447D-AD64-F07DBF4F0909}.Debug|x86.Build.0 = Debug|Any CPU
+		{69168924-9AA8-447D-AD64-F07DBF4F0909}.DefaultBuild|Any CPU.ActiveCfg = Debug|Any CPU
+		{69168924-9AA8-447D-AD64-F07DBF4F0909}.DefaultBuild|Any CPU.Build.0 = Debug|Any CPU
+		{69168924-9AA8-447D-AD64-F07DBF4F0909}.DefaultBuild|ARM.ActiveCfg = Debug|Any CPU
+		{69168924-9AA8-447D-AD64-F07DBF4F0909}.DefaultBuild|ARM.Build.0 = Debug|Any CPU
+		{69168924-9AA8-447D-AD64-F07DBF4F0909}.DefaultBuild|ARM64.ActiveCfg = Debug|Any CPU
+		{69168924-9AA8-447D-AD64-F07DBF4F0909}.DefaultBuild|ARM64.Build.0 = Debug|Any CPU
+		{69168924-9AA8-447D-AD64-F07DBF4F0909}.DefaultBuild|x64.ActiveCfg = Debug|Any CPU
+		{69168924-9AA8-447D-AD64-F07DBF4F0909}.DefaultBuild|x64.Build.0 = Debug|Any CPU
+		{69168924-9AA8-447D-AD64-F07DBF4F0909}.DefaultBuild|x86.ActiveCfg = Debug|Any CPU
+		{69168924-9AA8-447D-AD64-F07DBF4F0909}.DefaultBuild|x86.Build.0 = Debug|Any CPU
+		{69168924-9AA8-447D-AD64-F07DBF4F0909}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{69168924-9AA8-447D-AD64-F07DBF4F0909}.Release|Any CPU.Build.0 = Release|Any CPU
+		{69168924-9AA8-447D-AD64-F07DBF4F0909}.Release|ARM.ActiveCfg = Release|Any CPU
+		{69168924-9AA8-447D-AD64-F07DBF4F0909}.Release|ARM.Build.0 = Release|Any CPU
+		{69168924-9AA8-447D-AD64-F07DBF4F0909}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{69168924-9AA8-447D-AD64-F07DBF4F0909}.Release|ARM64.Build.0 = Release|Any CPU
+		{69168924-9AA8-447D-AD64-F07DBF4F0909}.Release|x64.ActiveCfg = Release|Any CPU
+		{69168924-9AA8-447D-AD64-F07DBF4F0909}.Release|x64.Build.0 = Release|Any CPU
+		{69168924-9AA8-447D-AD64-F07DBF4F0909}.Release|x86.ActiveCfg = Release|Any CPU
+		{69168924-9AA8-447D-AD64-F07DBF4F0909}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -6534,14 +6576,15 @@ Global
 		{D6F7D31D-7F8C-45E2-AE0A-FBBD1F5F9D5F} = {004337EB-0761-4D30-B9F5-AE6E1CFC6013}
 		{834C81C3-09B5-45D7-BE12-E7D1E6655A7C} = {004337EB-0761-4D30-B9F5-AE6E1CFC6013}
 		{866B916A-207C-43F0-B403-7C4A820C2E11} = {4EE6DBA1-71BC-49E2-8DC7-266487E61050}
+		{69168924-9AA8-447D-AD64-F07DBF4F0909} = {5F6BBAA8-EAD0-4B18-97E5-55B4F56DD760}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		BuildVersion_UseGlobalSettings = False
-		BuildVersion_AssemblyInfoFilename = Properties\AssemblyInfo.cs
-		BuildVersion_StartDate = 2000/1/1
-		BuildVersion_UpdateFileVersion = False
-		BuildVersion_UpdateAssemblyVersion = True
-		BuildVersion_BuildVersioningStyle = None.None.Increment.DeltaBaseYearDayOfYear
 		SolutionGuid = {7986F7F4-A86A-4994-B1B6-0988D7F057B6}
+		BuildVersion_BuildVersioningStyle = None.None.Increment.DeltaBaseYearDayOfYear
+		BuildVersion_UpdateAssemblyVersion = True
+		BuildVersion_UpdateFileVersion = False
+		BuildVersion_StartDate = 2000/1/1
+		BuildVersion_AssemblyInfoFilename = Properties\AssemblyInfo.cs
+		BuildVersion_UseGlobalSettings = False
 	EndGlobalSection
 EndGlobal
diff --git a/Software/Visual_Studio/Utilities/Tango.CctOptimizer.CLI/App.config b/Software/Visual_Studio/Utilities/Tango.CctOptimizer.CLI/App.config
new file mode 100644
index 000000000..a46da65da
--- /dev/null
+++ b/Software/Visual_Studio/Utilities/Tango.CctOptimizer.CLI/App.config
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <configSections>
+    <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
+    <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
+  </configSections>
+  <startup>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
+  </startup>
+  <entityFramework>
+    <defaultConnectionFactory type="System.Data.Entity.Infrastructure.SqlConnectionFactory, EntityFramework" />
+    <providers>
+      <provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
+    </providers>
+  </entityFramework>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.IdentityModel.Clients.ActiveDirectory" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.0.5.0" newVersion="5.0.5.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Z.EntityFramework.Extensions" publicKeyToken="59b66d028979105b" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.50.0" newVersion="4.0.50.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
\ No newline at end of file
diff --git a/Software/Visual_Studio/Utilities/Tango.CctOptimizer.CLI/Program.cs b/Software/Visual_Studio/Utilities/Tango.CctOptimizer.CLI/Program.cs
new file mode 100644
index 000000000..06c960e13
--- /dev/null
+++ b/Software/Visual_Studio/Utilities/Tango.CctOptimizer.CLI/Program.cs
@@ -0,0 +1,36 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.BL;
+using Tango.BL.Entities;
+
+namespace Tango.CctOptimizer.CLI
+{
+    class Program
+    {
+        static void Main(string[] args)
+        {
+            using (ObservablesContext db = ObservablesContext.CreateDefault())
+            {
+                var notUsedCcts = db.Ccts.Where(x => x.Rmls.All(y=>y.Cct.FileName != x.FileName)).ToObservableCollection();
+                
+                foreach ( var cct in notUsedCcts)
+                {
+                    cct.DeleteCascadeAsync(db);
+                }
+                
+                Dictionary <string, List<Cct>> duplicates = db.Ccts.Where(x => x.Rmls.All(y => y.Cct.FileName == x.FileName)).GroupBy(x => x.FileName).Where(x => x.Count() > 1).ToDictionary(g=>g.Key, g => g.ToList());
+                foreach (var value in duplicates.Values)
+                {
+                    var res = db.Rmls.Where(x => value.All(y => y.Guid == x.CctGuid )).ToList();
+                    
+                }
+
+                db.SaveChanges();
+
+            }
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Utilities/Tango.CctOptimizer.CLI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Utilities/Tango.CctOptimizer.CLI/Properties/AssemblyInfo.cs
new file mode 100644
index 000000000..38926dca0
--- /dev/null
+++ b/Software/Visual_Studio/Utilities/Tango.CctOptimizer.CLI/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("Tango.CctOptimizer.CLI")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("Tango.CctOptimizer.CLI")]
+[assembly: AssemblyCopyright("Copyright ©  2020")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("69168924-9aa8-447d-ad64-f07dbf4f0909")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/Software/Visual_Studio/Utilities/Tango.CctOptimizer.CLI/Tango.CctOptimizer.CLI.csproj b/Software/Visual_Studio/Utilities/Tango.CctOptimizer.CLI/Tango.CctOptimizer.CLI.csproj
new file mode 100644
index 000000000..14dd0b54b
--- /dev/null
+++ b/Software/Visual_Studio/Utilities/Tango.CctOptimizer.CLI/Tango.CctOptimizer.CLI.csproj
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{69168924-9AA8-447D-AD64-F07DBF4F0909}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>Tango.CctOptimizer.CLI</RootNamespace>
+    <AssemblyName>Tango.CctOptimizer.CLI</AssemblyName>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <Deterministic>true</Deterministic>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.dll</HintPath>
+    </Reference>
+    <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.SqlServer.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.ComponentModel.DataAnnotations" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Program.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="App.config" />
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\Tango.BL\Tango.BL.csproj">
+      <Project>{f441feee-322a-4943-b566-110e12fd3b72}</Project>
+      <Name>Tango.BL</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Tango.Core\Tango.Core.csproj">
+      <Project>{a34ee0f0-649d-41c8-8489-b6f1cc6924ee}</Project>
+      <Name>Tango.Core</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/Utilities/Tango.CctOptimizer.CLI/packages.config b/Software/Visual_Studio/Utilities/Tango.CctOptimizer.CLI/packages.config
new file mode 100644
index 000000000..b3daf0d6c
--- /dev/null
+++ b/Software/Visual_Studio/Utilities/Tango.CctOptimizer.CLI/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="EntityFramework" version="6.2.0" targetFramework="net461" />
+</packages>
\ No newline at end of file
-- 
cgit v1.3.1