diff --git a/package-lock.json b/package-lock.json index 97674a5..4f5c1ff 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,6 +9,7 @@ "version": "1.0.0", "license": "MIT", "dependencies": { + "@imengyu/vue3-context-menu": "^1.5.4", "@vueuse/core": "^14.2.1", "copy-to-clipboard": "^3.3.3", "electron-squirrel-startup": "^1.0.1", @@ -1406,6 +1407,21 @@ "dev": true, "license": "MIT" }, + "node_modules/@imengyu/vue-scroll-rect": { + "version": "0.1.8", + "resolved": "https://registry.npmjs.org/@imengyu/vue-scroll-rect/-/vue-scroll-rect-0.1.8.tgz", + "integrity": "sha512-Mg7rgHlsGPO0tcMFjp1kB2BZ3oRrRtFN8MoE52jTgQnlc+Y0N6ttFnbIxOh2fc9j82uhdQ8zgZcXlFHUXeGnCA==", + "license": "MIT" + }, + "node_modules/@imengyu/vue3-context-menu": { + "version": "1.5.4", + "resolved": "https://registry.npmjs.org/@imengyu/vue3-context-menu/-/vue3-context-menu-1.5.4.tgz", + "integrity": "sha512-/a6Quyn3V320/Mi6UoH+6wSTBYrln70RovT3iyfoXQQpIHpC7ZPWObzS0BXQTRlWtyJB92XmGDT703UxSO8Tvg==", + "license": "MIT", + "dependencies": { + "@imengyu/vue-scroll-rect": "^0.1.4" + } + }, "node_modules/@inquirer/checkbox": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/@inquirer/checkbox/-/checkbox-3.0.1.tgz", diff --git a/package.json b/package.json index f0de7b3..dceac85 100644 --- a/package.json +++ b/package.json @@ -30,6 +30,7 @@ "vite": "^5.4.21" }, "dependencies": { + "@imengyu/vue3-context-menu": "^1.5.4", "@vueuse/core": "^14.2.1", "copy-to-clipboard": "^3.3.3", "electron-squirrel-startup": "^1.0.1", diff --git a/src/Images/image.jpg b/public/images/ArUco-marker.jpg similarity index 100% rename from src/Images/image.jpg rename to public/images/ArUco-marker.jpg diff --git a/public/images/blue-platform.jpg b/public/images/blue-platform.jpg new file mode 100644 index 0000000..bff4e73 Binary files /dev/null and b/public/images/blue-platform.jpg differ diff --git a/public/images/red-platform.jpg b/public/images/red-platform.jpg new file mode 100644 index 0000000..6a7e75a Binary files /dev/null and b/public/images/red-platform.jpg differ diff --git a/public/images/white-platform.jpg b/public/images/white-platform.jpg new file mode 100644 index 0000000..3fac667 Binary files /dev/null and b/public/images/white-platform.jpg differ diff --git a/public/shablons/color.txt b/public/shablons/color.txt index 6571542..15781cc 100644 --- a/public/shablons/color.txt +++ b/public/shablons/color.txt @@ -43,12 +43,9 @@ class ColorDetect(): self.color = 'red' else: self.color = None - -#в MAIN для вызова функции должно быть: -# cd = ColorDetect() - #color_sub = rospy.Subscriber('main_camera/image_raw', Image, - #lambda img: cd.detect_color_callback(img, print_type='rgb'), - #queue_size=1) - # print(cd.getColor()) - #rospy.sleep(2) - #color_sub.unregister() +<> + cd = ColorDetect() + color_sub = rospy.Subscriber('main_camera/image_raw', Image, lambda img: cd.detect_color_callback(img, print_type='rgb'), queue_size=1) + print(cd.getColor()) + rospy.sleep(2) + color_sub.unregister() diff --git a/public/shablons/emergency_and_navigate.txt b/public/shablons/emergency_and_navigate.txt index 5889c07..c0475f7 100644 --- a/public/shablons/emergency_and_navigate.txt +++ b/public/shablons/emergency_and_navigate.txt @@ -17,6 +17,7 @@ get_telemetry = rospy.ServiceProxy('get_telemetry', srv.GetTelemetry) #сеов navigate = rospy.ServiceProxy('navigate', srv.Navigate) #сервис для полета по указаным координатам land = rospy.ServiceProxy('land', Trigger) #сервис для посадки +<> def navigate_wait(x=0, y=0, z=1, speed=0.5, frame_id='aruco_map', auto_arm=False, tolerance=0.2,sleep=2): """ @@ -91,7 +92,7 @@ def main(): #в дальнейшем не передавать переменной auto_arm значение True -<> +<
> land() #посадка diff --git a/src/App.vue b/src/App.vue index 0ace86e..3acb136 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,16 +1,17 @@