diff --git a/src/Calculator/Views/GraphingCalculator/GraphingCalculator.xaml b/src/Calculator/Views/GraphingCalculator/GraphingCalculator.xaml index bd2ff427..24f096f2 100644 --- a/src/Calculator/Views/GraphingCalculator/GraphingCalculator.xaml +++ b/src/Calculator/Views/GraphingCalculator/GraphingCalculator.xaml @@ -25,8 +25,7 @@ Grid.Row="1" Grid.Column="0"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Calculator/Views/GraphingCalculator/GraphingCalculator.xaml.cpp b/src/Calculator/Views/GraphingCalculator/GraphingCalculator.xaml.cpp index 6a8ee7e5..0aeb04f8 100644 --- a/src/Calculator/Views/GraphingCalculator/GraphingCalculator.xaml.cpp +++ b/src/Calculator/Views/GraphingCalculator/GraphingCalculator.xaml.cpp @@ -27,11 +27,6 @@ using namespace Windows::UI::Xaml::Media::Imaging; namespace { constexpr auto sc_ViewModelPropertyName = L"ViewModel"; - - double valFromTB(TextBox^ tb) - { - return stod(tb->Text->Data()); - }; } GraphingCalculator::GraphingCalculator() @@ -59,30 +54,3 @@ void GraphingCalculator::ViewModel::set(GraphingCalculatorViewModel^ vm) RaisePropertyChanged(StringReference(sc_ViewModelPropertyName)); } } - -void GraphingCalculator::ScaleRangeTextBox_KeyDown(Object^ sender, KeyRoutedEventArgs^ e) -{ - if (e->Key == VirtualKey::Enter) - { - double centerX = valFromTB(CenterXTextBox); - double centerY = valFromTB(CenterYTextBox); - double scale = valFromTB(ScaleTextBox); - - Graph->ScaleRange(centerX, centerY, scale); - - e->Handled = true; - } -} - -void GraphingCalculator::MoveRangeByRatioTextBox_KeyDown(Object^ sender, KeyRoutedEventArgs^ e) -{ - if (e->Key == VirtualKey::Enter) - { - double ratioX = valFromTB(RatioXTextBox); - double ratioY = valFromTB(RatioYTextBox); - - Graph->MoveRangeByRatio(ratioX, ratioY); - - e->Handled = true; - } -} diff --git a/src/Calculator/Views/GraphingCalculator/GraphingCalculator.xaml.h b/src/Calculator/Views/GraphingCalculator/GraphingCalculator.xaml.h index 4774c0d1..fc095ae8 100644 --- a/src/Calculator/Views/GraphingCalculator/GraphingCalculator.xaml.h +++ b/src/Calculator/Views/GraphingCalculator/GraphingCalculator.xaml.h @@ -22,9 +22,6 @@ namespace CalculatorApp private: void GraphingCalculator_DataContextChanged(Windows::UI::Xaml::FrameworkElement^ sender, Windows::UI::Xaml::DataContextChangedEventArgs^ args); - void ScaleRangeTextBox_KeyDown(Platform::Object^ sender, Windows::UI::Xaml::Input::KeyRoutedEventArgs^ e); - void MoveRangeByRatioTextBox_KeyDown(Platform::Object^ sender, Windows::UI::Xaml::Input::KeyRoutedEventArgs^ e); - private: CalculatorApp::ViewModel::GraphingCalculatorViewModel^ m_viewModel; };