[chronojump] Added inertial lateral and inertial mov pulley. TODO: images
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] Added inertial lateral and inertial mov pulley. TODO: images
- Date: Mon, 27 Apr 2015 18:43:40 +0000 (UTC)
commit 897964dbc65d51e9ef7dc4ecfc7f561f3cf79f95
Author: Xavier de Blas <xaviblas gmail com>
Date: Mon Apr 27 20:41:13 2015 +0200
Added inertial lateral and inertial mov pulley. TODO: images
encoder/util.R | 1 +
images/svg/encoder-mode-icons.svg | 492 ++++++++++++++++++++++++++++++++++---
src/Makefile.am | 1 +
src/constants.cs | 16 +-
src/encoder.cs | 116 ++++++++--
src/utilEncoder.cs | 16 +-
6 files changed, 586 insertions(+), 56 deletions(-)
---
diff --git a/encoder/util.R b/encoder/util.R
index befbd58..ff0079c 100644
--- a/encoder/util.R
+++ b/encoder/util.R
@@ -213,6 +213,7 @@ getAcceleration <- function(speed) {
}
#gearedDown is positive, normally 2
+#this is not used on inertial machines
getMass <- function(mass, gearedDown, angle) {
if(mass == 0)
return (0)
diff --git a/images/svg/encoder-mode-icons.svg b/images/svg/encoder-mode-icons.svg
index e6f56af..7535f92 100644
--- a/images/svg/encoder-mode-icons.svg
+++ b/images/svg/encoder-mode-icons.svg
@@ -31,9 +31,9 @@
inkscape:window-height="714"
id="namedview5689"
showgrid="false"
- inkscape:zoom="0.23412255"
- inkscape:cx="9918.8061"
- inkscape:cy="8918.0823"
+ inkscape:zoom="0.14198986"
+ inkscape:cx="5982.1773"
+ inkscape:cy="3947.6294"
inkscape:window-x="0"
inkscape:window-y="25"
inkscape:window-maximized="1"
@@ -23006,8 +23006,18 @@
y2="737.02002" />
<linearGradient
inkscape:collect="always"
+ xlink:href="#linearGradient30038-5-7-0-4-9-0-9-7-2-5-8"
+ id="linearGradient11533"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.0036372,0,0,1.0036372,9658.794,4108.09)"
+ x1="263.34442"
+ y1="5017.9204"
+ x2="272.7132"
+ y2="5118.3003" />
+ <linearGradient
+ inkscape:collect="always"
xlink:href="#linearGradient30038-5-7-0-4-19-9-3-75-2"
- id="linearGradient11529"
+ id="linearGradient11762"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0,0.1614264,-0.07552953,0,10134.556,9116.7845)"
x1="175.72"
@@ -23017,7 +23027,7 @@
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient30038-5-7-0-4-9-0-9-7-2-5-8"
- id="linearGradient11533"
+ id="linearGradient11766"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.0036372,0,0,1.0036372,9658.794,4108.09)"
x1="263.34442"
@@ -23027,7 +23037,7 @@
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient30038-5-7-0-4-9-0-9-7-49-2"
- id="linearGradient11538"
+ id="linearGradient11770"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.0036372,0,0,1.0036372,9598.762,4108.0901)"
x1="263.34442"
@@ -23037,7 +23047,7 @@
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient30038-5-7-0-4-9-0-91-12-0"
- id="linearGradient11542"
+ id="linearGradient11775"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0,1.6605382,-0.94620763,0,10340.038,8632.9395)"
x1="175.72"
@@ -23047,7 +23057,7 @@
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient30038-5-7-0-4-19-9-9-5"
- id="linearGradient11554"
+ id="linearGradient11786"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0,0.1614264,-0.07552953,0,10833.161,8631.9465)"
x1="175.72"
@@ -23057,7 +23067,7 @@
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient30038-5-7-0-4-9-0-9-8-21"
- id="linearGradient11561"
+ id="linearGradient11792"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0,0.22918207,-0.13059249,0,10808.651,8610.0855)"
x1="175.72"
@@ -23067,7 +23077,7 @@
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient30038-5-7-0-4-9-0-94-9"
- id="linearGradient11566"
+ id="linearGradient11797"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0,1.6605382,-0.94620763,0,11099.565,8148.1015)"
x1="175.72"
@@ -23077,7 +23087,7 @@
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5962-7-3-3-0-1"
- id="linearGradient11569"
+ id="linearGradient11800"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.0060803,0,0,1.0060803,11321.523,5105.87)"
x1="-1016.8681"
@@ -23086,80 +23096,456 @@
y2="3232.9158" />
<linearGradient
inkscape:collect="always"
- xlink:href="#linearGradient30038-5-7-0-4-19-9-3-75-2"
- id="linearGradient11762"
+ xlink:href="#linearGradient5962-7-3-3-9-1-9-6-1-6"
+ id="linearGradient11247-7"
gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0,0.1614264,-0.07552953,0,10134.556,9116.7845)"
+ gradientTransform="matrix(1.0024342,0,0,1.0024342,8412.2449,6794.563)"
+ x1="-1016.8681"
+ y1="4258.1187"
+ x2="-833.49841"
+ y2="3232.9158" />
+ <linearGradient
+ id="linearGradient5962-7-3-3-9-1-9-6-1-6">
+ <stop
+ style="stop-color:#fff842;stop-opacity:1;"
+ offset="0"
+ id="stop5964-4-5-5-7-0-6-2-7-3" />
+ <stop
+ style="stop-color:#f3ff80;stop-opacity:0;"
+ offset="1"
+ id="stop5966-6-4-5-9-5-0-4-77-5" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient30038-5-7-0-4-9-0-5-4-8-6-6-4-4"
+ id="linearGradient11244-2"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0,1.5030189,-0.85644999,0,8285.3909,10005.48)"
x1="175.72"
y1="737.02002"
x2="470"
y2="737.02002" />
<linearGradient
+ id="linearGradient30038-5-7-0-4-9-0-5-4-8-6-6-4-4"
+ y2="737.02002"
+ gradientUnits="userSpaceOnUse"
+ x2="470"
+ gradientTransform="matrix(0.47131,0,0,0.47131,8046.6,409.49)"
+ y1="737.02002"
+ x1="175.72">
+ <stop
+ id="stop12003-9-7-5-0-2-5-0-4-1-1-2-5-9"
+ stop-color="#1b4a78"
+ offset="0"
+ style="stop-color:#edc6de;stop-opacity:1;" />
+ <stop
+ id="stop12005-6-2-9-9-7-6-5-6-1-0-7-4-1"
+ stop-color="#5dacd1"
+ offset="1"
+ style="stop-color:#7c305f;stop-opacity:1;" />
+ </linearGradient>
+ <linearGradient
inkscape:collect="always"
- xlink:href="#linearGradient30038-5-7-0-4-9-0-9-7-2-5-8"
- id="linearGradient11766"
+ xlink:href="#linearGradient30038-5-7-0-4-9-0-9-4-8-0-0-6-2-2"
+ id="linearGradient11239-6"
gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(1.0036372,0,0,1.0036372,9658.794,4108.09)"
+ gradientTransform="matrix(0,0.20744176,-0.11820443,0,8022.0749,10423.641)"
+ x1="175.72"
+ y1="737.02002"
+ x2="470"
+ y2="737.02002" />
+ <linearGradient
+ id="linearGradient30038-5-7-0-4-9-0-9-4-8-0-0-6-2-2"
+ y2="737.02002"
+ gradientUnits="userSpaceOnUse"
+ x2="470"
+ gradientTransform="matrix(0.47131,0,0,0.47131,8046.6,409.49)"
+ y1="737.02002"
+ x1="175.72">
+ <stop
+ id="stop12003-9-7-5-0-2-5-1-9-5-2-4-7-55-0"
+ stop-color="#1b4a78"
+ offset="0"
+ style="stop-color:#edc6de;stop-opacity:1;" />
+ <stop
+ id="stop12005-6-2-9-9-7-6-4-6-3-6-5-6-0-0"
+ stop-color="#5dacd1"
+ offset="1"
+ style="stop-color:#7c305f;stop-opacity:1;" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient30038-0-4-2-3-7-8-0-2-2-2"
+ id="linearGradient11295-3"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0,0.43548449,-0.43548449,0,8210.3673,10440.979)"
+ x1="175.72"
+ y1="737.02002"
+ x2="470"
+ y2="737.02002" />
+ <linearGradient
+ id="linearGradient30038-0-4-2-3-7-8-0-2-2-2"
+ y2="737.02002"
+ gradientUnits="userSpaceOnUse"
+ x2="470"
+ gradientTransform="matrix(0.47131,0,0,0.47131,8046.6,409.49)"
+ y1="737.02002"
+ x1="175.72">
+ <stop
+ id="stop12003-8-7-34-9-6-8-5-2-3-2"
+ stop-color="#1b4a78"
+ offset="0" />
+ <stop
+ id="stop12005-3-5-0-5-0-6-8-4-2-5"
+ stop-color="#5dacd1"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient30038-0-4-1-3-8-2-45-3-6-9-8-9-6"
+ id="linearGradient11308-7"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0,0.25358466,-0.25358466,0,8140.9605,10499.673)"
+ x1="175.72"
+ y1="737.02002"
+ x2="470"
+ y2="737.02002" />
+ <linearGradient
+ id="linearGradient30038-0-4-1-3-8-2-45-3-6-9-8-9-6"
+ y2="737.02002"
+ gradientUnits="userSpaceOnUse"
+ x2="470"
+ gradientTransform="matrix(0.47131,0,0,0.47131,8046.6,409.49)"
+ y1="737.02002"
+ x1="175.72">
+ <stop
+ id="stop12003-8-7-3-2-5-27-70-2-4-1-2-2-2"
+ stop-color="#1b4a78"
+ offset="0"
+ style="stop-color:#19262e;stop-opacity:1;" />
+ <stop
+ id="stop12005-3-5-4-7-7-3-20-3-2-8-2-4-5"
+ stop-color="#5dacd1"
+ offset="1"
+ style="stop-color:#244457;stop-opacity:1;" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient30038-0-4-1-3-31-23-6-2-1-5-85-3"
+ id="linearGradient11301-8"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0,0.25358466,-0.25358466,0,8162.2693,10499.673)"
+ x1="175.72"
+ y1="737.02002"
+ x2="470"
+ y2="737.02002" />
+ <linearGradient
+ id="linearGradient30038-0-4-1-3-31-23-6-2-1-5-85-3"
+ y2="737.02002"
+ gradientUnits="userSpaceOnUse"
+ x2="470"
+ gradientTransform="matrix(0.47131,0,0,0.47131,8046.6,409.49)"
+ y1="737.02002"
+ x1="175.72">
+ <stop
+ id="stop12003-8-7-3-2-55-01-6-5-3-1-3-2"
+ stop-color="#1b4a78"
+ offset="0"
+ style="stop-color:#19262e;stop-opacity:1;" />
+ <stop
+ id="stop12005-3-5-4-7-1-6-8-7-4-7-3-8"
+ stop-color="#5dacd1"
+ offset="1"
+ style="stop-color:#244457;stop-opacity:1;" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient30038-5-7-0-4-9-0-91-9-9-5-6-7-3-2"
+ id="linearGradient11213-0"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0,1.503019,-0.85645002,0,7484.5339,10004.806)"
+ x1="175.72"
+ y1="737.02002"
+ x2="470"
+ y2="737.02002" />
+ <linearGradient
+ id="linearGradient30038-5-7-0-4-9-0-91-9-9-5-6-7-3-2"
+ y2="737.02002"
+ gradientUnits="userSpaceOnUse"
+ x2="470"
+ gradientTransform="matrix(0.47131,0,0,0.47131,8046.6,409.49)"
+ y1="737.02002"
+ x1="175.72">
+ <stop
+ id="stop12003-9-7-5-0-2-5-16-5-3-1-1-1-4-5"
+ stop-color="#1b4a78"
+ offset="0"
+ style="stop-color:#edc6de;stop-opacity:1;" />
+ <stop
+ id="stop12005-6-2-9-9-7-6-7-1-9-5-6-5-3-9"
+ stop-color="#5dacd1"
+ offset="1"
+ style="stop-color:#7c305f;stop-opacity:1;" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient30038-5-7-0-4-9-0-9-7-5-7-0-6-3-7-1"
+ id="linearGradient11209-4"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.90843176,0,0,0.90843176,6813.5749,5909.1852)"
x1="263.34442"
y1="5017.9204"
x2="272.7132"
y2="5118.3003" />
<linearGradient
+ id="linearGradient30038-5-7-0-4-9-0-9-7-5-7-0-6-3-7-1"
+ y2="737.02002"
+ gradientUnits="userSpaceOnUse"
+ x2="470"
+ gradientTransform="matrix(0.47131,0,0,0.47131,8046.6,409.49)"
+ y1="737.02002"
+ x1="175.72">
+ <stop
+ id="stop12003-9-7-5-0-2-5-1-3-9-2-4-7-4-2-0"
+ stop-color="#1b4a78"
+ offset="0"
+ style="stop-color:#edc6de;stop-opacity:1;" />
+ <stop
+ id="stop12005-6-2-9-9-7-6-4-7-9-2-4-2-0-0-4"
+ stop-color="#5dacd1"
+ offset="1"
+ style="stop-color:#7c305f;stop-opacity:1;" />
+ </linearGradient>
+ <linearGradient
inkscape:collect="always"
- xlink:href="#linearGradient30038-5-7-0-4-9-0-9-7-49-2"
- id="linearGradient11770"
+ xlink:href="#linearGradient30038-5-7-0-4-9-0-9-7-2-3-3-7-4-8-26-3"
+ id="linearGradient11205-0"
gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(1.0036372,0,0,1.0036372,9598.762,4108.0901)"
+ gradientTransform="matrix(0.90843176,0,0,0.90843176,6867.9119,5909.1851)"
x1="263.34442"
y1="5017.9204"
x2="272.7132"
y2="5118.3003" />
<linearGradient
+ id="linearGradient30038-5-7-0-4-9-0-9-7-2-3-3-7-4-8-26-3"
+ y2="737.02002"
+ gradientUnits="userSpaceOnUse"
+ x2="470"
+ gradientTransform="matrix(0.47131,0,0,0.47131,8046.6,409.49)"
+ y1="737.02002"
+ x1="175.72">
+ <stop
+ id="stop12003-9-7-5-0-2-5-1-3-8-3-6-2-1-4-2-9"
+ stop-color="#1b4a78"
+ offset="0"
+ style="stop-color:#edc6de;stop-opacity:1;" />
+ <stop
+ id="stop12005-6-2-9-9-7-6-4-7-6-2-3-0-2-1-8-2"
+ stop-color="#5dacd1"
+ offset="1"
+ style="stop-color:#7c305f;stop-opacity:1;" />
+ </linearGradient>
+ <linearGradient
inkscape:collect="always"
- xlink:href="#linearGradient30038-5-7-0-4-9-0-91-12-0"
- id="linearGradient11775"
+ xlink:href="#linearGradient30038-0-4-2-3-6-9-5-4-6-4-0"
+ id="linearGradient11271-7"
gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0,1.6605382,-0.94620763,0,10340.038,8632.9395)"
+ gradientTransform="matrix(0,0.43548449,-0.43548449,0,7475.7573,10442.979)"
x1="175.72"
y1="737.02002"
x2="470"
y2="737.02002" />
<linearGradient
+ id="linearGradient30038-0-4-2-3-6-9-5-4-6-4-0"
+ y2="737.02002"
+ gradientUnits="userSpaceOnUse"
+ x2="470"
+ gradientTransform="matrix(0.47131,0,0,0.47131,8046.6,409.49)"
+ y1="737.02002"
+ x1="175.72">
+ <stop
+ id="stop12003-8-7-34-9-5-8-8-2-8-36-6"
+ stop-color="#1b4a78"
+ offset="0" />
+ <stop
+ id="stop12005-3-5-0-5-7-5-6-2-7-6-5"
+ stop-color="#5dacd1"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
inkscape:collect="always"
- xlink:href="#linearGradient30038-5-7-0-4-19-9-9-5"
- id="linearGradient11786"
+ xlink:href="#linearGradient30038-0-4-1-3-8-2-45-6-4-5-6-8-81-6"
+ id="linearGradient11322-5"
gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0,0.1614264,-0.07552953,0,10833.161,8631.9465)"
+ gradientTransform="matrix(0,0.25358466,-0.25358466,0,7406.3505,10501.673)"
x1="175.72"
y1="737.02002"
x2="470"
y2="737.02002" />
<linearGradient
+ id="linearGradient30038-0-4-1-3-8-2-45-6-4-5-6-8-81-6"
+ y2="737.02002"
+ gradientUnits="userSpaceOnUse"
+ x2="470"
+ gradientTransform="matrix(0.47131,0,0,0.47131,8046.6,409.49)"
+ y1="737.02002"
+ x1="175.72">
+ <stop
+ id="stop12003-8-7-3-2-5-27-70-8-3-0-7-5-12-7"
+ stop-color="#1b4a78"
+ offset="0"
+ style="stop-color:#19262e;stop-opacity:1;" />
+ <stop
+ id="stop12005-3-5-4-7-7-3-20-8-5-7-7-0-0-0"
+ stop-color="#5dacd1"
+ offset="1"
+ style="stop-color:#244457;stop-opacity:1;" />
+ </linearGradient>
+ <linearGradient
inkscape:collect="always"
- xlink:href="#linearGradient30038-5-7-0-4-9-0-9-8-21"
- id="linearGradient11792"
+ xlink:href="#linearGradient30038-0-4-1-3-31-23-4-1-3-4-7-8-9"
+ id="linearGradient11315-0"
gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0,0.22918207,-0.13059249,0,10808.651,8610.0855)"
+ gradientTransform="matrix(0,0.25358466,-0.25358466,0,7427.6593,10501.673)"
x1="175.72"
y1="737.02002"
x2="470"
y2="737.02002" />
<linearGradient
+ id="linearGradient30038-0-4-1-3-31-23-4-1-3-4-7-8-9"
+ y2="737.02002"
+ gradientUnits="userSpaceOnUse"
+ x2="470"
+ gradientTransform="matrix(0.47131,0,0,0.47131,8046.6,409.49)"
+ y1="737.02002"
+ x1="175.72">
+ <stop
+ id="stop12003-8-7-3-2-55-01-8-8-1-6-6-3-5"
+ stop-color="#1b4a78"
+ offset="0"
+ style="stop-color:#19262e;stop-opacity:1;" />
+ <stop
+ id="stop12005-3-5-4-7-1-6-3-9-5-6-3-5-9"
+ stop-color="#5dacd1"
+ offset="1"
+ style="stop-color:#244457;stop-opacity:1;" />
+ </linearGradient>
+ <linearGradient
inkscape:collect="always"
- xlink:href="#linearGradient30038-5-7-0-4-9-0-94-9"
- id="linearGradient11797"
+ xlink:href="#linearGradient30038-0-4-1-3-31-23-4-1-3-4-7-8-9"
+ id="linearGradient12176"
gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0,1.6605382,-0.94620763,0,11099.565,8148.1015)"
+ gradientTransform="matrix(0,0.25358466,-0.25358466,0,6001.8865,13109.685)"
x1="175.72"
y1="737.02002"
x2="470"
y2="737.02002" />
<linearGradient
inkscape:collect="always"
- xlink:href="#linearGradient5962-7-3-3-0-1"
- id="linearGradient11800"
+ xlink:href="#linearGradient30038-0-4-1-3-8-2-45-6-4-5-6-8-81-6"
+ id="linearGradient12181"
gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(1.0060803,0,0,1.0060803,11321.523,5105.87)"
+ gradientTransform="matrix(0,0.25358466,-0.25358466,0,5980.5777,13109.685)"
+ x1="175.72"
+ y1="737.02002"
+ x2="470"
+ y2="737.02002" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient30038-0-4-2-3-6-9-5-4-6-4-0"
+ id="linearGradient12192"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0,0.43548449,-0.43548449,0,6049.9845,13050.991)"
+ x1="175.72"
+ y1="737.02002"
+ x2="470"
+ y2="737.02002" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient30038-5-7-0-4-9-0-9-7-2-3-3-7-4-8-26-3"
+ id="linearGradient12195"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.90843176,0,0,0.90843176,5442.1391,8517.1972)"
+ x1="263.34442"
+ y1="5017.9204"
+ x2="272.7132"
+ y2="5118.3003" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient30038-5-7-0-4-9-0-9-7-5-7-0-6-3-7-1"
+ id="linearGradient12198"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.90843176,0,0,0.90843176,5387.8021,8517.1973)"
+ x1="263.34442"
+ y1="5017.9204"
+ x2="272.7132"
+ y2="5118.3003" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient30038-5-7-0-4-9-0-91-9-9-5-6-7-3-2"
+ id="linearGradient12202"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0,1.503019,-0.85645002,0,6058.7611,12612.818)"
+ x1="175.72"
+ y1="737.02002"
+ x2="470"
+ y2="737.02002" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient30038-0-4-1-3-31-23-6-2-1-5-85-3"
+ id="linearGradient12207"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0,0.25358466,-0.25358466,0,6736.4965,13107.685)"
+ x1="175.72"
+ y1="737.02002"
+ x2="470"
+ y2="737.02002" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient30038-0-4-1-3-8-2-45-3-6-9-8-9-6"
+ id="linearGradient12212"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0,0.25358466,-0.25358466,0,6715.1877,13107.685)"
+ x1="175.72"
+ y1="737.02002"
+ x2="470"
+ y2="737.02002" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient30038-0-4-2-3-7-8-0-2-2-2"
+ id="linearGradient12223"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0,0.43548449,-0.43548449,0,6784.5945,13048.991)"
+ x1="175.72"
+ y1="737.02002"
+ x2="470"
+ y2="737.02002" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient30038-5-7-0-4-9-0-9-4-8-0-0-6-2-2"
+ id="linearGradient12227"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0,0.20744176,-0.11820443,0,6596.3021,13031.653)"
+ x1="175.72"
+ y1="737.02002"
+ x2="470"
+ y2="737.02002" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient30038-5-7-0-4-9-0-5-4-8-6-6-4-4"
+ id="linearGradient12232"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0,1.5030189,-0.85644999,0,6859.6181,12613.492)"
+ x1="175.72"
+ y1="737.02002"
+ x2="470"
+ y2="737.02002" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5962-7-3-3-9-1-9-6-1-6"
+ id="linearGradient12236"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.0024342,0,0,1.0024342,6986.4721,9402.5751)"
x1="-1016.8681"
y1="4258.1187"
x2="-833.49841"
@@ -34551,4 +34937,40 @@
d="m 10638.774,8686.2969 c -22.504,26.0647 -24.864,-52.5591 -34.567,-39.1394"
style="fill:none;stroke:#000000;stroke-width:6.6218791;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:none"
/>
</g>
+ <g
+ id="g12238"
+
inkscape:export-filename="/home/xavier/informatica/progs_meus/chronojump/chronojump/images/encoder-image-pending.png"
+ inkscape:export-xdpi="15.72"
+ inkscape:export-ydpi="15.72">
+ <rect
+ y="12613.371"
+ x="5120.2158"
+ height="1147.6829"
+ width="1647.2407"
+ id="rect5960-9-1-7-7-7-2-3-3-1-6-0"
+ style="fill:url(#linearGradient12236);fill-opacity:1;stroke:none" />
+ <text
+ sodipodi:linespacing="125%"
+ id="text4734-4-5-5-6-1-0-0"
+ y="13229.504"
+ x="5677.3262"
+
style="font-size:116.17972565px;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"
+ xml:space="preserve"><tspan
+ y="13229.504"
+ x="5677.3262"
+ id="tspan4736-8-2-9-4-3-5-4"
+ sodipodi:role="line">PENDING</tspan></text>
+ </g>
+ <text
+ xml:space="preserve"
+
style="font-size:101.84909058px;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="5184.772"
+ y="14043.772"
+ id="text5892-2-6-6-1-6-1-3-8-4-8"
+ sodipodi:linespacing="125%"><tspan
+ style="font-size:90px"
+ sodipodi:role="line"
+ x="5184.772"
+ y="14043.772"
+ id="tspan14125-8-0-1-1-8-9-98-3-5">encoder-pending-image-plane.png</tspan></text>
</svg>
diff --git a/src/Makefile.am b/src/Makefile.am
index 81dac7f..fac7002 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -311,6 +311,7 @@ RESOURCES = \
../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-image-pending.png,encoder-image-pending.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 a3a5db4..cfe123c 100644
--- a/src/constants.cs
+++ b/src/constants.cs
@@ -746,6 +746,8 @@ public class Constants
public static double EncoderErrorCode = -1;
+ public static string FileNameEncoderImagePending = "encoder-image-pending.png";
+
//three encoder types
public static string FileNameEncoderTypeLinear = "encoder-linear.png";
public static string FileNameEncoderTypeRotaryFriction = "encoder-rotary-friction.png";
@@ -779,15 +781,21 @@ public class Constants
public static string FileNameEncoderCalculeIM = "encoder-calcule-im.png";
public enum EncoderConfigurationNames { //this names are used on graph.R change there also if needed
+ // ---- LINEAR ----
LINEAR, LINEARINVERTED, LINEARINERTIAL,
WEIGHTEDMOVPULLEYLINEARONPERSON1, WEIGHTEDMOVPULLEYLINEARONPERSON1INV,
WEIGHTEDMOVPULLEYLINEARONPERSON2, WEIGHTEDMOVPULLEYLINEARONPERSON2INV,
WEIGHTEDMOVPULLEYONLINEARENCODER,
LINEARONPLANE, LINEARONPLANEWEIGHTDIFFANGLE,
- ROTARYFRICTIONSIDE, ROTARYFRICTIONAXIS, //friction
- ROTARYFRICTIONSIDEINERTIAL, ROTARYFRICTIONAXISINERTIAL, //friction
- WEIGHTEDMOVPULLEYROTARYFRICTION, //friction
- ROTARYAXIS, ROTARYAXISINERTIAL, WEIGHTEDMOVPULLEYROTARYAXIS //axis
+ // ---- ROTARY FRICTION ----
+ ROTARYFRICTIONSIDE, ROTARYFRICTIONAXIS,
+ WEIGHTEDMOVPULLEYROTARYFRICTION,
+ ROTARYFRICTIONSIDEINERTIAL, ROTARYFRICTIONAXISINERTIAL,
+ ROTARYFRICTIONSIDEINERTIALLATERAL, ROTARYFRICTIONAXISINERTIALLATERAL,
+ ROTARYFRICTIONSIDEINERTIALMOVPULLEY, ROTARYFRICTIONAXISINERTIALMOVPULLEY,
+ // ---- ROTARY AXIS ----
+ ROTARYAXIS, WEIGHTEDMOVPULLEYROTARYAXIS,
+ ROTARYAXISINERTIAL, ROTARYAXISINERTIALLATERAL, ROTARYAXISINERTIALMOVPULLEY
}
public static string DefaultEncoderConfigurationCode = "Linear - barbell";
diff --git a/src/encoder.cs b/src/encoder.cs
index fafdfd6..99867e3 100644
--- a/src/encoder.cs
+++ b/src/encoder.cs
@@ -950,6 +950,7 @@ public class EncoderConfiguration {
has_inertia = false;
gearedDown = 1;
+ // ---- LINEAR ----
if(name == Constants.EncoderConfigurationNames.LINEAR) {
type = Constants.EncoderType.LINEAR;
position = 0;
@@ -1051,6 +1052,7 @@ public class EncoderConfiguration {
has_angle_push = true;
has_angle_weight = true;
}
+ // ---- ROTARY FRICTION ----
else if(name == Constants.EncoderConfigurationNames.ROTARYFRICTIONSIDE) {
type = Constants.EncoderType.ROTARYFRICTION;
position = 0;
@@ -1068,9 +1070,16 @@ public class EncoderConfiguration {
has_d = true;
has_D = true;
}
- else if(name == Constants.EncoderConfigurationNames.ROTARYFRICTIONSIDEINERTIAL) {
+ else if(name == Constants.EncoderConfigurationNames.WEIGHTEDMOVPULLEYROTARYFRICTION) {
type = Constants.EncoderType.ROTARYFRICTION;
position = 2;
+ image = Constants.FileNameEncoderFrictionWithMovPulley;
+ code = "Rotary friction - moving pulley";
+ text = Catalog.GetString("Rotary friction encoder on weighted moving pulley.");
+ }
+ else if(name == Constants.EncoderConfigurationNames.ROTARYFRICTIONSIDEINERTIAL) {
+ type = Constants.EncoderType.ROTARYFRICTION;
+ position = 3;
image = Constants.FileNameEncoderFrictionSideInertial;
code = "Rotary friction - inertial machine side";
text = Catalog.GetString("Rotary friction encoder on inertial machine side.") + "\n" +
@@ -1083,7 +1092,7 @@ public class EncoderConfiguration {
}
else if(name == Constants.EncoderConfigurationNames.ROTARYFRICTIONAXISINERTIAL) {
type = Constants.EncoderType.ROTARYFRICTION;
- position = 3;
+ position = 4;
image = Constants.FileNameEncoderFrictionAxisInertial;
code = "Rotary friction axis - inertial machine axis";
text = Catalog.GetString("Rotary friction encoder on inertial machine axis.") + "\n" +
@@ -1093,13 +1102,63 @@ public class EncoderConfiguration {
has_d = true;
has_inertia = true;
}
- else if(name == Constants.EncoderConfigurationNames.WEIGHTEDMOVPULLEYROTARYFRICTION) {
+ else if(name == Constants.EncoderConfigurationNames.ROTARYFRICTIONSIDEINERTIALLATERAL) {
type = Constants.EncoderType.ROTARYFRICTION;
- position = 4;
- image = Constants.FileNameEncoderFrictionWithMovPulley;
- code = "Rotary friction - moving pulley";
- text = Catalog.GetString("Rotary friction encoder on weighted moving pulley.");
+ position = 5;
+ image = Constants.FileNameEncoderImagePending; //TODO
+ code = "Rotary friction - inertial machine side - lateral movement";
+ text = Catalog.GetString("Rotary friction encoder on inertial machine when person is
moving laterally.") + "\n" +
+ "*" + Catalog.GetString("Start capture with the string completely
unwrapped.") + "*" + "\n" +
+ Catalog.GetString("On inertial machines, 'd' means the average diameter where
the pull-push string is rolled");
+
+ has_d = true;
+ has_D = true;
+ has_inertia = true;
+ }
+ else if(name == Constants.EncoderConfigurationNames.ROTARYFRICTIONAXISINERTIALLATERAL) {
+ type = Constants.EncoderType.ROTARYFRICTION;
+ position = 6;
+ image = Constants.FileNameEncoderImagePending; //TODO
+ code = "Rotary friction - inertial machine axis - lateral movement";
+ text = Catalog.GetString("Rotary friction encoder on inertial machine when person is
moving laterally.") + "\n" +
+ "*" + Catalog.GetString("Start capture with the string completely
unwrapped.") + "*" + "\n" +
+ Catalog.GetString("On inertial machines, 'd' means the average diameter where
the pull-push string is rolled");
+
+ has_d = true;
+ has_inertia = true;
}
+ else if(name == Constants.EncoderConfigurationNames.ROTARYFRICTIONSIDEINERTIALMOVPULLEY) {
+ type = Constants.EncoderType.ROTARYFRICTION;
+ position = 7;
+ image = Constants.FileNameEncoderImagePending; //TODO
+ code = "Rotary friction - inertial machine side geared up";
+ text = Catalog.GetString("Rotary friction encoder on inertial machine geared up.") +
"\n" +
+ "*" + Catalog.GetString("Person has to start fully extended (on the toes).")
+ "*" + "\n" +
+ Catalog.GetString("On inertial machines, 'd' means the average diameter where
the pull-push string is rolled") + "\n" +
+ Catalog.GetString("Inertial machine rolls twice faster than body.");
+
+ has_d = true;
+ has_D = true;
+ has_inertia = true;
+
+ gearedDown = -2; //gearedDown is not used in inertial machines. It's hardcoded
+ }
+ else if(name == Constants.EncoderConfigurationNames.ROTARYFRICTIONAXISINERTIALMOVPULLEY) {
+ type = Constants.EncoderType.ROTARYFRICTION;
+ position = 8;
+ image = Constants.FileNameEncoderImagePending; //TODO
+ code = "Rotary friction - inertial machine axis geared up";
+ text = Catalog.GetString("Rotary friction encoder on inertial machine geared up.") +
"\n" +
+ "*" + Catalog.GetString("Person has to start fully extended (on the toes).")
+ "*" + "\n" +
+ Catalog.GetString("On inertial machines, 'd' means the average diameter where
the pull-push string is rolled") + "\n" +
+ Catalog.GetString("Inertial machine rolls twice faster than body.");
+
+ has_d = true;
+ has_inertia = true;
+
+ gearedDown = -2; //gearedDown is not used in inertial machines. It's hardcoded
+ }
+ // ---- ROTARY AXIS ----
else if(name == Constants.EncoderConfigurationNames.ROTARYAXIS) {
type = Constants.EncoderType.ROTARYAXIS;
position = 0;
@@ -1109,9 +1168,19 @@ public class EncoderConfiguration {
has_D = true;
}
- else if(name == Constants.EncoderConfigurationNames.ROTARYAXISINERTIAL) {
+ else if(name == Constants.EncoderConfigurationNames.WEIGHTEDMOVPULLEYROTARYAXIS) {
type = Constants.EncoderType.ROTARYAXIS;
position = 1;
+ image = Constants.FileNameEncoderAxisWithMovPulley;
+ code = "Rotary axis - moving pulley";
+ text = Catalog.GetString("Rotary axis encoder on weighted moving pulley.")
+ + " " + Catalog.GetString("Mass is geared down by 2.");
+
+ gearedDown = 2;
+ }
+ else if(name == Constants.EncoderConfigurationNames.ROTARYAXISINERTIAL) {
+ type = Constants.EncoderType.ROTARYAXIS;
+ position = 2;
image = Constants.FileNameEncoderAxisInertial;
code = "Rotary axis - inertial machine";
text = Catalog.GetString("Rotary axis encoder on inertial machine.") + "\n" +
@@ -1121,15 +1190,32 @@ public class EncoderConfiguration {
has_d = true;
has_inertia = true;
}
- else if(name == Constants.EncoderConfigurationNames.WEIGHTEDMOVPULLEYROTARYAXIS) {
+ else if(name == Constants.EncoderConfigurationNames.ROTARYAXISINERTIALLATERAL) {
type = Constants.EncoderType.ROTARYAXIS;
- position = 2;
- image = Constants.FileNameEncoderAxisWithMovPulley;
- code = "Rotary axis - moving pulley";
- text = Catalog.GetString("Rotary axis encoder on weighted moving pulley.")
- + " " + Catalog.GetString("Mass is geared down by 2.");
+ position = 3;
+ image = Constants.FileNameEncoderImagePending; //TODO
+ code = "Rotary axis - inertial machine - lateral movement";
+ text = Catalog.GetString("Rotary axis encoder on inertial machine when person is
moving laterally.") + "\n" +
+ "*" + Catalog.GetString("Start capture with the string completely
unwrapped.") + "*" + "\n" +
+ Catalog.GetString("On inertial machines, 'd' means the average diameter where
the pull-push string is rolled");
+
+ has_d = true;
+ has_inertia = true;
+ }
+ else if(name == Constants.EncoderConfigurationNames.ROTARYAXISINERTIALMOVPULLEY) {
+ type = Constants.EncoderType.ROTARYAXIS;
+ position = 4;
+ image = Constants.FileNameEncoderImagePending; //TODO
+ code = "Rotary axis - inertial machine geared up";
+ text = Catalog.GetString("Rotary axis encoder on inertial machine geared up.") + "\n"
+
+ "*" + Catalog.GetString("Person has to start fully extended (on the toes).")
+ "*" + "\n" +
+ Catalog.GetString("On inertial machines, 'd' means the average diameter where
the pull-push string is rolled") + "\n" +
+ Catalog.GetString("Inertial machine rolls twice faster than body.");
+
+ has_d = true;
+ has_inertia = true;
- gearedDown = 2;
+ gearedDown = -2; //gearedDown is not used in inertial machines. It's hardcoded
}
}
diff --git a/src/utilEncoder.cs b/src/utilEncoder.cs
index bc52bc6..6887ce5 100644
--- a/src/utilEncoder.cs
+++ b/src/utilEncoder.cs
@@ -727,18 +727,30 @@ public class UtilEncoder
list.Add(new EncoderConfiguration(
Constants.EncoderConfigurationNames.ROTARYFRICTIONAXIS));
list.Add(new EncoderConfiguration(
+ Constants.EncoderConfigurationNames.WEIGHTEDMOVPULLEYROTARYFRICTION));
+ list.Add(new EncoderConfiguration(
Constants.EncoderConfigurationNames.ROTARYFRICTIONSIDEINERTIAL));
list.Add(new EncoderConfiguration(
Constants.EncoderConfigurationNames.ROTARYFRICTIONAXISINERTIAL));
list.Add(new EncoderConfiguration(
- Constants.EncoderConfigurationNames.WEIGHTEDMOVPULLEYROTARYFRICTION));
+
Constants.EncoderConfigurationNames.ROTARYFRICTIONSIDEINERTIALLATERAL));
+ list.Add(new EncoderConfiguration(
+
Constants.EncoderConfigurationNames.ROTARYFRICTIONAXISINERTIALLATERAL));
+ list.Add(new EncoderConfiguration(
+
Constants.EncoderConfigurationNames.ROTARYFRICTIONSIDEINERTIALMOVPULLEY));
+ list.Add(new EncoderConfiguration(
+
Constants.EncoderConfigurationNames.ROTARYFRICTIONAXISINERTIALMOVPULLEY));
} else if(encoderType == Constants.EncoderType.ROTARYAXIS) {
list.Add(new EncoderConfiguration(
Constants.EncoderConfigurationNames.ROTARYAXIS));
list.Add(new EncoderConfiguration(
+ Constants.EncoderConfigurationNames.WEIGHTEDMOVPULLEYROTARYAXIS));
+ list.Add(new EncoderConfiguration(
Constants.EncoderConfigurationNames.ROTARYAXISINERTIAL));
list.Add(new EncoderConfiguration(
- Constants.EncoderConfigurationNames.WEIGHTEDMOVPULLEYROTARYAXIS));
+ Constants.EncoderConfigurationNames.ROTARYAXISINERTIALLATERAL));
+ list.Add(new EncoderConfiguration(
+ Constants.EncoderConfigurationNames.ROTARYAXISINERTIALMOVPULLEY));
}
return list;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
