diff --git a/Main/.settings/org.eclipse.core.resources.prefs b/Main/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 000000000..abdea9ac0 --- /dev/null +++ b/Main/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,4 @@ +eclipse.preferences.version=1 +encoding//src/main/java=UTF-8 +encoding//src/main/resources=UTF-8 +encoding/=UTF-8 diff --git a/Main/.settings/org.eclipse.jdt.apt.core.prefs b/Main/.settings/org.eclipse.jdt.apt.core.prefs new file mode 100644 index 000000000..d4313d4b2 --- /dev/null +++ b/Main/.settings/org.eclipse.jdt.apt.core.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.apt.aptEnabled=false diff --git a/Main/.settings/org.eclipse.jdt.core.prefs b/Main/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 000000000..6eecfaf0f --- /dev/null +++ b/Main/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,9 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=12 +org.eclipse.jdt.core.compiler.compliance=12 +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore +org.eclipse.jdt.core.compiler.processAnnotations=disabled +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=12 diff --git a/Main/.settings/org.eclipse.m2e.core.prefs b/Main/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 000000000..f897a7f1c --- /dev/null +++ b/Main/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/New client/chameleon-client/src/App.vue b/New client/chameleon-client/src/App.vue index eebd7be24..aa7d997b7 100644 --- a/New client/chameleon-client/src/App.vue +++ b/New client/chameleon-client/src/App.vue @@ -45,10 +45,12 @@ export default { created(){ this.$options.sockets.onmessage = (data) =>{ try{ - let message = JSON.parse(data.data); + // let message = JSON.parse(data.data); + let message = this.$msgPack().decode(data.data); for(let prop in message){ if(message.hasOwnProperty(prop)){ - this.handleMessage(prop,message[prop]); + // this.handleMessage(prop,message[prop]); + console.log(message); } } } diff --git a/New client/chameleon-client/src/views/Camera.vue b/New client/chameleon-client/src/views/Camera.vue index 4fbf618e2..b845ebf6c 100644 --- a/New client/chameleon-client/src/views/Camera.vue +++ b/New client/chameleon-client/src/views/Camera.vue @@ -91,10 +91,6 @@ import CVicon from '../components/cv-icon' CVicon }, methods:{ - test(){ - let o = this.$msgPack().encode("dasd"); - console.log(o); - } }, data() { return { diff --git a/New client/chameleon-client/src/views/CameraViewes/ContoursTab.vue b/New client/chameleon-client/src/views/CameraViewes/ContoursTab.vue index 638b52e94..84054273b 100644 --- a/New client/chameleon-client/src/views/CameraViewes/ContoursTab.vue +++ b/New client/chameleon-client/src/views/CameraViewes/ContoursTab.vue @@ -19,6 +19,7 @@ import CVselect from '../../components/cv-select' CVrangeSlider, CVselect }, + data() { return { } @@ -30,7 +31,7 @@ import CVselect from '../../components/cv-select' } return false; } - } + }, } diff --git a/New client/chameleon-client/src/views/CameraViewes/InputTab.vue b/New client/chameleon-client/src/views/CameraViewes/InputTab.vue index cb2ea75ad..b86fcf702 100644 --- a/New client/chameleon-client/src/views/CameraViewes/InputTab.vue +++ b/New client/chameleon-client/src/views/CameraViewes/InputTab.vue @@ -1,6 +1,6 @@