Merge pull request #195 from hcmlab/develop

Develop
hcmlab · Apr 3, 2017 · bc36291 · bc36291
2 parents a5757d8 + 3af8726
commit bc36291
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 8 deletions.
diff --git a/Controls/MainHandler.cs b/Controls/MainHandler.cs
@@ -20,7 +20,7 @@ namespace ssi
 {
     public partial class MainHandler
     {
-        public static string BuildVersion = "0.9.9.6.4";
+        public static string BuildVersion = "0.9.9.6.5";
 
         private static Timeline timeline = null;
 

diff --git a/Controls/MainHandlerFile.cs b/Controls/MainHandlerFile.cs
@@ -648,7 +648,7 @@ private void ExportFrameWiseAnnotations(int sr, string seperator, string restcla
 
             foreach (AnnoTier s in annoTiers)
             {
-                headline += s.AnnoList.Scheme.Name + seperator;
+                headline += s.AnnoList.Meta.Role + "_" +  s.AnnoList.Scheme.Name + seperator;
             }
 
             string firstmediadir = "";
@@ -682,13 +682,13 @@ private void ExportFrameWiseAnnotations(int sr, string seperator, string restcla
                                     }
                                     else found = false;
                                 }
-                                if (found) break;
                             }
                             else
                             {
                                 found = false;
                             }
-                            if (!found) headline += restclass + seperator;
+                            if (!found)
+                                headline += restclass + seperator;
                         }
 
                         headline = headline.Remove(headline.Length - 1);

diff --git a/Controls/MainHandlerMedia.cs b/Controls/MainHandlerMedia.cs
@@ -6,6 +6,7 @@
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
+using System.Windows.Input;
 using System.Windows.Threading;
 
 namespace ssi
@@ -337,7 +338,12 @@ public void Stop()
                 mediaList.Stop();
                 control.navigator.playButton.Content = ">";
 
-                int i = 0;
+
+                if (Keyboard.IsKeyDown(Key.LeftShift))
+                {
+
+
+                    int i = 0;
                 foreach (AnnoListItem ali in control.annoListControl.annoDataGrid.Items)
                 {
                     if (ali.Start <= Time.CurrentPlayPosition)
@@ -349,8 +355,9 @@ public void Stop()
                         break;
                     }
                 }
-
+                
                 jumpToGeometric(i);
+                }
             }
         }
 

diff --git a/Controls/MainHandlerSignal.cs b/Controls/MainHandlerSignal.cs
@@ -149,9 +149,9 @@ private void signalTrackGrid_MouseDown(object sender, MouseButtonEventArgs e)
         {
             if (e.LeftButton == MouseButtonState.Pressed)
             {
-                if (AnnoTierStatic.Label != null && Mouse.DirectlyOver.GetType() != AnnoTierStatic.Label.GetType() || AnnoTierStatic.Label == null)
+                 if (AnnoTierStatic.Label != null && Mouse.DirectlyOver.GetType() != AnnoTierStatic.Label.GetType() || AnnoTierStatic.Label == null)
                 {
-                    AnnoTierStatic.UnselectLabel();
+                     AnnoTierStatic.UnselectLabel();
                     bool is_playing = IsPlaying();
                     if (is_playing)
                     {

diff --git a/bin/nova.exe b/bin/nova.exe