From b34d8641f72e7b92958ea17d10ff15c29d37c464 Mon Sep 17 00:00:00 2001
From: Victoria Plitt <Victoria.Plitt@twine-s.com>
Date: Mon, 16 Sep 2019 11:40:14 +0300
Subject: Dropping Machine Studio ColorLab Module. Move to RML module.

Related Work Items: #1168
---
 .../Tango.MachineStudio.RML.csproj                 | 54 ++++++++++++++++++++--
 1 file changed, 50 insertions(+), 4 deletions(-)

(limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Tango.MachineStudio.RML.csproj')

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Tango.MachineStudio.RML.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Tango.MachineStudio.RML.csproj
index fc05f3c16..6741a1dff 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Tango.MachineStudio.RML.csproj
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Tango.MachineStudio.RML.csproj
@@ -90,13 +90,28 @@
     </Compile>
     <Compile Include="ViewModelLocator.cs" />
     <Compile Include="ViewModels\AddLiquidFactorViewVM.cs" />
+    <Compile Include="ViewModels\CalibrationDataPointVM.cs" />
+    <Compile Include="ViewModels\CalibrationDataViewVM.cs" />
+    <Compile Include="ViewModels\CalibrationDataVM.cs" />
+    <Compile Include="ViewModels\ColorConversionViewVM.cs" />
+    <Compile Include="ViewModels\LiquidVolumeVM.cs" />
     <Compile Include="ViewModels\MainViewVM.cs" />
+    <Compile Include="ViewModels\RgbVM.cs" />
     <Compile Include="Views\AddLiquidFactorView.xaml.cs">
       <DependentUpon>AddLiquidFactorView.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Views\CalibrationDataView.xaml.cs">
+      <DependentUpon>CalibrationDataView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\ColorConversionView.xaml.cs">
+      <DependentUpon>ColorConversionView.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Views\MainView.xaml.cs">
       <DependentUpon>MainView.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Views\ProcessParametersView.xaml.cs">
+      <DependentUpon>ProcessParametersView.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Views\RmlsView.xaml.cs">
       <DependentUpon>RmlsView.xaml</DependentUpon>
     </Compile>
@@ -115,10 +130,22 @@
     </None>
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\..\SideChains\ColorMine\ColorMine.csproj">
+      <Project>{37e4ceab-b54b-451f-b535-04cf7da9c459}</Project>
+      <Name>ColorMine</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\Tango.BL\Tango.BL.csproj">
       <Project>{f441feee-322a-4943-b566-110e12fd3b72}</Project>
       <Name>Tango.BL</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\Tango.BrushPicker\Tango.BrushPicker.csproj">
+      <Project>{40085232-aced-4cbe-945b-90ba8153c151}</Project>
+      <Name>Tango.BrushPicker</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Tango.ColorConversion\Tango.ColorConversion.csproj">
+      <Project>{b4fe6485-4161-4b36-bc08-67e0b53d01b7}</Project>
+      <Name>Tango.ColorConversion</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\Tango.Core\Tango.Core.csproj">
       <Project>{a34ee0f0-649d-41c8-8489-b6f1cc6924ee}</Project>
       <Name>Tango.Core</Name>
@@ -135,6 +162,10 @@
       <Project>{b112d89a-a106-41ae-a0c1-4abc84c477f5}</Project>
       <Name>Tango.DragAndDrop</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\Tango.Hive\Tango.Hive.csproj">
+      <Project>{942134ac-6ea2-4500-8f22-0f739b70a05f}</Project>
+      <Name>Tango.Hive</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\Tango.Logging\Tango.Logging.csproj">
       <Project>{bc932dbd-7cdb-488c-99e4-f02cf441f55e}</Project>
       <Name>Tango.Logging</Name>
@@ -155,10 +186,6 @@
       <Project>{cb0b0aa2-bb24-4bca-a720-45e397684e12}</Project>
       <Name>Tango.MachineStudio.Common</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Tango.MachineStudio.ColorLab\Tango.MachineStudio.ColorLab.csproj">
-      <Project>{4d183aca-552b-4135-ae81-7c5a8e5fc3b1}</Project>
-      <Name>Tango.MachineStudio.ColorLab</Name>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Resource Include="Images\rml-module.jpg" />
@@ -168,10 +195,22 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Views\CalibrationDataView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\ColorConversionView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Views\MainView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Views\ProcessParametersView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Views\RmlsView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -190,6 +229,13 @@
   <ItemGroup>
     <Resource Include="Images\data-table.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\arrow-long-down.png" />
+    <Resource Include="Images\arrow-long-left.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\arrow-long-right.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>
-- 
cgit v1.3.1