Module operator fix

This commit is contained in:
serso
2016-03-05 11:43:54 +01:00
parent 58e1088524
commit b1a0e588c1
29 changed files with 281 additions and 116 deletions

View File

@@ -35,6 +35,7 @@ import butterknife.ButterKnife;
import com.squareup.otto.Bus;
import jscl.NumeralBase;
import jscl.math.Generic;
import jscl.math.NotDoubleException;
import org.solovyev.android.calculator.converter.ConverterFragment;
import org.solovyev.android.calculator.jscl.JsclOperation;
@@ -134,8 +135,10 @@ public class DisplayFragment extends BaseFragment implements View.OnClickListene
addMenu(menu, item.title, this);
}
}
if (result.toDouble() != null) {
try {
result.doubleValue();
addMenu(menu, R.string.c_convert, this);
} catch (NotDoubleException ignored) {
}
}
if (launcher.canPlot(result)) {
@@ -207,10 +210,10 @@ public class DisplayFragment extends BaseFragment implements View.OnClickListene
if (result == null) {
return 1d;
}
final Double value = result.toDouble();
if (value == null) {
try {
return result.doubleValue();
} catch (NotDoubleException ignored) {
return 1d;
}
return value;
}
}