[chronojump] JumpsEvolution graph can be saved



commit aaeda88c40be5c6517726abac8c78ae8f2700e01
Author: Xavier de Blas <xaviblas gmail com>
Date:   Fri Jan 10 12:01:49 2020 +0100

    JumpsEvolution graph can be saved

 glade/app1.glade               | 31 +++++++++++++++++++------------
 src/constants.cs               |  2 +-
 src/gui/app1/icons.cs          |  3 +++
 src/gui/app1/jumpsEvolution.cs |  4 +---
 src/gui/encoder.cs             |  7 +++++++
 5 files changed, 31 insertions(+), 16 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index 7c410ffc..62757a1a 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -19119,6 +19119,7 @@ Concentric</property>
                                                             <property name="can_focus">True</property>
                                                             <property name="receives_default">True</property>
                                                             <property name="tooltip" translatable="yes">Save 
image</property>
+                                                            <signal name="clicked" 
handler="on_button_jumps_evolution_save_image_clicked" swapped="no"/>
                                                             <child>
                                                             <widget class="GtkVBox" id="vbox164">
                                                             <property name="visible">True</property>
@@ -22767,6 +22768,9 @@ Concentric</property>
                                                             <child>
                                                             <placeholder/>
                                                             </child>
+                                                            <child>
+                                                            <placeholder/>
+                                                            </child>
                                                             </widget>
                                                             <packing>
                                                             <property name="expand">False</property>
@@ -25014,18 +25018,6 @@ Concentric</property>
                                                             <property name="can_focus">False</property>
                                                             <property name="spacing">6</property>
                                                             <child>
-                                                            <widget class="GtkLabel" 
id="label_video_encoder_tests_will_be_filmed">
-                                                            <property name="can_focus">False</property>
-                                                            <property name="label" translatable="yes">Tests 
will be filmed</property>
-                                                            </widget>
-                                                            <packing>
-                                                            <property name="expand">False</property>
-                                                            <property name="fill">False</property>
-                                                            <property name="pack_type">end</property>
-                                                            <property name="position">0</property>
-                                                            </packing>
-                                                            </child>
-                                                            <child>
                                                             <widget class="GtkHBox" 
id="hbox_video_encoder_capturing">
                                                             <property name="can_focus">False</property>
                                                             <property name="spacing">4</property>
@@ -25062,6 +25054,18 @@ Concentric</property>
                                                             </packing>
                                                             </child>
                                                             <child>
+                                                            <widget class="GtkLabel" 
id="label_video_encoder_tests_will_be_filmed">
+                                                            <property name="can_focus">False</property>
+                                                            <property name="label" translatable="yes">Tests 
will be filmed</property>
+                                                            </widget>
+                                                            <packing>
+                                                            <property name="expand">False</property>
+                                                            <property name="fill">False</property>
+                                                            <property name="pack_type">end</property>
+                                                            <property name="position">0</property>
+                                                            </packing>
+                                                            </child>
+                                                            <child>
                                                             <widget class="GtkHBox" 
id="hbox_video_encoder_no_capturing">
                                                             <property name="visible">True</property>
                                                             <property name="can_focus">False</property>
@@ -32300,6 +32304,9 @@ then click this button.</property>
                                                             <child>
                                                             <placeholder/>
                                                             </child>
+                                                            <child>
+                                                            <placeholder/>
+                                                            </child>
                                                             </widget>
                                                             <packing>
                                                             <property name="expand">False</property>
diff --git a/src/constants.cs b/src/constants.cs
index a7a83992..ab187b16 100644
--- a/src/constants.cs
+++ b/src/constants.cs
@@ -1076,7 +1076,7 @@ public class Constants
 
        public enum EncoderGI {ALL, GRAVITATORY, INERTIAL}
        public enum CheckFileOp {
-               JUMPS_PROFILE_SAVE_IMAGE, JUMPS_DJ_OPTIMAL_FALL_SAVE_IMAGE, 
JUMPS_WEIGHT_FV_PROFILE_SAVE_IMAGE,
+               JUMPS_PROFILE_SAVE_IMAGE, JUMPS_DJ_OPTIMAL_FALL_SAVE_IMAGE, 
JUMPS_WEIGHT_FV_PROFILE_SAVE_IMAGE, JUMPS_EVOLUTION_SAVE_IMAGE,
                RUNS_SPRINT_SAVE_IMAGE,
                ENCODER_CAPTURE_EXPORT_ALL, ENCODER_ANALYZE_SAVE_IMAGE,
                ENCODER_ANALYZE_SEND_IMAGE, //like save image but just defines the name exportFileName to be 
sended
diff --git a/src/gui/app1/icons.cs b/src/gui/app1/icons.cs
index 6777c389..096eb1f0 100644
--- a/src/gui/app1/icons.cs
+++ b/src/gui/app1/icons.cs
@@ -214,6 +214,7 @@ public partial class ChronoJumpWindow
        [Widget] Gtk.Image image_forcesensor_analyze_image_save1;
        [Widget] Gtk.Image image_forcesensor_analyze_image_save2;
        [Widget] Gtk.Image image_forcesensor_analyze_image_save3;
+       [Widget] Gtk.Image image_forcesensor_analyze_image_save4;
        [Widget] Gtk.Image image_forcesensor_analyze_image_save5;
        [Widget] Gtk.Image image_forcesensor_analyze_image_save6;
        [Widget] Gtk.Image image_forcesensor_analyze_image_save7;
@@ -679,6 +680,7 @@ public partial class ChronoJumpWindow
                image_jumps_profile_save.Pixbuf = pixbuf;
                image_jumps_dj_optimal_fall_save.Pixbuf = pixbuf;
                image_jumps_weight_fv_profile_save.Pixbuf = pixbuf;
+               image_jumps_evolution_save.Pixbuf = pixbuf;
                image_encoder_analyze_image_compujump_send_email_image.Pixbuf = pixbuf;
 
                pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "save.png");
@@ -691,6 +693,7 @@ public partial class ChronoJumpWindow
                image_forcesensor_analyze_image_save1.Pixbuf = pixbuf;
                image_forcesensor_analyze_image_save2.Pixbuf = pixbuf;
                image_forcesensor_analyze_image_save3.Pixbuf = pixbuf;
+               image_forcesensor_analyze_image_save4.Pixbuf = pixbuf;
                image_forcesensor_analyze_image_save5.Pixbuf = pixbuf;
                image_forcesensor_analyze_image_save6.Pixbuf = pixbuf;
                image_forcesensor_analyze_image_save7.Pixbuf = pixbuf;
diff --git a/src/gui/app1/jumpsEvolution.cs b/src/gui/app1/jumpsEvolution.cs
index c707d420..5731fbee 100644
--- a/src/gui/app1/jumpsEvolution.cs
+++ b/src/gui/app1/jumpsEvolution.cs
@@ -111,10 +111,9 @@ public partial class ChronoJumpWindow
        //TODO
        private void on_button_jumps_evolution_save_image_clicked (object o, EventArgs args)
        {
-               //checkFile(Constants.CheckFileOp.JUMPS_EVOLUTION_SAVE_IMAGE);
+               checkFile(Constants.CheckFileOp.JUMPS_EVOLUTION_SAVE_IMAGE);
        }
 
-       /*
        private void on_button_jumps_evolution_save_image_selected (string destination)
        {
                if(drawingarea_jumps_evolution == null)
@@ -135,6 +134,5 @@ public partial class ChronoJumpWindow
                string myString = string.Format(Catalog.GetString("Saved to {0}"), exportFileName);
                new DialogMessage(Constants.MessageTypes.INFO, myString);
        }
-       */
 
 }
diff --git a/src/gui/encoder.cs b/src/gui/encoder.cs
index e40bf115..72124c1b 100644
--- a/src/gui/encoder.cs
+++ b/src/gui/encoder.cs
@@ -2035,6 +2035,7 @@ public partial class ChronoJumpWindow
                                checkFileOp == Constants.CheckFileOp.JUMPS_PROFILE_SAVE_IMAGE ||
                                checkFileOp == Constants.CheckFileOp.JUMPS_DJ_OPTIMAL_FALL_SAVE_IMAGE ||
                                checkFileOp == Constants.CheckFileOp.JUMPS_WEIGHT_FV_PROFILE_SAVE_IMAGE ||
+                               checkFileOp == Constants.CheckFileOp.JUMPS_EVOLUTION_SAVE_IMAGE ||
                                checkFileOp == Constants.CheckFileOp.RUNS_SPRINT_SAVE_IMAGE ||
                                checkFileOp == Constants.CheckFileOp.ENCODER_ANALYZE_SAVE_IMAGE ||
                                checkFileOp == Constants.CheckFileOp.FORCESENSOR_SAVE_IMAGE_SIGNAL ||
@@ -2089,6 +2090,7 @@ public partial class ChronoJumpWindow
                                checkFileOp == Constants.CheckFileOp.JUMPS_PROFILE_SAVE_IMAGE ||
                                checkFileOp == Constants.CheckFileOp.JUMPS_DJ_OPTIMAL_FALL_SAVE_IMAGE ||
                                checkFileOp == Constants.CheckFileOp.JUMPS_WEIGHT_FV_PROFILE_SAVE_IMAGE ||
+                               checkFileOp == Constants.CheckFileOp.JUMPS_EVOLUTION_SAVE_IMAGE ||
                                checkFileOp == Constants.CheckFileOp.RUNS_SPRINT_SAVE_IMAGE ||
                                checkFileOp == Constants.CheckFileOp.ENCODER_ANALYZE_SAVE_IMAGE ||
                                checkFileOp == Constants.CheckFileOp.FORCESENSOR_SAVE_IMAGE_SIGNAL ||
@@ -2144,6 +2146,9 @@ public partial class ChronoJumpWindow
                                        if(checkFileOp == 
Constants.CheckFileOp.JUMPS_WEIGHT_FV_PROFILE_SAVE_IMAGE)
                                                confirmWin.Button_accept.Clicked +=
                                                        new 
EventHandler(on_overwrite_file_jumps_weight_fv_profile_save_image_accepted);
+                                       if(checkFileOp == Constants.CheckFileOp.JUMPS_EVOLUTION_SAVE_IMAGE)
+                                               confirmWin.Button_accept.Clicked +=
+                                                       new 
EventHandler(on_overwrite_file_jumps_evolution_save_image_accepted);
                                        if(checkFileOp == Constants.CheckFileOp.RUNS_SPRINT_SAVE_IMAGE)
                                                confirmWin.Button_accept.Clicked +=
                                                        new 
EventHandler(on_overwrite_file_runs_sprint_save_image_accepted);
@@ -2179,6 +2184,8 @@ public partial class ChronoJumpWindow
                                                on_button_jumps_dj_optimal_fall_save_image_selected 
(exportFileName);
                                        else if(checkFileOp == 
Constants.CheckFileOp.JUMPS_WEIGHT_FV_PROFILE_SAVE_IMAGE)
                                                on_button_jumps_weight_fv_profile_save_image_selected 
(exportFileName);
+                                       else if(checkFileOp == 
Constants.CheckFileOp.JUMPS_EVOLUTION_SAVE_IMAGE)
+                                               on_button_jumps_evolution_save_image_selected 
(exportFileName);
                                        else if(checkFileOp == Constants.CheckFileOp.RUNS_SPRINT_SAVE_IMAGE)
                                                on_button_runs_sprint_save_image_selected (exportFileName);
                                        else if(checkFileOp == 
Constants.CheckFileOp.ENCODER_CAPTURE_EXPORT_ALL)


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