-
Notifications
You must be signed in to change notification settings - Fork 5.4k
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
Merge graphing calculator into master #899
Commits on Apr 11, 2019
-
Feature/GraphingCalculator initial commit (microsoft#450)
Initial PR for the feature/GraphingCalculator feature branch, part of microsoft#338. The feature incorporates a proprietary Microsoft-owned graphing engine to drive graphing experiences in the Windows Calculator app. Due to the private nature of the graphing engine, the source available in the public repo will make use of a mock graphing engine. See README.md for more details. This PR simply serves as a base for future feature development. As such, the PR will be immediately merged. Feedback on the content of this PR, and on the feature in general, is encouraged. If there is feedback related to the content of this specific PR, please leave comments on the PR page. We will address the comments in future PRs to the feature branch.
Daniel Belcher authoredApr 11, 2019 Configuration menu - View commit details
-
Copy full SHA for 091732a - Browse repository at this point
Copy the full SHA 091732aView commit details
Commits on Apr 22, 2019
-
Add Pan/Zoom support for the graph surface (microsoft#458)
Description of the changes: Add Pan/Zoom support for the graph surface. Currently only supports Mouse/Pen/Touch interactions. Keyboard support will be added separately. How changes were validated: Manual
Daniel Belcher authoredApr 22, 2019 Configuration menu - View commit details
-
Copy full SHA for 5ffe1bc - Browse repository at this point
Copy the full SHA 5ffe1bcView commit details
Commits on Jun 21, 2019
-
Updating GraphingInterfaces to use Graphing Engine 2.0 (microsoft#561)
* Updated Graphing Interfaces to version 2.0.1
Configuration menu - View commit details
-
Copy full SHA for c3c001a - Browse repository at this point
Copy the full SHA c3c001aView commit details
Commits on Jun 25, 2019
-
Configuration menu - View commit details
-
Copy full SHA for 1475b49 - Browse repository at this point
Copy the full SHA 1475b49View commit details
Commits on Jul 15, 2019
-
Merge master into feature/GraphingCalculator branch (microsoft#585)
* Merge master into feature/GraphingCalculator branch
Configuration menu - View commit details
-
Copy full SHA for a418777 - Browse repository at this point
Copy the full SHA a418777View commit details
Commits on Jul 24, 2019
-
Configuration menu - View commit details
-
Copy full SHA for 46f11c7 - Browse repository at this point
Copy the full SHA 46f11c7View commit details
Commits on Aug 13, 2019
-
Adding share functionality to Graphing Calculator (microsoft#601)
* 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 <joseartrivera@gmail.com> * PR Updates. * Add variables to the graph key. * PR Updates.
Configuration menu - View commit details
-
Copy full SHA for c1efa3d - Browse repository at this point
Copy the full SHA c1efa3dView commit details
Commits on Aug 16, 2019
-
Configuration menu - View commit details
-
Copy full SHA for 1c9755d - Browse repository at this point
Copy the full SHA 1c9755dView commit details
Commits on Sep 5, 2019
-
Configuration menu - View commit details
-
Copy full SHA for 41fbcfe - Browse repository at this point
Copy the full SHA 41fbcfeView commit details
Commits on Sep 23, 2019
-
Switch to RichEdit math mode in EquationTextBox (microsoft#672)
* Use RichEdit Math Mode * Add comment Co-Authored-By: Stephanie Anderl <46726333+sanderl@users.noreply.github.com>
Configuration menu - View commit details
-
Copy full SHA for b2dd55a - Browse repository at this point
Copy the full SHA b2dd55aView commit details
Commits on Sep 25, 2019
-
Configuration menu - View commit details
-
Copy full SHA for 7864fe6 - Browse repository at this point
Copy the full SHA 7864fe6View commit details
Commits on Oct 4, 2019
-
Passive & Active tracing (microsoft#638)
* 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 <joseartrivera@gmail.com> * 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.
Configuration menu - View commit details
-
Copy full SHA for 18f80a8 - Browse repository at this point
Copy the full SHA 18f80a8View commit details
Commits on Oct 10, 2019
-
Active tracing (microsoft#702)
* 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 <joseartrivera@gmail.com> * 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. * Fix bug where active tracing would turn back on after clicking button to turn it off.
Configuration menu - View commit details
-
Copy full SHA for 65c3046 - Browse repository at this point
Copy the full SHA 65c3046View commit details
Commits on Nov 5, 2019
-
Configuration menu - View commit details
-
Copy full SHA for 433d54d - Browse repository at this point
Copy the full SHA 433d54dView commit details
Commits on Nov 12, 2019
-
Configuration menu - View commit details
-
Copy full SHA for 626bdf0 - Browse repository at this point
Copy the full SHA 626bdf0View commit details -
Key graph features (microsoft#704)
* Added IGraphAnalyzer * Key Graph Features called and getting returned to the client. To do put all strings into the Equation object * Updated UpdateKeyGraphFeatures to add function analysis data to all properties in Equation object * Update KGF when variables are updated * Key graph features ui started * Added MathRichEditBox and started hooking up key graph features to the UI * Updated EquationViewModel to include parity and periodicity * Updated key graph features to update the EquationViewModel * updated key graph features to display more values * Key graph features populating uing MathRichEdit mode * moved KeyGraphFeatures control to GraphingCalculator.xaml * Use MathML formatting instead of MathRichEdit for strings passed back from the engine * cleaned up project targeting and equation.h comments * Updated equation edit box to populate for KeyGraphFeatures * Fixed vcxproj files to have the correct targeting and certificates. KGF Title strings moved to x:Uid instead of the code behind * Updated per PR feedback * Update MathRichEditBox to detect if the string is a mathml string and use the appropriate set method to set the text * fixed the issue where parity, periodicity and monotonicity could be set with an old value if the next one is empty * KGF control UI adjustments and error handling * Error control updates * Error handling added when analysis fails * fixed alignment on rich edit boxes * Add monotonicity direction into the mathml string and only have 1 richeditbox * Set hover state on KGF EquationEditBox to change button opacity and fixed spacing in Monotonicity RichEditBox * remove sideload package certificate info VS added * updated logic for setting error strings to be in the viewmodel * Updated KeyGraphFeatures to populate dynamically using a ListView and TemplateSelector * Update periodicity to not show if it isn't supported * Fixed issue where y-intercept was using the x-intercept value * Remove ItemsControl ItemsContainerStyle * Updated per pr feedback. Fixed bug where analysis error would not reset * Update MathRichEdit box to remove selection when focus is lost * Updated mathrichedit to get LAF access for Dev, Release and Graphing projects * Remove OnLostFocus in MathRichEdit, Change KGF ItemsControl back to ListView * Clean up styles for KGF and ensure the match the comps * Moved formatoptions logic to the Grapher constructor and reverted LineColor.Text resource that was mistakenly taken out * Add copyright header to KGF Files * fixed issue where asymptote values were not populating * Disable KGF button when there is no equation. Fixed issue where equation populated in a new equationtextbox after the previous one was deleted * Removed formatoptions testing lines used for debugging
Configuration menu - View commit details
-
Copy full SHA for 442ed6a - Browse repository at this point
Copy the full SHA 442ed6aView commit details
Commits on Nov 13, 2019
-
Configuration menu - View commit details
-
Copy full SHA for afc1b21 - Browse repository at this point
Copy the full SHA afc1b21View commit details
Commits on Nov 19, 2019
-
Update share output (microsoft#782)
* fix share bugs * PR feedback * PR feedback and merge fix * Fix spacing and use explicit break * Fix extra space
Configuration menu - View commit details
-
Copy full SHA for b55659f - Browse repository at this point
Copy the full SHA b55659fView commit details
Commits on Nov 20, 2019
-
Update styles for buttons on Graph and ListView (microsoft#793)
* Fix listview * extra merge with KGF * Few tweaks * Fix scrolling * PR feedback and other tweaks * Update src/Calculator/Views/GraphingCalculator/EquationInputArea.xaml Co-Authored-By: Stephanie Anderl <46726333+sanderl@users.noreply.github.com>
Configuration menu - View commit details
-
Copy full SHA for 9ee2f8a - Browse repository at this point
Copy the full SHA 9ee2f8aView commit details -
Refactor Equation to be treated as a model and update Key Graph Featu…
…res (microsoft#791) * refactor code * update KGF * Rename some functions * Undo comment out of proj file * Pr feedback
Configuration menu - View commit details
-
Copy full SHA for 288a90e - Browse repository at this point
Copy the full SHA 288a90eView commit details
Commits on Nov 21, 2019
-
Equation button updates: Enable/Disable on click, button content f1, …
…f2, f3..., visibility icon on hover (microsoft#804) * Added enable/disable line functionality * Update EquationTextBox to change the opacity of functions have are not visible. Update the function label for the EquationTextBox to increment the label to show f1, f2, f3, etc * rebase key-graph-features and fix issue where removing an equation box and adding a new one repopulates the previous equation * Added visibility icon for the equation button hover * updated EquationButton to be a toggle button to better handle the LineHidden state and other PR comment fixes. * Updated EquationButton style to use a toggle button and to have placeholder icons for the show/hide states * Updated equation button after pulling the refactor work into the branch. Fixed the Equation Button in KGF UI * Fixed Pepe's bugs * Uncomment temporary.pfx in calculator.vcxproj
Configuration menu - View commit details
-
Copy full SHA for a33c1a4 - Browse repository at this point
Copy the full SHA a33c1a4View commit details
Commits on Nov 22, 2019
-
Added support for small windows in the graphing calculator (microsoft…
…#803) * Add support of small windows * remove extra space * Modify how we manage the tooltip * Fix merge issues
Configuration menu - View commit details
-
Copy full SHA for 7ef6eaf - Browse repository at this point
Copy the full SHA 7ef6eafView commit details -
Add tooltips to buttons in graphing calculator (microsoft#822)
* Add tooltips to buttons in graphing calculator * Fix break due to bad merge * CR Feedback
Configuration menu - View commit details
-
Copy full SHA for 603d672 - Browse repository at this point
Copy the full SHA 603d672View commit details
Commits on Nov 23, 2019
-
Configuration menu - View commit details
-
Copy full SHA for f395d14 - Browse repository at this point
Copy the full SHA f395d14View commit details
Commits on Dec 2, 2019
-
Configuration menu - View commit details
-
Copy full SHA for 265721b - Browse repository at this point
Copy the full SHA 265721bView commit details
Commits on Dec 3, 2019
-
Merge remote-tracking branch 'upstream/master' into feature/UpstreamG…
…raphingCalculator
Rudy Huyn committedDec 3, 2019 Configuration menu - View commit details
-
Copy full SHA for 3988566 - Browse repository at this point
Copy the full SHA 3988566View commit details -
Rudy Huyn committed
Dec 3, 2019 Configuration menu - View commit details
-
Copy full SHA for 73d6a32 - Browse repository at this point
Copy the full SHA 73d6a32View commit details -
Rudy Huyn committed
Dec 3, 2019 Configuration menu - View commit details
-
Copy full SHA for 6911f2b - Browse repository at this point
Copy the full SHA 6911f2bView commit details -
Configuration menu - View commit details
-
Copy full SHA for 94b7088 - Browse repository at this point
Copy the full SHA 94b7088View commit details -
Configuration menu - View commit details
-
Copy full SHA for 03c2d65 - Browse repository at this point
Copy the full SHA 03c2d65View commit details -
Configuration menu - View commit details
-
Copy full SHA for 3ca4f4f - Browse repository at this point
Copy the full SHA 3ca4f4fView commit details -
Add error handling to graph and equations (microsoft#827)
* add error handling * Handle regraphing on certain errors * Fix high contrast * Hide KGF button in error state
Configuration menu - View commit details
-
Copy full SHA for 89c3fc3 - Browse repository at this point
Copy the full SHA 89c3fc3View commit details -
Update navigation unit tests to account for new graphing calc entry p…
…oint position (microsoft#844)
Configuration menu - View commit details
-
Copy full SHA for bed5151 - Browse repository at this point
Copy the full SHA bed5151View commit details
Commits on Dec 4, 2019
-
Add icons for show, hide and switch to equation mode (microsoft#845)
* Add icons for show, hide and switch to equation mode * use correct icon for small mode * cleanup of fonts
Configuration menu - View commit details
-
Copy full SHA for 133df73 - Browse repository at this point
Copy the full SHA 133df73View commit details -
Adding automation names to buttons (microsoft#842)
* Add missing automation names for buttons in graphing calculator * Add narrator support for tracing features
Configuration menu - View commit details
-
Copy full SHA for 36327b7 - Browse repository at this point
Copy the full SHA 36327b7View commit details -
Update ManualTests.md (microsoft#815)
* Update ManualTests.md Added manual test cases for Graphing mode in Calculator. * Update ManualTests.md Added line breaks to make my additions more legible, and added two more cases for testing the "too complex" and "unsupported" error messages for Key Graph Features.
Configuration menu - View commit details
-
Copy full SHA for 81747a0 - Browse repository at this point
Copy the full SHA 81747a0View commit details
Commits on Dec 6, 2019
-
Configuration menu - View commit details
-
Copy full SHA for 5038318 - Browse repository at this point
Copy the full SHA 5038318View commit details
Commits on Dec 7, 2019
-
Configuration menu - View commit details
-
Copy full SHA for 5209084 - Browse repository at this point
Copy the full SHA 5209084View commit details
Commits on Dec 9, 2019
-
Configuration menu - View commit details
-
Copy full SHA for c6d3132 - Browse repository at this point
Copy the full SHA c6d3132View commit details -
Add context menu to rich edit to allow for keyboard support (microsof…
…t#854) * Add context menu to rich edit to allow for keyboard support * Update src/Calculator/Controls/EquationTextBox.cpp Co-Authored-By: Pepe Rivera <joseartrivera@gmail.com> * Check for focus before triggering submit
Configuration menu - View commit details
-
Copy full SHA for 4bb5c39 - Browse repository at this point
Copy the full SHA 4bb5c39View commit details -
Fix graph rendering of inequalities (microsoft#856)
* fix inequality rendering * Add comment
Configuration menu - View commit details
-
Copy full SHA for f1bf335 - Browse repository at this point
Copy the full SHA f1bf335View commit details
Commits on Dec 10, 2019
-
[Graph] Replace the Add button by a EquationTextBlock (microsoft#826)
* init * Replace the Add equation button by an EquationTextBox * Move automatically the focus to the next textbox when users press Enter * nit * localize the placeholder * rebase * rebased and disable remove context menu when the equation is the last one * replace storyboards by setters in visual states
Configuration menu - View commit details
-
Copy full SHA for 07d012c - Browse repository at this point
Copy the full SHA 07d012cView commit details
Commits on Dec 11, 2019
-
Update GraphingCalculator Projects to allow official builds (microsof…
…t#852) * renamed MockGraphingImpl to GraphingImpl, updated the nuget.config to include the WindowsApps feed * Revert nuget.config change * Updated vcxproj files to output to the same directory regardless of configuration * Removed outder used GenerateProjectSpecificOutputfolder instead * revert commenting out the temporary.pfx cert in the calculator.vcxproj file
Configuration menu - View commit details
-
Copy full SHA for f593c62 - Browse repository at this point
Copy the full SHA f593c62View commit details
Commits on Dec 12, 2019
-
Redesign graph buttons + replace ActiveTracing button by a ToggleButt…
…on (microsoft#864) * redesign graph buttons * fix high-contrast and focus
Configuration menu - View commit details
-
Copy full SHA for f282605 - Browse repository at this point
Copy the full SHA f282605View commit details -
Fix some UI bugs in graph mode (microsoft#862)
* Address issues with error states * Add various fixes * Add back initial tooltip * PR comments
Configuration menu - View commit details
-
Copy full SHA for 2a0637e - Browse repository at this point
Copy the full SHA 2a0637eView commit details -
Move variables to the right column (microsoft#859)
* move variable editor * support high contrast and tab navigation * Remove obsolete resources * take feedback into account * Fix focus when virtualization recycle a EquationTextBox * formatting
Configuration menu - View commit details
-
Copy full SHA for da38b5a - Browse repository at this point
Copy the full SHA da38b5aView commit details
Commits on Dec 14, 2019
-
GraphControl: refactoring and optimizations (microsoft#831)
* GraphControl cleaning * replace textbox value after submission * rebase * rebase * rebase * Add filters * rebase! * rebase
Configuration menu - View commit details
-
Copy full SHA for 534139d - Browse repository at this point
Copy the full SHA 534139dView commit details -
Save and restore the value of EquationInputArea when users scroll (mi…
…crosoft#866) * Save and restore the value of EquationInputArea when users scroll * clean up * replace ->Focus(..) by FocusManager::TryFocus(...)
Configuration menu - View commit details
-
Copy full SHA for dbddc7b - Browse repository at this point
Copy the full SHA dbddc7bView commit details
Commits on Dec 16, 2019
-
Configuration menu - View commit details
-
Copy full SHA for eb2fa6d - Browse repository at this point
Copy the full SHA eb2fa6dView commit details -
Update graph tooltip design and content (microsoft#867)
* update graph tooltip * modify font size
Configuration menu - View commit details
-
Copy full SHA for fe599e3 - Browse repository at this point
Copy the full SHA fe599e3View commit details
Commits on Dec 17, 2019
-
Remove EquationTextBox from KeyGraphFeaturesPanel (microsoft#833)
* remove EquationBox from KFG * polish * improve templates * fix issue with dark theme and MathRichEditBox
Configuration menu - View commit details
-
Copy full SHA for dc79ec6 - Browse repository at this point
Copy the full SHA dc79ec6View commit details
Commits on Dec 19, 2019
-
Configuration menu - View commit details
-
Copy full SHA for 38da8d7 - Browse repository at this point
Copy the full SHA 38da8d7View commit details -
Wire up keyboard in graphing calculator (microsoft#863)
* Wire up graphing calculator keyboard with math rich edit control * CR feedback * Handle focus bug in flyout
Configuration menu - View commit details
-
Copy full SHA for 13e3179 - Browse repository at this point
Copy the full SHA 13e3179View commit details
Commits on Dec 20, 2019
-
High Contrast support for Graphing Calculator (microsoft#878)
* Equation Control - High contrast * tweak * Update graph colors when users switch from one high contrast mode to another * decrease opacity of reveal borders
Configuration menu - View commit details
-
Copy full SHA for 3942662 - Browse repository at this point
Copy the full SHA 3942662View commit details
Commits on Jan 3, 2020
-
Minor changes to share output (microsoft#886)
* Make some tweaks to share output * adjust strings * one more tweak * Remove unneeded span
Configuration menu - View commit details
-
Copy full SHA for 3b916dc - Browse repository at this point
Copy the full SHA 3b916dcView commit details -
Change active tracing to use correct glyph instead of dot (microsoft#890
Configuration menu - View commit details
-
Copy full SHA for 234ac8d - Browse repository at this point
Copy the full SHA 234ac8dView commit details -
Configuration menu - View commit details
-
Copy full SHA for 8357f5d - Browse repository at this point
Copy the full SHA 8357f5dView commit details
Commits on Jan 6, 2020
-
Prevent the graph to pan/zoom in some cases (microsoft#897)
* prevent the graph to change ranges when hide/show an equation or change the trig unit * make sure to not zoom/pan when we hide the last visible equation
Configuration menu - View commit details
-
Copy full SHA for 7aaeee9 - Browse repository at this point
Copy the full SHA 7aaeee9View commit details -
Configuration menu - View commit details
-
Copy full SHA for 3592b3d - Browse repository at this point
Copy the full SHA 3592b3dView commit details -
Configuration menu - View commit details
-
Copy full SHA for d2b2853 - Browse repository at this point
Copy the full SHA d2b2853View commit details -
Configuration menu - View commit details
-
Copy full SHA for 78c6c2f - Browse repository at this point
Copy the full SHA 78c6c2fView commit details
Commits on Jan 7, 2020
-
Configuration menu - View commit details
-
Copy full SHA for 40cadcd - Browse repository at this point
Copy the full SHA 40cadcdView commit details -
Configuration menu - View commit details
-
Copy full SHA for 967b2a1 - Browse repository at this point
Copy the full SHA 967b2a1View commit details -
Configuration menu - View commit details
-
Copy full SHA for d087404 - Browse repository at this point
Copy the full SHA d087404View commit details -
Configuration menu - View commit details
-
Copy full SHA for aad968f - Browse repository at this point
Copy the full SHA aad968fView commit details -
Configuration menu - View commit details
-
Copy full SHA for 09926e4 - Browse repository at this point
Copy the full SHA 09926e4View commit details