[chronojump] Fixed run encoder graph at first capture
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] Fixed run encoder graph at first capture
- Date: Thu, 16 Jul 2020 10:08:45 +0000 (UTC)
commit c3e0ef327e79c19829f2536d7537e915bb9c4e06
Author: Xavier de Blas <xaviblas gmail com>
Date: Thu Jul 16 12:08:27 2020 +0200
Fixed run encoder graph at first capture
src/gui/app1/runEncoder.cs | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
---
diff --git a/src/gui/app1/runEncoder.cs b/src/gui/app1/runEncoder.cs
index 8f9f4461..4cb00a5a 100644
--- a/src/gui/app1/runEncoder.cs
+++ b/src/gui/app1/runEncoder.cs
@@ -551,7 +551,7 @@ public partial class ChronoJumpWindow
File.Copy(fileName, RunEncoder.GetCSVFileName(), true); //can be overwritten
lastRunEncoderFullPath = fileName;
- raceEncoderCaptureGraphDo();
+ //raceEncoderCaptureGraphDo(); moved to pulseGTKRunEncoderCapture () where
currentRunEncoder is created
capturingRunEncoder = arduinoCaptureStatus.COPIED_TO_TMP;
}
@@ -958,13 +958,6 @@ public partial class ChronoJumpWindow
string title = Util.ChangeSpaceAndMinusForUnderscore(currentPerson.Name) + "-" +
Util.ChangeSpaceAndMinusForUnderscore(UtilGtk.ComboGetActive(combo_run_encoder_exercise));
- string dateTimeGraph = "";
- if(currentRunEncoder != null)
- dateTimeGraph = currentRunEncoder.DateTimePublic;
- else
- dateTimeGraph = UtilDate.ToFile(runEncoderTimeStartCapture);
-
-
bool plotRawAccel =
( Preferences.runEncoderAnalyzeAccel.SqlCurrentName ==
Preferences.runEncoderAnalyzeAFPSqlRAW ||
Preferences.runEncoderAnalyzeAccel.SqlCurrentName ==
Preferences.runEncoderAnalyzeAFPSqlBOTH );
@@ -992,7 +985,7 @@ public partial class ChronoJumpWindow
race_analyzer_temperature,
race_analyzer_device,
title,
- dateTimeGraph,
+ currentRunEncoder.DateTimePublic,
preferences.runEncoderMinAccel,
plotRawAccel, plotFittedAccel,
plotRawForce, plotFittedForce,
@@ -1126,6 +1119,8 @@ public partial class ChronoJumpWindow
sensitiveLastTestButtons(true);
contactsShowCaptureDoingButtons(false);
+ raceEncoderCaptureGraphDo();
+
runEncoderAnalyzeOpenImage();
notebook_analyze.CurrentPage =
Convert.ToInt32(notebook_analyze_pages.RACEENCODER);
radio_mode_contacts_analyze.Active = true;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]