diff options
| author | Roy Ben-Shabat <Roy@Twine-s.com> | 2019-01-08 14:27:21 +0200 |
|---|---|---|
| committer | Roy Ben-Shabat <Roy@Twine-s.com> | 2019-01-08 14:27:21 +0200 |
| commit | e2bf9f578c3ed53d869744f94b020048ca806c6e (patch) | |
| tree | 11b99612235ca541c029f45bac612706108de2df /Software/Visual_Studio | |
| parent | e111c33bc87acf40202f9e5423e21b087a366f07 (diff) | |
| download | Tango-e2bf9f578c3ed53d869744f94b020048ca806c6e.tar.gz Tango-e2bf9f578c3ed53d869744f94b020048ca806c6e.zip | |
Refactored catalogs to per RML.
Dropped MEDIA_COLOR.
Added RML White Point LAB.
Added additional dispenser parameters in MS module.
Attempt to optimize PPC color catalog view performance.
Removed "Color Catalog Code" from brush stop.
Implemented PPC color catalog selection per RML.
Diffstat (limited to 'Software/Visual_Studio')
38 files changed, 455 insertions, 889 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/Views/DispenserView.xaml b/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/Views/DispenserView.xaml index d4b3b0655..0b295b620 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/Views/DispenserView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/Views/DispenserView.xaml @@ -54,7 +54,19 @@ <ComboBox ItemsSource="{Binding DispenserTypes}" SelectedItem="{Binding ActiveDispenser.DispenserType}" DisplayMemberPath="Name"></ComboBox> <TextBlock FontWeight="SemiBold">Nanoliter / Pulse:</TextBlock> - <mahapps:NumericUpDown HasDecimals="True" BorderThickness="0 0 0 1" Background="Transparent" Minimum="0" Maximum="5" Value="{Binding ActiveDispenser.NlPerPulse}"></mahapps:NumericUpDown> + <mahapps:NumericUpDown HorizontalContentAlignment="Left" HasDecimals="True" BorderThickness="0 0 0 1" Background="Transparent" Minimum="0" Maximum="5" Value="{Binding ActiveDispenser.NlPerPulse}"></mahapps:NumericUpDown> + + <TextBlock FontWeight="SemiBold">Part Number:</TextBlock> + <TextBox Text="{Binding ActiveDispenser.PartNumber}"></TextBox> + + <TextBlock FontWeight="SemiBold">PCB Serial:</TextBlock> + <TextBox Text="{Binding ActiveDispenser.PcbSerial}"></TextBox> + + <TextBlock FontWeight="SemiBold">PCB Version:</TextBlock> + <TextBox Text="{Binding ActiveDispenser.PcbVersion}"></TextBox> + + <TextBlock FontWeight="SemiBold">Production Date:</TextBlock> + <DatePicker SelectedDate="{Binding ActiveDispenser.ProductionDate}"></DatePicker> <TextBlock FontWeight="SemiBold">Installed On Machine:</TextBlock> <TextBox IsEnabled="False" Text="{Binding ActiveDispenser.Machine.SerialNumber,Mode=OneWay,TargetNullValue='N/A',FallbackValue='N/A'}" IsReadOnly="True"></TextBox> diff --git a/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/Views/DispensersView.xaml b/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/Views/DispensersView.xaml index a7a57d801..a1d080380 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/Views/DispensersView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/Views/DispensersView.xaml @@ -66,6 +66,10 @@ <DataGridTextColumn Header="SERIAL NUMBER" Binding="{Binding SerialNumber}" Width="Auto" /> <DataGridTextColumn Header="TYPE" Binding="{Binding DispenserType.Name}" Width="Auto" /> <DataGridTextColumn Header="NANOLITER / PULSE" Binding="{Binding NlPerPulse}" Width="Auto" /> + <DataGridTextColumn Header="PART NUMBER" Binding="{Binding PartNumber}" Width="Auto" /> + <DataGridTextColumn Header="PCB SERIAL" Binding="{Binding PcbSerial}" Width="Auto" /> + <DataGridTextColumn Header="PCB VERSION" Binding="{Binding PcbVersion}" Width="Auto" /> + <DataGridTextColumn Header="PRODUCTION DATE" Binding="{Binding ProductionDate,StringFormat='d'}" Width="Auto" /> <DataGridTextColumn Header="INSTALLED" Binding="{Binding IsInstalled}" Width="Auto" /> <DataGridTextColumn Header="LAST UPDATED" Binding="{Binding LastUpdated,Converter={StaticResource DateTimeUTCToShortDateTimeConverter}}" Width="1*" /> </DataGrid.Columns> diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Tango.MachineStudio.DB.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Tango.MachineStudio.DB.csproj index da427f4d8..b0749e196 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Tango.MachineStudio.DB.csproj +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Tango.MachineStudio.DB.csproj @@ -109,7 +109,6 @@ <Compile Include="ViewModels\LiquidTypesViewVM.cs" /> <Compile Include="ViewModels\MachinesViewVM.cs" /> <Compile Include="ViewModels\MachineVersionsViewVM.cs" /> - <Compile Include="ViewModels\MediaColorsViewVM.cs" /> <Compile Include="ViewModels\MediaConditionsViewVM.cs" /> <Compile Include="ViewModels\MediaMaterialsViewVM.cs" /> <Compile Include="ViewModels\MediaPurposesViewVM.cs" /> @@ -230,18 +229,12 @@ <Compile Include="Views\DBViews\MediaMaterialsView.xaml.cs"> <DependentUpon>MediaMaterialsView.xaml</DependentUpon> </Compile> - <Compile Include="Views\DBViews\MediaColorView.xaml.cs"> - <DependentUpon>MediaColorView.xaml</DependentUpon> - </Compile> <Compile Include="Views\DBViews\MediaPurposView.xaml.cs"> <DependentUpon>MediaPurposView.xaml</DependentUpon> </Compile> <Compile Include="Views\DBViews\MediaMaterialView.xaml.cs"> <DependentUpon>MediaMaterialView.xaml</DependentUpon> </Compile> - <Compile Include="Views\DBViews\MediaColorsView.xaml.cs"> - <DependentUpon>MediaColorsView.xaml</DependentUpon> - </Compile> <Compile Include="Views\DBViews\IdsPacksView.xaml.cs"> <DependentUpon>IdsPacksView.xaml</DependentUpon> </Compile> @@ -501,10 +494,6 @@ <Generator>MSBuild:Compile</Generator> <SubType>Designer</SubType> </Page> - <Page Include="Views\DBViews\MediaColorView.xaml"> - <Generator>MSBuild:Compile</Generator> - <SubType>Designer</SubType> - </Page> <Page Include="Views\DBViews\MediaPurposView.xaml"> <Generator>MSBuild:Compile</Generator> <SubType>Designer</SubType> @@ -513,10 +502,6 @@ <Generator>MSBuild:Compile</Generator> <SubType>Designer</SubType> </Page> - <Page Include="Views\DBViews\MediaColorsView.xaml"> - <Generator>MSBuild:Compile</Generator> - <SubType>Designer</SubType> - </Page> <Page Include="Views\DBViews\IdsPacksView.xaml"> <Generator>MSBuild:Compile</Generator> <SubType>Designer</SubType> @@ -734,7 +719,7 @@ <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <ProjectExtensions> <VisualStudio> - <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" /> + <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" /> </VisualStudio> </ProjectExtensions> </Project>
\ No newline at end of file diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModelLocator.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModelLocator.cs index 736682e07..05c3ba0c7 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModelLocator.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModelLocator.cs @@ -41,7 +41,6 @@ namespace Tango.MachineStudio.DB TangoIOC.Default.Register<ContactsViewVM>(); TangoIOC.Default.Register<MediaMaterialsViewVM>(); - TangoIOC.Default.Register<MediaColorsViewVM>(); TangoIOC.Default.Register<MediaPurposesViewVM>(); TangoIOC.Default.Register<MediaConditionsViewVM>(); TangoIOC.Default.Register<LinearMassDensityUnitsViewVM>(); @@ -223,14 +222,6 @@ namespace Tango.MachineStudio.DB } } - public static MediaColorsViewVM MediaColorsViewVM - { - get - { - return TangoIOC.Default.GetInstance<MediaColorsViewVM>(); - } - } - public static MediaPurposesViewVM MediaPurposesViewVM { get diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/MediaColorsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/MediaColorsViewVM.cs deleted file mode 100644 index fd815e5df..000000000 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/MediaColorsViewVM.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Tango.BL.Entities; -using Tango.MachineStudio.Common.Notifications; - -namespace Tango.MachineStudio.DB.ViewModels -{ - public class MediaColorsViewVM : DbTableViewModel<MediaColor> - { - public MediaColorsViewVM(INotificationProvider notification) : base(notification) - { - } - } -} diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/MediaColorView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/MediaColorView.xaml deleted file mode 100644 index 9fcfc5a89..000000000 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/MediaColorView.xaml +++ /dev/null @@ -1,38 +0,0 @@ -<UserControl x:Class="Tango.MachineStudio.DB.Views.DBViews.MediaColorView" - xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" - xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" - xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - xmlns:d="http://schemas.microsoft.com/expression/blend/2008" - xmlns:mahapps="http://metro.mahapps.com/winfx/xaml/controls" - xmlns:controls="clr-namespace:Tango.MachineStudio.DB.Controls" - xmlns:colorPicker="clr-namespace:Tango;assembly=Tango.ColorPicker" - xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI" - mc:Ignorable="d" - d:DesignHeight="400" d:DesignWidth="300"> - - <UserControl.Resources> - <converters:ColorToIntegerConverter x:Key="ColorToIntegerConverter"></converters:ColorToIntegerConverter> - - <Style TargetType="{x:Type TabItem}" BasedOn="{StaticResource {x:Type TabItem}}"> - <Setter Property="mahapps:ControlsHelper.HeaderFontSize" Value="14" /> - <Setter Property="Margin" Value="2" /> - </Style> - </UserControl.Resources> - - <Grid> - <controls:TableGrid> - <TextBlock Text="ID:" FontWeight="Bold"></TextBlock> - <TextBox Text="{Binding EditEntity.ID}" IsReadOnly="True"></TextBox> - <TextBlock Text="GUID:" FontWeight="Bold"></TextBlock> - <TextBox Text="{Binding EditEntity.Guid}" IsReadOnly="True"></TextBox> - <TextBlock Text="Last Updated:" FontWeight="Bold"></TextBlock> - <TextBox Text="{Binding EditEntity.LastUpdated}" IsReadOnly="True"></TextBox> - <TextBlock Text="L:" FontWeight="Bold"></TextBlock> - <mahapps:NumericUpDown Minimum="0" Maximum="100" Value="{Binding EditEntity.L,Mode=TwoWay}" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Left"></mahapps:NumericUpDown> - <TextBlock Text="A:" FontWeight="Bold"></TextBlock> - <mahapps:NumericUpDown Minimum="-128" Maximum="128" Value="{Binding EditEntity.A,Mode=TwoWay}" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Left"></mahapps:NumericUpDown> - <TextBlock Text="B:" FontWeight="Bold"></TextBlock> - <mahapps:NumericUpDown Minimum="-128" Maximum="128" Value="{Binding EditEntity.B,Mode=TwoWay}" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Left"></mahapps:NumericUpDown> - </controls:TableGrid> - </Grid> -</UserControl> diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/MediaColorView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/MediaColorView.xaml.cs deleted file mode 100644 index de09b9aaf..000000000 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/MediaColorView.xaml.cs +++ /dev/null @@ -1,28 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows; -using System.Windows.Controls; -using System.Windows.Data; -using System.Windows.Documents; -using System.Windows.Input; -using System.Windows.Media; -using System.Windows.Media.Imaging; -using System.Windows.Navigation; -using System.Windows.Shapes; - -namespace Tango.MachineStudio.DB.Views.DBViews -{ - /// <summary> - /// Interaction logic for MachineView.xaml - /// </summary> - public partial class MediaColorView : UserControl - { - public MediaColorView() - { - InitializeComponent(); - } - } -} diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/MediaColorsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/MediaColorsView.xaml deleted file mode 100644 index 57adda44d..000000000 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/MediaColorsView.xaml +++ /dev/null @@ -1,42 +0,0 @@ -<UserControl x:Class="Tango.MachineStudio.DB.Views.DBViews.MediaColorsView" - xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" - xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" - xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - xmlns:d="http://schemas.microsoft.com/expression/blend/2008" - xmlns:global="clr-namespace:Tango.MachineStudio.DB" - xmlns:controls="clr-namespace:Tango.MachineStudio.DB.Controls" - xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI" - xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes" - mc:Ignorable="d" - d:DesignHeight="720" d:DesignWidth="1280" Background="White" DataContext="{x:Static global:ViewModelLocator.MediaColorsViewVM}"> - - <UserControl.Resources> - <converters:ColorToIntegerConverter x:Key="ColorToIntegerConverter"></converters:ColorToIntegerConverter> - </UserControl.Resources> - - <Grid> - <controls:DbTableView> - <DataGrid Background="Transparent" ItemsSource="{Binding Adapter.MediaColorsViewSource}" SelectedItem="{Binding SelectedEntity}" AutoGenerateColumns="False" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" IsReadOnly="True"> - <DataGrid.Columns> - <DataGridTextColumn Header="ID" Binding="{Binding ID}"></DataGridTextColumn> - <DataGridTextColumn Header="GUID" Binding="{Binding Guid}"></DataGridTextColumn> - <DataGridTextColumn Header="Name" Binding="{Binding Name}"></DataGridTextColumn> - <DataGridTextColumn Header="L" Binding="{Binding L}"></DataGridTextColumn> - <DataGridTextColumn Header="A" Binding="{Binding A}"></DataGridTextColumn> - <DataGridTextColumn Header="B" Binding="{Binding B}"></DataGridTextColumn> - <DataGridTemplateColumn Header="Color"> - <DataGridTemplateColumn.CellTemplate> - <DataTemplate> - <Rectangle Width="50"> - <Rectangle.Fill> - <SolidColorBrush Color="{Binding Color}"></SolidColorBrush> - </Rectangle.Fill> - </Rectangle> - </DataTemplate> - </DataGridTemplateColumn.CellTemplate> - </DataGridTemplateColumn> - </DataGrid.Columns> - </DataGrid> - </controls:DbTableView> - </Grid> -</UserControl> diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/MediaColorsView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/MediaColorsView.xaml.cs deleted file mode 100644 index ceae18ec8..000000000 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/MediaColorsView.xaml.cs +++ /dev/null @@ -1,32 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows; -using System.Windows.Controls; -using System.Windows.Data; -using System.Windows.Documents; -using System.Windows.Input; -using System.Windows.Media; -using System.Windows.Media.Imaging; -using System.Windows.Navigation; -using System.Windows.Shapes; -using Tango.MachineStudio.DB.CustomAttributes; -using Tango.MachineStudio.DB.Managers; -using Tango.SharedUI.Controls; - -namespace Tango.MachineStudio.DB.Views.DBViews -{ - /// <summary> - /// Interaction logic for MachinesView.xaml - /// </summary> - [DBView] - public partial class MediaColorsView : UserControl - { - public MediaColorsView() : base() - { - InitializeComponent(); - } - } -} diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs index f8966b729..57c1aa724 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs @@ -42,13 +42,6 @@ namespace Tango.MachineStudio.RML.ViewModels set { _materials = value; RaisePropertyChangedAuto(); } } - private ObservableCollection<MediaColor> _colors; - public ObservableCollection<MediaColor> Colors - { - get { return _colors; } - set { _colors = value; RaisePropertyChangedAuto(); } - } - private ObservableCollection<MediaPurpos> _purposes; public ObservableCollection<MediaPurpos> Purposes { @@ -265,7 +258,6 @@ namespace Tango.MachineStudio.RML.ViewModels private void LoadRmlProperties() { Materials = _active_context.MediaMaterials.ToObservableCollection(); - Colors = _active_context.MediaColors.ToObservableCollection(); Purposes = _active_context.MediaPurposes.ToObservableCollection(); Conditions = _active_context.MediaConditions.ToObservableCollection(); LinearMassDensityUnits = _active_context.LinearMassDensityUnits.ToObservableCollection(); @@ -303,7 +295,6 @@ namespace Tango.MachineStudio.RML.ViewModels rml.Manufacturer = "Twine"; rml.Code = Rmls.Max(x => x.Code) + 1; rml.MediaMaterial = Materials.FirstOrDefault(); - rml.MediaColor = Colors.FirstOrDefault(); rml.MediaPurpose = Purposes.FirstOrDefault(); rml.MediaCondition = Conditions.FirstOrDefault(); rml.LinearMassDensityUnit = LinearMassDensityUnits.FirstOrDefault(); diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlView.xaml index d72b6c7d3..8f2c5d187 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlView.xaml @@ -65,20 +65,12 @@ <TextBlock Text="Material:" ></TextBlock> <ComboBox ItemsSource="{Binding Materials}" SelectedItem="{Binding ActiveRML.MediaMaterial,Mode=TwoWay}" DisplayMemberPath="Name"></ComboBox> - <TextBlock Text="Color:" ></TextBlock> - <ComboBox ItemsSource="{Binding Colors}" SelectedItem="{Binding ActiveRML.MediaColor,Mode=TwoWay}"> - <ComboBox.ItemTemplate> - <DataTemplate> - <StackPanel Orientation="Horizontal"> - <Rectangle Width="16" Height="16" VerticalAlignment="Center"> - <Rectangle.Fill> - <SolidColorBrush Color="{Binding Color}"></SolidColorBrush> - </Rectangle.Fill> - </Rectangle> - </StackPanel> - </DataTemplate> - </ComboBox.ItemTemplate> - </ComboBox> + <TextBlock Text="White Point:" ></TextBlock> + <UniformGrid Columns="3"> + <mahapps:NumericUpDown HasDecimals="True" Minimum="0" Maximum="100" InterceptArrowKeys="True" HideUpDownButtons="True" Value="{Binding ActiveRML.WhitePointL}" HorizontalContentAlignment="Left" /> + <mahapps:NumericUpDown HasDecimals="True" Minimum="-128" Maximum="128" InterceptArrowKeys="True" HideUpDownButtons="True" Value="{Binding ActiveRML.WhitePointA}" HorizontalContentAlignment="Left" /> + <mahapps:NumericUpDown HasDecimals="True" Minimum="-128" Maximum="128" InterceptArrowKeys="True" HideUpDownButtons="True" Value="{Binding ActiveRML.WhitePointB}" HorizontalContentAlignment="Left" /> + </UniformGrid> <TextBlock Text="Purpose:" ></TextBlock> <ComboBox ItemsSource="{Binding Purposes}" SelectedItem="{Binding ActiveRML.MediaPurpose,Mode=TwoWay}" DisplayMemberPath="Name"></ComboBox> diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Tango.PPC.Jobs.csproj b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Tango.PPC.Jobs.csproj index 6830f2ec5..b4b635b8f 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Tango.PPC.Jobs.csproj +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Tango.PPC.Jobs.csproj @@ -394,7 +394,7 @@ <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <ProjectExtensions> <VisualStudio> - <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" /> + <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" /> </VisualStudio> </ProjectExtensions> </Project>
\ No newline at end of file diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs index 6a05eee12..08600c928 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs @@ -333,7 +333,7 @@ namespace Tango.PPC.Jobs.ViewModels TwineCatalogAutoCompleteProvider = new AutoCompleteProvider<ColorCatalog>((color, filter) => { - return !String.IsNullOrWhiteSpace(filter) && color.Name.ToLower().StartsWith(filter.ToLower()); + return !String.IsNullOrWhiteSpace(filter) && color.RmlGuid == Job.Rml.Guid && color.Name.ToLower().StartsWith(filter.ToLower()); }); //Initialize Commands @@ -410,6 +410,9 @@ namespace Tango.PPC.Jobs.ViewModels .WithBrushStops() .BuildAsync(); + Job.RmlChanged -= OnRmlChanged; + Job.RmlChanged += OnRmlChanged; + Job.ValidateOnPropertyChanged = true; LogManager.Log("Loading RMLS..."); @@ -420,7 +423,7 @@ namespace Tango.PPC.Jobs.ViewModels SpoolTypes = await _db.SpoolTypes.ToListAsync(); LogManager.Log("Loading Customers..."); Customers = await _db.Customers.Where(x => x.OrganizationGuid == MachineProvider.Machine.OrganizationGuid).ToListAsync(); - TwineCatalogItems = await _db.ColorCatalogs.Where(x => x.ColorSpace.Code == (int)BL.Enumerations.ColorSpaces.Twine).OrderBy(x => x.Name).ToListAsync(); + TwineCatalogItems = await _db.ColorCatalogs.Where(x => x.RmlGuid == Job.Rml.Guid && x.ColorSpace.Code == (int)BL.Enumerations.ColorSpaces.Twine).OrderBy(x => x.Name).ToListAsync(); if (!_check_gamut_thread.IsAlive) { @@ -470,6 +473,8 @@ namespace Tango.PPC.Jobs.ViewModels } } + + /// <summary> /// Saves the job. /// </summary> @@ -551,6 +556,22 @@ namespace Tango.PPC.Jobs.ViewModels #endregion + #region RML Changed + + protected virtual async void OnRmlChanged(object sender, Rml rml) + { + TwineCatalogItems = await _db.ColorCatalogs.Where(x => x.RmlGuid == rml.Guid && x.ColorSpace.Code == (int)BL.Enumerations.ColorSpaces.Twine).OrderBy(x => x.Name).ToListAsync(); + + //Replace all brush stops color catalogs. + foreach (var stop in Job.Segments.SelectMany(x => x.BrushStops).Where(x => x.ColorCatalog != null && x.BrushColorSpace == BL.Enumerations.ColorSpaces.Twine).ToList()) + { + var replacement = TwineCatalogItems.SingleOrDefault(x => x.Name == stop.ColorCatalog.Name); + stop.ColorCatalog = replacement; + } + } + + #endregion + #region Segments Management /// <summary> @@ -741,7 +762,7 @@ namespace Tango.PPC.Jobs.ViewModels if (catalogItem != null) { - stop.ColorCatalog = TwineCatalogItems.SingleOrDefault(x => x.Guid == catalogItem.Entity.Guid); + stop.ColorCatalog = TwineCatalogItems.SingleOrDefault(x => x.Name == catalogItem.Entity.Name); } } diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/TwineCatalogViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/TwineCatalogViewVM.cs index 6ed4afcd8..1fd5c8474 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/TwineCatalogViewVM.cs +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/TwineCatalogViewVM.cs @@ -94,7 +94,7 @@ namespace Tango.PPC.Jobs.ViewModels /// </summary> private void Confirm() { - SettingsManager.Default.GetOrCreate<JobsModuleSettings>().RecentTwineCatalogColors.Add(SelectedItem.Entity.Guid); + SettingsManager.Default.GetOrCreate<JobsModuleSettings>().RecentTwineCatalogColors.Add(SelectedItem.Entity.Name); SettingsManager.Default.Save(); Recent = CatalogLoader.GetRecent(Catalog, SettingsManager.Default.GetOrCreate<JobsModuleSettings>().RecentTwineCatalogColors); diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Controls/TwineCatalogControl.xaml b/Software/Visual_Studio/PPC/Tango.PPC.Common/Controls/TwineCatalogControl.xaml index c1a7b29a2..fe483420a 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Controls/TwineCatalogControl.xaml +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Controls/TwineCatalogControl.xaml @@ -13,7 +13,7 @@ <Grid> <Grid.ColumnDefinitions> <ColumnDefinition Width="1*"/> - <ColumnDefinition Width="100"/> + <ColumnDefinition Width="0"/> </Grid.ColumnDefinitions> <touch:TouchListBox ItemsSource="{Binding Groups}" x:Name="list" x:FieldModifier="public" DisableRipple="True" ScrollBarVisibility="Collapsed" SelectionMode="None"> diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Controls/TwineCatalogControl.xaml.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Controls/TwineCatalogControl.xaml.cs index f786009f0..d4b924f17 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Controls/TwineCatalogControl.xaml.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Controls/TwineCatalogControl.xaml.cs @@ -70,22 +70,22 @@ namespace Tango.PPC.Common.Controls /// <param name="e">The <see cref="Touch.Controls.DoubleValueChangedEventArgs"/> instance containing the event data.</param> private void ScrollViewer_Scrolling(object sender, Touch.Controls.DoubleValueChangedEventArgs e) { - if (!_preventChange) - { - if (e.Value > _lastScrollPosition + 60 || e.Value < _lastScrollPosition - 60) - { - var group = list.ScrollViewer.GetMostVisibleElementDataContext<CatalogGroup>(); + //if (!_preventChange) + //{ + // if (e.Value > _lastScrollPosition + 60 || e.Value < _lastScrollPosition - 60) + // { + // var group = list.ScrollViewer.GetMostVisibleElementDataContext<CatalogGroup>(); - if (group != null) - { - _preventChange = true; - slider.Value = slider.Maximum - _catalog.Groups.IndexOf(group); - _preventChange = false; - } + // if (group != null) + // { + // _preventChange = true; + // slider.Value = slider.Maximum - _catalog.Groups.IndexOf(group); + // _preventChange = false; + // } - _lastScrollPosition = e.Value; - } - } + // _lastScrollPosition = e.Value; + // } + //} } /// <summary> @@ -113,22 +113,22 @@ namespace Tango.PPC.Common.Controls /// <param name="e">The <see cref="RoutedPropertyChangedEventArgs{System.Double}"/> instance containing the event data.</param> private void TouchSlider_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e) { - if (_catalog == null || _catalog.Groups.Count == 0) return; + //if (_catalog == null || _catalog.Groups.Count == 0) return; - if (!_preventChange) - { - if (_catalog != null) - { - _preventChange = true; - list.ScrollToItem(_catalog.Groups.ElementAt(_catalog.Groups.Count - 1 - (int)e.NewValue)); - _preventChange = false; - } - } + //if (!_preventChange) + //{ + // if (_catalog != null) + // { + // _preventChange = true; + // list.ScrollToItem(_catalog.Groups.ElementAt(_catalog.Groups.Count - 1 - (int)e.NewValue)); + // _preventChange = false; + // } + //} - if (_catalog != null && _catalog.Groups.Count > _catalog.Groups.Count - 1 - (int)e.NewValue && _catalog.Groups.Count - 1 - (int)e.NewValue > -1) - { - slider.Foreground = new SolidColorBrush(_catalog.Groups.ElementAt(_catalog.Groups.Count - 1 - (int)e.NewValue).Color); - } + //if (_catalog != null && _catalog.Groups.Count > _catalog.Groups.Count - 1 - (int)e.NewValue && _catalog.Groups.Count - 1 - (int)e.NewValue > -1) + //{ + // slider.Foreground = new SolidColorBrush(_catalog.Groups.ElementAt(_catalog.Groups.Count - 1 - (int)e.NewValue).Color); + //} } /// <summary> diff --git a/Software/Visual_Studio/Tango.BL/Builders/RmlBuilder.cs b/Software/Visual_Studio/Tango.BL/Builders/RmlBuilder.cs index 7b5d9b7ff..dd40ceedc 100644 --- a/Software/Visual_Studio/Tango.BL/Builders/RmlBuilder.cs +++ b/Software/Visual_Studio/Tango.BL/Builders/RmlBuilder.cs @@ -20,7 +20,6 @@ namespace Tango.BL.Builders { return query. Include(x => x.MediaMaterial). - Include(x => x.MediaColor). Include(x => x.MediaPurpose). Include(x => x.MediaCondition). Include(x => x.LinearMassDensityUnit). diff --git a/Software/Visual_Studio/Tango.BL/Builders/RmlsCollectionBuilder.cs b/Software/Visual_Studio/Tango.BL/Builders/RmlsCollectionBuilder.cs index d6eabbae4..fa0056259 100644 --- a/Software/Visual_Studio/Tango.BL/Builders/RmlsCollectionBuilder.cs +++ b/Software/Visual_Studio/Tango.BL/Builders/RmlsCollectionBuilder.cs @@ -79,7 +79,6 @@ namespace Tango.BL.Builders return AddStep(6, () => { Context.MediaMaterials.ToList(); - Context.MediaColors.ToList(); Context.MediaPurposes.ToList(); Context.MediaConditions.ToList(); Context.LinearMassDensityUnits.ToList(); diff --git a/Software/Visual_Studio/Tango.BL/Catalogs/CatalogLoader.cs b/Software/Visual_Studio/Tango.BL/Catalogs/CatalogLoader.cs index ac2a00ab4..1522d0900 100644 --- a/Software/Visual_Studio/Tango.BL/Catalogs/CatalogLoader.cs +++ b/Software/Visual_Studio/Tango.BL/Catalogs/CatalogLoader.cs @@ -13,6 +13,8 @@ namespace Tango.BL.Catalogs { var all_items = context.ColorCatalogs.Where(x => x.ColorSpace.Code == (int)colorSpace).ToList(); + all_items = all_items.DistinctBy(x => x.Name).ToList(); + var first = all_items.First(); Catalog catalog = new Catalog(); @@ -35,9 +37,9 @@ namespace Tango.BL.Catalogs return catalog; } - public static Catalog GetRecent(Catalog source, List<String> guids) + public static Catalog GetRecent(Catalog source, List<String> names) { - var filtersItems = source.Groups.SelectMany(x => x.Items).Select(x => x.Entity).Where(x => guids.Contains(x.Guid)).ToList(); + var filtersItems = source.Groups.SelectMany(x => x.Items).Select(x => x.Entity).Where(x => names.Contains(x.Name)).ToList(); var first = filtersItems.FirstOrDefault(); diff --git a/Software/Visual_Studio/Tango.BL/Entities/BrushStopBase.cs b/Software/Visual_Studio/Tango.BL/Entities/BrushStopBase.cs index 53eee50e0..69658bab6 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/BrushStopBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/BrushStopBase.cs @@ -83,8 +83,6 @@ namespace Tango.BL.Entities public event EventHandler<Boolean> CorrectedChanged; - public event EventHandler<Int32> ColorCatalogCodeChanged; - public event EventHandler<ColorCatalog> ColorCatalogChanged; public event EventHandler<ColorSpace> ColorSpaceChanged; @@ -949,33 +947,6 @@ namespace Tango.BL.Entities } } - protected Int32 _colorcatalogcode; - - /// <summary> - /// Gets or sets the brushstopbase color catalog code. - /// </summary> - - [Column("COLOR_CATALOG_CODE")] - - public Int32 ColorCatalogCode - { - get - { - return _colorcatalogcode; - } - - set - { - if (_colorcatalogcode != value) - { - _colorcatalogcode = value; - - OnColorCatalogCodeChanged(value); - - } - } - } - protected ColorCatalog _colorcatalog; /// <summary> @@ -1319,15 +1290,6 @@ namespace Tango.BL.Entities } /// <summary> - /// Called when the ColorCatalogCode has changed. - /// </summary> - protected virtual void OnColorCatalogCodeChanged(Int32 colorcatalogcode) - { - ColorCatalogCodeChanged?.Invoke(this, colorcatalogcode); - RaisePropertyChanged(nameof(ColorCatalogCode)); - } - - /// <summary> /// Called when the ColorCatalog has changed. /// </summary> protected virtual void OnColorCatalogChanged(ColorCatalog colorcatalog) diff --git a/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogBase.cs b/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogBase.cs index 49e519455..6438c6332 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogBase.cs @@ -57,6 +57,33 @@ namespace Tango.BL.Entities public event EventHandler<ColorSpace> ColorSpaceChanged; + public event EventHandler<Rml> RmlChanged; + + protected String _rmlguid; + + /// <summary> + /// Gets or sets the colorcatalogbase rml guid. + /// </summary> + + [Column("RML_GUID")] + [ForeignKey("Rml")] + + public String RmlGuid + { + get + { + return _rmlguid; + } + + set + { + if (_rmlguid != value) + { + _rmlguid = value; + } + } + } + protected String _colorspaceguid; /// <summary> @@ -512,6 +539,33 @@ namespace Tango.BL.Entities } } + protected Rml _rml; + + /// <summary> + /// Gets or sets the colorcatalogbase rml. + /// </summary> + + [XmlIgnore] + [JsonIgnore] + public virtual Rml Rml + { + get + { + return _rml; + } + + set + { + if (_rml != value) + { + _rml = value; + + OnRmlChanged(value); + + } + } + } + /// <summary> /// Called when the ColorCode has changed. /// </summary> @@ -657,6 +711,15 @@ namespace Tango.BL.Entities } /// <summary> + /// Called when the Rml has changed. + /// </summary> + protected virtual void OnRmlChanged(Rml rml) + { + RmlChanged?.Invoke(this, rml); + RaisePropertyChanged(nameof(Rml)); + } + + /// <summary> /// Initializes a new instance of the <see cref="ColorCatalogBase" /> class. /// </summary> public ColorCatalogBase() : base() diff --git a/Software/Visual_Studio/Tango.BL/Entities/MediaColor.cs b/Software/Visual_Studio/Tango.BL/Entities/MediaColor.cs deleted file mode 100644 index b9020406b..000000000 --- a/Software/Visual_Studio/Tango.BL/Entities/MediaColor.cs +++ /dev/null @@ -1,45 +0,0 @@ -using ColorMine.ColorSpaces; -using Newtonsoft.Json; -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations.Schema; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Media; - -namespace Tango.BL.Entities -{ - public partial class MediaColor : MediaColorBase - { - [NotMapped] - [JsonIgnore] - public Color Color - { - get - { - Lab lab = new Lab(L, A, B); - var rgb = lab.To<Rgb>(); - return Color.FromRgb((byte)rgb.R, (byte)rgb.G, (byte)rgb.B); - } - } - - protected override void RaisePropertyChanged(string propName) - { - base.RaisePropertyChanged(propName); - - if (propName == nameof(L) || propName == nameof(A) || propName == nameof(B)) - { - RaisePropertyChanged(nameof(Color)); - } - } - - /// <summary> - /// Initializes a new instance of the <see cref="MediaColor" /> class. - /// </summary> - public MediaColor() : base() - { - - } - } -} diff --git a/Software/Visual_Studio/Tango.BL/Entities/MediaColorBase.cs b/Software/Visual_Studio/Tango.BL/Entities/MediaColorBase.cs deleted file mode 100644 index 529441857..000000000 --- a/Software/Visual_Studio/Tango.BL/Entities/MediaColorBase.cs +++ /dev/null @@ -1,226 +0,0 @@ -//------------------------------------------------------------------------------ -// <auto-generated> -// This code was generated by a tool. -// Tango Observables Generator -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. Do not modify! -// </auto-generated> -//------------------------------------------------------------------------------ - -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using System.Xml.Serialization; -using Newtonsoft.Json; -using System.Linq; -using Tango.DAL.Remote.DB; -using Tango.Core; - -namespace Tango.BL.Entities -{ - [Table("MEDIA_COLORS")] - public abstract class MediaColorBase : ObservableEntity<MediaColor> - { - - public event EventHandler<String> NameChanged; - - public event EventHandler<Double> LChanged; - - public event EventHandler<Double> AChanged; - - public event EventHandler<Double> BChanged; - - public event EventHandler<SynchronizedObservableCollection<Rml>> RmlsChanged; - - protected String _name; - - /// <summary> - /// Gets or sets the mediacolorbase name. - /// </summary> - - [Column("NAME")] - - public String Name - { - get - { - return _name; - } - - set - { - if (_name != value) - { - _name = value; - - OnNameChanged(value); - - } - } - } - - protected Double _l; - - /// <summary> - /// Gets or sets the mediacolorbase l. - /// </summary> - - [Column("L")] - - public Double L - { - get - { - return _l; - } - - set - { - if (_l != value) - { - _l = value; - - OnLChanged(value); - - } - } - } - - protected Double _a; - - /// <summary> - /// Gets or sets the mediacolorbase a. - /// </summary> - - [Column("A")] - - public Double A - { - get - { - return _a; - } - - set - { - if (_a != value) - { - _a = value; - - OnAChanged(value); - - } - } - } - - protected Double _b; - - /// <summary> - /// Gets or sets the mediacolorbase b. - /// </summary> - - [Column("B")] - - public Double B - { - get - { - return _b; - } - - set - { - if (_b != value) - { - _b = value; - - OnBChanged(value); - - } - } - } - - protected SynchronizedObservableCollection<Rml> _rmls; - - /// <summary> - /// Gets or sets the mediacolorbase rmls. - /// </summary> - - public virtual SynchronizedObservableCollection<Rml> Rmls - { - get - { - return _rmls; - } - - set - { - if (_rmls != value) - { - _rmls = value; - - OnRmlsChanged(value); - - } - } - } - - /// <summary> - /// Called when the Name has changed. - /// </summary> - protected virtual void OnNameChanged(String name) - { - NameChanged?.Invoke(this, name); - RaisePropertyChanged(nameof(Name)); - } - - /// <summary> - /// Called when the L has changed. - /// </summary> - protected virtual void OnLChanged(Double l) - { - LChanged?.Invoke(this, l); - RaisePropertyChanged(nameof(L)); - } - - /// <summary> - /// Called when the A has changed. - /// </summary> - protected virtual void OnAChanged(Double a) - { - AChanged?.Invoke(this, a); - RaisePropertyChanged(nameof(A)); - } - - /// <summary> - /// Called when the B has changed. - /// </summary> - protected virtual void OnBChanged(Double b) - { - BChanged?.Invoke(this, b); - RaisePropertyChanged(nameof(B)); - } - - /// <summary> - /// Called when the Rmls has changed. - /// </summary> - protected virtual void OnRmlsChanged(SynchronizedObservableCollection<Rml> rmls) - { - RmlsChanged?.Invoke(this, rmls); - RaisePropertyChanged(nameof(Rmls)); - } - - /// <summary> - /// Initializes a new instance of the <see cref="MediaColorBase" /> class. - /// </summary> - public MediaColorBase() : base() - { - - Rmls = new SynchronizedObservableCollection<Rml>(); - - } - } -} diff --git a/Software/Visual_Studio/Tango.BL/Entities/Rml.cs b/Software/Visual_Studio/Tango.BL/Entities/Rml.cs index c75c5bf99..f79fb6c5b 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/Rml.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/Rml.cs @@ -1,8 +1,10 @@ +using ColorMine.ColorSpaces; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using System.Windows.Media; namespace Tango.BL.Entities { @@ -15,5 +17,38 @@ namespace Tango.BL.Entities { } + + protected override void OnWhitePointLChanged(double whitepointl) + { + base.OnWhitePointLChanged(whitepointl); + UpdateColor(); + } + + protected override void OnWhitePointAChanged(double whitepointa) + { + base.OnWhitePointAChanged(whitepointa); + UpdateColor(); + } + + protected override void OnWhitePointBChanged(double whitepointb) + { + base.OnWhitePointBChanged(whitepointb); + UpdateColor(); + } + + private void UpdateColor() + { + RaisePropertyChanged(nameof(Color)); + } + + public Color Color + { + get + { + Lab lab = new Lab(WhitePointA, WhitePointA, WhitePointB); + Rgb rgb = lab.To<Rgb>(); + return Color.FromRgb((byte)rgb.R, (byte)rgb.G, (byte)rgb.B); + } + } } } diff --git a/Software/Visual_Studio/Tango.BL/Entities/RmlBase.cs b/Software/Visual_Studio/Tango.BL/Entities/RmlBase.cs index 2b85ca767..97fee9558 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/RmlBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/RmlBase.cs @@ -31,6 +31,12 @@ namespace Tango.BL.Entities public event EventHandler<Int32> CodeChanged; + public event EventHandler<Double> WhitePointLChanged; + + public event EventHandler<Double> WhitePointAChanged; + + public event EventHandler<Double> WhitePointBChanged; + public event EventHandler<Double> FiberSizeChanged; public event EventHandler<Int32> NumberOfFibersChanged; @@ -59,6 +65,8 @@ namespace Tango.BL.Entities public event EventHandler<SynchronizedObservableCollection<Cct>> CctsChanged; + public event EventHandler<SynchronizedObservableCollection<ColorCatalog>> ColorCatalogsChanged; + public event EventHandler<FiberShape> FiberShapeChanged; public event EventHandler<FiberSynth> FiberSynthChanged; @@ -71,8 +79,6 @@ namespace Tango.BL.Entities public event EventHandler<SynchronizedObservableCollection<Machine>> MachinesChanged; - public event EventHandler<MediaColor> MediaColorChanged; - public event EventHandler<MediaCondition> MediaConditionChanged; public event EventHandler<MediaMaterial> MediaMaterialChanged; @@ -162,52 +168,108 @@ namespace Tango.BL.Entities } } - protected String _mediamaterialguid; + protected Double _whitepointl; /// <summary> - /// Gets or sets the rmlbase media material guid. + /// Gets or sets the rmlbase white point l. /// </summary> - [Column("MEDIA_MATERIAL_GUID")] - [ForeignKey("MediaMaterial")] + [Column("WHITE_POINT_L")] - public String MediaMaterialGuid + public Double WhitePointL { get { - return _mediamaterialguid; + return _whitepointl; } set { - if (_mediamaterialguid != value) + if (_whitepointl != value) { - _mediamaterialguid = value; + _whitepointl = value; + + OnWhitePointLChanged(value); + } } } - protected String _mediacolorguid; + protected Double _whitepointa; /// <summary> - /// Gets or sets the rmlbase media color guid. + /// Gets or sets the rmlbase white point a. /// </summary> - [Column("MEDIA_COLOR_GUID")] - [ForeignKey("MediaColor")] + [Column("WHITE_POINT_A")] - public String MediaColorGuid + public Double WhitePointA { get { - return _mediacolorguid; + return _whitepointa; } set { - if (_mediacolorguid != value) + if (_whitepointa != value) { - _mediacolorguid = value; + _whitepointa = value; + + OnWhitePointAChanged(value); + + } + } + } + + protected Double _whitepointb; + + /// <summary> + /// Gets or sets the rmlbase white point b. + /// </summary> + + [Column("WHITE_POINT_B")] + + public Double WhitePointB + { + get + { + return _whitepointb; + } + + set + { + if (_whitepointb != value) + { + _whitepointb = value; + + OnWhitePointBChanged(value); + + } + } + } + + protected String _mediamaterialguid; + + /// <summary> + /// Gets or sets the rmlbase media material guid. + /// </summary> + + [Column("MEDIA_MATERIAL_GUID")] + [ForeignKey("MediaMaterial")] + + public String MediaMaterialGuid + { + get + { + return _mediamaterialguid; + } + + set + { + if (_mediamaterialguid != value) + { + _mediamaterialguid = value; } } } @@ -711,6 +773,31 @@ namespace Tango.BL.Entities } } + protected SynchronizedObservableCollection<ColorCatalog> _colorcatalogs; + + /// <summary> + /// Gets or sets the rmlbase color catalogs. + /// </summary> + + public virtual SynchronizedObservableCollection<ColorCatalog> ColorCatalogs + { + get + { + return _colorcatalogs; + } + + set + { + if (_colorcatalogs != value) + { + _colorcatalogs = value; + + OnColorCatalogsChanged(value); + + } + } + } + protected FiberShape _fibershape; /// <summary> @@ -867,33 +954,6 @@ namespace Tango.BL.Entities } } - protected MediaColor _mediacolor; - - /// <summary> - /// Gets or sets the rmlbase media colors. - /// </summary> - - [XmlIgnore] - [JsonIgnore] - public virtual MediaColor MediaColor - { - get - { - return _mediacolor; - } - - set - { - if (_mediacolor != value) - { - _mediacolor = value; - - OnMediaColorChanged(value); - - } - } - } - protected MediaCondition _mediacondition; /// <summary> @@ -1028,6 +1088,33 @@ namespace Tango.BL.Entities } /// <summary> + /// Called when the WhitePointL has changed. + /// </summary> + protected virtual void OnWhitePointLChanged(Double whitepointl) + { + WhitePointLChanged?.Invoke(this, whitepointl); + RaisePropertyChanged(nameof(WhitePointL)); + } + + /// <summary> + /// Called when the WhitePointA has changed. + /// </summary> + protected virtual void OnWhitePointAChanged(Double whitepointa) + { + WhitePointAChanged?.Invoke(this, whitepointa); + RaisePropertyChanged(nameof(WhitePointA)); + } + + /// <summary> + /// Called when the WhitePointB has changed. + /// </summary> + protected virtual void OnWhitePointBChanged(Double whitepointb) + { + WhitePointBChanged?.Invoke(this, whitepointb); + RaisePropertyChanged(nameof(WhitePointB)); + } + + /// <summary> /// Called when the FiberSize has changed. /// </summary> protected virtual void OnFiberSizeChanged(Double fibersize) @@ -1154,6 +1241,15 @@ namespace Tango.BL.Entities } /// <summary> + /// Called when the ColorCatalogs has changed. + /// </summary> + protected virtual void OnColorCatalogsChanged(SynchronizedObservableCollection<ColorCatalog> colorcatalogs) + { + ColorCatalogsChanged?.Invoke(this, colorcatalogs); + RaisePropertyChanged(nameof(ColorCatalogs)); + } + + /// <summary> /// Called when the FiberShape has changed. /// </summary> protected virtual void OnFiberShapeChanged(FiberShape fibershape) @@ -1208,15 +1304,6 @@ namespace Tango.BL.Entities } /// <summary> - /// Called when the MediaColor has changed. - /// </summary> - protected virtual void OnMediaColorChanged(MediaColor mediacolor) - { - MediaColorChanged?.Invoke(this, mediacolor); - RaisePropertyChanged(nameof(MediaColor)); - } - - /// <summary> /// Called when the MediaCondition has changed. /// </summary> protected virtual void OnMediaConditionChanged(MediaCondition mediacondition) @@ -1262,6 +1349,8 @@ namespace Tango.BL.Entities Ccts = new SynchronizedObservableCollection<Cct>(); + ColorCatalogs = new SynchronizedObservableCollection<ColorCatalog>(); + Jobs = new SynchronizedObservableCollection<Job>(); LiquidTypesRmls = new SynchronizedObservableCollection<LiquidTypesRml>(); diff --git a/Software/Visual_Studio/Tango.BL/ObservablesContext.cs b/Software/Visual_Studio/Tango.BL/ObservablesContext.cs index 27e4ee6a7..0ca9e8b34 100644 --- a/Software/Visual_Studio/Tango.BL/ObservablesContext.cs +++ b/Software/Visual_Studio/Tango.BL/ObservablesContext.cs @@ -391,14 +391,6 @@ namespace Tango.BL } /// <summary> - /// Gets or sets the MediaColors. - /// </summary> - public DbSet<MediaColor> MediaColors - { - get; set; - } - - /// <summary> /// Gets or sets the MediaConditions. /// </summary> public DbSet<MediaCondition> MediaConditions diff --git a/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapter.cs b/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapter.cs index 947d27565..1cbd91835 100644 --- a/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapter.cs +++ b/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapter.cs @@ -178,8 +178,6 @@ namespace Tango.BL MediaMaterials = Context.MediaMaterials.ToObservableCollection(); - MediaColors = Context.MediaColors.ToObservableCollection(); - MediaPurposes = Context.MediaPurposes.ToObservableCollection(); MediaConditions = Context.MediaConditions.ToObservableCollection(); diff --git a/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapterExtension.cs b/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapterExtension.cs index 57f01105e..5d087b245 100644 --- a/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapterExtension.cs +++ b/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapterExtension.cs @@ -1673,42 +1673,6 @@ namespace Tango.BL } - private ObservableCollection<MediaColor> _mediacolors; - /// <summary> - /// Gets or sets the MediaColors. - /// </summary> - public ObservableCollection<MediaColor> MediaColors - { - get - { - return _mediacolors; - } - - set - { - _mediacolors = value; RaisePropertyChanged(nameof(MediaColors)); - } - - } - - private ICollectionView _mediacolorsViewSource; - /// <summary> - /// Gets or sets the MediaColors View Source. - ///</summary> - public ICollectionView MediaColorsViewSource - { - get - { - return _mediacolorsViewSource; - } - - set - { - _mediacolorsViewSource = value; RaisePropertyChanged(nameof(MediaColorsViewSource)); - } - - } - private ObservableCollection<MediaCondition> _mediaconditions; /// <summary> /// Gets or sets the MediaConditions. @@ -2707,8 +2671,6 @@ namespace Tango.BL MachinesEventsViewSource = CreateCollectionView(MachinesEvents); - MediaColorsViewSource = CreateCollectionView(MediaColors); - MediaConditionsViewSource = CreateCollectionView(MediaConditions); MediaMaterialsViewSource = CreateCollectionView(MediaMaterials); diff --git a/Software/Visual_Studio/Tango.BL/ObservablesStaticCollectionsExtension.cs b/Software/Visual_Studio/Tango.BL/ObservablesStaticCollectionsExtension.cs index 096cd2687..d97e9d075 100644 --- a/Software/Visual_Studio/Tango.BL/ObservablesStaticCollectionsExtension.cs +++ b/Software/Visual_Studio/Tango.BL/ObservablesStaticCollectionsExtension.cs @@ -1673,42 +1673,6 @@ namespace Tango.BL } - private ObservableCollection<MediaColor> _mediacolors; - /// <summary> - /// Gets or sets the MediaColors. - /// </summary> - public ObservableCollection<MediaColor> MediaColors - { - get - { - return _mediacolors; - } - - set - { - _mediacolors = value; RaisePropertyChanged(nameof(MediaColors)); - } - - } - - private ICollectionView _mediacolorsViewSource; - /// <summary> - /// Gets or sets the MediaColors View Source. - ///</summary> - public ICollectionView MediaColorsViewSource - { - get - { - return _mediacolorsViewSource; - } - - set - { - _mediacolorsViewSource = value; RaisePropertyChanged(nameof(MediaColorsViewSource)); - } - - } - private ObservableCollection<MediaCondition> _mediaconditions; /// <summary> /// Gets or sets the MediaConditions. @@ -2707,8 +2671,6 @@ namespace Tango.BL MachinesEventsViewSource = CreateCollectionView(MachinesEvents); - MediaColorsViewSource = CreateCollectionView(MediaColors); - MediaConditionsViewSource = CreateCollectionView(MediaConditions); MediaMaterialsViewSource = CreateCollectionView(MediaMaterials); diff --git a/Software/Visual_Studio/Tango.BL/Tango.BL.csproj b/Software/Visual_Studio/Tango.BL/Tango.BL.csproj index dd5122ec2..08e005ff0 100644 --- a/Software/Visual_Studio/Tango.BL/Tango.BL.csproj +++ b/Software/Visual_Studio/Tango.BL/Tango.BL.csproj @@ -163,7 +163,6 @@ <Compile Include="Entities\MachinesEventBase.cs" /> <Compile Include="Entities\MachineStudioVersionBase.cs" /> <Compile Include="Entities\MachineVersionBase.cs" /> - <Compile Include="Entities\MediaColorBase.cs" /> <Compile Include="Entities\MediaConditionBase.cs" /> <Compile Include="Entities\MediaMaterialBase.cs" /> <Compile Include="Entities\MediaPurposBase.cs" /> @@ -275,7 +274,6 @@ <Compile Include="Entities\MachinesEvent.cs" /> <Compile Include="Entities\MachineStudioVersion.cs" /> <Compile Include="Entities\MachineVersion.cs" /> - <Compile Include="Entities\MediaColor.cs" /> <Compile Include="Entities\MediaCondition.cs" /> <Compile Include="Entities\MediaMaterial.cs" /> <Compile Include="Entities\MediaPurpos.cs" /> @@ -404,7 +402,7 @@ </Target> <ProjectExtensions> <VisualStudio> - <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" /> + <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" /> </VisualStudio> </ProjectExtensions> </Project>
\ No newline at end of file diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/BRUSH_STOPS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/BRUSH_STOPS.cs index 6c1ff459c..d06c0f5ad 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/BRUSH_STOPS.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/BRUSH_STOPS.cs @@ -49,7 +49,6 @@ namespace Tango.DAL.Remote.DB public int V7_DIV { get; set; } public bool CORRECTED { get; set; } public string COLOR_CATALOG_GUID { get; set; } - public int COLOR_CATALOG_CODE { get; set; } public virtual COLOR_CATALOGS COLOR_CATALOGS { get; set; } public virtual COLOR_SPACES COLOR_SPACES { get; set; } diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/COLOR_CATALOGS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/COLOR_CATALOGS.cs index 8526e3d8d..1a416d792 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/COLOR_CATALOGS.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/COLOR_CATALOGS.cs @@ -23,6 +23,7 @@ namespace Tango.DAL.Remote.DB public int ID { get; set; } public string GUID { get; set; } public System.DateTime LAST_UPDATED { get; set; } + public string RML_GUID { get; set; } public string COLOR_SPACE_GUID { get; set; } public int COLOR_CODE { get; set; } public string NAME { get; set; } @@ -42,5 +43,6 @@ namespace Tango.DAL.Remote.DB [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection<BRUSH_STOPS> BRUSH_STOPS { get; set; } public virtual COLOR_SPACES COLOR_SPACES { get; set; } + public virtual RML RML { get; set; } } } diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/MEDIA_COLORS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/MEDIA_COLORS.cs deleted file mode 100644 index 4e7672b2e..000000000 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/MEDIA_COLORS.cs +++ /dev/null @@ -1,34 +0,0 @@ -//------------------------------------------------------------------------------ -// <auto-generated> -// This code was generated from a template. -// -// Manual changes to this file may cause unexpected behavior in your application. -// Manual changes to this file will be overwritten if the code is regenerated. -// </auto-generated> -//------------------------------------------------------------------------------ - -namespace Tango.DAL.Remote.DB -{ - using System; - using System.Collections.Generic; - - public partial class MEDIA_COLORS - { - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] - public MEDIA_COLORS() - { - this.RMLS = new HashSet<RML>(); - } - - public int ID { get; set; } - public string GUID { get; set; } - public System.DateTime LAST_UPDATED { get; set; } - public string NAME { get; set; } - public double L { get; set; } - public double A { get; set; } - public double B { get; set; } - - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] - public virtual ICollection<RML> RMLS { get; set; } - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RML.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/RML.cs index 5b4ca71ff..539978519 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RML.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RML.cs @@ -19,6 +19,7 @@ namespace Tango.DAL.Remote.DB { this.CATS = new HashSet<CAT>(); this.CCTS = new HashSet<CCT>(); + this.COLOR_CATALOGS = new HashSet<COLOR_CATALOGS>(); this.JOBS = new HashSet<JOB>(); this.LIQUID_TYPES_RMLS = new HashSet<LIQUID_TYPES_RMLS>(); this.MACHINES = new HashSet<MACHINE>(); @@ -31,8 +32,10 @@ namespace Tango.DAL.Remote.DB public string NAME { get; set; } public string MANUFACTURER { get; set; } public int CODE { get; set; } + public double WHITE_POINT_L { get; set; } + public double WHITE_POINT_A { get; set; } + public double WHITE_POINT_B { get; set; } public string MEDIA_MATERIAL_GUID { get; set; } - public string MEDIA_COLOR_GUID { get; set; } public string MEDIA_PURPOSE_GUID { get; set; } public string MEDIA_CONDITION_GUID { get; set; } public string LINEAR_MASS_DENSITY_UNIT_GUID { get; set; } @@ -55,6 +58,8 @@ namespace Tango.DAL.Remote.DB public virtual ICollection<CAT> CATS { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection<CCT> CCTS { get; set; } + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + public virtual ICollection<COLOR_CATALOGS> COLOR_CATALOGS { get; set; } public virtual FIBER_SHAPES FIBER_SHAPES { get; set; } public virtual FIBER_SYNTHS FIBER_SYNTHS { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] @@ -64,7 +69,6 @@ namespace Tango.DAL.Remote.DB public virtual ICollection<LIQUID_TYPES_RMLS> LIQUID_TYPES_RMLS { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection<MACHINE> MACHINES { get; set; } - public virtual MEDIA_COLORS MEDIA_COLORS { get; set; } public virtual MEDIA_CONDITIONS MEDIA_CONDITIONS { get; set; } public virtual MEDIA_MATERIALS MEDIA_MATERIALS { get; set; } public virtual MEDIA_PURPOSES MEDIA_PURPOSES { get; set; } diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.cs index c103a6bba..98c4a65ae 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.cs @@ -71,7 +71,6 @@ namespace Tango.DAL.Remote.DB public virtual DbSet<MACHINE_VERSIONS> MACHINE_VERSIONS { get; set; } public virtual DbSet<MACHINE> MACHINES { get; set; } public virtual DbSet<MACHINES_EVENTS> MACHINES_EVENTS { get; set; } - public virtual DbSet<MEDIA_COLORS> MEDIA_COLORS { get; set; } public virtual DbSet<MEDIA_CONDITIONS> MEDIA_CONDITIONS { get; set; } public virtual DbSet<MEDIA_MATERIALS> MEDIA_MATERIALS { get; set; } public virtual DbSet<MEDIA_PURPOSES> MEDIA_PURPOSES { get; set; } diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx index 2ac5ff6b7..028494b1e 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx @@ -90,7 +90,6 @@ <Property Name="V7_DIV" Type="int" Nullable="false" /> <Property Name="CORRECTED" Type="bit" Nullable="false" /> <Property Name="COLOR_CATALOG_GUID" Type="varchar" MaxLength="36" /> - <Property Name="COLOR_CATALOG_CODE" Type="int" Nullable="false" /> </EntityType> <EntityType Name="CARTRIDGE_TYPES"> <Key> @@ -138,6 +137,7 @@ <Property Name="ID" Type="int" StoreGeneratedPattern="Identity" Nullable="false" /> <Property Name="GUID" Type="varchar" MaxLength="36" Nullable="false" /> <Property Name="LAST_UPDATED" Type="datetime2" Precision="3" Nullable="false" /> + <Property Name="RML_GUID" Type="varchar" MaxLength="36" Nullable="false" /> <Property Name="COLOR_SPACE_GUID" Type="varchar" MaxLength="36" Nullable="false" /> <Property Name="COLOR_CODE" Type="int" Nullable="false" /> <Property Name="NAME" Type="varchar" MaxLength="100" Nullable="false" /> @@ -692,18 +692,6 @@ <Property Name="DATE_TIME" Type="datetime2" Precision="3" Nullable="false" /> <Property Name="DESCRIPTION" Type="nvarchar(max)" /> </EntityType> - <EntityType Name="MEDIA_COLORS"> - <Key> - <PropertyRef Name="GUID" /> - </Key> - <Property Name="ID" Type="int" StoreGeneratedPattern="Identity" Nullable="false" /> - <Property Name="GUID" Type="varchar" MaxLength="36" Nullable="false" /> - <Property Name="LAST_UPDATED" Type="datetime2" Precision="3" Nullable="false" /> - <Property Name="NAME" Type="varchar" MaxLength="100" Nullable="false" /> - <Property Name="L" Type="float" Nullable="false" /> - <Property Name="A" Type="float" Nullable="false" /> - <Property Name="B" Type="float" Nullable="false" /> - </EntityType> <EntityType Name="MEDIA_CONDITIONS"> <Key> <PropertyRef Name="GUID" /> @@ -819,8 +807,10 @@ <Property Name="NAME" Type="nvarchar" MaxLength="50" Nullable="false" /> <Property Name="MANUFACTURER" Type="nvarchar" MaxLength="50" Nullable="false" /> <Property Name="CODE" Type="int" Nullable="false" /> + <Property Name="WHITE_POINT_L" Type="float" Nullable="false" /> + <Property Name="WHITE_POINT_A" Type="float" Nullable="false" /> + <Property Name="WHITE_POINT_B" Type="float" Nullable="false" /> <Property Name="MEDIA_MATERIAL_GUID" Type="varchar" MaxLength="36" Nullable="false" /> - <Property Name="MEDIA_COLOR_GUID" Type="varchar" MaxLength="36" Nullable="false" /> <Property Name="MEDIA_PURPOSE_GUID" Type="varchar" MaxLength="36" Nullable="false" /> <Property Name="MEDIA_CONDITION_GUID" Type="varchar" MaxLength="36" Nullable="false" /> <Property Name="LINEAR_MASS_DENSITY_UNIT_GUID" Type="varchar" MaxLength="36" Nullable="false" /> @@ -1160,6 +1150,20 @@ </Dependent> </ReferentialConstraint> </Association> + <Association Name="FK_COLOR_CATALOGS_RMLS"> + <End Role="RMLS" Type="Self.RMLS" Multiplicity="1"> + <OnDelete Action="Cascade" /> + </End> + <End Role="COLOR_CATALOGS" Type="Self.COLOR_CATALOGS" Multiplicity="*" /> + <ReferentialConstraint> + <Principal Role="RMLS"> + <PropertyRef Name="GUID" /> + </Principal> + <Dependent Role="COLOR_CATALOGS"> + <PropertyRef Name="RML_GUID" /> + </Dependent> + </ReferentialConstraint> + </Association> <Association Name="FK_CONFIGURATIONS_APPLICATION_DISPLAY_PANEL_VERSIONS"> <End Role="APPLICATION_DISPLAY_PANEL_VERSIONS" Type="Self.APPLICATION_DISPLAY_PANEL_VERSIONS" Multiplicity="1" /> <End Role="CONFIGURATIONS" Type="Self.CONFIGURATIONS" Multiplicity="*" /> @@ -1856,18 +1860,6 @@ </Dependent> </ReferentialConstraint> </Association> - <Association Name="FK_RML_MEDIA_COLORS"> - <End Role="MEDIA_COLORS" Type="Self.MEDIA_COLORS" Multiplicity="1" /> - <End Role="RMLS" Type="Self.RMLS" Multiplicity="*" /> - <ReferentialConstraint> - <Principal Role="MEDIA_COLORS"> - <PropertyRef Name="GUID" /> - </Principal> - <Dependent Role="RMLS"> - <PropertyRef Name="MEDIA_COLOR_GUID" /> - </Dependent> - </ReferentialConstraint> - </Association> <Association Name="FK_RML_MEDIA_CONDITIONS"> <End Role="MEDIA_CONDITIONS" Type="Self.MEDIA_CONDITIONS" Multiplicity="1" /> <End Role="RMLS" Type="Self.RMLS" Multiplicity="*" /> @@ -2110,7 +2102,6 @@ <EntitySet Name="MACHINE_VERSIONS" EntityType="Self.MACHINE_VERSIONS" Schema="dbo" store:Type="Tables" /> <EntitySet Name="MACHINES" EntityType="Self.MACHINES" Schema="dbo" store:Type="Tables" /> <EntitySet Name="MACHINES_EVENTS" EntityType="Self.MACHINES_EVENTS" Schema="dbo" store:Type="Tables" /> - <EntitySet Name="MEDIA_COLORS" EntityType="Self.MEDIA_COLORS" Schema="dbo" store:Type="Tables" /> <EntitySet Name="MEDIA_CONDITIONS" EntityType="Self.MEDIA_CONDITIONS" Schema="dbo" store:Type="Tables" /> <EntitySet Name="MEDIA_MATERIALS" EntityType="Self.MEDIA_MATERIALS" Schema="dbo" store:Type="Tables" /> <EntitySet Name="MEDIA_PURPOSES" EntityType="Self.MEDIA_PURPOSES" Schema="dbo" store:Type="Tables" /> @@ -2169,6 +2160,10 @@ <End Role="COLOR_SPACES" EntitySet="COLOR_SPACES" /> <End Role="COLOR_CATALOGS" EntitySet="COLOR_CATALOGS" /> </AssociationSet> + <AssociationSet Name="FK_COLOR_CATALOGS_RMLS" Association="Self.FK_COLOR_CATALOGS_RMLS"> + <End Role="RMLS" EntitySet="RMLS" /> + <End Role="COLOR_CATALOGS" EntitySet="COLOR_CATALOGS" /> + </AssociationSet> <AssociationSet Name="FK_CONFIGURATIONS_APPLICATION_DISPLAY_PANEL_VERSIONS" Association="Self.FK_CONFIGURATIONS_APPLICATION_DISPLAY_PANEL_VERSIONS"> <End Role="APPLICATION_DISPLAY_PANEL_VERSIONS" EntitySet="APPLICATION_DISPLAY_PANEL_VERSIONS" /> <End Role="CONFIGURATIONS" EntitySet="CONFIGURATIONS" /> @@ -2385,10 +2380,6 @@ <End Role="LINEAR_MASS_DENSITY_UNITS" EntitySet="LINEAR_MASS_DENSITY_UNITS" /> <End Role="RMLS" EntitySet="RMLS" /> </AssociationSet> - <AssociationSet Name="FK_RML_MEDIA_COLORS" Association="Self.FK_RML_MEDIA_COLORS"> - <End Role="MEDIA_COLORS" EntitySet="MEDIA_COLORS" /> - <End Role="RMLS" EntitySet="RMLS" /> - </AssociationSet> <AssociationSet Name="FK_RML_MEDIA_CONDITIONS" Association="Self.FK_RML_MEDIA_CONDITIONS"> <End Role="MEDIA_CONDITIONS" EntitySet="MEDIA_CONDITIONS" /> <End Role="RMLS" EntitySet="RMLS" /> @@ -2501,7 +2492,6 @@ <EntitySet Name="MACHINE_VERSIONS" EntityType="RemoteModel.MACHINE_VERSIONS" /> <EntitySet Name="MACHINES" EntityType="RemoteModel.MACHINE" /> <EntitySet Name="MACHINES_EVENTS" EntityType="RemoteModel.MACHINES_EVENTS" /> - <EntitySet Name="MEDIA_COLORS" EntityType="RemoteModel.MEDIA_COLORS" /> <EntitySet Name="MEDIA_CONDITIONS" EntityType="RemoteModel.MEDIA_CONDITIONS" /> <EntitySet Name="MEDIA_MATERIALS" EntityType="RemoteModel.MEDIA_MATERIALS" /> <EntitySet Name="MEDIA_PURPOSES" EntityType="RemoteModel.MEDIA_PURPOSES" /> @@ -2583,6 +2573,10 @@ <End Role="COLOR_SPACES" EntitySet="COLOR_SPACES" /> <End Role="COLOR_CATALOGS" EntitySet="COLOR_CATALOGS" /> </AssociationSet> + <AssociationSet Name="FK_COLOR_CATALOGS_RMLS" Association="RemoteModel.FK_COLOR_CATALOGS_RMLS"> + <End Role="RML" EntitySet="RMLS" /> + <End Role="COLOR_CATALOGS" EntitySet="COLOR_CATALOGS" /> + </AssociationSet> <AssociationSet Name="FK_JOBS_COLOR_SPACES" Association="RemoteModel.FK_JOBS_COLOR_SPACES"> <End Role="COLOR_SPACES" EntitySet="COLOR_SPACES" /> <End Role="JOB" EntitySet="JOBS" /> @@ -2787,10 +2781,6 @@ <End Role="USER" EntitySet="USERS" /> <End Role="MACHINES_EVENTS" EntitySet="MACHINES_EVENTS" /> </AssociationSet> - <AssociationSet Name="FK_RML_MEDIA_COLORS" Association="RemoteModel.FK_RML_MEDIA_COLORS"> - <End Role="MEDIA_COLORS" EntitySet="MEDIA_COLORS" /> - <End Role="RML" EntitySet="RMLS" /> - </AssociationSet> <AssociationSet Name="FK_RML_MEDIA_CONDITIONS" Association="RemoteModel.FK_RML_MEDIA_CONDITIONS"> <End Role="MEDIA_CONDITIONS" EntitySet="MEDIA_CONDITIONS" /> <End Role="RML" EntitySet="RMLS" /> @@ -2938,7 +2928,6 @@ <Property Name="V7_DIV" Type="Int32" Nullable="false" /> <Property Name="CORRECTED" Type="Boolean" Nullable="false" /> <Property Name="COLOR_CATALOG_GUID" Type="String" MaxLength="36" FixedLength="false" Unicode="false" /> - <Property Name="COLOR_CATALOG_CODE" Type="Int32" Nullable="false" /> <NavigationProperty Name="COLOR_CATALOGS" Relationship="RemoteModel.FK_BRUSH_STOPS_COLOR_CATALOGS" FromRole="BRUSH_STOPS" ToRole="COLOR_CATALOGS" /> <NavigationProperty Name="COLOR_SPACES" Relationship="RemoteModel.FK_BRUSH_STOPS_COLOR_SPACES" FromRole="BRUSH_STOPS" ToRole="COLOR_SPACES" /> <NavigationProperty Name="SEGMENT" Relationship="RemoteModel.FK_BRUSH_STOPS_SEGMENTS" FromRole="BRUSH_STOPS" ToRole="SEGMENT" /> @@ -2994,6 +2983,7 @@ <Property Name="ID" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" /> <Property Name="GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" /> <Property Name="LAST_UPDATED" Type="DateTime" Nullable="false" Precision="3" /> + <Property Name="RML_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" /> <Property Name="COLOR_SPACE_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" /> <Property Name="COLOR_CODE" Type="Int32" Nullable="false" /> <Property Name="NAME" Type="String" Nullable="false" MaxLength="100" FixedLength="false" Unicode="false" /> @@ -3011,6 +3001,7 @@ <Property Name="PROCESS_PARAMETERS_TABLE_INDEX" Type="Int32" Nullable="false" /> <NavigationProperty Name="BRUSH_STOPS" Relationship="RemoteModel.FK_BRUSH_STOPS_COLOR_CATALOGS" FromRole="COLOR_CATALOGS" ToRole="BRUSH_STOPS" /> <NavigationProperty Name="COLOR_SPACES" Relationship="RemoteModel.FK_COLOR_CATALOGS_COLOR_SPACES" FromRole="COLOR_CATALOGS" ToRole="COLOR_SPACES" /> + <NavigationProperty Name="RML" Relationship="RemoteModel.FK_COLOR_CATALOGS_RMLS" FromRole="COLOR_CATALOGS" ToRole="RML" /> </EntityType> <EntityType Name="COLOR_SPACES"> <Key> @@ -3640,19 +3631,6 @@ <NavigationProperty Name="MACHINE" Relationship="RemoteModel.FK_MACHINES_EVENTS_MACHINES" FromRole="MACHINES_EVENTS" ToRole="MACHINE" /> <NavigationProperty Name="USER" Relationship="RemoteModel.FK_MACHINES_EVENTS_USERS" FromRole="MACHINES_EVENTS" ToRole="USER" /> </EntityType> - <EntityType Name="MEDIA_COLORS"> - <Key> - <PropertyRef Name="GUID" /> - </Key> - <Property Name="ID" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" /> - <Property Name="GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" /> - <Property Name="LAST_UPDATED" Type="DateTime" Nullable="false" Precision="3" /> - <Property Name="NAME" Type="String" Nullable="false" MaxLength="100" FixedLength="false" Unicode="false" /> - <Property Name="L" Type="Double" Nullable="false" /> - <Property Name="A" Type="Double" Nullable="false" /> - <Property Name="B" Type="Double" Nullable="false" /> - <NavigationProperty Name="RMLS" Relationship="RemoteModel.FK_RML_MEDIA_COLORS" FromRole="MEDIA_COLORS" ToRole="RML" /> - </EntityType> <EntityType Name="MEDIA_CONDITIONS"> <Key> <PropertyRef Name="GUID" /> @@ -3781,8 +3759,10 @@ <Property Name="NAME" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="true" /> <Property Name="MANUFACTURER" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="true" /> <Property Name="CODE" Type="Int32" Nullable="false" /> + <Property Name="WHITE_POINT_L" Type="Double" Nullable="false" /> + <Property Name="WHITE_POINT_A" Type="Double" Nullable="false" /> + <Property Name="WHITE_POINT_B" Type="Double" Nullable="false" /> <Property Name="MEDIA_MATERIAL_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" /> - <Property Name="MEDIA_COLOR_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" /> <Property Name="MEDIA_PURPOSE_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" /> <Property Name="MEDIA_CONDITION_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" /> <Property Name="LINEAR_MASS_DENSITY_UNIT_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" /> @@ -3802,13 +3782,13 @@ <Property Name="THUMBNAIL" Type="Binary" MaxLength="Max" FixedLength="false" /> <NavigationProperty Name="CATS" Relationship="RemoteModel.FK_CATS_RMLS" FromRole="RML" ToRole="CAT" /> <NavigationProperty Name="CCTS" Relationship="RemoteModel.FK_CCTS_RMLS" FromRole="RML" ToRole="CCT" /> + <NavigationProperty Name="COLOR_CATALOGS" Relationship="RemoteModel.FK_COLOR_CATALOGS_RMLS" FromRole="RML" ToRole="COLOR_CATALOGS" /> <NavigationProperty Name="FIBER_SHAPES" Relationship="RemoteModel.FK_RML_FIBER_SHAPES" FromRole="RML" ToRole="FIBER_SHAPES" /> <NavigationProperty Name="FIBER_SYNTHS" Relationship="RemoteModel.FK_RML_FIBER_SYNTHESIS" FromRole="RML" ToRole="FIBER_SYNTHS" /> <NavigationProperty Name="JOBS" Relationship="RemoteModel.FK_JOBS_RMLS" FromRole="RML" ToRole="JOB" /> <NavigationProperty Name="LINEAR_MASS_DENSITY_UNITS" Relationship="RemoteModel.FK_RML_LINEAR_MASS_DENSITY_UNITS" FromRole="RML" ToRole="LINEAR_MASS_DENSITY_UNITS" /> <NavigationProperty Name="LIQUID_TYPES_RMLS" Relationship="RemoteModel.FK_LIQUID_TYPES_RMLS_RMLS" FromRole="RML" ToRole="LIQUID_TYPES_RMLS" /> <NavigationProperty Name="MACHINES" Relationship="RemoteModel.FK_MACHINES_RMLS2" FromRole="RML" ToRole="MACHINE" /> - <NavigationProperty Name="MEDIA_COLORS" Relationship="RemoteModel.FK_RML_MEDIA_COLORS" FromRole="RML" ToRole="MEDIA_COLORS" /> <NavigationProperty Name="MEDIA_CONDITIONS" Relationship="RemoteModel.FK_RML_MEDIA_CONDITIONS" FromRole="RML" ToRole="MEDIA_CONDITIONS" /> <NavigationProperty Name="MEDIA_MATERIALS" Relationship="RemoteModel.FK_RML_MEDIA_MATERIALS" FromRole="RML" ToRole="MEDIA_MATERIALS" /> <NavigationProperty Name="MEDIA_PURPOSES" Relationship="RemoteModel.FK_RML_MEDIA_PURPOSES" FromRole="RML" ToRole="MEDIA_PURPOSES" /> @@ -4227,6 +4207,20 @@ </Dependent> </ReferentialConstraint> </Association> + <Association Name="FK_COLOR_CATALOGS_RMLS"> + <End Type="RemoteModel.RML" Role="RML" Multiplicity="1"> + <OnDelete Action="Cascade" /> + </End> + <End Type="RemoteModel.COLOR_CATALOGS" Role="COLOR_CATALOGS" Multiplicity="*" /> + <ReferentialConstraint> + <Principal Role="RML"> + <PropertyRef Name="GUID" /> + </Principal> + <Dependent Role="COLOR_CATALOGS"> + <PropertyRef Name="RML_GUID" /> + </Dependent> + </ReferentialConstraint> + </Association> <Association Name="FK_JOBS_COLOR_SPACES"> <End Type="RemoteModel.COLOR_SPACES" Role="COLOR_SPACES" Multiplicity="0..1" /> <End Type="RemoteModel.JOB" Role="JOB" Multiplicity="*" /> @@ -4887,18 +4881,6 @@ </Dependent> </ReferentialConstraint> </Association> - <Association Name="FK_RML_MEDIA_COLORS"> - <End Type="RemoteModel.MEDIA_COLORS" Role="MEDIA_COLORS" Multiplicity="1" /> - <End Type="RemoteModel.RML" Role="RML" Multiplicity="*" /> - <ReferentialConstraint> - <Principal Role="MEDIA_COLORS"> - <PropertyRef Name="GUID" /> - </Principal> - <Dependent Role="RML"> - <PropertyRef Name="MEDIA_COLOR_GUID" /> - </Dependent> - </ReferentialConstraint> - </Association> <Association Name="FK_RML_MEDIA_CONDITIONS"> <End Type="RemoteModel.MEDIA_CONDITIONS" Role="MEDIA_CONDITIONS" Multiplicity="1" /> <End Type="RemoteModel.RML" Role="RML" Multiplicity="*" /> @@ -5123,7 +5105,6 @@ <EntitySetMapping Name="BRUSH_STOPS"> <EntityTypeMapping TypeName="RemoteModel.BRUSH_STOPS"> <MappingFragment StoreEntitySet="BRUSH_STOPS"> - <ScalarProperty Name="COLOR_CATALOG_CODE" ColumnName="COLOR_CATALOG_CODE" /> <ScalarProperty Name="COLOR_CATALOG_GUID" ColumnName="COLOR_CATALOG_GUID" /> <ScalarProperty Name="CORRECTED" ColumnName="CORRECTED" /> <ScalarProperty Name="V7_DIV" ColumnName="V7_DIV" /> @@ -5222,6 +5203,7 @@ <ScalarProperty Name="NAME" ColumnName="NAME" /> <ScalarProperty Name="COLOR_CODE" ColumnName="COLOR_CODE" /> <ScalarProperty Name="COLOR_SPACE_GUID" ColumnName="COLOR_SPACE_GUID" /> + <ScalarProperty Name="RML_GUID" ColumnName="RML_GUID" /> <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" /> <ScalarProperty Name="GUID" ColumnName="GUID" /> <ScalarProperty Name="ID" ColumnName="ID" /> @@ -5802,19 +5784,6 @@ </MappingFragment> </EntityTypeMapping> </EntitySetMapping> - <EntitySetMapping Name="MEDIA_COLORS"> - <EntityTypeMapping TypeName="RemoteModel.MEDIA_COLORS"> - <MappingFragment StoreEntitySet="MEDIA_COLORS"> - <ScalarProperty Name="B" ColumnName="B" /> - <ScalarProperty Name="A" ColumnName="A" /> - <ScalarProperty Name="L" ColumnName="L" /> - <ScalarProperty Name="NAME" ColumnName="NAME" /> - <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" /> - <ScalarProperty Name="GUID" ColumnName="GUID" /> - <ScalarProperty Name="ID" ColumnName="ID" /> - </MappingFragment> - </EntityTypeMapping> - </EntitySetMapping> <EntitySetMapping Name="MEDIA_CONDITIONS"> <EntityTypeMapping TypeName="RemoteModel.MEDIA_CONDITIONS"> <MappingFragment StoreEntitySet="MEDIA_CONDITIONS"> @@ -5948,8 +5917,10 @@ <ScalarProperty Name="LINEAR_MASS_DENSITY_UNIT_GUID" ColumnName="LINEAR_MASS_DENSITY_UNIT_GUID" /> <ScalarProperty Name="MEDIA_CONDITION_GUID" ColumnName="MEDIA_CONDITION_GUID" /> <ScalarProperty Name="MEDIA_PURPOSE_GUID" ColumnName="MEDIA_PURPOSE_GUID" /> - <ScalarProperty Name="MEDIA_COLOR_GUID" ColumnName="MEDIA_COLOR_GUID" /> <ScalarProperty Name="MEDIA_MATERIAL_GUID" ColumnName="MEDIA_MATERIAL_GUID" /> + <ScalarProperty Name="WHITE_POINT_B" ColumnName="WHITE_POINT_B" /> + <ScalarProperty Name="WHITE_POINT_A" ColumnName="WHITE_POINT_A" /> + <ScalarProperty Name="WHITE_POINT_L" ColumnName="WHITE_POINT_L" /> <ScalarProperty Name="CODE" ColumnName="CODE" /> <ScalarProperty Name="MANUFACTURER" ColumnName="MANUFACTURER" /> <ScalarProperty Name="NAME" ColumnName="NAME" /> diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram index 7c45c1dda..4a1ed5d8d 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram @@ -5,77 +5,76 @@ <!-- Diagram content (shape and connector positions) --> <edmx:Diagrams> <Diagram DiagramId="f9ae01d708754bbd997add25a4bacc79" Name="Diagram1"> - <EntityTypeShape EntityType="RemoteModel.ADDRESS" Width="1.5" PointX="0.75" PointY="53.875" /> - <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="0.75" PointY="46.375" /> - <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="0.75" PointY="13.25" /> - <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="0.75" PointY="16.5" /> - <EntityTypeShape EntityType="RemoteModel.BRUSH_STOPS" Width="1.5" PointX="13" PointY="28.125" /> - <EntityTypeShape EntityType="RemoteModel.CARTRIDGE_TYPES" Width="1.5" PointX="13.25" PointY="41.125" /> - <EntityTypeShape EntityType="RemoteModel.CAT" Width="1.5" PointX="10.5" PointY="22.75" /> - <EntityTypeShape EntityType="RemoteModel.CCT" Width="1.5" PointX="5.25" PointY="49.375" /> - <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS" Width="1.5" PointX="10.75" PointY="39" /> - <EntityTypeShape EntityType="RemoteModel.COLOR_SPACES" Width="1.5" PointX="3" PointY="19.75" /> - <EntityTypeShape EntityType="RemoteModel.CONFIGURATION" Width="1.5" PointX="3" PointY="8.375" /> - <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="0.75" PointY="49.875" /> - <EntityTypeShape EntityType="RemoteModel.CUSTOMER" Width="1.5" PointX="5.25" PointY="36.25" /> - <EntityTypeShape EntityType="RemoteModel.DISPENSER_TYPES" Width="1.5" PointX="11" PointY="45.625" /> - <EntityTypeShape EntityType="RemoteModel.DISPENSER" Width="1.5" PointX="13.25" PointY="45" /> - <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="0.75" PointY="43.375" /> - <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES" Width="1.5" PointX="11.25" PointY="17.375" /> - <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="0.75" PointY="33.875" /> - <EntityTypeShape EntityType="RemoteModel.FIBER_SYNTHS" Width="1.5" PointX="0.75" PointY="27.25" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWER_TYPES" Width="1.5" PointX="3.75" PointY="58.75" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWERS" Width="1.5" PointX="6" PointY="4.375" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSOR_TYPES" Width="1.5" PointX="3.75" PointY="62.75" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSORS" Width="1.5" PointX="6" PointY="8.5" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCER_TYPES" Width="1.5" PointX="6.75" PointY="43.125" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCERS" Width="1.5" PointX="9" PointY="0.75" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTOR_TYPES" Width="1.5" PointX="5.75" PointY="14.75" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTORS" Width="1.5" PointX="8" PointY="14.375" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROL_TYPES" Width="1.5" PointX="6.75" PointY="60.75" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROLS" Width="1.5" PointX="9" PointY="6.875" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSOR_TYPES" Width="1.5" PointX="0.75" PointY="61.75" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSORS" Width="1.5" PointX="3" PointY="13.5" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="0.75" PointY="8.25" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDER_TYPES" Width="1.5" PointX="0.75" PointY="58.375" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDERS" Width="1.5" PointX="3" PointY="4.625" /> - <EntityTypeShape EntityType="RemoteModel.IDS_PACK_FORMULAS" Width="1.5" PointX="13.25" PointY="13.625" /> - <EntityTypeShape EntityType="RemoteModel.IDS_PACKS" Width="1.5" PointX="15.5" PointY="28" /> - <EntityTypeShape EntityType="RemoteModel.JOB_RUNS" Width="1.5" PointX="9.75" PointY="34.625" /> - <EntityTypeShape EntityType="RemoteModel.JOB" Width="1.5" PointX="7.5" PointY="23.5" /> - <EntityTypeShape EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="0.75" PointY="30.875" /> - <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES" Width="1.5" PointX="8.25" PointY="38.75" /> - <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="10.25" PointY="26.875" /> - <EntityTypeShape EntityType="RemoteModel.MACHINE_STUDIO_VERSIONS" Width="1.5" PointX="7.5" PointY="34.75" /> - <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS" Width="1.5" PointX="3" PointY="43.25" /> - <EntityTypeShape EntityType="RemoteModel.MACHINE" Width="1.5" PointX="5.25" PointY="24.375" /> - <EntityTypeShape EntityType="RemoteModel.MACHINES_EVENTS" Width="1.5" PointX="13.5" PointY="23.625" /> - <EntityTypeShape EntityType="RemoteModel.MEDIA_COLORS" Width="1.5" PointX="0.75" PointY="19.75" /> - <EntityTypeShape EntityType="RemoteModel.MEDIA_CONDITIONS" Width="1.5" PointX="0.75" PointY="39.75" /> - <EntityTypeShape EntityType="RemoteModel.MEDIA_MATERIALS" Width="1.5" PointX="0.75" PointY="23" /> - <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="0.75" PointY="36.75" /> - <EntityTypeShape EntityType="RemoteModel.MID_TANK_TYPES" Width="1.5" PointX="13.25" PointY="38" /> - <EntityTypeShape EntityType="RemoteModel.ORGANIZATION" Width="1.5" PointX="3" PointY="52" /> - <EntityTypeShape EntityType="RemoteModel.PERMISSION" Width="1.5" PointX="8.25" PointY="64" /> - <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES" Width="1.5" PointX="7.5" PointY="53.375" /> - <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES_GROUPS" Width="1.5" PointX="5.25" PointY="55.125" /> - <EntityTypeShape EntityType="RemoteModel.RML" Width="1.5" PointX="3" PointY="24.125" /> - <EntityTypeShape EntityType="RemoteModel.ROLE" Width="1.5" PointX="8.25" PointY="46.875" /> - <EntityTypeShape EntityType="RemoteModel.ROLES_PERMISSIONS" Width="1.5" PointX="10.5" PointY="49" /> - <EntityTypeShape EntityType="RemoteModel.SEGMENT" Width="1.5" PointX="9.75" PointY="31.125" /> - <EntityTypeShape EntityType="RemoteModel.SPOOL_TYPES" Width="1.5" PointX="3" PointY="39.125" /> - <EntityTypeShape EntityType="RemoteModel.SPOOL" Width="1.5" PointX="13.5" PointY="19.75" /> - <EntityTypeShape EntityType="RemoteModel.sysdiagram" Width="1.5" PointX="11.75" PointY="6.75" /> - <EntityTypeShape EntityType="RemoteModel.TANGO_VERSIONS" Width="1.5" PointX="15.5" PointY="33.875" /> - <EntityTypeShape EntityType="RemoteModel.TECH_CONTROLLERS" Width="1.5" PointX="11.75" PointY="9.75" /> - <EntityTypeShape EntityType="RemoteModel.TECH_DISPENSERS" Width="1.5" PointX="13.75" PointY="6.75" /> - <EntityTypeShape EntityType="RemoteModel.TECH_HEATERS" Width="1.5" PointX="13.75" PointY="9.75" /> - <EntityTypeShape EntityType="RemoteModel.TECH_IOS" Width="1.5" PointX="15.75" PointY="6.75" /> - <EntityTypeShape EntityType="RemoteModel.TECH_MONITORS" Width="1.5" PointX="15.75" PointY="11.75" /> - <EntityTypeShape EntityType="RemoteModel.TECH_VALVES" Width="1.5" PointX="15.75" PointY="16.75" /> - <EntityTypeShape EntityType="RemoteModel.USER" Width="1.5" PointX="5.25" PointY="18.875" /> - <EntityTypeShape EntityType="RemoteModel.USERS_ROLES" Width="1.5" PointX="10.5" PointY="13.875" /> - <EntityTypeShape EntityType="RemoteModel.WINDING_METHODS" Width="1.5" PointX="5.25" PointY="33.125" /> + <EntityTypeShape EntityType="RemoteModel.ADDRESS" Width="1.5" PointX="0.75" PointY="38.25" /> + <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="0.75" PointY="6.125" /> + <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="0.75" PointY="9.125" /> + <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="0.75" PointY="12" /> + <EntityTypeShape EntityType="RemoteModel.BRUSH_STOPS" Width="1.5" PointX="12.75" PointY="27.625" /> + <EntityTypeShape EntityType="RemoteModel.CARTRIDGE_TYPES" Width="1.5" PointX="8.25" PointY="0.75" /> + <EntityTypeShape EntityType="RemoteModel.CAT" Width="1.5" PointX="10.5" PointY="22.375" /> + <EntityTypeShape EntityType="RemoteModel.CCT" Width="1.5" PointX="5.25" PointY="53.875" /> + <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS" Width="1.5" PointX="5.25" PointY="29.125" /> + <EntityTypeShape EntityType="RemoteModel.COLOR_SPACES" Width="1.5" PointX="3" PointY="32.5" /> + <EntityTypeShape EntityType="RemoteModel.CONFIGURATION" Width="1.5" PointX="3" PointY="8.875" /> + <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="0.75" PointY="42.5" /> + <EntityTypeShape EntityType="RemoteModel.CUSTOMER" Width="1.5" PointX="6" PointY="36" /> + <EntityTypeShape EntityType="RemoteModel.DISPENSER_TYPES" Width="1.5" PointX="6" PointY="43.625" /> + <EntityTypeShape EntityType="RemoteModel.DISPENSER" Width="1.5" PointX="8.25" PointY="43.125" /> + <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="0.75" PointY="3.25" /> + <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES" Width="1.5" PointX="5.25" PointY="6.375" /> + <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="0.75" PointY="31.625" /> + <EntityTypeShape EntityType="RemoteModel.FIBER_SYNTHS" Width="1.5" PointX="0.75" PointY="25.625" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWER_TYPES" Width="1.5" PointX="10.75" PointY="37.5" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWERS" Width="1.5" PointX="13" PointY="15.125" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSOR_TYPES" Width="1.5" PointX="8.75" PointY="4.5" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSORS" Width="1.5" PointX="11" PointY="6.25" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCER_TYPES" Width="1.5" PointX="11.75" PointY="2.5" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCERS" Width="1.5" PointX="14" PointY="9.5" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTOR_TYPES" Width="1.5" PointX="0.75" PointY="51.375" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTORS" Width="1.5" PointX="3" PointY="14.125" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROL_TYPES" Width="1.5" PointX="10.75" PointY="41.5" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROLS" Width="1.5" PointX="13" PointY="19.625" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSOR_TYPES" Width="1.5" PointX="0.75" PointY="47.5" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSORS" Width="1.5" PointX="3" PointY="5.25" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="0.75" PointY="14.875" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDER_TYPES" Width="1.5" PointX="5.75" PointY="2.5" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDERS" Width="1.5" PointX="8" PointY="8.375" /> + <EntityTypeShape EntityType="RemoteModel.IDS_PACK_FORMULAS" Width="1.5" PointX="8.25" PointY="37.75" /> + <EntityTypeShape EntityType="RemoteModel.IDS_PACKS" Width="1.5" PointX="10.5" PointY="10" /> + <EntityTypeShape EntityType="RemoteModel.JOB_RUNS" Width="1.5" PointX="10.5" PointY="26.5" /> + <EntityTypeShape EntityType="RemoteModel.JOB" Width="1.5" PointX="8.25" PointY="22" /> + <EntityTypeShape EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="0.75" PointY="28.625" /> + <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES" Width="1.5" PointX="8.25" PointY="12.5" /> + <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="5.25" PointY="25.375" /> + <EntityTypeShape EntityType="RemoteModel.MACHINE_STUDIO_VERSIONS" Width="1.5" PointX="7.5" PointY="48.25" /> + <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS" Width="1.5" PointX="3" PointY="36.75" /> + <EntityTypeShape EntityType="RemoteModel.MACHINE" Width="1.5" PointX="5.25" PointY="16.875" /> + <EntityTypeShape EntityType="RemoteModel.MACHINES_EVENTS" Width="1.5" PointX="7.5" PointY="17.125" /> + <EntityTypeShape EntityType="RemoteModel.MEDIA_CONDITIONS" Width="1.5" PointX="0.75" PointY="22.75" /> + <EntityTypeShape EntityType="RemoteModel.MEDIA_MATERIALS" Width="1.5" PointX="0.75" PointY="19.875" /> + <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="0.75" PointY="34.5" /> + <EntityTypeShape EntityType="RemoteModel.MID_TANK_TYPES" Width="1.5" PointX="8.25" PointY="34.625" /> + <EntityTypeShape EntityType="RemoteModel.ORGANIZATION" Width="1.5" PointX="3" PointY="40.375" /> + <EntityTypeShape EntityType="RemoteModel.PERMISSION" Width="1.5" PointX="11.25" PointY="49.25" /> + <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES" Width="1.5" PointX="7.5" PointY="57.875" /> + <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES_GROUPS" Width="1.5" PointX="5.25" PointY="59.5" /> + <EntityTypeShape EntityType="RemoteModel.RML" Width="1.5" PointX="3" PointY="22.375" /> + <EntityTypeShape EntityType="RemoteModel.ROLE" Width="1.5" PointX="11.25" PointY="45.125" /> + <EntityTypeShape EntityType="RemoteModel.ROLES_PERMISSIONS" Width="1.5" PointX="13.5" PointY="45.25" /> + <EntityTypeShape EntityType="RemoteModel.SEGMENT" Width="1.5" PointX="10.5" PointY="30.25" /> + <EntityTypeShape EntityType="RemoteModel.SPOOL_TYPES" Width="1.5" PointX="3" PointY="44.625" /> + <EntityTypeShape EntityType="RemoteModel.SPOOL" Width="1.5" PointX="10.5" PointY="18.125" /> + <EntityTypeShape EntityType="RemoteModel.sysdiagram" Width="1.5" PointX="2.75" PointY="1.75" /> + <EntityTypeShape EntityType="RemoteModel.TANGO_VERSIONS" Width="1.5" PointX="15.5" PointY="23.75" /> + <EntityTypeShape EntityType="RemoteModel.TECH_CONTROLLERS" Width="1.5" PointX="13.75" PointY="1.75" /> + <EntityTypeShape EntityType="RemoteModel.TECH_DISPENSERS" Width="1.5" PointX="15.75" PointY="1.75" /> + <EntityTypeShape EntityType="RemoteModel.TECH_HEATERS" Width="1.5" PointX="15.75" PointY="4.75" /> + <EntityTypeShape EntityType="RemoteModel.TECH_IOS" Width="1.5" PointX="15.75" PointY="14.75" /> + <EntityTypeShape EntityType="RemoteModel.TECH_MONITORS" Width="1.5" PointX="16.75" PointY="7.75" /> + <EntityTypeShape EntityType="RemoteModel.TECH_VALVES" Width="1.5" PointX="17.75" PointY="1.75" /> + <EntityTypeShape EntityType="RemoteModel.USER" Width="1.5" PointX="5.25" PointY="11.125" /> + <EntityTypeShape EntityType="RemoteModel.USERS_ROLES" Width="1.5" PointX="13.5" PointY="6.125" /> + <EntityTypeShape EntityType="RemoteModel.WINDING_METHODS" Width="1.5" PointX="6" PointY="39.125" /> <AssociationConnector Association="RemoteModel.FK_ORGANIZATIONS_ADDRESSES" /> <AssociationConnector Association="RemoteModel.FK_USERS_ADDRESSES" /> <AssociationConnector Association="RemoteModel.FK_CONFIGURATIONS_APPLICATION_DISPLAY_PANEL_VERSIONS" /> @@ -90,6 +89,7 @@ <AssociationConnector Association="RemoteModel.FK_CATS_RMLS" /> <AssociationConnector Association="RemoteModel.FK_CCTS_RMLS" /> <AssociationConnector Association="RemoteModel.FK_COLOR_CATALOGS_COLOR_SPACES" /> + <AssociationConnector Association="RemoteModel.FK_COLOR_CATALOGS_RMLS" /> <AssociationConnector Association="RemoteModel.FK_JOBS_COLOR_SPACES" /> <AssociationConnector Association="RemoteModel.FK_MACHINES_COLOR_SPACES" /> <AssociationConnector Association="RemoteModel.FK_CONFIGURATIONS_EMBEDDED_FIRMWARE_VERSIONS" /> @@ -141,7 +141,6 @@ <AssociationConnector Association="RemoteModel.FK_MACHINES_SPOOL_TYPES" /> <AssociationConnector Association="RemoteModel.FK_SPOOLS_MACHINES" /> <AssociationConnector Association="RemoteModel.FK_MACHINES_EVENTS_USERS" /> - <AssociationConnector Association="RemoteModel.FK_RML_MEDIA_COLORS" /> <AssociationConnector Association="RemoteModel.FK_RML_MEDIA_CONDITIONS" /> <AssociationConnector Association="RemoteModel.FK_RML_MEDIA_MATERIALS" /> <AssociationConnector Association="RemoteModel.FK_RML_MEDIA_PURPOSES" /> diff --git a/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj b/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj index 6938b6eca..508d9793e 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj +++ b/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj @@ -201,9 +201,6 @@ <Compile Include="DB\MACHINE_VERSIONS.cs"> <DependentUpon>RemoteADO.tt</DependentUpon> </Compile> - <Compile Include="DB\MEDIA_COLORS.cs"> - <DependentUpon>RemoteADO.tt</DependentUpon> - </Compile> <Compile Include="DB\MEDIA_CONDITIONS.cs"> <DependentUpon>RemoteADO.tt</DependentUpon> </Compile> @@ -347,7 +344,7 @@ </Target> <ProjectExtensions> <VisualStudio> - <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" /> + <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" /> </VisualStudio> </ProjectExtensions> </Project>
\ No newline at end of file |