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

Add Graph Settings #879

Merged
merged 22 commits into from
Jan 3, 2020
Merged

Add Graph Settings #879

merged 22 commits into from
Jan 3, 2020

Conversation

rudyhuyn
Copy link
Contributor

Taking over @sanderl's PR.

Description of the changes:

  • Add Graph Settings
  • Add GraphSettingsViewModel to simplify the UI part of the control and manage all the logic
  • Support error states (when minimum is higher than maximum)
  • Disable keyboard when the flyout is opened
  • Only load GraphSettings after the user clicks on the button to improve launch performance

How changes were validated:

  • Manually

@rudyhuyn rudyhuyn added the graphing calculator Work items related to the graphing calculator feature. label Dec 18, 2019
joseartrivera
joseartrivera requested changes Dec 18, 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.

Thanks for taking this PR over! Seems to be working well although I did find a few bugs/crashes. Let me know what you think! Thanks again.

src/Calculator/Views/GraphingCalculator/GraphingSettings.xaml Show resolved Hide resolved
src/Calculator/Views/GraphingCalculator/GraphingSettings.xaml Show resolved Hide resolved
src/Calculator/Views/GraphingCalculator/GraphingSettings.xaml Show resolved Hide resolved
src/Calculator/Views/GraphingCalculator/GraphingSettings.xaml Show resolved Hide resolved
src/Calculator/Views/GraphingCalculator/GraphingCalculator.xaml.cpp Outdated Show resolved Hide resolved
src/Calculator/Calculator.vcxproj Outdated Show resolved Hide resolved
src/Calculator/Views/GraphingCalculator/GraphingCalculator.xaml.cpp Outdated Show resolved Hide resolved
src/Calculator/Views/GraphingCalculator/GraphingCalculator.xaml.cpp Outdated Show resolved Hide resolved
src/Calculator/Views/GraphingCalculator/GraphingSettings.xaml Show resolved Hide resolved
src/GraphControl/Control/Grapher.h Show resolved Hide resolved
DavidShoe and others added 18 commits December 19, 2019 14:53
@DavidShoe
PR after merge and reset onto feature\graphingcalculator
fd3fb05
@DavidShoe
PR comment updates.
3054b99
@sanderl
Updated GraphingInterfaces and added logic to enable key graph featur…
f3de60b 
…es for equations with variables
@sanderl
Removed LockAspectRatio, hooked up the engine for graph options and s…
1fb8b18 
…tarted fixing the styling on the page.
@sanderl
Updated UI for GraphSettings
d2d7c28
@sanderl
Updated spacing, added graph options title, started the error state o…
934eddd 
…n the textboxes
add VM and manage error states
2ea7a14
- Make GraphSettingsButton compatible with high contrast mode
a17fd7a 
- Fix crash when users open Graph Settings in high contrast mode
- Replace brushes created for the fake Toggle Button in Graph Settings by brushes used in the real ToggleButton
update VM
d713a09
Set TrigUnitsRadioButtonStyle.FocusVisualMargin
001a565
replace tabs
730ad2f
Prevent users to enter a non-double.
4531679 
Force a redraw after X/Y Min/Max values are modified
Update grid range when we reopen the popup
d0472ba
modify renderMain
94a5d20
rollback vcxproj
870c89b
prevent crash when users copy text
3cf2f7f
force std::stod to use the full string
a91afd2
rebase
8cc91c1
@rudyhuyn
Copy link
Contributor Author

Rebased!

@microsoft microsoft deleted a comment from joseartrivera Dec 20, 2019
@ghost ghost removed the needs author feedback label Dec 21, 2019
- improve graph mock to support bitmap, graphingOption, graphRenderer
b5c0f6c 
- calculate a proportional range in the ViewModel instead of relying on the graph
@rudyhuyn rudyhuyn merged commit 8357f5d into microsoft:feature/GraphingCalculator Jan 3, 2020
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

@EriWong EriWong Awaiting requested review from EriWong

Assignees
No one assigned
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.
4 participants
@rudyhuyn @joseartrivera @DavidShoe @sanderl