[chronojump] Fixed inertia mommentum calculation on No RDotNet
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] Fixed inertia mommentum calculation on No RDotNet
- Date: Sat, 28 Feb 2015 11:59:20 +0000 (UTC)
commit 9896b5f7cd2fe7d8f542af210b37dc722373d02e
Author: Xavier de Blas <xaviblas gmail com>
Date: Sat Feb 28 12:58:40 2015 +0100
Fixed inertia mommentum calculation on No RDotNet
src/gui/encoder.cs | 6 ++----
src/utilEncoder.cs | 2 +-
2 files changed, 3 insertions(+), 5 deletions(-)
---
diff --git a/src/gui/encoder.cs b/src/gui/encoder.cs
index f974d06..f644de8 100644
--- a/src/gui/encoder.cs
+++ b/src/gui/encoder.cs
@@ -2367,7 +2367,6 @@ public partial class ChronoJumpWindow
sendCurve = false;
}
- //LogB.Debug(curve.ToString());
if(sendCurve) {
UtilEncoder.RunEncoderCaptureNoRDotNetSendCurve(
pCaptureNoRDotNet,
@@ -4644,8 +4643,7 @@ public partial class ChronoJumpWindow
//encoder_pulsebar_capture.Text = Catalog.GetString("Please, wait.");
LogB.Information("encoderThreadStart begins");
if( runEncoderCaptureCsharpCheckPort(chronopicWin.GetEncoderPort()) ) {
- if(action == encoderActions.CAPTURE) {
-
+ //if(action == encoderActions.CAPTURE) {
if(useRDotNet) {
if(RInitialized == Constants.Status.UNSTARTED)
rengine =
UtilEncoder.RunEncoderCaptureCsharpInitializeR(rengine, out RInitialized);
@@ -4664,7 +4662,7 @@ public partial class ChronoJumpWindow
*/
} else
runEncoderCaptureNoRDotNetInitialize();
- }
+ //}
image_encoder_width = UtilGtk.WidgetWidth(viewport_image_encoder_capture)-5;
image_encoder_height = UtilGtk.WidgetHeight(viewport_image_encoder_capture)-5;
diff --git a/src/utilEncoder.cs b/src/utilEncoder.cs
index b85f675..88fd463 100644
--- a/src/utilEncoder.cs
+++ b/src/utilEncoder.cs
@@ -483,7 +483,7 @@ public class UtilEncoder
string curveSend = "ps " + Util.ConvertToPoint(heightAtStart);
LogB.Debug("curveSend [heightAtStart]",curveSend);
p.StandardInput.WriteLine(curveSend);
-
+
curveSend = curveCompressed;
//TODO convert comma to point in this doubles
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]