fix LZA box sorter

Author: Gin

SerialPrograms/Source/CommonTools/OCR/OCR_NumberReader.cpp

@@ -173,7 +173,7 @@ std::string read_number_waterfill_no_normalization(
     std::string ocr_text;
     for (const auto& item : map){
         const WaterfillObject& object = item.second;
-        ImageRGB32 cropped = extract_box_reference(filtered, object).copy();            
+        ImageRGB32 cropped = extract_box_reference(filtered, object).copy();
         PackedBinaryMatrix tmp(object.packed_matrix());
         filter_by_mask(tmp, cropped, Color(0xffffffff), true);
 
@@ -190,11 +190,9 @@ std::string read_number_waterfill_no_normalization(
         // std::cout << ocr[0] << std::endl;
         if (!ocr.empty()){
             ocr_text += ocr[0];
-        }else{
-            if (check_empty_string){
-                logger.log("OCR fail: one of characters read as empty string.", COLOR_RED);
-                return "";
-            }
+        }else if (check_empty_string){
+            logger.log("OCR fail: one of characters read as empty string.", COLOR_RED);
+            return "";
         }
     }
 
@@ -228,13 +226,14 @@ int read_number_waterfill_multifilter(
 
             uint32_t rgb32_min = filter.first;
             uint32_t rgb32_max = filter.second;
+            bool check_empty_string = false;
             std::string ocr_text = read_number_waterfill_no_normalization(
                 logger,
                 image,
                 rgb32_min, rgb32_max,
                 text_inside_range,
                 width_max,
-                true
+                check_empty_string
             );
 
             std::string normalized = run_number_normalization(ocr_text);

SerialPrograms/Source/Pokemon/Options/Pokemon_BoxSortingTable.cpp

@@ -26,7 +26,11 @@ const EnumDropdownDatabase<SortingRuleType>& SortingRuleType_Database(){
 
 BoxSortingRow::BoxSortingRow(EditableTableOption& parent_table)
     : EditableTableRow(parent_table)
-    , sort_type(SortingRuleType_Database(), LockMode::LOCK_WHILE_RUNNING, SortingRuleType::DexNo)
+    , sort_type(
+        static_cast<BoxSortingTable&>(parent_table).database(),
+        LockMode::LOCK_WHILE_RUNNING,
+        SortingRuleType::DexNo
+    )
     , reverse(LockMode::LOCK_WHILE_RUNNING, false)
 {
     PA_ADD_OPTION(sort_type);
@@ -41,7 +45,30 @@ std::unique_ptr<EditableTableRow> BoxSortingRow::clone() const{
 
 
 BoxSortingTable::BoxSortingTable(std::string label)
-    : EditableTableOption_t<BoxSortingRow>(
+    : BoxSortingTableDatabaseHelper(nullptr)
+    , EditableTableOption_t<BoxSortingRow>(
+        std::move(label),
+        LockMode::LOCK_WHILE_RUNNING,
+        make_defaults()
+    )
+{}
+
+BoxSortingTable::BoxSortingTable(std::string label, const std::vector<SortingRuleType>& allowed_rules)
+    : BoxSortingTableDatabaseHelper([&allowed_rules]() {
+        // Build custom database from allowed rules
+        const EnumDropdownDatabase<SortingRuleType>& full_db = SortingRuleType_Database();
+        auto custom_db = std::make_shared<EnumDropdownDatabase<SortingRuleType>>();
+
+        for (SortingRuleType rule : allowed_rules) {
+            const EnumEntry* entry = full_db.find(rule);
+            if (entry != nullptr) {
+                custom_db->add(rule, entry->slug, entry->display, entry->enabled);
+            }
+        }
+
+        return custom_db;
+    }())
+    , EditableTableOption_t<BoxSortingRow>(
         std::move(label),
         LockMode::LOCK_WHILE_RUNNING,
         make_defaults()
@@ -77,6 +104,13 @@ std::vector<std::unique_ptr<EditableTableRow>> BoxSortingTable::make_defaults(){
     return ret;
 }
 
+const EnumDropdownDatabase<SortingRuleType>& BoxSortingTable::database() const{
+    if (m_database) {
+        return *m_database;
+    }
+    return SortingRuleType_Database();
+}
+
 
 
 

SerialPrograms/Source/Pokemon/Options/Pokemon_BoxSortingTable.h

@@ -42,16 +42,29 @@ class BoxSortingRow : public EditableTableRow{
 };
 
 
+// Helper base class to ensure database is initialized before table construction
+class BoxSortingTableDatabaseHelper{
+protected:
+    BoxSortingTableDatabaseHelper(std::shared_ptr<const EnumDropdownDatabase<SortingRuleType>> db = nullptr)
+        : m_database(std::move(db))
+    {}
+
+    std::shared_ptr<const EnumDropdownDatabase<SortingRuleType>> m_database;
+};
+
 
-class BoxSortingTable : public EditableTableOption_t<BoxSortingRow>{
+class BoxSortingTable : private BoxSortingTableDatabaseHelper, public EditableTableOption_t<BoxSortingRow>{
 public:
     BoxSortingTable(std::string label);
+    BoxSortingTable(std::string label, const std::vector<SortingRuleType>& allowed_rules);
 
     std::vector<SortingRule> preferences() const;
 
     virtual std::vector<std::string> make_header() const;
 
     std::vector<std::unique_ptr<EditableTableRow>> make_defaults();
+
+    const EnumDropdownDatabase<SortingRuleType>& database() const;
 };
 
 

SerialPrograms/Source/PokemonLZA/Inference/Boxes/PokemonLZA_BoxInfoDetector.cpp

@@ -205,7 +205,19 @@ void BoxDexNumberDetector::make_overlays(VideoOverlaySet& items) const{
 bool BoxDexNumberDetector::detect(const ImageViewRGB32& screen){
     const size_t max_dex_number = std::max(LUMIOSE_DEX_SLUGS().size(), HYPERSPACE_DEX_SLUGS().size());
 
-    const int dex_number = OCR::read_number_waterfill(m_logger, extract_box_reference(screen, m_dex_number_box), 0xff808080, 0xffffffff, false);
+    const ImageViewRGB32 dex_image_crop = extract_box_reference(screen, m_dex_number_box);
+    // const bool in_range_black = false;
+    // const ImageRGB32 black_white_dex_image_crop = to_blackwhite_rgb32_range(dex_image_crop, in_range_black, 0xff808080, 0xffffffff);
+    // black_white_dex_image_crop.save("blackwhite_number.png");
+    // const int dex_number = OCR::read_number(m_logger, black_white_dex_image_crop);
+    // const int dex_number = OCR::read_number_waterfill(m_logger, dex_image_crop, 0xff808080, 0xffffffff, false);
+    const int dex_number = OCR::read_number_waterfill_multifilter(m_logger, dex_image_crop, {
+        {0x0, 0xff202020},
+        {0x0, 0xff404040},
+        {0x0, 0xff606060},
+        {0x0, 0xff808080},
+        {0x0, 0xffA0A0A0},
+    });
     if (dex_number <= 0 || dex_number > static_cast<int>(max_dex_number)) {
         m_dex_number = 0;
         m_dex_number_when_error = dex_number;

SerialPrograms/Source/PokemonLZA/Programs/PokemonLZA_BoxSorter.cpp

@@ -82,7 +82,8 @@ BoxSorter::BoxSorter()
         1, 1, MAX_BOXES
         )
     , SORT_TABLE(
-          "<b>Sort Order Rules:</b><br>Sort order rules will be applied top to bottom."
+          "<b>Sort Order Rules:</b><br>Sort order rules will be applied top to bottom.",
+          {SortingRuleType::DexNo, SortingRuleType::Shiny, SortingRuleType::Alpha}
           )
     , OUTPUT_FILE(
           false,