Merge pull request #212 from weilanxiao/fix_y_label_width

Solve the problem of insufficient width of Y-axis label display
AppDevNext · May 16, 2024 · 8bea117 · 8bea117
2 parents a45f5c6 + 8bb809b
commit 8bea117
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 2 deletions.
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/components/AxisBase.java b/MPChartLib/src/main/java/com/github/mikephil/charting/components/AxisBase.java
@@ -3,6 +3,7 @@
 
 import android.graphics.Color;
 import android.graphics.DashPathEffect;
+import android.graphics.Paint;
 import android.util.Log;
 
 import com.github.mikephil.charting.formatter.DefaultAxisValueFormatter;
@@ -524,6 +525,33 @@ public String getLongestLabel() {
         return longest;
     }
 
+    /**
+     * Returns the longest formatted label (in terms of px), this axis
+     * contains.
+     * If paint is null, then returns the longest formatted label (in terms of characters), this axis contains.
+     *
+     * @return
+     */
+    public String getLongestLabel(Paint p) {
+        if (p == null) {
+            return getLongestLabel();
+        }
+        String longest = "";
+        float max = 0f;
+
+        for (int i = 0; i < mEntries.length; i++) {
+            String text = getFormattedLabel(i);
+            if (text != null) {
+                float width = p.measureText(text);
+                if (max < width) {
+                    longest = text;
+                }
+            }
+        }
+
+        return longest;
+    }
+
     public String getFormattedLabel(int index) {
 
         if (index < 0 || index >= mEntries.length)

diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/components/YAxis.java b/MPChartLib/src/main/java/com/github/mikephil/charting/components/YAxis.java
@@ -344,7 +344,7 @@ public float getRequiredWidthSpace(Paint p) {
 
         p.setTextSize(mTextSize);
 
-        String label = getLongestLabel();
+        String label = getLongestLabel(p);
         float width = (float) Utils.calcTextWidth(p, label) + getXOffset() * 2f;
 
         float minWidth = getMinWidth();
@@ -371,7 +371,7 @@ public float getRequiredHeightSpace(Paint p) {
 
         p.setTextSize(mTextSize);
 
-        String label = getLongestLabel();
+        String label = getLongestLabel(p);
         return (float) Utils.calcTextHeight(p, label) + getYOffset() * 2f;
     }
 

diff --git a/screenshotsToCompare/StartTest_smokeTestStart-1-LineChartActivity1.png b/screenshotsToCompare/StartTest_smokeTestStart-1-LineChartActivity1.png
diff --git a/screenshotsToCompare/StartTest_smokeTestStart-18-BarChartActivitySinus.png b/screenshotsToCompare/StartTest_smokeTestStart-18-BarChartActivitySinus.png
diff --git a/...otsToCompare/StartTest_smokeTestStart-23-SpecificPositionsLineChartActivity.png b/...otsToCompare/StartTest_smokeTestStart-23-SpecificPositionsLineChartActivity.png
diff --git a/screenshotsToCompare/StartTest_smokeTestStart-3-LineChartDualAxisActivity.png b/screenshotsToCompare/StartTest_smokeTestStart-3-LineChartDualAxisActivity.png
diff --git a/screenshotsToCompare/StartTest_smokeTestStart-32-ViewPagerSimpleChartDemo.png b/screenshotsToCompare/StartTest_smokeTestStart-32-ViewPagerSimpleChartDemo.png
diff --git a/screenshotsToCompare/StartTest_smokeTestStart-8-FilledLineActivity.png b/screenshotsToCompare/StartTest_smokeTestStart-8-FilledLineActivity.png
diff --git a/screenshotsToCompare/ViewPagerTest_smokeTestViewPager.png b/screenshotsToCompare/ViewPagerTest_smokeTestViewPager.png