Work on highlighting

Author: PhilJay

MPChartExample/src/com/xxmassdeveloper/mpchartexample/AnotherBarActivity.java

@@ -54,7 +54,7 @@ protected void onCreate(Bundle savedInstanceState) {
         // drawn
         mChart.setMaxVisibleValueCount(60);
 
-        // scaling can now only be done on x- and y-axis separately
+        // scaling can now only be done on xPx- and yPx-axis separately
         mChart.setPinchZoom(false);
 
         mChart.setDrawBarShadow(false);

MPChartExample/src/com/xxmassdeveloper/mpchartexample/BarChartActivity.java

@@ -74,7 +74,7 @@ protected void onCreate(Bundle savedInstanceState) {
         // drawn
         mChart.setMaxVisibleValueCount(60);
 
-        // scaling can now only be done on x- and y-axis separately
+        // scaling can now only be done on xPx- and yPx-axis separately
         mChart.setPinchZoom(false);
 
         mChart.setDrawGridBackground(false);
@@ -282,7 +282,7 @@ public void onValueSelected(Entry e, int dataSetIndex, Highlight h) {
         Log.i("bounds", bounds.toString());
         Log.i("position", position.toString());
 
-        Log.i("x-index",
+        Log.i("xPx-index",
                 "low: " + mChart.getLowestVisibleX() + ", high: "
                         + mChart.getHighestVisibleX());
     }

MPChartExample/src/com/xxmassdeveloper/mpchartexample/BarChartActivityMultiDataset.java

@@ -62,7 +62,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
 //        mChart.setDrawBorders(true);
 
-        // scaling can now only be done on x- and y-axis separately
+        // scaling can now only be done on xPx- and yPx-axis separately
         mChart.setPinchZoom(false);
 
         mChart.setDrawBarShadow(false);

MPChartExample/src/com/xxmassdeveloper/mpchartexample/BarChartActivitySinus.java

@@ -63,10 +63,10 @@ protected void onCreate(Bundle savedInstanceState) {
         // drawn
         mChart.setMaxVisibleValueCount(60);
 
-        // scaling can now only be done on x- and y-axis separately
+        // scaling can now only be done on xPx- and yPx-axis separately
         mChart.setPinchZoom(false);
 
-        // draw shadows for each bar that show the maximum value
+        // draw shadows for each bar that show the maximum yValue
         // mChart.setDrawBarShadow(true);
 
         // mChart.setDrawXLabels(false);

MPChartExample/src/com/xxmassdeveloper/mpchartexample/BarChartPositiveNegative.java

@@ -47,7 +47,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
         mChart.setDescription("");
 
-        // scaling can now only be done on x- and y-axis separately
+        // scaling can now only be done on xPx- and yPx-axis separately
         mChart.setPinchZoom(false);
 
         mChart.setDrawGridBackground(false);

MPChartExample/src/com/xxmassdeveloper/mpchartexample/CandleStickChartActivity.java

@@ -57,7 +57,7 @@ protected void onCreate(Bundle savedInstanceState) {
         // drawn
         mChart.setMaxVisibleValueCount(60);
 
-        // scaling can now only be done on x- and y-axis separately
+        // scaling can now only be done on xPx- and yPx-axis separately
         mChart.setPinchZoom(false);
 
         mChart.setDrawGridBackground(false);

MPChartExample/src/com/xxmassdeveloper/mpchartexample/CubicLineChartActivity.java

@@ -73,7 +73,7 @@ protected void onCreate(Bundle savedInstanceState) {
         mChart.setDragEnabled(true);
         mChart.setScaleEnabled(true);
 
-        // if disabled, scaling can be done on x- and y-axis separately
+        // if disabled, scaling can be done on xPx- and yPx-axis separately
         mChart.setPinchZoom(false);
 
         mChart.setDrawGridBackground(false);

MPChartExample/src/com/xxmassdeveloper/mpchartexample/DrawChartActivity.java

@@ -69,7 +69,7 @@ protected void onCreate(Bundle savedInstanceState) {
         mChart.getLegend().setEnabled(false);
 
         // mChart.setYRange(-40f, 40f, true);
-        // call this to reset the changed y-range
+        // call this to reset the changed yPx-range
         // mChart.resetYRange(true);
     }
 

MPChartExample/src/com/xxmassdeveloper/mpchartexample/DynamicalAddingActivity.java

@@ -62,7 +62,7 @@ private void addEntry() {
                 data.addDataSet(set);
             }
 
-            // add a new x-value first
+            // add a new xPx-yValue first
             data.addXValue(new XAxisValue(set.getEntryCount(), set.getEntryCount() + ""));
 
             // choose a random dataSet
@@ -111,11 +111,11 @@ private void addDataSet() {
 
             int count = (data.getDataSetCount() + 1);
 
-            // create 10 y-vals
+            // create 10 yPx-vals
             ArrayList<Entry> yVals = new ArrayList<Entry>();
 
             if(data.getXValCount() == 0) {
-                // add 10 x-entries
+                // add 10 xPx-entries
                 for (int i = 0; i < 10; i++) {
                     data.addXValue(new XAxisValue(i, i + ""));
                 }

MPChartExample/src/com/xxmassdeveloper/mpchartexample/HorizontalBarChartActivity.java

@@ -72,10 +72,10 @@ protected void onCreate(Bundle savedInstanceState) {
         // drawn
         mChart.setMaxVisibleValueCount(60);
 
-        // scaling can now only be done on x- and y-axis separately
+        // scaling can now only be done on xPx- and yPx-axis separately
         mChart.setPinchZoom(false);
 
-        // draw shadows for each bar that show the maximum value
+        // draw shadows for each bar that show the maximum yValue
         // mChart.setDrawBarShadow(true);
 
         // mChart.setDrawXLabels(false);

MPChartExample/src/com/xxmassdeveloper/mpchartexample/InvertedLineChartActivity.java

@@ -69,7 +69,7 @@ protected void onCreate(Bundle savedInstanceState) {
         mChart.setDragEnabled(true);
         mChart.setScaleEnabled(true);
 
-        // if disabled, scaling can be done on x- and y-axis separately
+        // if disabled, scaling can be done on xPx- and yPx-axis separately
         mChart.setPinchZoom(true);
 
         // set an alternative background color

MPChartExample/src/com/xxmassdeveloper/mpchartexample/LineChartActivity1.java

@@ -84,7 +84,7 @@ protected void onCreate(Bundle savedInstanceState) {
         // mChart.setScaleXEnabled(true);
         // mChart.setScaleYEnabled(true);
 
-        // if disabled, scaling can be done on x- and y-axis separately
+        // if disabled, scaling can be done on xPx- and yPx-axis separately
         mChart.setPinchZoom(true);
 
         // set an alternative background color
@@ -97,7 +97,7 @@ protected void onCreate(Bundle savedInstanceState) {
         // set the marker to the chart
         mChart.setMarkerView(mv);
 
-        // x-axis limit line
+        // xPx-axis limit line
         LimitLine llXAxis = new LimitLine(10f, "Index 10");
         llXAxis.setLineWidth(4f);
         llXAxis.enableDashedLine(10f, 10f, 0f);
@@ -106,7 +106,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
         XAxis xAxis = mChart.getXAxis();
         //xAxis.setValueFormatter(new MyCustomXAxisValueFormatter());
-        //xAxis.addLimitLine(llXAxis); // add x-axis limit line
+        //xAxis.addLimitLine(llXAxis); // add xPx-axis limit line
 
         Typeface tf = Typeface.createFromAsset(getAssets(), "OpenSans-Regular.ttf");
 
@@ -346,7 +346,7 @@ private void setData(int count, float range) {
             float mult = (range + 1);
             float val = (float) (Math.random() * mult) + 3;// + (float)
             // ((mult *
-            // 0.1) / 10);x
+            // 0.1) / 10);xPx
             yVals.add(new Entry(i, val));
             xVals.add(new XAxisValue(i, i + ""));
         }
@@ -400,7 +400,7 @@ private void setData(int count, float range) {
 
     @Override
     public void onChartGestureStart(MotionEvent me, ChartTouchListener.ChartGesture lastPerformedGesture) {
-        Log.i("Gesture", "START, x: " + me.getX() + ", y: " + me.getY());
+        Log.i("Gesture", "START, xPx: " + me.getX() + ", yPx: " + me.getY());
     }
 
     @Override

MPChartExample/src/com/xxmassdeveloper/mpchartexample/LineChartActivity2.java

@@ -76,7 +76,7 @@ protected void onCreate(Bundle savedInstanceState) {
         mChart.setDrawGridBackground(false);
         mChart.setHighlightPerDragEnabled(true);
 
-        // if disabled, scaling can be done on x- and y-axis separately
+        // if disabled, scaling can be done on xPx- and yPx-axis separately
         mChart.setPinchZoom(true);
 
         // set an alternative background color

MPChartExample/src/com/xxmassdeveloper/mpchartexample/LineChartActivityColored.java

@@ -74,7 +74,7 @@ private void setupChart(LineChart chart, LineData data, int color) {
         chart.setDragEnabled(true);
         chart.setScaleEnabled(true);
 
-        // if disabled, scaling can be done on x- and y-axis separately
+        // if disabled, scaling can be done on xPx- and yPx-axis separately
         chart.setPinchZoom(false);
 
         chart.setBackgroundColor(color);

MPChartExample/src/com/xxmassdeveloper/mpchartexample/LineChartTime.java

@@ -73,7 +73,7 @@ protected void onCreate(Bundle savedInstanceState) {
         mChart.setDrawGridBackground(false);
         mChart.setHighlightPerDragEnabled(true);
 
-        // if disabled, scaling can be done on x- and y-axis separately
+        // if disabled, scaling can be done on xPx- and yPx-axis separately
         mChart.setPinchZoom(true);
 
         // set an alternative background color
@@ -104,7 +104,7 @@ protected void onCreate(Bundle savedInstanceState) {
         xAxis.setDrawAxisLine(false);
         xAxis.setSpaceBetweenLabels(1);
 
-        // custom x-axis min / max
+        // custom xPx-axis min / max
         xAxis.setAxisMinValue(5000);
         xAxis.setAxisMaxValue(30000);
 

MPChartExample/src/com/xxmassdeveloper/mpchartexample/MultiLineChartActivity.java

@@ -69,7 +69,7 @@ protected void onCreate(Bundle savedInstanceState) {
         mChart.setDragEnabled(true);
         mChart.setScaleEnabled(true);
 
-        // if disabled, scaling can be done on x- and y-axis separately
+        // if disabled, scaling can be done on xPx- and yPx-axis separately
         mChart.setPinchZoom(false);
 
         mSeekBarX.setProgress(20);

MPChartExample/src/com/xxmassdeveloper/mpchartexample/PerformanceLineChart.java

@@ -53,7 +53,7 @@ protected void onCreate(Bundle savedInstanceState) {
         mChart.setDragEnabled(true);
         mChart.setScaleEnabled(true);
 
-        // if disabled, scaling can be done on x- and y-axis separately
+        // if disabled, scaling can be done on xPx- and yPx-axis separately
         mChart.setPinchZoom(false);
 
         mChart.getAxisLeft().setDrawGridLines(false);

MPChartExample/src/com/xxmassdeveloper/mpchartexample/RealtimeLineChartActivity.java

@@ -53,7 +53,7 @@ protected void onCreate(Bundle savedInstanceState) {
         mChart.setScaleEnabled(true);
         mChart.setDrawGridBackground(false);
 
-        // if disabled, scaling can be done on x- and y-axis separately
+        // if disabled, scaling can be done on xPx- and yPx-axis separately
         mChart.setPinchZoom(true);
 
         // set an alternative background color
@@ -139,7 +139,7 @@ private void addEntry() {
                 data.addDataSet(set);
             }
 
-            // add a new x-value first
+            // add a new xPx-yValue first
             data.addXValue(new XAxisValue(data.getXValCount() ,mMonths[data.getXValCount() % 12] + " "
                     + (year + data.getXValCount() / 12)));
             data.addEntry(new Entry((float) (Math.random() * 40) + 30f, set.getEntryCount()), 0);

MPChartExample/src/com/xxmassdeveloper/mpchartexample/ScrollViewActivity.java

@@ -31,7 +31,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
         mChart.setDescription("");
 
-        // scaling can now only be done on x- and y-axis separately
+        // scaling can now only be done on xPx- and yPx-axis separately
         mChart.setPinchZoom(false);
 
         mChart.setDrawBarShadow(false);

MPChartExample/src/com/xxmassdeveloper/mpchartexample/StackedBarActivity.java

@@ -63,15 +63,15 @@ protected void onCreate(Bundle savedInstanceState) {
         // drawn
         mChart.setMaxVisibleValueCount(40);
 
-        // scaling can now only be done on x- and y-axis separately
+        // scaling can now only be done on xPx- and yPx-axis separately
         mChart.setPinchZoom(false);
 
         mChart.setDrawGridBackground(false);
         mChart.setDrawBarShadow(false);
 
         mChart.setDrawValueAboveBar(false);
 
-        // change the position of the y-labels
+        // change the position of the yPx-labels
         YAxis leftAxis = mChart.getAxisLeft();
         leftAxis.setValueFormatter(new MyYAxisValueFormatter());
         leftAxis.setAxisMinValue(0f); // this replaces setStartAtZero(true)

MPChartExample/src/com/xxmassdeveloper/mpchartexample/StackedBarActivityNegative.java

@@ -51,7 +51,7 @@ protected void onCreate(Bundle savedInstanceState) {
         mChart.setDrawGridBackground(false);
         mChart.setDescription("");
 
-        // scaling can now only be done on x- and y-axis separately
+        // scaling can now only be done on xPx- and yPx-axis separately
         mChart.setPinchZoom(false);
 
         mChart.setDrawBarShadow(false);

MPChartExample/src/com/xxmassdeveloper/mpchartexample/custom/MyCustomXAxisValueFormatter.java

@@ -15,9 +15,9 @@ public MyCustomXAxisValueFormatter() {
     @Override
     public String getXValue(String original, int index, ViewPortHandler viewPortHandler) {
 
-        //Log.i("TRANS", "x: " + viewPortHandler.getTransX() + ", y: " + viewPortHandler.getTransY());
+        //Log.i("TRANS", "xPx: " + viewPortHandler.getTransX() + ", yPx: " + viewPortHandler.getTransY());
 
-        // e.g. adjust the x-axis values depending on scale / zoom level
+        // e.g. adjust the xPx-axis values depending on scale / zoom level
         if (viewPortHandler.getScaleX() > 5)
             return "4";
         else if (viewPortHandler.getScaleX() > 3)

MPChartExample/src/com/xxmassdeveloper/mpchartexample/custom/MyMarkerView.java

@@ -50,7 +50,7 @@ public int getXOffset(float xpos) {
 
     @Override
     public int getYOffset(float ypos) {
-        // this will cause the marker-view to be above the selected value
+        // this will cause the marker-view to be above the selected yValue
         return -getHeight();
     }
 }

MPChartExample/src/com/xxmassdeveloper/mpchartexample/custom/StackedBarsMarkerView.java

@@ -37,7 +37,7 @@ public void refreshContent(Entry e, Highlight highlight) {
 
             if(be.getYVals() != null) {
 
-                // draw the stack value
+                // draw the stack yValue
                 tvContent.setText("" + Utils.formatNumber(be.getYVals()[highlight.getStackIndex()], 0, true));
             } else {
                 tvContent.setText("" + Utils.formatNumber(be.getY(), 0, true));
@@ -56,7 +56,7 @@ public int getXOffset(float xpos) {
 
     @Override
     public int getYOffset(float ypos) {
-        // this will cause the marker-view to be above the selected value
+        // this will cause the marker-view to be above the selected yValue
         return -getHeight();
     }
 }

MPChartExample/src/com/xxmassdeveloper/mpchartexample/notimportant/MainActivity.java

@@ -68,14 +68,14 @@ protected void onCreate(Bundle savedInstanceState) {
 
         objects.add(new ContentItem("Line Chart", "A simple demonstration of the linechart."));
         objects.add(new ContentItem("Line Chart (Dual YAxis)",
-                "Demonstration of the linechart with dual y-axis."));
+                "Demonstration of the linechart with dual yPx-axis."));
         objects.add(new ContentItem("Bar Chart", "A simple demonstration of the bar chart."));
         objects.add(new ContentItem("Horizontal Bar Chart",
                 "A simple demonstration of the horizontal bar chart."));
         objects.add(new ContentItem("Combined Chart",
                 "Demonstrates how to create a combined chart (bar and line in this case)."));
         objects.add(new ContentItem("Pie Chart", "A simple demonstration of the pie chart."));
-        objects.add(new ContentItem("Pie Chart with value lines", "A simple demonstration of the pie chart with polyline notes."));
+        objects.add(new ContentItem("Pie Chart with yValue lines", "A simple demonstration of the pie chart with polyline notes."));
         objects.add(new ContentItem("Scatter Chart", "A simple demonstration of the scatter chart."));
         objects.add(new ContentItem("Bubble Chart", "A simple demonstration of the bubble chart."));
         objects.add(new ContentItem("Stacked Bar Chart",
@@ -99,7 +99,7 @@ protected void onCreate(Bundle savedInstanceState) {
                 "Demonstrates the usage of different chart types inside a ListView."));
         objects.add(new ContentItem(
                 "Inverted Line Chart",
-                "Demonstrates the feature of inverting the y-axis."));
+                "Demonstrates the feature of inverting the yPx-axis."));
         objects.add(new ContentItem(
                 "Candle Stick Chart",
                 "Demonstrates usage of the CandleStickChart."));
@@ -114,7 +114,7 @@ protected void onCreate(Bundle savedInstanceState) {
                 "Shows a LineChart with different background and line color."));
         objects.add(new ContentItem(
                 "Realtime Chart",
-                "This chart is fed with new data in realtime. It also restrains the view on the x-axis."));
+                "This chart is fed with new data in realtime. It also restrains the view on the xPx-axis."));
         objects.add(new ContentItem(
                 "Dynamical data adding",
                 "This Activity demonstrates dynamical adding of Entries and DataSets (real time graph)."));

MPChartExample/src/com/xxmassdeveloper/mpchartexample/realm/RealmBaseActivity.java

@@ -55,7 +55,7 @@ protected void setup(Chart<?> chart) {
             mChart.setDragEnabled(true);
             mChart.setScaleEnabled(true);
 
-            // if disabled, scaling can be done on x- and y-axis separately
+            // if disabled, scaling can be done on xPx- and yPx-axis separately
             mChart.setPinchZoom(false);
 
             YAxis leftAxis = mChart.getAxisLeft();

MPChartExample/src/com/xxmassdeveloper/mpchartexample/realm/RealmDatabaseActivityBar.java

@@ -50,7 +50,7 @@ private void setData() {
         RealmResults<RealmDemoData> result = mRealm.allObjects(RealmDemoData.class);
 
         //RealmBarDataSet<RealmDemoData> set = new RealmBarDataSet<RealmDemoData>(result, "stackValues", "xIndex"); // normal entries
-        RealmBarDataSet<RealmDemoData> set = new RealmBarDataSet<RealmDemoData>(result, "value", "xIndex"); // stacked entries
+        RealmBarDataSet<RealmDemoData> set = new RealmBarDataSet<RealmDemoData>(result, "yValue", "xIndex"); // stacked entries
         set.setColors(new int[] {ColorTemplate.rgb("#FF5722"), ColorTemplate.rgb("#03A9F4")});
         set.setLabel("Realm BarDataSet");
 

MPChartExample/src/com/xxmassdeveloper/mpchartexample/realm/RealmDatabaseActivityBubble.java

@@ -53,7 +53,7 @@ private void setData() {
 
         RealmResults<RealmDemoData> result = mRealm.allObjects(RealmDemoData.class);
 
-        RealmBubbleDataSet<RealmDemoData> set = new RealmBubbleDataSet<RealmDemoData>(result, "value", "xIndex", "bubbleSize");
+        RealmBubbleDataSet<RealmDemoData> set = new RealmBubbleDataSet<RealmDemoData>(result, "yValue", "xIndex", "bubbleSize");
         set.setLabel("Realm BubbleDataSet");
         set.setColors(ColorTemplate.COLORFUL_COLORS, 110);
 

MPChartExample/src/com/xxmassdeveloper/mpchartexample/realm/RealmDatabaseActivityLine.java

@@ -54,7 +54,7 @@ private void setData() {
 
         RealmResults<RealmDemoData> result = mRealm.allObjects(RealmDemoData.class);
 
-        RealmLineDataSet<RealmDemoData> set = new RealmLineDataSet<RealmDemoData>(result, "value", "xIndex");
+        RealmLineDataSet<RealmDemoData> set = new RealmLineDataSet<RealmDemoData>(result, "yValue", "xIndex");
         set.setDrawCubic(false);
         set.setLabel("Realm LineDataSet");
         set.setDrawCircleHole(false);