diff --git a/SmartAquaViewer/Controls/SegmentedControl.xaml b/SmartAquaViewer/Controls/SegmentedControl.xaml new file mode 100644 index 0000000..2a04da7 --- /dev/null +++ b/SmartAquaViewer/Controls/SegmentedControl.xaml @@ -0,0 +1,31 @@ + + + + + + + + + + + diff --git a/SmartAquaViewer/Controls/SegmentedControl.xaml.cs b/SmartAquaViewer/Controls/SegmentedControl.xaml.cs new file mode 100644 index 0000000..6293c78 --- /dev/null +++ b/SmartAquaViewer/Controls/SegmentedControl.xaml.cs @@ -0,0 +1,48 @@ +using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Imaging; +using System.Windows.Navigation; +using System.Windows.Shapes; + +namespace SmartAquaViewer.Controls +{ + /// + /// SegmentedControl.xaml에 대한 상호 작용 논리 + /// + public partial class SegmentedControl : UserControl + { + public SegmentedControl() + { + InitializeComponent(); + } + + public string SelectedValue + { + get { return (string)GetValue(SelectedValueProperty); } + set { SetValue(SelectedValueProperty, value); } + } + + public static readonly DependencyProperty SelectedValueProperty = + DependencyProperty.Register(nameof(SelectedValue), typeof(string), typeof(SegmentedControl), + new PropertyMetadata(null)); + + private void RadioButton_Checked(object sender, RoutedEventArgs e) + { + if (sender is RadioButton rb && rb.Tag != null) + { + SelectedValue = rb.Tag.ToString(); + Debug.WriteLine($"SelectedValue changed to: {SelectedValue}"); + } + } + } +} diff --git a/SmartAquaViewer/MainWindow.xaml b/SmartAquaViewer/MainWindow.xaml index 2fc1595..fd81c7f 100644 --- a/SmartAquaViewer/MainWindow.xaml +++ b/SmartAquaViewer/MainWindow.xaml @@ -36,25 +36,25 @@ + @@ -48,7 +49,7 @@ Source="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(helper:RadioButtonHelper.UnPressedImage)}"/> diff --git a/SmartAquaViewer/Resources/Images/SegmentedControl/select_btn_1.png b/SmartAquaViewer/Resources/Images/SegmentedControl/select_btn_1.png new file mode 100644 index 0000000..81bc737 Binary files /dev/null and b/SmartAquaViewer/Resources/Images/SegmentedControl/select_btn_1.png differ diff --git a/SmartAquaViewer/Resources/Images/SegmentedControl/select_btn_1_press.png b/SmartAquaViewer/Resources/Images/SegmentedControl/select_btn_1_press.png new file mode 100644 index 0000000..2453b7f Binary files /dev/null and b/SmartAquaViewer/Resources/Images/SegmentedControl/select_btn_1_press.png differ diff --git a/SmartAquaViewer/Resources/Images/SegmentedControl/select_btn_2.png b/SmartAquaViewer/Resources/Images/SegmentedControl/select_btn_2.png new file mode 100644 index 0000000..27cbfce Binary files /dev/null and b/SmartAquaViewer/Resources/Images/SegmentedControl/select_btn_2.png differ diff --git a/SmartAquaViewer/Resources/Images/SegmentedControl/select_btn_2_press.png b/SmartAquaViewer/Resources/Images/SegmentedControl/select_btn_2_press.png new file mode 100644 index 0000000..683b679 Binary files /dev/null and b/SmartAquaViewer/Resources/Images/SegmentedControl/select_btn_2_press.png differ diff --git a/SmartAquaViewer/Resources/Images/SegmentedControl/select_btn_3.png b/SmartAquaViewer/Resources/Images/SegmentedControl/select_btn_3.png new file mode 100644 index 0000000..f05fd39 Binary files /dev/null and b/SmartAquaViewer/Resources/Images/SegmentedControl/select_btn_3.png differ diff --git a/SmartAquaViewer/Resources/Images/SegmentedControl/select_btn_3_press.png b/SmartAquaViewer/Resources/Images/SegmentedControl/select_btn_3_press.png new file mode 100644 index 0000000..fa3ceff Binary files /dev/null and b/SmartAquaViewer/Resources/Images/SegmentedControl/select_btn_3_press.png differ diff --git a/SmartAquaViewer/Resources/Images/SegmentedControl/select_btn_4.png b/SmartAquaViewer/Resources/Images/SegmentedControl/select_btn_4.png new file mode 100644 index 0000000..2c95a9b Binary files /dev/null and b/SmartAquaViewer/Resources/Images/SegmentedControl/select_btn_4.png differ diff --git a/SmartAquaViewer/Resources/Images/SegmentedControl/select_btn_4_press.png b/SmartAquaViewer/Resources/Images/SegmentedControl/select_btn_4_press.png new file mode 100644 index 0000000..531e557 Binary files /dev/null and b/SmartAquaViewer/Resources/Images/SegmentedControl/select_btn_4_press.png differ diff --git a/SmartAquaViewer/SmartAquaViewer.csproj b/SmartAquaViewer/SmartAquaViewer.csproj index 27a713d..3c0030f 100644 --- a/SmartAquaViewer/SmartAquaViewer.csproj +++ b/SmartAquaViewer/SmartAquaViewer.csproj @@ -22,6 +22,14 @@ + + + + + + + + @@ -30,6 +38,12 @@ + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + @@ -46,6 +60,14 @@ + + + + + + + + PreserveNewest diff --git a/SmartAquaViewer/View/MonitoringView.xaml b/SmartAquaViewer/View/MonitoringView.xaml index 243698f..e706bbb 100644 --- a/SmartAquaViewer/View/MonitoringView.xaml +++ b/SmartAquaViewer/View/MonitoringView.xaml @@ -4,6 +4,7 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:local="clr-namespace:SmartAquaViewer.View" + xmlns:control="clr-namespace:SmartAquaViewer.Controls" xmlns:helper="clr-namespace:SmartAquaViewer.Helper" xmlns:md="http://materialdesigninxaml.net/winfx/xaml/themes" mc:Ignorable="d" @@ -19,6 +20,8 @@ +