From a221d34fb5c7a184aa45c789abd5b9d3f0f3e920 Mon Sep 17 00:00:00 2001
From: syneffort <syneffort@gmail.com>
Date: Mon, 20 May 2024 17:06:16 +0900
Subject: [PATCH] by datapoint

---
 .../GettingStarted/GettingStarted.csproj      |  1 +
 OxyPlotExample/GettingStarted/MainWindow.xaml | 10 +++++-
 .../ViewModels/MainViewModel2.cs              | 34 +++++++++++++++++++
 .../GettingStarted/Views/MainView.xaml        | 20 -----------
 .../GettingStarted/Views/MainViewControl.xaml | 19 +++++++++++
 ...inView.xaml.cs => MainViewControl.xaml.cs} |  6 ++--
 .../Views/MainViewControl2.xaml               | 23 +++++++++++++
 .../Views/MainViewControl2.xaml.cs            | 28 +++++++++++++++
 8 files changed, 117 insertions(+), 24 deletions(-)
 create mode 100644 OxyPlotExample/GettingStarted/ViewModels/MainViewModel2.cs
 delete mode 100644 OxyPlotExample/GettingStarted/Views/MainView.xaml
 create mode 100644 OxyPlotExample/GettingStarted/Views/MainViewControl.xaml
 rename OxyPlotExample/GettingStarted/Views/{MainView.xaml.cs => MainViewControl.xaml.cs} (78%)
 create mode 100644 OxyPlotExample/GettingStarted/Views/MainViewControl2.xaml
 create mode 100644 OxyPlotExample/GettingStarted/Views/MainViewControl2.xaml.cs

diff --git a/OxyPlotExample/GettingStarted/GettingStarted.csproj b/OxyPlotExample/GettingStarted/GettingStarted.csproj
index 80096b0..9e580d5 100644
--- a/OxyPlotExample/GettingStarted/GettingStarted.csproj
+++ b/OxyPlotExample/GettingStarted/GettingStarted.csproj
@@ -10,6 +10,7 @@
 
   <ItemGroup>
     <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
+    <PackageReference Include="OxyPlot.Contrib.Wpf" Version="2.1.2" />
     <PackageReference Include="OxyPlot.Wpf" Version="2.1.2" />
   </ItemGroup>
 
diff --git a/OxyPlotExample/GettingStarted/MainWindow.xaml b/OxyPlotExample/GettingStarted/MainWindow.xaml
index f4d94a1..7fb12a8 100644
--- a/OxyPlotExample/GettingStarted/MainWindow.xaml
+++ b/OxyPlotExample/GettingStarted/MainWindow.xaml
@@ -9,5 +9,13 @@
         Width="800"
         Height="450"
         mc:Ignorable="d">
-    <views:MainView />
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="*"/>
+            <RowDefinition Height="*"/>
+        </Grid.RowDefinitions>
+
+        <views:MainViewControl Grid.Row="0"/>
+        <views:MainViewControl2 Grid.Row="1"/>
+    </Grid>
 </Window>
diff --git a/OxyPlotExample/GettingStarted/ViewModels/MainViewModel2.cs b/OxyPlotExample/GettingStarted/ViewModels/MainViewModel2.cs
new file mode 100644
index 0000000..436411f
--- /dev/null
+++ b/OxyPlotExample/GettingStarted/ViewModels/MainViewModel2.cs
@@ -0,0 +1,34 @@
+using CommunityToolkit.Mvvm.ComponentModel;
+using OxyPlot;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace GettingStarted.ViewModels
+{
+    internal partial class MainViewModel2 : ObservableObject
+    {
+        [ObservableProperty]
+        private string _title;
+
+        [ObservableProperty]
+        private IList<DataPoint> _points;
+
+        public MainViewModel2()
+        {
+            Title = "Example 2";
+            Points = new List<DataPoint>()
+            {
+                new DataPoint(0, 4),
+                new DataPoint(10, 13),
+                new DataPoint(20, 15),
+                new DataPoint(30, 16),
+                new DataPoint(40, 12),
+                new DataPoint(50, 12)
+
+            };
+        }
+    }
+}
diff --git a/OxyPlotExample/GettingStarted/Views/MainView.xaml b/OxyPlotExample/GettingStarted/Views/MainView.xaml
deleted file mode 100644
index c05b2ae..0000000
--- a/OxyPlotExample/GettingStarted/Views/MainView.xaml
+++ /dev/null
@@ -1,20 +0,0 @@
-<Page x:Class="GettingStarted.Views.MainView"
-      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-      xmlns:local="clr-namespace:GettingStarted.Views"
-      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-      xmlns:oxy="http://oxyplot.org/wpf"
-      xmlns:viewModels="clr-namespace:GettingStarted.ViewModels"
-      Title="MainView"
-      d:DesignHeight="450"
-      d:DesignWidth="800"
-      mc:Ignorable="d">
-    <Page.DataContext>
-        <viewModels:MainViewModel />
-    </Page.DataContext>
-
-    <Grid>
-        <oxy:PlotView Model="{Binding MyModel}" />
-    </Grid>
-</Page>
diff --git a/OxyPlotExample/GettingStarted/Views/MainViewControl.xaml b/OxyPlotExample/GettingStarted/Views/MainViewControl.xaml
new file mode 100644
index 0000000..7af058e
--- /dev/null
+++ b/OxyPlotExample/GettingStarted/Views/MainViewControl.xaml
@@ -0,0 +1,19 @@
+<UserControl x:Class="GettingStarted.Views.MainViewControl"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:local="clr-namespace:GettingStarted.Views"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:oxy="http://oxyplot.org/wpf"
+             xmlns:viewModels="clr-namespace:GettingStarted.ViewModels"
+             d:DesignHeight="450"
+             d:DesignWidth="800"
+             mc:Ignorable="d">
+    <UserControl.DataContext>
+        <viewModels:MainViewModel />
+    </UserControl.DataContext>
+
+    <Grid>
+        <oxy:PlotView Model="{Binding MyModel}" />
+    </Grid>
+</UserControl>
diff --git a/OxyPlotExample/GettingStarted/Views/MainView.xaml.cs b/OxyPlotExample/GettingStarted/Views/MainViewControl.xaml.cs
similarity index 78%
rename from OxyPlotExample/GettingStarted/Views/MainView.xaml.cs
rename to OxyPlotExample/GettingStarted/Views/MainViewControl.xaml.cs
index 32d8205..0aaf00b 100644
--- a/OxyPlotExample/GettingStarted/Views/MainView.xaml.cs
+++ b/OxyPlotExample/GettingStarted/Views/MainViewControl.xaml.cs
@@ -16,11 +16,11 @@ using System.Windows.Shapes;
 namespace GettingStarted.Views
 {
     /// <summary>
-    /// MainView.xaml에 대한 상호 작용 논리
+    /// MainViewControl.xaml에 대한 상호 작용 논리
     /// </summary>
-    public partial class MainView : Page
+    public partial class MainViewControl : UserControl
     {
-        public MainView()
+        public MainViewControl()
         {
             InitializeComponent();
         }
diff --git a/OxyPlotExample/GettingStarted/Views/MainViewControl2.xaml b/OxyPlotExample/GettingStarted/Views/MainViewControl2.xaml
new file mode 100644
index 0000000..1f23179
--- /dev/null
+++ b/OxyPlotExample/GettingStarted/Views/MainViewControl2.xaml
@@ -0,0 +1,23 @@
+<UserControl x:Class="GettingStarted.Views.MainViewControl2"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:local="clr-namespace:GettingStarted.Views"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:oxyControls="http://oxyplot.org/wpf/contrib"
+             xmlns:viewModels="clr-namespace:GettingStarted.ViewModels"
+             d:DesignHeight="450"
+             d:DesignWidth="800"
+             mc:Ignorable="d">
+    <UserControl.DataContext>
+        <viewModels:MainViewModel2 />
+    </UserControl.DataContext>
+
+    <Grid>
+        <oxyControls:Plot Title="{Binding Title}">
+            <oxyControls:Plot.Series>
+                <oxyControls:LineSeries ItemsSource="{Binding Points}" />
+            </oxyControls:Plot.Series>
+        </oxyControls:Plot>
+    </Grid>
+</UserControl>
diff --git a/OxyPlotExample/GettingStarted/Views/MainViewControl2.xaml.cs b/OxyPlotExample/GettingStarted/Views/MainViewControl2.xaml.cs
new file mode 100644
index 0000000..fc845e2
--- /dev/null
+++ b/OxyPlotExample/GettingStarted/Views/MainViewControl2.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+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 GettingStarted.Views
+{
+    /// <summary>
+    /// MainViewControl2.xaml에 대한 상호 작용 논리
+    /// </summary>
+    public partial class MainViewControl2 : UserControl
+    {
+        public MainViewControl2()
+        {
+            InitializeComponent();
+        }
+    }
+}