[chronojump] encoder small fix

[Xavier de Blas <xaviblas src gnome org>]

commit d97538ca79b3ff9ec30aab6a22a0714d32cb986c
Author: Xavier de Blas <xaviblas gmail com>
Date:   Wed Jan 16 18:30:53 2013 +0100

    encoder small fix

 encoder/graph.R    |   10 +++++-----
 src/gui/encoder.cs |    7 +------
 2 files changed, 6 insertions(+), 11 deletions(-)
---
diff --git a/encoder/graph.R b/encoder/graph.R
index dd6c564..4d6f67a 100644
--- a/encoder/graph.R
+++ b/encoder/graph.R
@@ -66,7 +66,7 @@ width=as.numeric(options[13])
 height=as.numeric(options[14])
 Title=options[15]
 
-write("(1/4) Starting R", outputData2)
+write("(1/5) Starting R", outputData2)
 
 
 #this will replace below methods: findPics1ByMinindex, findPics2BySpeed
@@ -680,12 +680,12 @@ quitIfNoData <- function(n, curves, outputData1) {
 	}
 }
 
-write("(1/4) Calling EMD", outputData2)
+write("(2/5) Calling EMD", outputData2)
 
 library("EMD")
 #library("sfsmisc")
 
-write("(2/4) Starting process", outputData2)
+write("(3/5) Starting process", outputData2)
 
 if(analysis != "exportCSV") {
 	png(outputGraph, width=width, height=height)
@@ -853,7 +853,7 @@ if(! singleFile) {
 	}
 }
 
-write("(3/4) Curves processed", outputData2)
+write("(4/5) Curves processed", outputData2)
 
 if(analysis=="single") {
 	if(jump>0) {
@@ -1088,7 +1088,7 @@ if(analysis=="exportCSV") {
 if(analysis != "exportCSV")
 	dev.off()
 
-write("(4/4) R tasks done", outputData2)
+write("(5/5) R tasks done", outputData2)
 
 warnings()
 
diff --git a/src/gui/encoder.cs b/src/gui/encoder.cs
index 7e32145..1944739 100644
--- a/src/gui/encoder.cs
+++ b/src/gui/encoder.cs
@@ -1880,7 +1880,6 @@ public partial class ChronoJumpWindow
 			encoder_pulsebar_capture.Fraction = 1;
 
 		} else { //ANALYZE
-			bool analyzedCurvesOk = false;
 			if(encoderProcessCancel) {
 				encoderProcessCancel = false;
 				encoder_pulsebar_analyze.Text = Catalog.GetString("Cancelled");
@@ -1890,15 +1889,11 @@ public partial class ChronoJumpWindow
 				Pixbuf pixbuf = new Pixbuf (Util.GetEncoderGraphTempFileName()); //from a file
 				image_encoder_analyze.Pixbuf = pixbuf;
 				encoder_pulsebar_analyze.Text = "";
-				if(radiobutton_encoder_analyze_data_user_curves.Active)
-					analyzedCurvesOk = true;
 			}
 
 			encoder_pulsebar_analyze.Fraction = 1;
-		
 			encoderButtonsSensitive(encoderSensEnumStored);
-			if(analyzedCurvesOk)
-				image_encoder_analyze.Sensitive = true;
+			image_encoder_analyze.Sensitive = true;
 		}
 
 		treeview_encoder_curves.Sensitive = true;