[chronojump] run_encoder image_test changes when device manual/resisted changes



commit f12e10470fbb87eaf42eefe436bb75a86d5c112e
Author: Xavier de Blas <xaviblas gmail com>
Date:   Thu Sep 26 13:56:02 2019 +0200

    run_encoder image_test changes when device manual/resisted changes

 glade/app1.glade      |  1 +
 src/Makefile.am       |  2 ++
 src/gui/chronojump.cs |  4 ++++
 src/gui/runEncoder.cs | 17 ++++++++++++++++-
 4 files changed, 23 insertions(+), 1 deletion(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index d7b254bc..160345df 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -10346,6 +10346,7 @@ Inverted values</property>
                                                             <property name="active">0</property>
                                                             <property name="items">Manual race analyzer
 Resisted race analyzer</property>
+                                                            <signal name="changed" 
handler="on_combo_race_analyzer_device_changed" swapped="no"/>
                                                             </widget>
                                                             <packing>
                                                             <property name="expand">False</property>
diff --git a/src/Makefile.am b/src/Makefile.am
index 4c3aa91a..700b9701 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -274,6 +274,8 @@ RESOURCES = \
        ../images/selector-rt.png,selector-rt.png \
        ../images/selector-multichronopic.png,selector-multichronopic.png \
        ../images/mini/force_sensor.png,mini/force_sensor.png \
+       ../images/mini/run-encoder-manual.png,mini/run-encoder-manual.png \
+       ../images/mini/run-encoder-resisted.png,mini/run-encoder-resisted.png \
        ../images/board-unknown.png,board-unknown.png \
        ../images/board-jump-run.png,board-jump-run.png \
        ../images/board-encoder.png,board-encoder.png \
diff --git a/src/gui/chronojump.cs b/src/gui/chronojump.cs
index c74fd01f..28b797b2 100644
--- a/src/gui/chronojump.cs
+++ b/src/gui/chronojump.cs
@@ -3428,6 +3428,10 @@ public partial class ChronoJumpWindow
                        notebook_capture_graph_table.CurrentPage = 1; //"Show table"
                        notebook_capture_graph_table.ShowTabs = false;
                        */
+
+                       combo_race_analyzer_device.Active = 0;
+                       forceSensorImageTestChange();
+
                }
                else if(m == Constants.Menuitem_modes.RT)
                {
diff --git a/src/gui/runEncoder.cs b/src/gui/runEncoder.cs
index 00f7226d..793a660a 100644
--- a/src/gui/runEncoder.cs
+++ b/src/gui/runEncoder.cs
@@ -260,7 +260,6 @@ public partial class ChronoJumpWindow
        private void initRunEncoder ()
        {
                createRunEncoderExerciseCombo();
-               combo_race_analyzer_device.Active = 0;
        }
 
        private void raceEncoderReadWidgets()
@@ -289,6 +288,22 @@ public partial class ChronoJumpWindow
                        combo_race_analyzer_device.Active = 
UtilGtk.ComboMakeActive(combo_race_analyzer_device, RunEncoder.DevicesStringMANUAL);
        }
 
+       private void on_combo_race_analyzer_device_changed (object o, EventArgs args)
+       {
+               forceSensorImageTestChange();
+       }
+
+       private void forceSensorImageTestChange()
+       {
+               Pixbuf pixbuf; //main image
+               if(UtilGtk.ComboGetActive(combo_race_analyzer_device) == RunEncoder.DevicesStringMANUAL)
+                       pixbuf = new Pixbuf (null, Util.GetImagePath(true) + "run-encoder-manual.png");
+               else
+                       pixbuf = new Pixbuf (null, Util.GetImagePath(true) + "run-encoder-resisted.png");
+
+               image_test.Pixbuf = pixbuf;
+       }
+
        private void raceEncoderSetDistanceAndTemp(int distance, int temp)
        {
                race_analyzer_spinbutton_distance.Value = distance;


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