[chronojump] runEncoder gui moved to app1



commit 5171ad809a5711c61878b791017815370f267370
Author: Xavier de Blas <xaviblas gmail com>
Date:   Thu Apr 23 17:45:28 2020 +0200

    runEncoder gui moved to app1

 po/POTFILES.in                   |  2 +-
 src/Makefile.am                  |  2 +-
 src/gui/{ => app1}/runEncoder.cs | 34 +++++++++++++++++-----------------
 3 files changed, 19 insertions(+), 19 deletions(-)
---
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 4bbe3f60..49a1caf5 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -69,6 +69,7 @@ src/gui/app1/jumpsWeightFVProfile.cs
 src/gui/app1/pulse.cs
 src/gui/app1/reactionTime.cs
 src/gui/app1/run.cs
+src/gui/app1/runEncoder.cs
 src/gui/app1/session/loadAndImport.cs
 src/gui/app1/session/addEdit.cs
 src/gui/chronopic.cs
@@ -105,7 +106,6 @@ src/gui/reactionTime.cs
 src/gui/repetitiveConditions.cs
 src/gui/report.cs
 src/gui/run.cs
-src/gui/runEncoder.cs
 src/gui/runType.cs
 src/gui/sendLog.cs
 src/gui/server.cs
diff --git a/src/Makefile.am b/src/Makefile.am
index f4fce6df..db3032af 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -27,6 +27,7 @@ SOURCES = \
        gui/app1/pulse.cs\
        gui/app1/reactionTime.cs\
        gui/app1/run.cs\
+       gui/app1/runEncoder.cs\
        gui/cairo/jumpsDjOptimalFall.cs\
        gui/cairo/jumpsEvolution.cs\
        gui/cairo/jumpsProfile.cs\
@@ -55,7 +56,6 @@ SOURCES = \
        gui/jumpType.cs\
        gui/restTime.cs\
        gui/run.cs\
-       gui/runEncoder.cs\
        gui/runType.cs\
        gui/reactionTime.cs\
        gui/pulse.cs\
diff --git a/src/gui/runEncoder.cs b/src/gui/app1/runEncoder.cs
similarity index 98%
rename from src/gui/runEncoder.cs
rename to src/gui/app1/runEncoder.cs
index bf16e5fd..83171d87 100644
--- a/src/gui/runEncoder.cs
+++ b/src/gui/app1/runEncoder.cs
@@ -1031,22 +1031,22 @@ public partial class ChronoJumpWindow
 
        private bool pulseGTKRunEncoderCapture ()
        {
-LogB.Information(" re A ");
+               LogB.Information(" re A ");
                if(runEncoderCaptureThread == null)
                {
                        Thread.Sleep (25);
                        return true;
                }
 
-LogB.Information(" re B ");
+               LogB.Information(" re B ");
                //LogB.Information(capturingRunEncoder.ToString())
                if(! runEncoderCaptureThread.IsAlive || runEncoderProcessFinish || runEncoderProcessCancel || 
runEncoderProcessError)
                {
-LogB.Information(" re C ");
+                       LogB.Information(" re C ");
                        button_video_play_this_test_contacts.Sensitive = false;
                        if(runEncoderProcessFinish)
                        {
-LogB.Information(" re C finish");
+                               LogB.Information(" re C finish");
                                if(capturingRunEncoder != arduinoCaptureStatus.COPIED_TO_TMP)
                                {
                                        Thread.Sleep (25); //Wait file is copied
@@ -1103,10 +1103,10 @@ LogB.Information(" re C finish");
                                                forceSensorDoGraphAI();
                                        */
                                }
-LogB.Information(" re C finish 2");
+                               LogB.Information(" re C finish 2");
                        } else if(runEncoderProcessCancel || runEncoderProcessError)
                        {
-LogB.Information(" re C cancel ");
+                               LogB.Information(" re C cancel ");
                                //stop the camera (and do not save)
                                webcamEnd (Constants.TestTypes.RACEANALYZER, -1);
                                sensitiveLastTestButtons(false);
@@ -1117,7 +1117,7 @@ LogB.Information(" re C cancel ");
                                        event_execute_label_message.Text = "Cancelled.";
                                else
                                        event_execute_label_message.Text = runEncoderNotConnectedString;
-LogB.Information(" re C cancel 2");
+                               LogB.Information(" re C cancel 2");
                        }
                        else
                                event_execute_label_message.Text = "";
@@ -1131,7 +1131,7 @@ LogB.Information(" re C cancel 2");
                         */
                        while(runEncoderCaptureThread.IsAlive)
                                Thread.Sleep (250);
-LogB.Information(" re D ");
+                       LogB.Information(" re D ");
 
                        LogB.ThreadEnded(); 
 
@@ -1153,23 +1153,23 @@ LogB.Information(" re D ");
                        event_execute_label_message.Text = runEncoderPulseMessage;
 
 
-LogB.Information(" re E ");
-/*
+               LogB.Information(" re E ");
+               /*
                if(forceCaptureStartMark)
                {
                        event_execute_label_message.Text = "Capturing ...";
                        forceCaptureStartMark = false;
                }
                */
-LogB.Information(" re F ");
+               LogB.Information(" re F ");
 
                if(capturingRunEncoder == arduinoCaptureStatus.CAPTURING)
                {
-LogB.Information(" re G ");
+                       LogB.Information(" re G ");
 
 
-LogB.Information(" re H2 ");
-/*
+                       LogB.Information(" re H2 ");
+                       /*
                        if(usbDisconnectedLastTime == forceSensorValues.TimeLast)
                        {
                                usbDisconnectedCount ++;
@@ -1187,11 +1187,11 @@ LogB.Information(" re H2 ");
                        }
                        */
 
-LogB.Information(" re I ");
+                       LogB.Information(" re I ");
 
-LogB.Information(" re Q ");
+                       LogB.Information(" re Q ");
                }
-LogB.Information(" re R ");
+               LogB.Information(" re R ");
 
                Thread.Sleep (25);
                //LogB.Information(" RunEncoder:"+ runEncoderCaptureThread.ThreadState.ToString());


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