Commit Graph

715 Commits

Author SHA1 Message Date
Léa Saviot
a3032e5ec3 Merge branch Tree into master 2018-07-19 14:01:02 +02:00
Émilie Feral
2e7c08241a [poincare] Change writeTextInBuffer signature (parameters are float
display mode and number of significant digits)
2018-07-18 16:32:50 +02:00
Émilie Feral
b8af15f1ab [poincare] change createLayout signature
- CreateLayout depends on the float display mode and the number of
significant digits
- Float display mode does not have a default value anymore
2018-07-18 16:32:50 +02:00
Léa Saviot
2d7450b1dd [apps/escher/poincare] Empty expression char is now ø 2018-07-18 10:32:45 +02:00
Léa Saviot
47802341f8 [apps/reg] Actualize the current model display in the menu 2018-07-18 10:32:45 +02:00
Léa Saviot
e4fc5e8a64 [apps/reg] Display the regression layouts is RegressionController 2018-07-18 10:32:45 +02:00
Léa Saviot
6ca4ecb635 [apps/regression] Display the regression type menu 2018-07-18 10:32:45 +02:00
Léa Saviot
785df118dc [poincare] Fix layout insertion 2018-07-06 11:35:52 +02:00
Léa Saviot
d1bdc7e2d5 [poincare] Fix tree retain count 2018-07-05 10:26:10 +02:00
Léa Saviot
880c3e59de [poincare] Continue removing layouts 2018-07-03 18:29:08 +02:00
Léa Saviot
f579e95815 [poincare] Start removing ExpressionLayout 2018-07-03 17:33:06 +02:00
Léa Saviot
a5ebab4bc1 [poincare] Continue adapting LayoutField 2018-07-03 14:56:15 +02:00
Léa Saviot
d0304d4a83 LayoutField 2018-07-03 13:52:33 +02:00
Léa Saviot
5270c7740b [escher] Fix cursor position when copy pasting 2018-06-12 16:55:01 +02:00
Léa Saviot
acc49412f1 [apps/escher] EvenOddExpressionCell has left and right margins 2018-06-12 15:50:50 +02:00
Émilie Feral
c24e2726fa [escher][apps] Get rid of duplicate overriden methods:
cumulatedHeightFromIndex, indexFromCumulatedHeight
2018-06-12 10:27:23 +02:00
Émilie Feral
67cddf554d Merge branch 'lea-statistics' into upgrade-1.6.0 2018-06-12 10:25:54 +02:00
Émilie Feral
f8039fac32 [solver] Fix update of the button message between: 'Solve the equation'
and 'Solve the system'
2018-06-11 13:58:42 +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
Léa Saviot
c9407d6bdb [apps/stats] Color the box of the selected box view 2018-06-11 13:58:23 +02:00
Léa Saviot
090f27c107 [escher] Add comment in table view 2018-06-11 13:57:54 +02:00
Léa Saviot
249b15750a [apps/stats] Display all non empty series in calculation 2018-06-11 13:56:32 +02:00
Émilie Feral
ad6c985111 [solver] ExpressionCell are EvenOddExpressionCell rather than former
ModelExpressionCell
2018-06-08 15:13:50 +02:00
Émilie Feral
2dec9e6244 [escher] Button: method setMessage 2018-06-07 16:21:39 +02:00
Émilie Feral
06b552c033 [escher] InputViewController: call the textField/ExpressionLayout
delegate 'DidFinishEvent' after performing the sucess or abort action
2018-06-07 16:21:39 +02:00
Émilie Feral
f6bdf56c15 [escher] TableViewDataSource: implement default cumulatedWidthFromIndex,
cumulatedWidthFromIndex, indexFromCumulatedWidth,
indexFromCumulatedHeight
2018-06-07 16:21:31 +02:00
Émilie Feral
ac9da8d559 [escher] Handle copy/cut event on Expression in selectable table view 2018-06-07 14:46:14 +02:00
Émilie Feral
24c9549866 [escher] Handle copy/cut event on selectable table view 2018-06-07 14:46:14 +02:00
Émilie Feral
218eec34e0 [escher] AlternateEmptyViewController: give the event to the default
controller
2018-06-07 13:46:18 +02:00
Émilie Feral
e160282e06 [escher] Change the function expression cell to inherit from
even odd expression cell
2018-06-07 13:46:17 +02:00
Romain Goyet
a514f2a6be [escher] TextArea now uses clearRect and drawLine 2018-06-04 16:08:11 +02:00
Romain Goyet
9e4a1c7d54 [escher] TextArea cleanup 2018-06-04 16:08:11 +02:00
Romain Goyet
d2b2705d2d [escher] TextInput doesn't use colors anymore 2018-06-04 16:08:11 +02:00
Léa Saviot
2b185261b7 [apps/stats] Hide empty histogram cells 2018-05-29 15:34:49 +02:00
Émilie Feral
b2b141aae4 [escher] Fix underscore replacement for subscript insertion in textfield 2018-05-17 16:53:16 +02:00
Émilie Feral
c3b35302aa [escher] Clean Expression layout field 2018-05-17 13:53:10 +02:00
Émilie Feral
5dcfbf83e9 [escher] ExpressionLayoutFieldDelegate should not take a text as
parameter but a layout
Warning: in ExpressionField: the serialized layout is not guaranteed to
be small enough to fill in the text buffer
2018-05-17 13:53:10 +02:00
Léa Saviot
3953ca1c67 [escher] Remove duplicate method
Change-Id: Iac03f002cb6928831a8d640f1bcdeba116f71d06
2018-05-17 13:42:20 +02:00
Léa Saviot
b752ab0389 [escher] Add bool forceCursorRightOfText in handleEventWithText
Change-Id: I9124a1bacfce821fc761ddefc4d8b43de82dbc21
2018-05-17 13:42:20 +02:00
Léa Saviot
2e03812cdb [poincare] Fix cursor position when layout field is not editing
Change-Id: I39fa348a3e567621f4574b2e331b75a836353306
2018-05-17 13:42:20 +02:00
Léa Saviot
05334823e5 [escher] Handle empty text in ExpressionLayoutField::handleEventWithText
Change-Id: Ieb8433a7cf24341b576ab76014cc4cf1e36d929b
2018-05-17 13:42:20 +02:00
Léa Saviot
d84c91f547 [escher] Reorganize event handling in ExpressionLayoutField
Change-Id: I41f7ccbe742c344d1710eca844715ec2e2ec0fbc
2018-05-17 13:22:05 +02:00
Léa Saviot
08b3f73b9c [escher] Return true when layout too big to be handled
Change-Id: If15f032c4d1666021435927d90f500afbdee3bfd
2018-05-17 13:22:05 +02:00
Léa Saviot
bde05b3d8b [escher] Fix layout count verification in ExprLayField::handleEvWText
Change-Id: Ie56e61aa10c907c6ab0dac8814b9ed46aac669f8
2018-05-17 13:22:05 +02:00
Émilie Feral
6035bd904b [escher] Expression layout: Prevent from inserting XNT when the field is full 2018-05-16 19:20:34 +02:00
Léa Saviot
372a214afb [poincare] Prevent insertion of a big layout in ExprLayField
For instance when copy-pasting a layout.

Change-Id: I5967a601b783b81cb537ab4b46e03118f3bd6cdc
2018-05-16 18:37:02 +02:00
Léa Saviot
c2d273bba5 [escher/poincare] ExprLayoutField cannot have more than 152 descendants
If the number of layouts could be infinite, we would have memory
problems. A Layout uses at least one char when being serialized, so we
use the same limit as the char limit in TextField.

Change-Id: Ib8f9c05d04a4dde5b6ca96a732e3e4175dd65b9c
2018-05-16 18:37:02 +02:00
Léa Saviot
f1635515a8 [poincare] Make ExpressionLayoutField::insertLayoutAtCursor private
Change-Id: I809a04a87b933ef18dd6c02d29502ccf443ffa46
2018-05-16 18:37:02 +02:00
Léa Saviot
22b0c4c8b1 [escher] Remove duplicate function
Change-Id: I6301f10bf1598a81956909137109ed1a721d3a1a
ExpressionLayoutField::insertLayoutFromTextAtCursor
ExpressionField::handleEventWithText
2018-05-16 18:37:02 +02:00
Léa Saviot
0294ebc448 [escher] Fix signed/unsigned int comparison
Change-Id: I72b6dc3f46ee585814a540fc999001e113db0ea1
2018-05-16 17:34:34 +02:00