Commit Graph

510 Commits

Author SHA1 Message Date
Émilie Feral
aaa20a58fa [poincare] Implement SerializationHelper and
SerializationHelperInterface. WriteTextInBuffer->serialize
2018-08-08 15:31:40 +02:00
Léa Saviot
3b1fc4b3d5 [poincare] Remove old layouts 2018-07-26 14:46:55 +02:00
Léa Saviot
a3032e5ec3 Merge branch Tree into master 2018-07-19 14:01:02 +02:00
Léa Saviot
799bbfbf05 [apps/reg] Display the regression controller from the graph view 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
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
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
45b9f9a2f5 [apps/regression] Fix margins in Stats 2018-06-11 13:58:24 +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
0f2b811692 [asscher/palette] Change Palette::Green
It is now more readable in Stats/Data
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
41215ac593 [apps/stats] Draw table separators in Calculation 2018-06-11 13:58:23 +02:00
Émilie Feral
ad6c985111 [solver] ExpressionCell are EvenOddExpressionCell rather than former
ModelExpressionCell
2018-06-08 15:13:50 +02:00
Émilie Feral
a120c1c7e0 [solver] Add a brace view on the list controller 2018-06-08 15:13:41 +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
40ab598c68 [escher] Add setter on EvenOddBufferTextCell 2018-06-07 13:46:18 +02:00
Romain Goyet
a514f2a6be [escher] TextArea now uses clearRect and drawLine 2018-06-04 16:08:11 +02:00
Romain Goyet
88e40266f6 [code] Create a PythonTextArea 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
É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
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
Léa Saviot
ea8bd568bf [apps/escher] Fix ExprFieldDelegateApp::exprLayoutFieldDidReceiveEvent
Fix the buffer size and check the length of the serialized expression

Change-Id: I7d53365313c0e0307db3393d46537d35ed799b3b
2018-05-16 15:56:13 +02:00
Émilie Feral
bb8ab2a42e Merge branch 'saisie-jolie' into master-merge-saisie-jolie 2018-05-16 11:28:07 +02:00
Léa Saviot
40d9fc4c42 [escher] Fix signed/unsigned comparison warning
Change-Id: I3278e2e1a951475f96adae4f0c6ba6b6b52a170e
2018-05-16 11:22:47 +02:00
Émilie Feral
33ad49789b [escher][apps] Make View using blendRectWithMask without background
inherit from TransparentView
2018-05-15 17:24:27 +02:00
Émilie Feral
6f08a77cac [escher] create TransparentView 2018-05-15 17:24:27 +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
9a94cbe934 [poincare] Scroll to show whole layout inserted from toolbox
Change-Id: If3e39659bdfc36b5e52a29845dfd213424233ab4
2018-05-14 16:57:08 +02:00
Romain Goyet
daee2998c5 [escher] Add a ScrollViewDelegate 2018-05-09 17:46:09 +02:00
Léa Saviot
4de2ae5353 [poincare] Fix virtualty of ScrollView::setBackgroundColor and TopMargin
Change-Id: Id15d2b233b0a0f11435ab8f41a142eeca4fcec05
2018-05-08 17:52:54 +02:00
Léa Saviot
7b6fdf6a1c [escher] Fix ScrollableView content view size.
Change-Id: I531236e7527b3922dac81067d41024e0c5d6bf88
2018-05-08 17:32:55 +02:00