 Bennet Brunsen
|
639d109e39
|
Revert "adding white space mess "
This reverts commit ec12301feee614dc356732850564b754e0bfc33a.
|
2015-04-30 11:54:47 +02:00 |
|
|
Bennet Brunsen
|
ff1b0c6f87
|
Merge branch 'master' into ubilabs--tracking_app--develop
|
2015-04-28 13:47:56 +02:00 |
|
 Simon Pamies
|
9c1cf6951c
|
Added chinese translation
|
2015-04-28 14:49:10 +08:00 |
|
 Frederik Petersen
|
e807456eec
|
Fixed errors after merge
|
2015-04-25 16:35:39 +02:00 |
|
|
Frederik Petersen
|
ca2ac594f5
|
Merge branch 'master' into bug2700
Conflicts:
java/com.sap.sailing.server/META-INF/MANIFEST.MF
java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PolarDiagramGPSDirect.java
|
2015-04-24 18:41:37 +02:00 |
|
 Christopher Ronnewinkel (D036654)
|
5e6da115d3
|
Merge remote-tracking branch 'ExternalGit/raceboard-simulation'
|
2015-04-24 14:21:39 +02:00 |
|
|
Frederik Petersen
|
a59a1a6c12
|
Fixed test case
delta needed to be higher, since now the confidence of track based
estimation without polars isn't as big as before anymore
|
2015-04-24 14:09:22 +02:00 |
|
|
Christopher Ronnewinkel (D036654)
|
93f1c21764
|
Merge remote-tracking branch 'ExternalGit/master' into raceboard-simulation
|
2015-04-24 13:53:24 +02:00 |
|
|
Christopher Ronnewinkel (D036654)
|
2248d5d1f9
|
improve logging of opportunist-360 and tree-grow-360;
|
2015-04-24 13:44:01 +02:00 |
|
|
Christopher Ronnewinkel (D036654)
|
7a70eb34a4
|
fix reaching-steps with water-current by determining boat-speed based on overground-bearing to target; use overground-extension of polar-diagram-base;
|
2015-04-24 13:15:20 +02:00 |
|
|
Bennet Brunsen
|
33d5c9a167
|
Applied code formatting to android shared project.
Applied sap eclipse code formatter android shared project.
|
2015-04-24 11:11:32 +02:00 |
|
|
Bennet Brunsen
|
5ef4b8ad33
|
Applied code formatting to tracking app project
Applied sap eclipse code formatter tracking app project.
|
2015-04-24 11:06:40 +02:00 |
|
|
Bennet Brunsen
|
8c0cec3632
|
Applied code formatting on buoy project
Applied sap code formatter on buoy project.
|
2015-04-24 10:58:06 +02:00 |
|
|
Bennet Brunsen
|
b20d4edb26
|
Changed 'about' string in EN.
|
2015-04-24 10:06:07 +02:00 |
|
 Axel Uhl
|
8d5411c596
|
removed ACCURACY constant that wasn't used anywhere
|
2015-04-24 00:20:27 +02:00 |
|
|
Axel Uhl
|
34bb8a83da
|
removed merge artifacts
|
2015-04-24 00:16:02 +02:00 |
|
|
Axel Uhl
|
78a74295ca
|
whitespace changed to match code formatting conventions
|
2015-04-23 23:48:27 +02:00 |
|
|
Axel Uhl
|
c2db032c7b
|
Merge branch 'master' into ubilabs--tracking_app--develop
|
2015-04-23 23:42:07 +02:00 |
|
|
Frederik Petersen
|
8a81e3e077
|
Polar confidence used in Track Based Windestimation
|
2015-04-23 16:55:47 +02:00 |
|
|
Axel Uhl
|
eef6479636
|
Merge remote-tracking branch 'server/master'
|
2015-04-23 15:46:10 +02:00 |
|
|
Axel Uhl
|
c7d6f62a75
|
fixing bug 2767 by also registering the old GPSFix(Moving)Impl type names with their old package locations for the Mongo persistence handler;
the commit in which the types were moved was 58bd451481
|
2015-04-23 15:41:08 +02:00 |
|
|
Bennet Brunsen
|
3ee24aa666
|
Introduces textview for course type in regatta fragment
|
2015-04-23 15:38:54 +02:00 |
|
|
Bennet Brunsen
|
94761bd617
|
Fixes Bug 2759
|
2015-04-23 15:28:32 +02:00 |
|
|
Christopher Ronnewinkel (D036654)
|
47f5a4ae51
|
Merge remote-tracking branch 'ExternalGit/master' into raceboard-simulation
Conflicts:
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/RaceMap.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SimulatorServiceImpl.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/PathCanvasOverlay.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/ReplayPathCanvasOverlay.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/SimulatorMap.java
java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PathGeneratorTracTrac.java
java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PathGeneratorTreeGrow.java
|
2015-04-23 14:33:48 +02:00 |
|
|
Christopher Ronnewinkel (D036654)
|
41642d4a24
|
fix 1-turner-360 algorithm used to finalize opportunistic courses;
|
2015-04-23 13:56:07 +02:00 |
|
|
Frederik Petersen
|
9cff25eab8
|
Merge branch 'master' into bug2700
Conflicts:
java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/data/RaceResultOfCompetitorWithContext.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/mock/MockedTrackedRaceWithStartTimeAndRanks.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/polars/PolarDataService.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/TrackedRace.java
java/com.sap.sailing.polars.test/src/com/sap/sailing/polars/mining/test/PolarDataMinerTest.java
java/com.sap.sailing.polars/src/com/sap/sailing/polars/impl/PolarDataServiceImpl.java
java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/PolarDataMiner.java
java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/PolarResource.java
java/com.sap.sailing.server/src/com/sap/sailing/server/impl/Activator.java
java/com.sap.sailing.server/src/com/sap/sailing/server/masterdata/DummyTrackedRace.java
|
2015-04-23 13:36:00 +02:00 |
|
|
Frederik Petersen
|
9451d69009
|
Use polar data service in track based windestimation
|
2015-04-23 12:31:52 +02:00 |
|
|
Bennet Brunsen
|
27664c30c0
|
Fixes bug 2760
Changed string inside fragment to use less space.
|
2015-04-23 12:30:58 +02:00 |
|
|
Bennet Brunsen
|
d5c5a0d29c
|
Fixes NPE in BuoyFragment
|
2015-04-23 11:41:48 +02:00 |
|
|
Frederik Petersen
|
6089c83613
|
Introduces polardataservice to tracked race
transient
can be null, needs to be handled accordingly
is null, if polar osgi bundle is stopped
|
2015-04-23 11:38:41 +02:00 |
|
|
Bennet Brunsen
|
f426946c59
|
Fixes missing translation of bug 2761
|
2015-04-23 11:11:33 +02:00 |
|
|
Frederik Petersen
|
f8f2ada89c
|
PolarDataService now uses OSGi service registry
preparation for being able to use polar data service in domain classes
|
2015-04-23 10:58:54 +02:00 |
|
|
Bennet Brunsen
|
1ccd21186d
|
Fixes build issue on hudson.
Changed sleep time after adb initialization from 10 to 60.
|
2015-04-23 10:51:20 +02:00 |
|
|
Bennet Brunsen
|
4aa6593aec
|
Adds comments for suppress warnings in old rc app.
|
2015-04-23 10:22:10 +02:00 |
|
|
Axel Uhl
|
fac1e416a6
|
further improved logging in case mark GPS tracks cannot be loaded
|
2015-04-22 23:03:45 +02:00 |
|
|
Axel Uhl
|
4f24e2177b
|
improved exception logging for GPS track loading for smartphone tracking
|
2015-04-22 22:56:43 +02:00 |
|
|
Axel Uhl
|
584f5350cb
|
removed Hockey dependency; fixed proxy settings in build script for android SDK update
|
2015-04-22 16:24:10 +02:00 |
|
|
Axel Uhl
|
118dd33eaf
|
Merge branch 'ubilabs--buoy_positioning_app--develop' into ubilabs--tracking_app--develop
|
2015-04-22 16:07:26 +02:00 |
|
|
Axel Uhl
|
dbea038349
|
adjusted finding of "android" tool so that it also works for Windows platform where it's called android.bat
|
2015-04-22 15:48:12 +02:00 |
|
|
Axel Uhl
|
1a7292f970
|
added the org.json.simple dependency to the build.gradle file of com.sap.sse.common
|
2015-04-22 15:36:58 +02:00 |
|
|
Axel Uhl
|
6d3afe9707
|
fixed some files to match formatting conventions
|
2015-04-22 14:58:48 +02:00 |
|
|
Axel Uhl
|
7747e8707d
|
Merge branch 'ubilabs--tracking_app--develop' into ubilabs--buoy_positioning_app--develop
Conflicts:
java/com.sap.sailing.gwt.ui/SailingGWT Remote Profiling (Run-Mode only).launch
java/com.sap.sailing.gwt.ui/SailingGWT sdm.launch
java/com.sap.sailing.gwt.ui/SailingGWT.launch
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/WindLatticeDTO.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/WindLatticeGenParamsDTO.java
java/com.sap.sse.security.ui/Security UI sdm.launch
|
2015-04-22 14:56:03 +02:00 |
|
|
Axel Uhl
|
18997d1159
|
Merge branch 'master' into ubilabs--tracking_app--develop
|
2015-04-22 14:55:23 +02:00 |
|
|
Axel Uhl
|
7f67ac85fb
|
Merge branch 'master' into ubilabs--buoy_positioning_app--develop
|
2015-04-22 14:54:28 +02:00 |
|
|
Christopher Ronnewinkel (D036654)
|
4c395695db
|
support reaching steps in opportunist-360;
|
2015-04-21 22:35:56 +02:00 |
|
 fmittag
|
7a8a267613
|
fix for Bug 2515 - Height of leaderboard competitor charts depends on height of leaderboard which is too tall with long leaderboard / many competitors
|
2015-04-21 21:38:53 +02:00 |
|
|
fmittag
|
9782fbc9e5
|
added a link to jobs.sapsailing.com in the footer
|
2015-04-21 18:32:55 +02:00 |
|
|
fmittag
|
0c31315125
|
added racecommittee app tutorial for race officer
|
2015-04-21 18:23:31 +02:00 |
|
|
Christopher Ronnewinkel (D036654)
|
8c9a4b1064
|
add opportunist-360;
|
2015-04-20 20:22:33 +02:00 |
|
|
fmittag
|
cfd36680f6
|
Merge remote-tracking branch 'origin/bug1963'
|
2015-04-20 18:57:54 +02:00 |
|