Skip to content

Commit 7d82116

Browse files
MysticialMysticial
committed
Move more infra files.
1 parent 442cfb3 commit 7d82116

File tree

117 files changed

+1321
-1352
lines changed

Some content is hidden

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

117 files changed

+1321
-1352
lines changed

‎SerialPrograms/CMakeLists.txt‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -324,20 +324,14 @@ file(GLOB MAIN_SOURCES
324324
Source/CommonFramework/GlobalSettingsPanel.h
325325
Source/CommonFramework/Globals.cpp
326326
Source/CommonFramework/Globals.h
327-
Source/CommonFramework/ImageTools/BinaryImage_FilterRgb32.cpp
328-
Source/CommonFramework/ImageTools/BinaryImage_FilterRgb32.h
329327
Source/CommonFramework/ImageTools/FloatPixel.cpp
330328
Source/CommonFramework/ImageTools/FloatPixel.h
331329
Source/CommonFramework/ImageTools/ImageBoxes.cpp
332330
Source/CommonFramework/ImageTools/ImageBoxes.h
333-
Source/CommonFramework/ImageTools/ImageFilter.cpp
334-
Source/CommonFramework/ImageTools/ImageFilter.h
335-
Source/CommonFramework/ImageTools/ImageManip.cpp
336-
Source/CommonFramework/ImageTools/ImageManip.h
331+
Source/CommonFramework/ImageTools/ImageDiff.cpp
332+
Source/CommonFramework/ImageTools/ImageDiff.h
337333
Source/CommonFramework/ImageTools/ImageStats.cpp
338334
Source/CommonFramework/ImageTools/ImageStats.h
339-
Source/CommonFramework/ImageTools/WaterfillUtilities.cpp
340-
Source/CommonFramework/ImageTools/WaterfillUtilities.h
341335
Source/CommonFramework/ImageTypes/BinaryImage.cpp
342336
Source/CommonFramework/ImageTypes/BinaryImage.h
343337
Source/CommonFramework/ImageTypes/ImageHSV32.cpp
@@ -350,8 +344,6 @@ file(GLOB MAIN_SOURCES
350344
Source/CommonFramework/ImageTypes/ImageViewPlanar32.h
351345
Source/CommonFramework/ImageTypes/ImageViewRGB32.cpp
352346
Source/CommonFramework/ImageTypes/ImageViewRGB32.h
353-
Source/CommonFramework/Inference/StatAccumulator.cpp
354-
Source/CommonFramework/Inference/StatAccumulator.h
355347
Source/CommonFramework/Language.cpp
356348
Source/CommonFramework/Language.h
357349
Source/CommonFramework/Logging/FileWindowLogger.cpp
@@ -438,6 +430,8 @@ file(GLOB MAIN_SOURCES
438430
Source/CommonFramework/Tools/FileDownloader.h
439431
Source/CommonFramework/Tools/ProgramEnvironment.cpp
440432
Source/CommonFramework/Tools/ProgramEnvironment.h
433+
Source/CommonFramework/Tools/StatAccumulator.cpp
434+
Source/CommonFramework/Tools/StatAccumulator.h
441435
Source/CommonFramework/Tools/VideoStream.cpp
442436
Source/CommonFramework/Tools/VideoStream.h
443437
Source/CommonFramework/VideoPipeline/Backends/CameraImplementations.cpp
@@ -512,8 +506,6 @@ file(GLOB MAIN_SOURCES
512506
Source/CommonTools/ImageMatch/FilterToAlpha.h
513507
Source/CommonTools/ImageMatch/ImageCropper.cpp
514508
Source/CommonTools/ImageMatch/ImageCropper.h
515-
Source/CommonTools/ImageMatch/ImageDiff.cpp
516-
Source/CommonTools/ImageMatch/ImageDiff.h
517509
Source/CommonTools/ImageMatch/ImageMatchOption.cpp
518510
Source/CommonTools/ImageMatch/ImageMatchOption.h
519511
Source/CommonTools/ImageMatch/ImageMatchResult.cpp
@@ -524,15 +516,23 @@ file(GLOB MAIN_SOURCES
524516
Source/CommonTools/ImageMatch/SubObjectTemplateMatcher.h
525517
Source/CommonTools/ImageMatch/WaterfillTemplateMatcher.cpp
526518
Source/CommonTools/ImageMatch/WaterfillTemplateMatcher.h
519+
Source/CommonTools/Images/BinaryImage_FilterRgb32.cpp
520+
Source/CommonTools/Images/BinaryImage_FilterRgb32.h
527521
Source/CommonTools/Images/ColorClustering.cpp
528522
Source/CommonTools/Images/ColorClustering.h
529523
Source/CommonTools/Images/DistanceToLine.h
524+
Source/CommonTools/Images/ImageFilter.cpp
525+
Source/CommonTools/Images/ImageFilter.h
530526
Source/CommonTools/Images/ImageGradient.cpp
531527
Source/CommonTools/Images/ImageGradient.h
528+
Source/CommonTools/Images/ImageManip.cpp
529+
Source/CommonTools/Images/ImageManip.h
532530
Source/CommonTools/Images/ImageTools.cpp
533531
Source/CommonTools/Images/ImageTools.h
534532
Source/CommonTools/Images/SolidColorTest.cpp
535533
Source/CommonTools/Images/SolidColorTest.h
534+
Source/CommonTools/Images/WaterfillUtilities.cpp
535+
Source/CommonTools/Images/WaterfillUtilities.h
536536
Source/CommonTools/InferenceCallbacks/AudioInferenceCallback.h
537537
Source/CommonTools/InferenceCallbacks/InferenceCallback.h
538538
Source/CommonTools/InferenceCallbacks/VisualInferenceCallback.cpp

‎SerialPrograms/SerialPrograms.pro‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -184,20 +184,16 @@ SOURCES += \
184184
Source/CommonFramework/GlobalServices.cpp \
185185
Source/CommonFramework/GlobalSettingsPanel.cpp \
186186
Source/CommonFramework/Globals.cpp \
187-
Source/CommonFramework/ImageTools/BinaryImage_FilterRgb32.cpp \
188187
Source/CommonFramework/ImageTools/FloatPixel.cpp \
189188
Source/CommonFramework/ImageTools/ImageBoxes.cpp \
190-
Source/CommonFramework/ImageTools/ImageFilter.cpp \
191-
Source/CommonFramework/ImageTools/ImageManip.cpp \
189+
Source/CommonFramework/ImageTools/ImageDiff.cpp \
192190
Source/CommonFramework/ImageTools/ImageStats.cpp \
193-
Source/CommonFramework/ImageTools/WaterfillUtilities.cpp \
194191
Source/CommonFramework/ImageTypes/BinaryImage.cpp \
195192
Source/CommonFramework/ImageTypes/ImageHSV32.cpp \
196193
Source/CommonFramework/ImageTypes/ImageRGB32.cpp \
197194
Source/CommonFramework/ImageTypes/ImageViewHSV32.cpp \
198195
Source/CommonFramework/ImageTypes/ImageViewPlanar32.cpp \
199196
Source/CommonFramework/ImageTypes/ImageViewRGB32.cpp \
200-
Source/CommonFramework/Inference/StatAccumulator.cpp \
201197
Source/CommonFramework/Language.cpp \
202198
Source/CommonFramework/Logging/FileWindowLogger.cpp \
203199
Source/CommonFramework/Logging/Logger.cpp \
@@ -237,6 +233,7 @@ SOURCES += \
237233
Source/CommonFramework/Tools/ErrorDumper.cpp \
238234
Source/CommonFramework/Tools/FileDownloader.cpp \
239235
Source/CommonFramework/Tools/ProgramEnvironment.cpp \
236+
Source/CommonFramework/Tools/StatAccumulator.cpp \
240237
Source/CommonFramework/Tools/VideoStream.cpp \
241238
Source/CommonFramework/VideoPipeline/Backends/CameraImplementations.cpp \
242239
Source/CommonFramework/VideoPipeline/Backends/CameraWidgetQt5.cpp \
@@ -265,16 +262,19 @@ SOURCES += \
265262
Source/CommonTools/ImageMatch/ExactImageMatcher.cpp \
266263
Source/CommonTools/ImageMatch/FilterToAlpha.cpp \
267264
Source/CommonTools/ImageMatch/ImageCropper.cpp \
268-
Source/CommonTools/ImageMatch/ImageDiff.cpp \
269265
Source/CommonTools/ImageMatch/ImageMatchOption.cpp \
270266
Source/CommonTools/ImageMatch/ImageMatchResult.cpp \
271267
Source/CommonTools/ImageMatch/SilhouetteDictionaryMatcher.cpp \
272268
Source/CommonTools/ImageMatch/SubObjectTemplateMatcher.cpp \
273269
Source/CommonTools/ImageMatch/WaterfillTemplateMatcher.cpp \
270+
Source/CommonTools/Images/BinaryImage_FilterRgb32.cpp \
274271
Source/CommonTools/Images/ColorClustering.cpp \
272+
Source/CommonTools/Images/ImageFilter.cpp \
275273
Source/CommonTools/Images/ImageGradient.cpp \
274+
Source/CommonTools/Images/ImageManip.cpp \
276275
Source/CommonTools/Images/ImageTools.cpp \
277276
Source/CommonTools/Images/SolidColorTest.cpp \
277+
Source/CommonTools/Images/WaterfillUtilities.cpp \
278278
Source/CommonTools/InferenceCallbacks/VisualInferenceCallback.cpp \
279279
Source/CommonTools/InferencePivots/AudioInferencePivot.cpp \
280280
Source/CommonTools/InferencePivots/VisualInferencePivot.cpp \
@@ -1270,20 +1270,16 @@ HEADERS += \
12701270
Source/CommonFramework/GlobalServices.h \
12711271
Source/CommonFramework/GlobalSettingsPanel.h \
12721272
Source/CommonFramework/Globals.h \
1273-
Source/CommonFramework/ImageTools/BinaryImage_FilterRgb32.h \
12741273
Source/CommonFramework/ImageTools/FloatPixel.h \
12751274
Source/CommonFramework/ImageTools/ImageBoxes.h \
1276-
Source/CommonFramework/ImageTools/ImageFilter.h \
1277-
Source/CommonFramework/ImageTools/ImageManip.h \
1275+
Source/CommonFramework/ImageTools/ImageDiff.h \
12781276
Source/CommonFramework/ImageTools/ImageStats.h \
1279-
Source/CommonFramework/ImageTools/WaterfillUtilities.h \
12801277
Source/CommonFramework/ImageTypes/BinaryImage.h \
12811278
Source/CommonFramework/ImageTypes/ImageHSV32.h \
12821279
Source/CommonFramework/ImageTypes/ImageRGB32.h \
12831280
Source/CommonFramework/ImageTypes/ImageViewHSV32.h \
12841281
Source/CommonFramework/ImageTypes/ImageViewPlanar32.h \
12851282
Source/CommonFramework/ImageTypes/ImageViewRGB32.h \
1286-
Source/CommonFramework/Inference/StatAccumulator.h \
12871283
Source/CommonFramework/Language.h \
12881284
Source/CommonFramework/Logging/FileWindowLogger.h \
12891285
Source/CommonFramework/Logging/Logger.h \
@@ -1328,6 +1324,7 @@ HEADERS += \
13281324
Source/CommonFramework/Tools/ErrorDumper.h \
13291325
Source/CommonFramework/Tools/FileDownloader.h \
13301326
Source/CommonFramework/Tools/ProgramEnvironment.h \
1327+
Source/CommonFramework/Tools/StatAccumulator.h \
13311328
Source/CommonFramework/Tools/VideoStream.h \
13321329
Source/CommonFramework/VideoPipeline/Backends/CameraImplementations.h \
13331330
Source/CommonFramework/VideoPipeline/Backends/CameraWidgetQt5.h \
@@ -1368,17 +1365,20 @@ HEADERS += \
13681365
Source/CommonTools/ImageMatch/ExactImageMatcher.h \
13691366
Source/CommonTools/ImageMatch/FilterToAlpha.h \
13701367
Source/CommonTools/ImageMatch/ImageCropper.h \
1371-
Source/CommonTools/ImageMatch/ImageDiff.h \
13721368
Source/CommonTools/ImageMatch/ImageMatchOption.h \
13731369
Source/CommonTools/ImageMatch/ImageMatchResult.h \
13741370
Source/CommonTools/ImageMatch/SilhouetteDictionaryMatcher.h \
13751371
Source/CommonTools/ImageMatch/SubObjectTemplateMatcher.h \
13761372
Source/CommonTools/ImageMatch/WaterfillTemplateMatcher.h \
1373+
Source/CommonTools/Images/BinaryImage_FilterRgb32.h \
13771374
Source/CommonTools/Images/ColorClustering.h \
13781375
Source/CommonTools/Images/DistanceToLine.h \
1376+
Source/CommonTools/Images/ImageFilter.h \
13791377
Source/CommonTools/Images/ImageGradient.h \
1378+
Source/CommonTools/Images/ImageManip.h \
13801379
Source/CommonTools/Images/ImageTools.h \
13811380
Source/CommonTools/Images/SolidColorTest.h \
1381+
Source/CommonTools/Images/WaterfillUtilities.h \
13821382
Source/CommonTools/InferenceCallbacks/AudioInferenceCallback.h \
13831383
Source/CommonTools/InferenceCallbacks/InferenceCallback.h \
13841384
Source/CommonTools/InferenceCallbacks/VisualInferenceCallback.h \

SerialPrograms/Source/CommonTools/ImageMatch/ImageDiff.cpp renamed to SerialPrograms/Source/CommonFramework/ImageTools/ImageDiff.cpp

File renamed without changes.

SerialPrograms/Source/CommonTools/ImageMatch/ImageDiff.h renamed to SerialPrograms/Source/CommonFramework/ImageTools/ImageDiff.h

File renamed without changes.

0 commit comments

Comments
 (0)