wip: arcaea-offline==0.2.0

ui/extends/components/chartSelector.py

@@ -26,8 +26,6 @@ class FuzzySearchCompleterModel(QStandardItemModel):
             item = QStandardItem(kw)
             item.setData(kw)
             item.setData(displayText, Qt.ItemDataRole.UserRole + 75)
-            item.setData(
-                f"{chart.song_id}, {chart.package_id}", Qt.ItemDataRole.UserRole + 76
-            )
+            item.setData(f"{chart.song_id}, {chart.set}", Qt.ItemDataRole.UserRole + 76)
             item.setData(chart, Qt.ItemDataRole.UserRole + 10)
             self.appendRow(item)

ui/extends/components/ocrQueue.py

@@ -236,7 +236,7 @@ class OcrQueueModel(QAbstractListModel):
         chart = index.data(self.ChartRole)
         score = index.data(self.ScoreRole)
         if isinstance(chart, Chart) and isinstance(score, Score):
-            scoreRange = calculate_score_range(chart.note, score.pure, score.far)
+            scoreRange = calculate_score_range(chart.notes, score.pure, score.far)
             scoreValidateOk = scoreRange[0] <= score.score <= scoreRange[1]
             self.setData(index, scoreValidateOk, self.ScoreValidateOkRole)
         else:

ui/extends/shared/delegates/chartDelegate.py

@@ -98,7 +98,7 @@ class ChartDelegate(TextSegmentDelegate):
             ],
             [
                 {
-                    self.TextRole: f"{rating_class_to_text(chart.rating_class)} {chart.rating / 10:.1f}",
+                    self.TextRole: f"{rating_class_to_text(chart.rating_class)} {chart.constant / 10:.1f}",
                     self.ColorRole: self.RatingClassColors[chart.rating_class],
                 },
             ],

ui/extends/shared/delegates/scoreDelegate.py

@@ -95,7 +95,7 @@ class ScoreDelegate(TextSegmentDelegate):
         chart = self.getChart(index)
 
         if isinstance(score, Score) and isinstance(chart, Chart):
-            scoreRange = calculate_score_range(chart.note, score.pure, score.far)
+            scoreRange = calculate_score_range(chart.notes, score.pure, score.far)
             return scoreRange[0] <= score.score <= scoreRange[1]
 
     def getScoreGradeGradientWrapper(self, score: int):
@@ -203,7 +203,7 @@ class ScoreDelegate(TextSegmentDelegate):
             editor.setWindowFlag(Qt.WindowType.Sheet, True)
             editor.setWindowFlag(Qt.WindowType.FramelessWindowHint, True)
             editor.setWindowTitle(
-                f"{chart.name_en}({chart.song_id}) | {rating_class_to_text(chart.rating_class)} | {chart.package_id}"
+                f"{chart.title}({chart.song_id}) | {rating_class_to_text(chart.rating_class)} | {chart.set}"
             )
             editor.setText(self.getScore(index))
             editor.setValidateBeforeAccept(False)

ui/extends/tabs/tabOcr/tabOcr_B30.py

@@ -1,7 +1,7 @@
 import logging
 
 from arcaea_offline.database import Database
-from arcaea_offline.models import Chart, Score
+from arcaea_offline.models import Score
 from arcaea_offline_ocr.b30.chieri.v4.ocr import ChieriBotV4Ocr
 from arcaea_offline_ocr.b30.shared import B30OcrResultItem
 from PySide6.QtGui import QImage
@@ -27,25 +27,26 @@ class ChieriV4OcrRunnable(OcrRunnable):
             self.signals.finished.emit()
 
 
-def b30ResultToScoreInsert(_, qImage: QImage, result: B30OcrResultItem):
+def b30ResultToScore(_: None, qImage: QImage, result: B30OcrResultItem):
     if not result.song_id and not result.title:
         raise ValueError("no title or song_id")
 
     db = Database()
     if not result.song_id:
-        song_id = db.fuzzy_search_song_id(result.title)[0][0]
+        raise NotImplementedError("Not supported yet.")
     else:
         song_id = result.song_id
 
-    chart = Chart.from_db_row(db.get_chart(song_id, result.rating_class))
-    score = ScoreInsert(
+    chart = db.get_chart(song_id, result.rating_class)
+    score = Score(
         song_id=song_id,
         rating_class=result.rating_class,
         score=result.score,
-        time=1485014400,
+        date=None,
         pure=result.pure,
         far=result.far,
         lost=result.lost,
+        comment="B30 OCR",
     )
 
     return (chart, score)

ui/extends/tabs/tabOcr/tabOcr_Device.py

@@ -6,7 +6,7 @@ from arcaea_offline.database import Database
 from arcaea_offline.models import Chart, Score
 from arcaea_offline_ocr.device.shared import DeviceOcrResult
 from arcaea_offline_ocr.device.v2.ocr import DeviceV2Ocr
-from arcaea_offline_ocr.device.v2.rois import DeviceV2Rois
+from arcaea_offline_ocr.device.v2.rois import DeviceV2AutoRois, DeviceV2Rois
 from arcaea_offline_ocr.utils import imread_unicode
 from PySide6.QtCore import QDateTime, QFileInfo
 
@@ -37,6 +37,25 @@ class TabDeviceV2OcrRunnable(OcrRunnable):
             self.signals.finished.emit()
 
 
+class TabDeviceV2AutoRoisOcrRunnable(OcrRunnable):
+    def __init__(self, imagePath, knnModel, siftDb):
+        super().__init__()
+        self.imagePath = imagePath
+        self.knnModel = knnModel
+        self.siftDb = siftDb
+
+    def run(self):
+        try:
+            rois = DeviceV2AutoRois(imread_unicode(self.imagePath))
+            ocr = DeviceV2Ocr(self.knnModel, self.siftDb)
+            result = ocr.ocr(rois)
+            self.signals.resultReady.emit(result)
+        except Exception:
+            logger.exception(f"DeviceV2AutoRois ocr {self.imagePath} error")
+        finally:
+            self.signals.finished.emit()
+
+
 def getImageDate(imagePath: str) -> QDateTime:
     datetime = None
     with contextlib.suppress(Exception):
@@ -63,9 +82,7 @@ class ScoreConverter:
             lost=result.lost,
             date=getImageDate(imagePath).toSecsSinceEpoch(),
             max_recall=result.max_recall,
-            r10_clear_type=None,
             comment=f"OCR {QFileInfo(imagePath).fileName()}",
         )
-        print(f"OCR {QFileInfo(imagePath).fileName()}")
         chart = db.get_chart(score.song_id, score.rating_class)
         return (chart, score)