Team2890/PhotonVision
4
0
Fork 0
mirror of https://github.com/PhotonVision/photonvision synced 2026-07-05 03:21:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Renamed "Closest" sort mode to "Centermost", Removed SpringFramework because its not needed

Browse Source
This commit is contained in:
Omer
2019-10-30 14:32:57 +02:00
parent a7f306d0b9
commit 120fa64f3c
3 changed files with 4 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Main/pom.xml
View File

@@ -101,11 +101,6 @@
<artifactId>jackson-dataformat-msgpack</artifactId>
<version>0.8.18</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<version>5.1.9.RELEASE</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>

13
Main/src/main/java/com/chameleonvision/web/ServerHandler.java
View File

@@ -14,7 +14,6 @@ import io.javalin.websocket.*;
import org.apache.commons.lang3.ArrayUtils;
import org.msgpack.jackson.dataformat.MessagePackFactory;
import org.springframework.beans.BeanUtils;
import java.io.IOException;
import java.lang.reflect.Field;
@@ -152,16 +151,10 @@ public class ServerHandler {
private void setField(Object obj, String fieldName, Object value) {
try {
Field field = obj.getClass().getField(fieldName);
if (BeanUtils.isSimpleValueType(field.getType())) {
if (field.getType().isEnum()) {
field.set(obj, field.getType().getEnumConstants()[(Integer) value]);
} else {
field.set(obj, value);
}
} else if (field.getType() == List.class) {
// if(((ParameterizedType)field.getGenericType()).getActualTypeArguments()[0] == Double.class){
if (field.getType().isEnum())
field.set(obj, field.getType().getEnumConstants()[(Integer) value]);
else
field.set(obj, value);
}
} catch (NoSuchFieldException | IllegalAccessException ex) {
ex.printStackTrace();
}

2
chameleon-client/src/views/CameraViewes/OutputTab.vue
View File

@@ -1,6 +1,6 @@
<template>
<div>
<CVselect name="SortMode" v-model="value.sortMode" :list="['Largest','Smallest','Highest','Lowest','Rightmost','Leftmost','Closest']" @input="handleInput('sortMode',value.sortMode)"></CVselect>
<CVselect name="SortMode" v-model="value.sortMode" :list="['Largest','Smallest','Highest','Lowest','Rightmost','Leftmost','Centermost']" @input="handleInput('sortMode',value.sortMode)"></CVselect>
<span>Calibrate:</span><v-divider dark color="white"></v-divider>
<v-row align="center" justify="start">
<v-col style="padding-right:0px" :cols="3">