Passive & Active tracing#638
Merged
sanderl merged 44 commits intomicrosoft:feature/GraphingCalculatorfrom Oct 4, 2019
Merged
Conversation
…inpage to graphingcalculator
… of a failure. Then add the equations key.
…till need to do the graph equation key.
Feature/graphing calculator update from microsoft master repo.
Working -> feature branch so can validate then pull to main project from fork.
Fixed Co-Authored-By: Pepe Rivera <[email protected]>
…ops. Also block tracking of the active tracing key's when in the EquationTextBox.
grochocki
added
the
graphing calculator
joseartrivera
requested changes
Aug 28, 2019
Contributor
joseartrivera
left a comment
joseartrivera
left a comment
There was a problem hiding this comment.
Awesome changes! This feels really good and responsive. I left a few comments for you to consider. Thanks again for helping out with this feature :)
src/Calculator/Views/GraphingCalculator/GraphingCalculator.xaml
Outdated
Show resolved
Hide resolved
src/Calculator/Views/GraphingCalculator/GraphingCalculator.xaml
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/GraphingCalculator.xaml
Outdated
Show resolved
Hide resolved
ghost
added
the
|
This pull request has been automatically marked as stale because it has been marked as requiring author feedback but has not had any activity for 7 days. Thank you for your contributions to Windows Calculator! |
sanderl
suggested changes
Sep 10, 2019
src/Calculator/Views/GraphingCalculator/GraphingCalculator.xaml
Outdated
Show resolved
Hide resolved
|
This pull request has been automatically marked as stale because it has been marked as requiring author feedback but has not had any activity for 7 days. Thank you for your contributions to Windows Calculator! |
added 4 commits
September 23, 2019 16:29
… automatically change depending on system values. And changed text formatting of the value to be generic (x,y) value.
joseartrivera
requested changes
Sep 30, 2019
src/GraphControl/Control/Grapher.cpp
Outdated
| // NOTE: you can't select the graph control from the mouse for focus but you can tab to it. | ||
| FrameworkElement ^ whoHasFocus = (FrameworkElement ^) FocusManager::GetFocusedElement(); | ||
| String ^ wName = whoHasFocus->Name; | ||
| String ^ ETBName = L"GraphingControl"; |
Contributor
There was a problem hiding this comment.
We shouldn't hard code this, we should use this->Name instead. However, the GraphControl doesn't require a name either, people could use it without assigning a name. You can just check the self contained FocusState of the GraphControl or compare the returned FrameWorkElement to the GraphControl itself.
Author
There was a problem hiding this comment.
Changed to us a dynamic_cast like c# "as" functionality. If we get a nullptr back it isn't the graph control and we skip processing.
Contributor
There was a problem hiding this comment.
Nice solution, I think we should still check that the GraphControl is really us in case there are multiple. Super NIT corner case :P
added 2 commits
September 30, 2019 18:08
joseartrivera
approved these changes
Oct 4, 2019
sanderl
approved these changes
Oct 4, 2019
DavidShoe
pushed a commit
to DavidShoe/calculator
that referenced
this pull request
Oct 29, 2019
* Plumebd with data transfer * Getting mainpage to talk to getbitmap. moving share callbacks from mainpage to graphingcalculator * Trying to get bitmap from renderer. * work * Share worked * cleanups * Cleanups progressing * Share working, need loc for title string and user notification incase of a failure. Then add the equations key. * More cleanup, now using share icon image and resources for strings. Still need to do the graph equation key. * Change share to html based start. * Key working, with UL but going to try changing to table. * Fix a html formating error, generating a new UL for each equation. * Switched over to a table for equation key and have color block formating * Updates from PR feedback, using Graphing::IBitmap abstraction. * Update src/Calculator/Views/GraphingCalculator/GraphingCalculator.xaml.h Fixed Co-Authored-By: Pepe Rivera <[email protected]> * PR Updates. * Add variables to the graph key. * eod * Passive graph value tracing working. * Basic active tracing cursor working. * Move active tracing from graphingcalculator to grapher to save some hops. Also block tracking of the active tracing key's when in the EquationTextBox. * Active tracing working, need to put button on screen for activation. * Added active tracing control button (placeholder image) * Eod * Popup trace value now tracks the highlighted point. * Popup skined * PR Updates. * Update certificate thumbnail so VS2019 doesn't have a build error. * PR comments in process. * PR Updates * PR Updates, change tracing value to use tooltip static resource so we automatically change depending on system values. And changed text formatting of the value to be generic (x,y) value. * PR updates, changed how we detect who has focus so we don't eat keys when not in active tracing. * Additional filtering for the Key Up/Down in the grapher.
DavidShoe
pushed a commit
to DavidShoe/calculator
that referenced
this pull request
Nov 26, 2019
* Plumebd with data transfer * Getting mainpage to talk to getbitmap. moving share callbacks from mainpage to graphingcalculator * Trying to get bitmap from renderer. * work * Share worked * cleanups * Cleanups progressing * Share working, need loc for title string and user notification incase of a failure. Then add the equations key. * More cleanup, now using share icon image and resources for strings. Still need to do the graph equation key. * Change share to html based start. * Key working, with UL but going to try changing to table. * Fix a html formating error, generating a new UL for each equation. * Switched over to a table for equation key and have color block formating * Updates from PR feedback, using Graphing::IBitmap abstraction. * Update src/Calculator/Views/GraphingCalculator/GraphingCalculator.xaml.h Fixed Co-Authored-By: Pepe Rivera <[email protected]> * PR Updates. * Add variables to the graph key. * eod * Passive graph value tracing working. * Basic active tracing cursor working. * Move active tracing from graphingcalculator to grapher to save some hops. Also block tracking of the active tracing key's when in the EquationTextBox. * Active tracing working, need to put button on screen for activation. * Added active tracing control button (placeholder image) * Eod * Popup trace value now tracks the highlighted point. * Popup skined * PR Updates. * Update certificate thumbnail so VS2019 doesn't have a build error. * PR comments in process. * PR Updates * PR Updates, change tracing value to use tooltip static resource so we automatically change depending on system values. And changed text formatting of the value to be generic (x,y) value. * PR updates, changed how we detect who has focus so we don't eat keys when not in active tracing. * Additional filtering for the Key Up/Down in the grapher.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #.
Description of the changes:
Add the ability to trace the values of the graphed lines.
How changes were validated:
Manual/ad-hoc retail and debug.