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.

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

Passive & Active tracing #638

Merged
merged 44 commits into from
Oct 4, 2019

Conversation

DavidShoe
Copy link
Contributor

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.

DavidShoe and others added 30 commits July 12, 2019 15:19
Feature/graphing calculator update from microsoft master repo.
Working -> feature branch so can validate then pull to main project from fork.
…ops.

Also block tracking of the active tracing key's when in the EquationTextBox.
@grochocki grochocki added the graphing calculator Work items related to the graphing calculator feature. label Aug 9, 2019
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.

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/Calculator.vcxproj 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.h Show resolved Hide resolved
src/GraphControl/Control/Grapher.cpp Outdated Show resolved Hide resolved
@ghost ghost added the no recent activity label Sep 4, 2019
@ghost
Copy link

ghost commented Sep 4, 2019

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!

@ghost ghost removed the no recent activity label Sep 10, 2019
@ghost ghost added the no recent activity label Sep 17, 2019
@ghost
Copy link

ghost commented Sep 17, 2019

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!

… automatically change depending on system values. And changed text formatting of the value to be generic (x,y) value.
src/GraphControl/Control/Grapher.cpp Outdated Show resolved Hide resolved
// 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";
Copy link
Contributor

Choose a reason for hiding this comment

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

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.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

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.

Copy link
Contributor

Choose a reason for hiding this comment

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

Nice solution, I think we should still check that the GraphControl is really us in case there are multiple. Super NIT corner case :P

src/GraphControl/Control/Grapher.cpp Outdated Show resolved Hide resolved
src/GraphControl/GraphControl.vcxproj.filters Outdated Show resolved Hide resolved
@sanderl sanderl merged commit 18f80a8 into microsoft:feature/GraphingCalculator Oct 4, 2019
DavidShoe added 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 added 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.
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.

5 participants