Merge branch 'PokemonAutomation:main' into main

Author: ZacharyPL

SerialPrograms/Source/CommandLine/CommandLine_Main.cpp

@@ -55,7 +55,7 @@ int main(int argc, char* argv[]){
             // Mash A button for 3 seconds
             logger.log("Mashing A button for 3 seconds...");
 
-            for(int i = 0; i < 30; i++){
+            for (int i = 0; i < 30; i++){
                 // Push A button: delay=0ms, hold=50ms, release=50ms, button=BUTTON_A
                 controller.push_button(0, 50, 50, static_cast<uint32_t>(BUTTON_A));
             }

SerialPrograms/Source/CommonFramework/AudioPipeline/AudioTemplate.h

@@ -43,7 +43,7 @@ class AudioTemplate{
         return (float*)((char*)m_spectrogram.data() + windowIndex * m_bytes_per_spectrum);
     }
 
-//    void scale(float s) { for(auto& v: m_spectrogram) v *= s; }
+//    void scale(float s){ for (auto& v: m_spectrogram) v *= s; }
 
 private:
     size_t m_numWindows = 0;

SerialPrograms/Source/CommonFramework/AudioPipeline/IO/AudioFileLoader.cpp

@@ -250,7 +250,7 @@ std::pair<const char*, size_t> AudioFileLoader::convertRawWavSamples(){
     if(m_audioFormat.channelCount() == 1){
         // Input wav file has stereo or more channels, but output format is mono,
         // average L and R channel samples per frame:
-        for(size_t i = 0; i < framesRead; i++){
+        for (size_t i = 0; i < framesRead; i++){
             m_floatBuffer[i] = (m_floatBuffer[2*i] + m_floatBuffer[2*i+1]) / 2.0f;
         }
         return {reinterpret_cast<const char*>(m_floatBuffer.data()), framesRead * sizeof(float)};
@@ -260,9 +260,9 @@ std::pair<const char*, size_t> AudioFileLoader::convertRawWavSamples(){
         // Input wav is mono but output format is stereo,
         // Duplicate samples for each channel:
         m_floatBuffer.resize(samplesRead * m_audioFormat.channelCount());
-        for(size_t i = samplesRead; i-- > 0;){
+        for (size_t i = samplesRead; i-- > 0;){
             const float v = m_floatBuffer[i];
-            for(int j = m_audioFormat.channelCount()-1; j >= 0; j--){
+            for (int j = m_audioFormat.channelCount()-1; j >= 0; j--){
                 m_floatBuffer[m_audioFormat.channelCount()*i+j] = v;
             }
         }

SerialPrograms/Source/CommonFramework/AudioPipeline/Spectrum/AudioSpectrumHolder.cpp

@@ -84,7 +84,7 @@ AudioSpectrumHolder::AudioSpectrumHolder()
 //    }
 
 //    cout << "Freq vis block boundaries: ";
-//    for(const auto v : m_freq_visualization_block_boundaries){
+//    for (const auto v : m_freq_visualization_block_boundaries){
 //        cout << v << " ";
 //    }
 //    cout << endl;
@@ -193,7 +193,7 @@ void AudioSpectrumHolder::push_spectrum(size_t sample_rate, std::shared_ptr<cons
         m_last_spectrum.timestamp = timestamp;
         for (size_t i = 0; i < m_freq_visualization_block_boundaries.size() - 1; i++){
             float mag = 0.0f;
-            for(size_t j = m_freq_visualization_block_boundaries[i]; j < m_freq_visualization_block_boundaries[i+1]; j++){
+            for (size_t j = m_freq_visualization_block_boundaries[i]; j < m_freq_visualization_block_boundaries[i+1]; j++){
                 mag += output[j];
             }
 
@@ -227,7 +227,7 @@ void AudioSpectrumHolder::push_spectrum(size_t sample_rate, std::shared_ptr<cons
 //        std::cout << "Computed FFT! "  << magSum << std::endl;
 
         if (m_saveFreqToDisk){
-            for(size_t i = 0; i < m_num_freqs; i++){
+            for (size_t i = 0; i < m_num_freqs; i++){
                 m_freqStream << output[i] << " ";
             }
             m_freqStream << std::endl;

SerialPrograms/Source/CommonFramework/AudioPipeline/Tools/AudioFormatUtils.cpp

@@ -91,7 +91,7 @@ float audio_sample_sum(const QAudioFormat& format, const char* data, size_t len)
     convert_samples_to_float(format, data, len, buffer.data());
 
     float sum = 0.0f;
-    for(float v: buffer){
+    for (float v: buffer){
         sum += v;
     }
     return sum;

SerialPrograms/Source/CommonFramework/GlobalSettingsPanel.cpp

@@ -352,14 +352,14 @@ void GlobalSettings::load_json(const JsonValue& json){
             std::cout << "Enter command line test mode:" << std::endl;
             if (COMMAND_LINE_TEST_LIST.size() > 0){
                 std::cout << "Run following tests: " << std::endl;
-                for(const auto& name : COMMAND_LINE_TEST_LIST){
+                for (const auto& name : COMMAND_LINE_TEST_LIST){
                     std::cout << "- " << name << std::endl;
                 }
             }
             if (COMMAND_LINE_IGNORE_LIST.size() > 0){
                 std::cout << "Ignore following " << COMMAND_LINE_IGNORE_LIST.size() << " paths: " << std::endl;
                 const size_t MAX_LINES = 5;
-                for(size_t i = 0; i < COMMAND_LINE_IGNORE_LIST.size() && i < MAX_LINES; i++){
+                for (size_t i = 0; i < COMMAND_LINE_IGNORE_LIST.size() && i < MAX_LINES; i++){
                     std::cout << "- " << COMMAND_LINE_IGNORE_LIST[i] << std::endl;
                 }
                 if (COMMAND_LINE_IGNORE_LIST.size() > MAX_LINES){
@@ -381,15 +381,15 @@ JsonValue GlobalSettings::to_json() const{
 
     {
         JsonArray test_list;
-        for(const auto& name : COMMAND_LINE_TEST_LIST){
+        for (const auto& name : COMMAND_LINE_TEST_LIST){
             test_list.push_back(name);
         }
         command_line_test_obj["TEST_LIST"] = std::move(test_list);
     }
 
     {
         JsonArray ignore_list;
-        for(const auto& name : COMMAND_LINE_IGNORE_LIST){
+        for (const auto& name : COMMAND_LINE_IGNORE_LIST){
             ignore_list.push_back(name);
         }
         command_line_test_obj["IGNORE_LIST"] = std::move(ignore_list);

SerialPrograms/Source/CommonFramework/ImageTypes/ImageViewRGB32.cpp

@@ -34,7 +34,7 @@ bool ImageViewRGB32::save(const std::string& path) const{
     QDir dir = fileInfo.dir();
 
     if (!dir.exists()){
-        if (!dir.mkpath(".")) { // Create the path (the "." refers to the dir path itself)
+        if (!dir.mkpath(".")){ // Create the path (the "." refers to the dir path itself)
             global_logger_tagged().log("Failed to create directory for saving image:" + dir.absolutePath().toStdString());
             return false;
         }

SerialPrograms/Source/CommonFramework/VideoPipeline/UI/VideoOverlayWidget.cpp

@@ -264,7 +264,7 @@ void VideoOverlayWidget::render_images(QPainter& painter){
     const double width = static_cast<double>(this->width());
     const double height = static_cast<double>(this->height());
 
-    for(const auto& image_overlay: *m_images){
+    for (const auto& image_overlay: *m_images){
         QImage q_image = image_overlay.image.to_QImage_ref();
         // source rect is the entire portion of the q_image, in pixel units
         QRectF source_rect(0.0, 0.0, static_cast<double>(q_image.width()), static_cast<double>(q_image.height()));

SerialPrograms/Source/CommonFramework/VideoPipeline/VideoOverlaySession.cpp

@@ -292,7 +292,7 @@ void VideoOverlaySession::add_log(std::string message, Color color){
 
         //  We create a newly allocated Box vector to avoid listener accessing
         //  `m_log_texts` asynchronously.
-        for(const auto& item : m_log_texts){
+        for (const auto& item : m_log_texts){
             ptr->emplace_back(item);
         }
     }
@@ -306,7 +306,7 @@ void VideoOverlaySession::clear_log(){
 
         //  We create a newly allocated log text vector to avoid listener accessing
         //  `m_log_texts` asynchronously.
-        for(const auto& item : m_log_texts){
+        for (const auto& item : m_log_texts){
             ptr->emplace_back(item);
         }
     }

SerialPrograms/Source/CommonTools/Audio/SpectrogramMatcher.cpp

@@ -28,10 +28,10 @@ std::vector<float> buildSpikeKernel(size_t numFrequencies, size_t halfSampleRate
     // 199.21875 * numFrequencies / halfSampleRate
     size_t numKernelIntervals = int(199.21875 * numFrequencies / halfSampleRate + 0.5);
     size_t slopeLen = numKernelIntervals / 2;
-    for(size_t i = 0; i <= slopeLen; i++){
+    for (size_t i = 0; i <= slopeLen; i++){
         kernel.push_back(-4.0f + 8.f * i / (float)slopeLen);
     }
-    for(size_t i = ((numKernelIntervals+1) % 2); i <= slopeLen; i++){
+    for (size_t i = ((numKernelIntervals+1) % 2); i <= slopeLen; i++){
         kernel.push_back(-4.0f + 8.f * (slopeLen-i)/(float)slopeLen);
     }
     return kernel;
@@ -135,7 +135,7 @@ SpectrogramMatcher::SpectrogramMatcher(
         // num windows of each subdivided template
         const size_t num_subWindows = numTemplateWindows / templateSubdivision;
         m_numSpectrumsNeeded = num_subWindows;
-        for(size_t i = 0; i < templateSubdivision; i++){
+        for (size_t i = 0; i < templateSubdivision; i++){
             const size_t windowStart = i * num_subWindows;
             const size_t windowEnd = (i+1) * num_subWindows;
             m_templateRange.emplace_back(windowStart, windowEnd);
@@ -183,7 +183,7 @@ std::vector<float> SpectrogramMatcher::buildTemplateNorm() const{
     for (size_t sub_index = 0; sub_index < m_templateRange.size(); sub_index++){
         float sumSqr = 0.0f;
         for (size_t i = m_templateRange[sub_index].first; i < m_templateRange[sub_index].second; i++){
-            for(size_t j = m_freqStart; j < m_freqEnd; j++){
+            for (size_t j = m_freqStart; j < m_freqEnd; j++){
                 const float v = m_template.getWindow(i)[j];
                 sumSqr += v * v;
             }
@@ -215,7 +215,7 @@ bool SpectrogramMatcher::update_to_new_spectrum(AudioSpectrum spectrum){
     case Mode::AVERAGE_5:
     {
         AlignedVector<float> avgedSpectrum(m_template.bufferSize());
-        for(size_t j = 0; j < m_template.numFrequencies(); j++){
+        for (size_t j = 0; j < m_template.numFrequencies(); j++){
             const float * rawFreqMag = spectrum.magnitudes->data() + m_originalFreqStart + j*5;
             const float newMag = (rawFreqMag[0] + rawFreqMag[1] + rawFreqMag[2] + rawFreqMag[3] + rawFreqMag[4]) / 5.0f;
             avgedSpectrum[j] = newMag;
@@ -267,12 +267,12 @@ std::pair<float, float> SpectrogramMatcher::match_sub_template(size_t sub_index)
 
     const size_t template_start = m_templateRange[sub_index].first;
     const size_t template_end = m_templateRange[sub_index].second;
-    for(size_t i = template_start; i < template_end; i++, iter++, iter2++){
+    for (size_t i = template_start; i < template_end; i++, iter++, iter2++){
         // match in order from latest window to oldest
         const float* templateData = m_template.getWindow(template_end-1-i);
         const float* streamData = iter->magnitudes->data();
         streamSumSqr += *iter2;
-        for(size_t j = m_freqStart; j < m_freqEnd; j++){
+        for (size_t j = m_freqStart; j < m_freqEnd; j++){
             sumMulti += templateData[j] * streamData[j];
         }
     }
@@ -281,11 +281,11 @@ std::pair<float, float> SpectrogramMatcher::match_sub_template(size_t sub_index)
 
     iter = m_spectrums.begin();
     float sum = 0.0f;
-    for(size_t i = template_start; i < template_end; i++, iter++){
+    for (size_t i = template_start; i < template_end; i++, iter++){
         // match in order from latest window to oldest
         const float* templateData = m_template.getWindow(template_end-1-i);
         const float* streamData = iter->magnitudes->data();
-        for(size_t j = m_freqStart; j < m_freqEnd; j++){
+        for (size_t j = m_freqStart; j < m_freqEnd; j++){
             float d = templateData[j] - scale * streamData[j];
             sum += d * d;
         }
@@ -347,7 +347,7 @@ float SpectrogramMatcher::match(const std::vector<AudioSpectrum>& new_spectrums)
     for (const auto& s : m_spectrums){
         if (s.stamp != lastStamp - 1){
             std::cout << "Error: SpectrogramMatcher (" + m_name + ") spectrum timestamps are not continuous:" << std::endl;
-            for(const auto& sp : m_spectrums){
+            for (const auto& sp : m_spectrums){
                 std::cout << sp.stamp << ", ";
             }
             std::cout << std::endl;