Added markerview support for HorizontalBarChart (PhilJay#1010) - still bugfixing needed.

PhilJay · PhilJay · commit 75be29ef038f · 2015-09-10T12:04:19.000+02:00
diff --git a/MPChartExample/build.gradle b/MPChartExample/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 23
-    buildToolsVersion '23.0.0'
+    buildToolsVersion '23.0.1'
     defaultConfig {
         minSdkVersion 8
         targetSdkVersion 23
diff --git a/MPChartExample/src/com/xxmassdeveloper/mpchartexample/HorizontalBarChartActivity.java b/MPChartExample/src/com/xxmassdeveloper/mpchartexample/HorizontalBarChartActivity.java
@@ -31,6 +31,7 @@
 import com.github.mikephil.charting.listener.OnChartValueSelectedListener;
 import com.github.mikephil.charting.highlight.Highlight;
 import com.github.mikephil.charting.utils.ColorTemplate;
+import com.xxmassdeveloper.mpchartexample.custom.MyMarkerView;
 import com.xxmassdeveloper.mpchartexample.notimportant.DemoBase;
 
 import java.util.ArrayList;
@@ -105,6 +106,11 @@ protected void onCreate(Bundle savedInstanceState) {
         yr.setDrawGridLines(false);
 //        yr.setInverted(true);
 
+        MyMarkerView mv = new MyMarkerView(this, R.layout.custom_marker_view);
+
+        // set the marker to the chart
+        mChart.setMarkerView(mv);
+
         setData(12, 50);
         mChart.animateY(2500);
 
diff --git a/MPChartLib/build.gradle b/MPChartLib/build.gradle
@@ -3,7 +3,7 @@ apply plugin: 'android-maven'
 
 android {
     compileSdkVersion 23
-    buildToolsVersion '23.0.0'
+    buildToolsVersion '23.0.1'
     // resourcePrefix 'mpcht'
     defaultConfig {
         minSdkVersion 8
diff --git a/MPChartLib/src/com/github/mikephil/charting/charts/BarLineChartBase.java b/MPChartLib/src/com/github/mikephil/charting/charts/BarLineChartBase.java
@@ -548,15 +548,34 @@ protected float[] getMarkerPosition(Entry e, Highlight highlight) {
 
             BarData bd = (BarData) mData;
             float space = bd.getGroupSpace();
+            int setCount = mData.getDataSetCount();
+            int i = e.getXIndex();
 
-            float x = e.getXIndex() * (mData.getDataSetCount() - 1) + dataSetIndex + space * e.getXIndex() + space
-                    / 2f;
+            if(this instanceof HorizontalBarChart) {
 
-            xPos += x;
+                // calculate the x-position, depending on datasetcount
+                float y = i + i * (setCount - 1) + dataSetIndex + space * i + space / 2f ;
 
-            BarEntry entry = (BarEntry) e;
-            if(entry.getVals() != null) {
-                yPos = highlight.getRange().to;
+                yPos = y;
+
+                BarEntry entry = (BarEntry) e;
+                if(entry.getVals() != null) {
+                    xPos = highlight.getRange().to;
+                } else {
+                    xPos = e.getVal();
+                }
+            } else {
+
+                float x = i + i * (setCount - 1) + dataSetIndex + space * i + space / 2f;
+
+                xPos = x;
+
+                BarEntry entry = (BarEntry) e;
+                if(entry.getVals() != null) {
+                    yPos = highlight.getRange().to;
+                } else {
+                    yPos = e.getVal();
+                }
             }
         }
 
diff --git a/MPChartLib/src/com/github/mikephil/charting/utils/Transformer.java b/MPChartLib/src/com/github/mikephil/charting/utils/Transformer.java
@@ -262,7 +262,7 @@ public float[] generateTransformedValuesHorizontalBarChart(List<? extends Entry>
             int i = e.getXIndex();
 
             // calculate the x-position, depending on datasetcount
-            float x = e.getXIndex() + i * (setCount - 1) + dataSet + space * i
+            float x = i + i * (setCount - 1) + dataSet + space * i
                     + space / 2f ;
             float y = e.getVal();
 
