Commit Graph

205 Commits

Author SHA1 Message Date
Léa Saviot
2146dd6422 [apps] Fix wrong method call
Change-Id: I2695d7c659f18edb1839cdf7c8282cc69862a4e5
2018-04-11 10:40:06 +02:00
Léa Saviot
c4b5d4cf40 Merge branch 'SaisieJolieRebase1201' into SaisieJolieMerge10Apr
Change-Id: I802dbb9f7c0eebf75a1b6cd21ddd194e89b53752
2018-04-10 17:21:54 +02:00
Émilie Feral
576caa039f [apps][escher] Add methods 'handleEventWithText' in TextField and
TextArea to fix bug in probability (adding a toolbox text from the
calculations controller)
2018-03-22 13:12:12 +01:00
Émilie Feral
6de71ae145 [poincare] Clean: convertFloatToText should be in PrintFloat instead of
Complex
2018-03-21 15:57:19 +01:00
Émilie Feral
a8fe8dc22e [apps] Calculation: input text stores in cache have to be checked again
when used as its length context dependent (because of 'ans' symbol)
2018-02-01 11:49:39 +01:00
Émilie Feral
53393524ef [apps] Calculation: do not display a syntax error when the textfield is
empty
2018-02-01 11:49:39 +01:00
Émilie Feral
470767340a [apps] Calculation: OK on an empty textfield re-do the last user input
kept in cache
2018-02-01 11:49:39 +01:00
Émilie Feral
f2db9f2065 [apps] Calculation: exact and approximate output can be equal even if
the exact output is not a rational: 1/2+i = 0.5+i
2018-01-30 19:14:42 +01:00
Émilie Feral
ed59909531 [apps] Calculation: avoid 1/400000 = 0.000003
Re-serialise the calculation approximate output with the right number of
significant digits before comparing the parsed expression with the exact
one
2018-01-30 19:14:42 +01:00
Émilie Feral
03c8b373f7 [apps] Calculation: update the equal sign view according to the
calculation outputs
2018-01-30 19:14:42 +01:00
Émilie Feral
9d6b2e3cad [apps] Calculation: add a method to test if the exact output and the
approximate output are equal
2018-01-30 19:14:42 +01:00
Émilie Feral
541d0809f3 [apps] Calculation: avoid replacing 'ans' with a store expression (to
avoid bug like '(2->A)->B')
2018-01-30 16:17:03 +01:00
Émilie Feral
e4cb6d9aad [apps] Calculation: when checking the length of the input calculation,
first replace "ans" symbol
2018-01-30 16:17:03 +01:00
Émilie Feral
36a3108309 [apps] Calculation: move implementation of ansExpression() from
Calculation to CalculationStore
2018-01-30 16:17:03 +01:00
Émilie Feral
59fdcde548 [poincare] Avoid returning partial simplification when the
simplification process has been interrupted
2018-01-30 16:17:03 +01:00
Léa Saviot
a2c0eaa20b [apps/escher] Remove textFieldDidAbortEditing const char * argument.
Also removed the same argument in scrollableExpressionViewWithCursorDidAbortEditing.

Change-Id: Iadc6b708cfc0fab44b9fd4edb980cb759d41e8d0
2018-01-23 10:28:02 +01:00
Léa Saviot
4d778b5d9f [apps/escher/poincare] Use 2D Edition in Sequence and Graph apps.
EditableExpressionView is renamed ScrollableViewWithCursor.
EditableExpressionView is now a View that displays either a TextField or
a ScrollableViewWithCursor, depending on Poincare::Preferences.

Change-Id: Id44ddcd9a83f5fd17d65753ca4c94c5c7cda9b8a
2018-01-23 10:28:02 +01:00
Léa Saviot
169913b800 [apps/calculation] Fix background redraw bug.
The margins around the textfield did not redraw themselves properly
after dismissing a toolbox for instance. The textfield now takes the
full height of edition zone.

Change-Id: I0794b8273a880a2dc921c5f492eb0f41aef7fe97
2018-01-17 14:26:58 +01:00
Léa Saviot
05de98ea04 [apps/calculation] Fetch the edition mode in the preferences.
Change-Id: Iec7cfc5695907b8c410077a48749fd43efb6cc65
2018-01-17 10:39:20 +01:00
Léa Saviot
51e33b6903 [apps/calculation] Fix margins.
Change-Id: If799563af90c9de4ea02d3177a0ee2375d8ddbb4
2018-01-16 17:33:58 +01:00
Léa Saviot
24a22fb374 [apps/calculation] Delete layout when unloading view.
Change-Id: I7c7afc4882051266c04f28cf2823d58c803f05c0
2018-01-16 16:54:10 +01:00
Léa Saviot
f50391689f [apps/calculation] Handle OK event in calculation history.
Change-Id: I3e4c309a3bc031476eea0d64d433b535b1220a8f
2018-01-16 16:43:40 +01:00
Léa Saviot
e1235cdb4f [escher] EditableExpressionView: Remove the cursor when not editing.
Change-Id: If333f6074bce39d71ceb89b9424f7fec26a1f0c6
2018-01-16 16:43:40 +01:00
Léa Saviot
86b29f7e2f [apps/calculation] Fix rendering bug.
When powering off then on the device, the EditableExpressionView had a
rendering bug on the bottom left corner.

Change-Id: I1792831f949b8e646fff68b9e784c1ff573516fc
2018-01-16 16:43:40 +01:00
Léa Saviot
53556ffacf [apps/calculation] Handle "ans" event in EditableExpressionView.
Change-Id: I7761f36b5a94bb5c8190cd5b238542280666c256
2018-01-16 16:43:38 +01:00
Léa Saviot
91c05b3bb7 [apps/calculation] EditableExpressionView in calculation app.
Change-Id: I8b67353682652695f7296f0222939930f4b21794
2018-01-16 16:43:15 +01:00
Émilie Feral
ddd8c3c44a [apps] Add tests on Ans behaviour in Calculation 2018-01-16 15:17:16 +01:00
Émilie Feral
775432efdc [poincare][apps] Replace Ans symbol when preprocessing the calculation 2018-01-16 15:17:16 +01:00
Émilie Feral
17fc7998a2 [apps] Calculation: Ans is exact only when the expression hold is exact 2018-01-16 15:17:16 +01:00
Émilie Feral
d6d31b4eb0 [apps] Calculation: clean unused methods 2018-01-16 15:17:16 +01:00
Émilie Feral
b8b7da7dd8 [apps] Calculation: Ans holds an exact expression 2018-01-16 15:17:16 +01:00
Léa Saviot
4ad3adaab2 [apps/escher] Changed setExpression to setExpressionLayout.
Change-Id: I095a12868fd7eaf8d4eb2408617941a86f43e1ee
2018-01-15 11:58:01 +01:00
Émilie Feral
077a95197e [escher] SelectableTableView handles setting the ccell as first
responder if needed
2017-12-20 17:17:41 +01:00
Émilie Feral
db35fc1d72 Merge branch 'cas_with_python' into python_console
Change-Id: I06e3e07b9fd8d52818d90110ed7517777b35b9f1
2017-12-01 17:29:55 +01:00
Émilie Feral
504bd41664 [apps] In calculation: Avoid to parse twice instead of once when checking the input
string

Change-Id: I653ae54b554c05735c7f9502a6ca44076aed5d7e
2017-12-01 17:22:05 +01:00
Léa Saviot
e43bbd38f2 [escher] Fixed TextField bug.
The Statistics apps crashed when navigating the Data table.
 -> Check that the textfield is editing before calling
textFieldShouldFinishEditing.
 -> Changed textLength() to draftTextLength().

Change-Id: Id373a7cd50438303f470abc5bcee7a795c33926a
2017-12-01 13:19:30 +01:00
Émilie Feral
01d456299f [apps] Add comment
Change-Id: I53bdeb08625a2699408f563b0b3ed6c45744d01d
2017-11-28 17:03:33 +01:00
Émilie Feral
0b0f765f6b [apps] In calculation, return only approximation when input involves
symbols A-Z

Change-Id: Ibf50fb516b01850c5f93c5153f4d550d3e459028
2017-11-28 11:43:06 +01:00
Émilie Feral
51e360aa6f [apps] In calculation, default XNT is x
Change-Id: I9bfef8920a4975b1162e2630aa4c4556537886b1
2017-11-28 11:42:21 +01:00
Émilie Feral
bf2a26d90e [apps] In calculation, do not accept expression whose corresponding
texts is too long

Change-Id: Ic96e5ed42e249d43e21241f8e1a7b1e873f3cad3
2017-11-27 12:07:35 +01:00
Émilie Feral
74a91ac214 [apps] In Calculation, the input text can be longer that the text
written by the user (omitted multiplication signs added, parenthesis
...)

Change-Id: Icc9861da847c7e65939ea6a9c337ffb3d1f12e61
2017-11-27 11:13:30 +01:00
Émilie Feral
89485104b8 [apps] In calculation, fix history table row height
Change-Id: Ia0ee485b80d6f4db81f480d0e3e8f91b73c912a2
2017-11-24 17:13:21 +01:00
Émilie Feral
fda382cc0d [poincare] Change name: evaluate->approximate
Change-Id: I649a7c640190713dcf063a4148decd6038e62796
2017-11-24 13:31:44 +01:00
Émilie Feral
a5c984fce3 [apps] Calculation: change the grey of approximate output
Change-Id: Iac001fc581544af0634ad1d7765074f69aa07809
2017-11-23 11:49:52 +01:00
Émilie Feral
8f4c49d8c1 [apps] In calculation, fix the almostEqual aligmnent
Change-Id: I26eca4c9c2b5a3b1ad05567e8d5daf76922f2cb7
2017-11-22 14:38:53 +01:00
Romain Goyet
52bdf4a41f Merge branch 'cas_with_app_copy' into python_console 2017-11-21 18:44:38 +01:00
Émilie Feral
7c772d85b7 [apps] In calculation, do not display exact output if it is identical to input
Change-Id: I4b0733c7e3090bc2b04c68661bd34cf0b6da17f1
2017-11-21 17:37:25 +01:00
Émilie Feral
b2d6c2e305 [apps] In calculation, avoid blinking when changing selection
Change-Id: I8b94362183e1aed0d87cfdfa39b3f67ccbbd8b42
2017-11-21 17:37:25 +01:00
Émilie Feral
5e822a8001 [apps] In calculation, fix scrolling between approximate and exact
outputs

Change-Id: I8920cc3eab9f72d4b82cf2361bd1eba02232a268
2017-11-21 17:37:25 +01:00
Émilie Feral
7d30801e68 [apps] Change output colors
Change-Id: Ic8cb3f6bf3130c8b5e4c84edc1513353631d0336
2017-11-21 17:37:25 +01:00