[chronojump: 4/4] Merge branch 'master' of gitlab.gnome.org:GNOME/chronojump

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

commit d6001e7cd41c2be6b801bafe9f649d208c033143
Merge: 907d2b7c b532f002
Author: Xavier Padullés <x padulles gmail com>
Date:   Tue Oct 22 11:11:18 2019 +0200

    Merge branch 'master' of gitlab.gnome.org:GNOME/chronojump

 diagrams/processes/import.dia                  |  Bin 0 -> 5452 bytes
 glade/app1.glade                               |   39 +-
 glade/session_load.glade                       |  837 +++++++++++---
 po/POTFILES.in                                 |    4 +-
 po/es.po                                       | 1406 +++++++++++++-----------
 r-scripts/forcePosition.R                      |    5 +-
 src/Makefile.am                                |    5 +-
 src/chronojump-importer/chronojump_importer.py |   52 +-
 src/chronojump.cs                              |    3 +-
 src/chronojumpImporter.cs                      |   95 +-
 src/encoderCapture.cs                          |    6 +
 src/forceSensor.cs                             |   43 +-
 src/gui/chronojump.cs                          |  104 --
 src/gui/chronojumpImporter.cs                  |  188 ++++
 src/gui/forceSensor.cs                         |   11 +-
 src/gui/runEncoder.cs                          |  179 ++-
 src/gui/session.cs                             | 1398 -----------------------
 src/gui/session/addEdit.cs                     |  669 +++++++++++
 src/gui/session/load.cs                        |  693 ++++++++++++
 src/gui/session/selectStats.cs                 |  282 +++++
 src/sqlite/forceSensor.cs                      |   87 +-
 src/sqlite/main.cs                             |    4 +
 src/sqlite/runEncoder.cs                       |   18 +-
 src/util.cs                                    |    6 +-
 src/webcam/webcamFfmpeg.cs                     |   21 +-
 src/webcam/webcamFfmpegDevices.cs              |    5 +-
 src/webcam/webcamFfmpegSupportedModes.cs       |    6 +-
 win32/deps/bin/i386/ffmpeg.exe                 |  Bin 0 -> 49556992 bytes
 win32/deps/bin/i386/ffplay.exe                 |  Bin 0 -> 49437184 bytes
 29 files changed, 3731 insertions(+), 2435 deletions(-)
---
diff --cc r-scripts/forcePosition.R
index d5df28a1,205000f6..7db1c2bf
--- a/r-scripts/forcePosition.R
+++ b/r-scripts/forcePosition.R
@@@ -3,9 -3,10 +3,10 @@@
  
  getDynamicsFromForceSensor <- function(file = 
"/home/xpadulles/.local/share/Chronojump/forceSensor/83/1_Xavier Padullés_2019-10-01_13-03-41.csv",
                                         totalMass = 75,
+                                      stiffness = 71.93,       #71.93 N/m measured in the black rubber
                                         angle = 0,
                                         smooth = 5,
 -                                       minDisplacement = 0.1
 +                                       conMinDisplacement = 0.1, eccMinDisplacement = 0.1
  )
  {
          forceSensor = read.csv(file, sep =";", dec = ",", header = TRUE)
@@@ -200,11 -191,12 +201,11 @@@ getRepetitions <- function(time, positi
                  , meanSpeeds = meanSpeeds[2:length(meanSpeeds)]))
  }
  
 -testDir = "/home/xpadulles/chronojump/r-scripts/tests/"
 -allFiles = dir("/home/xpadulles/chronojump/r-scripts/tests/")
 +testDir = "/home/xpadulles/Descargas/Piscina-mati/separat-per-punticoma/"
 +allFiles = dir(testDir)
  
 -for(i in 1:length(allFiles))
 +for(i in 1:5)
  {
          dynamics = getDynamicsFromForceSensor(file = paste(testDir, allFiles[i], sep ="")
-                                               ,smooth = 10, totalMass = 0, angle = 0, conMinDisplacement = 
0.5, eccMinDisplacement = 0.1)
+                                               ,smooth = 10, totalMass = 0, stiffness = 71.93, angle = 0, 
minDisplacement = .5)
  }
 -