UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-03-29 19:49:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

[apps/graph] Evaluation methods renaming

Browse Source
This commit is contained in:
Léa Saviot
2019-08-28 16:56:49 +02:00
parent 28a721e96e
commit c71ef7ff79
22 changed files with 94 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
apps/graph/graph/graph_view.cpp
View File

@@ -30,40 +30,39 @@ void GraphView::drawRect(KDContext * ctx, KDRect rect) const {
ExpiringPointer<CartesianFunction> f = m_functionStore->modelForRecord(record);;
switch (f->plotType()) {
case Shared::CartesianFunction::PlotType::Cartesian:
drawCartesianCurve(ctx, rect, [](float t, void * model, void * context) {
CartesianFunction * f = (CartesianFunction *)model;
Poincare::Context * c = (Poincare::Context *)context;
return f->evaluateAtParameter(t, c).y();
return f->evaluateXYAtParameter(t, c);
}, f.operator->(), context(), f->color(), record == m_selectedRecord, m_highlightedStart, m_highlightedEnd);
/* Draw tangent */
if (m_tangent && record == m_selectedRecord) {
float tangentParameter[2];
tangentParameter[0] = f->approximateDerivative(m_curveViewCursor->x(), context());
tangentParameter[1] = -tangentParameter[0]*m_curveViewCursor->x()+f->evaluateAtParameter(m_curveViewCursor->x(), context()).y();
tangentParameter[1] = -tangentParameter[0]*m_curveViewCursor->x()+f->evaluateXYAtParameter(m_curveViewCursor->x(), context()).x2();
drawCartesianCurve(ctx, rect, [](float t, void * model, void * context) {
float * tangent = (float *)model;
return tangent[0]*t+tangent[1];
return Poincare::Coordinate2D<float>(t, tangent[0]*t+tangent[1]);
}, tangentParameter, nullptr, Palette::GreyVeryDark);
}
break;
case Shared::CartesianFunction::PlotType::Polar:
drawCurve(ctx, rect, 0.0f, 396.0f, 36.0f, [](float t, void * model, void * context) { //TODO LEA RUBEN use the models's tMin, tMax
CartesianFunction * f = (CartesianFunction *)model;
Poincare::Context * c = (Poincare::Context *)context;
return f->evaluateAtParameter(t, c).y() * std::cos(t);
}, [](float t, void * model, void * context) {
CartesianFunction * f = (CartesianFunction *)model;
Poincare::Context * c = (Poincare::Context *)context;
return f->evaluateAtParameter(t, c).y() * std::sin(t);
return f->evaluateXYAtParameter(t, c);
}, f.operator->(), context(), false, f->color());
break;
case Shared::CartesianFunction::PlotType::Parametric:
drawCurve(ctx, rect, 0.0f, 396.0f, 36.0f, [](float t, void * model, void * context) { //TODO LEA RUBEN use the models's tMin, tMax
CartesianFunction * f = (CartesianFunction *)model;
Poincare::Context * c = (Poincare::Context *)context;
if (f->isCircularlyDefined(c)) {
return NAN;
return Poincare::Coordinate2D<float>(NAN, NAN);
}
constexpr int bufferSize = CodePoint::MaxCodePointCharLength + 1;
char unknownX[bufferSize];
@@ -71,36 +70,15 @@ void GraphView::drawRect(KDContext * ctx, KDRect rect) const {
Poincare::VariableContext variableContext(unknownX, c);
variableContext.setApproximationForVariable(t);
Poincare::Expression e = f->expressionReduced(c);
assert(
e.type() == Poincare::ExpressionNode::Type::Matrix &&
static_cast<Poincare::Matrix&>(e).numberOfRows() == 2 &&
static_cast<Poincare::Matrix&>(e).numberOfColumns() == 1
);
assert(e.type() == Poincare::ExpressionNode::Type::Matrix
&& static_cast<Poincare::Matrix&>(e).numberOfRows() == 2
&& static_cast<Poincare::Matrix&>(e).numberOfColumns() == 1);
Poincare::Preferences * preferences = Poincare::Preferences::sharedPreferences();
Poincare::Preferences::ComplexFormat complexFormat = Poincare::Expression::UpdatedComplexFormatWithExpressionInput(preferences->complexFormat(), e, c);
return e.childAtIndex(0).approximateToScalar<float>(&variableContext, complexFormat, preferences->angleUnit());
}, [](float t, void * model, void * context) {
CartesianFunction * f = (CartesianFunction *)model;
Poincare::Context * c = (Poincare::Context *)context;
if (f->isCircularlyDefined(c)) {
return NAN;
}
constexpr int bufferSize = CodePoint::MaxCodePointCharLength + 1;
char unknownX[bufferSize];
Poincare::SerializationHelper::CodePoint(unknownX, bufferSize, UCodePointUnknownX);
Poincare::VariableContext variableContext(unknownX, c);
variableContext.setApproximationForVariable(t);
Poincare::Expression e = f->expressionReduced(c);
assert(
e.type() == Poincare::ExpressionNode::Type::Matrix &&
static_cast<Poincare::Matrix&>(e).numberOfRows() == 2 &&
static_cast<Poincare::Matrix&>(e).numberOfColumns() == 1
);
Poincare::Preferences * preferences = Poincare::Preferences::sharedPreferences();
Poincare::Preferences::ComplexFormat complexFormat = Poincare::Expression::UpdatedComplexFormatWithExpressionInput(preferences->complexFormat(), e, c);
return e.childAtIndex(1).approximateToScalar<float>(&variableContext, complexFormat, preferences->angleUnit());
return Poincare::Coordinate2D<float>(e.childAtIndex(0).approximateToScalar<float>(&variableContext, complexFormat, preferences->angleUnit()), e.childAtIndex(1).approximateToScalar<float>(&variableContext, complexFormat, preferences->angleUnit()));
}, f.operator->(), context(), false, f->color());
break;
default:
assert(false);
}