UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-03-22 07:10:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

[apps/cartesian_function] Change function when switching plotType

Browse Source 
Cartesian -> Parametric -> Polar
    3     ->  [[t][3]]  -> 3
This commit is contained in:
Léa Saviot
2019-09-02 11:04:32 +02:00
parent c2c4157b73
commit 9fe6034eb5
2 changed files with 36 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
apps/shared/cartesian_function.cpp
View File

@@ -2,6 +2,7 @@
#include "expression_model_store.h"
#include "poincare_helpers.h"
#include <poincare/derivative.h>
#include <poincare/matrix.h>
#include <poincare/serialization_helper.h>
#include <escher/palette.h>
#include <ion/unicode/utf8_decoder.h>
@@ -106,14 +107,40 @@ CartesianFunction::PlotType CartesianFunction::plotType() const {
return recordData()->plotType();
}
void CartesianFunction::setPlotType(PlotType plotType) {
void CartesianFunction::setPlotType(PlotType newPlotType) {
PlotType currentPlotType = plotType();
if (newPlotType == currentPlotType) {
return;
}
/* Reset memoized layout. */
Expression e = expressionClone();
m_model.tidy();
double tMin = plotType == PlotType::Cartesian ? -INFINITY : 0.0;
double tMax = plotType == PlotType::Cartesian ? INFINITY : 360.0;
double tMin = newPlotType == PlotType::Cartesian ? -INFINITY : 0.0;
double tMax = newPlotType == PlotType::Cartesian ? INFINITY : 360.0;
setTMin(tMin);
setTMax(tMax);
return recordData()->setPlotType(plotType);
recordData()->setPlotType(newPlotType);
if (currentPlotType == PlotType::Parametric) {
// Change [x(t) y(t)] to y(t)
if (e.type() == ExpressionNode::Type::Matrix
&& static_cast<Poincare::Matrix&>(e).numberOfRows() == 2
&& static_cast<Poincare::Matrix&>(e).numberOfColumns() == 1)
{
Expression nextContent = e.childAtIndex(1);
/* We need to detach it, otherwise nextContent will think it has a parent
* when we retrieve it from the storage. */
nextContent.detachFromParent();
setExpressionContent(nextContent);
}
return;
} else if (newPlotType == PlotType::Parametric) {
// Change y(t) to [t y(t)]
Matrix newExpr = Matrix::Builder();
newExpr.addChildAtIndexInPlace(Symbol::Builder(UCodePointUnknownX), 0, 0);
newExpr.addChildAtIndexInPlace(e, newExpr.numberOfChildren(), newExpr.numberOfChildren());
newExpr.setDimensions(2, 1);
setExpressionContent(newExpr);
}
}
template <typename T>