Merge pull request #245 from hcmlab/develop

Annotiers are reloaded, on CML prediction
hcmlab · Jun 29, 2017 · 4fdb819 · 4fdb819
2 parents 341f99b + 4febd05
commit 4fdb819
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 9 deletions.
diff --git a/Controls/MainHandler.cs b/Controls/MainHandler.cs
@@ -50,12 +50,12 @@ public static Timeline Time
         public Cursor signalCursor = null;
         public Cursor annoCursor = null;
 
-        private List<SignalTrack> signalTracks = new List<SignalTrack>();
-        private List<Signal> signals = new List<Signal>();
-        private List<AnnoTier> annoTiers = new List<AnnoTier>();
-        private List<AnnoList> annoLists = new List<AnnoList>();
-        private MediaList mediaList = new MediaList();
-        private List<MediaBox> mediaBoxes = new List<MediaBox>();
+        public static List<SignalTrack> signalTracks = new List<SignalTrack>();
+        public static List<Signal> signals = new List<Signal>();
+        public static List<AnnoTier> annoTiers = new List<AnnoTier>();
+        public static List<AnnoList> annoLists = new List<AnnoList>();
+        public static MediaList mediaList = new MediaList();
+        public static List<MediaBox> mediaBoxes = new List<MediaBox>();
 
         private bool playIsPlaying = false;
         private double playSampleRate = Defaults.DefaultSampleRate;

diff --git a/Controls/MainHandlerFile.cs b/Controls/MainHandlerFile.cs
@@ -1012,7 +1012,7 @@ private void fileLoadProject_Click(object sender, RoutedEventArgs e)
         private void exportSamples_Click(object sender, RoutedEventArgs e)
         {
             ExportSamplesWindow window = new ExportSamplesWindow();
-            foreach (AnnoTier tier in this.annoTiers)
+            foreach (AnnoTier tier in annoTiers)
             {
                 if (tier.AnnoList.Source.HasFile && 
                     (tier.AnnoList.Scheme.Type == AnnoScheme.TYPE.DISCRETE ||

diff --git a/Controls/MainHandlerMenu.cs b/Controls/MainHandlerMenu.cs
@@ -61,7 +61,7 @@ private void tierMenu_MouseEnter(object sender, RoutedEventArgs e)
 
         private void helpDocumentationMenu_Click(object sender, RoutedEventArgs e)
         {            
-            System.Diagnostics.Process.Start("https://cdn.rawgit.com/hcmlab/nova/3db284e0/docs/index.html");
+            System.Diagnostics.Process.Start("https://rawgit.com/hcmlab/nova/master/docs/index.html");
         }
 
         private void helpShortcutsMenu_Click(object sender, RoutedEventArgs e)

diff --git a/Database/DatabaseCMLTrainAndPredictWindow.xaml.cs b/Database/DatabaseCMLTrainAndPredictWindow.xaml.cs
@@ -327,10 +327,21 @@ private void Apply_Click(object sender, RoutedEventArgs e)
 
             }
 
+            if (mode == Mode.PREDICT)
+            {
+                foreach (AnnoTier tier in MainHandler.annoTiers)
+                {
+                    if (tier.AnnoList.Source.HasDatabase)
+                    {
+                        handler.ReloadAnnoTierFromDatabase(tier);
+                    }
+                }
+            }
+
+
             if (mode == Mode.COMPLETE)
             {
                 handler.ReloadAnnoTierFromDatabase(AnnoTierStatic.Selected);
-
                 ApplyButton.Content = "Undo";
                 mode = Mode.COMPLETE_UNDO;                
             }

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