[refactoring] Convert [mm] location to [m] to be consistent

g3force · g3force · commit 1b4440a976d9 · 2018-12-06T19:07:34.000+01:00
diff --git a/src/components/common/EditableLabelNumber.vue b/src/components/common/EditableLabelNumber.vue
@@ -36,7 +36,7 @@
             callback: Function
         },
         data: function () {
-            return {g: {edit: false, value: 0, focused: false}}
+            return {g: {edit: false, value: 0.0, focused: false}}
         },
         methods: {
             updateValue: function () {
diff --git a/src/components/common/LocationSelection.vue b/src/components/common/LocationSelection.vue
@@ -2,12 +2,12 @@
     <b-form-group :label="label" horizontal>
         <input type="number"
                v-model="model.x"
-               :min="-99000"
-               :max="99000"/>
+               :min="-99000.0"
+               :max="99000.0"/>
         <input type="number"
                v-model="model.y"
-               :min="-99000"
-               :max="99000"/>
+               :min="-99000.0"
+               :max="99000.0"/>
     </b-form-group>
 </template>
 
diff --git a/src/components/events/PlaceBall.vue b/src/components/events/PlaceBall.vue
@@ -1,7 +1,7 @@
 <template>
     <div>
         <TeamSelection :model="model" label="For: " :allow-unknown-team="false"/>
-        <LocationSelection :model="model.location" label="Location [mm]: "/>
+        <LocationSelection :model="model.location" label="Location [m]: "/>
         <b-button variant="primary"
                   @click="sendEvent()"
                   :disabled="model.team === null || !ballLocationSet">
diff --git a/src/components/events/inputs/AimlessKick.vue b/src/components/events/inputs/AimlessKick.vue
@@ -2,8 +2,8 @@
     <div>
         <TeamSelection :model="model" label="By: " :allow-unknown-team="false"/>
         <BotSelection :model="model" label="By Bot: "/>
-        <LocationSelection :model="model.location" label="Location [mm]: "/>
-        <LocationSelection :model="model.kickLocation" label="Kick Location [mm]: "/>
+        <LocationSelection :model="model.location" label="Location [m]: "/>
+        <LocationSelection :model="model.kickLocation" label="Kick Location [m]: "/>
         <b-button variant="primary"
                   @click="sendEvent()"
                   :disabled="model.team === null">
diff --git a/src/components/events/inputs/AttackerDoubleTouchedBall.vue b/src/components/events/inputs/AttackerDoubleTouchedBall.vue
@@ -2,7 +2,7 @@
     <div>
         <TeamSelection :model="model" label="By: " :allow-unknown-team="false"/>
         <BotSelection :model="model" label="By Bot: "/>
-        <LocationSelection :model="model.location" label="Location [mm]: "/>
+        <LocationSelection :model="model.location" label="Location [m]: "/>
         <b-button variant="primary"
                   @click="sendEvent()"
                   :disabled="model.team === null">
diff --git a/src/components/events/inputs/AttackerInDefenseArea.vue b/src/components/events/inputs/AttackerInDefenseArea.vue
@@ -2,7 +2,7 @@
     <div>
         <TeamSelection :model="model" label="By: " :allow-unknown-team="false"/>
         <BotSelection :model="model" label="By Bot: "/>
-        <LocationSelection :model="model.location" label="Location [mm]: "/>
+        <LocationSelection :model="model.location" label="Location [m]: "/>
         <b-button variant="primary"
                   @click="sendEvent()"
                   :disabled="model.team === null">
diff --git a/src/components/events/inputs/AttackerTooCloseToDefenseArea.vue b/src/components/events/inputs/AttackerTooCloseToDefenseArea.vue
@@ -2,7 +2,7 @@
     <div>
         <TeamSelection :model="model" label="By: " :allow-unknown-team="false"/>
         <BotSelection :model="model" label="By Bot: "/>
-        <LocationSelection :model="model.location" label="Location [mm]: "/>
+        <LocationSelection :model="model.location" label="Location [m]: "/>
         <b-button variant="primary"
                   @click="sendEvent()"
                   :disabled="model.team === null">
diff --git a/src/components/events/inputs/AttackerTouchedKeeper.vue b/src/components/events/inputs/AttackerTouchedKeeper.vue
@@ -2,7 +2,7 @@
     <div>
         <TeamSelection :model="model" label="By: " :allow-unknown-team="false"/>
         <BotSelection :model="model" label="By Bot: "/>
-        <LocationSelection :model="model.location" label="Location [mm]: "/>
+        <LocationSelection :model="model.location" label="Location [m]: "/>
         <b-button variant="primary"
                   @click="sendEvent()"
                   :disabled="model.team === null">
diff --git a/src/components/events/inputs/BallLeftFieldGoalLine.vue b/src/components/events/inputs/BallLeftFieldGoalLine.vue
@@ -2,7 +2,7 @@
     <div>
         <TeamSelection :model="model" label="By Team: " :allow-unknown-team="false"/>
         <BotSelection :model="model" label="By Bot: "/>
-        <LocationSelection :model="model.location" label="Location [mm]: "/>
+        <LocationSelection :model="model.location" label="Location [m]: "/>
         <b-button variant="primary"
                   @click="sendEvent()"
                   :disabled="model.team === null">
diff --git a/src/components/events/inputs/BallLeftFieldTouchLine.vue b/src/components/events/inputs/BallLeftFieldTouchLine.vue
@@ -2,7 +2,7 @@
     <div>
         <TeamSelection :model="model" label="By: " :allow-unknown-team="false"/>
         <BotSelection :model="model" label="By Bot: "/>
-        <LocationSelection :model="model.location" label="Location [mm]: "/>
+        <LocationSelection :model="model.location" label="Location [m]: "/>
         <b-button variant="primary"
                   @click="sendEvent()"
                   :disabled="model.team === null">
diff --git a/src/components/events/inputs/BotCrashDrawn.vue b/src/components/events/inputs/BotCrashDrawn.vue
@@ -2,7 +2,7 @@
     <div>
         <BotSelection :model="model.botYellow" label="Yellow Bot: "/>
         <BotSelection :model="model.botBlue" label="Blue Bot: "/>
-        <LocationSelection :model="model.location" label="Location [mm]: "/>
+        <LocationSelection :model="model.location" label="Location [m]: "/>
         <b-button variant="primary"
                   @click="sendEvent()"
                   :disabled="model.team === null">
diff --git a/src/components/events/inputs/BotCrashUnique.vue b/src/components/events/inputs/BotCrashUnique.vue
@@ -3,7 +3,7 @@
         <TeamSelection :model="model" label="By: " :allow-unknown-team="false"/>
         <BotSelection :model="model.violator" label="Violator Bot: "/>
         <BotSelection :model="model.victim" label="Victim Bot: "/>
-        <LocationSelection :model="model.location" label="Location [mm]: "/>
+        <LocationSelection :model="model.location" label="Location [m]: "/>
         <b-button variant="primary"
                   @click="sendEvent()"
                   :disabled="model.team === null">
diff --git a/src/components/events/inputs/BotCrashUniqueSkipped.vue b/src/components/events/inputs/BotCrashUniqueSkipped.vue
@@ -3,7 +3,7 @@
         <TeamSelection :model="model" label="By: " :allow-unknown-team="false"/>
         <BotSelection :model="model.violator" label="Violator Bot: "/>
         <BotSelection :model="model.victim" label="Victim Bot: "/>
-        <LocationSelection :model="model.location" label="Location [mm]: "/>
+        <LocationSelection :model="model.location" label="Location [m]: "/>
         <b-button variant="primary"
                   @click="sendEvent()"
                   :disabled="model.team === null">
diff --git a/src/components/events/inputs/BotDribbledBallTooFar.vue b/src/components/events/inputs/BotDribbledBallTooFar.vue
@@ -2,8 +2,8 @@
     <div>
         <TeamSelection :model="model" label="By: " :allow-unknown-team="false"/>
         <BotSelection :model="model" label="By Bot: "/>
-        <LocationSelection :model="model.startLocation" label="Start [mm]: "/>
-        <LocationSelection :model="model.endLocation" label="End [mm]: "/>
+        <LocationSelection :model="model.startLocation" label="Start [m]: "/>
+        <LocationSelection :model="model.endLocation" label="End [m]: "/>
         <b-button variant="primary"
                   @click="sendEvent()"
                   :disabled="model.team === null">
diff --git a/src/components/events/inputs/BotHeldBallDeliberately.vue b/src/components/events/inputs/BotHeldBallDeliberately.vue
@@ -2,7 +2,7 @@
     <div>
         <TeamSelection :model="model" label="By: " :allow-unknown-team="false"/>
         <BotSelection :model="model" label="By Bot: "/>
-        <LocationSelection :model="model.location" label="Location [mm]: "/>
+        <LocationSelection :model="model.location" label="Location [m]: "/>
         <b-button variant="primary"
                   @click="sendEvent()"
                   :disabled="model.team === null">
diff --git a/src/components/events/inputs/BotInterferedPlacement.vue b/src/components/events/inputs/BotInterferedPlacement.vue
@@ -2,7 +2,7 @@
     <div>
         <TeamSelection :model="model" label="By: " :allow-unknown-team="false"/>
         <BotSelection :model="model" label="By Bot: "/>
-        <LocationSelection :model="model.location" label="Location [mm]: "/>
+        <LocationSelection :model="model.location" label="Location [m]: "/>
         <b-button variant="primary"
                   @click="sendEvent()"
                   :disabled="model.team === null">
diff --git a/src/components/events/inputs/BotKickedBallTooFast.vue b/src/components/events/inputs/BotKickedBallTooFast.vue
@@ -2,7 +2,7 @@
     <div>
         <TeamSelection :model="model" label="By: " :allow-unknown-team="false"/>
         <BotSelection :model="model" label="By Bot: "/>
-        <LocationSelection :model="model.location" label="Location [mm]: "/>
+        <LocationSelection :model="model.location" label="Location [m]: "/>
         <b-button variant="primary"
                   @click="sendEvent()"
                   :disabled="model.team === null">
diff --git a/src/components/events/inputs/BotPushedBot.vue b/src/components/events/inputs/BotPushedBot.vue
@@ -3,7 +3,7 @@
         <TeamSelection :model="model" label="By: " :allow-unknown-team="false"/>
         <BotSelection :model="model.violator" label="Violator Bot: "/>
         <BotSelection :model="model.victim" label="Victim Bot: "/>
-        <LocationSelection :model="model.location" label="Location [mm]: "/>
+        <LocationSelection :model="model.location" label="Location [m]: "/>
         <b-button variant="primary"
                   @click="sendEvent()"
                   :disabled="model.team === null">
diff --git a/src/components/events/inputs/BotPushedBotSkipped.vue b/src/components/events/inputs/BotPushedBotSkipped.vue
@@ -3,7 +3,7 @@
         <TeamSelection :model="model" label="By: " :allow-unknown-team="false"/>
         <BotSelection :model="model.violator" label="Violator Bot: "/>
         <BotSelection :model="model.victim" label="Victim Bot: "/>
-        <LocationSelection :model="model.location" label="Location [mm]: "/>
+        <LocationSelection :model="model.location" label="Location [m]: "/>
         <b-button variant="primary"
                   @click="sendEvent()"
                   :disabled="model.team === null">
diff --git a/src/components/events/inputs/BotTippedOver.vue b/src/components/events/inputs/BotTippedOver.vue
@@ -2,7 +2,7 @@
     <div>
         <TeamSelection :model="model" label="By: " :allow-unknown-team="false"/>
         <BotSelection :model="model" label="By Bot: "/>
-        <LocationSelection :model="model.location" label="Location [mm]: "/>
+        <LocationSelection :model="model.location" label="Location [m]: "/>
         <b-button variant="primary"
                   @click="sendEvent()"
                   :disabled="model.team === null">
diff --git a/src/components/events/inputs/BotTooFastInStop.vue b/src/components/events/inputs/BotTooFastInStop.vue
@@ -2,7 +2,7 @@
     <div>
         <TeamSelection :model="model" label="By: " :allow-unknown-team="false"/>
         <BotSelection :model="model" label="By Bot: "/>
-        <LocationSelection :model="model.location" label="Location [mm]: "/>
+        <LocationSelection :model="model.location" label="Location [m]: "/>
         <b-button variant="primary"
                   @click="sendEvent()"
                   :disabled="model.team === null">
diff --git a/src/components/events/inputs/ChippedGoal.vue b/src/components/events/inputs/ChippedGoal.vue
@@ -2,8 +2,8 @@
     <div>
         <TeamSelection :model="model" label="By: " :allow-unknown-team="false"/>
         <BotSelection :model="model" label="By Bot: "/>
-        <LocationSelection :model="model.location" label="Location [mm]: "/>
-        <LocationSelection :model="model.kickLocation" label="Kick Location [mm]: "/>
+        <LocationSelection :model="model.location" label="Location [m]: "/>
+        <LocationSelection :model="model.kickLocation" label="Kick Location [m]: "/>
         <b-button variant="primary"
                   @click="sendEvent()"
                   :disabled="model.team === null">
diff --git a/src/components/events/inputs/DefenderInDefenseArea.vue b/src/components/events/inputs/DefenderInDefenseArea.vue
@@ -2,7 +2,7 @@
     <div>
         <TeamSelection :model="model" label="By: " :allow-unknown-team="false"/>
         <BotSelection :model="model" label="By Bot: "/>
-        <LocationSelection :model="model.location" label="Location [mm]: "/>
+        <LocationSelection :model="model.location" label="Location [m]: "/>
         <b-button variant="primary"
                   @click="sendEvent()"
                   :disabled="model.team === null">
diff --git a/src/components/events/inputs/DefenderInDefenseAreaPartially.vue b/src/components/events/inputs/DefenderInDefenseAreaPartially.vue
@@ -2,7 +2,7 @@
     <div>
         <TeamSelection :model="model" label="By: " :allow-unknown-team="false"/>
         <BotSelection :model="model" label="By Bot: "/>
-        <LocationSelection :model="model.location" label="Location [mm]: "/>
+        <LocationSelection :model="model.location" label="Location [m]: "/>
         <b-button variant="primary"
                   @click="sendEvent()"
                   :disabled="model.team === null">
diff --git a/src/components/events/inputs/DefenderTooCloseToKickPoint.vue b/src/components/events/inputs/DefenderTooCloseToKickPoint.vue
@@ -2,7 +2,7 @@
     <div>
         <TeamSelection :model="model" label="By: " :allow-unknown-team="false"/>
         <BotSelection :model="model" label="By Bot: "/>
-        <LocationSelection :model="model.location" label="Location [mm]: "/>
+        <LocationSelection :model="model.location" label="Location [m]: "/>
         <b-button variant="primary"
                   @click="sendEvent()"
                   :disabled="model.team === null">
diff --git a/src/components/events/inputs/Goal.vue b/src/components/events/inputs/Goal.vue
@@ -2,8 +2,8 @@
     <div>
         <TeamSelection :model="model" label="By: " :allow-unknown-team="false"/>
         <BotSelection :model="model" label="By Bot: "/>
-        <LocationSelection :model="model.location" label="Location [mm]: "/>
-        <LocationSelection :model="model.kickLocation" label="Kick Location [mm]: "/>
+        <LocationSelection :model="model.location" label="Location [m]: "/>
+        <LocationSelection :model="model.kickLocation" label="Kick Location [m]: "/>
         <b-button variant="primary"
                   @click="sendEvent()"
                   :disabled="model.team === null">
diff --git a/src/components/events/inputs/IndirectGoal.vue b/src/components/events/inputs/IndirectGoal.vue
@@ -2,8 +2,8 @@
     <div>
         <TeamSelection :model="model" label="By: " :allow-unknown-team="false"/>
         <BotSelection :model="model" label="By Bot: "/>
-        <LocationSelection :model="model.location" label="Location [mm]: "/>
-        <LocationSelection :model="model.kickLocation" label="Kick Location [mm]: "/>
+        <LocationSelection :model="model.location" label="Location [m]: "/>
+        <LocationSelection :model="model.kickLocation" label="Kick Location [m]: "/>
         <b-button variant="primary"
                   @click="sendEvent()"
                   :disabled="model.team === null">
diff --git a/src/components/events/inputs/KeeperHeldBall.vue b/src/components/events/inputs/KeeperHeldBall.vue
@@ -1,7 +1,7 @@
 <template>
     <div>
         <TeamSelection :model="model" label="By: " :allow-unknown-team="false"/>
-        <LocationSelection :model="model.location" label="Location [mm]: "/>
+        <LocationSelection :model="model.location" label="Location [m]: "/>
         <b-button variant="primary"
                   @click="sendEvent()"
                   :disabled="model.team === null">
diff --git a/src/components/events/inputs/PossibleGoal.vue b/src/components/events/inputs/PossibleGoal.vue
@@ -2,8 +2,8 @@
     <div>
         <TeamSelection :model="model" label="By: " :allow-unknown-team="false"/>
         <BotSelection :model="model" label="By Bot: "/>
-        <LocationSelection :model="model.location" label="Location [mm]: "/>
-        <LocationSelection :model="model.kickLocation" label="Kick Location [mm]: "/>
+        <LocationSelection :model="model.location" label="Location [m]: "/>
+        <LocationSelection :model="model.kickLocation" label="Kick Location [m]: "/>
         <b-button variant="primary"
                   @click="sendEvent()"
                   :disabled="model.team === null">
diff --git a/src/refereeState.js b/src/refereeState.js
@@ -24,5 +24,5 @@ export let convertStringLocation = function (loc) {
     if (loc.y === null || loc.y === "") {
         loc.y = "0";
     }
-    return {x: parseInt(loc.x) / 1000.0, y: parseInt(loc.y) / 1000.0}
+    return {x: parseFloat(loc.x), y: parseFloat(loc.y)}
 };
