Skip to content

Commit a9168b9

Browse files
MysticialMysticial
committed
Move CommonFramework/ImageMatch/ to CommonTools/ImageMatch/.
1 parent 57ceee5 commit a9168b9

File tree

173 files changed

+4359
-417
lines changed

Some content is hidden

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

173 files changed

+4359
-417
lines changed

‎SerialPrograms/CMakeLists.txt‎

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -324,28 +324,6 @@ file(GLOB MAIN_SOURCES
324324
Source/CommonFramework/GlobalSettingsPanel.h
325325
Source/CommonFramework/Globals.cpp
326326
Source/CommonFramework/Globals.h
327-
Source/CommonFramework/ImageMatch/CroppedImageDictionaryMatcher.cpp
328-
Source/CommonFramework/ImageMatch/CroppedImageDictionaryMatcher.h
329-
Source/CommonFramework/ImageMatch/ExactImageDictionaryMatcher.cpp
330-
Source/CommonFramework/ImageMatch/ExactImageDictionaryMatcher.h
331-
Source/CommonFramework/ImageMatch/ExactImageMatcher.cpp
332-
Source/CommonFramework/ImageMatch/ExactImageMatcher.h
333-
Source/CommonFramework/ImageMatch/FilterToAlpha.cpp
334-
Source/CommonFramework/ImageMatch/FilterToAlpha.h
335-
Source/CommonFramework/ImageMatch/ImageCropper.cpp
336-
Source/CommonFramework/ImageMatch/ImageCropper.h
337-
Source/CommonFramework/ImageMatch/ImageDiff.cpp
338-
Source/CommonFramework/ImageMatch/ImageDiff.h
339-
Source/CommonFramework/ImageMatch/ImageMatchOption.cpp
340-
Source/CommonFramework/ImageMatch/ImageMatchOption.h
341-
Source/CommonFramework/ImageMatch/ImageMatchResult.cpp
342-
Source/CommonFramework/ImageMatch/ImageMatchResult.h
343-
Source/CommonFramework/ImageMatch/SilhouetteDictionaryMatcher.cpp
344-
Source/CommonFramework/ImageMatch/SilhouetteDictionaryMatcher.h
345-
Source/CommonFramework/ImageMatch/SubObjectTemplateMatcher.cpp
346-
Source/CommonFramework/ImageMatch/SubObjectTemplateMatcher.h
347-
Source/CommonFramework/ImageMatch/WaterfillTemplateMatcher.cpp
348-
Source/CommonFramework/ImageMatch/WaterfillTemplateMatcher.h
349327
Source/CommonFramework/ImageTools/BinaryImage_FilterRgb32.cpp
350328
Source/CommonFramework/ImageTools/BinaryImage_FilterRgb32.h
351329
Source/CommonFramework/ImageTools/FloatPixel.cpp
@@ -396,28 +374,6 @@ file(GLOB MAIN_SOURCES
396374
Source/CommonFramework/Notifications/ProgramNotifications.h
397375
Source/CommonFramework/Notifications/SenderNotificationTable.cpp
398376
Source/CommonFramework/Notifications/SenderNotificationTable.h
399-
Source/CommonFramework/OCR/OCR_DictionaryMatcher.cpp
400-
Source/CommonFramework/OCR/OCR_DictionaryMatcher.h
401-
Source/CommonFramework/OCR/OCR_DictionaryOCR.cpp
402-
Source/CommonFramework/OCR/OCR_DictionaryOCR.h
403-
Source/CommonFramework/OCR/OCR_LargeDictionaryMatcher.cpp
404-
Source/CommonFramework/OCR/OCR_LargeDictionaryMatcher.h
405-
Source/CommonFramework/OCR/OCR_NumberReader.cpp
406-
Source/CommonFramework/OCR/OCR_NumberReader.h
407-
Source/CommonFramework/OCR/OCR_RawOCR.cpp
408-
Source/CommonFramework/OCR/OCR_RawOCR.h
409-
Source/CommonFramework/OCR/OCR_Routines.cpp
410-
Source/CommonFramework/OCR/OCR_Routines.h
411-
Source/CommonFramework/OCR/OCR_SmallDictionaryMatcher.cpp
412-
Source/CommonFramework/OCR/OCR_SmallDictionaryMatcher.h
413-
Source/CommonFramework/OCR/OCR_StringMatchResult.cpp
414-
Source/CommonFramework/OCR/OCR_StringMatchResult.h
415-
Source/CommonFramework/OCR/OCR_StringNormalization.cpp
416-
Source/CommonFramework/OCR/OCR_StringNormalization.h
417-
Source/CommonFramework/OCR/OCR_TextMatcher.cpp
418-
Source/CommonFramework/OCR/OCR_TextMatcher.h
419-
Source/CommonFramework/OCR/OCR_TrainingTools.cpp
420-
Source/CommonFramework/OCR/OCR_TrainingTools.h
421377
Source/CommonFramework/Options/Environment/PerformanceOptions.h
422378
Source/CommonFramework/Options/Environment/ProcessPriorityOption.h
423379
Source/CommonFramework/Options/Environment/ProcessorLevelOption.cpp
@@ -546,6 +502,28 @@ file(GLOB MAIN_SOURCES
546502
Source/CommonTools/Audio/SpectrogramMatcher.cpp
547503
Source/CommonTools/Audio/SpectrogramMatcher.h
548504
Source/CommonTools/DetectionDebouncer.h
505+
Source/CommonTools/ImageMatch/CroppedImageDictionaryMatcher.cpp
506+
Source/CommonTools/ImageMatch/CroppedImageDictionaryMatcher.h
507+
Source/CommonTools/ImageMatch/ExactImageDictionaryMatcher.cpp
508+
Source/CommonTools/ImageMatch/ExactImageDictionaryMatcher.h
509+
Source/CommonTools/ImageMatch/ExactImageMatcher.cpp
510+
Source/CommonTools/ImageMatch/ExactImageMatcher.h
511+
Source/CommonTools/ImageMatch/FilterToAlpha.cpp
512+
Source/CommonTools/ImageMatch/FilterToAlpha.h
513+
Source/CommonTools/ImageMatch/ImageCropper.cpp
514+
Source/CommonTools/ImageMatch/ImageCropper.h
515+
Source/CommonTools/ImageMatch/ImageDiff.cpp
516+
Source/CommonTools/ImageMatch/ImageDiff.h
517+
Source/CommonTools/ImageMatch/ImageMatchOption.cpp
518+
Source/CommonTools/ImageMatch/ImageMatchOption.h
519+
Source/CommonTools/ImageMatch/ImageMatchResult.cpp
520+
Source/CommonTools/ImageMatch/ImageMatchResult.h
521+
Source/CommonTools/ImageMatch/SilhouetteDictionaryMatcher.cpp
522+
Source/CommonTools/ImageMatch/SilhouetteDictionaryMatcher.h
523+
Source/CommonTools/ImageMatch/SubObjectTemplateMatcher.cpp
524+
Source/CommonTools/ImageMatch/SubObjectTemplateMatcher.h
525+
Source/CommonTools/ImageMatch/WaterfillTemplateMatcher.cpp
526+
Source/CommonTools/ImageMatch/WaterfillTemplateMatcher.h
549527
Source/CommonTools/Images/ColorClustering.cpp
550528
Source/CommonTools/Images/ColorClustering.h
551529
Source/CommonTools/Images/DistanceToLine.h
@@ -564,6 +542,28 @@ file(GLOB MAIN_SOURCES
564542
Source/CommonTools/InferencePivots/VisualInferencePivot.cpp
565543
Source/CommonTools/InferencePivots/VisualInferencePivot.h
566544
Source/CommonTools/InferenceThrottler.h
545+
Source/CommonTools/OCR/OCR_DictionaryMatcher.cpp
546+
Source/CommonTools/OCR/OCR_DictionaryMatcher.h
547+
Source/CommonTools/OCR/OCR_DictionaryOCR.cpp
548+
Source/CommonTools/OCR/OCR_DictionaryOCR.h
549+
Source/CommonTools/OCR/OCR_LargeDictionaryMatcher.cpp
550+
Source/CommonTools/OCR/OCR_LargeDictionaryMatcher.h
551+
Source/CommonTools/OCR/OCR_NumberReader.cpp
552+
Source/CommonTools/OCR/OCR_NumberReader.h
553+
Source/CommonTools/OCR/OCR_RawOCR.cpp
554+
Source/CommonTools/OCR/OCR_RawOCR.h
555+
Source/CommonTools/OCR/OCR_Routines.cpp
556+
Source/CommonTools/OCR/OCR_Routines.h
557+
Source/CommonTools/OCR/OCR_SmallDictionaryMatcher.cpp
558+
Source/CommonTools/OCR/OCR_SmallDictionaryMatcher.h
559+
Source/CommonTools/OCR/OCR_StringMatchResult.cpp
560+
Source/CommonTools/OCR/OCR_StringMatchResult.h
561+
Source/CommonTools/OCR/OCR_StringNormalization.cpp
562+
Source/CommonTools/OCR/OCR_StringNormalization.h
563+
Source/CommonTools/OCR/OCR_TextMatcher.cpp
564+
Source/CommonTools/OCR/OCR_TextMatcher.h
565+
Source/CommonTools/OCR/OCR_TrainingTools.cpp
566+
Source/CommonTools/OCR/OCR_TrainingTools.h
567567
Source/CommonTools/Options/LanguageOCROption.cpp
568568
Source/CommonTools/Options/LanguageOCROption.h
569569
Source/CommonTools/Options/ScreenWatchOption.cpp

‎SerialPrograms/SerialPrograms.pro‎

Lines changed: 44 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -184,17 +184,6 @@ SOURCES += \
184184
Source/CommonFramework/GlobalServices.cpp \
185185
Source/CommonFramework/GlobalSettingsPanel.cpp \
186186
Source/CommonFramework/Globals.cpp \
187-
Source/CommonFramework/ImageMatch/CroppedImageDictionaryMatcher.cpp \
188-
Source/CommonFramework/ImageMatch/ExactImageDictionaryMatcher.cpp \
189-
Source/CommonFramework/ImageMatch/ExactImageMatcher.cpp \
190-
Source/CommonFramework/ImageMatch/FilterToAlpha.cpp \
191-
Source/CommonFramework/ImageMatch/ImageCropper.cpp \
192-
Source/CommonFramework/ImageMatch/ImageDiff.cpp \
193-
Source/CommonFramework/ImageMatch/ImageMatchOption.cpp \
194-
Source/CommonFramework/ImageMatch/ImageMatchResult.cpp \
195-
Source/CommonFramework/ImageMatch/SilhouetteDictionaryMatcher.cpp \
196-
Source/CommonFramework/ImageMatch/SubObjectTemplateMatcher.cpp \
197-
Source/CommonFramework/ImageMatch/WaterfillTemplateMatcher.cpp \
198187
Source/CommonFramework/ImageTools/BinaryImage_FilterRgb32.cpp \
199188
Source/CommonFramework/ImageTools/FloatPixel.cpp \
200189
Source/CommonFramework/ImageTools/ImageBoxes.cpp \
@@ -220,17 +209,6 @@ SOURCES += \
220209
Source/CommonFramework/Notifications/MessageAttachment.cpp \
221210
Source/CommonFramework/Notifications/ProgramNotifications.cpp \
222211
Source/CommonFramework/Notifications/SenderNotificationTable.cpp \
223-
Source/CommonFramework/OCR/OCR_DictionaryMatcher.cpp \
224-
Source/CommonFramework/OCR/OCR_DictionaryOCR.cpp \
225-
Source/CommonFramework/OCR/OCR_LargeDictionaryMatcher.cpp \
226-
Source/CommonFramework/OCR/OCR_NumberReader.cpp \
227-
Source/CommonFramework/OCR/OCR_RawOCR.cpp \
228-
Source/CommonFramework/OCR/OCR_Routines.cpp \
229-
Source/CommonFramework/OCR/OCR_SmallDictionaryMatcher.cpp \
230-
Source/CommonFramework/OCR/OCR_StringMatchResult.cpp \
231-
Source/CommonFramework/OCR/OCR_StringNormalization.cpp \
232-
Source/CommonFramework/OCR/OCR_TextMatcher.cpp \
233-
Source/CommonFramework/OCR/OCR_TrainingTools.cpp \
234212
Source/CommonFramework/Options/Environment/ProcessorLevelOption.cpp \
235213
Source/CommonFramework/Options/Environment/SleepSuppressOption.cpp \
236214
Source/CommonFramework/Options/Environment/ThemeSelectorOption.cpp \
@@ -282,6 +260,17 @@ SOURCES += \
282260
Source/CommonTools/Audio/AudioPerSpectrumDetectorBase.cpp \
283261
Source/CommonTools/Audio/AudioTemplateCache.cpp \
284262
Source/CommonTools/Audio/SpectrogramMatcher.cpp \
263+
Source/CommonTools/ImageMatch/CroppedImageDictionaryMatcher.cpp \
264+
Source/CommonTools/ImageMatch/ExactImageDictionaryMatcher.cpp \
265+
Source/CommonTools/ImageMatch/ExactImageMatcher.cpp \
266+
Source/CommonTools/ImageMatch/FilterToAlpha.cpp \
267+
Source/CommonTools/ImageMatch/ImageCropper.cpp \
268+
Source/CommonTools/ImageMatch/ImageDiff.cpp \
269+
Source/CommonTools/ImageMatch/ImageMatchOption.cpp \
270+
Source/CommonTools/ImageMatch/ImageMatchResult.cpp \
271+
Source/CommonTools/ImageMatch/SilhouetteDictionaryMatcher.cpp \
272+
Source/CommonTools/ImageMatch/SubObjectTemplateMatcher.cpp \
273+
Source/CommonTools/ImageMatch/WaterfillTemplateMatcher.cpp \
285274
Source/CommonTools/Images/ColorClustering.cpp \
286275
Source/CommonTools/Images/ImageGradient.cpp \
287276
Source/CommonTools/Images/ImageTools.cpp \
@@ -290,6 +279,17 @@ SOURCES += \
290279
Source/CommonTools/InferencePivots/AudioInferencePivot.cpp \
291280
Source/CommonTools/InferencePivots/VisualInferencePivot.cpp \
292281
Source/CommonTools/MultiConsoleErrors.cpp \
282+
Source/CommonTools/OCR/OCR_DictionaryMatcher.cpp \
283+
Source/CommonTools/OCR/OCR_DictionaryOCR.cpp \
284+
Source/CommonTools/OCR/OCR_LargeDictionaryMatcher.cpp \
285+
Source/CommonTools/OCR/OCR_NumberReader.cpp \
286+
Source/CommonTools/OCR/OCR_RawOCR.cpp \
287+
Source/CommonTools/OCR/OCR_Routines.cpp \
288+
Source/CommonTools/OCR/OCR_SmallDictionaryMatcher.cpp \
289+
Source/CommonTools/OCR/OCR_StringMatchResult.cpp \
290+
Source/CommonTools/OCR/OCR_StringNormalization.cpp \
291+
Source/CommonTools/OCR/OCR_TextMatcher.cpp \
292+
Source/CommonTools/OCR/OCR_TrainingTools.cpp \
293293
Source/CommonTools/Options/LanguageOCROption.cpp \
294294
Source/CommonTools/Options/QtWidgets/LanguageOCRWidget.cpp \
295295
Source/CommonTools/Options/QtWidgets/ScreenWatchWidget.cpp \
@@ -1270,17 +1270,6 @@ HEADERS += \
12701270
Source/CommonFramework/GlobalServices.h \
12711271
Source/CommonFramework/GlobalSettingsPanel.h \
12721272
Source/CommonFramework/Globals.h \
1273-
Source/CommonFramework/ImageMatch/CroppedImageDictionaryMatcher.h \
1274-
Source/CommonFramework/ImageMatch/ExactImageDictionaryMatcher.h \
1275-
Source/CommonFramework/ImageMatch/ExactImageMatcher.h \
1276-
Source/CommonFramework/ImageMatch/FilterToAlpha.h \
1277-
Source/CommonFramework/ImageMatch/ImageCropper.h \
1278-
Source/CommonFramework/ImageMatch/ImageDiff.h \
1279-
Source/CommonFramework/ImageMatch/ImageMatchOption.h \
1280-
Source/CommonFramework/ImageMatch/ImageMatchResult.h \
1281-
Source/CommonFramework/ImageMatch/SilhouetteDictionaryMatcher.h \
1282-
Source/CommonFramework/ImageMatch/SubObjectTemplateMatcher.h \
1283-
Source/CommonFramework/ImageMatch/WaterfillTemplateMatcher.h \
12841273
Source/CommonFramework/ImageTools/BinaryImage_FilterRgb32.h \
12851274
Source/CommonFramework/ImageTools/FloatPixel.h \
12861275
Source/CommonFramework/ImageTools/ImageBoxes.h \
@@ -1306,17 +1295,6 @@ HEADERS += \
13061295
Source/CommonFramework/Notifications/ProgramInfo.h \
13071296
Source/CommonFramework/Notifications/ProgramNotifications.h \
13081297
Source/CommonFramework/Notifications/SenderNotificationTable.h \
1309-
Source/CommonFramework/OCR/OCR_DictionaryMatcher.h \
1310-
Source/CommonFramework/OCR/OCR_DictionaryOCR.h \
1311-
Source/CommonFramework/OCR/OCR_LargeDictionaryMatcher.h \
1312-
Source/CommonFramework/OCR/OCR_NumberReader.h \
1313-
Source/CommonFramework/OCR/OCR_RawOCR.h \
1314-
Source/CommonFramework/OCR/OCR_Routines.h \
1315-
Source/CommonFramework/OCR/OCR_SmallDictionaryMatcher.h \
1316-
Source/CommonFramework/OCR/OCR_StringMatchResult.h \
1317-
Source/CommonFramework/OCR/OCR_StringNormalization.h \
1318-
Source/CommonFramework/OCR/OCR_TextMatcher.h \
1319-
Source/CommonFramework/OCR/OCR_TrainingTools.h \
13201298
Source/CommonFramework/Options/Environment/PerformanceOptions.h \
13211299
Source/CommonFramework/Options/Environment/ProcessPriorityOption.h \
13221300
Source/CommonFramework/Options/Environment/ProcessorLevelOption.h \
@@ -1385,6 +1363,17 @@ HEADERS += \
13851363
Source/CommonTools/Audio/AudioTemplateCache.h \
13861364
Source/CommonTools/Audio/SpectrogramMatcher.h \
13871365
Source/CommonTools/DetectionDebouncer.h \
1366+
Source/CommonTools/ImageMatch/CroppedImageDictionaryMatcher.h \
1367+
Source/CommonTools/ImageMatch/ExactImageDictionaryMatcher.h \
1368+
Source/CommonTools/ImageMatch/ExactImageMatcher.h \
1369+
Source/CommonTools/ImageMatch/FilterToAlpha.h \
1370+
Source/CommonTools/ImageMatch/ImageCropper.h \
1371+
Source/CommonTools/ImageMatch/ImageDiff.h \
1372+
Source/CommonTools/ImageMatch/ImageMatchOption.h \
1373+
Source/CommonTools/ImageMatch/ImageMatchResult.h \
1374+
Source/CommonTools/ImageMatch/SilhouetteDictionaryMatcher.h \
1375+
Source/CommonTools/ImageMatch/SubObjectTemplateMatcher.h \
1376+
Source/CommonTools/ImageMatch/WaterfillTemplateMatcher.h \
13881377
Source/CommonTools/Images/ColorClustering.h \
13891378
Source/CommonTools/Images/DistanceToLine.h \
13901379
Source/CommonTools/Images/ImageGradient.h \
@@ -1394,10 +1383,20 @@ HEADERS += \
13941383
Source/CommonTools/InferenceCallbacks/InferenceCallback.h \
13951384
Source/CommonTools/InferenceCallbacks/VisualInferenceCallback.h \
13961385
Source/CommonTools/InferencePivots/AudioInferencePivot.h \
1397-
Source/CommonTools/InferencePivots/InferenceCallback.h \
13981386
Source/CommonTools/InferencePivots/VisualInferencePivot.h \
13991387
Source/CommonTools/InferenceThrottler.h \
14001388
Source/CommonTools/MultiConsoleErrors.h \
1389+
Source/CommonTools/OCR/OCR_DictionaryMatcher.h \
1390+
Source/CommonTools/OCR/OCR_DictionaryOCR.h \
1391+
Source/CommonTools/OCR/OCR_LargeDictionaryMatcher.h \
1392+
Source/CommonTools/OCR/OCR_NumberReader.h \
1393+
Source/CommonTools/OCR/OCR_RawOCR.h \
1394+
Source/CommonTools/OCR/OCR_Routines.h \
1395+
Source/CommonTools/OCR/OCR_SmallDictionaryMatcher.h \
1396+
Source/CommonTools/OCR/OCR_StringMatchResult.h \
1397+
Source/CommonTools/OCR/OCR_StringNormalization.h \
1398+
Source/CommonTools/OCR/OCR_TextMatcher.h \
1399+
Source/CommonTools/OCR/OCR_TrainingTools.h \
14011400
Source/CommonTools/Options/LanguageOCROption.h \
14021401
Source/CommonTools/Options/QtWidgets/LanguageOCRWidget.h \
14031402
Source/CommonTools/Options/QtWidgets/ScreenWatchWidget.h \

‎SerialPrograms/Source/CommonFramework/ImageTools/WaterfillUtilities.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
#include "Kernels/Waterfill/Kernels_Waterfill_Types.h"
1111
#include "CommonFramework/GlobalSettingsPanel.h"
1212
#include "CommonFramework/Logging/Logger.h"
13-
#include "CommonFramework/ImageMatch/WaterfillTemplateMatcher.h"
1413
#include "CommonFramework/ImageTools/BinaryImage_FilterRgb32.h"
1514
#include "CommonFramework/ImageTypes/ImageRGB32.h"
1615
#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
1716
#include "CommonFramework/Tools/DebugDumper.h"
17+
#include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h"
1818
#include "WaterfillUtilities.h"
1919

2020
#include <iostream>

‎SerialPrograms/Source/CommonFramework/Resources/SpriteDatabase.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#include "Common/Cpp/Json/JsonObject.h"
99
#include "CommonFramework/Globals.h"
1010
#include "CommonFramework/ImageTools/ImageBoxes.h"
11-
#include "CommonFramework/ImageMatch/ImageCropper.h"
11+
#include "CommonTools/ImageMatch/ImageCropper.h"
1212
#include "SpriteDatabase.h"
1313

1414
namespace PokemonAutomation{

0 commit comments

Comments
 (0)