TnSb/android-calculatorpp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

user exceptions fixed

Browse Source
This commit is contained in:
Sergey Solovyev 2012-12-05 12:43:57 +04:00
parent 8784c3232f
commit 5ac1f7405a
3 changed files with 46 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
android-app-onscreen/src/main/java/org/solovyev/android/calculator/onscreen/CalculatorOnscreenService.java
View File

@ -98,8 +98,10 @@ public class CalculatorOnscreenService extends Service implements ExternalCalcul
@Override @Override
public void onDestroy() { public void onDestroy() {
stopCalculatorListening(); stopCalculatorListening();
this.view.hide(); if (viewCreated) {
super.onDestroy(); this.view.hide();
}
super.onDestroy();
} }
@Override @Override

21
android-app/src/main/java/org/solovyev/android/calculator/plot/CalculatorPlotFragment.java
View File

@ -23,7 +23,6 @@ import jscl.math.Expression;
import jscl.math.Generic; import jscl.math.Generic;
import jscl.math.function.Constant; import jscl.math.function.Constant;
import jscl.text.ParseException; import jscl.text.ParseException;
import org.achartengine.GraphicalView;
import org.achartengine.chart.XYChart; import org.achartengine.chart.XYChart;
import org.achartengine.model.XYSeries; import org.achartengine.model.XYSeries;
import org.achartengine.renderer.XYMultipleSeriesRenderer; import org.achartengine.renderer.XYMultipleSeriesRenderer;
@ -32,7 +31,21 @@ import org.achartengine.tools.ZoomEvent;
import org.achartengine.tools.ZoomListener; import org.achartengine.tools.ZoomListener;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.solovyev.android.calculator.*; import org.solovyev.android.calculator.CalculatorApplication;
import org.solovyev.android.calculator.CalculatorDisplayChangeEventData;
import org.solovyev.android.calculator.CalculatorDisplayViewState;
import org.solovyev.android.calculator.CalculatorEventData;
import org.solovyev.android.calculator.CalculatorEventHolder;
import org.solovyev.android.calculator.CalculatorEventListener;
import org.solovyev.android.calculator.CalculatorEventType;
import org.solovyev.android.calculator.CalculatorFragment;
import org.solovyev.android.calculator.CalculatorParseException;
import org.solovyev.android.calculator.CalculatorPreferences;
import org.solovyev.android.calculator.CalculatorUtils;
import org.solovyev.android.calculator.Locator;
import org.solovyev.android.calculator.PreparedExpression;
import org.solovyev.android.calculator.R;
import org.solovyev.android.calculator.ToJsclTextProcessor;
import org.solovyev.android.menu.ActivityMenu; import org.solovyev.android.menu.ActivityMenu;
import org.solovyev.android.menu.IdentifiableMenuItem; import org.solovyev.android.menu.IdentifiableMenuItem;
import org.solovyev.android.menu.ListActivityMenu; import org.solovyev.android.menu.ListActivityMenu;
@ -69,7 +82,7 @@ public class CalculatorPlotFragment extends CalculatorFragment implements Calcul
* The encapsulated graphical view. * The encapsulated graphical view.
*/ */
@Nullable @Nullable
private GraphicalView graphicalView; private MyGraphicalView graphicalView;
// thread which calculated data for graph view // thread which calculated data for graph view
@NotNull @NotNull
@ -247,7 +260,7 @@ public class CalculatorPlotFragment extends CalculatorFragment implements Calcul
chart.getRenderer().setYAxisMax(plotBoundaries.yMax); chart.getRenderer().setYAxisMax(plotBoundaries.yMax);
} }
graphicalView = new GraphicalView(this.getActivity(), chart); graphicalView = new MyGraphicalView(this.getActivity(), chart);
graphicalView.setBackgroundColor(this.bgColor); graphicalView.setBackgroundColor(this.bgColor);
graphicalView.addZoomListener(new ZoomListener() { graphicalView.addZoomListener(new ZoomListener() {

25
android-app/src/main/java/org/solovyev/android/calculator/plot/MyGraphicalView.java Normal file
View File

@ -0,0 +1,25 @@
package org.solovyev.android.calculator.plot;
import android.content.Context;
import android.graphics.Canvas;
import org.achartengine.GraphicalView;
import org.achartengine.chart.AbstractChart;
import org.solovyev.android.calculator.Locator;
public class MyGraphicalView extends GraphicalView {
private static final String TAG = MyGraphicalView.class.getSimpleName();
public MyGraphicalView(Context context, AbstractChart chart) {
super(context, chart);
}
@Override
protected void onDraw(Canvas canvas) {
try {
super.onDraw(canvas);
} catch (RuntimeException e) {
Locator.getInstance().getLogger().error(TAG, e.getMessage(), e);
}
}
}