[chronojump] ForceSensor webcam on capture after the arduino connect



commit a61039cc72834f9350f34b3e4e9fc53944cfd98c
Author: Xavier de Blas <xaviblas gmail com>
Date:   Tue Sep 10 17:11:32 2019 +0200

    ForceSensor webcam on capture after the arduino connect

 src/gui/chronojump.cs  | 6 +++---
 src/gui/forceSensor.cs | 5 +++++
 src/gui/webcam.cs      | 2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)
---
diff --git a/src/gui/chronojump.cs b/src/gui/chronojump.cs
index 6a8051b1..2a061f64 100644
--- a/src/gui/chronojump.cs
+++ b/src/gui/chronojump.cs
@@ -3901,7 +3901,7 @@ public partial class ChronoJumpWindow
                         on_force_sensor_activate(canCaptureC);
                         */
 
-                       on_button_execute_test_acceptedPre_start_camera(false);
+                       on_buttons_force_sensor_clicked(button_execute_test, new EventArgs ());
                        return;
                }
                if(current_menuitem_mode == Constants.Menuitem_modes.RUNSENCODER)
@@ -3977,7 +3977,7 @@ public partial class ChronoJumpWindow
                        if(chronopic)
                                on_button_execute_test_accepted();
                        else
-                               on_buttons_force_sensor_clicked(button_execute_test, new EventArgs ());
+                               forceSensorCapturePre3_GTK();
 
                        return;
                }
@@ -3988,7 +3988,7 @@ public partial class ChronoJumpWindow
                        if(chronopic)
                                on_button_execute_test_accepted();
                        else
-                               on_buttons_force_sensor_clicked(button_execute_test, new EventArgs ());
+                               forceSensorCapturePre3_GTK();
                }
        }
 
diff --git a/src/gui/forceSensor.cs b/src/gui/forceSensor.cs
index 4777b400..7d5477c0 100644
--- a/src/gui/forceSensor.cs
+++ b/src/gui/forceSensor.cs
@@ -627,6 +627,11 @@ public partial class ChronoJumpWindow
        }
 
        private void forceSensorCapturePre2_GTK()
+       {
+               on_button_execute_test_acceptedPre_start_camera(false);
+       }
+
+       private void forceSensorCapturePre3_GTK()
        {
                button_execute_test.Sensitive = false;
                event_execute_button_finish.Sensitive = true;
diff --git a/src/gui/webcam.cs b/src/gui/webcam.cs
index e9cc05f2..374085e4 100644
--- a/src/gui/webcam.cs
+++ b/src/gui/webcam.cs
@@ -202,7 +202,7 @@ public partial class ChronoJumpWindow
                        }
 
                        if(current_menuitem_mode == Constants.Menuitem_modes.FORCESENSOR)
-                               on_buttons_force_sensor_clicked(button_execute_test, new EventArgs ());
+                               forceSensorCapturePre3_GTK();
                        else
                                on_button_execute_test_accepted ();
 


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