Merge pull request #51 from Polyrhythm/master

Persist track names
vvvv · Apr 18, 2017 · cbe8f58 · cbe8f58
2 parents c9e35a5 + 9c5ec93
commit cbe8f58
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 6 deletions.
diff --git a/Source/Model/BaseClasses.cs b/Source/Model/BaseClasses.cs
@@ -91,7 +91,7 @@ public abstract class TLTrackBase : TLModelBase
     	{
     		get;
     	}
-    	
+
         public EditableProperty<int> Order
         {
             get;

diff --git a/Source/Model/StringTrack.cs b/Source/Model/StringTrack.cs
@@ -35,9 +35,19 @@ public TLStringTrack(string name)
 			Keyframes = new EditableIDList<TLStringKeyframe>("Keyframes");
 			Keyframes.Added += Keyframes_Added;
             Add(Keyframes);
-            
+
             //set the name of this track
-            Label.Value = "String " + name;
+            string label;
+            int x;
+            if (Int32.TryParse(name, out x))
+            {
+                label = "String " + x.ToString();
+            }
+            else
+            {
+                label = name;
+            }
+            Label.Value = label;
 		}
 
 		void Keyframes_Added(IViewableCollection<TLStringKeyframe> collection, TLStringKeyframe item)

diff --git a/Source/Model/TimelinerDocumentSerializer.cs b/Source/Model/TimelinerDocumentSerializer.cs
@@ -145,7 +145,9 @@ public abstract class TLTrackSerializer<TTrack> : ISerializer<TTrack> where TTra
         public XElement Serialize(TTrack value, Serializer serializer)
         {
             var x = value.GetXML(GetTagName());
-
+
+            string trackName = value.Label.Value;
+            x.FirstAttribute.SetValue(trackName);
 			value.SerializeProperties(x);
 
             SerializeKeyframes(x, value, serializer);

diff --git a/Source/Model/ValueTrack.cs b/Source/Model/ValueTrack.cs
@@ -73,8 +73,17 @@ public TLValueTrack(string name)
             Keyframes.Added += Keyframes_Added;
             Keyframes.Removed += Keyframes_Removed;
 
-
-            Label.Value = "Value " + name;
+            string label;
+            int x;
+            if (Int32.TryParse(name, out x))
+            {
+                label = "Value " + x.ToString();
+            }
+            else
+            {
+                label = name;
+            }
+            Label.Value = label;
         }
 
         void Keyframes_Removed(IViewableCollection<TLValueKeyframe> collection, TLValueKeyframe item)