github/msft-calculator
1
0
Fork 0
mirror of https://github.com/Microsoft/calculator.git synced 2025-08-22 22:23:29 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Apply CR feedback

Browse source
This commit is contained in:
Daniel Belcher 2019-04-19 18:12:16 -07:00
commit e7feac672b
2 changed files with 42 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

66
src/GraphControl/Control/Grapher.cpp
View file

@ -30,9 +30,11 @@ namespace
// Helper function for converting a pointer position to a position that the graphing engine will understand. // Helper function for converting a pointer position to a position that the graphing engine will understand.
// posX/posY are the pointer position elements and width,height are the dimensions of the graph surface. // posX/posY are the pointer position elements and width,height are the dimensions of the graph surface.
// The graphing engine interprets x,y position between the range [-1, 1].
// Translate the pointer position to the [-1, 1] bounds.
__inline pair<double, double> PointerPositionToGraphPosition(double posX, double posY, double width, double height) __inline pair<double, double> PointerPositionToGraphPosition(double posX, double posY, double width, double height)
{ {
return make_pair(2 * posX / width - 1, 1 - 2 * posY / height); return make_pair(( 2 * posX / width - 1 ), ( 1 - 2 * posY / height ));
} }
} }
@ -85,7 +87,7 @@ namespace GraphControl
void Grapher::ScaleRange(double centerX, double centerY, double scale) void Grapher::ScaleRange(double centerX, double centerY, double scale)
{ {
if (m_graph) if (m_graph != nullptr && m_renderMain != nullptr)
{ {
if (auto renderer = m_graph->GetRenderer()) if (auto renderer = m_graph->GetRenderer())
{ {
@ -97,20 +99,6 @@ namespace GraphControl
} }
} }
void Grapher::MoveRangeByRatio(double ratioX, double ratioY)
{
if (m_graph)
{
if (auto renderer = m_graph->GetRenderer())
{
if (SUCCEEDED(renderer->MoveRangeByRatio(ratioX, ratioY)))
{
m_renderMain->RunRenderPass();
}
}
}
}
void Grapher::OnApplyTemplate() void Grapher::OnApplyTemplate()
{ {
auto swapChainPanel = dynamic_cast<SwapChainPanel^>(GetTemplateChild(StringReference(s_templateKey_SwapChainPanel))); auto swapChainPanel = dynamic_cast<SwapChainPanel^>(GetTemplateChild(StringReference(s_templateKey_SwapChainPanel)));
@ -404,34 +392,34 @@ namespace GraphControl
} }
} }
void Grapher::OnPointerEntered(PointerRoutedEventArgs^ e) void Grapher::OnPointerEntered(PointerRoutedEventArgs^ args)
{ {
if (m_renderMain) if (m_renderMain)
{ {
OnPointerMoved(e); OnPointerMoved(args);
m_renderMain->DrawNearestPoint = true; m_renderMain->DrawNearestPoint = true;
e->Handled = true; args->Handled = true;
} }
} }
void Grapher::OnPointerMoved(PointerRoutedEventArgs^ e) void Grapher::OnPointerMoved(PointerRoutedEventArgs^ args)
{ {
if (m_renderMain) if (m_renderMain)
{ {
PointerPoint^ currPoint = e->GetCurrentPoint(/* relativeTo */ this); PointerPoint^ currPoint = args->GetCurrentPoint(/* relativeTo */ this);
m_renderMain->PointerLocation = currPoint->Position; m_renderMain->PointerLocation = currPoint->Position;
e->Handled = true; args->Handled = true;
} }
} }
void Grapher::OnPointerExited(PointerRoutedEventArgs^ e) void Grapher::OnPointerExited(PointerRoutedEventArgs^ args)
{ {
if (m_renderMain) if (m_renderMain)
{ {
m_renderMain->DrawNearestPoint = false; m_renderMain->DrawNearestPoint = false;
e->Handled = true; args->Handled = true;
} }
} }
@ -463,37 +451,39 @@ namespace GraphControl
args->Handled = true; args->Handled = true;
} }
void Grapher::OnPointerPressed(PointerRoutedEventArgs^ e) void Grapher::OnPointerPressed(PointerRoutedEventArgs^ args)
{ {
// Set the pointer capture to the element being interacted with so that only it // Set the pointer capture to the element being interacted with so that only it
// will fire pointer-related events // will fire pointer-related events
CapturePointer(e->Pointer); CapturePointer(args->Pointer);
} }
void Grapher::OnPointerReleased(PointerRoutedEventArgs^ e) void Grapher::OnPointerReleased(PointerRoutedEventArgs^ args)
{ {
// Release the pointer ReleasePointerCapture(args->Pointer);
ReleasePointerCapture(e->Pointer);
} }
void Grapher::OnPointerCanceled(PointerRoutedEventArgs^ e) void Grapher::OnPointerCanceled(PointerRoutedEventArgs^ args)
{ {
ReleasePointerCapture(e->Pointer); ReleasePointerCapture(args->Pointer);
} }
void Grapher::OnManipulationDelta(ManipulationDeltaRoutedEventArgs^ args) void Grapher::OnManipulationDelta(ManipulationDeltaRoutedEventArgs^ args)
{ {
if (m_graph) if (m_renderMain != nullptr && m_graph != nullptr)
{ {
if (auto renderer = m_graph->GetRenderer()) if (auto renderer = m_graph->GetRenderer())
{ {
// Only call for a render pass if we actually scaled or translated.
bool needsRenderPass = false;
const double width = ActualWidth; const double width = ActualWidth;
const double height = ActualHeight; const double height = ActualHeight;
const auto& translation = args->Delta.Translation; const auto& translation = args->Delta.Translation;
double translationX = translation.X; double translationX = translation.X;
double translationY = translation.Y; double translationY = translation.Y;
if (translationX != 0 || translation.Y != 0) if (translationX != 0 || translationY != 0)
{ {
// The graphing engine pans the graph according to a ratio for x and y. // The graphing engine pans the graph according to a ratio for x and y.
// A value of +1 means move a half screen in the positive direction for the given axis. // A value of +1 means move a half screen in the positive direction for the given axis.
@ -505,6 +495,8 @@ namespace GraphControl
{ {
return; return;
} }
needsRenderPass = true;
} }
if (double scale = args->Delta.Scale; scale != 1.0) if (double scale = args->Delta.Scale; scale != 1.0)
@ -513,8 +505,7 @@ namespace GraphControl
// from the ManipulationUpdatedEventArgs. Invert the scale amount for the engine. // from the ManipulationUpdatedEventArgs. Invert the scale amount for the engine.
scale = 1.0 / scale; scale = 1.0 / scale;
// The graphing engine interprets x,y position between the range [-1, 1]. // Convert from PointerPosition to graph position.
// Translate the pointer position to the [-1, 1] bounds.
const auto& pos = args->Position; const auto& pos = args->Position;
const auto[centerX, centerY] = PointerPositionToGraphPosition(pos.X, pos.Y, width, height); const auto[centerX, centerY] = PointerPositionToGraphPosition(pos.X, pos.Y, width, height);
@ -522,10 +513,15 @@ namespace GraphControl
{ {
return; return;
} }
needsRenderPass = true;
} }
if (needsRenderPass)
{
m_renderMain->RunRenderPass(); m_renderMain->RunRenderPass();
} }
} }
} }
}
} }

21
src/GraphControl/Control/Grapher.h
View file

@ -100,21 +100,18 @@ namespace GraphControl
} }
#pragma endregion #pragma endregion
void ScaleRange(double centerX, double centerY, double scale);
void MoveRangeByRatio(double ratioX, double ratioY);
protected: protected:
#pragma region Control Overrides #pragma region Control Overrides
void OnApplyTemplate() override; void OnApplyTemplate() override;
void OnPointerEntered(Windows::UI::Xaml::Input::PointerRoutedEventArgs^ e) override; void OnPointerEntered(Windows::UI::Xaml::Input::PointerRoutedEventArgs^ args) override;
void OnPointerMoved(Windows::UI::Xaml::Input::PointerRoutedEventArgs^ e) override; void OnPointerMoved(Windows::UI::Xaml::Input::PointerRoutedEventArgs^ args) override;
void OnPointerExited(Windows::UI::Xaml::Input::PointerRoutedEventArgs^ e) override; void OnPointerExited(Windows::UI::Xaml::Input::PointerRoutedEventArgs^ args) override;
void OnPointerWheelChanged(Windows::UI::Xaml::Input::PointerRoutedEventArgs^ e) override; void OnPointerWheelChanged(Windows::UI::Xaml::Input::PointerRoutedEventArgs^ args) override;
void OnPointerPressed(Windows::UI::Xaml::Input::PointerRoutedEventArgs^ e) override; void OnPointerPressed(Windows::UI::Xaml::Input::PointerRoutedEventArgs^ args) override;
void OnPointerReleased(Windows::UI::Xaml::Input::PointerRoutedEventArgs^ e) override; void OnPointerReleased(Windows::UI::Xaml::Input::PointerRoutedEventArgs^ args) override;
void OnPointerCanceled(Windows::UI::Xaml::Input::PointerRoutedEventArgs^ e) override; void OnPointerCanceled(Windows::UI::Xaml::Input::PointerRoutedEventArgs^ args) override;
void OnManipulationDelta(Windows::UI::Xaml::Input::ManipulationDeltaRoutedEventArgs^ e) override; void OnManipulationDelta(Windows::UI::Xaml::Input::ManipulationDeltaRoutedEventArgs^ args) override;
#pragma endregion #pragma endregion
private: private:
@ -145,6 +142,8 @@ namespace GraphControl
void OnItemsAdded(int index, int count); void OnItemsAdded(int index, int count);
void OnItemsRemoved(int index, int count); void OnItemsRemoved(int index, int count);
void ScaleRange(double centerX, double centerY, double scale);
private: private:
DX::RenderMain^ m_renderMain = nullptr; DX::RenderMain^ m_renderMain = nullptr;