Compare commits
1 Commits
miheev-dev
..
master
| Author | SHA1 | Date | |
|---|---|---|---|
| b6597f235e |
Generated
+11
-10
@@ -638,7 +638,6 @@
|
|||||||
"integrity": "sha512-zx0EIq78WlY/lBb1uXlziZmDZI4ubcCXIMJ4uGjXzZW0nS19TjSPeXPAjzzTmKQlJUZm0SbmZhPKP7tuQ1SsEw==",
|
"integrity": "sha512-zx0EIq78WlY/lBb1uXlziZmDZI4ubcCXIMJ4uGjXzZW0nS19TjSPeXPAjzzTmKQlJUZm0SbmZhPKP7tuQ1SsEw==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"peer": true,
|
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"chalk": "^4.1.1",
|
"chalk": "^4.1.1",
|
||||||
"fs-extra": "^9.0.1",
|
"fs-extra": "^9.0.1",
|
||||||
@@ -1782,7 +1781,6 @@
|
|||||||
"integrity": "sha512-yl43JD/86CIj3Mz5mvvLJqAOfIup7ncxfJ0Btnl0/v5TouVUyeEdcpknfgc+yMevS/48oH9WAkkw93m7otLb/A==",
|
"integrity": "sha512-yl43JD/86CIj3Mz5mvvLJqAOfIup7ncxfJ0Btnl0/v5TouVUyeEdcpknfgc+yMevS/48oH9WAkkw93m7otLb/A==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"peer": true,
|
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@inquirer/checkbox": "^3.0.1",
|
"@inquirer/checkbox": "^3.0.1",
|
||||||
"@inquirer/confirm": "^4.0.1",
|
"@inquirer/confirm": "^4.0.1",
|
||||||
@@ -2965,7 +2963,6 @@
|
|||||||
"integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
|
"integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"peer": true,
|
|
||||||
"bin": {
|
"bin": {
|
||||||
"acorn": "bin/acorn"
|
"acorn": "bin/acorn"
|
||||||
},
|
},
|
||||||
@@ -3032,7 +3029,6 @@
|
|||||||
"integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
|
"integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"peer": true,
|
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"fast-deep-equal": "^3.1.3",
|
"fast-deep-equal": "^3.1.3",
|
||||||
"fast-uri": "^3.0.1",
|
"fast-uri": "^3.0.1",
|
||||||
@@ -3257,7 +3253,6 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"peer": true,
|
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"baseline-browser-mapping": "^2.9.0",
|
"baseline-browser-mapping": "^2.9.0",
|
||||||
"caniuse-lite": "^1.0.30001759",
|
"caniuse-lite": "^1.0.30001759",
|
||||||
@@ -3774,7 +3769,6 @@
|
|||||||
"integrity": "sha512-9nF4PdUle+5ta4W5SyZdLCCmFd37uVimSjg1evcTqKJCyvCEEj12WKzOSBNak6r4im4J4iYXKH1OWpUV5LBYFg==",
|
"integrity": "sha512-9nF4PdUle+5ta4W5SyZdLCCmFd37uVimSjg1evcTqKJCyvCEEj12WKzOSBNak6r4im4J4iYXKH1OWpUV5LBYFg==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"peer": true,
|
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@emotion/hash": "~0.8.0",
|
"@emotion/hash": "~0.8.0",
|
||||||
"csstype": "~3.0.5"
|
"csstype": "~3.0.5"
|
||||||
@@ -3799,7 +3793,6 @@
|
|||||||
"integrity": "sha512-Ukq0owbQXxa/U3EGtsdVBkR1w7KOQ5gIBqdH2hkvknzZPYvBxb/aa6E8L7tmjFtkwZBu3UXBbjIgPo/Ez4xaNg==",
|
"integrity": "sha512-Ukq0owbQXxa/U3EGtsdVBkR1w7KOQ5gIBqdH2hkvknzZPYvBxb/aa6E8L7tmjFtkwZBu3UXBbjIgPo/Ez4xaNg==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"peer": true,
|
|
||||||
"funding": {
|
"funding": {
|
||||||
"type": "github",
|
"type": "github",
|
||||||
"url": "https://github.com/sponsors/kossnocorp"
|
"url": "https://github.com/sponsors/kossnocorp"
|
||||||
@@ -4605,6 +4598,17 @@
|
|||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT"
|
"license": "MIT"
|
||||||
},
|
},
|
||||||
|
"node_modules/encoding": {
|
||||||
|
"version": "0.1.13",
|
||||||
|
"resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz",
|
||||||
|
"integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==",
|
||||||
|
"dev": true,
|
||||||
|
"license": "MIT",
|
||||||
|
"optional": true,
|
||||||
|
"dependencies": {
|
||||||
|
"iconv-lite": "^0.6.2"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/end-of-stream": {
|
"node_modules/end-of-stream": {
|
||||||
"version": "1.4.5",
|
"version": "1.4.5",
|
||||||
"resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.5.tgz",
|
"resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.5.tgz",
|
||||||
@@ -8218,7 +8222,6 @@
|
|||||||
"integrity": "sha512-o5a9xKjbtuhY6Bi5S3+HvbRERmouabWbyUcpXXUA1u+GNUKoROi9byOJ8M0nHbHYHkYICiMlqxkg1KkYmm25Sw==",
|
"integrity": "sha512-o5a9xKjbtuhY6Bi5S3+HvbRERmouabWbyUcpXXUA1u+GNUKoROi9byOJ8M0nHbHYHkYICiMlqxkg1KkYmm25Sw==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"peer": true,
|
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"esbuild": "^0.21.3",
|
"esbuild": "^0.21.3",
|
||||||
"postcss": "^8.4.43",
|
"postcss": "^8.4.43",
|
||||||
@@ -8291,7 +8294,6 @@
|
|||||||
"resolved": "https://registry.npmjs.org/vue/-/vue-3.5.28.tgz",
|
"resolved": "https://registry.npmjs.org/vue/-/vue-3.5.28.tgz",
|
||||||
"integrity": "sha512-BRdrNfeoccSoIZeIhyPBfvWSLFP4q8J3u8Ju8Ug5vu3LdD+yTM13Sg4sKtljxozbnuMu1NB1X5HBHRYUzFocKg==",
|
"integrity": "sha512-BRdrNfeoccSoIZeIhyPBfvWSLFP4q8J3u8Ju8Ug5vu3LdD+yTM13Sg4sKtljxozbnuMu1NB1X5HBHRYUzFocKg==",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"peer": true,
|
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@vue/compiler-dom": "3.5.28",
|
"@vue/compiler-dom": "3.5.28",
|
||||||
"@vue/compiler-sfc": "3.5.28",
|
"@vue/compiler-sfc": "3.5.28",
|
||||||
@@ -8364,7 +8366,6 @@
|
|||||||
"integrity": "sha512-gX/dMkRQc7QOMzgTe6KsYFM7DxeIONQSui1s0n/0xht36HvrgbxtM1xBlgx596NbpHuQU8P7QpKwrZYwUX48nw==",
|
"integrity": "sha512-gX/dMkRQc7QOMzgTe6KsYFM7DxeIONQSui1s0n/0xht36HvrgbxtM1xBlgx596NbpHuQU8P7QpKwrZYwUX48nw==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"peer": true,
|
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@types/eslint-scope": "^3.7.7",
|
"@types/eslint-scope": "^3.7.7",
|
||||||
"@types/estree": "^1.0.8",
|
"@types/estree": "^1.0.8",
|
||||||
|
|||||||
+14
-30
@@ -60,7 +60,8 @@ function setNumber(item) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function openPreview() {
|
function openPreview(event) {
|
||||||
|
event.currentTarget.blur()
|
||||||
generateCode()
|
generateCode()
|
||||||
if (!listOfTrips.value.length) {
|
if (!listOfTrips.value.length) {
|
||||||
izitoast.error({
|
izitoast.error({
|
||||||
@@ -72,8 +73,9 @@ function openPreview() {
|
|||||||
isCodeViewVisible.value = true;
|
isCodeViewVisible.value = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
function saveResult() {
|
function saveResult(event) {
|
||||||
isModalVisible.value = true;
|
isModalVisible.value = true;
|
||||||
|
event.currentTarget.blur()
|
||||||
generateCode()
|
generateCode()
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -94,18 +96,18 @@ function generateCode() {
|
|||||||
let textOfCode = color
|
let textOfCode = color
|
||||||
textOfCode = textOfCode.split('<<separator>>')
|
textOfCode = textOfCode.split('<<separator>>')
|
||||||
colorDetectClass.value = textOfCode[0]
|
colorDetectClass.value = textOfCode[0]
|
||||||
colorDetectCode.value += `\t${textOfCode[1].trim()}\n`;
|
colorDetectCode.value += ` ${textOfCode[1].trim()}\n`;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (isUsedQR) {
|
if (isUsedQR) {
|
||||||
let textOfCode = qr
|
let textOfCode = qr
|
||||||
textOfCode = textOfCode.split('<<separator>>')
|
textOfCode = textOfCode.split('<<separator>>')
|
||||||
QRDetectClass.value = textOfCode[0]
|
QRDetectClass.value = textOfCode[0]
|
||||||
QRDetectCode.value += `\t${textOfCode[1].trim()}\n`;
|
QRDetectCode.value += ` ${textOfCode[1].trim()}\n`;
|
||||||
}
|
}
|
||||||
|
|
||||||
for (const item of listOfTrips.value) {
|
for (const item of listOfTrips.value) {
|
||||||
mainCode.value += `\tnavigate_wait(${item.x}, ${item.y})\n`;
|
mainCode.value += ` navigate_wait(${item.x}, ${item.y})\n`;
|
||||||
if (item.isPlatform) {
|
if (item.isPlatform) {
|
||||||
mainCode.value += colorDetectCode.value + '\n'
|
mainCode.value += colorDetectCode.value + '\n'
|
||||||
}
|
}
|
||||||
@@ -127,7 +129,8 @@ function generateCode() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function cancel() {
|
function cancel(event) {
|
||||||
|
event.currentTarget.blur()
|
||||||
if (clickCount.value === 1) {
|
if (clickCount.value === 1) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -139,7 +142,8 @@ function cancel() {
|
|||||||
clickCount.value--;
|
clickCount.value--;
|
||||||
}
|
}
|
||||||
|
|
||||||
function cleanResult() {
|
function cleanResult(event) {
|
||||||
|
event.currentTarget.blur()
|
||||||
clickCount.value = 1;
|
clickCount.value = 1;
|
||||||
numbers.value.forEach(item => {
|
numbers.value.forEach(item => {
|
||||||
item.isPlatform = false;
|
item.isPlatform = false;
|
||||||
@@ -272,16 +276,6 @@ function createIcon(src) {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
function createSvgIcon(svg) {
|
|
||||||
return h(svg,{
|
|
||||||
style:{
|
|
||||||
color: '#000',
|
|
||||||
width: '20px',
|
|
||||||
height: '20px',
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
function onContextMenu(e, item) {
|
function onContextMenu(e, item) {
|
||||||
ContextMenu.showContextMenu({
|
ContextMenu.showContextMenu({
|
||||||
theme: 'mac dark',
|
theme: 'mac dark',
|
||||||
@@ -310,7 +304,7 @@ function onContextMenu(e, item) {
|
|||||||
{
|
{
|
||||||
label: "Удалить",
|
label: "Удалить",
|
||||||
onClick: () => deletePlatform(item),
|
onClick: () => deletePlatform(item),
|
||||||
icon: createSvgIcon(Trash),
|
icon: h(Trash),
|
||||||
},
|
},
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
@@ -326,14 +320,14 @@ function onContextMenu(e, item) {
|
|||||||
{
|
{
|
||||||
label: "Удалить",
|
label: "Удалить",
|
||||||
onClick: () => deleteQR(item),
|
onClick: () => deleteQR(item),
|
||||||
icon: createSvgIcon(Trash),
|
icon: h(Trash)
|
||||||
|
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: "Удалить",
|
label: "Удалить",
|
||||||
icon: createSvgIcon(Trash),
|
icon: h(Trash),
|
||||||
onClick: () => deletePointMap(item),
|
onClick: () => deletePointMap(item),
|
||||||
},
|
},
|
||||||
]
|
]
|
||||||
@@ -401,10 +395,6 @@ function onContextMenu(e, item) {
|
|||||||
<style>
|
<style>
|
||||||
* {
|
* {
|
||||||
font-family: 'Courier New', Courier, monospace;
|
font-family: 'Courier New', Courier, monospace;
|
||||||
outline: none;
|
|
||||||
}
|
|
||||||
* :focus-visible {
|
|
||||||
box-shadow: 0 0 0 3px #23aae3e2;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
html {
|
html {
|
||||||
@@ -487,17 +477,11 @@ body {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.actions svg {
|
.actions svg {
|
||||||
outline: none;
|
|
||||||
width: 40px;
|
width: 40px;
|
||||||
height: 40px;
|
height: 40px;
|
||||||
transition: color 0.4s;
|
transition: color 0.4s;
|
||||||
}
|
}
|
||||||
|
|
||||||
.actions svg:focus-visible {
|
|
||||||
box-shadow: 0 0 0 3px #23aae3e2;
|
|
||||||
border-radius: 8px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.actions svg:hover {
|
.actions svg:hover {
|
||||||
color: rgba(20, 104, 140, 0.89);
|
color: rgba(20, 104, 140, 0.89);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -20,4 +20,7 @@
|
|||||||
.cls-1{
|
.cls-1{
|
||||||
fill:none;
|
fill:none;
|
||||||
}
|
}
|
||||||
|
#Layer_2 {
|
||||||
|
color: black;
|
||||||
|
}
|
||||||
</style>
|
</style>
|
||||||
@@ -41,7 +41,7 @@ def emergency_stop():
|
|||||||
|
|
||||||
"""Функция экстренной остановки, срабатывает при нажатии Ctrl + C"""
|
"""Функция экстренной остановки, срабатывает при нажатии Ctrl + C"""
|
||||||
|
|
||||||
print("\n" + "="*50)
|
print("="*50)
|
||||||
print("EMERGENCY STOP ACTIVATED!")
|
print("EMERGENCY STOP ACTIVATED!")
|
||||||
print("="*50)
|
print("="*50)
|
||||||
|
|
||||||
@@ -81,7 +81,7 @@ def signal_handler(sig, frame):
|
|||||||
"""Перехват Ctrl+C: вместо аварийного завершения программы
|
"""Перехват Ctrl+C: вместо аварийного завершения программы
|
||||||
выполняет безопасную посадку дрона."""
|
выполняет безопасную посадку дрона."""
|
||||||
|
|
||||||
print("\nCtrl+C detected - Emergency stop!")
|
print("Ctrl+C detected - Emergency stop!")
|
||||||
emergency_stop()
|
emergency_stop()
|
||||||
sys.exit(0)
|
sys.exit(0)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user