Skip to content

Refactor Equation to be treated as a model and update Key Graph Features#791

Merged
joseartrivera merged 8 commits intomicrosoft:feature/GraphingCalculatorfrom
joseartrivera:joriv/refactorEquation
Nov 20, 2019
Merged

Refactor Equation to be treated as a model and update Key Graph Features#791
joseartrivera merged 8 commits intomicrosoft:feature/GraphingCalculatorfrom
joseartrivera:joriv/refactorEquation

Conversation

@joseartrivera
Copy link
Copy Markdown
Contributor

@joseartrivera joseartrivera commented Nov 12, 2019

Part of #338.

Description of the changes:

The current way we transfer data from the EquationViewModel -> Equation is through duplicated dependency properties that are connected via two-way bindings in xaml. This is because the GraphControl was initially designed to receive a DataTemplate where the Equation FrameworkElement was supposed to be used. This isn't an ideal design since a DataTemplate should be able to accept any type of UI but currently would only work when used with the Equation FrameworkElement.

This PR refactors the code so that the GraphControl works more like the MapControl and the MapRouteView class. The GraphControl has a collection of Equations. To add an Equation to the Graph, we would append the equation to that collection and then call the PlotGraph() function.

This PR also updated Key Graph Features to use the new refactored way of transferring data. It was also updated to analyze an equation when the user clicks the button instead of analyzing them all at once.

How changes were validated:

  • Manual tests

@joseartrivera joseartrivera changed the title Refactor Equation to be treated a model Refactor Equation to be treated as a model Nov 12, 2019
@joseartrivera joseartrivera added the graphing calculator Work items related to the graphing calculator feature. label Nov 12, 2019
@joseartrivera joseartrivera changed the title Refactor Equation to be treated as a model Refactor Equation to be treated as a model and update Key Graph Features Nov 18, 2019
@sanderl
Copy link
Copy Markdown
Contributor

sanderl commented Nov 19, 2019

    InspectingDataSource ^ m_dataSource;

You can remove this


Refers to: src/GraphControl/Control/Grapher.h:206 in f242cd4. [](commit_id = f242cd4, deletion_comment = False)

@sanderl
Copy link
Copy Markdown
Contributor

sanderl commented Nov 19, 2019

#include "InspectingDataSource.h"

This too


Refers to: src/GraphControl/Control/Grapher.h:6 in f242cd4. [](commit_id = f242cd4, deletion_comment = False)

@ghost ghost removed the needs author feedback label Nov 20, 2019
@joseartrivera joseartrivera merged commit 288a90e into microsoft:feature/GraphingCalculator Nov 20, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

graphing calculator Work items related to the graphing calculator feature.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants