[chronojump] Encoder capture file not hardcoded (to work on windows)
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] Encoder capture file not hardcoded (to work on windows)
- Date: Tue, 10 Mar 2015 10:32:25 +0000 (UTC)
commit 93430e3972a9360d41100452d61fffc9bd4e8c6b
Author: Xavier de Blas <xaviblas gmail com>
Date: Tue Mar 10 11:32:00 2015 +0100
Encoder capture file not hardcoded (to work on windows)
encoder/capture.R | 2 +-
src/constants.cs | 1 +
src/gui/encoder.cs | 6 +++---
src/utilEncoder.cs | 3 +++
4 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/encoder/capture.R b/encoder/capture.R
index da362a1..4375ddf 100644
--- a/encoder/capture.R
+++ b/encoder/capture.R
@@ -30,7 +30,7 @@ g = 9.81
debug = FALSE
-filename = "/tmp/captured.txt"; #TODO HARDCODED!!!
+filename = options[1]
file.create(filename)
diff --git a/src/constants.cs b/src/constants.cs
index 90b59ca..3da3323 100644
--- a/src/constants.cs
+++ b/src/constants.cs
@@ -712,6 +712,7 @@ public class Constants
//public static string EncoderScriptGraphCall =
//"/home/xavier/informatica/progs_meus/chronojump/chronojump/encoder/call_graph.py";
+ public static string EncoderCaptureTemp = "chronojump-captured-data.txt";
public static string EncoderDataTemp = "chronojump-last-encoder-data.txt";
public static string EncoderCurvesTemp = "chronojump-last-encoder-curves.txt";
public static string EncoderAnalyzeTableTemp = "chronojump-last-encoder-analyze-table.txt";
diff --git a/src/gui/encoder.cs b/src/gui/encoder.cs
index c717345..0302c3f 100644
--- a/src/gui/encoder.cs
+++ b/src/gui/encoder.cs
@@ -4705,7 +4705,7 @@ public partial class ChronoJumpWindow
"meanPower,peakPower,peakPowerT,pp_ppt," +
"meanForce, maxForce, maxForceT");
- string filename = "/tmp/captured.txt"; //HARDCODED
+ string filename = UtilEncoder.GetEncoderCaptureTempFileName();
if(File.Exists(filename))
File.Delete(filename);
@@ -4892,7 +4892,7 @@ public partial class ChronoJumpWindow
);
EncoderStruct es = new EncoderStruct(
- "none", //UtilEncoder.GetEncoderDataTempFileName(),
+ UtilEncoder.GetEncoderCaptureTempFileName(),
//UtilEncoder.GetEncoderDataTempFileName(), //used here print the captured data file
"none", //UtilEncoder.GetEncoderGraphTempFileName(),
"none", //UtilEncoder.GetEncoderCurvesTempFileName(),
"none", //UtilEncoder.GetEncoderStatusTempBaseFileName(),
@@ -5042,7 +5042,7 @@ LogB.Debug("D");
//private void readingCurveFromR (object sendingProcess, DataReceivedEventArgs curveFromR)
private void readingCurveFromR ()
{
- string filename = "/tmp/captured.txt"; //HARDCODED
+ string filename = UtilEncoder.GetEncoderCaptureTempFileName();
if(! File.Exists(filename))
return;
diff --git a/src/utilEncoder.cs b/src/utilEncoder.cs
index 5bf5bd1..de18bf3 100644
--- a/src/utilEncoder.cs
+++ b/src/utilEncoder.cs
@@ -93,6 +93,9 @@ public class UtilEncoder
}
}
+ public static string GetEncoderCaptureTempFileName() {
+ return Path.Combine(Path.GetTempPath(), Constants.EncoderCaptureTemp);
+ }
public static string GetEncoderDataTempFileName() {
return Path.Combine(Path.GetTempPath(), Constants.EncoderDataTemp);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]