From cabf65951454bee6665a1043f952c9972f62ad83 Mon Sep 17 00:00:00 2001 From: THE_KONDRAT Date: Sat, 30 Sep 2023 22:50:15 +0300 Subject: [PATCH] output directory variable --- Make3.Renderer/Program.cs | 4 +++- Make3.Renderer/TestClass.cs | 25 ++++++++++++++----------- 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/Make3.Renderer/Program.cs b/Make3.Renderer/Program.cs index 8b1958d..d624d08 100644 --- a/Make3.Renderer/Program.cs +++ b/Make3.Renderer/Program.cs @@ -9,9 +9,11 @@ Console.WriteLine("Hello, World!"); var filePath = @"F:\GS_TEST.png"; filePath = @"F:\GS_TEST_1.png"; +var outputDirectory = "F:\\"; + using (var s = new FileStream(filePath, FileMode.Open, FileAccess.Read)) { - var testClass = new TestClass(s); + var testClass = new TestClass(s, outputDirectory); testClass.Execute(); } Console.ReadLine(); diff --git a/Make3.Renderer/TestClass.cs b/Make3.Renderer/TestClass.cs index 4056aad..1a4dea5 100644 --- a/Make3.Renderer/TestClass.cs +++ b/Make3.Renderer/TestClass.cs @@ -5,15 +5,18 @@ namespace Make3.Renderer internal class TestClass { private readonly Mat _inputMat; + private readonly string _outputDirectory; - public TestClass(Stream stream) + public TestClass(Stream stream, string outputDirectory) { _inputMat = Mat.FromStream(stream, ImreadModes.Grayscale); ; + _outputDirectory = outputDirectory; } - public TestClass(Mat inputMat) + public TestClass(Mat inputMat, string outputDirectory) { _inputMat = inputMat; + _outputDirectory = outputDirectory; } internal void Execute() @@ -31,14 +34,14 @@ namespace Make3.Renderer closing.FindContours(out contours, out hierarchy, RetrievalModes.Tree, ContourApproximationModes.ApproxNone); var contNum = 0; - - //var allContursColored = GetContoursColored(contours, hierarchy, contNum); - + + var allContursColored = GetContoursColored(contours, hierarchy, contNum); + allContursColored.SaveImage(Path.Combine(_outputDirectory, $"GS_TEST_{contNum}_conturs_colored.png")); + var allConturs = GetContoursBW(contours, hierarchy, contNum); - allConturs.SaveImage(@$"F:\GS_TEST_c{contNum}.png"); + allConturs.SaveImage(Path.Combine(_outputDirectory, $"GS_TEST{contNum}_conturs_BW.png")); //colorSeparatedMats.Add(c); - allConturs.SaveImage(@$"F:\GS_TEST_cc{contNum}.png"); DistanceTransform(allConturs, contNum); } @@ -113,7 +116,7 @@ namespace Make3.Renderer /// /// /// - private static void DistanceTransform(Mat input, int contur) + private void DistanceTransform(Mat input, int contur) { var distanceTransform = input.EmptyClone(); //Cv2.DistanceTransform(dst1, dst2, DistanceTypes.L2, DistanceTransformMasks.Precise); @@ -121,8 +124,8 @@ namespace Make3.Renderer Cv2.DistanceTransformWithLabels(input, distanceTransform, labels, DistanceTypes.L2, DistanceTransformMasks.Precise, //Cv2.DistanceTransformWithLabels(dst1, dst2, labelIndexes, DistanceTypes.L2, DistanceTransformMasks.Mask3, DistanceTransformLabelTypes.Pixel); - distanceTransform.SaveImage(@$"F:\GS_TEST_ccc{contur}.png"); - + distanceTransform.SaveImage(Path.Combine(_outputDirectory, $"GS_TEST{contur}_distance_transform.png")); + //labels.PushBack(-1); var k = 1; for (int i = 0; i < distanceTransform.Height; i++) @@ -148,7 +151,7 @@ namespace Make3.Renderer } } - labels.SaveImage(@$"F:\GS_TEST_cccc{contur}.png"); + labels.SaveImage(Path.Combine(_outputDirectory, $"GS_TEST{contur}_distance_transform_labels.png")); } //private void B()