UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-03-28 18:20:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge changes I13cebe8a,Iee7c65e1

Browse Source 
* changes:
  [apps/graph] Fix bug
  [apps/calculations] Fix selection error
This commit is contained in:
Émilie Feral
2017-05-31 11:46:46 +02:00
committed by Gerrit
parent f4f5a37465 3af8c86504
commit 065a7c623c
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
apps/calculation/history_controller.cpp
View File

@@ -77,6 +77,7 @@ bool HistoryController::handleEvent(Ion::Events::Event event) {
return true;
}
if (event == Ion::Events::Clear) {
selectableTableView()->deselectTable();
m_calculationStore->deleteAll();
reload();
app()->setFirstResponder(parentResponder());

2
apps/graph/cartesian_function.cpp
View File

@@ -18,7 +18,7 @@ void CartesianFunction::setDisplayDerivative(bool display) {
float CartesianFunction::approximateDerivative(float x, Poincare::Context * context) const {
Poincare::Complex abscissa = Poincare::Complex::Float(x);
Poincare::Expression * args[2] = {m_expression, &abscissa};
Poincare::Expression * args[2] = {expression(), &abscissa};
Poincare::Derivative derivative;
derivative.setArgument(args, 2, true);
return derivative.approximate(*context);