[chronojump] Prettier Encoder analyze buttons
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] Prettier Encoder analyze buttons
- Date: Fri, 4 Apr 2014 18:17:08 +0000 (UTC)
commit cd8af24f4b44aa7bdf8098ca51fc5af0d16d5c9f
Author: Xavier de Blas <xaviblas gmail com>
Date: Fri Apr 4 20:16:04 2014 +0200
Prettier Encoder analyze buttons
glade/chronojump.glade | 274 +++++++++------
images/encoder-analyze-accel.png | Bin 0 -> 603 bytes
images/encoder-analyze-force.png | Bin 0 -> 473 bytes
images/encoder-analyze-max.png | Bin 0 -> 443 bytes
images/encoder-analyze-mean.png | Bin 0 -> 443 bytes
images/encoder-analyze-power.png | Bin 0 -> 527 bytes
images/encoder-analyze-range.png | Bin 0 -> 496 bytes
images/encoder-analyze-speed.png | Bin 0 -> 574 bytes
images/encoder-analyze-time-to-pp.png | Bin 0 -> 503 bytes
images/svg/icons.svg | 619 ++++++++++++++++++++++++++++++---
src/Makefile.am | 8 +
src/constants.cs | 10 +
src/gui/chronojump.cs | 26 ++
src/gui/encoder.cs | 53 ++-
src/utilGtk.cs | 6 +
15 files changed, 814 insertions(+), 182 deletions(-)
---
diff --git a/glade/chronojump.glade b/glade/chronojump.glade
index 5bd27a2..c3e7769 100644
--- a/glade/chronojump.glade
+++ b/glade/chronojump.glade
@@ -6388,6 +6388,9 @@ Second Chronopic to platforms.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">True</property>
@@ -6990,6 +6993,9 @@ Second Chronopic to platforms.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
<child>
@@ -7728,6 +7734,9 @@ Second Chronopic to platforms.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="position">2</property>
@@ -8225,6 +8234,9 @@ Second Chronopic to platforms.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="position">4</property>
@@ -13581,7 +13593,7 @@ on current Chronojump version.</property>
<widget class="GtkHBox" id="hbox92">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">12</property>
+ <property name="spacing">8</property>
<child>
<widget class="GtkCheckButton"
id="check_encoder_analyze_eccon_together">
<property name="visible">True</property>
@@ -13652,71 +13664,24 @@ on current Chronojump version.</property>
</packing>
</child>
<child>
- <widget class="GtkHBox"
id="hbox_encoder_analyze_curve_num">
- <property name="can_focus">False</property>
- <property name="spacing">6</property>
- <child>
- <widget class="GtkLabel" id="label83">
+ <widget class="GtkCheckButton"
id="check_encoder_analyze_mean_or_max">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="tooltip"
translatable="yes">Curve number</property>
- <property name="label">nº</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
+ <property name="can_focus">True</property>
+ <property
name="receives_default">False</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">False</property>
+ <signal name="toggled"
handler="on_check_encoder_analyze_mean_or_max_toggled" swapped="no"/>
<child>
- <widget class="GtkHBox"
id="hbox_combo_encoder_analyze_curve_num_combo">
+ <widget class="GtkHBox" id="hbox89">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="tooltip"
translatable="yes">Curve number</property>
<child>
- <placeholder/>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox"
id="hbox_combo_encoder_analyze_cross">
- <property name="can_focus">False</property>
- <child>
- <placeholder/>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">3</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox"
id="hbox_encoder_analyze_mean_or_max">
- <property name="can_focus">False</property>
- <property name="spacing">4</property>
- <child>
- <widget class="GtkRadioButton"
id="radiobutton_encoder_analyze_mean">
- <property name="label"
translatable="yes">Mean</property>
+ <widget class="GtkImage"
id="image_encoder_analyze_mean">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property
name="receives_default">False</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip" translatable="yes">Mean
values</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
+ <property name="can_focus">False</property>
+ <property name="tooltip"
translatable="yes">Analyze mean values</property>
+ <property
name="stock">gtk-missing-image</property>
+ <property name="icon-size">2</property>
</widget>
<packing>
<property name="expand">True</property>
@@ -13725,15 +13690,11 @@ on current Chronojump version.</property>
</packing>
</child>
<child>
- <widget class="GtkRadioButton"
id="radiobutton_encoder_analyze_max">
- <property name="label"
translatable="yes">Max</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property
name="receives_default">False</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip" translatable="yes">Max
values</property>
- <property name="draw_indicator">True</property>
- <property
name="group">radiobutton_encoder_analyze_mean</property>
+ <widget class="GtkImage"
id="image_encoder_analyze_max">
+ <property name="can_focus">False</property>
+ <property name="tooltip"
translatable="yes">Analyze max values</property>
+ <property
name="stock">gtk-missing-image</property>
+ <property name="icon-size">2</property>
</widget>
<packing>
<property name="expand">True</property>
@@ -13742,10 +13703,12 @@ on current Chronojump version.</property>
</packing>
</child>
</widget>
+ </child>
+ </widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">4</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
</packing>
</child>
<child>
@@ -13758,28 +13721,27 @@ on current Chronojump version.</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">5</property>
+ <property name="position">3</property>
</packing>
</child>
<child>
<widget class="GtkHBox"
id="hbox_encoder_analyze_show_powerbars">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">2</property>
+ <property name="spacing">8</property>
<child>
- <widget class="GtkCheckButton"
id="check_encoder_analyze_show_time_to_peak_power">
+ <widget class="GtkCheckButton"
id="check_encoder_analyze_show_range">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="receives_default">False</property>
- <property name="draw_indicator">True</property>
+ <property name="tooltip" translatable="yes">Show
range</property>
+ <property name="draw_indicator">False</property>
<child>
- <widget class="GtkLabel" id="label93">
+ <widget class="GtkImage"
id="image_encoder_analyze_range">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="tooltip" translatable="yes">Show
time to peak power</property>
- <property name="label" translatable="yes">Time
to peak power</property>
- <property name="ellipsize">end</property>
- <property name="max_width_chars">12</property>
+ <property
name="stock">gtk-missing-image</property>
+ <property name="icon-size">2</property>
</widget>
</child>
</widget>
@@ -13790,19 +13752,18 @@ on current Chronojump version.</property>
</packing>
</child>
<child>
- <widget class="GtkCheckButton"
id="check_encoder_analyze_show_range">
+ <widget class="GtkCheckButton"
id="check_encoder_analyze_show_time_to_peak_power">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="receives_default">False</property>
- <property name="draw_indicator">True</property>
+ <property name="tooltip" translatable="yes">Show
Time to Peak Power</property>
+ <property name="draw_indicator">False</property>
<child>
- <widget class="GtkLabel" id="label108">
+ <widget class="GtkImage"
id="image_encoder_analyze_time_to_pp">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="tooltip" translatable="yes">Show
range</property>
- <property name="label"
translatable="yes">Range</property>
- <property name="ellipsize">end</property>
- <property name="max_width_chars">12</property>
+ <property
name="stock">gtk-missing-image</property>
+ <property name="icon-size">2</property>
</widget>
</child>
</widget>
@@ -13816,26 +13777,27 @@ on current Chronojump version.</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">6</property>
+ <property name="position">4</property>
</packing>
</child>
<child>
<widget class="GtkHBox"
id="hbox_encoder_analyze_show_SAFE">
<property name="can_focus">False</property>
- <property name="spacing">2</property>
+ <property name="spacing">8</property>
<child>
<widget class="GtkCheckButton"
id="check_encoder_analyze_show_speed">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="receives_default">False</property>
+ <property name="tooltip" translatable="yes">Show
speed</property>
<property name="active">True</property>
- <property name="draw_indicator">True</property>
+ <property name="draw_indicator">False</property>
<child>
- <widget class="GtkLabel" id="label81">
+ <widget class="GtkImage"
id="image_encoder_analyze_speed">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="tooltip"
translatable="yes">Speed</property>
- <property name="label"
translatable="yes">v</property>
+ <property
name="stock">gtk-missing-image</property>
+ <property name="icon-size">2</property>
</widget>
</child>
</widget>
@@ -13850,13 +13812,14 @@ on current Chronojump version.</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="receives_default">False</property>
- <property name="draw_indicator">True</property>
+ <property name="tooltip" translatable="yes">Show
acceleration</property>
+ <property name="draw_indicator">False</property>
<child>
- <widget class="GtkLabel" id="label71">
+ <widget class="GtkImage"
id="image_encoder_analyze_accel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="tooltip"
translatable="yes">Acceleration</property>
- <property name="label"
translatable="yes">a</property>
+ <property
name="stock">gtk-missing-image</property>
+ <property name="icon-size">2</property>
</widget>
</child>
</widget>
@@ -13871,13 +13834,14 @@ on current Chronojump version.</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="receives_default">False</property>
- <property name="draw_indicator">True</property>
+ <property name="tooltip" translatable="yes">Show
force</property>
+ <property name="draw_indicator">False</property>
<child>
- <widget class="GtkLabel" id="label84">
+ <widget class="GtkImage"
id="image_encoder_analyze_force">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="tooltip"
translatable="yes">Force</property>
- <property name="label"
translatable="yes">F</property>
+ <property
name="stock">gtk-missing-image</property>
+ <property name="icon-size">2</property>
</widget>
</child>
</widget>
@@ -13892,14 +13856,15 @@ on current Chronojump version.</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="receives_default">False</property>
+ <property name="tooltip" translatable="yes">Show
power</property>
<property name="active">True</property>
- <property name="draw_indicator">True</property>
+ <property name="draw_indicator">False</property>
<child>
- <widget class="GtkLabel" id="label89">
+ <widget class="GtkImage"
id="image_encoder_analyze_power">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="tooltip"
translatable="yes">Power</property>
- <property name="label"
translatable="yes">P</property>
+ <property
name="stock">gtk-missing-image</property>
+ <property name="icon-size">2</property>
</widget>
</child>
</widget>
@@ -13913,6 +13878,58 @@ on current Chronojump version.</property>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
+ <property name="position">5</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox"
id="hbox_encoder_analyze_curve_num">
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
+ <child>
+ <widget class="GtkLabel" id="label83">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="tooltip"
translatable="yes">Curve number</property>
+ <property name="label">nº</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox"
id="hbox_combo_encoder_analyze_curve_num_combo">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="tooltip"
translatable="yes">Curve number</property>
+ <child>
+ <placeholder/>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">6</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox"
id="hbox_combo_encoder_analyze_cross">
+ <property name="can_focus">False</property>
+ <child>
+ <placeholder/>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">7</property>
</packing>
</child>
@@ -17496,6 +17513,9 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -17901,6 +17921,9 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -18725,6 +18748,12 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">True</property>
@@ -25390,6 +25419,24 @@ options</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -26367,6 +26414,9 @@ options</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -26831,6 +26881,9 @@ options</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -28600,6 +28653,9 @@ show elevation as:</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="left_attach">2</property>
@@ -28669,6 +28725,9 @@ show elevation as:</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -28753,6 +28812,9 @@ show elevation as:</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
diff --git a/images/encoder-analyze-accel.png b/images/encoder-analyze-accel.png
new file mode 100644
index 0000000..a959663
Binary files /dev/null and b/images/encoder-analyze-accel.png differ
diff --git a/images/encoder-analyze-force.png b/images/encoder-analyze-force.png
new file mode 100644
index 0000000..16f5e9a
Binary files /dev/null and b/images/encoder-analyze-force.png differ
diff --git a/images/encoder-analyze-max.png b/images/encoder-analyze-max.png
new file mode 100644
index 0000000..baa1926
Binary files /dev/null and b/images/encoder-analyze-max.png differ
diff --git a/images/encoder-analyze-mean.png b/images/encoder-analyze-mean.png
new file mode 100644
index 0000000..6cb41e0
Binary files /dev/null and b/images/encoder-analyze-mean.png differ
diff --git a/images/encoder-analyze-power.png b/images/encoder-analyze-power.png
new file mode 100644
index 0000000..326a364
Binary files /dev/null and b/images/encoder-analyze-power.png differ
diff --git a/images/encoder-analyze-range.png b/images/encoder-analyze-range.png
new file mode 100644
index 0000000..c9284ef
Binary files /dev/null and b/images/encoder-analyze-range.png differ
diff --git a/images/encoder-analyze-speed.png b/images/encoder-analyze-speed.png
new file mode 100644
index 0000000..773348b
Binary files /dev/null and b/images/encoder-analyze-speed.png differ
diff --git a/images/encoder-analyze-time-to-pp.png b/images/encoder-analyze-time-to-pp.png
new file mode 100644
index 0000000..c000327
Binary files /dev/null and b/images/encoder-analyze-time-to-pp.png differ
diff --git a/images/svg/icons.svg b/images/svg/icons.svg
index 4542470..b26e4a7 100644
--- a/images/svg/icons.svg
+++ b/images/svg/icons.svg
@@ -9,8 +9,8 @@
xmlns="http://www.w3.org/2000/svg";
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
- width="116.77551"
- height="101.14973"
+ width="124.24907"
+ height="161.54089"
id="svg2"
version="1.1"
inkscape:version="0.48.4 r9939"
@@ -27,9 +27,9 @@
borderopacity="1.0"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
- inkscape:zoom="5.5462335"
- inkscape:cx="58.387756"
- inkscape:cy="51.205922"
+ inkscape:zoom="4.9112877"
+ inkscape:cx="57.476558"
+ inkscape:cy="19.619395"
inkscape:document-units="px"
inkscape:current-layer="capa1"
showgrid="false"
@@ -43,7 +43,12 @@
fit-margin-right="0"
fit-margin-bottom="0"
showguides="true"
- inkscape:guide-bbox="true" />
+ inkscape:guide-bbox="true">
+ <sodipodi:guide
+ orientation="1,0"
+ position="88.291294,9.8065335"
+ id="guide5151" />
+ </sodipodi:namedview>
<metadata
id="metadata7">
<rdf:RDF>
@@ -60,7 +65,7 @@
inkscape:label="Capa 1"
inkscape:groupmode="layer"
id="capa1"
- transform="translate(61.525543,-966.91272)">
+ transform="translate(63.113403,-966.91272)">
<text
xml:space="preserve"
style="font-size:10px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
@@ -342,56 +347,6 @@
</g>
</g>
<g
- id="g5559"
-
inkscape:export-filename="/home/xavier/informatica/progs_meus/chronojump/chronojump/images/encoder-analyze-cross.png"
- inkscape:export-xdpi="89.989998"
- inkscape:export-ydpi="89.989998"
- transform="translate(0,-13.72549)">
- <rect
- y="1003.9698"
- x="-35.875648"
- height="16"
- width="16"
- id="rect2985-62"
- style="fill:#ffffff;fill-opacity:0;fill-rule:nonzero;stroke:none" />
- <text
- sodipodi:linespacing="125%"
- id="text4179-0-0"
- y="1016.79"
- x="-35.732384"
-
style="font-size:5.53214312px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:0.55199999;stroke-linecap:butt;stroke-miterlimit:100;stroke-opacity:1;stroke-dasharray:none;font-family:Sans"
- xml:space="preserve"><tspan
-
style="font-size:8.76907158px;font-weight:bold;fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:0.55199999;stroke-linecap:butt;stroke-miterlimit:100;stroke-opacity:1;stroke-dasharray:none;-inkscape-font-specification:Sans
Bold"
- y="1016.79"
- x="-35.732384"
- id="tspan4181-7-7"
- sodipodi:role="line">x</tspan></text>
- <text
- sodipodi:linespacing="125%"
- id="text4179-0-0-6"
- y="1016.79"
- x="-25.675137"
-
style="font-size:5.53214312px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:0.55199999;stroke-linecap:butt;stroke-miterlimit:100;stroke-opacity:1;stroke-dasharray:none;font-family:Sans"
- xml:space="preserve"><tspan
-
style="font-size:8.76907158px;font-weight:bold;fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:0.55199999;stroke-linecap:butt;stroke-miterlimit:100;stroke-opacity:1;stroke-dasharray:none;-inkscape-font-specification:Sans
Bold"
- y="1016.79"
- x="-25.675137"
- id="tspan4181-7-7-4"
- sodipodi:role="line">x</tspan></text>
- <text
- sodipodi:linespacing="125%"
- id="text4179-0-0-6-6"
- y="1009.7675"
- x="-30.70376"
-
style="font-size:5.53214312px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:0.55199999;stroke-linecap:butt;stroke-miterlimit:100;stroke-opacity:1;stroke-dasharray:none;font-family:Sans"
- xml:space="preserve"><tspan
-
style="font-size:8.76907158px;font-weight:bold;fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:0.55199999;stroke-linecap:butt;stroke-miterlimit:100;stroke-opacity:1;stroke-dasharray:none;-inkscape-font-specification:Sans
Bold"
- y="1009.7675"
- x="-30.70376"
- id="tspan4181-7-7-4-8"
- sodipodi:role="line">x</tspan></text>
- </g>
- <g
id="g3934-7"
transform="translate(3.5087043,-28.265443)"
inkscape:export-filename="/home/xavier/informatica/progs_meus/chronojump/chronojump/images/encoder-analyze-eccon-together.png"
@@ -576,5 +531,555 @@
x="6.4940448"
y="1024.1896"
style="font-size:2px">encoder-analyze-current-signal.png</tspan></text>
+ <g
+ id="g5559-6"
+
inkscape:export-filename="/home/xavier/informatica/progs_meus/chronojump/chronojump/images/encoder-analyze-cross.png"
+ inkscape:export-xdpi="89.989998"
+ inkscape:export-ydpi="89.989998"
+ transform="translate(6.5575725,-13.143517)">
+ <rect
+ y="1003.9698"
+ x="-35.875648"
+ height="16"
+ width="16"
+ id="rect2985-62-9"
+ style="fill:#ffffff;fill-opacity:0;fill-rule:nonzero;stroke:none" />
+ <text
+ sodipodi:linespacing="125%"
+ id="text4179-0-0-60"
+ y="1016.79"
+ x="-35.732384"
+
style="font-size:5.53214312px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:0.55199999;stroke-linecap:butt;stroke-miterlimit:100;stroke-opacity:1;stroke-dasharray:none;font-family:Sans"
+ xml:space="preserve"><tspan
+
style="font-size:8.76907158px;font-weight:bold;fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:0.55199999;stroke-linecap:butt;stroke-miterlimit:100;stroke-opacity:1;stroke-dasharray:none;-inkscape-font-specification:Sans
Bold"
+ y="1016.79"
+ x="-35.732384"
+ id="tspan4181-7-7-6"
+ sodipodi:role="line">x</tspan></text>
+ <text
+ sodipodi:linespacing="125%"
+ id="text4179-0-0-6-0"
+ y="1016.79"
+ x="-25.675137"
+
style="font-size:5.53214312px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:0.55199999;stroke-linecap:butt;stroke-miterlimit:100;stroke-opacity:1;stroke-dasharray:none;font-family:Sans"
+ xml:space="preserve"><tspan
+
style="font-size:8.76907158px;font-weight:bold;fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:0.55199999;stroke-linecap:butt;stroke-miterlimit:100;stroke-opacity:1;stroke-dasharray:none;-inkscape-font-specification:Sans
Bold"
+ y="1016.79"
+ x="-25.675137"
+ id="tspan4181-7-7-4-0"
+ sodipodi:role="line">x</tspan></text>
+ <text
+ sodipodi:linespacing="125%"
+ id="text4179-0-0-6-6-2"
+ y="1009.7675"
+ x="-30.70376"
+
style="font-size:5.53214312px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:0.55199999;stroke-linecap:butt;stroke-miterlimit:100;stroke-opacity:1;stroke-dasharray:none;font-family:Sans"
+ xml:space="preserve"><tspan
+
style="font-size:8.76907158px;font-weight:bold;fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:0.55199999;stroke-linecap:butt;stroke-miterlimit:100;stroke-opacity:1;stroke-dasharray:none;-inkscape-font-specification:Sans
Bold"
+ y="1009.7675"
+ x="-30.70376"
+ id="tspan4181-7-7-4-8-8"
+ sodipodi:role="line">x</tspan></text>
+ </g>
+ <text
+ xml:space="preserve"
+
style="font-size:10px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+ x="2.6018784"
+ y="106.91103"
+ id="text4037"
+ sodipodi:linespacing="125%"
+ transform="translate(-61.525543,966.91272)"><tspan
+ sodipodi:role="line"
+ id="tspan4039"
+ x="2.6018784"
+ y="106.91103"></tspan></text>
+ <text
+ xml:space="preserve"
+
style="font-size:10px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+ x="-63.223755"
+ y="1078.2783"
+ id="text3938-3-00"
+ sodipodi:linespacing="125%"><tspan
+ sodipodi:role="line"
+ id="tspan3940-6-5"
+ x="-63.223755"
+ y="1078.2783"
+ style="font-size:2px">encoder-analyze-speed.png</tspan></text>
+ <text
+ xml:space="preserve"
+
style="font-size:10px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+ x="-37.027149"
+ y="1074.1897"
+ id="text3938-3-00-0"
+ sodipodi:linespacing="125%"><tspan
+ sodipodi:role="line"
+ id="tspan3940-6-5-4"
+ x="-37.027149"
+ y="1074.1897"
+ style="font-size:2px">encoder-analyze-acceleration.png</tspan></text>
+ <text
+ xml:space="preserve"
+
style="font-size:10px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+ x="-3.8994586"
+ y="1077.0446"
+ id="text3938-3-00-0-2"
+ sodipodi:linespacing="125%"><tspan
+ sodipodi:role="line"
+ id="tspan3940-6-5-4-0"
+ x="-3.8994586"
+ y="1077.0446"
+ style="font-size:2px">encoder-analyze-force.png</tspan></text>
+ <text
+ xml:space="preserve"
+
style="font-size:10px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+ x="17.603037"
+ y="1074.7472"
+ id="text3938-3-00-0-5"
+ sodipodi:linespacing="125%"><tspan
+ sodipodi:role="line"
+ id="tspan3940-6-5-4-7"
+ x="17.603037"
+ y="1074.7472"
+ style="font-size:2px">encoder-analyze-acceleration-power.png</tspan></text>
+ <rect
+
style="fill:none;stroke:#000000;stroke-width:0.48147383;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:100;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ id="rect4113"
+ width="52.997437"
+ height="57.956905"
+ x="4.5681477"
+ y="1012.1834" />
+ <g
+ id="g4459"
+
inkscape:export-filename="/home/xavier/informatica/progs_meus/chronojump/chronojump/images/encoder-analyze-speed.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90"
+ transform="translate(0,-26.785133)">
+ <rect
+ y="1108.693"
+ x="-59.296551"
+ height="16"
+ width="16"
+ id="rect2985-62-4-5"
+ style="fill:#ffffff;fill-opacity:0;fill-rule:nonzero;stroke:none" />
+ <rect
+ y="1120.8237"
+ x="-58.972847"
+ height="2.3525958"
+ width="15.352595"
+ id="rect4222"
+
style="fill:#2bff1a;fill-opacity:1;fill-rule:nonzero;stroke:#fafafa;stroke-width:0.64740431;stroke-opacity:1"
/>
+ <text
+ sodipodi:linespacing="125%"
+ id="text4179-0-0-2-9"
+ y="1122.3763"
+ x="-56.382275"
+
style="font-size:9.83662701px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:#fafafa;stroke-width:0.5;stroke-linecap:butt;stroke-miterlimit:100;stroke-opacity:1;stroke-dasharray:none;font-family:Sans"
+ xml:space="preserve"><tspan
+
style="font-size:15.59216499px;font-weight:bold;fill:#000000;fill-opacity:1;stroke:#fafafa;stroke-width:0.5;stroke-linecap:butt;stroke-miterlimit:100;stroke-opacity:1;stroke-dasharray:none;-inkscape-font-specification:Sans
Bold"
+ y="1122.3763"
+ x="-56.382275"
+ id="tspan4181-7-7-61-4"
+ sodipodi:role="line">v</tspan></text>
+ </g>
+ <g
+ id="g4445"
+
inkscape:export-filename="/home/xavier/informatica/progs_meus/chronojump/chronojump/images/encoder-analyze-force.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90"
+ transform="translate(0,-26.785133)">
+ <rect
+ y="1108.693"
+ x="3.3276374"
+ height="16"
+ width="16"
+ id="rect2985-62-2"
+ style="fill:#ffffff;fill-opacity:0;fill-rule:nonzero;stroke:none" />
+ <rect
+ y="1108.693"
+ x="3.3276374"
+ height="16"
+ width="16"
+ id="rect2985-62-4-5-2-6"
+ style="fill:#ffffff;fill-opacity:0;fill-rule:nonzero;stroke:none" />
+ <rect
+ y="1120.8213"
+ x="3.7821155"
+ height="2.3574517"
+ width="15.092"
+ id="rect4222-4-7"
+
style="fill:#401aff;fill-opacity:1;fill-rule:nonzero;stroke:#fafafa;stroke-width:0.64254838;stroke-opacity:1"
/>
+ <text
+ sodipodi:linespacing="125%"
+ id="text4179-0-0-74"
+ y="1122.3763"
+ x="5.941184"
+
style="font-size:9.83662701px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:#fafafa;stroke-width:0.5;stroke-linecap:butt;stroke-miterlimit:100;stroke-opacity:1;stroke-dasharray:none;font-family:Sans"
+ xml:space="preserve"><tspan
+
style="font-size:15.59216499px;font-weight:bold;fill:#000000;fill-opacity:1;stroke:#fafafa;stroke-width:0.5;stroke-linecap:butt;stroke-miterlimit:100;stroke-opacity:1;stroke-dasharray:none;-inkscape-font-specification:Sans
Bold"
+ y="1122.3763"
+ x="5.941184"
+ id="tspan4181-7-7-4"
+ sodipodi:role="line">F</tspan></text>
+ </g>
+ <g
+ id="g4438"
+
inkscape:export-filename="/home/xavier/informatica/progs_meus/chronojump/chronojump/images/encoder-analyze-power.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90"
+ transform="translate(0,-26.785133)">
+ <rect
+ y="1108.693"
+ x="34.526897"
+ height="16"
+ width="16"
+ id="rect2985-62-99-6"
+ style="fill:#ffffff;fill-opacity:0;fill-rule:nonzero;stroke:none" />
+ <rect
+ y="1108.693"
+ x="34.526897"
+ height="16"
+ width="16"
+ id="rect2985-62-4-5-2-3"
+ style="fill:#ffffff;fill-opacity:0;fill-rule:nonzero;stroke:none" />
+ <rect
+ y="1120.8213"
+ x="35.113625"
+ height="2.3574517"
+ width="15.092"
+ id="rect4222-4-77"
+
style="fill:#ff281a;fill-opacity:1;fill-rule:nonzero;stroke:#fafafa;stroke-width:0.64254838;stroke-opacity:1"
/>
+ <text
+ sodipodi:linespacing="125%"
+ id="text4179-0-0-9-4"
+ y="1122.3763"
+ x="36.417175"
+
style="font-size:9.83662701px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:#fafafa;stroke-width:0.5;stroke-linecap:butt;stroke-miterlimit:100;stroke-opacity:1;stroke-dasharray:none;font-family:Sans"
+ xml:space="preserve"><tspan
+
style="font-size:15.59216499px;font-weight:bold;fill:#000000;fill-opacity:1;stroke:#fafafa;stroke-width:0.5;stroke-linecap:butt;stroke-miterlimit:100;stroke-opacity:1;stroke-dasharray:none;-inkscape-font-specification:Sans
Bold"
+ y="1122.3763"
+ x="36.417175"
+ id="tspan4181-7-7-62-8"
+ sodipodi:role="line">P</tspan></text>
+ </g>
+ <g
+ id="g4452"
+
inkscape:export-filename="/home/xavier/informatica/progs_meus/chronojump/chronojump/images/encoder-analyze-accel.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90"
+ transform="translate(0,-26.785133)">
+ <rect
+ y="1108.693"
+ x="-28.09729"
+ height="16"
+ width="16"
+ id="rect2985-62-6-2"
+ style="fill:#ffffff;fill-opacity:0;fill-rule:nonzero;stroke:none" />
+ <rect
+ y="1108.693"
+ x="-28.09729"
+ height="16"
+ width="16"
+ id="rect2985-62-4-5-2"
+ style="fill:#ffffff;fill-opacity:0;fill-rule:nonzero;stroke:none" />
+ <rect
+ y="1120.8213"
+ x="-27.776016"
+ height="2.3574517"
+ width="15.092"
+ id="rect4222-4"
+
style="fill:#ff1adf;fill-opacity:1;fill-rule:nonzero;stroke:#fafafa;stroke-width:0.64254838;stroke-opacity:1"
/>
+ <text
+ sodipodi:linespacing="125%"
+ id="text4179-0-0-7-8"
+ y="1122.3763"
+ x="-25.080235"
+
style="font-size:9.83662701px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:#fafafa;stroke-width:0.5;stroke-linecap:butt;stroke-miterlimit:100;stroke-opacity:1;stroke-dasharray:none;font-family:Sans"
+ xml:space="preserve"><tspan
+
style="font-size:15.59216499px;font-weight:bold;fill:#000000;fill-opacity:1;stroke:#fafafa;stroke-width:0.5;stroke-linecap:butt;stroke-miterlimit:100;stroke-opacity:1;stroke-dasharray:none;-inkscape-font-specification:Sans
Bold"
+ y="1122.3763"
+ x="-25.080235"
+ id="tspan4181-7-7-3-5"
+ sodipodi:role="line">a</tspan></text>
+ </g>
+ <g
+ id="g6008"
+
inkscape:export-filename="/home/xavier/informatica/progs_meus/chronojump/chronojump/images/encoder-analyze-max.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
+ <rect
+ y="1112.4536"
+ x="-28.115742"
+ height="16"
+ width="16"
+ id="rect2985-62-4-5-7-1"
+ style="fill:#ffffff;fill-opacity:0;fill-rule:nonzero;stroke:none" />
+ <g
+ inkscape:export-ydpi="90"
+ inkscape:export-xdpi="90"
+
inkscape:export-filename="/home/xavier/informatica/progs_meus/chronojump/chronojump/images/encoder-analyze-max.png"
+ id="g5986">
+ <path
+
style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ d="m -20.232715,1118.0898 c 3.313335,-0.1924 3.587649,4.6469 5.723426,5.6947"
+ id="path3792-5-2-9-3-3-9-8"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
+ <path
+
style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ d="m -19.998768,1118.0898 c -3.313335,-0.1924 -3.587649,4.6469 -5.723425,5.6947"
+ id="path3792-5-2-9-3-3-9-4-2"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
+ <g
+ id="g5962">
+ <g
+ transform="matrix(1.1518438,0,0,-0.93170758,-46.594524,2119.5978)"
+ style="stroke-width:1.44795358;stroke-miterlimit:4;stroke-dasharray:none"
+ id="g3119-4-7-5">
+ <path
+
style="fill:none;stroke:#000000;stroke-width:1.44795358;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ d="m 22.886618,1074.9167 c 2.876549,0.2065 3.114701,-4.9875 4.968925,-6.1121"
+ id="path3792-5-2-9-3-3-9"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
+ </g>
+ <g
+ transform="matrix(-1.1518438,0,0,-0.93170758,6.3630412,2119.5978)"
+ style="stroke-width:1.44795358;stroke-miterlimit:4;stroke-dasharray:none"
+ id="g3119-4-7-5-9">
+ <path
+
style="fill:none;stroke:#000000;stroke-width:1.44795358;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ d="m 22.886618,1074.9167 c 2.876549,0.2065 3.114701,-4.9875 4.968925,-6.1121"
+ id="path3792-5-2-9-3-3-9-4"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
+ </g>
+ </g>
+ <path
+ sodipodi:type="arc"
+
style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.28709117;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:100;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ id="path4559"
+ sodipodi:cx="8.6341915"
+ sodipodi:cy="150.00484"
+ sodipodi:rx="2.0107021"
+ sodipodi:ry="2.0107021"
+ d="m 10.644894,150.00484 a 2.0107021,2.0107021 0 1 1 -4.0214046,0 2.0107021,2.0107021 0 1 1
4.0214046,0 z"
+ transform="matrix(0.92839834,0,0,0.92839834,-28.13171,978.54093)" />
+ </g>
+ </g>
+ <g
+ id="g5996"
+
inkscape:export-filename="/home/xavier/informatica/progs_meus/chronojump/chronojump/images/encoder-analyze-mean.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
+ <rect
+ y="1112.4536"
+ x="-59.873928"
+ height="16"
+ width="16"
+ id="rect2985-62-4-5-7"
+ style="fill:#ffffff;fill-opacity:0;fill-rule:nonzero;stroke:none" />
+ <rect
+ y="1120.5629"
+ x="-55.772827"
+ height="1.7169666"
+ width="7.7977967"
+ id="rect4607"
+
style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.33658218000000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
/>
+ <g
+ transform="matrix(1.1518438,0,0,-0.93170758,-78.352709,2119.5978)"
+
style="stroke:#ffffff;stroke-width:1.93060482;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ id="g3119-4-7-5-16-1">
+ <path
+
style="fill:none;stroke:#ffffff;stroke-width:1.93060482;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ d="m 22.886618,1074.9167 c 2.876549,0.2065 3.114701,-4.9875 4.968925,-6.1121"
+ id="path3792-5-2-9-3-3-9-8-1"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
+ </g>
+ <g
+ transform="matrix(-1.1518438,0,0,-0.93170758,-25.395144,2119.5978)"
+
style="stroke:#ffffff;stroke-width:1.93060482;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ id="g3119-4-7-5-9-0-4">
+ <path
+
style="fill:none;stroke:#ffffff;stroke-width:1.93060482;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ d="m 22.886618,1074.9167 c 2.876549,0.2065 3.114701,-4.9875 4.968925,-6.1121"
+ id="path3792-5-2-9-3-3-9-4-2-2"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
+ </g>
+ <g
+ transform="matrix(1.1518438,0,0,-0.93170758,-78.352709,2119.5978)"
+ id="g3119-4-7-5-4"
+ style="stroke-width:1.44795358;stroke-miterlimit:4;stroke-dasharray:none">
+ <path
+
style="fill:none;stroke:#000000;stroke-width:1.44795358;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ d="m 22.886618,1074.9167 c 2.876549,0.2065 3.114701,-4.9875 4.968925,-6.1121"
+ id="path3792-5-2-9-3-3-9-6"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
+ </g>
+ <g
+ transform="matrix(-1.1518438,0,0,-0.93170758,-25.395144,2119.5978)"
+ id="g3119-4-7-5-9-2"
+
style="stroke:#000000;stroke-width:1.44795358;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none">
+ <path
+
style="fill:none;stroke:#000000;stroke-width:1.44795358;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ d="m 22.886618,1074.9167 c 2.876549,0.2065 3.114701,-4.9875 4.968925,-6.1121"
+ id="path3792-5-2-9-3-3-9-4-6"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
+ </g>
+ </g>
+ <text
+ xml:space="preserve"
+
style="font-size:10px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+ x="-61.646904"
+ y="1106.1874"
+ id="text3938-3-00-9"
+ sodipodi:linespacing="125%"><tspan
+ sodipodi:role="line"
+ id="tspan3940-6-5-3"
+ x="-61.646904"
+ y="1106.1874"
+ style="font-size:2px">encoder-analyze-mean.png</tspan></text>
+ <text
+ xml:space="preserve"
+
style="font-size:10px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+ x="-31.002258"
+ y="1108.627"
+ id="text3938-3-00-9-3"
+ sodipodi:linespacing="125%"><tspan
+ sodipodi:role="line"
+ id="tspan3940-6-5-3-2"
+ x="-31.002258"
+ y="1108.627"
+ style="font-size:2px">encoder-analyze-max.png</tspan></text>
+ <g
+ id="g5968"
+
inkscape:export-filename="/home/xavier/informatica/progs_meus/chronojump/chronojump/images/encoder-analyze-time-to-pp.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
+ <rect
+ y="1112.4536"
+ x="35.400635"
+ height="16"
+ width="16"
+ id="rect2985-62-4-5-7-1-4"
+ style="fill:#ffffff;fill-opacity:0;fill-rule:nonzero;stroke:none" />
+ <path
+ sodipodi:nodetypes="cc"
+ inkscape:connector-curvature="0"
+ id="path3792-5-2-9-3-3-9-8-10"
+ d="m 43.283662,1118.0898 c 3.313335,-0.1924 3.587649,4.6469 5.723426,5.6947"
+
style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
/>
+ <path
+ sodipodi:nodetypes="cc"
+ inkscape:connector-curvature="0"
+ id="path3792-5-2-9-3-3-9-4-2-3"
+ d="m 43.517609,1118.0898 c -3.313335,-0.1924 -3.587649,4.6469 -5.723426,5.6947"
+
style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
/>
+ <g
+ id="g5958">
+ <path
+
style="fill:none;stroke:#ff0000;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ d="m 43.283662,1118.0898 c 3.313335,-0.1924 3.587649,4.6469 5.723426,5.6947"
+ id="path3792-5-2-9-3-3-9-0"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
+ <path
+
style="fill:none;stroke:#ff0000;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ d="m 43.517609,1118.0898 c -3.313335,-0.1924 -3.587649,4.6469 -5.723426,5.6947"
+ id="path3792-5-2-9-3-3-9-4-5"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
+ </g>
+ <path
+ transform="matrix(0.92839834,0,0,0.92839834,35.384666,978.54092)"
+ d="m 10.644894,150.00484 a 2.0107021,2.0107021 0 1 1 -4.0214046,0 2.0107021,2.0107021 0 1 1
4.0214046,0 z"
+ sodipodi:ry="2.0107021"
+ sodipodi:rx="2.0107021"
+ sodipodi:cy="150.00484"
+ sodipodi:cx="8.6341915"
+ id="path4559-3"
+
style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.28709117;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:100;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ sodipodi:type="arc" />
+ <rect
+ y="1124.6047"
+ x="36.994091"
+ height="2.0847321"
+ width="6.5049443"
+ id="rect4607-8"
+
style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.33874368999999999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
/>
+ </g>
+ <g
+ id="g5978"
+
inkscape:export-filename="/home/xavier/informatica/progs_meus/chronojump/chronojump/images/encoder-analyze-range.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
+ <rect
+ y="1112.4536"
+ x="3.5568383"
+ height="16"
+ width="16"
+ id="rect2985-62-4-5-7-1-4-5"
+ style="fill:#ffffff;fill-opacity:0;fill-rule:nonzero;stroke:none" />
+ <path
+ sodipodi:nodetypes="cc"
+ inkscape:connector-curvature="0"
+ id="path3792-5-2-9-3-3-9-8-10-4"
+ d="m 12.436312,1118.09 c 3.313173,-0.1923 3.587474,4.6467 5.723146,5.6945"
+
style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
/>
+ <path
+ sodipodi:nodetypes="cc"
+ inkscape:connector-curvature="0"
+ id="path3792-5-2-9-3-3-9-4-2-3-7"
+ d="m 12.670247,1118.09 c -3.3131733,-0.1923 -3.5874738,4.6467 -5.723146,5.6945"
+
style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
/>
+ <path
+ sodipodi:nodetypes="cc"
+ inkscape:connector-curvature="0"
+ id="path3792-5-2-9-3-3-9-0-3"
+ d="m 12.436312,1118.09 c 3.313173,-0.1923 3.587474,4.6467 5.723146,5.6945"
+
style="fill:none;stroke:#000000;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
/>
+ <path
+ sodipodi:nodetypes="cc"
+ inkscape:connector-curvature="0"
+ id="path3792-5-2-9-3-3-9-4-5-1"
+ d="m 12.670247,1118.09 c -3.3131733,-0.1923 -3.5874738,4.6467 -5.723146,5.6945"
+
style="fill:none;stroke:#000000;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
/>
+ <rect
+ transform="matrix(0,1,-1,0,0,0)"
+ y="-6.0536032"
+ x="1117.1946"
+ height="1.9245516"
+ width="7.5081"
+ id="rect4607-8-4"
+
style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.34966657000000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
/>
+ </g>
+ <text
+ xml:space="preserve"
+
style="font-size:10px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+ x="-1.6740185"
+ y="1106.1874"
+ id="text3938-3-00-9-3-2"
+ sodipodi:linespacing="125%"><tspan
+ sodipodi:role="line"
+ id="tspan3940-6-5-3-2-3"
+ x="-1.6740185"
+ y="1106.1874"
+ style="font-size:2px">encoder-analyze-range.png</tspan></text>
+ <text
+ xml:space="preserve"
+
style="font-size:10px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+ x="29.115158"
+ y="1108.627"
+ id="text3938-3-00-9-3-6"
+ sodipodi:linespacing="125%"><tspan
+ sodipodi:role="line"
+ id="tspan3940-6-5-3-2-2"
+ x="29.115158"
+ y="1108.627"
+ style="font-size:2px">encoder-analyze-time-to-pp.png</tspan></text>
</g>
</svg>
diff --git a/src/Makefile.am b/src/Makefile.am
index fe0a3bc..42befa9 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -274,6 +274,14 @@ RESOURCES = \
../images/encoder-analyze-nmp.png,encoder-analyze-nmp.png \
../images/encoder-analyze-eccon-together.png,encoder-analyze-eccon-together.png \
../images/encoder-analyze-eccon-separated.png,encoder-analyze-eccon-separated.png \
+ ../images/encoder-analyze-speed.png,encoder-analyze-speed.png \
+ ../images/encoder-analyze-accel.png,encoder-analyze-accel.png \
+ ../images/encoder-analyze-force.png,encoder-analyze-force.png \
+ ../images/encoder-analyze-power.png,encoder-analyze-power.png \
+ ../images/encoder-analyze-mean.png,encoder-analyze-mean.png \
+ ../images/encoder-analyze-max.png,encoder-analyze-max.png \
+ ../images/encoder-analyze-range.png,encoder-analyze-range.png \
+ ../images/encoder-analyze-time-to-pp.png,encoder-analyze-time-to-pp.png \
../images/encoder-linear.png,encoder-linear.png \
../images/encoder-rotary-friction.png,encoder-rotary-friction.png \
../images/encoder-rotary-axis.png,encoder-rotary-axis.png \
diff --git a/src/constants.cs b/src/constants.cs
index fbf3628..2c2efbb 100644
--- a/src/constants.cs
+++ b/src/constants.cs
@@ -398,6 +398,16 @@ public class Constants
public static string FileNameEncoderAnalyzeEcconTogetherIcon = "encoder-analyze-eccon-together.png";
public static string FileNameEncoderAnalyzeEcconSeparatedIcon = "encoder-analyze-eccon-separated.png";
+ public static string FileNameEncoderAnalyzeSpeedIcon = "encoder-analyze-speed.png";
+ public static string FileNameEncoderAnalyzeAccelIcon = "encoder-analyze-accel.png";
+ public static string FileNameEncoderAnalyzeForceIcon = "encoder-analyze-force.png";
+ public static string FileNameEncoderAnalyzePowerIcon = "encoder-analyze-power.png";
+
+ public static string FileNameEncoderAnalyzeMeanIcon = "encoder-analyze-mean.png";
+ public static string FileNameEncoderAnalyzeMaxIcon = "encoder-analyze-max.png";
+ public static string FileNameEncoderAnalyzeRangeIcon = "encoder-analyze-range.png";
+ public static string FileNameEncoderAnalyzeTimeToPPIcon = "encoder-analyze-time-to-pp.png";
+
//30 colors defined
//see als UtilGtk that's not used by the server
public static string [] Colors = {
diff --git a/src/gui/chronojump.cs b/src/gui/chronojump.cs
index 5165ced..3bc3e23 100644
--- a/src/gui/chronojump.cs
+++ b/src/gui/chronojump.cs
@@ -775,6 +775,14 @@ public partial class ChronoJumpWindow
UtilGtk.ColorsRadio(viewport_chronopics, radiobutton_encoder_analyze_side);
UtilGtk.ColorsRadio(viewport_chronopics, radiobutton_encoder_analyze_single);
UtilGtk.ColorsRadio(viewport_chronopics, radiobutton_encoder_analyze_neuromuscular_profile);
+
+ UtilGtk.ColorsCheckbox(viewport_chronopics, check_encoder_analyze_show_speed);
+ UtilGtk.ColorsCheckbox(viewport_chronopics, check_encoder_analyze_show_accel);
+ UtilGtk.ColorsCheckbox(viewport_chronopics, check_encoder_analyze_show_force);
+ UtilGtk.ColorsCheckbox(viewport_chronopics, check_encoder_analyze_show_power);
+
+ UtilGtk.ColorsCheckbox(viewport_chronopics, check_encoder_analyze_show_range);
+ UtilGtk.ColorsCheckbox(viewport_chronopics, check_encoder_analyze_show_time_to_peak_power);
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "gpm-statistics.png");
@@ -802,6 +810,24 @@ public partial class ChronoJumpWindow
image_encoder_analyze_eccon_together.Pixbuf = pixbuf;
pixbuf = new Pixbuf (null, Util.GetImagePath(false) +
Constants.FileNameEncoderAnalyzeEcconSeparatedIcon);
image_encoder_analyze_eccon_separated.Pixbuf = pixbuf;
+
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) +
Constants.FileNameEncoderAnalyzeSpeedIcon);
+ image_encoder_analyze_speed.Pixbuf = pixbuf;
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) +
Constants.FileNameEncoderAnalyzeAccelIcon);
+ image_encoder_analyze_accel.Pixbuf = pixbuf;
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) +
Constants.FileNameEncoderAnalyzeForceIcon);
+ image_encoder_analyze_force.Pixbuf = pixbuf;
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) +
Constants.FileNameEncoderAnalyzePowerIcon);
+ image_encoder_analyze_power.Pixbuf = pixbuf;
+
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) +
Constants.FileNameEncoderAnalyzeMeanIcon);
+ image_encoder_analyze_mean.Pixbuf = pixbuf;
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) +
Constants.FileNameEncoderAnalyzeMaxIcon);
+ image_encoder_analyze_max.Pixbuf = pixbuf;
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) +
Constants.FileNameEncoderAnalyzeRangeIcon);
+ image_encoder_analyze_range.Pixbuf = pixbuf;
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) +
Constants.FileNameEncoderAnalyzeTimeToPPIcon);
+ image_encoder_analyze_time_to_pp.Pixbuf = pixbuf;
}
private void loadPreferences ()
diff --git a/src/gui/encoder.cs b/src/gui/encoder.cs
index df43195..d007643 100644
--- a/src/gui/encoder.cs
+++ b/src/gui/encoder.cs
@@ -123,15 +123,23 @@ public partial class ChronoJumpWindow
[Widget] Gtk.CheckButton check_encoder_analyze_eccon_together;
[Widget] Gtk.Image image_encoder_analyze_eccon_together;
[Widget] Gtk.Image image_encoder_analyze_eccon_separated;
+
+ [Widget] Gtk.Image image_encoder_analyze_speed;
+ [Widget] Gtk.Image image_encoder_analyze_accel;
+ [Widget] Gtk.Image image_encoder_analyze_force;
+ [Widget] Gtk.Image image_encoder_analyze_power;
+
+ [Widget] Gtk.Image image_encoder_analyze_mean;
+ [Widget] Gtk.Image image_encoder_analyze_max;
+ [Widget] Gtk.Image image_encoder_analyze_range;
+ [Widget] Gtk.Image image_encoder_analyze_time_to_pp;
[Widget] Gtk.Box hbox_encoder_analyze_curve_num;
[Widget] Gtk.Box hbox_combo_encoder_analyze_curve_num_combo;
[Widget] Gtk.ComboBox combo_encoder_analyze_curve_num_combo;
[Widget] Gtk.Label label_encoder_analyze_side_max;
-
- [Widget] Gtk.Box hbox_encoder_analyze_mean_or_max;
- [Widget] Gtk.RadioButton radiobutton_encoder_analyze_mean;
- [Widget] Gtk.RadioButton radiobutton_encoder_analyze_max;
+
+ [Widget] Gtk.CheckButton check_encoder_analyze_mean_or_max;
[Widget] Gtk.Viewport viewport_image_encoder_analyze;
[Widget] Gtk.Image image_encoder_analyze;
@@ -252,6 +260,7 @@ public partial class ChronoJumpWindow
//TODO: put a save graph and a html report
+
Constants.Status RInitialized;
private void encoderInitializeStuff() {
@@ -2137,7 +2146,7 @@ public partial class ChronoJumpWindow
//convert: "Force / Speed" in: "cross.Force.Speed.mean"
string [] crossNameFull = crossName.Split(new char[] {' '});
analysisVariables = crossNameFull[0] + ";" + crossNameFull[2]; //[1]=="/"
- if(radiobutton_encoder_analyze_mean.Active)
+ if(check_encoder_analyze_mean_or_max.Active)
analysisVariables += ";mean";
else
analysisVariables += ";max";
@@ -2506,7 +2515,7 @@ Log.WriteLine(str);
hbox_encoder_analyze_curve_num.Visible=true;
hbox_combo_encoder_analyze_curve_num_combo.Visible = true;
hbox_combo_encoder_analyze_cross.Visible=false;
- hbox_encoder_analyze_mean_or_max.Visible=false;
+ check_encoder_analyze_mean_or_max.Visible=false;
hbox_encoder_analyze_show_powerbars.Visible=false;
hbox_encoder_analyze_show_SAFE.Visible=true;
encoderAnalysis = "single";
@@ -2518,7 +2527,7 @@ Log.WriteLine(str);
label_encoder_analyze_side_max.Visible = false;
//restore 1RM Bench Press sensitiveness
- radiobutton_encoder_analyze_max.Sensitive = true;
+ check_encoder_analyze_mean_or_max.Sensitive = true;
encoderButtonsSensitive(encoderSensEnumStored);
}
@@ -2528,7 +2537,7 @@ Log.WriteLine(str);
hbox_encoder_analyze_curve_num.Visible=true;
hbox_combo_encoder_analyze_curve_num_combo.Visible = true;
hbox_combo_encoder_analyze_cross.Visible=false;
- hbox_encoder_analyze_mean_or_max.Visible=false;
+ check_encoder_analyze_mean_or_max.Visible=false;
hbox_encoder_analyze_show_powerbars.Visible=false;
hbox_encoder_analyze_show_SAFE.Visible=true;
encoderAnalysis="superpose";
@@ -2540,7 +2549,7 @@ Log.WriteLine(str);
button_encoder_analyze_help.Visible = false;
//restore 1RM Bench Press sensitiveness
- radiobutton_encoder_analyze_max.Sensitive = true;
+ check_encoder_analyze_mean_or_max.Sensitive = true;
on_combo_encoder_analyze_cross_changed (obj, args);
}
@@ -2549,7 +2558,7 @@ Log.WriteLine(str);
hbox_encoder_analyze_curve_num.Visible=false;
hbox_combo_encoder_analyze_curve_num_combo.Visible = false;
hbox_combo_encoder_analyze_cross.Visible=false;
- hbox_encoder_analyze_mean_or_max.Visible=false;
+ check_encoder_analyze_mean_or_max.Visible=false;
hbox_encoder_analyze_show_powerbars.Visible=false;
hbox_encoder_analyze_show_SAFE.Visible=true;
encoderAnalysis = "side";
@@ -2561,7 +2570,7 @@ Log.WriteLine(str);
button_encoder_analyze_help.Visible = false;
//restore 1RM Bench Press sensitiveness
- radiobutton_encoder_analyze_max.Sensitive = true;
+ check_encoder_analyze_mean_or_max.Sensitive = true;
encoderButtonsSensitive(encoderSensEnumStored);
}
@@ -2569,7 +2578,7 @@ Log.WriteLine(str);
hbox_encoder_analyze_curve_num.Visible=false;
hbox_combo_encoder_analyze_curve_num_combo.Visible = false;
hbox_combo_encoder_analyze_cross.Visible=false;
- hbox_encoder_analyze_mean_or_max.Visible=false;
+ check_encoder_analyze_mean_or_max.Visible=false;
hbox_encoder_analyze_show_powerbars.Visible=true;
hbox_encoder_analyze_show_SAFE.Visible=false;
encoderAnalysis="powerBars";
@@ -2580,7 +2589,7 @@ Log.WriteLine(str);
label_encoder_analyze_side_max.Visible = false;
//restore 1RM Bench Press sensitiveness
- radiobutton_encoder_analyze_max.Sensitive = true;
+ check_encoder_analyze_mean_or_max.Sensitive = true;
encoderButtonsSensitive(encoderSensEnumStored);
}
@@ -2589,7 +2598,7 @@ Log.WriteLine(str);
hbox_encoder_analyze_curve_num.Visible=false;
hbox_combo_encoder_analyze_curve_num_combo.Visible = false;
hbox_combo_encoder_analyze_cross.Visible=true;
- hbox_encoder_analyze_mean_or_max.Visible=true;
+ check_encoder_analyze_mean_or_max.Visible=true;
hbox_encoder_analyze_show_powerbars.Visible=false;
hbox_encoder_analyze_show_SAFE.Visible=false;
encoderAnalysis="cross";
@@ -2608,7 +2617,7 @@ Log.WriteLine(str);
hbox_encoder_analyze_curve_num.Visible=false;
hbox_combo_encoder_analyze_curve_num_combo.Visible = false;
hbox_combo_encoder_analyze_cross.Visible=false;
- hbox_encoder_analyze_mean_or_max.Visible=false;
+ check_encoder_analyze_mean_or_max.Visible=false;
hbox_encoder_analyze_show_powerbars.Visible=false;
hbox_encoder_analyze_show_SAFE.Visible=false;
encoderAnalysis="neuromuscularProfile";
@@ -2619,7 +2628,7 @@ Log.WriteLine(str);
button_encoder_analyze_help.Visible = true;
label_encoder_analyze_side_max.Visible = false;
- radiobutton_encoder_analyze_max.Sensitive = false;
+ check_encoder_analyze_mean_or_max.Sensitive = false;
encoderButtonsSensitive(encoderSensEnumStored);
}
@@ -2645,6 +2654,12 @@ Log.WriteLine(str);
image_encoder_analyze_eccon_separated.Visible = ! check_encoder_analyze_eccon_together.Active;
}
+ private void on_check_encoder_analyze_mean_or_max_toggled (object obj, EventArgs args) {
+ image_encoder_analyze_mean.Visible = check_encoder_analyze_mean_or_max.Active;
+ image_encoder_analyze_max.Visible = ! check_encoder_analyze_mean_or_max.Active;
+ }
+
+
private void on_button_encoder_analyze_help_clicked (object obj, EventArgs args) {
//currently only active on neuromuscular profile
@@ -2916,12 +2931,12 @@ Log.WriteLine(str);
encoderAnalyzeCrossTranslation) == "1RM Bench Press" ||
Util.FindOnArray(':',1,0,UtilGtk.ComboGetActive(combo_encoder_analyze_cross),
encoderAnalyzeCrossTranslation) == "1RM Any exercise" ) {
- radiobutton_encoder_analyze_mean.Active = true;
- radiobutton_encoder_analyze_max.Sensitive = false;
+ check_encoder_analyze_mean_or_max.Active = true;
+ check_encoder_analyze_mean_or_max.Sensitive = false;
check_encoder_analyze_eccon_together.Active = false;
check_encoder_analyze_eccon_together.Sensitive = false;
} else {
- radiobutton_encoder_analyze_max.Sensitive = true;
+ check_encoder_analyze_mean_or_max.Sensitive = true;
check_encoder_analyze_eccon_together.Sensitive = true;
}
}
diff --git a/src/utilGtk.cs b/src/utilGtk.cs
index 22a66af..062a70f 100644
--- a/src/utilGtk.cs
+++ b/src/utilGtk.cs
@@ -259,6 +259,12 @@ public class UtilGtk
r.ModifyBg(StateType.Active, v.Style.Background(StateType.Selected));
r.ModifyBg(StateType.Prelight, v.Style.Background(StateType.Selected));
}
+
+ public static void ColorsCheckbox(Gtk.Viewport v, Gtk.CheckButton c) {
+ c.ModifyBg(StateType.Active, v.Style.Background(StateType.Selected));
+ c.ModifyBg(StateType.Prelight, v.Style.Background(StateType.Selected));
+ }
+
public static void ColorsCheckOnlyPrelight(Gtk.CheckButton c) {
//c.ModifyBg(StateType.Normal, WHITE);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
