[chronojump] Fixed loosing videoURL os signal after recalculate
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] Fixed loosing videoURL os signal after recalculate
- Date: Mon, 9 Feb 2015 00:23:34 +0000 (UTC)
commit 66978f22a66a9be8986d7d330001879d83315359
Author: Xavier de Blas <xaviblas gmail com>
Date: Sun Feb 8 19:50:37 2015 +0000
Fixed loosing videoURL os signal after recalculate
src/gui/encoder.cs | 27 ++++++++++++++++++++-------
1 files changed, 20 insertions(+), 7 deletions(-)
---
diff --git a/src/gui/encoder.cs b/src/gui/encoder.cs
index 0264c04..a263d48 100644
--- a/src/gui/encoder.cs
+++ b/src/gui/encoder.cs
@@ -706,6 +706,16 @@ public partial class ChronoJumpWindow
string analysisOptions = getEncoderAnalysisOptions();
+ //without this we loose the videoURL on recalculate
+ string videoURL = "";
+ if(encoderSignalUniqueID != null && encoderSignalUniqueID != "-1") {
+ string file = Util.GetVideoFileName(currentSession.UniqueID,
+ Constants.TestTypes.ENCODER, Convert.ToInt32(encoderSignalUniqueID));
+
+ if(file != null && file != "" && File.Exists(file))
+ videoURL = file;
+ }
+
//see explanation on the top of this file
lastEncoderSQLSignal = new EncoderSQL(
"-1",
@@ -721,7 +731,7 @@ public partial class ChronoJumpWindow
(int) encoderCaptureOptionsWin.spin_encoder_capture_time.Value,
(int) encoderCaptureOptionsWin.spin_encoder_capture_min_height.Value,
"", //desc,
- "","", //status, videoURL
+ "", videoURL, //status, videoURL
encoderConfigurationCurrent,
"","","", //future1, 2, 3
Util.FindOnArray(':', 2, 1, UtilGtk.ComboGetActive(combo_encoder_exercise),
@@ -1849,8 +1859,12 @@ public partial class ChronoJumpWindow
}
}
else {
+ LogB.Warning("TOSTRING1");
+ eSQL.ToString();
//only signal is updated
SqliteEncoder.Update(false, eSQL); //Adding on SQL
+ LogB.Warning("TOSTRING2");
+ eSQL.ToString();
feedback = Catalog.GetString("Set updated");
}
@@ -5145,11 +5159,6 @@ LogB.Debug("D");
encoder_pulsebar_capture.Text = Catalog.GetString("Finished");
}
else if(action == encoderActions.CURVES || action == encoderActions.LOAD) {
-
- if(action == encoderActions.LOAD) {
- playVideoEncoderPrepare(false); //do not play
- }
-
//this notebook has capture (signal plotting), and curves (shows R graph)
if(notebook_encoder_capture.CurrentPage == 0)
notebook_encoder_capture.NextPage();
@@ -5245,6 +5254,10 @@ LogB.Debug("D");
findAndMarkSavedCurves();
}
+
+ if(action == encoderActions.LOAD) {
+ playVideoEncoderPrepare(false); //do not play
+ }
}
if(action == encoderActions.CAPTURE_IM && ! encoderProcessCancel && !
encoderProcessProblems)
@@ -5402,7 +5415,7 @@ LogB.Debug("D");
string file = Util.GetVideoFileName(currentSession.UniqueID,
Constants.TestTypes.ENCODER, Convert.ToInt32(encoderSignalUniqueID));
- if(file == null || file == "")
+ if(file == null || file == "" || ! File.Exists(file))
return;
try {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]