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

Updates ResetGrid to account for when equations are added during Manual Adjustment mode (#1231)

Browse Source 
* updated the reset grid logic to track and set the initial range after an equation is added

* When in manual adjustment mode and an equation is added, replot the graph when reset is called

* remove members that are no longer needed

* Added logic to include the PrepareGraph() and removed re-graphing in the ResetGrid method

* skip SetDisplayRanges if TryInitialize returns a nullopt so there is no crash

* Updated the logic to handle the case where the range is updated via settings

* Fix bug with reset view hyperlink

* Updated the logic for graph settings updating the graph range

* Rebased with the latest, fixed issues with the rebase

 Author:    Stephanie Anderl <46726333+sanderl@users.noreply.github.com>

* Update the internals version of calculator to the latest so that the PrepareGraph API available
This commit is contained in:
Stephanie Anderl
2020-06-17 12:30:19 -07:00
committed by GitHub
parent 81ea002cf9
commit 76e33ef159
6 changed files with 55 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/GraphControl/Control/Grapher.h
View File

@@ -254,7 +254,7 @@ public enum class GraphViewChangedReason
if (auto render = m_graph->GetRenderer())
{
render->SetDisplayRanges(xMin, xMax, yMin, yMax);
m_replot = true;
m_rangeUpdatedBySettings = true;
if (m_renderMain)
{
m_renderMain->RunRenderPass();
@@ -352,7 +352,12 @@ public enum class GraphViewChangedReason
Windows::UI::Core::CoreCursor ^ m_cachedCursor;
int m_errorType;
int m_errorCode;
bool m_replot;
bool m_resetUsingInitialDisplayRange;
bool m_rangeUpdatedBySettings;
double m_initialDisplayRangeXMin;
double m_initialDisplayRangeXMax;
double m_initialDisplayRangeYMin;
double m_initialDisplayRangeYMax;
public:
Windows::Storage::Streams::RandomAccessStreamReference ^ GetGraphBitmapStream();