From c3f1e3200f2e2a3f3f447f5277acd9c28c73db88 Mon Sep 17 00:00:00 2001
From: Sergey Solovyev <se.solovyev@gmail.com>
Date: Wed, 16 Jan 2013 17:47:56 +0400
Subject: [PATCH] new plotter

---
 .../layout/cpp_fixable_messages_dialog.xml    |  5 +-
 android-app-core/res/values/text_strings.xml  | 10 ++
 android-app-core/res/values/theme_gray.xml    |  5 +
 android-app/AndroidManifest.xml               |  8 +-
 android-app/project.properties                | 28 +++---
 .../cpp_plot_function_settings_dialog.xml     |  5 +-
 .../cpp_plot_function_settings_fragment.xml   | 17 +++-
 .../res/layout/cpp_plot_functions_dialog.xml  |  2 -
 .../layout/cpp_plot_functions_fragment.xml    |  6 +-
 .../calculator/CalculatorFragmentType.java    |  6 +-
 .../plot/AbstractCalculatorPlotFragment.java  |  6 +-
 .../plot/CalculatorGraph2dView.java           | 93 ++++++++++++-------
 ...alculatorPlotFunctionSettingsActivity.java | 66 ++++++++++++-
 .../android/calculator/plot/PlotLineDef.java  | 11 ++-
 14 files changed, 188 insertions(+), 80 deletions(-)

diff --git a/android-app-core/res/layout/cpp_fixable_messages_dialog.xml b/android-app-core/res/layout/cpp_fixable_messages_dialog.xml
index f24ce907..43a71fff 100644
--- a/android-app-core/res/layout/cpp_fixable_messages_dialog.xml
+++ b/android-app-core/res/layout/cpp_fixable_messages_dialog.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
-    a:layout_width="wrap_content"
-    a:layout_height="wrap_content"
-    style="?cpp_dialog_style"
-    a:orientation="vertical">
+    style="?cpp_dialog_style">
 
     <LinearLayout
         a:id="@+id/cpp_fixable_messages_container"
diff --git a/android-app-core/res/values/text_strings.xml b/android-app-core/res/values/text_strings.xml
index 2d2428c6..33c02872 100644
--- a/android-app-core/res/values/text_strings.xml
+++ b/android-app-core/res/values/text_strings.xml
@@ -302,4 +302,14 @@
 	<string name="cpp_plot_screenshot_saved">Screenshot successfully saved: %1$s!</string>
 	<string name="cpp_plot_unable_to_save_screenshot">Screenshot cannot be saved as sdcard is not mounted. Mount sdcard and try again!</string>
 
+	<string name="cpp_plot_function_line_color_type">Line color type</string>
+	<string name="cpp_plot_function_line_color">Line color</string>
+	<string name="cpp_plot_function_line_style">Line style</string>
+	<string name="cpp_plot_function_line_width">Line width</string>
+	<string name="cpp_plot_function_settings">Function settings</string>
+	<string name="cpp_function">Function</string>
+	<string name="cpp_pinned">Pinned</string>
+	<string name="cpp_visible">Visible</string>
+
+
 </resources>
\ No newline at end of file
diff --git a/android-app-core/res/values/theme_gray.xml b/android-app-core/res/values/theme_gray.xml
index 7d2ecc3c..ca6b0df3 100644
--- a/android-app-core/res/values/theme_gray.xml
+++ b/android-app-core/res/values/theme_gray.xml
@@ -12,6 +12,11 @@
 
     <style name="cpp_default_dialog_style">
         <item name="android:padding">6dp</item>
+        <item name="android:minWidth">200dp</item>
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:orientation">vertical</item>
+        <item name="android:layout_gravity">center_horizontal</item>
     </style>
 
     <style name="cpp_default_control_button_style" parent="cpp_keyboard_button_style">
diff --git a/android-app/AndroidManifest.xml b/android-app/AndroidManifest.xml
index e0b077ba..1f3ab5fa 100644
--- a/android-app/AndroidManifest.xml
+++ b/android-app/AndroidManifest.xml
@@ -22,7 +22,7 @@
 
     <uses-sdk android:minSdkVersion="4" android:targetSdkVersion="8"/>
 
-    <application android:debuggable="false" android:hardwareAccelerated="false" android:icon="@drawable/icon" android:label="@string/c_app_name" android:name=".CalculatorApplication" android:theme="@style/cpp_metro_blue_theme">
+    <application android:debuggable="true" android:hardwareAccelerated="false" android:icon="@drawable/icon" android:label="@string/c_app_name" android:name=".CalculatorApplication" android:theme="@style/cpp_metro_blue_theme">
 
         <activity android:clearTaskOnLaunch="true" android:label="@string/c_app_name" android:name=".CalculatorActivity" android:windowSoftInputMode="adjustPan">
 
@@ -40,7 +40,7 @@
 
         <activity android:label="@string/c_history" android:name=".history.CalculatorHistoryActivity"/>
 
-        <activity android:excludeFromRecents="true" android:finishOnTaskLaunch="true" android:label="@string/calculation_messages_dialog_title" android:launchMode="singleTask" android:name=".FixableMessagesDialog" android:theme="@style/Theme.Sherlock.Dialog"/>
+        <activity android:excludeFromRecents="true" android:finishOnTaskLaunch="true" android:label="@string/calculation_messages_dialog_title" android:launchMode="singleTask" android:name=".FixableMessagesDialog" android:theme="@style/cpp_gray_dialog_theme"/>
 
         <activity android:label="@string/c_about" android:name=".about.CalculatorAboutActivity"/>
 
@@ -53,8 +53,8 @@
         <activity android:label="@string/c_vars_and_constants" android:name=".math.edit.CalculatorVarsActivity"/>
 
         <activity android:label="@string/c_plot_graph" android:name=".plot.CalculatorPlotActivity"/>
-        <activity android:label="@string/c_plot_graph" android:name=".plot.CalculatorPlotFunctionsActivity" android:theme="@style/cpp_gray_dialog_theme"/>
-        <activity android:label="@string/c_plot_graph" android:name=".plot.CalculatorPlotFunctionSettingsActivity" android:theme="@style/cpp_gray_dialog_theme"/>
+        <activity android:launchMode="singleTop" android:label="@string/cpp_plot_functions" android:name=".plot.CalculatorPlotFunctionsActivity" android:theme="@style/cpp_gray_dialog_theme"/>
+        <activity android:launchMode="singleTop" android:label="@string/cpp_plot_function_settings" android:name=".plot.CalculatorPlotFunctionSettingsActivity" android:theme="@style/cpp_gray_dialog_theme"/>
 
         <!-- todo serso: strings-->
         <activity android:label="@string/c_plot_graph" android:name=".matrix.CalculatorMatrixActivity"/>
diff --git a/android-app/project.properties b/android-app/project.properties
index 542cf64d..1b8a55be 100644
--- a/android-app/project.properties
+++ b/android-app/project.properties
@@ -12,19 +12,19 @@ target=android-15
 android.library.reference.1=../android-app-core
 android.library.reference.2=../android-app-widget
 android.library.reference.3=../android-app-onscreen
-android.library.reference.4=gen-external-apklibs/org.solovyev.android_android-common-all_1.0.6
-android.library.reference.5=gen-external-apklibs/org.solovyev.android_android-common-ads_1.0.6
-android.library.reference.6=gen-external-apklibs/org.solovyev.android_android-common-core_1.0.6
-android.library.reference.7=gen-external-apklibs/org.solovyev.android_android-common-billing_1.0.6
-android.library.reference.8=gen-external-apklibs/org.solovyev.android_android-common-db_1.0.6
-android.library.reference.9=gen-external-apklibs/org.solovyev.android_android-common-http_1.0.6
-android.library.reference.10=gen-external-apklibs/org.solovyev.android_android-common-list_1.0.6
-android.library.reference.11=gen-external-apklibs/org.solovyev.android_android-common-view_1.0.6
-android.library.reference.12=gen-external-apklibs/org.solovyev.android_android-common-preferences_1.0.6
-android.library.reference.13=gen-external-apklibs/org.solovyev.android_android-common-menu_1.0.6
-android.library.reference.14=gen-external-apklibs/org.solovyev.android_android-common-other_1.0.6
-android.library.reference.15=gen-external-apklibs/org.solovyev.android_android-common-sherlock_1.0.6
-android.library.reference.16=gen-external-apklibs/com.actionbarsherlock_actionbarsherlock_4.2.0
-android.library.reference.17=gen-external-apklibs/org.solovyev.android_android-common-keyboard_1.0.6
+android.library.reference.4=../android-app-core/gen-external-apklibs/org.solovyev.android_android-common-all_1.0.6
+android.library.reference.5=../android-app-core/gen-external-apklibs/org.solovyev.android_android-common-ads_1.0.6
+android.library.reference.6=../android-app-core/gen-external-apklibs/org.solovyev.android_android-common-core_1.0.6
+android.library.reference.7=../android-app-core/gen-external-apklibs/org.solovyev.android_android-common-billing_1.0.6
+android.library.reference.8=../android-app-core/gen-external-apklibs/org.solovyev.android_android-common-db_1.0.6
+android.library.reference.9=../android-app-core/gen-external-apklibs/org.solovyev.android_android-common-http_1.0.6
+android.library.reference.10=../android-app-core/gen-external-apklibs/org.solovyev.android_android-common-list_1.0.6
+android.library.reference.11=../android-app-core/gen-external-apklibs/org.solovyev.android_android-common-view_1.0.6
+android.library.reference.12=../android-app-core/gen-external-apklibs/org.solovyev.android_android-common-preferences_1.0.6
+android.library.reference.13=../android-app-core/gen-external-apklibs/org.solovyev.android_android-common-menu_1.0.6
+android.library.reference.14=../android-app-core/gen-external-apklibs/org.solovyev.android_android-common-other_1.0.6
+android.library.reference.15=../android-app-core/gen-external-apklibs/org.solovyev.android_android-common-sherlock_1.0.6
+android.library.reference.16=../android-app-core/gen-external-apklibs/com.actionbarsherlock_actionbarsherlock_4.2.0
+android.library.reference.17=../android-app-core/gen-external-apklibs/org.solovyev.android_android-common-keyboard_1.0.6
 
 
diff --git a/android-app/res/layout/cpp_plot_function_settings_dialog.xml b/android-app/res/layout/cpp_plot_function_settings_dialog.xml
index 742f0b5c..310c67b4 100644
--- a/android-app/res/layout/cpp_plot_function_settings_dialog.xml
+++ b/android-app/res/layout/cpp_plot_function_settings_dialog.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
-    a:layout_width="wrap_content"
-    a:layout_height="wrap_content"
     a:id="@+id/dialog_layout"
-    style="?cpp_dialog_style"
-    a:orientation="vertical">
+    style="?cpp_dialog_style">
 
 </LinearLayout>
\ No newline at end of file
diff --git a/android-app/res/layout/cpp_plot_function_settings_fragment.xml b/android-app/res/layout/cpp_plot_function_settings_fragment.xml
index 3c7dcf38..9c859dba 100644
--- a/android-app/res/layout/cpp_plot_function_settings_fragment.xml
+++ b/android-app/res/layout/cpp_plot_function_settings_fragment.xml
@@ -3,13 +3,14 @@
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
     a:id="@+id/main_fragment_layout"
     style="?cpp_fragment_layout_style"
-    a:layout_width="match_parent"
+    a:layout_width="wrap_content"
+	a:layout_gravity="center_horizontal"
     a:layout_height="match_parent"
 	a:orientation="vertical">
 
     <include layout="@layout/ad" />
 
-	<TextView a:text="Line color type"
+	<TextView a:text="@string/cpp_plot_function_line_color_type"
 			  a:layout_width="match_parent"
 			  a:layout_height="wrap_content"/>
 
@@ -18,7 +19,7 @@
 			 a:layout_width="match_parent"
 			 a:layout_height="wrap_content"/>
 
-	<TextView a:text="Line color"
+	<TextView a:text="@string/cpp_plot_function_line_color"
 			  a:layout_width="match_parent"
 			  a:layout_height="wrap_content"/>
 
@@ -27,7 +28,7 @@
 			 a:layout_width="match_parent"
 			 a:layout_height="wrap_content"/>
 
-	<TextView a:text="Line style"
+	<TextView a:text="@string/cpp_plot_function_line_style"
 			  a:layout_width="match_parent"
 			  a:layout_height="wrap_content"/>
 
@@ -36,6 +37,14 @@
 			 a:layout_width="match_parent"
 			 a:layout_height="wrap_content"/>
 
+	<TextView a:text="@string/cpp_plot_function_line_width"
+			  a:layout_width="match_parent"
+			  a:layout_height="wrap_content"/>
+
+	<SeekBar a:id="@+id/cpp_plot_functions_line_width_seekbar"
+				a:layout_width="match_parent"
+				a:layout_height="wrap_content"/>
+
 	<Button a:id="@+id/cpp_ok_button"
 			a:text="@string/ok"
 			a:layout_width="match_parent"
diff --git a/android-app/res/layout/cpp_plot_functions_dialog.xml b/android-app/res/layout/cpp_plot_functions_dialog.xml
index 742f0b5c..d0239197 100644
--- a/android-app/res/layout/cpp_plot_functions_dialog.xml
+++ b/android-app/res/layout/cpp_plot_functions_dialog.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
-    a:layout_width="wrap_content"
-    a:layout_height="wrap_content"
     a:id="@+id/dialog_layout"
     style="?cpp_dialog_style"
     a:orientation="vertical">
diff --git a/android-app/res/layout/cpp_plot_functions_fragment.xml b/android-app/res/layout/cpp_plot_functions_fragment.xml
index 992051b9..5a6b2fd6 100644
--- a/android-app/res/layout/cpp_plot_functions_fragment.xml
+++ b/android-app/res/layout/cpp_plot_functions_fragment.xml
@@ -17,19 +17,19 @@
             a:layout_width="0dp"
             a:layout_height="wrap_content"
             a:layout_weight="3"
-            a:text="Function"/>
+            a:text="@string/cpp_function"/>
 
         <TextView
             a:layout_width="0dp"
             a:layout_height="wrap_content"
             a:layout_weight="1"
-            a:text="Pinned"/>
+            a:text="@string/cpp_pinned"/>
 
         <TextView
             a:layout_width="0dp"
             a:layout_height="wrap_content"
             a:layout_weight="1"
-            a:text="Visible"/>
+            a:text="@string/cpp_visible"/>
 
 		<TextView
 				a:layout_width="0dp"
diff --git a/android-app/src/main/java/org/solovyev/android/calculator/CalculatorFragmentType.java b/android-app/src/main/java/org/solovyev/android/calculator/CalculatorFragmentType.java
index 612cebf8..3d463d1b 100644
--- a/android-app/src/main/java/org/solovyev/android/calculator/CalculatorFragmentType.java
+++ b/android-app/src/main/java/org/solovyev/android/calculator/CalculatorFragmentType.java
@@ -33,10 +33,8 @@ public enum CalculatorFragmentType {
     functions(CalculatorFunctionsFragment.class, R.layout.math_entities_fragment, R.string.c_functions),
     operators(CalculatorOperatorsFragment.class, R.layout.math_entities_fragment, R.string.c_operators),
     plotter(CalculatorPlotFragment.class, R.layout.cpp_plot_fragment, R.string.c_graph),
-
-	// todo serso: strings
-	plotter_functions(CalculatorPlotFunctionsActivity.CalculatorPlotFunctionsFragment.class, R.layout.cpp_plot_functions_fragment, R.string.c_graph),
-	plotter_function_settings(CalculatorPlotFunctionSettingsActivity.CalculatorPlotFunctionSettingsFragment.class, R.layout.cpp_plot_function_settings_fragment, R.string.c_graph),
+	plotter_functions(CalculatorPlotFunctionsActivity.CalculatorPlotFunctionsFragment.class, R.layout.cpp_plot_functions_fragment, R.string.cpp_plot_functions),
+	plotter_function_settings(CalculatorPlotFunctionSettingsActivity.CalculatorPlotFunctionSettingsFragment.class, R.layout.cpp_plot_function_settings_fragment, R.string.cpp_plot_function_settings),
 
     about(CalculatorAboutFragment.class, R.layout.about_fragment, R.string.c_about),
     faq(CalculatorHelpFaqFragment.class, R.layout.help_faq_fragment, R.string.c_faq),
diff --git a/android-app/src/main/java/org/solovyev/android/calculator/plot/AbstractCalculatorPlotFragment.java b/android-app/src/main/java/org/solovyev/android/calculator/plot/AbstractCalculatorPlotFragment.java
index 3582ba34..fe68f37c 100644
--- a/android-app/src/main/java/org/solovyev/android/calculator/plot/AbstractCalculatorPlotFragment.java
+++ b/android-app/src/main/java/org/solovyev/android/calculator/plot/AbstractCalculatorPlotFragment.java
@@ -453,11 +453,7 @@ public abstract class AbstractCalculatorPlotFragment extends CalculatorFragment
         paint.setColor(plotLineDef.getLineColor());
         paint.setStyle(Paint.Style.STROKE);
 
-        if ( plotLineDef.getLineWidth() == PlotLineDef.DEFAULT_LINE_WIDTH ) {
-            paint.setStrokeWidth(0);
-        } else {
-            paint.setStrokeWidth(plotLineDef.getLineWidth());
-        }
+        paint.setStrokeWidth(plotLineDef.getLineWidth());
 
         final AndroidPlotLineStyle androidPlotLineStyle = AndroidPlotLineStyle.valueOf(plotLineDef.getLineStyle());
         if (androidPlotLineStyle != null) {
diff --git a/android-app/src/main/java/org/solovyev/android/calculator/plot/CalculatorGraph2dView.java b/android-app/src/main/java/org/solovyev/android/calculator/plot/CalculatorGraph2dView.java
index 35d0c695..edb9b1f9 100644
--- a/android-app/src/main/java/org/solovyev/android/calculator/plot/CalculatorGraph2dView.java
+++ b/android-app/src/main/java/org/solovyev/android/calculator/plot/CalculatorGraph2dView.java
@@ -12,6 +12,7 @@ import android.widget.Scroller;
 import android.widget.ZoomButtonsController;
 import org.javia.arity.Function;
 import org.jetbrains.annotations.NotNull;
+import org.solovyev.common.math.Point2d;
 
 import java.text.DecimalFormat;
 import java.util.ArrayList;
@@ -27,6 +28,7 @@ public class CalculatorGraph2dView extends View implements GraphView {
     *
     **********************************************************************
     */
+	private static final int NO_TOUCH = -1;
 
     private static final float TICKS_COUNT = 15;
     public static final int TICK_SIZE_PXS = 3;
@@ -51,7 +53,7 @@ public class CalculatorGraph2dView extends View implements GraphView {
     private int widthPxs;
     private int heightPxs;
 
-    @NotNull
+	@NotNull
     private final Matrix matrix = new Matrix();
 
     // paints
@@ -80,15 +82,15 @@ public class CalculatorGraph2dView extends View implements GraphView {
     private float y0;
 
     // graph width in function units (NOT screen pixels)
-    private float graphWidth = 20;
+    private float gWidth = 20;
 
     private float lastXMin;
 
     private float lastYMin;
     private float lastYMax;
 
-    private float lastTouchX, lastTouchY;
-
+    private float lastTouchXPxs = NO_TOUCH;
+	private float lastTouchYPxs = NO_TOUCH;
 
     @NotNull
     private TouchHandler touchHandler;
@@ -134,8 +136,8 @@ public class CalculatorGraph2dView extends View implements GraphView {
 
     @Override
     public void setXRange(float xMin, float xMax) {
-        this.graphWidth = xMax - xMin;
-        this.x0 = xMin + graphWidth / 2;
+        this.gWidth = xMax - xMin;
+        this.x0 = xMin + gWidth / 2;
         this.y0 = 0;
     }
 
@@ -418,6 +420,9 @@ public class CalculatorGraph2dView extends View implements GraphView {
         }
 
 
+		final float tickStep = getStep(gWidth);
+		final int tickDigits = countTickDigits(tickStep);
+
         {
             // GRID
 
@@ -428,17 +433,14 @@ public class CalculatorGraph2dView extends View implements GraphView {
             textPaint.setTextSize(12);
             textPaint.setTextAlign(Paint.Align.CENTER);
 
-            final float step = getStep(graphWidth);
-            final int tickDigits = countTickDigits(step);
-
             // round xMin and init first tick
-            float tick = ((int) (xMin / step)) * step;
+            float tick = ((int) (xMin / tickStep)) * tickStep;
 
             final float y2 = y0px + TICK_SIZE_PXS;
 
-            final float stepPxs = step / ratio;
+            final float stepPxs = tickStep / ratio;
 
-            for (float xPxs = (tick - xMin) / ratio; xPxs <= widthPxs; xPxs += stepPxs, tick += step) {
+            for (float xPxs = (tick - xMin) / ratio; xPxs <= widthPxs; xPxs += stepPxs, tick += tickStep) {
                 // draw grid line
                 canvas.drawLine(xPxs, 0, xPxs, heightPxs, paint);
 
@@ -449,9 +451,9 @@ public class CalculatorGraph2dView extends View implements GraphView {
             }
 
             final float x1 = x0px - TICK_SIZE_PXS;
-            tick = ((int) (yMin / step)) * step;
+            tick = ((int) (yMin / tickStep)) * tickStep;
             textPaint.setTextAlign(Paint.Align.RIGHT);
-            for (float y = heightPxs - (tick - yMin) / ratio; y >= 0; y -= stepPxs, tick += step) {
+            for (float y = heightPxs - (tick - yMin) / ratio; y >= 0; y -= stepPxs, tick += tickStep) {
                 canvas.drawLine(0, y, widthPxs, y, paint);
 
                 final CharSequence tickLabel = formatTick(tick, tickDigits);
@@ -471,6 +473,26 @@ public class CalculatorGraph2dView extends View implements GraphView {
             canvas.drawLine(0, y0px, widthPxs, y0px, paint);
         }
 
+		{
+			// TOUCH POSITION
+
+			if (lastTouchXPxs != NO_TOUCH && lastTouchYPxs != NO_TOUCH) {
+
+				paint.setColor(graphViewHelper.getFunctionViewDef().getGridColor());
+				paint.setAlpha(100);
+
+				canvas.drawLine(lastTouchXPxs, 0, lastTouchXPxs, heightPxs, paint);
+				canvas.drawLine(0, lastTouchYPxs, widthPxs, lastTouchYPxs, paint);
+
+				final Point2d lastTouch = toGraphCoordinates(lastTouchXPxs, lastTouchYPxs);
+				final String touchLabel = "[" + formatTick(lastTouch.getX(), tickDigits + 1) + ", " + formatTick(lastTouch.getY(), tickDigits + 1) + "]";
+				canvas.drawText(touchLabel, 0, touchLabel.length(), lastTouchXPxs - 40, lastTouchYPxs - 40, textPaint);
+
+				// restore alpha
+				paint.setAlpha(255);
+			}
+		}
+
 
         matrix.reset();
         matrix.preTranslate(-this.x0, -this.y0);
@@ -550,14 +572,18 @@ public class CalculatorGraph2dView extends View implements GraphView {
     **********************************************************************
     */
 
+	private Point2d toGraphCoordinates(float xPxs, float yPxs) {
+		return new Point2d(xPxs * getRatio() + getXMin(), - (yPxs * getRatio() + getYMin()));
+	}
+
     // X
 
     public float getXMin() {
-        return x0 - graphWidth / 2;
+        return x0 - gWidth / 2;
     }
 
     private float getXMax(float minX) {
-        return minX + graphWidth;
+        return minX + gWidth;
     }
 
     public float getXMax() {
@@ -587,20 +613,20 @@ public class CalculatorGraph2dView extends View implements GraphView {
     }
 
     private float getGraphHeight() {
-        return graphWidth * getAspectRatio();
+        return gWidth * getAspectRatio();
     }
 
     private float getRatio() {
         if (widthPxs != 0) {
-            return  graphWidth / widthPxs;
+            return gWidth / widthPxs;
         } else {
             return 0;
         }
     }
 
-    private int getAspectRatio() {
+    private float getAspectRatio() {
         if (widthPxs != 0) {
-            return heightPxs / widthPxs;
+            return ((float)heightPxs) / widthPxs;
         } else {
             return 0;
         }
@@ -628,12 +654,12 @@ public class CalculatorGraph2dView extends View implements GraphView {
     public void onZoom(boolean zoomIn) {
         if (zoomIn) {
             if (canZoomIn()) {
-                graphWidth /= 2;
+                gWidth /= 2;
                 invalidateGraphs();
             }
         } else {
             if (canZoomOut()) {
-                graphWidth *= 2;
+                gWidth *= 2;
                 invalidateGraphs();
             }
         }
@@ -663,17 +689,19 @@ public class CalculatorGraph2dView extends View implements GraphView {
         if (!scroller.isFinished()) {
             scroller.abortAnimation();
         }
-        lastTouchX = x;
-        lastTouchY = y;
+
+		lastTouchXPxs = x;
+        lastTouchYPxs = y;
     }
 
     public void onTouchMove(float x, float y) {
-        float deltaX = x - lastTouchX;
-        float deltaY = y - lastTouchY;
+        float deltaX = x - lastTouchXPxs;
+        float deltaY = y - lastTouchYPxs;
+
         if (deltaX < -1 || deltaX > 1 || deltaY < -1 || deltaY > 1) {
             scroll(-deltaX, deltaY);
-            lastTouchX = x;
-            lastTouchY = y;
+            lastTouchXPxs = x;
+            lastTouchYPxs = y;
             invalidate();
         }
     }
@@ -681,6 +709,9 @@ public class CalculatorGraph2dView extends View implements GraphView {
     public void onTouchUp(float x, float y) {
         final float ratio = getRatio();
 
+		lastTouchXPxs = NO_TOUCH;
+		lastTouchYPxs = NO_TOUCH;
+
         float sx = -touchHandler.getXVelocity();
         float sy = touchHandler.getYVelocity();
 
@@ -696,7 +727,7 @@ public class CalculatorGraph2dView extends View implements GraphView {
     }
 
     public void onTouchZoomDown(float x1, float y1, float x2, float y2) {
-        zoomTracker.start(graphWidth, x1, y1, x2, y2);
+        zoomTracker.start(gWidth, x1, y1, x2, y2);
     }
 
     public void onTouchZoomMove(float x1, float y1, float x2, float y2) {
@@ -705,7 +736,7 @@ public class CalculatorGraph2dView extends View implements GraphView {
         }
         float targetGwidth = zoomTracker.value;
         if (targetGwidth > .25f && targetGwidth < 200) {
-            graphWidth = targetGwidth;
+            gWidth = targetGwidth;
         }
         // scroll(-zoomTracker.moveX, zoomTracker.moveY);
         invalidateGraphs();
@@ -719,7 +750,7 @@ public class CalculatorGraph2dView extends View implements GraphView {
     }
 
     private void scroll(float deltaX, float deltaY) {
-        final float scale = graphWidth / widthPxs;
+        final float scale = gWidth / widthPxs;
         float dx = deltaX * scale;
         float dy = deltaY * scale;
         final float adx = Math.abs(dx);
diff --git a/android-app/src/main/java/org/solovyev/android/calculator/plot/CalculatorPlotFunctionSettingsActivity.java b/android-app/src/main/java/org/solovyev/android/calculator/plot/CalculatorPlotFunctionSettingsActivity.java
index ad2dc0e3..3d7e529c 100644
--- a/android-app/src/main/java/org/solovyev/android/calculator/plot/CalculatorPlotFunctionSettingsActivity.java
+++ b/android-app/src/main/java/org/solovyev/android/calculator/plot/CalculatorPlotFunctionSettingsActivity.java
@@ -4,11 +4,14 @@ import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.Button;
+import android.widget.SeekBar;
 import android.widget.Spinner;
 import com.actionbarsherlock.app.SherlockFragmentActivity;
 import org.jetbrains.annotations.NotNull;
@@ -27,7 +30,6 @@ public class CalculatorPlotFunctionSettingsActivity extends SherlockFragmentActi
 		final Intent intent = new Intent(context, CalculatorPlotFunctionSettingsActivity.class);
 		intent.putExtra(INPUT_FUNCTION_ID, plotFunction.getXyFunction().getId());
 		context.startActivity(intent);
-
 	}
 
 	@Override
@@ -55,9 +57,42 @@ public class CalculatorPlotFunctionSettingsActivity extends SherlockFragmentActi
 
 	public static class CalculatorPlotFunctionSettingsFragment extends CalculatorFragment {
 
+		/*
+		**********************************************************************
+		*
+		*                           STATIC
+		*
+		**********************************************************************
+		*/
+
+		public static final int LINE_WIDTH_DELAY = 1000;
+		public static final int MESSAGE_ID = 1;
+
 		@Nullable
 		private PlotFunction plotFunction;
 
+		@NotNull
+		private final CalculatorPlotter plotter = Locator.getInstance().getPlotter();
+
+		@NotNull
+		private final Handler handler = new Handler() {
+
+			@Override
+			public void handleMessage(Message msg) {
+				if (plotFunction != null) {
+					switch (msg.what) {
+						case MESSAGE_ID:
+							final PlotLineDef newPlotLineDef = PlotLineDef.changeLineWidth(plotFunction.getPlotLineDef(), msg.arg1);
+							final PlotFunction newPlotFunction = PlotFunction.changePlotLineDef(plotFunction, newPlotLineDef);
+							if(plotter.updateFunction(newPlotFunction)) {
+								plotFunction = newPlotFunction;
+							}
+							break;
+					}
+				}
+			}
+		};
+
 		public CalculatorPlotFunctionSettingsFragment() {
 			super(CalculatorFragmentType.plotter_function_settings);
 		}
@@ -69,6 +104,9 @@ public class CalculatorPlotFunctionSettingsActivity extends SherlockFragmentActi
 			final String functionId = getArguments().getString(INPUT_FUNCTION_ID);
 			if (functionId != null) {
 				plotFunction = Locator.getInstance().getPlotter().getFunctionById(functionId);
+				if ( plotFunction != null ) {
+					getActivity().setTitle(plotFunction.getXyFunction().getExpressionString());
+				}
 			}
 		}
 
@@ -81,14 +119,16 @@ public class CalculatorPlotFunctionSettingsActivity extends SherlockFragmentActi
 		public void onViewCreated(View root, Bundle savedInstanceState) {
 			super.onViewCreated(root, savedInstanceState);
 
-			final CalculatorPlotter plotter = Locator.getInstance().getPlotter();
-
 			final Spinner plotLineColorSpinner = (Spinner)root.findViewById(R.id.cpp_plot_function_line_color_spinner);
 			final Spinner plotLineColorTypeSpinner = (Spinner)root.findViewById(R.id.cpp_plot_function_line_color_type_spinner);
 			final Spinner plotLineStyleSpinner = (Spinner)root.findViewById(R.id.cpp_plot_function_line_style_spinner);
+			final SeekBar plotLineWidthSeekBar = (SeekBar)root.findViewById(R.id.cpp_plot_functions_line_width_seekbar);
 			final Button okButton = (Button)root.findViewById(R.id.cpp_ok_button);
 
+			plotLineWidthSeekBar.setMax(10);
+
 			if (plotFunction != null) {
+				plotLineWidthSeekBar.setProgress((int)plotFunction.getPlotLineDef().getLineWidth());
 
 				plotLineColorSpinner.setSelection(PlotLineColor.valueOf(plotFunction.getPlotLineDef().getLineColor()).ordinal());
 				plotLineColorSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
@@ -150,6 +190,25 @@ public class CalculatorPlotFunctionSettingsActivity extends SherlockFragmentActi
 					}
 				});
 
+				plotLineWidthSeekBar.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
+					@Override
+					public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
+						// remove old messages
+						handler.removeMessages(MESSAGE_ID);
+
+						// send new message
+						handler.sendMessageDelayed(Message.obtain(handler, MESSAGE_ID, progress, 0), LINE_WIDTH_DELAY);
+					}
+
+					@Override
+					public void onStartTrackingTouch(SeekBar seekBar) {
+					}
+
+					@Override
+					public void onStopTrackingTouch(SeekBar seekBar) {
+					}
+				});
+
 				okButton.setOnClickListener(new View.OnClickListener() {
 					@Override
 					public void onClick(View v) {
@@ -161,6 +220,7 @@ public class CalculatorPlotFunctionSettingsActivity extends SherlockFragmentActi
 				});
 
 			} else {
+				plotLineWidthSeekBar.setEnabled(false);
 				plotLineColorSpinner.setEnabled(false);
 				plotLineColorTypeSpinner.setEnabled(false);
 				plotLineStyleSpinner.setEnabled(false);
diff --git a/core/src/main/java/org/solovyev/android/calculator/plot/PlotLineDef.java b/core/src/main/java/org/solovyev/android/calculator/plot/PlotLineDef.java
index 3323315f..f567a313 100644
--- a/core/src/main/java/org/solovyev/android/calculator/plot/PlotLineDef.java
+++ b/core/src/main/java/org/solovyev/android/calculator/plot/PlotLineDef.java
@@ -18,7 +18,7 @@ public class PlotLineDef {
     */
 
     @NotNull
-    public static final Float DEFAULT_LINE_WIDTH = -1f;
+    private static final Float DEFAULT_LINE_WIDTH = 0f;
 
     private static final int WHITE = 0xFFFFFFFF;
 
@@ -39,7 +39,7 @@ public class PlotLineDef {
     @NotNull
     private PlotLineStyle lineStyle = PlotLineStyle.solid;
 
-    private float lineWidth = -DEFAULT_LINE_WIDTH;
+    private float lineWidth = DEFAULT_LINE_WIDTH;
 
     private PlotLineDef() {
     }
@@ -88,6 +88,13 @@ public class PlotLineDef {
 		return result;
 	}
 
+	@NotNull
+	public static PlotLineDef changeLineWidth(@NotNull PlotLineDef plotLineDef, int newLineWidth) {
+		final PlotLineDef result = plotLineDef.copy();
+		result.lineWidth = newLineWidth;
+		return result;
+	}
+
 	@NotNull
 	public static PlotLineDef changeLineColorType(@NotNull PlotLineDef plotLineDef, @NotNull PlotLineColorType newPlotLineColorType) {
 		final PlotLineDef result = plotLineDef.copy();