[chronojump] reimplemented button_video_play_selected_test sensitivity



commit a13702fbc96ab1716d02ad856f9a6c4823cd689c
Author: Xavier de Blas <xaviblas gmail com>
Date:   Fri Apr 12 15:09:00 2019 +0200

    reimplemented button_video_play_selected_test sensitivity

 src/gui/chronojump.cs | 84 ++-------------------------------------------------
 src/gui/webcam.cs     | 77 +++++++++++++++++++++++++++++++++++++++++++---
 2 files changed, 76 insertions(+), 85 deletions(-)
---
diff --git a/src/gui/chronojump.cs b/src/gui/chronojump.cs
index 507ef23b..18d02f7a 100644
--- a/src/gui/chronojump.cs
+++ b/src/gui/chronojump.cs
@@ -7482,87 +7482,32 @@ LogB.Debug("mc finished 5");
                sensitiveLastTestButtons(! execute);
        }
 
-
        private void showHideActionEventButtons(bool show, string type) {
                bool success = false;
                bool recordedVideo = false;
+
                if(type == "ALL" || type == "Jump") {
                        button_edit_selected_jump.Sensitive = show;
                        button_delete_selected_jump.Sensitive = show;
-
-                       button_video_play_selected_jump.Sensitive = false;
-                       if (myTreeViewJumps.EventSelectedID > 0 && File.Exists(Util.GetVideoFileName(
-                                                       currentSession.UniqueID, 
-                                                       Constants.TestTypes.JUMP,
-                                                       myTreeViewJumps.EventSelectedID))) {
-                               button_video_play_selected_jump.Sensitive = true;
-                               recordedVideo = true;
-                       }
-
-
-                       success = true;
                } 
                if (type == "ALL" || type == "JumpRj") {
                        button_edit_selected_jump_rj.Sensitive = show;
                        button_delete_selected_jump_rj.Sensitive = show;
                        button_repair_selected_jump_rj.Sensitive = show;
-
-                       button_video_play_selected_jump_rj.Sensitive = false;
-                       if (myTreeViewJumpsRj.EventSelectedID > 0 && File.Exists(Util.GetVideoFileName(
-                                                       currentSession.UniqueID, 
-                                                       Constants.TestTypes.JUMP_RJ,
-                                                       myTreeViewJumpsRj.EventSelectedID))) {
-                               button_video_play_selected_jump_rj.Sensitive = true;
-                               recordedVideo = true;
-                       }
-
-                       success = true;
                } 
                if (type == "ALL" || type == "Run") {
                        button_edit_selected_run.Sensitive = show;
                        button_delete_selected_run.Sensitive = show;
-
-                       button_video_play_selected_run.Sensitive = false;
-                       if (myTreeViewRuns.EventSelectedID > 0 && File.Exists(Util.GetVideoFileName(
-                                                       currentSession.UniqueID, 
-                                                       Constants.TestTypes.RUN,
-                                                       myTreeViewRuns.EventSelectedID))) {
-                               button_video_play_selected_run.Sensitive = true;
-                               recordedVideo = true;
-                       }
-
-                       success = true;
                } 
                if (type == "ALL" || type == "RunInterval") {
                        button_edit_selected_run_interval.Sensitive = show;
                        button_delete_selected_run_interval.Sensitive = show;
                        button_repair_selected_run_interval.Sensitive = show;
                        
-                       button_video_play_selected_run_interval.Sensitive = false;
-                       if (myTreeViewRunsInterval.EventSelectedID > 0 && File.Exists(Util.GetVideoFileName(
-                                                       currentSession.UniqueID, 
-                                                       Constants.TestTypes.RUN_I,
-                                                       myTreeViewRunsInterval.EventSelectedID))) {
-                               button_video_play_selected_run_interval.Sensitive = true;
-                               recordedVideo = true;
-                       }
-
-                       success = true;
                } 
                if (type == "ALL" || type == "ReactionTime") {
                        button_edit_selected_reaction_time.Sensitive = show;
                        button_delete_selected_reaction_time.Sensitive = show;
-                       
-                       button_video_play_selected_reaction_time.Sensitive = false;
-                       if (myTreeViewReactionTimes.EventSelectedID > 0 && File.Exists(Util.GetVideoFileName(
-                                                       currentSession.UniqueID, 
-                                                       Constants.TestTypes.RT,
-                                                       myTreeViewReactionTimes.EventSelectedID))) {
-                               button_video_play_selected_reaction_time.Sensitive = true;
-                               recordedVideo = true;
-                       }
-
-                       success = true;
                } 
                if (type == "ALL" || type == "Pulse") {
                        // menuitem_edit_selected_pulse.Sensitive = show;
@@ -7570,38 +7515,15 @@ LogB.Debug("mc finished 5");
                        button_edit_selected_pulse.Sensitive = show;
                        button_delete_selected_pulse.Sensitive = show;
                        button_repair_selected_pulse.Sensitive = show;
-                       
-                       button_video_play_selected_pulse.Sensitive = false;
-                       if (myTreeViewPulses.EventSelectedID > 0 && File.Exists(Util.GetVideoFileName(
-                                                       currentSession.UniqueID, 
-                                                       Constants.TestTypes.PULSE,
-                                                       myTreeViewPulses.EventSelectedID))) {
-                               button_video_play_selected_pulse.Sensitive = true;
-                               recordedVideo = true;
-                       }
-
-                       success = true;
                } 
                if (type == "ALL" || type == Constants.MultiChronopicName) {
                        button_edit_selected_multi_chronopic.Sensitive = show;
                        button_delete_selected_multi_chronopic.Sensitive = show;
                        
-                       button_video_play_selected_multi_chronopic.Sensitive = false;
-                       if (myTreeViewMultiChronopic.EventSelectedID > 0 && File.Exists(Util.GetVideoFileName(
-                                                       currentSession.UniqueID, 
-                                                       Constants.TestTypes.MULTICHRONOPIC,
-                                                       myTreeViewMultiChronopic.EventSelectedID))) {
-                               button_video_play_selected_multi_chronopic.Sensitive = true;
-                               recordedVideo = true;
-                       }
-
-                       success = true;
                } 
-               if (!success)
-                       LogB.Error(string.Format("Error in showHideActionEventButtons, type: {0}", type));
 
-               LogB.Information("recordedVideo = " + recordedVideo.ToString());
-               //button_video_play_this_test.Sensitive = recordedVideo;
+               button_video_play_selected_test(current_menuitem_mode);
+               //LogB.Information("recordedVideo = " + recordedVideo.ToString());
        }
        
        
diff --git a/src/gui/webcam.cs b/src/gui/webcam.cs
index a3320591..812e5606 100644
--- a/src/gui/webcam.cs
+++ b/src/gui/webcam.cs
@@ -21,6 +21,7 @@
 using System;
 using Gtk;
 using Glade;
+using System.IO; //"File" things
 
 public partial class ChronoJumpWindow 
 {
@@ -148,6 +149,72 @@ public partial class ChronoJumpWindow
                        button_video_play_this_test_encoder.Sensitive = s; //TODO:jugar amb la sensitivitat 
de aixo quan hi ha o no signalUniqueID 
        }
 
+       /*
+        * in the past we pass here an string, and an option was ALL
+        * now we use Menuitem_modes an UNDEFINED will work as ALL
+        */
+       private void button_video_play_selected_test(Constants.Menuitem_modes m)
+       {
+               if(m == Constants.Menuitem_modes.JUMPSSIMPLE || m == Constants.Menuitem_modes.UNDEFINED)
+                       button_video_play_selected_jump.Sensitive =
+                               (myTreeViewJumps.EventSelectedID > 0 &&
+                                File.Exists(Util.GetVideoFileName(
+                                                currentSession.UniqueID,
+                                                Constants.TestTypes.JUMP,
+                                                myTreeViewJumps.EventSelectedID)));
+
+               if(m == Constants.Menuitem_modes.JUMPSREACTIVE || m == Constants.Menuitem_modes.UNDEFINED)
+                       button_video_play_selected_jump_rj.Sensitive =
+                               (myTreeViewJumpsRj.EventSelectedID > 0
+                                && File.Exists(Util.GetVideoFileName(
+                                                currentSession.UniqueID,
+                                                Constants.TestTypes.JUMP_RJ,
+                                                myTreeViewJumpsRj.EventSelectedID)));
+
+               if(m == Constants.Menuitem_modes.RUNSSIMPLE || m == Constants.Menuitem_modes.UNDEFINED)
+                       button_video_play_selected_run.Sensitive =
+                               (myTreeViewRuns.EventSelectedID > 0 &&
+                                File.Exists(Util.GetVideoFileName(
+                                                currentSession.UniqueID,
+                                                Constants.TestTypes.RUN,
+                                                myTreeViewRuns.EventSelectedID)));
+
+               if(m == Constants.Menuitem_modes.RUNSINTERVALLIC || m == Constants.Menuitem_modes.UNDEFINED)
+                       button_video_play_selected_run_interval.Sensitive =
+                               (myTreeViewRunsInterval.EventSelectedID > 0
+                                && File.Exists(Util.GetVideoFileName(
+                                                currentSession.UniqueID,
+                                                Constants.TestTypes.RUN_I,
+                                                myTreeViewRunsInterval.EventSelectedID)));
+
+
+               if(m == Constants.Menuitem_modes.RT || m == Constants.Menuitem_modes.UNDEFINED)
+                       button_video_play_selected_reaction_time.Sensitive =
+                               (myTreeViewReactionTimes.EventSelectedID > 0 &&
+                                File.Exists(Util.GetVideoFileName(
+                                                currentSession.UniqueID,
+                                                Constants.TestTypes.RT,
+                                                myTreeViewReactionTimes.EventSelectedID)));
+
+               if(m == Constants.Menuitem_modes.OTHER || m == Constants.Menuitem_modes.UNDEFINED)
+               {
+                       button_video_play_selected_pulse.Sensitive =
+                               (myTreeViewPulses.EventSelectedID > 0 &&
+                                File.Exists(Util.GetVideoFileName(
+                                                currentSession.UniqueID,
+                                                Constants.TestTypes.PULSE,
+                                                myTreeViewPulses.EventSelectedID)));
+
+                       button_video_play_selected_multi_chronopic.Sensitive =
+                               (myTreeViewMultiChronopic.EventSelectedID > 0
+                                && File.Exists(Util.GetVideoFileName(
+                                                currentSession.UniqueID,
+                                                Constants.TestTypes.MULTICHRONOPIC,
+                                                myTreeViewMultiChronopic.EventSelectedID)));
+               }
+       }
+
+
        //can pass a -1 uniqueID if test is cancelled
        private void webcamEnd (Constants.TestTypes testType, int uniqueID)
        {
@@ -162,18 +229,18 @@ public partial class ChronoJumpWindow
                        hbox_video_encoder_capturing.Visible = false;
                }
 
-               //button_video_play_this_test.Sensitive = false;
-               button_video_play_this_test_sensitive (guiContactsEncoder, false);
-
                if(! preferences.videoOn || webcamManage == null)
+               {
+                       button_video_play_this_test_sensitive (guiContactsEncoder, false);
                        return;
+               }
 
                Webcam.Result result = webcamManage.RecordEnd (1);
 
                if(! result.success)
                {
                        new DialogMessage(Constants.MessageTypes.WARNING, result.error);
-                       button_video_play_this_test_sensitive (webcamEndParams.guiContactsEncoder, false);
+                       button_video_play_this_test_sensitive (guiContactsEncoder, false);
 
                        return;
                }
@@ -194,6 +261,7 @@ public partial class ChronoJumpWindow
                        new DialogMessage(Constants.MessageTypes.WARNING, resultExit.error);
 
                button_video_play_this_test_sensitive (webcamEndParams.guiContactsEncoder, 
resultExit.success);
+               button_video_play_selected_test(current_menuitem_mode);
 
                return false; //do not call this Timeout routine again
        }
@@ -261,6 +329,7 @@ public partial class ChronoJumpWindow
 
                //button_video_play_this_test.Sensitive = (uniqueID != -1 && errorMessage == "");
                button_video_play_this_test_sensitive (guiContactsEncoder, (uniqueID != -1 && errorMessage == 
""));
+               button_video_play_selected_test(current_menuitem_mode);
        }
 
 


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