Show score like "W+1.2" on winrate bar (featurecat#808)

kaorahi · Nov 8, 2020 · cd3b40f · cd3b40f
1 parent 277a790
commit cd3b40f
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 37 deletions.
diff --git a/src/main/java/featurecat/lizzie/gui/LizzieFrame.java b/src/main/java/featurecat/lizzie/gui/LizzieFrame.java
@@ -967,25 +967,7 @@ private void drawMoveStatistics(Graphics2D g, int posX, int posY, int width, int
     MoveData bestMove = Utils.getBestMove();
     boolean validScore = (bestMove != null);
     if (Lizzie.leelaz.isKataGo && validScore) {
-      double score = bestMove.scoreMean;
       double stdev = bestMove.scoreStdev;
-      if (Lizzie.board.getHistory().isBlacksTurn()) {
-        if (Lizzie.config.showKataGoBoardScoreMean) {
-          score = score + Lizzie.board.getHistory().getGameInfo().getKomi();
-        }
-      } else {
-        if (Lizzie.config.showKataGoBoardScoreMean) {
-          score = score - Lizzie.board.getHistory().getGameInfo().getKomi();
-        }
-        if (Lizzie.config.kataGoScoreMeanAlwaysBlack) {
-          score = -score;
-        }
-      }
-      text =
-          resourceBundle.getString("LizzieFrame.katago.scoreMean")
-              + ": "
-              + String.format("%.1f", score)
-              + " ";
       text =
           text
               + resourceBundle.getString("LizzieFrame.katago.scoreStdev")
@@ -1044,6 +1026,18 @@ private void drawMoveStatistics(Graphics2D g, int posX, int posY, int width, int
           winString,
           barPosxB + maxBarwidth - sw - 2 * strokeRadius,
           posY + barHeight - 2 * strokeRadius);
+      String scoreTextWithLeadingColor = Utils.getScoreTextWithLeadingColor();
+      if (scoreTextWithLeadingColor != "") {
+        String scoreString =
+            resourceBundle.getString("LizzieFrame.katago.scoreMean")
+                + ": "
+                + scoreTextWithLeadingColor;
+        sw = g.getFontMetrics().stringWidth(scoreString);
+        g.drawString(
+            scoreString,
+            barPosxB + maxBarwidth / 2 - sw / 2 - strokeRadius,
+            posY + barHeight - 2 * strokeRadius);
+      }
 
       g.setColor(Color.GRAY);
       Stroke oldstroke = g.getStroke();

diff --git a/src/main/java/featurecat/lizzie/gui/WinratePane.java b/src/main/java/featurecat/lizzie/gui/WinratePane.java
@@ -189,25 +189,7 @@ private void drawMoveStatistics(Graphics2D g, int posX, int posY, int width, int
     MoveData bestMove = Utils.getBestMove();
     boolean validScore = (bestMove != null);
     if (Lizzie.leelaz.isKataGo && validScore) {
-      double score = bestMove.scoreMean;
       double stdev = bestMove.scoreStdev;
-      if (Lizzie.board.getHistory().isBlacksTurn()) {
-        if (Lizzie.config.showKataGoBoardScoreMean) {
-          score = score + Lizzie.board.getHistory().getGameInfo().getKomi();
-        }
-      } else {
-        if (Lizzie.config.showKataGoBoardScoreMean) {
-          score = score - Lizzie.board.getHistory().getGameInfo().getKomi();
-        }
-        if (Lizzie.config.kataGoScoreMeanAlwaysBlack) {
-          score = -score;
-        }
-      }
-      text =
-          LizzieMain.resourceBundle.getString("LizzieFrame.katago.scoreMean")
-              + ":"
-              + String.format("%.1f", score)
-              + " ";
       text =
           text
               + LizzieMain.resourceBundle.getString("LizzieFrame.katago.scoreStdev")
@@ -267,6 +249,18 @@ private void drawMoveStatistics(Graphics2D g, int posX, int posY, int width, int
           winString,
           barPosxB + maxBarwidth - sw - 2 * strokeRadius,
           posY + barHeight - 2 * strokeRadius);
+      String scoreTextWithLeadingColor = Utils.getScoreTextWithLeadingColor();
+      if (scoreTextWithLeadingColor != "") {
+        String scoreString =
+            Lizzie.frame.resourceBundle.getString("LizzieFrame.katago.scoreMean")
+                + ": "
+                + scoreTextWithLeadingColor;
+        sw = g.getFontMetrics().stringWidth(scoreString);
+        g.drawString(
+            scoreString,
+            barPosxB + maxBarwidth / 2 - sw / 2 - strokeRadius,
+            posY + barHeight - 2 * strokeRadius);
+      }
 
       g.setColor(Color.GRAY);
       Stroke oldstroke = g.getStroke();

diff --git a/src/main/java/featurecat/lizzie/util/Utils.java b/src/main/java/featurecat/lizzie/util/Utils.java
@@ -165,6 +165,10 @@ public static Color getBlunderNodeColor(BoardHistoryNode node) {
   }
 
   public static double actualScoreMean(double scoreMean) {
+    return actualScoreMean(scoreMean, Lizzie.config.kataGoScoreMeanAlwaysBlack);
+  }
+
+  private static double actualScoreMean(double scoreMean, boolean alwaysBlack) {
     double score = scoreMean;
     if (Lizzie.board.getHistory().isBlacksTurn()) {
       if (Lizzie.config.showKataGoBoardScoreMean) {
@@ -174,7 +178,7 @@ public static double actualScoreMean(double scoreMean) {
       if (Lizzie.config.showKataGoBoardScoreMean) {
         score = score - Lizzie.board.getHistory().getGameInfo().getKomi();
       }
-      if (Lizzie.config.kataGoScoreMeanAlwaysBlack) {
+      if (alwaysBlack) {
         score = -score;
       }
     }
@@ -186,6 +190,19 @@ public static MoveData getBestMove() {
     return (bestMoves.size() > 0) ? bestMoves.get(0) : null;
   }
 
+  public static String getScoreTextWithLeadingColor() {
+    MoveData bestMove = getBestMove();
+    boolean validScore = Lizzie.leelaz.isKataGo && (bestMove != null);
+    if (!validScore) {
+      return "";
+    }
+    double blackScore = actualScoreMean(bestMove.scoreMean, true);
+    String leadingColor =
+        Lizzie.frame.resourceBundle.getString(
+            (blackScore >= 0) ? "CountDialog.bigBlack" : "CountDialog.bigWhite");
+    return leadingColor + "+" + String.format("%.1f", Math.abs(blackScore));
+  }
+
   public static Integer txtFieldValue(JTextField txt) {
     if (txt.getText().trim().isEmpty()
         || txt.getText().trim().length() >= String.valueOf(Integer.MAX_VALUE).length()) {