Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango

1 files changed, 28 insertions, 0 deletions

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 a413223c3..38d289c58 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
@@ -49,6 +49,12 @@
     <Reference Include="MaterialDesignThemes.Wpf, Version=2.3.1.953, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\MaterialDesignThemes.2.3.1.953\lib\net45\MaterialDesignThemes.Wpf.dll</HintPath>
     </Reference>
+    <Reference Include="OxyPlot">
+      <HintPath>..\..\..\packages\OxyPlot.Core.2.0.0\lib\net45\OxyPlot.dll</HintPath>
+    </Reference>
+    <Reference Include="OxyPlot.Wpf">
+      <HintPath>..\..\..\packages\OxyPlot.Wpf.2.0.0\lib\net45\OxyPlot.Wpf.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Data" />
@@ -73,7 +79,9 @@
       <Link>GlobalVersionInfo.cs</Link>
     </Compile>
     <Compile Include="Contracts\IMainView.cs" />
+    <Compile Include="Models\CalibrationMeasurementModel.cs" />
     <Compile Include="Models\CctModel.cs" />
+    <Compile Include="Models\ColorLinearizationModel.cs" />
     <Compile Include="RMLModule.cs" />
     <Compile Include="Properties\AssemblyInfo.cs">
       <SubType>Code</SubType>
@@ -93,16 +101,21 @@
     <Compile Include="ViewModels\CalibrationDataPointVM.cs" />
     <Compile Include="ViewModels\CalibrationDataViewVM.cs" />
     <Compile Include="ViewModels\CalibrationDataVM.cs" />
+    <Compile Include="ViewModels\ColorCalibrationViewVM.cs" />
     <Compile Include="ViewModels\ColorConversionViewVM.cs" />
     <Compile Include="ViewModels\LiquidVolumeVM.cs" />
     <Compile Include="ViewModels\MainViewVM.cs" />
     <Compile Include="ViewModels\RgbVM.cs" />
+    <Compile Include="ViewModels\RmlDeleteDialogViewVM.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\ColorCalibrationView.xaml.cs">
+      <DependentUpon>ColorCalibrationView.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Views\ColorConversionView.xaml.cs">
       <DependentUpon>ColorConversionView.xaml</DependentUpon>
     </Compile>
@@ -112,6 +125,9 @@
     <Compile Include="Views\ProcessParametersView.xaml.cs">
       <DependentUpon>ProcessParametersView.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Views\RmlDeleteDialogView.xaml.cs">
+      <DependentUpon>RmlDeleteDialogView.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Views\RmlsView.xaml.cs">
       <DependentUpon>RmlsView.xaml</DependentUpon>
     </Compile>
@@ -151,6 +167,10 @@
       <Project>{40085232-aced-4cbe-945b-90ba8153c151}</Project>
       <Name>Tango.BrushPicker</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\Tango.ColorCalibration\Tango.ColorCalibration.csproj">
+      <Project>{b60c695c-61e8-4091-b506-4c45349c04aa}</Project>
+      <Name>Tango.ColorCalibration</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\Tango.ColorConversion\Tango.ColorConversion.csproj">
       <Project>{b4fe6485-4161-4b36-bc08-67e0b53d01b7}</Project>
       <Name>Tango.ColorConversion</Name>
@@ -212,6 +232,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="Views\ColorCalibrationView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Views\ColorConversionView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -224,6 +248,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Views\RmlDeleteDialogView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Views\RmlsView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>