UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-03-21 14:50:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

[apps/graph] Values are correcty computed in the values tab

Browse Source
This commit is contained in:
Léa Saviot
2019-09-04 14:21:06 +02:00
parent 3ffa23e1e3
commit 6fb7d74e4d
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
apps/graph/values/values_controller.cpp
View File

@@ -158,8 +158,15 @@ double ValuesController::evaluationOfAbscissaAtColumn(double abscissa, int colum
if (isDerivative) {
return function->approximateDerivative(abscissa, context);
}
//TODO LEA RUBEN
return function->evaluate2DAtParameter(abscissa, context).x1();
Poincare::Coordinate2D<double> eval = function->evaluate2DAtParameter(abscissa, context);
if (function->plotType() != CartesianFunction::PlotType::Parametric
|| (columnIndex == numberOfColumns() - 1
|| !((typeAtLocation(columnIndex+1, 0) == k_functionTitleCellType)
&& recordAtColumn(columnIndex+1) == record)))
{
return eval.x2();
}
return eval.x1();
}
void ValuesController::updateNumberOfColumns() {