Merge pull request '底部时间栏组件更换' (#11) from obsmain into master

Reviewed-on: RDTKEditor/RDTKEditor#11

AIAssistant/Model.cs

@@ -0,0 +1,102 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using CSharpToJsonSchema;
+using Ollama;
+using RhythmBase.RhythmDoctor.Components;
+using System.ComponentModel;
+
+namespace RDTKEditor.AIAssistant
+{
+	public class Assistant
+	{
+		public const string Deepseek = "deepseek-r1:14b";
+		public const string Smollm = "smollm2:135m";
+		public const string Qwen_0_5 = "qwen2.5-coder:0.5b";
+		public const string Qwen_3 = "qwen2.5-coder:7b";
+		public OllamaApiClient Ollama { get; } = new(baseUri: new Uri("http://127.0.0.1:11434/api"));
+		public Chat Chat { get; }
+		public Assistant(string modelName)
+		{
+			Chat = Ollama.Chat(
+				model: modelName,
+				autoCallTools: true
+				);
+			var utils = new RhythmBaseUtils();
+			Chat.AddToolService(utils.AsTools().AsOllamaTools(), utils.AsCalls());
+		}
+		public async IAsyncEnumerable<GenerateCompletionResponse> GetResponse(string modelName, string userInput)
+		{
+			await foreach (var responce in Ollama.Completions.GenerateCompletionAsync(modelName, userInput))
+			{
+				if (responce != null)
+				{
+					yield return responce;
+				}
+			}
+		}
+	}
+	[GenerateJsonSchema]
+	public interface IRhythmBaseUtils
+	{
+		[Description("创建空关卡")]
+		public void CreateEmptyLevel();
+		[Description("创建关卡模板（默认关卡）")]
+		public void CreateLevelTemplate();
+		[Description("打开关卡")]
+		public void OpenLevel([Description("关卡路径")] string filepath);
+		[Description("添加轨道")]
+		public void AddRow(
+			[Description("轨道所在的房间")] RDRoomIndex roomIndex,
+			[Description("轨道名称")] string trackName
+			);
+		[Description("保存关卡")]
+		public void SaveLevel([Description("关卡路径，后缀为 .rdlevel")] string filepath);
+	}
+	public class RhythmBaseUtils : IRhythmBaseUtils
+	{
+		private RDLevel? level;
+		public void CreateEmptyLevel()
+		{
+			Console.BackgroundColor = ConsoleColor.Green;
+			Console.WriteLine($"Called CreateEmptyLevel");
+			Console.ResetColor();
+			level = [];
+		}
+		public void CreateLevelTemplate()
+		{
+			Console.BackgroundColor = ConsoleColor.Green;
+			Console.WriteLine($"Called CreateLevelTemplate");
+			Console.ResetColor();
+			level = RDLevel.Default;
+		}
+		public void OpenLevel(string filepath)
+		{
+			Console.BackgroundColor = ConsoleColor.Green;
+			Console.WriteLine($"Called OpenLevel: {filepath}");
+			Console.ResetColor();
+			level = RDLevel.Read(filepath);
+		}
+		public void AddRow(RDRoomIndex roomIndex, string trackName)
+		{
+			Console.BackgroundColor = ConsoleColor.Green;
+			Console.WriteLine($"Called AddRow: [{roomIndex}] {trackName}");
+			Console.ResetColor();
+			level?.CreateRow(roomIndex, trackName);
+		}
+		public void SaveLevel(string filepath)
+		{
+			Console.BackgroundColor = ConsoleColor.Green;
+			Console.WriteLine($"Called SaveLevel: {filepath}");
+			Console.ResetColor();
+			string dir = Path.GetDirectoryName(filepath) ?? "";
+			if (!string.IsNullOrEmpty(dir))
+			{
+				Directory.CreateDirectory(dir);
+			}
+			level?.Write(filepath);
+		}
+	}
+}

MainWindow.xaml

@@ -5,6 +5,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 		xmlns:skia="clr-namespace:SkiaSharp.Views.WPF;assembly=SkiaSharp.Views.WPF"
         xmlns:local="clr-namespace:RDTKEditor"
+		xmlns:rdtkwpf="clr-namespace:RhythmBase.Control.WPF;assembly=RhythmBase.Control.WPF"
         mc:Ignorable="d"
         Title="RDTK Editor" Height="450" Width="800">
 	<Window.DataContext>
@@ -15,6 +16,7 @@
 			<RowDefinition Height="Auto" />
 			<RowDefinition Height="*" />
 		</Grid.RowDefinitions>
+
 		<Menu Grid.Row="0" VerticalAlignment="Top">
 			<MenuItem Header="文件(_F)">
 				<MenuItem Header="打开文件(_O)" Click="OpenFile" InputGestureText="Ctrl+O"/>
@@ -42,6 +44,41 @@
 			<Border Grid.Column="0" Background="LightBlue">
 				<ScrollViewer VerticalScrollBarVisibility="Auto">
 					<ItemsControl x:Name="ItemProperties" Background="LightGray">
+						<ComboBox Grid.Row="0"   BorderBrush="#FFDF4444" Foreground="#FFC65E5E" RenderTransformOrigin="0.5,0.5">
+							<ComboBox.RenderTransform>
+								<TransformGroup>
+									<ScaleTransform/>
+									<SkewTransform/>
+									<RotateTransform Angle="-0.383"/>
+									<TranslateTransform/>
+								</TransformGroup>
+							</ComboBox.RenderTransform>
+							<ComboBox.Background>
+								<LinearGradientBrush EndPoint="0,1">
+									<GradientStop Color="#FFF0F0F0"/>
+									<GradientStop Color="#FF963333" Offset="1"/>
+								</LinearGradientBrush>
+							</ComboBox.Background>
+							<ComboBoxItem Content="选项 1" />
+							<ComboBoxItem Content="选项 2" />
+						</ComboBox>
+						<Label Grid.Row="1" Content="Label"   RenderTransformOrigin="0.5,0.5">
+							<Label.RenderTransform>
+								<TransformGroup>
+									<ScaleTransform/>
+									<SkewTransform/>
+									<RotateTransform Angle="0.017"/>
+									<TranslateTransform/>
+								</TransformGroup>
+							</Label.RenderTransform>
+						</Label>
+						<ListView Grid.Row="3" d:ItemsSource="{d:SampleData ItemCount=3}">
+							<ListView.View>
+								<GridView>
+									<GridViewColumn/>
+								</GridView>
+							</ListView.View>
+						</ListView>
 					</ItemsControl>
 				</ScrollViewer>
 			</Border>
@@ -54,13 +91,26 @@
 			<GridSplitter Grid.Column="3" Width="5" Background="Gray" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" />
 			<Border Grid.Column="4" Background="LightBlue" >
 				<ScrollViewer VerticalScrollBarVisibility="Auto">
-					<Grid x:Name="timelineCanvas3" Background="LightGray" />
+					<Grid x:Name="timelineCanvas3" Background="LightGray" >
+						<Grid.RowDefinitions>
+							<RowDefinition Height="*" />
+							<RowDefinition Height="20" />
+						</Grid.RowDefinitions>
+
+						<TextBox Grid.Row="0" x:Name="AIAssistantText"  TextWrapping="Wrap" >
+							AI问答
+						</TextBox>
+						<Button Grid.Row="1" x:Name="AIButton"  VerticalAlignment="Bottom"  Click="AIAssistantButton_Click"  IsEnabled="{Binding IsButtonEnabled}" >
+							点击按钮开发
+						</Button>
+					</Grid>
 				</ScrollViewer>
 			</Border>
 			<GridSplitter Grid.Row="1" Grid.ColumnSpan="5" Height="5" Background="Gray" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" />
 			<Border Grid.ColumnSpan="5" Grid.Row="2" Background="LightSalmon">
-				<ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto">
+				<ScrollViewer x:Name="timelineScrollviewer" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto" >
-					<Canvas x:Name="timelineCanvas" Background="LightGray" />
+					<rdtkwpf:RDTimeLinePanel x:Name="timeLine">
+					</rdtkwpf:RDTimeLinePanel>
 				</ScrollViewer>
 			</Border>
 		</Grid>

MainWindow.xaml.cs

@@ -1,12 +1,18 @@
 using Microsoft.Win32;
+using Ollama;
+using RDTKEditor.AIAssistant;
 using RDTKEditor.Models;
-using RhythmBase.Events;
+using RhythmBase.RhythmDoctor.Components;
+using RhythmBase.RhythmDoctor.Events;
 using SkiaSharp;
+using SkiaSharp.Views.Desktop;
 using System.ComponentModel;
 using System.Reflection;
 using System.Windows;
 using System.Windows.Controls;
+using System.Windows.Media;
 using System.Windows.Shapes;
+using RhythmBase.Control.WPF;
 
 namespace RDTKEditor
 {
@@ -15,10 +21,15 @@ namespace RDTKEditor
 	/// </summary>
 	public partial class MainWindow : Window
 	{
+		private readonly Assistant Assistant = new(Assistant.Qwen_3);
+		private SKSizeI _vsScale = new(1600, 900);
 		private readonly RDTKView viewModel = new();
+		private readonly List<BaseEvent> _selectedEvents = [];
+		internal readonly Dictionary<Type, StackPanel[]> _eventPanel = [];
 		public MainWindow()
 		{
 			InitializeComponent();
+			timeLine.Level = RDLevel.Default;
 		}
 		private void OpenFile(object sender, RoutedEventArgs e)
 		{
@@ -50,35 +61,18 @@ namespace RDTKEditor
 		}
 		private void About(object sender, RoutedEventArgs e)
 		{
-			OnUpdateEventProperties(GetProperties(new MoveRow()));
+			if (_selectedEvents.Count == 0)
-
+			{
-			//OnUpdateEventProperties([
+				MessageBox.Show("请先选择一个事件。", "提示", MessageBoxButton.OK, MessageBoxImage.Information);
-			//	new(){
+				return;
-			//		Verifier = new RDTKPropertyVerifierDefault(),
+			}
-			//		Name = "Name",
+			if (_selectedEvents.Count == 1)
-			//		Value = "RDTK Editor",
+			{
-			//		Type = RDPropertyType.String,
+				OnUpdateEventProperties(_selectedEvents[0], GetProperties(_selectedEvents[0]));
-			//	},
+			}
-			//	new(){
+			else
-			//		Verifier = new RDTKPropertyVerifierDefault(),
+			{
-			//		Name = "Version",
+			}
-			//		Value = "1.0.0",
-			//		Type = RDPropertyType.String,
-			//	},
-			//	new(){
-			//		Verifier = new RDTKPropertyVerifierEnum(typeof(EventType)),
-			//		Name = "Description",
-			//		Value = "RDTK Editor 是一个简单的节奏医生关卡编辑器。",
-			//		Type = RDPropertyType.Enum,
-			//	},
-			//	new(){
-			//		Verifier = new RDTKPropertyVerifierBool(),
-			//		Name = "测试值",
-			//		Value = "true",
-			//		Type = RDPropertyType.Bool,
-			//	}
-			//	]);
-			//MessageBox.Show("RDTK Editor 是一个简单的节奏医生关卡编辑器。", "关于 RDTK Editor");
 		}
 		private RDTKProperty[] GetProperties(BaseEvent e)
 		{
@@ -121,6 +115,30 @@ namespace RDTKEditor
 						Value = property.GetValue(obj)?.ToString() ?? "null",
 						Type = RDPropertyType.String,
 					};
+				case "Int32":
+					return new()
+					{
+						Verifier = new RDTKPropertyVerifierDefault(),
+						Name = property.Name,
+						Value = property.GetValue(obj)?.ToString() ?? "null",
+						Type = RDPropertyType.Integer,
+					};
+				case "Single":
+					return new()
+					{
+						Verifier = new RDTKPropertyVerifierDefault(),
+						Name = property.Name,
+						Value = property.GetValue(obj)?.ToString() ?? "null",
+						Type = RDPropertyType.Float,
+					};
+				case "RDColor":
+					return new()
+					{
+						Verifier = new RDTKPropertyVerifierDefault(),
+						Name = property.Name,
+						Value = property.GetValue(obj)?.ToString() ?? "null",
+						Type = RDPropertyType.Color,
+					};
 			}
 			return new()
 			{
@@ -130,16 +148,22 @@ namespace RDTKEditor
 				Type = RDPropertyType.String,
 			};
 		}
-		internal void OnUpdateEventProperties(RDTKProperty[] properties)
+		private readonly List<BaseEvent> selectedEvents = new();
+		internal void OnUpdateEventProperties(BaseEvent baseEvent, RDTKProperty[] properties)
 		{
 			ItemProperties.Items.Clear();
-			foreach (var property in properties)
+			StackPanel[] panel = new StackPanel[properties.Length];
+			if (_eventPanel.ContainsKey(baseEvent.GetType()))
 			{
-				StackPanel stackPanel;
+
-				switch (property.Type)
+			}
+			else
+			{
+				foreach (var property in properties)
 				{
-					case RDPropertyType.Bool:
+					StackPanel stackPanel = property.Type switch
-						stackPanel = new()
+					{
+						RDPropertyType.Bool => new()
 						{
 							Orientation = Orientation.Horizontal,
 							FlowDirection = FlowDirection.LeftToRight,
@@ -148,10 +172,8 @@ namespace RDTKEditor
 								new Label(){Content = property.Name},
 								new CheckBox() { IsChecked = bool.Parse( property.Value), }
 							},
-						};
+						},
-						break;
+						RDPropertyType.Enum => new()
-					case RDPropertyType.Enum:
-						stackPanel = new()
 						{
 							AllowDrop = true,
 							Orientation = Orientation.Horizontal,
@@ -165,10 +187,8 @@ namespace RDTKEditor
 									SelectedValue = property.Value,
 								}
 							},
-						};
+						},
-						break;
+						RDPropertyType.String => new()
-					case RDPropertyType.String:
-						stackPanel = new()
 						{
 							AllowDrop = true,
 							Orientation = Orientation.Horizontal,
@@ -178,10 +198,41 @@ namespace RDTKEditor
 								new Label(){Content = property.Name},
 								new TextBox() { Text = property.Value, }
 							},
-						};
+						},
-						break;
+						RDPropertyType.Integer => new()
-					default:
+						{
-						stackPanel = new()
+							AllowDrop = true,
+							Orientation = Orientation.Horizontal,
+							FlowDirection = FlowDirection.LeftToRight,
+							Children =
+							{
+								new Label(){Content = property.Name},
+								new TextBox() { Text = property.Value, }
+							},
+						},
+						RDPropertyType.Float => new()
+						{
+							AllowDrop = true,
+							Orientation = Orientation.Horizontal,
+							FlowDirection = FlowDirection.LeftToRight,
+							Children =
+							{
+								new Label(){Content = property.Name},
+								new TextBox() { Text = property.Value, }
+							},
+						},
+						RDPropertyType.Color => new()
+						{
+							AllowDrop = true,
+							Orientation = Orientation.Horizontal,
+							FlowDirection = FlowDirection.LeftToRight,
+							Children =
+							{
+								new Label(){Content = property.Name},
+								new TextBox() { Text = property.Value, }
+							},
+						},
+						_ => new()
 						{
 							Orientation = Orientation.Horizontal,
 							Children =
@@ -189,57 +240,84 @@ namespace RDTKEditor
 								new Label(){Content = property.Name},
 								new Label(){Content = property.Value}
 							}
-						};
+						},
-						break;
+					};
-				}
+					foreach (var child in stackPanel.Children)
-				foreach (var child in stackPanel.Children)
-				{
-					switch (child)
 					{
-						case CheckBox checkBox:
+						switch (child)
-							checkBox.Checked += (sender, e) =>
+						{
-							{
+							case CheckBox checkBox:
-								property.OnChanged("true");
+								checkBox.Checked += (sender, e) =>
-							};
+								{
-							checkBox.Unchecked += (sender, e) =>
+									property.OnChanged("true");
-							{
+								};
-								property.OnChanged("false");
+								checkBox.Unchecked += (sender, e) =>
-							};
+								{
-							break;
+									property.OnChanged("false");
-						case TextBox textBox:
+								};
-							textBox.TextChanged += (sender, e) =>
+								break;
-							{
+							case TextBox textBox:
-								property.OnChanged(textBox.Text);
+								textBox.TextChanged += (sender, e) =>
-							};
+								{
-							break;
+									property.OnChanged(textBox.Text);
-						case ComboBox comboBox:
+								};
-							comboBox.SelectionChanged += (sender, e) =>
+								break;
-							{
+							case ComboBox comboBox:
-								property.OnChanged(comboBox.SelectedValue);
+								comboBox.SelectionChanged += (sender, e) =>
-							};
+								{
-							break;
+									property.OnChanged(comboBox.SelectedValue);
-						default:
+								};
-							break;
+								break;
+							default:
+								break;
+						}
 					}
+					ItemProperties.Items.Add(stackPanel);
+					property.PropertyChanged += (e, s) => UpdateEvent();
 				}
-				ItemProperties.Items.Add(stackPanel);
+
-				property.PropertyChanged += (e, s) => UpdateEvent();
 			}
 		}
 		private void UpdateEvent()
 		{
-			MessageBox.Show("Update Event");
+			if (_selectedEvents.Count == 0)
+				return;
+			else if (_selectedEvents.Count == 1)
+			{
+				var e = _selectedEvents[0];
+				foreach (var property in ItemProperties.Items)
+				{
+					if (property is StackPanel stackPanel)
+					{
+						foreach (var child in stackPanel.Children)
+						{
+							switch (child)
+							{
+								case CheckBox checkBox:
+									e.GetType().GetProperty(stackPanel.Name)?.SetValue(e, checkBox.IsChecked);
+									break;
+								case TextBox textBox:
+									e.GetType().GetProperty(stackPanel.Name)?.SetValue(e, textBox.Text);
+									break;
+								case ComboBox comboBox:
+									e.GetType().GetProperty(stackPanel.Name)?.SetValue(e, comboBox.SelectedValue);
+									break;
+								default:
+									break;
+							}
+						}
+					}
+				}
+			}
+			else
+			{
+			}
+
 		}
 		private void UpdateTimeLine()
 		{
-			Rectangle rectangle = new()
-			{
-				Width = 100,
-				Height = 100,
-			};
-			timelineCanvas.Children.Add(rectangle);
 		}
-		private void mainUI_PaintSurface(object sender, SkiaSharp.Views.Desktop.SKPaintSurfaceEventArgs e)
+		/*private void mainUI_PaintSurface(object sender, SkiaSharp.Views.Desktop.SKPaintSurfaceEventArgs e)
 		{
 			var sfc = e.Surface;
 			var cvs = sfc.Canvas;
@@ -248,10 +326,69 @@ namespace RDTKEditor
 			{
 				Color = SKColors.Red,
 			});
+		}*/
+		private void mainUI_PaintSurface(object sender, SKPaintSurfaceEventArgs e)
+		{
+			var sfc = e.Surface;
+			var cvs = sfc.Canvas;
+			var info = e.Info;
+			cvs.Clear(SKColors.Black);
+			SKPoint scale = new((float)info.Width / _vsScale.Width, (float)info.Height / _vsScale.Height);
+			cvs.Save();
+			cvs.Scale(scale);
+			Draw(cvs);
+			cvs.Restore();
+		}
+		private void Draw(SKCanvas canvas)
+		{
+			// 以 1600x900 为基准绘制
+
+			canvas.DrawLine(0, 0, _vsScale.Width, _vsScale.Height, new SKPaint
+			{
+				Color = SKColors.Red,
+				StrokeWidth = 3,
+				IsStroke = true,
+			});
+			canvas.DrawLine(0, _vsScale.Height, _vsScale.Width, 0, new SKPaint
+			{
+				Color = SKColors.White,
+				StrokeWidth = 3,
+				IsStroke = true,
+			});
+		}
+		private void CheckBox_Checked(object sender, RoutedEventArgs e)
+		{
+			MessageBox.Show("已确认");
+		}
+
+		private async void AIAssistantButton_Click(object sender, RoutedEventArgs e)
+		{
+			string input = AIAssistantText.Text;
+			if (string.IsNullOrEmpty(input))
+				return;
+			Message responce = await Assistant.Chat.SendAsync(input);
+			AIAssistantText.Text = responce.Content;
 		}
 	}
+
+
 	public class MainViewModel : INotifyPropertyChanged
 	{
-		public event PropertyChangedEventHandler PropertyChanged;
+		public event PropertyChangedEventHandler? PropertyChanged;
+		private bool _isButtonEnabled = true;
+		public bool IsButtonEnabled
+		{
+			get => _isButtonEnabled;
+			set
+			{
+				_isButtonEnabled = value;
+
+			}
+		}
+
 	}
+
+
+
+
 }

Models/RDTKView.cs

@@ -1,4 +1,4 @@
-using RhythmBase.Components;
+using RhythmBase.RhythmDoctor.Components;
 using System.Diagnostics.CodeAnalysis;
 
 namespace RDTKEditor.Models
@@ -91,7 +91,7 @@ namespace RDTKEditor.Models
 	internal class RDTKView
 	{
 
-		private RDLevel? Level { get; set; }
+		public RDLevel? Level { get; set; }
 		public RDTKView()
 		{
 		}

RDTKEditor.csproj

@@ -9,8 +9,24 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="RhythmBase" Version="1.1.0-beta" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="SkiaSharp.Views.WPF" Version="3.118.0-preview.2.3" />
+    <PackageReference Include="Ollama" Version="1.15.1-dev.13" />
+    <PackageReference Include="RhythmBase" Version="1.2.0-beta1" />
+    <PackageReference Include="SkiaSharp.Views.WPF" Version="3.119.0-preview.1.2" />
+    <PackageReference Include="sly" Version="3.7.3" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Reference Include="RhythmBase.Control.Core">
+      <HintPath>..\RhythmBase.Control.WPF\bin\Debug\net8.0-windows\RhythmBase.Control.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="RhythmBase.Control.WPF">
+      <HintPath>..\RhythmBase.Control.WPF\bin\Debug\net8.0-windows\RhythmBase.Control.WPF.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+
+  <ItemGroup>
+    <Using Include="System.IO" />
   </ItemGroup>
 
 </Project>