mirror/openscale
1
0
Fork 0
mirror of https://github.com/oliexdev/openScale.git synced 2025-08-11 19:24:06 +02:00
Code Issues Releases Wiki Activity

commented out linear regression line

Browse Source
This commit is contained in:
oliexdev
2019-02-24 08:29:38 +01:00
parent 39d41ce0ec
commit 49823d3bc8
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
android_app/app/src/main/java/com/health/openscale/gui/preferences/GraphPreferences.java
View File

@@ -18,10 +18,7 @@ package com.health.openscale.gui.preferences;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.content.SharedPreferences.OnSharedPreferenceChangeListener; import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
import android.os.Bundle; import android.os.Bundle;
import android.preference.EditTextPreference;
import android.preference.Preference;
import android.preference.PreferenceFragment; import android.preference.PreferenceFragment;
import android.text.method.DigitsKeyListener;
import com.health.openscale.R; import com.health.openscale.R;
import com.health.openscale.core.OpenScale; import com.health.openscale.core.OpenScale;
@@ -36,7 +33,8 @@ public class GraphPreferences extends PreferenceFragment implements OnSharedPref
addPreferencesFromResource(R.xml.graph_preferences); addPreferencesFromResource(R.xml.graph_preferences);
EditTextPreference regressionLineOrder = // TODO replaced it with sliding average
/*EditTextPreference regressionLineOrder =
(EditTextPreference) findPreference(PREFERENCE_KEY_REGRESSION_LINE_ORDER); (EditTextPreference) findPreference(PREFERENCE_KEY_REGRESSION_LINE_ORDER);
regressionLineOrder.getEditText().setKeyListener(new DigitsKeyListener()); regressionLineOrder.getEditText().setKeyListener(new DigitsKeyListener());
regressionLineOrder.getEditText().setSelectAllOnFocus(true); regressionLineOrder.getEditText().setSelectAllOnFocus(true);
@@ -47,7 +45,7 @@ public class GraphPreferences extends PreferenceFragment implements OnSharedPref
preference.setSummary((String) newValue); preference.setSummary((String) newValue);
return true; return true;
} }
}); });*/
} }
@Override @Override

2
android_app/app/src/main/java/com/health/openscale/gui/views/ChartMeasurementView.java
View File

@@ -457,7 +457,7 @@ public class ChartMeasurementView extends LineChart {
} }
addGoalLine(lineDataSets); addGoalLine(lineDataSets);
addRegressionLine(lineDataSets); // addRegressionLine(lineDataSets); TODO replaced it with an sliding average
LineData data = new LineData(lineDataSets); LineData data = new LineData(lineDataSets);
setData(data); setData(data);

2
android_app/app/src/main/res/xml/graph_preferences.xml
View File

@@ -30,6 +30,7 @@
android:summaryOff="@string/info_is_not_visible" android:summaryOff="@string/info_is_not_visible"
android:summaryOn="@string/info_is_visible" android:summaryOn="@string/info_is_visible"
android:title="@string/label_goal_line" /> android:title="@string/label_goal_line" />
<!--
<CheckBoxPreference <CheckBoxPreference
android:defaultValue="false" android:defaultValue="false"
android:key="regressionLine" android:key="regressionLine"
@@ -41,4 +42,5 @@
android:dependency="regressionLine" android:dependency="regressionLine"
android:key="regressionLineOrder" android:key="regressionLineOrder"
android:title="@string/label_regression_line_degree" /> android:title="@string/label_regression_line_degree" />
-->
</PreferenceScreen> </PreferenceScreen>