[chronojump/michrolab] Many internal names of encoder images reduced to allow compilation on windows

[Xavier Padullés <xpadulles src gnome org>]

commit a1020b41b296d395964339bc09966adee18885ec
Author: Xavier de Blas <xaviblas gmail com>
Date:   Tue Oct 4 11:28:59 2022 +0200

    Many internal names of encoder images reduced to allow compilation on windows

 src/Makefile.am            | 60 +++++++++++++++++++++++-----------------------
 src/constants.cs           | 54 ++++++++++++++++++++---------------------
 src/gui/app1/chronojump.cs |  6 ++---
 3 files changed, 60 insertions(+), 60 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index e500fb579..cdb36d30e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -688,37 +688,37 @@ RESOURCES = \
        ../images/force_exerted_projected.png,force_exerted_projected.png \
        ../images/er-fr.png,encoder-rotary-friction.png \
        ../images/er-axis.png,encoder-rotary-axis.png \
-       ../images/el-blue.png,encoder-linear-blue.png \
-       ../images/er-fr-blue.png,encoder-rotary-friction-blue.png \
-       ../images/er-axis-blue.png,encoder-rotary-axis-blue.png \
-       ../images/el-free-weight.png,encoder-linear-free-weight.png \
-       ../images/el-free-weight-inv.png,encoder-linear-free-weight-inv.png \
-       ../images/el-inertial.png,encoder-linear-inertial.png \
-       
../images/el-on-person-weighted-moving-pulley1.png,encoder-linear-on-person-weighted-moving-pulley1.png \
-       
../images/el-inv-on-person-weighted-moving-pulley1.png,encoder-linear-inv-on-person-weighted-moving-pulley1.png
 \
-       
../images/el-on-person-weighted-moving-pulley2.png,encoder-linear-on-person-weighted-moving-pulley2.png \
-       
../images/el-inv-on-person-weighted-moving-pulley2.png,encoder-linear-inv-on-person-weighted-moving-pulley2.png
 \
-       ../images/el-on-weighted-moving-pulley.png,encoder-linear-on-weighted-moving-pulley.png \
-       ../images/el-inclined-plane.png,encoder-linear-inclined-plane.png \
-       ../images/el-inclined-plane-weight-diff-angle.png,encoder-linear-inclined-plane-weight-diff-angle.png 
\
-       
../images/el-inclined-plane-weight-diff-angle-mov-pulley.png,encoder-linear-inclined-plane-weight-diff-angle-mov-pulley.png
 \
-       ../images/el-pneumatic.png,encoder-linear-pneumatic.png \
-       ../images/er-fr-pulley.png,encoder-rotary-friction-pulley.png \
-       ../images/er-fr-pulley-axis.png,encoder-rotary-friction-pulley-axis.png \
-       ../images/er-fr-side-inertial.png,encoder-rotary-friction-side-inertial.png \
-       ../images/er-fr-axis-inertial.png,encoder-rotary-friction-axis-inertial.png \
-       ../images/er-fr-side-inertial-lateral.png,encoder-rotary-friction-side-inertial-lateral.png \
-       ../images/er-fr-axis-inertial-lateral.png,encoder-rotary-friction-axis-inertial-lateral.png \
-       ../images/er-fr-side-inertial-mov-pulley.png,encoder-rotary-friction-side-inertial-mov-pulley.png \
-       ../images/er-fr-axis-inertial-mov-pulley.png,encoder-rotary-friction-axis-inertial-mov-pulley.png \
-       
../images/er-fr-on-fixed-pulley-with-weighted-moving-pulley.png,encoder-rotary-friction-on-fixed-pulley-with-weighted-moving-pulley.png
 \
-       ../images/er-axis-pulley-axis.png,encoder-rotary-axis-pulley-axis.png \
-       ../images/er-axis-inertial.png,encoder-rotary-axis-inertial.png \
-       ../images/er-axis-inertial-lateral.png,encoder-rotary-axis-inertial-lateral.png \
-       ../images/er-axis-inertial-mov-pulley.png,encoder-rotary-axis-inertial-mov-pulley.png \
-       ../images/er-axis-inertial-mov-pulley-lateral.png,encoder-rotary-axis-inertial-mov-pulley-lateral.png 
\
+       ../images/el-blue.png,encoder-l-blue.png \
+       ../images/er-fr-blue.png,encoder-rf-blue.png \
+       ../images/er-axis-blue.png,encoder-ra-blue.png \
+       ../images/el-free-weight.png,encoder-l-free-weight.png \
+       ../images/el-free-weight-inv.png,encoder-l-free-weight-inv.png \
+       ../images/el-inertial.png,encoder-l-inertial.png \
+       ../images/el-on-person-weighted-moving-pulley1.png,encoder-l-on-person-weighted-moving-pulley1.png \
+       
../images/el-inv-on-person-weighted-moving-pulley1.png,encoder-l-inv-on-person-weighted-moving-pulley1.png \
+       ../images/el-on-person-weighted-moving-pulley2.png,encoder-l-on-person-weighted-moving-pulley2.png \
+       
../images/el-inv-on-person-weighted-moving-pulley2.png,encoder-l-inv-on-person-weighted-moving-pulley2.png \
+       ../images/el-on-weighted-moving-pulley.png,encoder-l-on-weighted-moving-pulley.png \
+       ../images/el-inclined-plane.png,encoder-l-inclined-plane.png \
+       ../images/el-inclined-plane-weight-diff-angle.png,encoder-l-inclined-plane-weight-diff-angle.png \
+       
../images/el-inclined-plane-weight-diff-angle-mov-pulley.png,encoder-l-inclined-plane-weight-diff-angle-mov-pulley.png
 \
+       ../images/el-pneumatic.png,encoder-l-pneumatic.png \
+       ../images/er-fr-pulley.png,encoder-rf-pulley.png \
+       ../images/er-fr-pulley-axis.png,encoder-rf-pulley-axis.png \
+       ../images/er-fr-side-inertial.png,encoder-rf-side-inertial.png \
+       ../images/er-fr-axis-inertial.png,encoder-rf-axis-inertial.png \
+       ../images/er-fr-side-inertial-lateral.png,encoder-rf-side-inertial-lateral.png \
+       ../images/er-fr-axis-inertial-lateral.png,encoder-rf-axis-inertial-lateral.png \
+       ../images/er-fr-side-inertial-mov-pulley.png,encoder-rf-side-inertial-mov-pulley.png \
+       ../images/er-fr-axis-inertial-mov-pulley.png,encoder-rf-axis-inertial-mov-pulley.png \
+       
../images/er-fr-on-fixed-pulley-with-weighted-moving-pulley.png,encoder-rf-on-fixed-pulley-with-weighted-moving-pulley.png
 \
+       ../images/er-axis-pulley-axis.png,encoder-ra-pulley-axis.png \
+       ../images/er-axis-inertial.png,encoder-ra-inertial.png \
+       ../images/er-axis-inertial-lateral.png,encoder-ra-inertial-lateral.png \
+       ../images/er-axis-inertial-mov-pulley.png,encoder-ra-inertial-mov-pulley.png \
+       ../images/er-axis-inertial-mov-pulley-lateral.png,encoder-ra-inertial-mov-pulley-lateral.png \
        ../images/encoder-calcule-im.png,encoder-calcule-im.png \
-       
../images/er-axis-on-fixed-pulley-with-weighted-moving-pulley.png,encoder-rotary-axis-on-fixed-pulley-with-weighted-moving-pulley.png
 \
+       
../images/er-axis-on-fixed-pulley-with-weighted-moving-pulley.png,encoder-ra-on-fixed-pulley-with-weighted-moving-pulley.png
 \
        ../images/inertial-start.png,inertial-start.png \
        ../images/start.wav,sound_can_start.wav \
        ../images/ok.wav,ok.wav \
diff --git a/src/constants.cs b/src/constants.cs
index c89546080..2800071cf 100644
--- a/src/constants.cs
+++ b/src/constants.cs
@@ -1229,37 +1229,37 @@ public class Constants
        
        //encoder configurations
        //linear
-       public static string FileNameEncoderLinearFreeWeight = "encoder-linear-free-weight.png";
-       public static string FileNameEncoderLinearFreeWeightInv = "encoder-linear-free-weight-inv.png";
-       public static string FileNameEncoderLinearInertial = "encoder-linear-inertial.png";
-       public static string FileNameEncoderWeightedMovPulleyOnPerson1 = 
"encoder-linear-on-person-weighted-moving-pulley1.png";
-       public static string FileNameEncoderWeightedMovPulleyOnPerson1Inv = 
"encoder-linear-inv-on-person-weighted-moving-pulley1.png";
-       public static string FileNameEncoderWeightedMovPulleyOnPerson2 = 
"encoder-linear-on-person-weighted-moving-pulley2.png";
-       public static string FileNameEncoderWeightedMovPulleyOnPerson2Inv = 
"encoder-linear-inv-on-person-weighted-moving-pulley2.png";
-       public static string FileNameEncoderWeightedMovPulleyOnLinearEncoder = 
"encoder-linear-on-weighted-moving-pulley.png";
-       public static string FileNameEncoderLinearOnPlane = "encoder-linear-inclined-plane.png";        
-       public static string FileNameEncoderLinearOnPlaneWeightDiffAngle = 
"encoder-linear-inclined-plane-weight-diff-angle.png";       
-       public static string FileNameEncoderLinearOnPlaneWeightDiffAngleMovPulley = 
"encoder-linear-inclined-plane-weight-diff-angle-mov-pulley.png";
-       public static string FileNameEncoderLinearPneumatic = "encoder-linear-pneumatic.png";
+       public static string FileNameEncoderLinearFreeWeight = "encoder-l-free-weight.png";
+       public static string FileNameEncoderLinearFreeWeightInv = "encoder-l-free-weight-inv.png";
+       public static string FileNameEncoderLinearInertial = "encoder-l-inertial.png";
+       public static string FileNameEncoderWeightedMovPulleyOnPerson1 = 
"encoder-l-on-person-weighted-moving-pulley1.png";
+       public static string FileNameEncoderWeightedMovPulleyOnPerson1Inv = 
"encoder-l-inv-on-person-weighted-moving-pulley1.png";
+       public static string FileNameEncoderWeightedMovPulleyOnPerson2 = 
"encoder-l-on-person-weighted-moving-pulley2.png";
+       public static string FileNameEncoderWeightedMovPulleyOnPerson2Inv = 
"encoder-l-inv-on-person-weighted-moving-pulley2.png";
+       public static string FileNameEncoderWeightedMovPulleyOnLinearEncoder = 
"encoder-l-on-weighted-moving-pulley.png";
+       public static string FileNameEncoderLinearOnPlane = "encoder-l-inclined-plane.png";
+       public static string FileNameEncoderLinearOnPlaneWeightDiffAngle = 
"encoder-l-inclined-plane-weight-diff-angle.png";
+       public static string FileNameEncoderLinearOnPlaneWeightDiffAngleMovPulley = 
"encoder-l-inclined-plane-weight-diff-angle-mov-pulley.png";
+       public static string FileNameEncoderLinearPneumatic = "encoder-l-pneumatic.png";
 
        //rotary friction
-       public static string FileNameEncoderFrictionSide = "encoder-rotary-friction-pulley.png";
-       public static string FileNameEncoderFrictionAxis = "encoder-rotary-friction-pulley-axis.png";
-       public static string FileNameEncoderFrictionSideInertial = 
"encoder-rotary-friction-side-inertial.png";
-       public static string FileNameEncoderFrictionAxisInertial = 
"encoder-rotary-friction-axis-inertial.png";
-       public static string FileNameEncoderFrictionSideInertialLateral = 
"encoder-rotary-friction-side-inertial-lateral.png";
-       public static string FileNameEncoderFrictionAxisInertialLateral = 
"encoder-rotary-friction-axis-inertial-lateral.png";
-       public static string FileNameEncoderFrictionSideInertialMovPulley = 
"encoder-rotary-friction-side-inertial-mov-pulley.png";
-       public static string FileNameEncoderFrictionAxisInertialMovPulley = 
"encoder-rotary-friction-axis-inertial-mov-pulley.png";
-       public static string FileNameEncoderFrictionWithMovPulley = 
"encoder-rotary-friction-on-fixed-pulley-with-weighted-moving-pulley.png";
+       public static string FileNameEncoderFrictionSide = "encoder-rf-pulley.png";
+       public static string FileNameEncoderFrictionAxis = "encoder-rf-pulley-axis.png";
+       public static string FileNameEncoderFrictionSideInertial = "encoder-rf-side-inertial.png";
+       public static string FileNameEncoderFrictionAxisInertial = "encoder-rf-axis-inertial.png";
+       public static string FileNameEncoderFrictionSideInertialLateral = 
"encoder-rf-side-inertial-lateral.png";
+       public static string FileNameEncoderFrictionAxisInertialLateral = 
"encoder-rf-axis-inertial-lateral.png";
+       public static string FileNameEncoderFrictionSideInertialMovPulley = 
"encoder-rf-side-inertial-mov-pulley.png";
+       public static string FileNameEncoderFrictionAxisInertialMovPulley = 
"encoder-rf-axis-inertial-mov-pulley.png";
+       public static string FileNameEncoderFrictionWithMovPulley = 
"encoder-rf-on-fixed-pulley-with-weighted-moving-pulley.png";
 
        //rotary axis
-       public static string FileNameEncoderRotaryAxisOnAxis = "encoder-rotary-axis-pulley-axis.png";
-       public static string FileNameEncoderAxisInertial = "encoder-rotary-axis-inertial.png";
-       public static string FileNameEncoderAxisInertialLateral = "encoder-rotary-axis-inertial-lateral.png";
-       public static string FileNameEncoderAxisInertialMovPulley = 
"encoder-rotary-axis-inertial-mov-pulley.png";
-       public static string FileNameEncoderAxisInertialMovPulleyLateral = 
"encoder-rotary-axis-inertial-mov-pulley-lateral.png";
-       public static string FileNameEncoderAxisWithMovPulley = 
"encoder-rotary-axis-on-fixed-pulley-with-weighted-moving-pulley.png";
+       public static string FileNameEncoderRotaryAxisOnAxis = "encoder-ra-pulley-axis.png";
+       public static string FileNameEncoderAxisInertial = "encoder-ra-inertial.png";
+       public static string FileNameEncoderAxisInertialLateral = "encoder-ra-inertial-lateral.png";
+       public static string FileNameEncoderAxisInertialMovPulley = "encoder-ra-inertial-mov-pulley.png";
+       public static string FileNameEncoderAxisInertialMovPulleyLateral = 
"encoder-ra-inertial-mov-pulley-lateral.png";
+       public static string FileNameEncoderAxisWithMovPulley = 
"encoder-ra-on-fixed-pulley-with-weighted-moving-pulley.png";
        
        public static string FileNameEncoderCalculeIM = "encoder-calcule-im.png";       
 
diff --git a/src/gui/app1/chronojump.cs b/src/gui/app1/chronojump.cs
index 81cfa01ee..47b903e06 100644
--- a/src/gui/app1/chronojump.cs
+++ b/src/gui/app1/chronojump.cs
@@ -4197,11 +4197,11 @@ public partial class ChronoJumpWindow
        {
                Pixbuf pixbuf;
                if(encoderConfigurationCurrent.type == Constants.EncoderType.LINEAR)
-                       pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "encoder-linear-blue.png");
+                       pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "encoder-l-blue.png");
                else if(encoderConfigurationCurrent.type == Constants.EncoderType.ROTARYFRICTION)
-                       pixbuf = new Pixbuf (null, Util.GetImagePath(false) + 
"encoder-rotary-friction-blue.png");
+                       pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "encoder-rf-blue.png");
                else // if(encoderConfigurationCurrent.type == Constants.EncoderType.ROTARYAXIS)
-                       pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "encoder-rotary-axis-blue.png");
+                       pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "encoder-ra-blue.png");
 
                image_encoder_top_selected_type.Pixbuf = pixbuf;
                image_encoder_selected_type.Pixbuf = pixbuf;