Merge pull request #228 from hcmlab/develop

added hotkeys (0-9) for continuous annotations
hcmlab · Jun 9, 2017 · 3fdfe25 · 3fdfe25
2 parents 8101025 + 1c32e39
commit 3fdfe25
Show file tree

Hide file tree

Showing 14 changed files with 135 additions and 11 deletions.
diff --git a/Controls/Annotation/AnnoTier.cs b/Controls/Annotation/AnnoTier.cs
@@ -34,6 +34,7 @@ public partial class AnnoTierStatic : Canvas
         public static bool continuousAnnoMode = false;
         public static bool askForLabel = false;
         public static AnnoTierSegment objectContainer = null;
+        public static bool MouseActive = true;
 
         static public event AnnoTierChangeEventHandler OnTierChange;
 
@@ -290,15 +291,35 @@ public AnnoTier(AnnoList anno)
                                 closestIndex = GetClosestContinuousIndex(closestposition);
                                 if (closestIndex > -1)
                                 {
-                                    if (this == Mouse.DirectlyOver || (Mouse.GetPosition(this).Y > 0 &&
-                                        Mouse.GetPosition(this).Y < this.ActualHeight && continuousTierEllipse == Mouse.DirectlyOver))
                                     {
-                                        double normal = 1.0 - (Mouse.GetPosition(this).Y / this.ActualHeight);
+                                        continuousTierEllipse.Visibility = Visibility.Visible;
+
+                                       Point relativePoint = continuousTierEllipse.TransformToAncestor(this).Transform(new Point(0, 0));
+                                        double yPos = relativePoint.Y + continuousTierEllipse.Height / 2;
+
+                                        if ((this == Mouse.DirectlyOver || (Mouse.GetPosition(this).Y > 0 && Mouse.GetPosition(this).Y < this.ActualHeight && continuousTierEllipse == Mouse.DirectlyOver)) && MouseActive)
+                                            yPos = Mouse.GetPosition(this).Y;
+
+
+
+
+                                        double numberoflevels = Properties.Settings.Default.ContinuousHotkeysNumber;
+                                        double fac =  1 + (1 / (numberoflevels - 1));
+                                        double segmentheight = (this.ActualHeight / numberoflevels);
+
+                                        for (int i=0; i< numberoflevels; i++)
+                                        {
+                                            if (Keyboard.IsKeyDown(Key.D1 + i) )
+                                                yPos =  (numberoflevels - (i* fac))  * segmentheight;
+                                        }
+
+
+                                        double normal = 1.0 - (yPos / this.ActualHeight);
                                         double normalized = (normal * range) + anno.Scheme.MinScore;
 
                                         continuousTierEllipse.Height = this.ActualHeight / 10;
                                         continuousTierEllipse.Width = continuousTierEllipse.Height;
-                                        continuousTierEllipse.SetValue(Canvas.TopProperty, (Mouse.GetPosition(this).Y - continuousTierEllipse.Height / 2));
+                                        continuousTierEllipse.SetValue(Canvas.TopProperty, (yPos - continuousTierEllipse.Height / 2));
                                         AnnoList[closestIndex].Label = (normalized).ToString();
 
                                         for (int i = closestIndexOld; i < closestIndex; i++)
@@ -508,7 +529,8 @@ public void InitContinousValues(double sr)
             continuousTierEllipse.Fill = Brushes.WhiteSmoke;
             continuousTierEllipse.Stroke = Brushes.Black;
             continuousTierEllipse.Visibility = Visibility.Hidden;
-            continuousTierEllipse.SetValue(Canvas.LeftProperty, 0.0);
+            continuousTierEllipse.SetValue(Canvas.LeftProperty, continuousTierEllipse.Width / 2);
+            continuousTierEllipse.SetValue(Canvas.TopProperty, this.ActualHeight/2 - continuousTierEllipse.Height / 2);
             this.Children.Add(continuousTierEllipse);
 
             TimeRangeChanged(MainHandler.Time);

diff --git a/Controls/MainControl.xaml b/Controls/MainControl.xaml
@@ -386,7 +386,9 @@
                                                 Grid.Column="1"
                                                 Orientation="Horizontal"
                                                 HorizontalAlignment="Right">
-                                        <CheckBox x:Name="annoContinuousModeCheckBox" Style="{DynamicResource OrangeSwitchStyle}"
+                                        <Label Name="annoContinuousModeDeactiveMouseLabel" Visibility="Hidden">Deactive Mouse</Label>
+                                        <CheckBox Name="annoContinuousModeDeactiveMouse"  Visibility="Hidden"></CheckBox>
+                                        <CheckBox x:Name="annoContinuousModeCheckBox" Style="{DynamicResource OrangeSwitchStyle}" 
                                                   ToolTip="Continuous Annotation Mode. Shortcut: M" 
                                                   Visibility="Hidden"/>
                                         <Separator Width="20" Visibility="Hidden"></Separator>

diff --git a/Controls/MainHandler.cs b/Controls/MainHandler.cs
@@ -10,7 +10,7 @@ namespace ssi
 {
     public partial class MainHandler
     {
-        public static string BuildVersion = "0.9.9.9.0";
+        public static string BuildVersion = "0.9.9.9.1";
 
         private static Timeline timeline = null;
 
@@ -133,6 +133,8 @@ public MainHandler(MainControl view)
             control.annoTierControl.MouseRightButtonUp += annoTierControl_MouseRightButtonUp;
             control.annoContinuousModeCheckBox.Checked += annoContinuousMode_Changed;
             control.annoContinuousModeCheckBox.Unchecked += annoContinuousMode_Changed;
+            control.annoContinuousModeDeactiveMouse.Checked += annoContinuousModeDeactiveMouse_Checked;
+            control.annoContinuousModeDeactiveMouse.Unchecked += annoContinuousModeDeactiveMouse_Unchecked;
 
             // Geometric
 
@@ -432,6 +434,7 @@ private void showSettings(bool connectDatabase = false)
                 Properties.Settings.Default.DefaultMinSegmentSize = double.Parse(s.SegmentMinDur());
                 Properties.Settings.Default.DefaultDiscreteSampleRate = double.Parse(s.SampleRate());
                 Properties.Settings.Default.CheckUpdateOnStart = s.CheckforUpdatesonStartup();
+                Properties.Settings.Default.ContinuousHotkeysNumber = int.Parse(s.ContinuousHotkeyLevels());
                 Properties.Settings.Default.DatabaseAskBeforeOverwrite = s.DBAskforOverwrite();
                 Properties.Settings.Default.Save();
 

diff --git a/Controls/MainHandlerKey.cs b/Controls/MainHandlerKey.cs
@@ -425,18 +425,46 @@ public void OnKeyDown(object sender, KeyEventArgs e)
                         {
                             AnnoTierStatic.Selected.ContinuousAnnoMode(true);
                             control.annoContinuousModeCheckBox.IsChecked = false;
+
+
                         }
 
                         else
                         {
                             control.annoContinuousModeCheckBox.IsChecked = true;
                             AnnoTierStatic.Selected.ContinuousAnnoMode(false);
+
                         }
                     }
                     isKeyDown = true;
                     // e.Handled = true;
                 }
 
+
+                if (e.KeyboardDevice.IsKeyDown(Key.N))
+                {
+                    if (AnnoTierStatic.Selected != null && AnnoTierStatic.Selected.IsContinuous)
+                    {
+
+                        if (control.annoContinuousModeDeactiveMouse.IsChecked == true)
+                        {
+
+                            control.annoContinuousModeDeactiveMouse.IsChecked = false;
+
+
+                        }
+
+                        else
+                        {
+                            control.annoContinuousModeDeactiveMouse.IsChecked = true;
+
+                        }
+                    }
+                    isKeyDown = true;
+                    // e.Handled = true;
+                }
+
+
                 if (e.KeyboardDevice.IsKeyDown(Key.Q) && !isKeyDown)
                 {
                     if (AnnoTierStatic.Label != null && AnnoTierStatic.Selected.IsDiscreteOrFree && isKeyDown == false)

diff --git a/Controls/MainHandlerNavigation.cs b/Controls/MainHandlerNavigation.cs
@@ -50,18 +50,41 @@ private void navigatorCorrectionMode_Click(object sender, RoutedEventArgs e)
 
         private void annoContinuousMode_Changed(object sender, RoutedEventArgs e)
         {
+            control.annoContinuousModeDeactiveMouse.IsChecked = Properties.Settings.Default.ContinuousDeactiveMouse;
 
             if (AnnoTier.Selected != null && AnnoTier.Selected.AnnoList.Scheme.Type == AnnoScheme.TYPE.CONTINUOUS)
                if (control.annoContinuousModeCheckBox.IsChecked == true)
                 {
                     AnnoTierStatic.Selected.ContinuousAnnoMode(false);
+                    control.annoContinuousModeDeactiveMouse.Visibility = Visibility.Visible;
+                    control.annoContinuousModeDeactiveMouseLabel.Visibility = Visibility.Visible;
+
                 }
                 else
                 {
                     AnnoTierStatic.Selected.ContinuousAnnoMode(true);
+                    control.annoContinuousModeDeactiveMouse.Visibility = Visibility.Collapsed;
+                    control.annoContinuousModeDeactiveMouseLabel.Visibility = Visibility.Collapsed;
                 }
         }
 
+
+
+        private void annoContinuousModeDeactiveMouse_Checked(object sender, RoutedEventArgs e)
+        {
+            AnnoTier.MouseActive = false;
+            Properties.Settings.Default.ContinuousDeactiveMouse = true;
+            Properties.Settings.Default.Save();
+        }
+
+        private void annoContinuousModeDeactiveMouse_Unchecked(object sender, RoutedEventArgs e)
+        {
+            AnnoTier.MouseActive = true;
+            Properties.Settings.Default.ContinuousDeactiveMouse = false;
+            Properties.Settings.Default.Save();
+        }
+
+
         private void navigatorNewAnnoFromDatabase_Click(object sender, RoutedEventArgs e)
         {
             addNewAnnotationDatabase();

diff --git a/Controls/Other/Settings.xaml b/Controls/Other/Settings.xaml
@@ -32,6 +32,8 @@
                         <RowDefinition></RowDefinition>
                         <RowDefinition></RowDefinition>
                         <RowDefinition></RowDefinition>
+                        <RowDefinition></RowDefinition>
+                        <RowDefinition></RowDefinition>
                     </Grid.RowDefinitions>
 
                     <Grid.ColumnDefinitions>
@@ -48,8 +50,10 @@
                     <TextBox Grid.Row="7" Name="Segmentmindur" Margin="5,0,5,5" PreviewTextInput="NumberValidationTextBox" />
                     <Label Grid.Row="8" Content="Discrete sample rate in Hz (0 for none):" />
                     <TextBox Grid.Row="9" Name="Samplerate" Margin="5,0,5,5" PreviewTextInput="IntNumberValidationTextBox" />
-                    <Label Grid.Row="10" Content="Check for updates on startup:"  />
-                    <CheckBox Grid.Row="11" Name="UpdatesCheckbox" Margin="5,0,5,5" />
+                    <Label Grid.Row="10" Content="Number of Levels for Continuous Annos:"  />
+                    <TextBox Grid.Row="11" Name="ContinuousHotkeysnum" Margin="5,0,5,5"  PreviewTextInput="IntNumberValidationTextBoxContinuous"/>
+                    <Label Grid.Row="12" Content="Check for updates on startup:"  />
+                    <CheckBox Grid.Row="13" Name="UpdatesCheckbox" Margin="5,0,5,5" />
 
                 </Grid>
             </TabItem>

diff --git a/Controls/Other/Settings.xaml.cs b/Controls/Other/Settings.xaml.cs
@@ -20,6 +20,7 @@ public Settings()
             DefaultZoom.Text = Properties.Settings.Default.DefaultZoomInSeconds.ToString();
             Segmentmindur.Text = Properties.Settings.Default.DefaultMinSegmentSize.ToString();
             Samplerate.Text = Properties.Settings.Default.DefaultDiscreteSampleRate.ToString();
+            ContinuousHotkeysnum.Text = Properties.Settings.Default.ContinuousHotkeysNumber.ToString();
             string[] tokens = Properties.Settings.Default.DatabaseAddress.Split(':');
             if (tokens.Length == 2)
             {
@@ -74,6 +75,11 @@ public string SampleRate()
             return Samplerate.Text;
         }
 
+        public string ContinuousHotkeyLevels()
+        {
+            return ContinuousHotkeysnum.Text;
+        }
+
         public bool CheckforUpdatesonStartup()
         {
             return (UpdatesCheckbox.IsChecked == true);
@@ -101,6 +107,12 @@ private void IntNumberValidationTextBox(object sender, TextCompositionEventArgs
             e.Handled = !regex.IsMatch((sender as TextBox).Text.Insert((sender as TextBox).SelectionStart, e.Text));
         }
 
+        private void IntNumberValidationTextBoxContinuous(object sender, TextCompositionEventArgs e)
+        {
+            Regex regex = new Regex("^[2-9]$");
+            e.Handled = !regex.IsMatch((sender as TextBox).Text.Insert((sender as TextBox).SelectionStart, e.Text));
+        }
+
         private void ApplyButton_Click(object sender, RoutedEventArgs e)
         {
             if (Properties.Settings.Default.DatabaseDirectory != DownloadDirectory.Text)                

diff --git a/Properties/Settings.Designer.cs b/Properties/Settings.Designer.cs
diff --git a/Properties/Settings.settings b/Properties/Settings.settings
@@ -104,5 +104,11 @@
     <Setting Name="LastUpdateCheckDate" Type="System.DateTime" Scope="User">
       <Value Profile="(Default)">1979-01-01</Value>
     </Setting>
+    <Setting Name="ContinuousHotkeysNumber" Type="System.Int32" Scope="User">
+      <Value Profile="(Default)">5</Value>
+    </Setting>
+    <Setting Name="ContinuousDeactiveMouse" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">False</Value>
+    </Setting>
   </Settings>
 </SettingsFile>
diff --git a/Tools/PluginCaller.cs b/Tools/PluginCaller.cs
@@ -26,7 +26,7 @@ public PluginCaller(string dllPath, string typeName)
             isLoaded = true;
 
             dllName = Path.GetFileNameWithoutExtension(dllPath);
-            directory = Environment.CurrentDirectory + "\\" + PLUGIN_FOLDER + "\\" + dllName + "\\";
+            directory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\" + PLUGIN_FOLDER + "\\" + dllName + "\\";
 
             Directory.CreateDirectory(directory);
             if (!downloadDll(dllName, false))
@@ -81,7 +81,7 @@ public bool downloadDll(string name, bool isDependency)
 
                     if(isDependency)
                     {
-                        Client.DownloadFile(url, Environment.CurrentDirectory + "//" + name + ".dll");
+                        Client.DownloadFile(url, Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "//" + name + ".dll");
                     }
 
                     else Client.DownloadFile(url, directory + "//" + name + ".dll"); ;

diff --git a/bin/MathNet.Numerics.dll b/bin/MathNet.Numerics.dll
diff --git a/bin/nova.exe b/bin/nova.exe
diff --git a/bin/plugins/ActiveMQSender/ActiveMQSender.dll b/bin/plugins/ActiveMQSender/ActiveMQSender.dll
diff --git a/bin/plugins/UdpSender/UdpSender.dll b/bin/plugins/UdpSender/UdpSender.dll