[chronojump] Encoder: Fixed problems on end of capture



commit 50777b49995344e31e03dcd8963ade5f8d0d02b2
Author: Xavier de Blas <xaviblas gmail com>
Date:   Mon Feb 25 19:28:09 2013 +0100

    Encoder: Fixed problems on end of capture

 src/gui/encoder.cs |   19 ++++++++++---------
 1 files changed, 10 insertions(+), 9 deletions(-)
---
diff --git a/src/gui/encoder.cs b/src/gui/encoder.cs
index 8a81b24..7220f38 100644
--- a/src/gui/encoder.cs
+++ b/src/gui/encoder.cs
@@ -2286,25 +2286,26 @@ Log.WriteLine("RRR4");
                                mode == encoderModes.RECALCULATE_OR_LOAD )
                {
                        Log.WriteLine("ffffffinishPulsebarrrrr");
+                       
                        if(encoderProcessCancel) {
                                //encoderButtonsSensitive(encoderSensEnum.DONEYESSIGNAL);
                                encoderButtonsSensitive(encoderSensEnumStored);
                                encoder_pulsebar_capture.Text = Catalog.GetString("Cancelled");
                                if(notebook_encoder_capture.CurrentPage == 0 )
                                        notebook_encoder_capture.NextPage();
+                               encoder_pulsebar_capture.Fraction = 1;
                        }
-
-                       if(
-                               ( mode == encoderModes.CALCULECURVES || 
-                                 mode == encoderModes.RECALCULATE_OR_LOAD ) &&
-                               notebook_encoder_capture.CurrentPage == 0 )
-                                       notebook_encoder_capture.NextPage();
-
-                       if(mode == encoderModes.CAPTURE && encoderProcessFinish) {
+                       else if(mode == encoderModes.CAPTURE && encoderProcessFinish) {
                                //encoderButtonsSensitive(encoderSensEnum.DONEYESSIGNAL);
                                encoderButtonsSensitive(encoderSensEnumStored);
                                encoder_pulsebar_capture.Text = Catalog.GetString("Finished");
-                       } else {
+                       } 
+                       else if(mode == encoderModes.CALCULECURVES || 
+                                       mode == encoderModes.RECALCULATE_OR_LOAD) {
+
+                               if(notebook_encoder_capture.CurrentPage == 0)
+                                       notebook_encoder_capture.NextPage();
+
                                Pixbuf pixbuf = new Pixbuf (Util.GetEncoderGraphTempFileName()); //from a file
                                image_encoder_capture.Pixbuf = pixbuf;
                                encoderUpdateTreeView();


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]