minor fixes for continuous schemes < 0

hcmlab · Mar 4, 2019 · d21c207 · d21c207
1 parent 226d906
commit d21c207
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 8 deletions.
diff --git a/App/MainWindow.xaml.cs b/App/MainWindow.xaml.cs
@@ -111,12 +111,16 @@ private void Window_Closing(object sender, System.ComponentModel.CancelEventArgs
             {
                 e.Cancel = true;
             }
-
-            var dir = new DirectoryInfo(Path.GetDirectoryName(Properties.Settings.Default.CMLTempTrainerPath));
-            foreach (var file in dir.EnumerateFiles(Path.GetFileName(Properties.Settings.Default.CMLTempTrainerPath) + "latestcmlmodel*"))
+            try
             {
-                file.Delete();
+                var dir = new DirectoryInfo(Path.GetDirectoryName(Properties.Settings.Default.CMLTempTrainerPath));
+                foreach (var file in dir.EnumerateFiles(Path.GetFileName(Properties.Settings.Default.CMLTempTrainerPath) + "latestcmlmodel*"))
+                {
+                    file.Delete();
+                }
             }
+            catch { }
+
 
         }
     }

diff --git a/Controls/Annotation/AnnoTier.cs b/Controls/Annotation/AnnoTier.cs
@@ -329,7 +329,7 @@ public AnnoTier(AnnoList anno)
 
                                         if (!init)
                                         {
-                                            yPos = yPos = (numberOfLevels - ((int)(numberOfLevels / 2) * fac)) * segmentHeight;
+                                            yPos = (numberOfLevels - ((int)(numberOfLevels / 2) * fac)) * segmentHeight;
                                             init = true;
                                         }
 
@@ -375,7 +375,8 @@ private void UdpateContinuousPosition()
 
             double normal = 1.0 - (yPos / this.ActualHeight);
             double normalized = (normal * range) + this.AnnoList.Scheme.MinScore;
-            if (normalized < 1.1102230246251565E-15) normalized = 0;
+            //TODO fix for very small numbers
+            if (normalized < 1.1102230246251565E-15 &&  normalized > -1.1102230246251565E-15)  normalized = 0;
 
             continuousTierEllipse.Height = this.ActualHeight / 10;
             continuousTierEllipse.Width = continuousTierEllipse.Height;
@@ -416,7 +417,7 @@ public void continuousSegmentDown()
 
             double step = fac * segmentHeight;
             yPos = (yPos + step <= this.ActualHeight) ? yPos + step : yPos;
-            if (yPos + step <= this.ActualHeight) level--;
+            level--;
         }
 
         public void continuousSegmentToPosition(int position)

diff --git a/Controls/MainHandler.cs b/Controls/MainHandler.cs
@@ -16,7 +16,7 @@ public partial class MainHandler
     {
 
         //Config
-        public static string BuildVersion = "1.0.5.0";
+        public static string BuildVersion = "1.0.5.1";
         public static MEDIABACKEND MediaBackend = MEDIABACKEND.MEDIAKIT;
         public static bool ENABLE_PYTHON = Properties.Settings.Default.EnablePython;
 

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