Using framestep interface if available for forward stepping.

Switch to chart after manual data acquisition.
avosskuehler · Dec 27, 2015 · cd33d80 · cd33d80
1 parent 02fc293
commit cd33d80
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/VianaNET/MainWindow/MainWindow.xaml.cs b/VianaNET/MainWindow/MainWindow.xaml.cs
@@ -971,8 +971,8 @@ private void ManualDataAquisitionButtonClick(object sender, RoutedEventArgs e)
 
       this.Refresh();
 
-      // Switch to datagrid window
-      this.VideoTab.IsSelected = true;
+      // Switch to chart window
+      this.ChartTab.IsSelected = true;
     }
 
     /// <summary>

diff --git a/VianaNET/Modules/Video/Control/VideoPlayer.cs b/VianaNET/Modules/Video/Control/VideoPlayer.cs
@@ -486,7 +486,7 @@ public void StepOneFrame(bool forward)
     {
       if (forward)
       {
-        if (Video.Instance.IsDataAcquisitionRunning)
+        if (Video.Instance.IsDataAcquisitionRunning || this.frameStep != null)
         {
           this.StepFrames(1);
         }
@@ -737,6 +737,7 @@ private void EventWait()
               }
               else if (ec == EventCode.StepComplete)
               {
+                Console.WriteLine("StepComplete");
                 // Throw event
                 if (this.StepComplete != null)
                 {

diff --git a/VianaNET/Modules/Video/VideoWindow.xaml.cs b/VianaNET/Modules/Video/VideoWindow.xaml.cs
@@ -898,6 +898,7 @@ private void VideoPlayerElementStepComplete(object sender, EventArgs e)
             Viana.Project.ProcessingData.ProcessImage();
           });
 
+
       // Run next sample
       this.Dispatcher.Invoke(
         (ThreadStart)delegate
@@ -1141,7 +1142,7 @@ private void TimesliderUpdateTimerTick(object sender, EventArgs e)
 
         // double alignedTime = (int)(preciseTime / Video.Instance.VideoPlayerElement.FrameTimeIn100NanoSeconds) *
         // Video.Instance.VideoPlayerElement.FrameTimeIn100NanoSeconds;
-        this.TimelineSlider.Value = preciseTime * VideoBase.NanoSecsToMilliSecs;
+        this.TimelineSlider.Value = Math.Round(preciseTime * VideoBase.NanoSecsToMilliSecs);
       }
     }
 
@@ -1153,6 +1154,7 @@ private void StepBackward()
       if (this.TimelineSlider.Value >= this.TimelineSlider.SelectionStart + this.TimelineSlider.TickFrequency)
       {
         Video.Instance.StepOneFrame(false);
+
       }
     }