Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Equation button updates: Enable/Disable on click, button content f1, f2, f3..., visibility icon on hover #804

Merged
merged 28 commits into from Nov 21, 2019
Merged

Equation button updates: Enable/Disable on click, button content f1, f2, f3..., visibility icon on hover #804

merged 28 commits into from Nov 21, 2019

Conversation

sanderl
Copy link
Contributor

@sanderl sanderl commented Nov 15, 2019

Fixes Part of #338.

Description of the changes:

  • Implemented the graph line enabling/disabling when the equation button is clicked
  • Replaced the x in the button content fx with the number for the equation.
  • Added a hover state to show clicking the icon sets the visibility of the line

How changes were validated:

  • manually

joseartrivera
joseartrivera requested changes Nov 15, 2019
View reviewed changes
Copy link
Contributor

@joseartrivera joseartrivera left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for taking on this feature! Works great functionally. Left a few comments and a solution for the issue we talked about at my desk. Thanks again! :)

src/Calculator/App.xaml Show resolved Hide resolved
src/Calculator/Calculator.vcxproj Outdated Show resolved Hide resolved
src/Calculator/Calculator.vcxproj Outdated Show resolved Hide resolved
src/Calculator/Views/GraphingCalculator/EquationInputArea.xaml Outdated Show resolved Hide resolved
src/Calculator/Views/GraphingCalculator/EquationInputArea.xaml.cpp Show resolved Hide resolved
src/Calculator/App.xaml Outdated Show resolved Hide resolved
src/Calculator/App.xaml Outdated Show resolved Hide resolved
src/GraphControl/Control/Grapher.cpp Outdated Show resolved Hide resolved
src/GraphControl/Control/Grapher.cpp Outdated Show resolved Hide resolved
src/GraphControl/Control/Grapher.cpp Outdated Show resolved Hide resolved
@sanderl sanderl added the graphing calculator Work items related to the graphing calculator feature. label Nov 18, 2019
@sanderl
Added IGraphAnalyzer
a5389f5
@sanderl
Key Graph Features called and getting returned to the client. To do p…
5d258b4 
…ut all strings into the Equation object
@sanderl
Update KGF when variables are updated
6230505
@sanderl
Key graph features ui started
626d816
@sanderl
Added MathRichEditBox and started hooking up key graph features to th…
1f56376 
…e UI
@sanderl
updated key graph features to display more values
9ac3b73
@sanderl
Key graph features populating uing MathRichEdit mode
7611d11
@sanderl
Use MathML formatting instead of MathRichEdit for strings passed back…
bcde84e 
… from the engine
@sanderl
cleaned up project targeting and equation.h comments
201e724
@sanderl
Updated equation edit box to populate for KeyGraphFeatures
1d1a214
@sanderl
KGF control UI adjustments and error handling
475fd68
@sanderl
Error handling added when analysis fails
95c8575
@sanderl
updated logic for setting error strings to be in the viewmodel
59023f8
@sanderl
Updated KeyGraphFeatures to populate dynamically using a ListView and…
be4ed2a 
… TemplateSelector
@sanderl
Update periodicity to not show if it isn't supported
908300f
@sanderl
Updated per pr feedback. Fixed bug where analysis error would not reset
bb543b3
@sanderl
Update MathRichEdit box to remove selection when focus is lost
1e6b694
@sanderl
Remove OnLostFocus in MathRichEdit, Change KGF ItemsControl back to L…
fe53153 
…istView
@sanderl
Moved formatoptions logic to the Grapher constructor and reverted Lin…
885871a 
…eColor.Text resource that was mistakenly taken out
@sanderl
Added enable/disable line functionality
5b78a0d
@sanderl
Update EquationTextBox to change the opacity of functions have are no…
1b37f47 
…t visible. Update the function label for the EquationTextBox to increment the label to show f1, f2, f3, etc
@sanderl
rebase key-graph-features and fix issue where removing an equation bo…
44f9f42 
…x and adding a new one repopulates the previous equation
@sanderl
Added visibility icon for the equation button hover
a2c418f
@sanderl
updated EquationButton to be a toggle button to better handle the Lin…
1f1da90 
…eHidden state and other PR comment fixes.
@sanderl sanderl merged commit a33c1a4 into microsoft:feature/GraphingCalculator Nov 21, 2019
@sanderl sanderl deleted the EnableDisableLine branch January 16, 2020 18:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@joseartrivera joseartrivera joseartrivera approved these changes

Assignees

@joseartrivera joseartrivera

Labels
graphing calculator Work items related to the graphing calculator feature.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@sanderl @joseartrivera