[chronojump] Encoder capture with sounds (untested)
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] Encoder capture with sounds (untested)
- Date: Thu, 6 Mar 2014 13:41:43 +0000 (UTC)
commit 140e439cbc2efd6a9f3545a5d7bd448a6974c89c
Author: Xavier de Blas <xaviblas gmail com>
Date: Thu Mar 6 14:41:21 2014 +0100
Encoder capture with sounds (untested)
src/gui/chronojump.cs | 3 ++-
src/gui/encoder.cs | 29 +++++++++++++++++++++--------
2 files changed, 23 insertions(+), 9 deletions(-)
---
diff --git a/src/gui/chronojump.cs b/src/gui/chronojump.cs
index ce99183..5c8857d 100644
--- a/src/gui/chronojump.cs
+++ b/src/gui/chronojump.cs
@@ -5425,7 +5425,8 @@ Console.WriteLine("X");
string mainVariable = encoderCaptureOptionsWin.GetMainVariable();
double mainVariableHigher =
encoderCaptureOptionsWin.GetMainVariableHigher(mainVariable);
double mainVariableLower =
encoderCaptureOptionsWin.GetMainVariableLower(mainVariable);
- plotCurvesGraphDoPlot(mainVariable, mainVariableHigher, mainVariableLower,
captureCurvesBarsData);
+ plotCurvesGraphDoPlot(mainVariable, mainVariableHigher, mainVariableLower,
captureCurvesBarsData,
+ false); //not capturing
} else
UtilGtk.ErasePaint(encoder_capture_curves_bars_drawingarea,
encoder_capture_curves_bars_pixmap);
}
diff --git a/src/gui/encoder.cs b/src/gui/encoder.cs
index c1d2b7b..c5a2d89 100644
--- a/src/gui/encoder.cs
+++ b/src/gui/encoder.cs
@@ -4174,7 +4174,8 @@ Log.WriteLine(str);
else //mainVariable == Constants.PeakPower
captureCurvesBarsData.Add(peakPower);
- plotCurvesGraphDoPlot(mainVariable, mainVariableHigher, mainVariableLower,
captureCurvesBarsData);
+ plotCurvesGraphDoPlot(mainVariable, mainVariableHigher, mainVariableLower,
captureCurvesBarsData,
+ true); //capturing
}
@@ -4199,7 +4200,8 @@ Log.WriteLine(str);
ecca.curvesDone ++;
}
- void plotCurvesGraphDoPlot(string mainVariable, double mainVariableHigher, double mainVariableLower,
ArrayList data) {
+ //if we are capturing, play sounds
+ void plotCurvesGraphDoPlot(string mainVariable, double mainVariableHigher, double mainVariableLower,
ArrayList data, bool capturing) {
Log.WriteLine("at plotCurvesGraphDoPlot");
UtilGtk.ErasePaint(encoder_capture_curves_bars_drawingarea,
encoder_capture_curves_bars_pixmap);
@@ -4269,11 +4271,19 @@ Log.WriteLine(str);
dLeft = left_margin + dWidth * count;
dWidth = dWidth - sep;
- //select pen color for bars
- if(mainVariableHigher != -1 && d >= mainVariableHigher)
+ //select pen color for bars and sounds
+ if(mainVariableHigher != -1 && d >= mainVariableHigher) {
my_pen = pen_green_encoder_capture;
- else if(mainVariableLower != -1 && d <= mainVariableLower)
+ //play sound if value is high, volumeOn == true, is last value, capturing
+ if(volumeOn && count == data.Count -1 && capturing)
+ Util.PlaySound(Constants.SoundTypes.GOOD, volumeOn);
+ }
+ else if(mainVariableLower != -1 && d <= mainVariableLower) {
my_pen = pen_red_encoder_capture;
+ //play sound if value is low, volumeOn == true, is last value, capturing
+ if(volumeOn && count == data.Count -1 && capturing)
+ Util.PlaySound(Constants.SoundTypes.BAD, volumeOn);
+ }
else
my_pen = pen_azul_encoder_capture;
@@ -4321,7 +4331,8 @@ Log.WriteLine(str);
string mainVariable = encoderCaptureOptionsWin.GetMainVariable();
double mainVariableHigher =
encoderCaptureOptionsWin.GetMainVariableHigher(mainVariable);
double mainVariableLower =
encoderCaptureOptionsWin.GetMainVariableLower(mainVariable);
- plotCurvesGraphDoPlot(mainVariable, mainVariableHigher, mainVariableLower,
captureCurvesBarsData);
+ plotCurvesGraphDoPlot(mainVariable, mainVariableHigher, mainVariableLower,
captureCurvesBarsData,
+ false); //not capturing
} else
UtilGtk.ErasePaint(encoder_capture_curves_bars_drawingarea,
encoder_capture_curves_bars_pixmap);
@@ -4351,7 +4362,8 @@ Log.WriteLine(str);
string mainVariable = encoderCaptureOptionsWin.GetMainVariable();
double mainVariableHigher =
encoderCaptureOptionsWin.GetMainVariableHigher(mainVariable);
double mainVariableLower =
encoderCaptureOptionsWin.GetMainVariableLower(mainVariable);
- plotCurvesGraphDoPlot(mainVariable, mainVariableHigher, mainVariableLower,
captureCurvesBarsData);
+ plotCurvesGraphDoPlot(mainVariable, mainVariableHigher, mainVariableLower,
captureCurvesBarsData,
+ false); //not capturing
} else
UtilGtk.ErasePaint(encoder_capture_curves_bars_drawingarea,
encoder_capture_curves_bars_pixmap);
@@ -4768,7 +4780,8 @@ Log.WriteLine(str);
else //mainVariable == Constants.PeakPower
captureCurvesBarsData.Add(Convert.ToDouble(curve.PeakPower));
}
- plotCurvesGraphDoPlot(mainVariable, mainVariableHigher, mainVariableLower,
captureCurvesBarsData);
+ plotCurvesGraphDoPlot(mainVariable, mainVariableHigher, mainVariableLower,
captureCurvesBarsData,
+ false); //not capturing
//autosave signal (but not in load)
if(action == encoderActions.CURVES)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]