[chronojump] runEncoder can play videos (after capture/load)



commit 47906007b89f53ddfe385bb26490478c1795861f
Author: Xavier de Blas <xaviblas gmail com>
Date:   Thu Sep 19 10:42:13 2019 +0200

    runEncoder can play videos (after capture/load)

 src/gui/chronojump.cs | 7 ++++++-
 src/gui/runEncoder.cs | 6 ++++++
 src/runEncoder.cs     | 2 +-
 3 files changed, 13 insertions(+), 2 deletions(-)
---
diff --git a/src/gui/chronojump.cs b/src/gui/chronojump.cs
index f9d6e8ce..230612c9 100644
--- a/src/gui/chronojump.cs
+++ b/src/gui/chronojump.cs
@@ -7484,12 +7484,17 @@ LogB.Debug("mc finished 5");
                notebook_options_top.Sensitive = true;
                event_execute_button_update.Sensitive = true;
 
-               //forceSensor does not use currentEventExecute
+               //forceSensor and runEncoder does not use currentEventExecute
                if(current_menuitem_mode == Constants.Menuitem_modes.FORCESENSOR)
                {
                        sensitiveLastTestButtons(! forceProcessCancel && ! forceProcessError);
                        LogB.Information(" sensitiveGuiEventDone end (forceSensor)");
                        return;
+               } else if(current_menuitem_mode == Constants.Menuitem_modes.RUNSENCODER)
+               {
+                       sensitiveLastTestButtons(! runEncoderProcessCancel && ! runEncoderProcessError);
+                       LogB.Information(" sensitiveGuiEventDone end (forceSensor)");
+                       return;
                }
 
                sensitiveLastTestButtons(true);
diff --git a/src/gui/runEncoder.cs b/src/gui/runEncoder.cs
index c9931dbc..9ff09dab 100644
--- a/src/gui/runEncoder.cs
+++ b/src/gui/runEncoder.cs
@@ -601,6 +601,9 @@ public partial class ChronoJumpWindow
                button_run_encoder_recalculate.Sensitive = true;
                button_race_analyzer_save_comment.Sensitive = true;
 
+               button_video_play_this_test.Sensitive = (re.VideoURL != "");
+               sensitiveLastTestButtons(true);
+
                event_execute_label_message.Text = "Loaded: " + Util.GetLastPartOfPath(re.Filename);
        }
 
@@ -867,6 +870,7 @@ LogB.Information(" fc B ");
                if(! runEncoderCaptureThread.IsAlive || runEncoderProcessFinish || runEncoderProcessCancel || 
runEncoderProcessError)
                {
 LogB.Information(" fc C ");
+                       button_video_play_this_test.Sensitive = false;
                        if(runEncoderProcessFinish)
                        {
 LogB.Information(" fc C finish");
@@ -905,6 +909,7 @@ LogB.Information(" fc C finish");
                                        }
 
                                        Thread.Sleep (250); //Wait a bit to ensure is copied
+                                       sensitiveLastTestButtons(true);
 
                                        runEncoderAnalyzeOpenImage();
                                        notebook_analyze.CurrentPage = 
Convert.ToInt32(notebook_analyze_pages.RACEENCODER);
@@ -928,6 +933,7 @@ LogB.Information(" fc C finish 2");
 LogB.Information(" fc C cancel ");
                                //stop the camera (and do not save)
                                webcamEnd (Constants.TestTypes.RACEANALYZER, -1);
+                               sensitiveLastTestButtons(false);
 
                                if(runEncoderProcessCancel)
                                        event_execute_label_message.Text = "Cancelled.";
diff --git a/src/runEncoder.cs b/src/runEncoder.cs
index 623c99c5..b9140bb5 100644
--- a/src/runEncoder.cs
+++ b/src/runEncoder.cs
@@ -230,7 +230,7 @@ public class RunEncoder
        }
        public string VideoURL
        {
-               //get { return videoURL; }
+               get { return videoURL; }
                set { videoURL = value; }
        }
        public string ExerciseName


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]