Skip to content

Commit 0abfcbd

Browse files
MysticialMysticial
committed
Move some non-infra stuff out of CommonFramework into CommonTools.
1 parent b1b316d commit 0abfcbd

File tree

239 files changed

+3137
-3241
lines changed

Some content is hidden

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

239 files changed

+3137
-3241
lines changed

‎SerialPrograms/CMakeLists.txt‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -379,30 +379,10 @@ file(GLOB MAIN_SOURCES
379379
Source/CommonFramework/ImageTypes/ImageViewPlanar32.h
380380
Source/CommonFramework/ImageTypes/ImageViewRGB32.cpp
381381
Source/CommonFramework/ImageTypes/ImageViewRGB32.h
382-
Source/CommonFramework/Inference/AnomalyDetector.cpp
383-
Source/CommonFramework/Inference/AnomalyDetector.h
384-
Source/CommonFramework/Inference/AudioPerSpectrumDetectorBase.cpp
385-
Source/CommonFramework/Inference/AudioPerSpectrumDetectorBase.h
386-
Source/CommonFramework/Inference/AudioTemplateCache.cpp
387-
Source/CommonFramework/Inference/AudioTemplateCache.h
388-
Source/CommonFramework/Inference/BlackBorderDetector.cpp
389-
Source/CommonFramework/Inference/BlackBorderDetector.h
390-
Source/CommonFramework/Inference/BlackScreenDetector.cpp
391-
Source/CommonFramework/Inference/BlackScreenDetector.h
392-
Source/CommonFramework/Inference/DetectionDebouncer.h
393-
Source/CommonFramework/Inference/FrozenImageDetector.cpp
394-
Source/CommonFramework/Inference/FrozenImageDetector.h
395-
Source/CommonFramework/Inference/ImageMatchDetector.cpp
396-
Source/CommonFramework/Inference/ImageMatchDetector.h
397382
Source/CommonFramework/Inference/ImageTools.cpp
398383
Source/CommonFramework/Inference/ImageTools.h
399-
Source/CommonFramework/Inference/InferenceThrottler.h
400-
Source/CommonFramework/Inference/SpectrogramMatcher.cpp
401-
Source/CommonFramework/Inference/SpectrogramMatcher.h
402384
Source/CommonFramework/Inference/StatAccumulator.cpp
403385
Source/CommonFramework/Inference/StatAccumulator.h
404-
Source/CommonFramework/Inference/TimeWindowStatTracker.h
405-
Source/CommonFramework/Inference/VisualDetector.h
406386
Source/CommonFramework/InferenceInfra/AudioInferenceCallback.h
407387
Source/CommonFramework/InferenceInfra/AudioInferencePivot.cpp
408388
Source/CommonFramework/InferenceInfra/AudioInferencePivot.h
@@ -543,10 +523,6 @@ file(GLOB MAIN_SOURCES
543523
Source/CommonFramework/Tools/MultiConsoleErrors.h
544524
Source/CommonFramework/Tools/ProgramEnvironment.cpp
545525
Source/CommonFramework/Tools/ProgramEnvironment.h
546-
Source/CommonFramework/Tools/StatsDatabase.cpp
547-
Source/CommonFramework/Tools/StatsDatabase.h
548-
Source/CommonFramework/Tools/StatsTracking.cpp
549-
Source/CommonFramework/Tools/StatsTracking.h
550526
Source/CommonFramework/Tools/SuperControlSession.tpp
551527
Source/CommonFramework/Tools/SuperControlSession.h
552528
Source/CommonFramework/Tools/VideoResolutionCheck.cpp
@@ -600,6 +576,30 @@ file(GLOB MAIN_SOURCES
600576
Source/CommonFramework/Windows/MainWindow.h
601577
Source/CommonFramework/Windows/WindowTracker.cpp
602578
Source/CommonFramework/Windows/WindowTracker.h
579+
Source/CommonTools/AudioTools/AudioPerSpectrumDetectorBase.cpp
580+
Source/CommonTools/AudioTools/AudioPerSpectrumDetectorBase.h
581+
Source/CommonTools/AudioTools/AudioTemplateCache.cpp
582+
Source/CommonTools/AudioTools/AudioTemplateCache.h
583+
Source/CommonTools/AudioTools/SpectrogramMatcher.cpp
584+
Source/CommonTools/AudioTools/SpectrogramMatcher.h
585+
Source/CommonTools/DetectionDebouncer.h
586+
Source/CommonTools/InferenceThrottler.h
587+
Source/CommonTools/ProgramStats/StatsDatabase.cpp
588+
Source/CommonTools/ProgramStats/StatsDatabase.h
589+
Source/CommonTools/ProgramStats/StatsTracking.cpp
590+
Source/CommonTools/ProgramStats/StatsTracking.h
591+
Source/CommonTools/TrendInference/AnomalyDetector.cpp
592+
Source/CommonTools/TrendInference/AnomalyDetector.h
593+
Source/CommonTools/TrendInference/TimeWindowStatTracker.h
594+
Source/CommonTools/VisualDetector.h
595+
Source/CommonTools/VisualDetectors/BlackBorderDetector.cpp
596+
Source/CommonTools/VisualDetectors/BlackBorderDetector.h
597+
Source/CommonTools/VisualDetectors/BlackScreenDetector.cpp
598+
Source/CommonTools/VisualDetectors/BlackScreenDetector.h
599+
Source/CommonTools/VisualDetectors/FrozenImageDetector.cpp
600+
Source/CommonTools/VisualDetectors/FrozenImageDetector.h
601+
Source/CommonTools/VisualDetectors/ImageMatchDetector.cpp
602+
Source/CommonTools/VisualDetectors/ImageMatchDetector.h
603603
Source/ComputerPrograms/ComputerProgram.cpp
604604
Source/ComputerPrograms/ComputerProgram.h
605605
Source/ComputerPrograms/Framework/ComputerProgramOption.cpp

‎SerialPrograms/SerialPrograms.pro‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -211,15 +211,7 @@ SOURCES += \
211211
Source/CommonFramework/ImageTypes/ImageViewHSV32.cpp \
212212
Source/CommonFramework/ImageTypes/ImageViewPlanar32.cpp \
213213
Source/CommonFramework/ImageTypes/ImageViewRGB32.cpp \
214-
Source/CommonFramework/Inference/AnomalyDetector.cpp \
215-
Source/CommonFramework/Inference/AudioPerSpectrumDetectorBase.cpp \
216-
Source/CommonFramework/Inference/AudioTemplateCache.cpp \
217-
Source/CommonFramework/Inference/BlackBorderDetector.cpp \
218-
Source/CommonFramework/Inference/BlackScreenDetector.cpp \
219-
Source/CommonFramework/Inference/FrozenImageDetector.cpp \
220-
Source/CommonFramework/Inference/ImageMatchDetector.cpp \
221214
Source/CommonFramework/Inference/ImageTools.cpp \
222-
Source/CommonFramework/Inference/SpectrogramMatcher.cpp \
223215
Source/CommonFramework/Inference/StatAccumulator.cpp \
224216
Source/CommonFramework/InferenceInfra/AudioInferencePivot.cpp \
225217
Source/CommonFramework/InferenceInfra/InferenceRoutines.cpp \
@@ -285,8 +277,6 @@ SOURCES += \
285277
Source/CommonFramework/Tools/InterruptableCommands.tpp \
286278
Source/CommonFramework/Tools/MultiConsoleErrors.cpp \
287279
Source/CommonFramework/Tools/ProgramEnvironment.cpp \
288-
Source/CommonFramework/Tools/StatsDatabase.cpp \
289-
Source/CommonFramework/Tools/StatsTracking.cpp \
290280
Source/CommonFramework/Tools/VideoResolutionCheck.cpp \
291281
Source/CommonFramework/Tools/VideoStream.cpp \
292282
Source/CommonFramework/VideoPipeline/Backends/CameraImplementations.cpp \
@@ -306,6 +296,16 @@ SOURCES += \
306296
Source/CommonFramework/Windows/DpiScaler.cpp \
307297
Source/CommonFramework/Windows/MainWindow.cpp \
308298
Source/CommonFramework/Windows/WindowTracker.cpp \
299+
Source/CommonTools/AudioTools/AudioPerSpectrumDetectorBase.cpp \
300+
Source/CommonTools/AudioTools/AudioTemplateCache.cpp \
301+
Source/CommonTools/AudioTools/SpectrogramMatcher.cpp \
302+
Source/CommonTools/ProgramStats/StatsDatabase.cpp \
303+
Source/CommonTools/ProgramStats/StatsTracking.cpp \
304+
Source/CommonTools/TrendInference/AnomalyDetector.cpp \
305+
Source/CommonTools/VisualDetectors/BlackBorderDetector.cpp \
306+
Source/CommonTools/VisualDetectors/BlackScreenDetector.cpp \
307+
Source/CommonTools/VisualDetectors/FrozenImageDetector.cpp \
308+
Source/CommonTools/VisualDetectors/ImageMatchDetector.cpp \
309309
Source/ComputerPrograms/ComputerProgram.cpp \
310310
Source/ComputerPrograms/Framework/ComputerProgramOption.cpp \
311311
Source/ComputerPrograms/Framework/ComputerProgramSession.cpp \
@@ -1299,20 +1299,8 @@ HEADERS += \
12991299
Source/CommonFramework/ImageTypes/ImageViewHSV32.h \
13001300
Source/CommonFramework/ImageTypes/ImageViewPlanar32.h \
13011301
Source/CommonFramework/ImageTypes/ImageViewRGB32.h \
1302-
Source/CommonFramework/Inference/AnomalyDetector.h \
1303-
Source/CommonFramework/Inference/AudioPerSpectrumDetectorBase.h \
1304-
Source/CommonFramework/Inference/AudioTemplateCache.h \
1305-
Source/CommonFramework/Inference/BlackBorderDetector.h \
1306-
Source/CommonFramework/Inference/BlackScreenDetector.h \
1307-
Source/CommonFramework/Inference/DetectionDebouncer.h \
1308-
Source/CommonFramework/Inference/FrozenImageDetector.h \
1309-
Source/CommonFramework/Inference/ImageMatchDetector.h \
13101302
Source/CommonFramework/Inference/ImageTools.h \
1311-
Source/CommonFramework/Inference/InferenceThrottler.h \
1312-
Source/CommonFramework/Inference/SpectrogramMatcher.h \
13131303
Source/CommonFramework/Inference/StatAccumulator.h \
1314-
Source/CommonFramework/Inference/TimeWindowStatTracker.h \
1315-
Source/CommonFramework/Inference/VisualDetector.h \
13161304
Source/CommonFramework/InferenceInfra/AudioInferenceCallback.h \
13171305
Source/CommonFramework/InferenceInfra/AudioInferencePivot.h \
13181306
Source/CommonFramework/InferenceInfra/InferenceCallback.h \
@@ -1385,8 +1373,6 @@ HEADERS += \
13851373
Source/CommonFramework/Tools/InterruptableCommands.tpp \
13861374
Source/CommonFramework/Tools/MultiConsoleErrors.h \
13871375
Source/CommonFramework/Tools/ProgramEnvironment.h \
1388-
Source/CommonFramework/Tools/StatsDatabase.h \
1389-
Source/CommonFramework/Tools/StatsTracking.h \
13901376
Source/CommonFramework/Tools/SuperControlSession.h \
13911377
Source/CommonFramework/Tools/SuperControlSession.tpp \
13921378
Source/CommonFramework/Tools/VideoResolutionCheck.h \
@@ -1415,6 +1401,20 @@ HEADERS += \
14151401
Source/CommonFramework/Windows/DpiScaler.h \
14161402
Source/CommonFramework/Windows/MainWindow.h \
14171403
Source/CommonFramework/Windows/WindowTracker.h \
1404+
Source/CommonTools/AudioTools/AudioPerSpectrumDetectorBase.h \
1405+
Source/CommonTools/AudioTools/AudioTemplateCache.h \
1406+
Source/CommonTools/AudioTools/SpectrogramMatcher.h \
1407+
Source/CommonTools/DetectionDebouncer.h \
1408+
Source/CommonTools/InferenceThrottler.h \
1409+
Source/CommonTools/ProgramStats/StatsDatabase.h \
1410+
Source/CommonTools/ProgramStats/StatsTracking.h \
1411+
Source/CommonTools/TrendInference/AnomalyDetector.h \
1412+
Source/CommonTools/TrendInference/TimeWindowStatTracker.h \
1413+
Source/CommonTools/VisualDetector.h \
1414+
Source/CommonTools/VisualDetectors/BlackBorderDetector.h \
1415+
Source/CommonTools/VisualDetectors/BlackScreenDetector.h \
1416+
Source/CommonTools/VisualDetectors/FrozenImageDetector.h \
1417+
Source/CommonTools/VisualDetectors/ImageMatchDetector.h \
14181418
Source/ComputerPrograms/ComputerProgram.h \
14191419
Source/ComputerPrograms/Framework/ComputerProgramOption.h \
14201420
Source/ComputerPrograms/Framework/ComputerProgramSession.h \

‎SerialPrograms/Source/CommonFramework/Notifications/ProgramNotifications.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#include "CommonFramework/Globals.h"
1515
#include "CommonFramework/GlobalSettingsPanel.h"
1616
#include "CommonFramework/Tools/ProgramEnvironment.h"
17-
#include "CommonFramework/Tools/StatsTracking.h"
17+
#include "CommonTools/ProgramStats/StatsTracking.h"
1818
#include "Integrations/DiscordWebhook.h"
1919
#include "Integrations/SleepyDiscordRunner.h"
2020
#include "ProgramNotifications.h"

‎SerialPrograms/Source/CommonFramework/Panels/ProgramDescriptor.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*
55
*/
66

7-
#include "CommonFramework/Tools/StatsTracking.h"
7+
#include "CommonTools/ProgramStats/StatsTracking.h"
88
#include "ProgramDescriptor.h"
99

1010
namespace PokemonAutomation{

‎SerialPrograms/Source/CommonFramework/ProgramSession.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
#include "Common/Cpp/Exceptions.h"
88
#include "Common/Cpp/PanicDump.h"
99
#include "CommonFramework/GlobalSettingsPanel.h"
10-
#include "CommonFramework/Tools/StatsDatabase.h"
1110
#include "CommonFramework/Panels/ProgramDescriptor.h"
1211
#include "CommonFramework/ProgramSession.h"
12+
#include "CommonTools/ProgramStats/StatsDatabase.h"
1313
#include "Integrations/ProgramTracker.h"
1414

1515
namespace PokemonAutomation{

‎SerialPrograms/Source/CommonFramework/Tools/BlackBorderCheck.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
//#include "CommonFramework/ImageTypes/ImageRGB32.h"
99
#include "CommonFramework/VideoPipeline/VideoFeed.h"
1010
#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
11-
#include "CommonFramework/Inference/BlackBorderDetector.h"
1211
#include "CommonFramework/Tools/VideoStream.h"
12+
#include "CommonTools/VisualDetectors/BlackBorderDetector.h"
1313
#include "BlackBorderCheck.h"
1414

1515
namespace PokemonAutomation{

‎SerialPrograms/Source/CommonFramework/Tools/ProgramEnvironment.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#include "CommonFramework/ProgramSession.h"
1111
#include "CommonFramework/Notifications/ProgramInfo.h"
1212
#include "CommonFramework/Options/Environment/PerformanceOptions.h"
13-
#include "StatsTracking.h"
13+
#include "CommonTools/ProgramStats/StatsTracking.h"
1414
#include "ProgramEnvironment.h"
1515

1616

0 commit comments

Comments
 (0)