Skip to content

Commit a5e490a

Browse files
shimatshimat
committed
namespace
1 parent e3fbdbd commit a5e490a

File tree

97 files changed

+1210
-1169
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

97 files changed

+1210
-1169
lines changed

‎SampleBase/Console/ConsoleMessagePrinter.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
using SampleBase.Interfaces;
2-
using System;
1+
using System;
2+
using SampleBase.Interfaces;
33

4-
namespace SampleBase
4+
namespace SampleBase.Console
55
{
66
public class ConsoleMessagePrinter : IMessagePrinter
77
{
@@ -16,12 +16,12 @@ public void PrintColorInfo(string message, bool newLine = true, ConsoleColor con
1616

1717
public void PrintObject(object obj, bool newLine = true, ConsoleColor consoleColor = ConsoleColor.White)
1818
{
19-
Console.ForegroundColor = consoleColor;
19+
System.Console.ForegroundColor = consoleColor;
2020
if (newLine)
21-
Console.WriteLine(obj);
21+
System.Console.WriteLine(obj);
2222
else
23-
Console.Write(obj);
24-
Console.ResetColor();
23+
System.Console.Write(obj);
24+
System.Console.ResetColor();
2525
}
2626

2727
public void PrintInfo(string message, bool newLine = true)

‎SampleBase/Console/ConsoleTestBase.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
using SampleBase.Interfaces;
2-
using System;
1+
using System;
2+
using SampleBase.Interfaces;
33

4-
namespace SampleBase
4+
namespace SampleBase.Console
55
{
66
public abstract class ConsoleTestBase : ITestBase
77
{
@@ -55,14 +55,14 @@ public IMessagePrinter GetMessagePrinter()
5555

5656
public string? WaitToInput()
5757
{
58-
return Console.ReadLine();
58+
return System.Console.ReadLine();
5959
}
6060

6161
public void WaitToContinue(string? tip = null)
6262
{
6363
if (tip != null)
64-
Console.WriteLine(tip);
65-
Console.ReadLine();
64+
System.Console.WriteLine(tip);
65+
System.Console.ReadLine();
6666
}
6767
}
6868
}

‎SampleBase/Console/ConsoleTestManager.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
using SampleBase.Interfaces;
2-
using System;
1+
using System;
32
using System.Collections.Generic;
43
using System.Diagnostics;
54
using System.Linq;
5+
using SampleBase.Interfaces;
66

7-
namespace SampleBase
7+
namespace SampleBase.Console
88
{
99
public class ConsoleTestManager : ITestManager
1010
{
@@ -68,7 +68,7 @@ public virtual void ShowTestNames()
6868
msgPrinter.PrintSuccess(
6969
$"Please enter a number to select the test to run.{Environment.NewLine}Enter {exitCode} to exit, Enter {inputClear} to clear history, Enter {inputHelp} to show help info.");
7070
ShowTestNames();
71-
return Console.ReadLine();
71+
return System.Console.ReadLine();
7272
}
7373

7474
/// <summary>
@@ -78,7 +78,7 @@ public virtual void ShowTestNames()
7878
private string? PrintErrorAndRead(string message)
7979
{
8080
msgPrinter.PrintError(message);
81-
return Console.ReadLine();
81+
return System.Console.ReadLine();
8282
}
8383

8484
private string GetNameOfTest(object test)
@@ -100,7 +100,7 @@ public virtual void ShowTestEntrance()
100100
{
101101
if (input?.ToLower() == inputClear)
102102
{
103-
Console.Clear();
103+
System.Console.Clear();
104104
PrintNamesAndRead();
105105
continue;
106106
}

‎SamplesCore/Program.cs‎

Lines changed: 56 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,66 +1,67 @@
11
using SampleBase;
22
using SampleBase.Interfaces;
33
using System;
4+
using SampleBase.Console;
5+
using OpenCvSharp;
46

5-
namespace SamplesCore
7+
namespace SamplesCore;
8+
9+
public static class Program
610
{
7-
public static class Program
11+
[STAThread]
12+
public static void Main(string[] args)
813
{
9-
[STAThread]
10-
public static void Main(string[] args)
11-
{
12-
Console.WriteLine("Runtime Version = {0}", Environment.Version);
14+
Console.WriteLine("Runtime Version = {0}", Environment.Version);
1315

14-
ITestManager testManager = new ConsoleTestManager();
16+
ITestManager testManager = new ConsoleTestManager();
1517

16-
testManager.AddTests(
17-
new ArucoSample(),
18-
new BgSubtractorMOG(),
19-
new BinarizerSample(),
20-
new BRISKSample(),
21-
new CaffeSample(),
22-
new CameraCaptureSample(),
23-
new ClaheSample(),
24-
new ConnectedComponentsSample(),
25-
new DFT(),
26-
new DnnSuperresSample(),
27-
new DrawBestMatchRectangle(),
28-
new FaceDetection(),
29-
new FaceDetectionDNN(),
30-
new FASTSample(),
31-
new FlannSample(),
32-
new FREAKSample(),
33-
new HandPose(),
34-
new HistSample(),
35-
new HOGSample(),
36-
new HoughLinesSample(),
37-
new InpaintSample(),
38-
new KAZESample(),
39-
new KAZESample2(),
40-
new MatOperations(),
41-
new MDS(),
42-
new MergeSplitSample(),
43-
new MorphologySample(),
44-
new MSERSample(),
45-
new NormalArrayOperations(),
46-
new OpenVinoFaceDetection(),
47-
new PhotoMethods(),
48-
new PixelAccess(),
49-
new Pose(),
50-
new SeamlessClone(),
51-
new SiftSurfSample(),
52-
new SimpleBlobDetectorSample(),
53-
new SolveEquation(),
54-
new StarDetectorSample(),
55-
new Stitching(),
56-
new Subdiv2DSample(),
57-
new SuperResolutionSample(),
58-
new SVMSample(),
59-
new VideoWriterSample(),
60-
new VideoCaptureSample(),
61-
new WatershedSample());
18+
testManager.AddTests(
19+
new ArucoSample(),
20+
new BgSubtractorMOG(),
21+
new BinarizerSample(),
22+
new BRISKSample(),
23+
new CaffeSample(),
24+
new CameraCaptureSample(),
25+
new ClaheSample(),
26+
new ConnectedComponentsSample(),
27+
new DFT(),
28+
new DnnSuperresSample(),
29+
new DrawBestMatchRectangle(),
30+
new FaceDetection(),
31+
new FaceDetectionDNN(),
32+
new FASTSample(),
33+
new FlannSample(),
34+
new FREAKSample(),
35+
new HandPose(),
36+
new HistSample(),
37+
new HOGSample(),
38+
new HoughLinesSample(),
39+
new InpaintSample(),
40+
new KAZESample(),
41+
new KAZESample2(),
42+
new MatOperations(),
43+
new MDS(),
44+
new MergeSplitSample(),
45+
new MorphologySample(),
46+
new MSERSample(),
47+
new NormalArrayOperations(),
48+
new OpenVinoFaceDetection(),
49+
new PhotoMethods(),
50+
new PixelAccess(),
51+
new Pose(),
52+
new SeamlessClone(),
53+
new SiftSurfSample(),
54+
new SimpleBlobDetectorSample(),
55+
new SolveEquation(),
56+
new StarDetectorSample(),
57+
new Stitching(),
58+
new Subdiv2DSample(),
59+
new SuperResolutionSample(),
60+
new SVMSample(),
61+
new VideoWriterSample(),
62+
new VideoCaptureSample(),
63+
new WatershedSample());
6264

63-
testManager.ShowTestEntrance();
64-
}
65+
testManager.ShowTestEntrance();
6566
}
6667
}

‎SamplesCore/Samples/ArucoSample.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,14 @@
33
using OpenCvSharp;
44
using OpenCvSharp.Aruco;
55
using SampleBase;
6+
using SampleBase.Console;
67

7-
namespace SamplesCore
8+
namespace SamplesCore;
9+
10+
public class ArucoSample : ConsoleTestBase
811
{
9-
public class ArucoSample : ConsoleTestBase
12+
public override void RunTest()
1013
{
11-
public override void RunTest()
12-
{
1314
// The locations of the markers in the image at FilePath.Image.Aruco.
1415
const int upperLeftMarkerId = 160;
1516
const int upperRightMarkerId = 268;
@@ -76,5 +77,4 @@ public override void RunTest()
7677

7778
Cv2.WaitKey();
7879
}
79-
}
8080
}

‎SamplesCore/Samples/BRISKSample.cs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
using OpenCvSharp;
22
using SampleBase;
3+
using SampleBase.Console;
34

4-
namespace SamplesCore
5+
namespace SamplesCore;
6+
7+
/// <summary>
8+
/// Retrieves keypoints using the BRISK algorithm.
9+
/// </summary>
10+
class BRISKSample : ConsoleTestBase
511
{
6-
/// <summary>
7-
/// Retrieves keypoints using the BRISK algorithm.
8-
/// </summary>
9-
class BRISKSample : ConsoleTestBase
12+
public override void RunTest()
1013
{
11-
public override void RunTest()
12-
{
1314
var gray = new Mat(ImagePath.Lenna, ImreadModes.Grayscale);
1415
var dst = new Mat(ImagePath.Lenna, ImreadModes.Color);
1516

@@ -39,5 +40,4 @@ public override void RunTest()
3940
Cv2.WaitKey();
4041
}
4142
}
42-
}
43-
}
43+
}

‎SamplesCore/Samples/BgSubtractorMOG.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
using OpenCvSharp;
22
using SampleBase;
3+
using SampleBase.Console;
34

4-
namespace SamplesCore
5+
namespace SamplesCore;
6+
7+
class BgSubtractorMOG : ConsoleTestBase
58
{
6-
class BgSubtractorMOG : ConsoleTestBase
9+
public override void RunTest()
710
{
8-
public override void RunTest()
9-
{
1011
using var capture = new VideoCapture(MoviePath.Bach);
1112
using var mog = BackgroundSubtractorMOG.Create();
1213
using var windowSrc = new Window("src");
@@ -26,5 +27,4 @@ public override void RunTest()
2627
Cv2.WaitKey(50);
2728
}
2829
}
29-
}
30-
}
30+
}

‎SamplesCore/Samples/BinarizerSample.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,14 @@
33
using OpenCvSharp;
44
using OpenCvSharp.XImgProc;
55
using SampleBase;
6+
using SampleBase.Console;
67

7-
namespace SamplesCore
8+
namespace SamplesCore;
9+
10+
internal class BinarizerSample : ConsoleTestBase
811
{
9-
internal class BinarizerSample : ConsoleTestBase
12+
public override void RunTest()
1013
{
11-
public override void RunTest()
12-
{
1314
using var src = Cv2.ImRead(ImagePath.Binarization, ImreadModes.Grayscale);
1415
using var niblack = new Mat();
1516
using var sauvola = new Mat();
@@ -40,5 +41,4 @@ public override void RunTest()
4041
Cv2.WaitKey();
4142
}
4243
}
43-
}
4444
}

0 commit comments

Comments
 (0)