DevWiki/calculator
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improved error handing for function analysis for functions in the f(y) format (#1338)

Browse Source 
* Updated the CanFunctionAnalysisBePerformed api to use the updated one with variableIsNotX error handling. Updated the UI to reflect the new descriptive error case to show an informative error.

* Fixed spacing and updated the moved the variableIsNotX check up into the parent if statement

* Update the internals version to match the version needed to support this change
This commit is contained in:
Stephanie Anderl
2020-09-15 14:27:22 -07:00
committed by GitHub
parent bc473617ae
commit a0f98ca76b
7 changed files with 24 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/GraphControl/Control/Grapher.cpp
View File

@@ -254,8 +254,8 @@ namespace GraphControl
vector<Equation ^> equationVector;
equationVector.push_back(equation);
UpdateGraphOptions(graph->GetOptions(), equationVector);
if (analyzer->CanFunctionAnalysisBePerformed())
bool variableIsNotX;
if (analyzer->CanFunctionAnalysisBePerformed(variableIsNotX) && !variableIsNotX)
{
if (S_OK
== analyzer->PerformFunctionAnalysis(
@@ -265,6 +265,10 @@ namespace GraphControl
return KeyGraphFeaturesInfo::Create(functionAnalysisData);
}
}
else if (variableIsNotX)
{
return KeyGraphFeaturesInfo::Create(CalculatorApp::AnalysisErrorType::VariableIsNotX);
}
else
{
return KeyGraphFeaturesInfo::Create(CalculatorApp::AnalysisErrorType::AnalysisNotSupported);