Quentin
27a0935311
[Fix] Patched colors
2020-06-20 19:46:47 +02:00
Quentin
db10723e76
[Update] Upstream
2020-06-18 19:25:17 +02:00
Léa Saviot
93d687abc2
[apps/calculation] Fix height computation in additional results
2020-06-04 05:47:55 -07:00
Léa Saviot
a56a73b0ba
[apps/calculation] Fix calculation height computation
...
It was done in two places before, which created inconsistencies
2020-05-28 04:44:27 -07:00
Léa Saviot
11c39b6206
[apps/calculation] Calculation::height has two types of margin arguments
...
One for the margin between layouts and on top / at the bottom of the
cell, the other for the margin surrounding each layout.
2020-05-28 04:44:27 -07:00
Léa Saviot
78cac6ddae
[apps/calculation] Calculation::height has CanBeSingleLine argument
2020-05-28 04:44:27 -07:00
Léa Saviot
525290427a
[apps/calculation] Calculation::height takes verticalMargin argument
2020-05-28 04:44:27 -07:00
Quentin
f37040dc8a
[Fix] Conflicts
2020-04-16 14:04:56 +02:00
Neven Sajko
dd6a729f65
Better usage of some floating point constants
2020-04-09 13:58:56 +02:00
Neven Sajko
c92b770112
Performance fixes relating to floating point constants
...
This replaces unnecessary double-precision soft-float operations with
single-precision floating-point operations, mainly by casting.
In a couple places I also replace a function call with a constant.
2020-04-09 13:58:56 +02:00
Émilie Feral
068325d151
Coding style: remove unecessary 'virtual' keyword when 'override' is
...
present 2/2
2020-04-09 11:36:51 +02:00
Quentin
aea963dac0
[Fix] Fix conflicts ._.
2020-04-07 14:53:19 +02:00
Émilie Feral
e6516ae0e7
[apps/calculation] Fix typo
2020-04-03 10:39:05 +02:00
Quentin
0d56576f9c
[Git] Fix conflicts
2020-04-01 11:36:16 +02:00
Émilie Feral
bc8dc0c59c
[apps] Use drawSegment when drawing lines instead of drawCurve or
...
drawCartesianCurve
2020-04-01 10:18:08 +02:00
Émilie Feral
aaf71328ba
[apps/shared] CurveView: resolve name conflict -
...
drawHorizontalOrVerticalSegment & drawSegment -
2020-04-01 10:18:08 +02:00
Quentin Guidée
d50511f1be
[Fix] Fix conflicts
2020-03-11 19:12:20 +01:00
Romain Goyet
2bf83c43a8
[apps/shared] Factorize CurveView::label
...
There was a lot of code duplication.
I removed the initialization of xLabel{} and yLabels{} because those are
scratch buffers that shouldn't be accessed before being written to
anyway.
2020-03-11 09:51:33 +01:00
Quentin Guidée
24907511f5
Fix conflicts
2020-02-23 13:27:10 +01:00
Léa Saviot
c8537df3b4
[apps/calc] Do not forget to call parent method
...
Scenario: Open several times the additional outputs menu, there are
drawing problems (multiple stack headers)
2020-02-21 17:04:19 +01:00
Quentin Guidée
5420a8a34f
Merge remote-tracking branch 'upstream/master' into omega-hotfix
2020-02-20 23:41:50 +01:00
Émilie Feral
a2a47bb8ae
[apps/calculation] Additional outputs: dismiss the pop-up before doing
...
any Poincare computations to optimize the available space in the
Poincare pool
2020-02-20 10:56:11 +01:00
Émilie Feral
99e88df284
[apps/calculation] Additional outputs: Clean cells when the pop-up
...
disappears to avoid uselessly overloading the Poincare pool
2020-02-20 10:56:11 +01:00
Quentin Guidée
8343610b8d
Fix palette E13
2020-02-16 14:10:17 +01:00
Émilie Feral
c2540a1d8a
[apps/calculation] Calculations now hold 4 texts: input, exact output
...
and 2 approximate outputs - one with the maximal number of significant
digits and one with the number of significant digits asked by the user.
This enables to find the approximate output without going through the
approximation routine again.
2020-02-12 15:13:23 +01:00
Émilie Feral
251db5b60e
[apps/shared][apps/calculation] Change class names:
...
ScrollableInputExactApproximateExpressionsCell -->
ScrollableThreeExpressionsCell
AbstractScrollableExactApproximateExpressionsView -->
AbstractScrollableMultipleExpressionsView
ScrollableExactApproximateExpressionsView -->
ScrollableTwoExpressionsView
ScrollableInputExactApproximateExpressionsView -->
ScrollableTwoExpressionsCell
2020-02-12 15:13:22 +01:00
Émilie Feral
87e4836196
[apps/calculation][apps/shared]
...
AbstractScrollableExactApproximateExpressionsView children classes
reload scroll after reloading the subview selection when entering the
responder chain and when cell becomes first responder. We don't reload
scroll when setting content of cells as this is done every time we
relayout - when scrolling in the table for instance.
2020-02-12 15:13:22 +01:00
Émilie Feral
56319ef275
[apps/shared] AbstractScrollableExactApproximateExpressionsView can hold up to
...
three expressions but no more BurgerMenuView.
ScrollableExactApproximateExpressionsView and
ScrollableInputExactApproximateExpressionsView inherit from it.
2020-02-12 15:13:22 +01:00
Émilie Feral
3de0ee7f98
[apps/calculation] ExpressionWithEqualSignView inherits from
...
ExpressionView instead of composing
This is useful for future change on
ScrollableExactApproximateExpressionView
2020-02-12 15:13:22 +01:00
Émilie Feral
2a37fa4447
[apps/calculation] ComplexListController: change the way the
...
Complex model parameters are computed.
Sometimes, approximation without simplification doesn't not give the
same results as approximation after simplification. As we decided to
display the additional results from an approximation without
simplifcation (done in Expression::hasDefinedComplexApproximation), we
compute the model parameters the same way (to ensure that both
parameters are defined)
2020-02-12 15:13:21 +01:00
Léa Saviot
756eeeb2d8
[poincare/parser] Add context
2020-02-12 15:13:21 +01:00
Émilie Feral
d61336936e
[apps/shared] Create a class Dots to share dots masks between CurveView
...
and RoundCursorView. Use the same dot for illustrations of additional
results in Calculation app and Function app
2020-02-12 15:13:21 +01:00
Émilie Feral
3fa4e0838a
[escher] Create a class Bordered instead of BorderedCell: this enable
...
non-cell view to use it as well
2020-02-12 15:13:21 +01:00
Émilie Feral
398b529811
[apps/calculation][poincare] AdditionalInformationType is determined
...
from both input and output expressions of a Calculation
2020-02-12 15:13:21 +01:00
Émilie Feral
be6f11208f
[apps/calculation] additional_outputs: make a parent class to
...
TrigonometryGraphCell and ComplexGraphCell inheriting from
BorderedCell
2020-02-12 15:13:21 +01:00
Émilie Feral
404c0945f9
[apps/calculation] additional_outputs: ComplexGraphView: simplify
...
computation of ellipsis equation (avoid computational errors for real =
-6 and imaginary = 1E-8 for instance)
2020-02-12 15:13:21 +01:00
Émilie Feral
06fa3bba5b
[apps/shared][apps/calculation] CurveView: enable to personalize the
...
maximal glyph length of graduation labels. Shorten them in
ComplexGraphView
2020-02-12 15:13:21 +01:00
Léa Saviot
97c5ef79af
[apps/calc] Display ApproximateOnly if approximate layout cannot be created
2020-02-12 15:13:21 +01:00
Léa Saviot
1af28d4310
[apps/calc] Display ApproximateOnly if exact layout cannot be created
2020-02-12 15:13:21 +01:00
Émilie Feral
8e407bd01e
[apps/calculation] additional_outputs: fix assertion which checks that
...
both real and imaginary are well defined in ComplexGraphView
2020-02-12 15:13:21 +01:00
Émilie Feral
71a968ec05
[apps/calculation] Clean Unicode character treated as a whitespace
2020-02-12 15:13:21 +01:00
Émilie Feral
2b18f585d0
[poincare] additionalInformationType returns "Complex" only when both
...
real and imaginary parts are defined (not NAN or INFINITY)
2020-02-12 15:13:21 +01:00
Émilie Feral
a4d630ace0
[apps/calculation] additional_outputs: IllustratedListController:
...
textAtIndex depends on the selected subview
2020-02-12 15:13:21 +01:00
Émilie Feral
9d540ca16c
[apps/calculation] additional_outputs: In RationalListController,
...
special case for textAtIndex of the Euclidean division: copy only the
right part of the equality
2020-02-12 15:13:21 +01:00
Émilie Feral
685f030f83
[apps/calculation] Fix ScrollableInputExactApproximateExpressionCell and
...
ScrollableExactAppromiateExpressionsCell layout (layout of cells can be
asked at any moment - when handling copy/cut events)
2020-02-12 15:13:21 +01:00
Émilie Feral
a4e8d24a23
[apps/calculation] Improve text inserted in EditExpressionController
...
when handling OK events on additional outputs pop-ups
2020-02-12 15:13:20 +01:00
Émilie Feral
fef0538941
[apps/calculation] Handle OK events on additional outputs pop-up - WIP
2020-02-12 15:13:20 +01:00
Émilie Feral
c441611190
[apps/calculation] Do no display the factor expression if it is
...
undefined in Integer additional outputs
2020-02-12 15:13:20 +01:00
Émilie Feral
272d405eb7
[apps/calculation] additional_outputs: Always force selection on the
...
left subviews of cells when IllustratedListController pop-up is displayed
2020-02-12 15:13:20 +01:00
Émilie Feral
dd61468056
[apps/calculation] ScrollableInputExactApproximateExpressionsCell:
...
relayoutSubviews after changing member variables that affect the
subviews frames
2020-02-12 15:13:20 +01:00