diff --git a/package.json b/package.json index 36288f4..eb539c0 100644 --- a/package.json +++ b/package.json @@ -18,6 +18,7 @@ "babel-loader": "^9.1.2", "core-js": "^3.21.0", "element-resize-detector": "^1.2.4", + "konva": "^8.4.2", "qrcode.vue": "^3.3.3", "quasar": "^2.11.6", "reconnecting-websocket": "^4.4.0", @@ -28,6 +29,7 @@ "v-viewer": "^3.0.9", "vue": "^3.0.0", "vue-i18n": "^9.1.9", + "vue-konva": "^3.0.2", "vue-router": "^4.0.0", "vue3-draggable-resizable": "^1.6.5", "vuex": "^4.0.1", diff --git a/quasar.conf.js b/quasar.conf.js index 5e8b52a..54c6d0a 100644 --- a/quasar.conf.js +++ b/quasar.conf.js @@ -41,11 +41,6 @@ module.exports = configure(function (ctx) { // Full list of options: https://v2.quasar.dev/quasar-cli/quasar-conf-js#Property%3A-build build: { vueRouterMode: "hash", // available values: 'hash', 'history' - uglifyOptions: { - compress: { - drop_console: true, - }, - }, // transpile: false, @@ -57,7 +52,7 @@ module.exports = configure(function (ctx) { // rtl: true, // https://v2.quasar.dev/options/rtl-support // preloadChunks: true, // showProgress: false, - gzip: true, + // gzip: true, // analyze: true, // Options below are automatically set depending on the env, set them if you want to override @@ -75,17 +70,6 @@ module.exports = configure(function (ctx) { https: false, port: 8080, open: true, // opens browser window automatically - headers: { - "Access-Control-Allow-Methods": "POST,GET,PUT,DELETE", - "Access-Control-Allow-Credentials": true, - "Access-Control-Allow-Origin": "*", - "Access-Control-Allow-Headers": "*", - }, - proxy: { - "/get_websocket_port": "http://192.168.2.102", - "/media_control_client_product.js": "http://192.168.2.102", - "/media_control_client_language.js": "http://192.168.2.102", - }, }, // https://v2.quasar.dev/quasar-cli/quasar-conf-js#Property%3A-framework diff --git a/src/common/ClientConnection.ts b/src/common/ClientConnection.ts index fd5c8f3..dadb8aa 100644 --- a/src/common/ClientConnection.ts +++ b/src/common/ClientConnection.ts @@ -1551,6 +1551,24 @@ export default class ClientConnection { ); } + public async SetProjectorResolution( + width: number, + height: number + ) { + return await this.doRpc( + new Protocol.SetProjectorResolutionRequestEntity(width, height) + ); + } + + public async SetProjectorLayout( + row: number, + column: number + ) { + return await this.doRpc( + new Protocol.SetProjectorResolutionRequestEntity(row, column) + ); + } + public async setCloudServerSetting( cloud_server_address: string, cloud_server_verify_key: string, diff --git a/src/components/FusionSettings/DensityCorrection.vue b/src/components/FusionSettings/DensityCorrection.vue index 9fa6dbc..a86aad8 100644 --- a/src/components/FusionSettings/DensityCorrection.vue +++ b/src/components/FusionSettings/DensityCorrection.vue @@ -4,22 +4,20 @@
- v{{ - index+ 1 + index + 1 }} - v{{ - index+ 1 + index + 1 }} h{{ - index+ 1 + index + 1 }} h{{ - index+ 1 + index + 1 }}
@@ -50,47 +48,68 @@
+ +
-
-
-
-
- -
-
-
-
+
+ +
+
+
+
+
+
+ +
+ +
+
-
-
-
-
- -
-
-
-
+
+ +
+ +
+
+
+
+
+
+ +
+ +
+ +
+
+
+
-
- - +