Commit Graph

255 Commits

Author SHA1 Message Date
Léa Saviot
b2c84b3f45 [apps] Fix compilation 2018-06-11 13:58:25 +02:00
Léa Saviot
47fa6f4a41 [apps/escher] Share color selection for data (Red, blue, Green, Yellow) 2018-06-11 13:58:23 +02:00
Émilie Feral
58d10403e2 [apps/sequence] Fix maxFirstIndex for double recursive sequences 2018-05-17 17:32:55 +02:00
Émilie Feral
8541c2cb7e [sequence] Add a pop-up when the user tries to set the first term
index to a value above 1000
2018-05-17 15:39:14 +02:00
Émilie Feral
3a29f086a0 [sequence] Fix u(0), u(1) layout in sequence list 2018-05-17 15:39:14 +02:00
Léa Saviot
a67f422ab7 [apps/sequence] Fix first/second term index display.
Before, it was always u0 and u1.

Change-Id: Iad5a3992a16f4b4a55e295b24f6a784a17f2807b
2018-05-16 18:36:34 +02:00
Léa Saviot
16de5291bb [apps/sequence] Fix "Un" size in sequence table
Change-Id: I8f46a2f6f49da08a58d8c24252cf9fa8d09d2a0e
2018-05-15 16:29:35 +02:00
Léa Saviot
678a0db4e4 Merge with current GitHub master branch
Change-Id: Ie1b83cfabdee1369eb66f53c01314324d5d88a74
2018-05-14 17:03:12 +02:00
Léa Saviot
3b582a2e46 Merge branch 'SaisieJolie30Apr' into SaisieJolie8May
Change-Id: Ia4196119fc56c5bc3423aea752b49f3f7ba39499
2018-05-08 15:17:51 +02:00
Émilie Feral
71b972ceb1 [sequence] Decrease sequence graph resolution (2 dots per pixel instead
of 5)
2018-05-08 14:45:23 +02:00
Léa Saviot
d51ddc55a1 [apps/sequence] Put a condition on SeqType to get FirstInitialCondName
This condition was removed non-intentionnally by a previous commit

Change-Id: I643351b3ca965405753c0757971871c71838e405
2018-04-25 13:58:42 +02:00
Léa Saviot
a5c50f8887 [apps] Fix function name that was the same as virtual function.
Change-Id: Idec43b9427571dbd5752ac551424447cbdb08d27
2018-04-25 13:58:42 +02:00
Léa Saviot
13ae1d2545 [apps/escher/toolbox] handleEventWithText for all responders.
This makes the code in the various toolbox more generic. The arguments
of the text to insert are each replaced by a Ion::Charset::Empty.
These Empty chars are used to create layouts in ExpressionLayoutFields,
and to compute the position of the cursor in other fields, before being
removed.

Change-Id: Ie81c1e394b06fef2ab801ccff919d6550f70ec30
2018-04-23 17:18:48 +02:00
Léa Saviot
22ab94209f [apps/escher] Rename EditableExpressionView -> ExpressionField
Change-Id: Iadfb220ee94e68762305060215f1ead0cac951fb
2018-04-23 09:41:20 +02:00
Léa Saviot
31face58a2 [apps/escher] ScrollableEVWithCursor renamed ExpressionLayoutField
Change-Id: Id0e4610fb677d8ad36721eef1a85f1c424d1743e
2018-04-23 09:41:20 +02:00
Romain Goyet
84561a929f [escher] Clean the ScrollView, TableView and SelectableTableView constructors 2018-04-18 18:08:07 +02:00
Léa Saviot
e90b3fd1cd Merge branch 'SaisieJolieMerge10Apr' into SaisieJolieMerge11Apr (master)
Change-Id: I06732115ee37ffd9a037a8412e1c57751dfb3e0f
2018-04-12 09:58:09 +02:00
Léa Saviot
0fcd2a90f6 [apps] Fix comment aesthetics
Change-Id: I3e91391f0751515efe50ec4e4335a2421f2acbee
2018-04-11 17:11:05 +02:00
Léa Saviot
749c93e1af [apps/sequence] Fix obsolete code.
Change-Id: I4f6c1792ac245c072a3d70108a55518473c3fe80
2018-04-11 16:56:35 +02:00
Léa Saviot
6d3c67e9db [apps] Merge apps/sequence/graph/term_sum_controller.cpp
Change-Id: I9cbcbb73f4f475590762e29ab98999bd42906e74
2018-04-11 10:21:25 +02:00
Léa Saviot
c4b5d4cf40 Merge branch 'SaisieJolieRebase1201' into SaisieJolieMerge10Apr
Change-Id: I802dbb9f7c0eebf75a1b6cd21ddd194e89b53752
2018-04-10 17:21:54 +02:00
Romain Goyet
b691d3d6ed Merge branch 'usb' 2018-04-09 14:48:18 +02:00
Léa Saviot
3e66d51a6e [apps/sequence] Reset first rank when changing sequence type to Explicit
Change-Id: I3f356ebf95f1f81ab4601f0654166f146a505c27
2018-04-09 14:44:20 +02:00
Léa Saviot
b67e04214f [apps] Coding style.
Change-Id: I020cc98f87999b69e9c0d969126e9c1ae2f811f2
2018-04-06 14:31:48 +02:00
Zhaofeng Li
6679cb0a20 [apps] Fix exam mode 2018-04-04 13:42:00 +02:00
Émilie Feral
aade7cb2fe [escher] Create a class TextInput (from which derived TextField,
TextArea)
2018-03-22 13:12:12 +01: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
05055c387f [apps] Graph: when setting default range of a function, take
into account the potential periodicity
2018-03-22 10:48:06 +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
ca1daeb527 [apps] Sequence: fix confusion between sequence index in store and
sequence name
2018-02-14 12:04:47 +01:00
Émilie Feral
7026abdc5c [apps] Sequence: fix toolbox handleEvent 2018-02-14 12:04:18 +01:00
Émilie Feral
9cd50d8d9a [apps] Graph/Sequence: set different cursors for Sequence and Graph 2018-01-30 18:53:28 +01:00
Émilie Feral
95f0efaf9f [apps] Graph/Sequence: the function selected by the cursor has to be
save in the Snapshot to avoid weird selection when rebulding the app
2018-01-30 18:53:28 +01:00
Émilie Feral
ac6c8379ed [apps] Enable to specialize the sum layout in Sum Graph Controller 2018-01-30 18:19:27 +01:00
Émilie Feral
cdfbc02499 [apps] Add a function "sumBetweenBounds()" on Function (sum of terms on
Sequence, Integral on CartesianFunction)
2018-01-30 18:19:27 +01:00
Émilie Feral
7ea0dbeb56 [apps] Shared: Move part of the implementation of TermSumController to
shared (Integral Graph Controller) and improve bound edition in
TermSumController.
2018-01-30 18:19:27 +01:00
Émilie Feral
3a1d652a07 [apps] Sequence: Term Sum Controller inherits from
SimpleInteractiveCurveViewController (enable Zoom in/out)
2018-01-30 18:19:27 +01:00
Émilie Feral
a6050fda55 [apps] Shared: Factorize code: all FunctionGraphView have a member
indicating the selected function
2018-01-30 18:19:27 +01:00
Émilie Feral
ef8f5e07c2 [apps] In CurveView, replace the virtual method evaluateModelWithParameter by a function given as parameter (to be able to call Curve view methods with different implementation of evaluateModelWithParameter) 2018-01-30 18:19:27 +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
95f859ce80 [apps/sequence] Set sender for sequence toolbox.
Change-Id: I3fe78127273083fb4f8f680ea3e6394f99913a12
2018-01-26 11:55:04 +01:00
Émilie Feral
9443fcb043 [apps] Sequence: in the toolbox, update the extra-cells when updating
the hold layout to avoid unvalid read
2018-01-25 15:48:35 +01:00
Émilie Feral
479d86a38e [apps] Sequence: when setting a next first term index, forbid negative
index
2018-01-25 15:48:23 +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
e29691e1f1 [apps/sequence] Fix the insertion of sequence terms in text fields.
For instance, the serialization of the V_n layout is "v_{n}", which is
what we want to insert in an EditableExpressionView, but not in a Text
Field for which we want "v(n)".

Change-Id: Iab38058d982322891b530b3afd2d303a266643f9
2018-01-19 17:31:37 +01:00
Léa Saviot
251c4d01af [apps/sequence] Fix math_toolbox wrong functions calls.
Change-Id: I0b7871e87ea64ef9fbd008d9fb3e6d4cce2e97ca
2018-01-19 17:04:50 +01:00
Émilie Feral
9e9949ef78 [apps] Fix message: "Indice premier terme" 2018-01-17 12:07:24 +01:00
Léa Saviot
a435c548da [apps/sequence] Use the new layouts in the Sequence app.
Change-Id: I8b079bfabccd54472e0ba0fac17b87dbaf3678ee
2018-01-15 11:58:07 +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
6c070b63fc [apps] Sequence: fix bug due to const char * comparison 2018-01-03 16:16:34 +01:00