From c32489b040d20d4d20b2e760376770f31d7aa1f3 Mon Sep 17 00:00:00 2001 From: Mike Phares Date: Thu, 29 Sep 2022 18:57:46 -0700 Subject: [PATCH] Added cellInstanceName --- Adaptation/FileHandlers/jpeg/FileRead.cs | 2 +- Adaptation/FileHandlers/jpeg/ProcessData.cs | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Adaptation/FileHandlers/jpeg/FileRead.cs b/Adaptation/FileHandlers/jpeg/FileRead.cs index 5495482..1d6b35a 100644 --- a/Adaptation/FileHandlers/jpeg/FileRead.cs +++ b/Adaptation/FileHandlers/jpeg/FileRead.cs @@ -81,7 +81,7 @@ public class FileRead : Shared.FileRead, IFileRead _PreviousTotalDeltaCollection = new(); (_OffSetX, _OffSetY) = ProcessData.GetOffSet(_FileConnectorConfiguration.SourceDirectoryCloaking); string masterImageDirectory = GetPropertyValue(cellInstanceConnectionName, modelObjectParameters, "Path.Memory.Master.Images"); - List<(string File, Size Size, Color[] Colors)> colorCollections = ProcessData.GetColorCollections(_StartX, _StartY, _EndX, _EndY, _OffSetX, _OffSetY, masterImageDirectory); + List<(string File, Size Size, Color[] Colors)> colorCollections = ProcessData.GetColorCollections(_StartX, _StartY, _EndX, _EndY, _OffSetX, _OffSetY, cellInstanceName, masterImageDirectory); int[] distinctSizes = (from l in colorCollections select l.Size.Width * l.Size.Height).Distinct().ToArray(); if (distinctSizes.Length != 1) throw new Exception($"All Master Images must be the same size{Environment.NewLine}{string.Join(Environment.NewLine, distinctSizes)}"); diff --git a/Adaptation/FileHandlers/jpeg/ProcessData.cs b/Adaptation/FileHandlers/jpeg/ProcessData.cs index 4a45b74..700293e 100644 --- a/Adaptation/FileHandlers/jpeg/ProcessData.cs +++ b/Adaptation/FileHandlers/jpeg/ProcessData.cs @@ -238,13 +238,17 @@ public class ProcessData : IProcessData File.WriteAllLines(textFileName, lines); } - internal static List<(string, Size, Color[])> GetColorCollections(int startX, int startY, int endX, int endY, int offSetX, int offSetY, string masterImageDirectory) + internal static List<(string, Size, Color[])> GetColorCollections(int startX, int startY, int endX, int endY, int offSetX, int offSetY, string cellInstanceName, string masterImageDirectory) { List<(string, Size, Color[])> results = new(); (Size Size, Color[] Colors) result; + string fileName; string[] files = Directory.GetFiles(masterImageDirectory, "*.jpeg", SearchOption.TopDirectoryOnly); foreach (string file in files) { + fileName = Path.GetFileName(file); + if (!fileName.StartsWith(cellInstanceName)) + continue; result = Get(file, startX, startY, endX, endY, offSetX, offSetY); results.Add(new(file, result.Size, result.Colors)); }