Merge branch 'master' of https://github.com/OpenCGSS/DereTore

OpenCGSS · Nov 18, 2016 · e5ba643 · e5ba643
2 parents 03164b8 + a5e28bd
commit e5ba643
Show file tree

Hide file tree

Showing 10 changed files with 505 additions and 476 deletions.
diff --git a/DereTore.Applications.StarlightDirector/DereTore.Applications.StarlightDirector.csproj b/DereTore.Applications.StarlightDirector/DereTore.Applications.StarlightDirector.csproj
@@ -158,10 +158,6 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="UI\Controls\Primitives\SimpleScoreNote.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
     <Page Include="UI\Controls\ScoreEditor.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -203,6 +199,8 @@
     <Compile Include="UIHelper.cs" />
     <Compile Include="CommandHelper.cs" />
     <Compile Include="ResourceKeys.cs" />
+    <Compile Include="UI\Controls\Models\DrawingNote.cs" />
+    <Compile Include="UI\Controls\PreviewCanvas.cs" />
     <Compile Include="UI\Controls\Primitives\LineLayer.DependencyProperties.cs" />
     <Compile Include="UI\Controls\Primitives\LineLayer.xaml.cs">
       <DependentUpon>LineLayer.xaml</DependentUpon>
@@ -235,9 +233,6 @@
     <Compile Include="UI\Controls\Primitives\ScoreBar.Placeholder.cs" />
     <Compile Include="UI\Controls\Primitives\ScoreBar.Rendering.cs" />
     <Compile Include="UI\Controls\Primitives\ScoreBar.TextAndLocation.cs" />
-    <Compile Include="UI\Controls\Primitives\SimpleScoreNote.xaml.cs">
-      <DependentUpon>SimpleScoreNote.xaml</DependentUpon>
-    </Compile>
     <Compile Include="UI\Controls\ScoreEditor.DependencyProperties.cs" />
     <Compile Include="UI\Controls\ScoreEditor.Editing.cs" />
     <Compile Include="UI\Controls\ScoreEditor.EventHandlers.cs" />

diff --git a/DereTore.Applications.StarlightDirector/UI/Controls/Models/DrawingNote.cs b/DereTore.Applications.StarlightDirector/UI/Controls/Models/DrawingNote.cs
@@ -0,0 +1,29 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using DereTore.Applications.StarlightDirector.Entities;
+
+namespace DereTore.Applications.StarlightDirector.UI.Controls.Models
+{
+    /// <summary>
+    /// Internal representation of notes for drawing
+    /// </summary>
+    public class DrawingNote
+    {
+        public Note Note { get; set; }
+        public DrawingNote HoldTarget { get; set; }
+        public DrawingNote SyncTarget { get; set; }
+        public DrawingNote GroupTarget { get; set; }
+        public int Timing { get; set; }
+        public bool Done { get; set; }
+        public int Duration { get; set; }
+        public bool IsHoldStart { get; set; }
+        public double LastT { get; set; }
+        public double X { get; set; }
+        public double Y { get; set; }
+        public int DrawType { get; set; }
+        public int HitPosition { get; set; }
+        public bool EffectShown { get; set; }
+    }
+}