diff --git a/src/CalcViewModel/GraphingCalculator/EquationViewModel.cpp b/src/CalcViewModel/GraphingCalculator/EquationViewModel.cpp
index 69467667..22296698 100644
--- a/src/CalcViewModel/GraphingCalculator/EquationViewModel.cpp
+++ b/src/CalcViewModel/GraphingCalculator/EquationViewModel.cpp
@@ -2,11 +2,14 @@
#include "EquationViewModel.h"
using namespace Windows::UI;
+using namespace Windows::UI::Xaml;
namespace CalculatorApp::ViewModel
{
EquationViewModel::EquationViewModel()
- : m_LineColor{ Colors::Transparent }
+ : m_LineColor{ Colors::Transparent },
+ m_KeyGraphFeaturesVisibility{ ::Visibility::Collapsed },
+ m_Expression{ "" }
{
}
}
diff --git a/src/CalcViewModel/GraphingCalculator/EquationViewModel.h b/src/CalcViewModel/GraphingCalculator/EquationViewModel.h
index 0920caf2..50d23df1 100644
--- a/src/CalcViewModel/GraphingCalculator/EquationViewModel.h
+++ b/src/CalcViewModel/GraphingCalculator/EquationViewModel.h
@@ -12,5 +12,6 @@ namespace CalculatorApp::ViewModel
OBSERVABLE_OBJECT();
OBSERVABLE_PROPERTY_RW(Platform::String^, Expression);
OBSERVABLE_PROPERTY_RW(Windows::UI::Color, LineColor);
+ OBSERVABLE_PROPERTY_RW(Windows::UI::Xaml::Visibility, KeyGraphFeaturesVisibility);
};
}
diff --git a/src/Calculator/App.xaml b/src/Calculator/App.xaml
index cec835fb..4bce4693 100644
--- a/src/Calculator/App.xaml
+++ b/src/Calculator/App.xaml
@@ -47,6 +47,8 @@
FallbackColor="{ThemeResource SystemChromeMediumColor}"
TintColor="{ThemeResource SystemChromeLowColor}"
TintOpacity="0.7"/>
+
+
0,0,0,0
@@ -83,6 +85,8 @@
FallbackColor="{ThemeResource SystemChromeMediumColor}"
TintColor="{ThemeResource SystemChromeLowColor}"
TintOpacity="0.7"/>
+
+
0,1,0,0
@@ -105,6 +109,8 @@
+
+
@@ -1073,6 +1079,651 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Visible
+
+
+
+
+
+
+ Visible
+
+
+
+
+
+
+ Visible
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Visible
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Calculator/Calculator.vcxproj b/src/Calculator/Calculator.vcxproj
index 6c40aa2f..68448d7a 100644
--- a/src/Calculator/Calculator.vcxproj
+++ b/src/Calculator/Calculator.vcxproj
@@ -255,6 +255,7 @@
+
App.xaml
@@ -397,6 +398,7 @@
+
Create
Create
diff --git a/src/Calculator/Calculator.vcxproj.filters b/src/Calculator/Calculator.vcxproj.filters
index bc22d788..75e0a58f 100644
--- a/src/Calculator/Calculator.vcxproj.filters
+++ b/src/Calculator/Calculator.vcxproj.filters
@@ -314,6 +314,11 @@
Controls
+
+
+
+ Controls
+
@@ -416,6 +421,11 @@
Controls
+
+
+
+ Controls
+
diff --git a/src/Calculator/Controls/EquationTextBox.cpp b/src/Calculator/Controls/EquationTextBox.cpp
new file mode 100644
index 00000000..6416bcc1
--- /dev/null
+++ b/src/Calculator/Controls/EquationTextBox.cpp
@@ -0,0 +1,220 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+#include "pch.h"
+#include "EquationTextBox.h"
+#include "CalcViewModel/GraphingCalculator/EquationViewModel.h"
+
+using namespace std;
+using namespace Platform;
+using namespace CalculatorApp;
+using namespace CalculatorApp::Common;
+using namespace CalculatorApp::Controls;
+using namespace CalculatorApp::ViewModel;
+using namespace Windows::Foundation;
+using namespace Windows::UI::Xaml;
+using namespace Windows::UI::Xaml::Controls;
+using namespace Windows::UI::Xaml::Input;
+using namespace Windows::UI::Xaml::Controls::Primitives;
+using namespace Windows::UI::Text;
+
+DEPENDENCY_PROPERTY_INITIALIZATION(EquationTextBox, EquationColor);
+DEPENDENCY_PROPERTY_INITIALIZATION(EquationTextBox, KeyGraphFeaturesContent);
+DEPENDENCY_PROPERTY_INITIALIZATION(EquationTextBox, ColorChooserFlyout);
+
+void EquationTextBox::OnApplyTemplate()
+{
+ m_equationButton = dynamic_cast(GetTemplateChild("EquationButton"));
+ m_richEditBox = dynamic_cast(GetTemplateChild("EquationTextBox"));
+ m_deleteButton = dynamic_cast(GetTemplateChild("DeleteButton"));
+ m_removeButton = dynamic_cast(GetTemplateChild("RemoveButton"));
+ m_functionButton = dynamic_cast(GetTemplateChild("FunctionButton"));
+ m_colorChooserButton = dynamic_cast(GetTemplateChild("ColorChooserButton"));
+
+ if (m_richEditBox != nullptr)
+ {
+ m_richEditBox->GotFocus += ref new RoutedEventHandler(this, &EquationTextBox::OnRichEditBoxGotFocus);
+ m_richEditBox->LostFocus += ref new RoutedEventHandler(this, &EquationTextBox::OnRichEditBoxLostFocus);
+ m_richEditBox->TextChanged += ref new RoutedEventHandler(this, &EquationTextBox::OnRichEditBoxTextChanged);
+ }
+
+ if (m_equationButton != nullptr)
+ {
+ m_equationButton->Click += ref new RoutedEventHandler(this, &EquationTextBox::OnEquationButtonClicked);
+ }
+
+ if (m_deleteButton != nullptr)
+ {
+ m_deleteButton->Click += ref new RoutedEventHandler(this, &EquationTextBox::OnDeleteButtonClicked);
+ }
+
+ if (m_removeButton != nullptr)
+ {
+ m_removeButton->Click += ref new RoutedEventHandler(this, &EquationTextBox::OnRemoveButtonClicked);
+ }
+
+ if (m_colorChooserButton != nullptr)
+ {
+ m_colorChooserButton->Click += ref new RoutedEventHandler(this, &EquationTextBox::OnColorChooserButtonClicked);
+ }
+
+ if (m_functionButton != nullptr)
+ {
+ m_functionButton->Click += ref new RoutedEventHandler(this, &EquationTextBox::OnFunctionButtonClicked);
+ }
+
+ if (ColorChooserFlyout != nullptr)
+ {
+ ColorChooserFlyout->Opened += ref new EventHandler(this, &EquationTextBox::OnColorFlyoutOpened);
+ ColorChooserFlyout->Closed += ref new EventHandler(this, &EquationTextBox::OnColorFlyoutClosed);
+ }
+}
+
+void EquationTextBox::OnPointerEntered(PointerRoutedEventArgs^ e)
+{
+ m_isPointerOver = true;
+ UpdateCommonVisualState();
+}
+
+void EquationTextBox::OnPointerExited(PointerRoutedEventArgs^ e)
+{
+ m_isPointerOver = false;
+ UpdateCommonVisualState();
+}
+
+void EquationTextBox::OnPointerCanceled(PointerRoutedEventArgs^ e)
+{
+ m_isPointerOver = false;
+ UpdateCommonVisualState();
+}
+
+void EquationTextBox::OnPointerCaptureLost(PointerRoutedEventArgs^ e)
+{
+ m_isPointerOver = false;
+ UpdateCommonVisualState();
+}
+
+void EquationTextBox::OnColorFlyoutOpened(Object^ sender, Object^ e)
+{
+ m_isColorChooserFlyoutOpen = true;
+ UpdateCommonVisualState();
+}
+
+void EquationTextBox::OnColorFlyoutClosed(Object^ sender, Object^ e)
+{
+ m_colorChooserButton->IsChecked = false;
+ m_isColorChooserFlyoutOpen = false;
+ UpdateCommonVisualState();
+}
+
+void EquationTextBox::OnRichEditBoxTextChanged(Object^ sender, RoutedEventArgs^ e)
+{
+ UpdateDeleteButtonVisualState();
+}
+
+void EquationTextBox::OnRichEditBoxGotFocus(Object^ sender, RoutedEventArgs^ e)
+{
+ m_isFocused = true;
+ UpdateCommonVisualState();
+ UpdateDeleteButtonVisualState();
+}
+
+void EquationTextBox::OnRichEditBoxLostFocus(Object^ sender, RoutedEventArgs^ e)
+{
+ m_isFocused = false;
+ UpdateCommonVisualState();
+ UpdateDeleteButtonVisualState();
+}
+
+void EquationTextBox::OnDeleteButtonClicked(Object^ sender, RoutedEventArgs^ e)
+{
+ if (m_richEditBox != nullptr)
+ {
+ m_richEditBox->TextDocument->SetText(::TextSetOptions::None, L"");
+ }
+}
+
+void EquationTextBox::OnEquationButtonClicked(Object^ sender, RoutedEventArgs^ e)
+{
+
+}
+
+void EquationTextBox::OnRemoveButtonClicked(Object^ sender, RoutedEventArgs^ e)
+{
+ RemoveButtonClicked(this, ref new RoutedEventArgs());
+}
+
+void EquationTextBox::OnColorChooserButtonClicked(Object^ sender, RoutedEventArgs^ e)
+{
+ if (ColorChooserFlyout != nullptr && m_richEditBox != nullptr)
+ {
+ ColorChooserFlyout->ShowAt(m_richEditBox);
+ }
+}
+
+void EquationTextBox::OnFunctionButtonClicked(Object^ sender, RoutedEventArgs^ e)
+{
+ auto equationViewModel = static_cast(DataContext);
+ equationViewModel->KeyGraphFeaturesVisibility = (equationViewModel->KeyGraphFeaturesVisibility == ::Visibility::Collapsed) ? ::Visibility::Visible : ::Visibility::Collapsed;
+ UpdateCommonVisualState();
+}
+
+void EquationTextBox::UpdateDeleteButtonVisualState()
+{
+ String^ state;
+
+ if (ShouldDeleteButtonBeVisible())
+ {
+ state = "ButtonVisible";
+ }
+ else
+ {
+ state = "ButtonCollapsed";
+ }
+
+ VisualStateManager::GoToState(this, state, true);
+}
+
+void EquationTextBox::UpdateCommonVisualState()
+{
+ String^ state = "Normal";
+
+ if (m_isFocused)
+ {
+ state = "Focused";
+ }
+ else if (m_isPointerOver || m_isColorChooserFlyoutOpen)
+ {
+ state = "PointerOver";
+ }
+
+ VisualStateManager::GoToState(this, state, true);
+}
+
+
+Platform::String^ EquationTextBox::GetEquationText()
+{
+ String^ text;
+
+ if (m_richEditBox != nullptr)
+ {
+ m_richEditBox->TextDocument->GetText(::TextGetOptions::NoHidden, &text);
+ }
+
+ return text;
+}
+
+void EquationTextBox::SetEquationText(Platform::String^ equationText)
+{
+ if (m_richEditBox != nullptr)
+ {
+ m_richEditBox->TextDocument->SetText(::TextSetOptions::None, equationText);
+ }
+}
+
+
+bool EquationTextBox::ShouldDeleteButtonBeVisible()
+{
+ return (!GetEquationText()->IsEmpty() && m_isFocused);
+
+}
diff --git a/src/Calculator/Controls/EquationTextBox.h b/src/Calculator/Controls/EquationTextBox.h
new file mode 100644
index 00000000..f5e52387
--- /dev/null
+++ b/src/Calculator/Controls/EquationTextBox.h
@@ -0,0 +1,66 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+#pragma once
+
+#include "CalcViewModel/Common/Utils.h"
+
+namespace CalculatorApp
+{
+ namespace Controls
+ {
+ public ref class EquationTextBox sealed : public Windows::UI::Xaml::Controls::Control
+ {
+ public:
+ EquationTextBox()
+ {
+ }
+
+ DEPENDENCY_PROPERTY_OWNER(EquationTextBox);
+ DEPENDENCY_PROPERTY(Windows::UI::Xaml::Media::SolidColorBrush^, EquationColor);
+ DEPENDENCY_PROPERTY(Windows::UI::Xaml::UIElement^, KeyGraphFeaturesContent);
+ DEPENDENCY_PROPERTY(Windows::UI::Xaml::Controls::Flyout^, ColorChooserFlyout);
+
+ event Windows::UI::Xaml::RoutedEventHandler^ RemoveButtonClicked;
+
+ Platform::String^ GetEquationText();
+ void SetEquationText(Platform::String^ equationText);
+
+ protected:
+ virtual void OnApplyTemplate() override;
+ virtual void OnPointerEntered(Windows::UI::Xaml::Input::PointerRoutedEventArgs^ e) override;
+ virtual void OnPointerExited(Windows::UI::Xaml::Input::PointerRoutedEventArgs^ e) override;
+ virtual void OnPointerCanceled(Windows::UI::Xaml::Input::PointerRoutedEventArgs^ e) override;
+ virtual void OnPointerCaptureLost(Windows::UI::Xaml::Input::PointerRoutedEventArgs^ e) override;
+
+ private:
+ void UpdateCommonVisualState();
+ void UpdateDeleteButtonVisualState();
+ bool ShouldDeleteButtonBeVisible();
+
+ void OnRichEditBoxGotFocus(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e);
+ void OnRichEditBoxLostFocus(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e);
+ void OnRichEditBoxTextChanged(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e);
+
+ void OnDeleteButtonClicked(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e);
+ void OnEquationButtonClicked(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e);
+ void OnRemoveButtonClicked(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e);
+ void OnColorChooserButtonClicked(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e);
+ void OnFunctionButtonClicked(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e);
+
+ void OnColorFlyoutOpened(Platform::Object^ sender, Platform::Object^ e);
+ void OnColorFlyoutClosed(Platform::Object^ sender, Platform::Object^ e);
+
+ Windows::UI::Xaml::Controls::RichEditBox^ m_richEditBox;
+ Windows::UI::Xaml::Controls::Button^ m_equationButton;
+ Windows::UI::Xaml::Controls::Button^ m_deleteButton;
+ Windows::UI::Xaml::Controls::Button^ m_removeButton;
+ Windows::UI::Xaml::Controls::Button^ m_functionButton;
+ Windows::UI::Xaml::Controls::Primitives::ToggleButton^ m_colorChooserButton;
+
+ bool m_isFocused;
+ bool m_isPointerOver;
+ bool m_isColorChooserFlyoutOpen;
+ };
+ }
+}
diff --git a/src/Calculator/Resources/en-US/Resources.resw b/src/Calculator/Resources/en-US/Resources.resw
index 9233a5ae..10e8d95e 100644
--- a/src/Calculator/Resources/en-US/Resources.resw
+++ b/src/Calculator/Resources/en-US/Resources.resw
@@ -3407,12 +3407,12 @@
Y
{Locked}This is the value that comes from the VirtualKey enum that represents the button. This value is not localized and must be one value that comes from the Windows::System::VirtualKey enum.
-
- Equations
- The text that shows as the header for the equation input area in Graphing Calculator mode.
-
^
{Locked}This is the character that should trigger this button. Note that it is a character and not a key, so it does not come from the Windows::System::VirtualKey enum.
+
+ Add Equation
+ Placeholder text for the equation input button
+
diff --git a/src/Calculator/Resources/es-ES/Resources.resw b/src/Calculator/Resources/es-ES/Resources.resw
index e2e44b8e..3da471d9 100644
--- a/src/Calculator/Resources/es-ES/Resources.resw
+++ b/src/Calculator/Resources/es-ES/Resources.resw
@@ -1,4 +1,4 @@
-
+
+ Margin="0,0,0,0">
diff --git a/src/GraphControl/Control/EquationCollection.h b/src/GraphControl/Control/EquationCollection.h
index d048eeb0..92a0eed0 100644
--- a/src/GraphControl/Control/EquationCollection.h
+++ b/src/GraphControl/Control/EquationCollection.h
@@ -35,8 +35,6 @@ namespace GraphControl
m_tokens.emplace_back(
value->PropertyChanged += ref new GraphControl::PropertyChangedEventHandler(this, &EquationCollection::OnEquationPropertyChanged)
);
-
- EquationChanged();
}
virtual void Clear()
@@ -49,8 +47,6 @@ namespace GraphControl
m_vector->Clear();
m_tokens.clear();
-
- EquationChanged();
}
virtual GraphControl::Equation^ GetAt(unsigned int index)
@@ -80,8 +76,6 @@ namespace GraphControl
m_tokens.begin() + index,
value->PropertyChanged += ref new PropertyChangedEventHandler(this, &EquationCollection::OnEquationPropertyChanged)
);
-
- EquationChanged();
}
virtual void RemoveAt(unsigned int index)
@@ -90,8 +84,6 @@ namespace GraphControl
m_vector->RemoveAt(index);
m_tokens.erase(m_tokens.begin() + index);
-
- EquationChanged();
}
virtual void RemoveAtEnd()
@@ -104,8 +96,6 @@ namespace GraphControl
}
m_vector->RemoveAtEnd();
-
- EquationChanged();
}
virtual void ReplaceAll(const Platform::Array< GraphControl::Equation^ >^ items)
@@ -124,8 +114,6 @@ namespace GraphControl
}
m_vector->ReplaceAll(items);
-
- EquationChanged();
}
virtual void SetAt(unsigned int index, GraphControl::Equation^ value)
@@ -135,8 +123,6 @@ namespace GraphControl
m_vector->SetAt(index, value);
m_tokens[index] =
value->PropertyChanged += ref new PropertyChangedEventHandler(this, &EquationCollection::OnEquationPropertyChanged);
-
- EquationChanged();
}
#pragma endregion
diff --git a/src/GraphControl/Control/Grapher.cpp b/src/GraphControl/Control/Grapher.cpp
index 9cd33ca5..e7a026fc 100644
--- a/src/GraphControl/Control/Grapher.cpp
+++ b/src/GraphControl/Control/Grapher.cpp
@@ -300,6 +300,17 @@ namespace GraphControl
void Grapher::OnEquationsVectorChanged(IObservableVector^ sender, IVectorChangedEventArgs^ event)
{
+ if (event->CollectionChange == ::CollectionChange::ItemInserted || event->CollectionChange == ::CollectionChange::ItemChanged)
+ {
+ auto eq = sender->GetAt(event->Index);
+
+ // Don't update the graph unless the equations being added/modified is valid.
+ if (eq->Expression->IsEmpty())
+ {
+ return;
+ }
+ }
+
UpdateGraph();
}
@@ -313,9 +324,9 @@ namespace GraphControl
if (m_renderMain && m_graph != nullptr)
{
auto validEqs = GetValidEquations();
+
if (!validEqs.empty())
{
-
wstringstream ss{};
ss << L"show2d(";
@@ -333,7 +344,8 @@ namespace GraphControl
ss << L")";
wstring request = ss.str();
- if (auto graphExpression = m_solver->ParseInput(request))
+ unique_ptr graphExpression;
+ if (graphExpression = m_solver->ParseInput(request))
{
if (m_graph->TryInitialize(graphExpression.get()))
{
@@ -343,6 +355,15 @@ namespace GraphControl
}
}
}
+ else
+ {
+ if (m_graph->TryInitialize())
+ {
+ UpdateGraphOptions(m_graph->GetOptions(), validEqs);
+
+ m_renderMain->Graph = m_graph;
+ }
+ }
}
}
@@ -350,18 +371,21 @@ namespace GraphControl
{
options.SetForceProportional(ForceProportionalAxes);
- vector graphColors;
- graphColors.reserve(validEqs.size());
- for (Equation^ eq : validEqs)
+ if (!validEqs.empty())
{
- auto lineColor = eq->LineColor;
- graphColors.emplace_back(
- lineColor.R,
- lineColor.G,
- lineColor.B,
- lineColor.A);
+ vector graphColors;
+ graphColors.reserve(validEqs.size());
+ for (Equation^ eq : validEqs)
+ {
+ auto lineColor = eq->LineColor;
+ graphColors.emplace_back(
+ lineColor.R,
+ lineColor.G,
+ lineColor.B,
+ lineColor.A);
+ }
+ options.SetGraphColors(graphColors);
}
- options.SetGraphColors(graphColors);
}
vector Grapher::GetValidEquations()
diff --git a/src/GraphingInterfaces/IGraph.h b/src/GraphingInterfaces/IGraph.h
index 9cabaf75..6ff29128 100644
--- a/src/GraphingInterfaces/IGraph.h
+++ b/src/GraphingInterfaces/IGraph.h
@@ -12,7 +12,7 @@ namespace Graphing
{
virtual ~IGraph() = default;
- virtual std::optional>> TryInitialize(const IExpression* graphingExp) = 0;
+ virtual std::optional>> TryInitialize(const IExpression* graphingExp = nullptr) = 0;
virtual IGraphingOptions& GetOptions() = 0;