From e5a2208b276f468531a7b6b50d0204ad68b83063 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9a=20Saviot?= Date: Mon, 24 Feb 2020 17:32:40 +0100 Subject: [PATCH 1/8] [apps/interactive_curve_view_range] Recompute yRange after setDefault Scenario : f(x)=8x, scroll to the right until the window range has changed, then set the preadjustment to default -> the x change had no impact on the yRange because we did not set the yAuto before doing the changes. --- apps/shared/interactive_curve_view_range.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/shared/interactive_curve_view_range.cpp b/apps/shared/interactive_curve_view_range.cpp index 7e5f9680d..2db5afaa2 100644 --- a/apps/shared/interactive_curve_view_range.cpp +++ b/apps/shared/interactive_curve_view_range.cpp @@ -131,9 +131,9 @@ void InteractiveCurveViewRange::setDefault() { return; } if (!m_delegate->defautRangeIsNormalized()) { + m_yAuto = true; m_xRange.setMax(m_delegate->interestingXHalfRange(), k_lowerMaxFloat, k_upperMaxFloat); setXMin(-xMax()); - m_yAuto = true; return; } From 22afe4df2d8c12975ef183a3c110f4efda01ce3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9a=20Saviot?= Date: Mon, 24 Feb 2020 16:05:39 +0100 Subject: [PATCH 2/8] [apps/statistics] EXE should open the histogram param controller The OK button already does it. --- apps/statistics/histogram_controller.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/statistics/histogram_controller.cpp b/apps/statistics/histogram_controller.cpp index 1f153855a..a3ad6decd 100644 --- a/apps/statistics/histogram_controller.cpp +++ b/apps/statistics/histogram_controller.cpp @@ -42,7 +42,7 @@ const char * HistogramController::title() { bool HistogramController::handleEvent(Ion::Events::Event event) { assert(selectedSeriesIndex() >= 0); - if (event == Ion::Events::OK) { + if (event == Ion::Events::OK || event == Ion::Events::EXE) { stackController()->push(histogramParameterController()); return true; } From 18d6ad34bc6608ad9874080f1f7968000c9d5637 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9a=20Saviot?= Date: Wed, 19 Feb 2020 16:26:30 +0100 Subject: [PATCH 3/8] Revert "[ion/sdl/web] Fix the HTML page actions" This reverts commit 5796a0d930b52380856099bd7e74053962818f1e. --- ion/src/simulator/web/simulator.html | 49 +++++++++++++--------------- 1 file changed, 23 insertions(+), 26 deletions(-) diff --git a/ion/src/simulator/web/simulator.html b/ion/src/simulator/web/simulator.html index a51f745cd..e52a01e16 100644 --- a/ion/src/simulator/web/simulator.html +++ b/ion/src/simulator/web/simulator.html @@ -7,7 +7,7 @@ NumWorks graphing calculator From 383aafcc559c4721bc5ca7e79e298d47874a0baf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9a=20Saviot?= Date: Tue, 25 Feb 2020 14:25:30 +0100 Subject: [PATCH 8/8] [python/modion] Allow interruption of modion_keyboard_keydown --- python/port/mod/ion/modion.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/python/port/mod/ion/modion.cpp b/python/port/mod/ion/modion.cpp index 69118a103..8ab1ab142 100644 --- a/python/port/mod/ion/modion.cpp +++ b/python/port/mod/ion/modion.cpp @@ -9,5 +9,6 @@ extern "C" { mp_obj_t modion_keyboard_keydown(mp_obj_t key_o) { Ion::Keyboard::Key key = static_cast(mp_obj_get_int(key_o)); Ion::Keyboard::State state = Ion::Keyboard::scan(); + micropython_port_interrupt_if_needed(); return mp_obj_new_bool(state.keyDown(key)); }