Passive & Active tracing

src/Calculator/Calculator.vcxproj

@@ -599,6 +599,7 @@
     <PRIResource Include="Resources\zh-tw\Resources.resw" />
   </ItemGroup>
   <ItemGroup>
+    <Image Include="Assets\ActiveTracking-32_contrast-white.png" />
     <Image Include="Assets\CalculatorAppList.contrast-black_scale-100.png" />
     <Image Include="Assets\CalculatorAppList.contrast-black_scale-125.png" />
     <Image Include="Assets\CalculatorAppList.contrast-black_scale-150.png" />

src/Calculator/Calculator.vcxproj.filters

@@ -1557,6 +1557,9 @@
     <Image Include="Assets\CalculatorAppList.targetsize-256_altform-lightunplated.png">
       <Filter>Assets</Filter>
     </Image>
+    <Image Include="Assets\ActiveTracking-32_contrast-white.png">
+      <Filter>Assets</Filter>
+    </Image>
   </ItemGroup>
   <ItemGroup>
     <Font Include="Assets\CalcMDL2.ttf">
@@ -1569,5 +1572,9 @@
   <ItemGroup>
     <CopyFileToFolders Include="$(GraphingImplDll)" />
     <CopyFileToFolders Include="$(GraphingEngineDll)" />
+    <CopyFileToFolders Include="$(GraphingImplDll)" />
+    <CopyFileToFolders Include="$(GraphingEngineDll)" />
+    <CopyFileToFolders Include="$(GraphingImplDll)" />
+    <CopyFileToFolders Include="$(GraphingEngineDll)" />
   </ItemGroup>
 </Project>

src/Calculator/Resources/en-US/Resources.resw

@@ -3439,6 +3439,22 @@
     <value>Add Equation</value>
     <comment>Placeholder text for the equation input button</comment>
   </data>
+  <data name="ShareActionErrorMessage" xml:space="preserve">
+    <value>Unable to share at this time.</value>
+    <comment>If there is an error in the sharing action will display a dialog with this text.</comment>
+  </data>
+  <data name="ShareActionErrorOk" xml:space="preserve">
+    <value>OK</value>
+    <comment>Used on the dismiss button of the share action error dialog.</comment>
+  </data>
+  <data name="ShareActionTitle" xml:space="preserve">
+    <value>Look what I graphed.</value>
+    <comment>Sent as part of the shared content. The title for the share.</comment>
+  </data>
+  <data name="EmptyEquationString" xml:space="preserve">
+    <value>Empty graph equation</value>
+    <comment>When sharing and one of the equations has no content this will be shown in the graph key for that equation.</comment>
+  </data>
   <data name="VaiablesHeader.Text" xml:space="preserve">
     <value>Variables</value>
     <comment>Header text for variables area</comment>

src/Calculator/Views/GraphingCalculator/GraphingCalculator.xaml

@@ -9,14 +9,15 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:vm="using:CalculatorApp.ViewModel"
              DataContextChanged="GraphingCalculator_DataContextChanged"
-             mc:Ignorable="d">
+             mc:Ignorable="d"
+             >
 
     <UserControl.Resources>
         <converters:BooleanToVisibilityConverter x:Name="BooleanToVisibilityConverter"/>
         <converters:BooleanToVisibilityNegationConverter x:Name="BooleanToVisibilityNegationConverter"/>
     </UserControl.Resources>
 
-    <Grid x:Name="RootGrid">
+    <Grid x:Name="RootGrid" >
         <Grid.RowDefinitions>
             <RowDefinition x:Name="RowHamburger" Height="{StaticResource HamburgerHeightGridLength}"/>
             <RowDefinition/>
@@ -30,22 +31,34 @@
         <Grid x:Name="LeftGrid"
               Grid.Row="1"
               Grid.Column="0">
-
-            <graphControl:Grapher Name="GraphingControl"
-                                  Margin="4,7,4,4"
+            <Grid Grid.Row="0" Margin="4,7,4,4">
+                <graphControl:Grapher Name="GraphingControl" 
                                   EquationsSource="{x:Bind ViewModel.Equations, Mode=OneWay}"
                                   ForceProportionalAxes="True"
                                   UseSystemFocusVisuals="True"
                                   VariablesUpdated="GraphVariablesUpdated">
-                <graphControl:Grapher.Background>
-                    <SolidColorBrush Color="White"/>
-                </graphControl:Grapher.Background>
-                <graphControl:Grapher.EquationTemplate>
-                    <DataTemplate x:DataType="vm:EquationViewModel">
-                        <graphControl:Equation Expression="{x:Bind Expression, Mode=OneWay}" LineColor="{x:Bind LineColor, Mode=OneWay}"/>
-                    </DataTemplate>
-                </graphControl:Grapher.EquationTemplate>
-            </graphControl:Grapher>
+                    <graphControl:Grapher.Background>
+                        <SolidColorBrush Color="White"/>
+                    </graphControl:Grapher.Background>
+                    <graphControl:Grapher.EquationTemplate>
+                        <DataTemplate x:DataType="vm:EquationViewModel">
+                            <graphControl:Equation Expression="{x:Bind Expression, Mode=OneWay}" LineColor="{x:Bind LineColor, Mode=OneWay}"/>
+                        </DataTemplate>
+                    </graphControl:Grapher.EquationTemplate>
+
+                </graphControl:Grapher>
+
+                <Popup x:Name="TraceValuePopup" Grid.Row="0" RenderTransformOrigin="0,1">
+                    <Popup.RenderTransform>
+                        <TranslateTransform x:Name="TraceValuePopupTransform" X="50" Y="150"/>
+                    </Popup.RenderTransform>
+                    <Grid Background="White" BorderBrush="SlateBlue" BorderThickness="3,3,3,3">
+                        <TextBlock x:Name="TraceValue" Text="x=0,y=0" Margin="5,5,5,5"/>
+                    </Grid>
+                </Popup>
+
+            </Grid>
+
 
             <!-- Temporary button until the final UI is created -->
             <Button Margin="12,0,0,12"
@@ -229,7 +242,17 @@
                 <RowDefinition Height="3*"/>
             </Grid.RowDefinitions>
 
-            <local:EquationInputArea Grid.Row="0" Equations="{x:Bind ViewModel.Equations}"/>
+            <StackPanel>
+                <StackPanel Orientation="Horizontal">
+                    <Button x:Name="ActiveTracing" Click="OnActiveTracingClick" Width="40" Height="40" Margin="0,0,10,0">
+                        <Image Source="ms-appx:///Assets/ActiveTracking-32_contrast-white.png"/>
+                    </Button>
+                    <Button x:Name="Share" Click="OnShareClick" Width="40" Height="40">
+                        <FontIcon FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE72D;"/>
+                    </Button>
+                </StackPanel>
+                <local:EquationInputArea Grid.Row="0" Equations="{x:Bind ViewModel.Equations}"/>
+            </StackPanel>
 
             <Grid x:Name="ButtonContainerGrid"
                   Grid.Row="2"

src/Calculator/Views/GraphingCalculator/GraphingCalculator.xaml.cpp

@@ -1,5 +1,6 @@
 
 #include "pch.h"
+#include "CalcViewModel/Common/TraceLogger.h"
 #include "GraphingCalculator.xaml.h"
 #include "CalcViewModel/Common/KeyboardShortcutManager.h"
 #include "Controls/CalculationResult.h"
@@ -11,19 +12,24 @@ using namespace CalculatorApp::ViewModel;
 using namespace concurrency;
 using namespace GraphControl;
 using namespace Platform;
+using namespace Platform::Collections;
 using namespace std;
 using namespace std::chrono;
 using namespace Utils;
+using namespace Windows::ApplicationModel::DataTransfer;
 using namespace Windows::Foundation;
 using namespace Windows::Foundation::Collections;
 using namespace Windows::Storage::Streams;
 using namespace Windows::System;
+using namespace Windows::UI::Core;
+using namespace Windows::UI::Input;
 using namespace Windows::UI::Xaml;
 using namespace Windows::UI::Xaml::Data;
 using namespace Windows::UI::Xaml::Controls;
 using namespace Windows::UI::Xaml::Input;
 using namespace Windows::UI::Xaml::Media;
 using namespace Windows::UI::Xaml::Media::Imaging;
+using namespace Windows::UI::Popups;
 
 constexpr auto sc_ViewModelPropertyName = L"ViewModel";
 
@@ -32,21 +38,47 @@ GraphingCalculator::GraphingCalculator()
     Equation::RegisterDependencyProperties();
     Grapher::RegisterDependencyProperties();
     InitializeComponent();
+
+    DataTransferManager ^ dataTransferManager = DataTransferManager::GetForCurrentView();
+
+    // Register the current control as a share source.
+    m_dataRequestedToken = dataTransferManager->DataRequested += ref new TypedEventHandler<DataTransferManager ^, DataRequestedEventArgs ^>(this, &GraphingCalculator::OnDataRequested);
+
+    // Request notifications when we should be showing the trace values
+    m_showTracePopupChangedToken = GraphingControl->TracingChangedEvent += ref new TracingChangedEventHandler(this, &GraphingCalculator::OnShowTracePopupChanged);
+
+    // And when the actual trace value changes
+    m_tracePointChangedToken = GraphingControl->TracingValueChangedEvent += ref new TracingValueChangedEventHandler(this, &GraphingCalculator::OnTracePointChanged);
+}
+
+void GraphingCalculator::OnShowTracePopupChanged(bool newValue)
+{
+    TraceValuePopup->IsOpen = newValue;
 }
 
-void GraphingCalculator::GraphingCalculator_DataContextChanged(FrameworkElement^ sender, DataContextChangedEventArgs^ args)
+void GraphingCalculator::GraphingCalculator_DataContextChanged(FrameworkElement ^ sender, DataContextChangedEventArgs ^ args)
 {
-    ViewModel = dynamic_cast<GraphingCalculatorViewModel^>(args->NewValue);
+    ViewModel = dynamic_cast<GraphingCalculatorViewModel ^>(args->NewValue);
 
     ViewModel->VariableUpdated += ref new EventHandler<VariableChangedEventArgs>(this, &CalculatorApp::GraphingCalculator::OnVariableChanged);
 }
 
-GraphingCalculatorViewModel^ GraphingCalculator::ViewModel::get()
+void GraphingCalculator::OnTracePointChanged(Windows::Foundation::Point newPoint)
+{
+    auto p = GraphingControl->TraceValue;
+    auto l = GraphingControl->TraceLocation;
+    TraceValuePopupTransform->X = (int)l.X + 15;
+    TraceValuePopupTransform->Y = (int)l.Y - 30;
+
+    TraceValue->Text = "x=" + newPoint.X.ToString() + ", y=" + newPoint.Y.ToString();
+}
+
+GraphingCalculatorViewModel ^ GraphingCalculator::ViewModel::get()
 {
     return m_viewModel;
 }
 
-void GraphingCalculator::ViewModel::set(GraphingCalculatorViewModel^ vm)
+void GraphingCalculator::ViewModel::set(GraphingCalculatorViewModel ^ vm)
 {
     if (m_viewModel != vm)
     {
@@ -55,20 +87,132 @@ void GraphingCalculator::ViewModel::set(GraphingCalculatorViewModel^ vm)
     }
 }
 
-void GraphingCalculator::GraphVariablesUpdated(Object^, Object^)
+void CalculatorApp::GraphingCalculator::OnShareClick(Platform::Object ^ sender, Windows::UI::Xaml::RoutedEventArgs ^ e)
+{
+    // Ask the OS to start a share action.
+    DataTransferManager::ShowShareUI();
+}
+
+// When share is invoked (by the user or programmatically) the event handler we registered will be called to populate the data package with the
+// data to be shared. We will request the current graph image from the grapher as a stream that will pass to the share request.
+void GraphingCalculator::OnDataRequested(DataTransferManager ^ sender, DataRequestedEventArgs ^ args)
+{
+    try
+    {
+        // Get our title from the localized resources
+        auto resourceLoader = Windows::ApplicationModel::Resources::ResourceLoader::GetForCurrentView();
+        auto EmptyEquationString = resourceLoader->GetString(L"EmptyEquationString");
+
+        std::wstring rawHtml = L"<p><img src='graph.png'></p>";
+
+        auto equations = ViewModel->Equations;
+        rawHtml += L"<p><table cellpadding=\"10\">";
+        rawHtml += L"<col width=\"20\">";
+        rawHtml += L"<row height=\"20\">";
+        for (unsigned i = 0; i < equations->Size; i++)
+        {
+            auto expression = equations->GetAt(i)->Expression->Data();
+            auto color = equations->GetAt(i)->LineColor;
+
+            if (equations->GetAt(i)->Expression->Length() == 0)
+            {
+                expression = EmptyEquationString->Data();
+            }
+
+            rawHtml += L"<tr>";
+
+            rawHtml += L"<td style=\"background-color:rgb(";
+            rawHtml += color.R.ToString()->Data();
+            rawHtml += L",";
+            rawHtml += color.G.ToString()->Data();
+            rawHtml += L",";
+            rawHtml += color.B.ToString()->Data();
+            rawHtml += L"); \">";
+            rawHtml += L"</td>";
+            rawHtml += L"<td>";
+            rawHtml += expression;
+            rawHtml += L"</td>";
+
+            rawHtml += L"</tr>";
+        }
+        rawHtml += L"</table></p>";
+
+        auto variables = ViewModel->Variables;
+        rawHtml += L"<p><table cellpadding=\"10\">";
+        rawHtml += L"<col width=\"20\">";
+        rawHtml += L"<row height=\"20\">";
+        for (unsigned i = 0; i < variables->Size; i++)
+        {
+            auto name = variables->GetAt(i)->Name;
+            auto value = variables->GetAt(i)->Value;
+
+            if (name->Length() >= 0)
+            {
+                rawHtml += L"<tr>";
+
+                rawHtml += L"<td>";
+                rawHtml += name->Data();
+                rawHtml += L"</td>";
+                rawHtml += L"<td>";
+                rawHtml += std::to_wstring(value);
+                rawHtml += L"</td>";
+
+                rawHtml += L"</tr>";
+            }
+        }
+        rawHtml += L"</table></p>";
+
+        // Shortcut to the request data
+        auto requestData = args->Request->Data;
+
+        DataPackage ^ dataPackage = ref new DataPackage();
+        auto html = HtmlFormatHelper::CreateHtmlFormat(ref new String(rawHtml.c_str()));
+
+        auto titleString = resourceLoader->GetString(L"ShareActionTitle");
+        requestData->Properties->Title = titleString;
+
+        requestData->SetHtmlFormat(html);
+
+        auto bitmapStream = GraphingControl->GetGraphBitmapStream();
+
+        requestData->ResourceMap->Insert(ref new String(L"graph.png"), bitmapStream);
+
+        // Set the thumbnail image (in case the share target can't handle HTML)
+        requestData->Properties->Thumbnail = bitmapStream;
+
+        // And the bitmap (in case the share target can't handle HTML)
+        requestData->SetBitmap(bitmapStream);
+    }
+    catch (Exception ^ ex)
+    {
+        TraceLogger::GetInstance().LogPlatformException(__FUNCTIONW__, ex);
+
+        // Something went wrong, notify the user.
+        auto resourceLoader = Windows::ApplicationModel::Resources::ResourceLoader::GetForCurrentView();
+
+        auto errorTitleString = resourceLoader->GetString(L"ShareActionErrorMessage");
+        auto errorOkString = resourceLoader->GetString(L"ShareActionErrorOk");
+        auto errDialog = ref new Windows::UI::Xaml::Controls::ContentDialog();
+
+        errDialog->Content = errorTitleString;
+        errDialog->CloseButtonText = errorOkString;
+        errDialog->ShowAsync();
+    }
+}
+
+void GraphingCalculator::GraphVariablesUpdated(Object ^, Object ^)
 {
     m_viewModel->UpdateVariables(GraphingControl->Variables);
 }
 
-void GraphingCalculator::OnVariableChanged(Platform::Object^ sender, VariableChangedEventArgs args)
+void GraphingCalculator::OnVariableChanged(Platform::Object ^ sender, VariableChangedEventArgs args)
 {
     GraphingControl->SetVariable(args.variableName, args.newValue);
 }
 
-
-void GraphingCalculator::SubmitTextbox(TextBox^ sender)
+void GraphingCalculator::SubmitTextbox(TextBox ^ sender)
 {
-    auto variableViewModel = static_cast<VariableViewModel^>(sender->DataContext);
+    auto variableViewModel = static_cast<VariableViewModel ^>(sender->DataContext);
 
     if (sender->Name == "ValueTextBox")
     {
@@ -88,21 +232,20 @@ void GraphingCalculator::SubmitTextbox(TextBox^ sender)
     }
 }
 
-void GraphingCalculator::TextBoxLosingFocus(TextBox^ sender, LosingFocusEventArgs^)
+void GraphingCalculator::TextBoxLosingFocus(TextBox ^ sender, LosingFocusEventArgs ^)
 {
     SubmitTextbox(sender);
 }
 
-
-void GraphingCalculator::TextBoxKeyDown(TextBox^ sender, KeyRoutedEventArgs^ e)
+void GraphingCalculator::TextBoxKeyDown(TextBox ^ sender, KeyRoutedEventArgs ^ e)
 {
     if (e->Key == ::VirtualKey::Enter)
     {
         SubmitTextbox(sender);
     }
 }
 
-double GraphingCalculator::validateDouble(String^ value, double defaultValue)
+double GraphingCalculator::validateDouble(String ^ value, double defaultValue)
 {
     try
     {
@@ -114,7 +257,12 @@ double GraphingCalculator::validateDouble(String^ value, double defaultValue)
     }
 }
 
-void GraphingCalculator::TextBoxGotFocus(TextBox^ sender, RoutedEventArgs^ e)
+void GraphingCalculator::TextBoxGotFocus(TextBox ^ sender, RoutedEventArgs ^ e)
 {
     sender->SelectAll();
 }
+
+void GraphingCalculator::OnActiveTracingClick(Platform::Object ^ sender, Windows::UI::Xaml::RoutedEventArgs ^ e)
+{
+    GraphingControl->ActiveTracing = !GraphingControl->ActiveTracing;
+}