Bugfix

dattalab · Oct 6, 2016 · 6dead7d · 6dead7d
1 parent 487b322
commit 6dead7d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/kinect2_nidaq/MainWindow.xaml b/kinect2_nidaq/MainWindow.xaml
@@ -190,7 +190,7 @@
                         Width="512"
                         Stretch="UniformToFill"
                         VerticalAlignment="Top"
-                        HorizontalAlignment="Left" Grid.Row="1"/>
+                        HorizontalAlignment="Left" Grid.Row="1" RenderTransformOrigin="0.5, 0.5"/>
                     <Image x:Name="DepthDisplay"
                        HorizontalAlignment="Right"
                        Height="424"

diff --git a/kinect2_nidaq/MainWindow.xaml.cs b/kinect2_nidaq/MainWindow.xaml.cs
@@ -1279,6 +1279,8 @@ private void SettingsChanged()
                     // if we have anything in the time box, then disable the continuous button
                     CheckNoTimer.IsEnabled = false;
                     ContinuousMode = false;
+                    RecordingTimeText.IsEnabled = true;
+                    RecordingTimeBox.IsEnabled = true;
                     RecordingTime = Convert.ToDouble(RecordingTimeBox.Text) * 60e3;
                     //StatusBarSessionProgress.IsEnabled = true;
                 }
@@ -1529,16 +1531,14 @@ private void WriteMetadata()
 
                 Type t = typeof(NidaqData);
                 System.Reflection.PropertyInfo t2 = t.GetProperty("Data");
-                fMetadata.NidaqDataType = t2.PropertyType.Name;             
-            }
-
-
+                fMetadata.NidaqDataType = t2.PropertyType.Name;
 
-            for (int i = 0; i < aiChannelList.SelectedItems.Count; i++)
-            {
-                fMetadata.NidaqChannelNames[i] = aiChannelList.SelectedItems[i].ToString();
+                for (int i = 0; i < aiChannelList.SelectedItems.Count; i++)
+                {
+                    fMetadata.NidaqChannelNames[i] = aiChannelList.SelectedItems[i].ToString();
+                }
             }
-
+            
             fMetadata.StartTime = DateTime.Now;
 
             JsonSerializer serializer = new JsonSerializer();
@@ -1674,12 +1674,14 @@ private void FlipDepth_Checked(object sender, RoutedEventArgs e)
         {
             System.Windows.Media.RotateTransform rotateTransform = new System.Windows.Media.RotateTransform(180);
             DepthDisplay.RenderTransform = rotateTransform;
+            ColorDisplay.RenderTransform = rotateTransform;
         }
 
         private void FlipDepth_Unchecked(object sender, RoutedEventArgs e)
         {
             System.Windows.Media.RotateTransform rotateTransform = new System.Windows.Media.RotateTransform(0);
             DepthDisplay.RenderTransform = rotateTransform;
+            ColorDisplay.RenderTransform = rotateTransform;
         }
 
     }