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

graph improvements

Browse Source
This commit is contained in:
Sergey Solovyev
2013-06-16 14:43:34 +04:00
parent d1677c97e6
commit 6a4d990d9c
7 changed files with 114 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/main/java/org/solovyev/android/calculator/plot/CalculatorPlotterImpl.java
View File

@@ -31,6 +31,7 @@ public class CalculatorPlotterImpl implements CalculatorPlotter {
private final PlotResourceManager resourceManager = new MapPlotResourceManager();
private boolean plot3d = false;
private boolean adjustYAxis = true;
private boolean plotImag = false;
@@ -40,7 +41,7 @@ public class CalculatorPlotterImpl implements CalculatorPlotter {
private PlotBoundaries plotBoundaries = PlotBoundaries.newDefaultInstance();
@Nonnull
private PlotData plotData = new PlotData(Collections.<PlotFunction>emptyList(), plot3d, plotBoundaries);
private PlotData plotData = new PlotData(Collections.<PlotFunction>emptyList(), plot3d, true, plotBoundaries);
public CalculatorPlotterImpl(@Nonnull Calculator calculator) {
this.calculator = calculator;
@@ -308,6 +309,7 @@ public class CalculatorPlotterImpl implements CalculatorPlotter {
if (functions.isEmpty()) {
// no functions => new plot => default boundaries
this.plotBoundaries = PlotBoundaries.newDefaultInstance();
this.adjustYAxis = true;
}
arity = maxArity;
@@ -378,7 +380,7 @@ public class CalculatorPlotterImpl implements CalculatorPlotter {
}
private void updatePlotData() {
plotData = new PlotData(getVisibleFunctions(), plot3d, plotBoundaries);
plotData = new PlotData(getVisibleFunctions(), plot3d, adjustYAxis, plotBoundaries);
}
@Override
@@ -395,6 +397,7 @@ public class CalculatorPlotterImpl implements CalculatorPlotter {
public void savePlotBoundaries(@Nonnull PlotBoundaries plotBoundaries) {
if (!this.plotBoundaries.equals(plotBoundaries)) {
this.plotBoundaries = plotBoundaries;
this.adjustYAxis = false;
updatePlotData();
}
}
@@ -403,6 +406,7 @@ public class CalculatorPlotterImpl implements CalculatorPlotter {
public void setPlotBoundaries(@Nonnull PlotBoundaries plotBoundaries) {
if (!this.plotBoundaries.equals(plotBoundaries)) {
this.plotBoundaries = plotBoundaries;
this.adjustYAxis = false;
firePlotDataChangedEvent();
}
}

14
core/src/main/java/org/solovyev/android/calculator/plot/PlotData.java
View File

@@ -12,18 +12,22 @@ import java.util.List;
public class PlotData {
@Nonnull
private List<PlotFunction> functions;
private final List<PlotFunction> functions;
private boolean plot3d;
private final boolean plot3d;
private final boolean adjustYAxis;
@Nonnull
private PlotBoundaries boundaries;
private final PlotBoundaries boundaries;
public PlotData(@Nonnull List<PlotFunction> functions,
boolean plot3d,
boolean adjustYAxis,
@Nonnull PlotBoundaries boundaries) {
this.functions = functions;
this.plot3d = plot3d;
this.adjustYAxis = adjustYAxis;
this.boundaries = boundaries;
}
@@ -40,4 +44,8 @@ public class PlotData {
public PlotBoundaries getBoundaries() {
return boundaries;
}
public boolean isAdjustYAxis() {
return adjustYAxis;
}
}