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

new plotter

Browse Source
This commit is contained in:
Sergey Solovyev 2013-01-13 21:38:49 +04:00
parent f792e4c8ec
commit bb9d6f4038
1 changed files with 36 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -71,9 +71,12 @@ public class CalculatorPlotterImpl implements CalculatorPlotter {
yVariable = null;
}
boolean realAdded = addFunction(new XyFunction(expression, xVariable, yVariable, false));
final PlotFunction realPlotFunction = newPlotFunction(new XyFunction(expression, xVariable, yVariable, false));
final PlotFunction imagPlotFunction = newPlotFunction(new XyFunction(expression, xVariable, yVariable, true));
removeAllUnpinnedExcept(realPlotFunction, imagPlotFunction);
final boolean realAdded = addFunction(realPlotFunction);
final boolean imagAdded = addFunction(plotImag ? imagPlotFunction : PlotFunction.invisible(imagPlotFunction));
return imagAdded || realAdded;
@ -97,6 +100,37 @@ public class CalculatorPlotterImpl implements CalculatorPlotter {
}
}
private boolean removeAllUnpinnedExcept(@NotNull final PlotFunction... exceptFunctions) {
synchronized (functions) {
boolean changed = Iterables.removeIf(functions, new Predicate<PlotFunction>() {
@Override
public boolean apply(@Nullable PlotFunction function) {
if ( function != null && !function.isPinned() ) {
for (PlotFunction exceptFunction : exceptFunctions) {
if ( exceptFunction.equals(function) ) {
return false;
}
}
return true;
} else {
return false;
}
}
});
if (changed) {
onFunctionsChanged();
}
return changed;
}
}
@Override
public void removeAllUnpinned() {
synchronized (functions) {
@ -267,7 +301,6 @@ public class CalculatorPlotterImpl implements CalculatorPlotter {
@Override
public void plot(@NotNull Generic expression) {
removeAllUnpinned();
addFunction(expression);
plot();
}