restore messed up build files

psi · psi · commit 7edf573f3718 · 2017-02-25T12:55:26.000+01:00
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
diff --git a/androidplot-core/src/main/java/com/androidplot/xy/StepModelFit.java b/androidplot-core/src/main/java/com/androidplot/xy/StepModelFit.java
@@ -3,14 +3,10 @@
 import com.androidplot.Region;
 
 /**
- * Created by psi on 23.02.2017.
- *
- * Subclass of StepModel that chooses from predefined step values
- *
- * Depending on the currently displayed range (by value) choose increment so that
- * the number of lines is closest to StepModel.value
+ * Subclass of StepModel that chooses from predefined step values. Depending on the currently
+ * displayed range (by value) choose increment so that the number of lines
+ * is closest to StepModel.value
  */
-
 public class StepModelFit extends StepModel {
 
     private double[] steps; // list of steps to choose from
@@ -48,10 +44,10 @@ public double getValue() {
             return super.getValue();
 
         double curStep = steps[0];
-
         double oldDistance = Math.abs((scale.length().doubleValue() / curStep)-super.getValue() );
 
         // determine which step size comes closest to the desired number of steps
+        // since steps[] is a small array brute force search is ok
         for (double step : steps) {
 
             double newDistance = Math.abs((scale.length().doubleValue() / step)-super.getValue() );
diff --git a/build.gradle b/build.gradle
@@ -38,7 +38,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.3'
+        classpath 'com.android.tools.build:gradle:2.2.0'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7'
         classpath 'com.vanniktech:gradle-android-junit-jacoco-plugin:0.5.0'
diff --git a/demoapp-wearable/build.gradle b/demoapp-wearable/build.gradle
@@ -19,7 +19,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.3'
+        classpath 'com.android.tools.build:gradle:1.2.3'
     }
 }
 apply plugin: 'com.android.application'
diff --git a/demoapp/src/main/java/com/androidplot/demos/TouchZoomExampleActivity.java b/demoapp/src/main/java/com/androidplot/demos/TouchZoomExampleActivity.java
@@ -31,6 +31,7 @@
 public class TouchZoomExampleActivity extends Activity {
     private static final int SERIES_SIZE = 3000;
     private static final int SERIES_ALPHA = 255;
+    private static final int NUM_GRIDLINES = 5;
     private XYPlot plot;
     private PanZoom panZoom;
     private Button resetButton;
@@ -55,11 +56,11 @@ public void onClick(View view) {
         plot.setUserRangeOrigin(0);
 
         // predefine the stepping of both axis
-        // increment will be chosen from list to best fit 5 grid lines
+        // increment will be chosen from list to best fit NUM_GRIDLINES grid lines
         double[] inc_domain = new double[]{10,50,100,500};
         double[] inc_range = new double[]{1,5,10,20,50,100};
-        plot.setDomainStepModel(new StepModelFit(plot.getBounds().getxRegion(),inc_domain,5));
-        plot.setRangeStepModel( new StepModelFit(plot.getBounds().getyRegion(),inc_range,5));
+        plot.setDomainStepModel(new StepModelFit(plot.getBounds().getxRegion(),inc_domain,NUM_GRIDLINES));
+        plot.setRangeStepModel( new StepModelFit(plot.getBounds().getyRegion(),inc_range,NUM_GRIDLINES));
 
 
         panSpinner = (Spinner) findViewById(R.id.pan_spinner);

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ buildscript {`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`dependencies {`
`41`		`- classpath 'com.android.tools.build:gradle:2.2.3'`
	`41`	`+ classpath 'com.android.tools.build:gradle:2.2.0'`
`42`	`42`	`classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'`
`43`	`43`	`classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7'`
`44`	`44`	`classpath 'com.vanniktech:gradle-android-junit-jacoco-plugin:0.5.0'`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ buildscript {`
`19`	`19`	`jcenter()`
`20`	`20`	`}`
`21`	`21`	`dependencies {`
`22`		`- classpath 'com.android.tools.build:gradle:2.2.3'`
	`22`	`+ classpath 'com.android.tools.build:gradle:1.2.3'`
`23`	`23`	`}`
`24`	`24`	`}`
`25`	`25`	`apply plugin: 'com.android.application'`