Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
fb48c06
블럭 도움말 위키 링크 추가하기.
Feb 11, 2025
3728da0
aidt objectEditable 옵션사용시 stage handle조작 안되도록 수정
Feb 12, 2025
385ba16
Merge pull request #2910 from entrylabs/issue/9097
leunge Feb 12, 2025
ef5c2cc
Merge pull request #2911 from entrylabs/issue/9093
leunge Feb 12, 2025
9bea8a3
드론 블록 기능 추가
wing1008 Feb 14, 2025
d646a04
Update Cocodron Controller: Added English descriptions
wing1008 Feb 17, 2025
6eda079
Removed h origin develop-hw
wing1008 Feb 17, 2025
8cec4e0
오류 수정
Feb 17, 2025
fd2aace
오류 수정
Feb 17, 2025
a42c836
text font 변경.
Feb 17, 2025
52154ad
리뷰반영
Feb 18, 2025
62085f2
엔트리 연결시 / 엔트리 정지시 알라 얼굴 표시되도록 수정
irarykim Feb 18, 2025
1a6eeef
게임/캐릭터 아이콘 블록 추가
irarykim Feb 18, 2025
aba5cac
엔트리 연결시 / 엔트리 정지시 알라 얼굴 표시되도록 수정
irarykim Feb 18, 2025
489bb0f
게임/캐릭터 아이콘 블록 추가
irarykim Feb 18, 2025
9a10606
Merge pull request #2915 from entrylabs/issue/9109
leunge Feb 18, 2025
40113cd
Remove package-lock.json and yarn.lock
wing1008 Feb 19, 2025
caa1d4e
Update @mediapipe/tasks-vision to 0.10.18
wing1008 Feb 19, 2025
33be4dd
Merge pull request #2917 from irarykim/develop-hw-robotai-lite
Tnks2U Feb 19, 2025
a8dd8f5
Merge pull request #2916 from irarykim/develop-hw-koalabot-lite
Tnks2U Feb 19, 2025
3edb0c5
Merge pull request #2914 from wing1008/develop-hw
Tnks2U Feb 19, 2025
cb59582
editable = false 일 경우 Input disabled가 되어 클릭이 안되는 오류 수정
Feb 20, 2025
67b2051
lint : cocodrone 린트적용
Tnks2U Feb 20, 2025
882414f
feat : 코코드론의 WS최초 실행시 로그 제거
Tnks2U Feb 20, 2025
2a08d0e
Merge pull request #2919 from entrylabs/issue/9093_2
leunge Feb 20, 2025
68dca28
continueLoop 로직 수정
Feb 21, 2025
01fbeb9
무한루프 오류 수정
Feb 24, 2025
265107e
Merge pull request #2920 from entrylabs/develop-hw
Tnks2U Feb 25, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added images/hw_lite/cocodroncontrollerLite.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 9 additions & 7 deletions src/class/entity.js
Original file line number Diff line number Diff line change
Expand Up @@ -91,12 +91,14 @@ Entry.EntityObject = class EntityObject {
Entry.stage.isObjectClick = true;

if (Entry.type !== 'minimize' && Entry.stage.isEntitySelectable()) {
this.offset = {
x: -this.parent.x + this.entity.getX() - (stageX * 0.75 - 240),
y: -this.parent.y - this.entity.getY() - (stageY * 0.75 - 135),
};
this.cursor = 'move';
this.entity.initCommand();
if (Entry.objectEditable) {
this.offset = {
x: -this.parent.x + this.entity.getX() - (stageX * 0.75 - 240),
y: -this.parent.y - this.entity.getY() - (stageY * 0.75 - 135),
};
this.cursor = 'move';
this.entity.initCommand();
}
Entry.container.selectObject(id);
}
});
Expand All @@ -107,7 +109,7 @@ Entry.EntityObject = class EntityObject {
this.entity.checkCommand();
});

if (Entry.type !== 'minimize') {
if (Entry.type !== 'minimize' && Entry.objectEditable) {
this.object.on(GEDragHelper.types.MOVE, function ({ stageX, stageY }) {
if (Entry.stage.isEntitySelectable()) {
const entity = this.entity;
Expand Down
20 changes: 20 additions & 0 deletions src/class/helper.js
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,18 @@ class EntryBlockHelper {
this._elementsContainer.addClass('entryBlockHelperContent textModeElem selectAble');
blockHelperContent.appendChild(this._elementsContainer);

const blockHelperLink = Entry.createElement(
'div',
'entryBlockHelperLinkWorkspace'
);
Comment on lines +75 to +78
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ⏎············'div',⏎············'entryBlockHelperLinkWorkspace'⏎········ with 'div',·'entryBlockHelperLinkWorkspace'

Suggested change
const blockHelperLink = Entry.createElement(
'div',
'entryBlockHelperLinkWorkspace'
);
const blockHelperLink = Entry.createElement('div', 'entryBlockHelperLinkWorkspace');

blockHelperLink.addClass('blockHelperLink');
const helperLink = Entry.createElement('a', 'entryBlockHelperLink');
helperLink.addClass('linkTextElem');
helperLink.setAttribute('target' ,'_blank');
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚫 [eslint] <prettier/prettier> reported by reviewdog 🐶
Replace ·, with

Suggested change
helperLink.setAttribute('target' ,'_blank');
helperLink.setAttribute('target', '_blank');

blockHelperLink.appendChild(helperLink);
blockHelperContent.appendChild(blockHelperLink);
this.blockHelperLink_ = helperLink;

if (typeof CodeMirror !== 'undefined') {
const codeMirrorTitle = Entry.createElement('div');
codeMirrorTitle.addClass('entryBlockHelperTitle textModeElem');
Expand Down Expand Up @@ -189,6 +201,14 @@ class EntryBlockHelper {
} else {
this._contentView.removeClass('textMode');
this.blockHelperDescription_.textContent = description;
const category = Entry.block[type].wikiClass || Entry.Utils.getBlockCategory(type);
if (category) {
this.blockHelperLink_.textContent = Lang.Helper.link_to_entry_wiki;
this.blockHelperLink_.href = Lang.Helper[`wiki_link_${category}`];
} else {
this.blockHelperLink_.textContent = '';
this.blockHelperLink_.href = '';
}
}

code.createThread([def]);
Expand Down
3 changes: 3 additions & 0 deletions src/class/scene.js
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,9 @@ Entry.Scene = class {
createSceneDivider() {
const divide = Entry.createElement('span');
divide.addClass('entrySceneInputCover');
if (!Entry.sceneEditable) {
divide.addClass('entryDisabledScene');
}
return divide;
}

Expand Down
4 changes: 2 additions & 2 deletions src/class/stage.js
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,7 @@ Entry.Stage = class Stage {
} else {
this.handle.toggleResize(true);
}
this.handle.setVisible(true);
this.handle.setVisible(Entry.objectEditable);
const entity = object.entity;
this.handle.setWidth(entity.getScaleX() * entity.getWidth());
this.handle.setHeight(entity.getScaleY() * entity.getHeight());
Expand Down Expand Up @@ -439,7 +439,7 @@ Entry.Stage = class Stage {
this.handle.setDirection(entity.getDirection());
this.objectUpdated = true;

this.handle.setVisible(object.entity.getVisible());
this.handle.setVisible(Entry.objectEditable && object.entity.getVisible());
if (object.entity.getVisible()) {
this.handle.render();
}
Expand Down
24 changes: 21 additions & 3 deletions src/css/components/helper.less
Original file line number Diff line number Diff line change
Expand Up @@ -199,17 +199,35 @@
line-height: 20px;
width: 100%;
font-size: 14px;
font-weight: bold;
font-stretch: normal;
font-style: normal;
line-height: 18px;
letter-spacing: -0.33px;
padding: 0 40px;
padding: 0 20px;
color: #555555;
text-align: center;
text-align: left;
margin-top: 24px;
}

.blockHelperLink {
width: 100%;
font-size: 14px;
font-stretch: normal;
font-style: normal;
line-height: 18px;
letter-spacing: -.33px;
padding: 0 20px;
color: #555;
text-align: left;
margin-top: 24px;
}

.linkTextElem {
font-size: 13px;
font-weight: bold;
color: #4F80FF;
}

.textModeElem {
display: none;
}
Expand Down
8 changes: 8 additions & 0 deletions src/css/components/object.less
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,14 @@
background-color: #fff;
}

.entryContainerListElementWorkspace.entryDisabled > .entryObjectWrapperWorkspace::before {
display: block;
content: " ";
width: 100%;
height: 100%;
position: absolute;
}

.entryObjectDeleteWorkspace {
overflow: hidden;
position: absolute;
Expand Down
10 changes: 10 additions & 0 deletions src/css/components/scene.less
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,16 @@ body {
border-radius: 10px 10px 0 0;
}

.entrySceneInputCover.entryDisabledScene::before {
display: block;
content: " ";
width: 100%;
height: 100%;
position: absolute;
top: 0;
left: 0;
}

.entrySceneFieldWorkspace {
cursor: text !important;
display: inline-block;
Expand Down
5 changes: 5 additions & 0 deletions src/playground/blocks/block_ai_learning.js
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,7 @@ module.exports = {
class: 'ai_learning',
isNotFor: ['ai_learning_image'],
events: {},
wikiClass: 'ai_image',
},
learning_title_speech: {
skeleton: 'basic_text',
Expand All @@ -164,6 +165,7 @@ module.exports = {
class: 'ai_learning',
isNotFor: ['ai_learning_speech'],
events: {},
wikiClass: 'ai_speech',
},
learning_title_text: {
skeleton: 'basic_text',
Expand All @@ -182,6 +184,7 @@ module.exports = {
class: 'ai_learning',
isNotFor: ['ai_learning_text'],
events: {},
wikiClass: 'ai_text',
},
insert_data_for_test: {
color: EntryStatic.colorSet.block.default.AI_LEARNING,
Expand Down Expand Up @@ -274,6 +277,7 @@ module.exports = {
js: [],
py: [],
},
wikiClass: 'ai_image',
},
insert_text_block_for_test: {
color: EntryStatic.colorSet.block.default.AI_LEARNING,
Expand Down Expand Up @@ -320,6 +324,7 @@ module.exports = {
js: [],
py: [],
},
wikiClass: 'ai_text',
},
test_result: {
color: EntryStatic.colorSet.block.default.AI_LEARNING,
Expand Down
10 changes: 10 additions & 0 deletions src/playground/blocks/block_ai_learning_cluster.js
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ module.exports = {
js: [],
py: [],
},
wikiClass: 'ai_cluster',
},
set_cluster_option_centroids: {
color: EntryStatic.colorSet.block.default.AI_LEARNING,
Expand Down Expand Up @@ -107,6 +108,7 @@ module.exports = {
js: [],
py: [],
},
wikiClass: 'ai_cluster',
},
get_cluster_centriod_count: {
color: EntryStatic.colorSet.block.default.AI_LEARNING,
Expand Down Expand Up @@ -134,6 +136,7 @@ module.exports = {
js: [],
py: [],
},
wikiClass: 'ai_cluster',
},
get_cluster_centriod_value: {
color: EntryStatic.colorSet.block.default.AI_LEARNING,
Expand Down Expand Up @@ -187,6 +190,7 @@ module.exports = {
js: [],
py: [],
},
wikiClass: 'ai_cluster',
},
get_cluster_centriod_index_1: {
color: EntryStatic.colorSet.block.default.AI_LEARNING,
Expand Down Expand Up @@ -236,6 +240,7 @@ module.exports = {
js: [],
py: [],
},
wikiClass: 'ai_cluster',
},
get_cluster_centriod_index_2: {
color: EntryStatic.colorSet.block.default.AI_LEARNING,
Expand Down Expand Up @@ -306,6 +311,7 @@ module.exports = {
js: [],
py: [],
},
wikiClass: 'ai_cluster',
},
get_cluster_centriod_index_3: {
color: EntryStatic.colorSet.block.default.AI_LEARNING,
Expand Down Expand Up @@ -397,6 +403,7 @@ module.exports = {
js: [],
py: [],
},
wikiClass: 'ai_cluster',
},
get_cluster_centriod_index_4: {
color: EntryStatic.colorSet.block.default.AI_LEARNING,
Expand Down Expand Up @@ -509,6 +516,7 @@ module.exports = {
js: [],
py: [],
},
wikiClass: 'ai_cluster',
},
get_cluster_centriod_index_5: {
color: EntryStatic.colorSet.block.default.AI_LEARNING,
Expand Down Expand Up @@ -642,6 +650,7 @@ module.exports = {
js: [],
py: [],
},
wikiClass: 'ai_cluster',
},
get_cluster_centriod_index_6: {
color: EntryStatic.colorSet.block.default.AI_LEARNING,
Expand Down Expand Up @@ -797,6 +806,7 @@ module.exports = {
py: [],
},
},
wikiClass: 'ai_cluster',
};
},
};
8 changes: 8 additions & 0 deletions src/playground/blocks/block_ai_learning_regression.js
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ module.exports = {
js: [],
py: [],
},
wikiClass: 'ai_regression',
},
get_regression_predict_1: {
color: EntryStatic.colorSet.block.default.AI_LEARNING,
Expand Down Expand Up @@ -120,6 +121,7 @@ module.exports = {
js: [],
py: [],
},
wikiClass: 'ai_regression',
},
get_regression_predict_2: {
color: EntryStatic.colorSet.block.default.AI_LEARNING,
Expand Down Expand Up @@ -190,6 +192,7 @@ module.exports = {
js: [],
py: [],
},
wikiClass: 'ai_regression',
},
get_regression_predict_3: {
color: EntryStatic.colorSet.block.default.AI_LEARNING,
Expand Down Expand Up @@ -281,6 +284,7 @@ module.exports = {
js: [],
py: [],
},
wikiClass: 'ai_regression',
},
get_regression_predict_4: {
color: EntryStatic.colorSet.block.default.AI_LEARNING,
Expand Down Expand Up @@ -393,6 +397,7 @@ module.exports = {
js: [],
py: [],
},
wikiClass: 'ai_regression',
},
get_regression_predict_5: {
color: EntryStatic.colorSet.block.default.AI_LEARNING,
Expand Down Expand Up @@ -526,6 +531,7 @@ module.exports = {
js: [],
py: [],
},
wikiClass: 'ai_regression',
},
get_regression_predict_6: {
color: EntryStatic.colorSet.block.default.AI_LEARNING,
Expand Down Expand Up @@ -680,6 +686,7 @@ module.exports = {
js: [],
py: [],
},
wikiClass: 'ai_regression',
},
get_regression_accuracy: {
color: EntryStatic.colorSet.block.default.AI_LEARNING,
Expand All @@ -705,6 +712,7 @@ module.exports = {
js: [],
py: [],
},
wikiClass: 'ai_regression',
},
};
},
Expand Down
6 changes: 6 additions & 0 deletions src/playground/blocks/block_ai_utilize_audio.js
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ Entry.AI_UTILIZE_BLOCK.audio.getBlocks = function() {
js: [],
py: [],
},
wikiClass: 'ai_utilize_stt',
},
get_microphone_volume: {
color: EntryStatic.colorSet.block.default.AI_UTILIZE,
Expand All @@ -98,6 +99,7 @@ Entry.AI_UTILIZE_BLOCK.audio.getBlocks = function() {
js: [],
py: [],
},
wikiClass: 'ai_utilize_stt',
},
speech_to_text_title: {
skeleton: 'basic_text',
Expand Down Expand Up @@ -202,6 +204,7 @@ Entry.AI_UTILIZE_BLOCK.audio.getBlocks = function() {
js: [],
py: [],
},
wikiClass: 'ai_utilize_stt',
},
timed_speech_to_text_convert: {
color: EntryStatic.colorSet.block.default.AI_UTILIZE,
Expand Down Expand Up @@ -297,6 +300,7 @@ Entry.AI_UTILIZE_BLOCK.audio.getBlocks = function() {
js: [],
py: [],
},
wikiClass: 'ai_utilize_stt',
},
set_visible_speech_to_text: {
color: EntryStatic.colorSet.block.default.AI_UTILIZE,
Expand Down Expand Up @@ -363,6 +367,7 @@ Entry.AI_UTILIZE_BLOCK.audio.getBlocks = function() {
js: [],
py: [],
},
wikiClass: 'ai_utilize_stt',
},
speech_to_text_get_value: {
color: EntryStatic.colorSet.block.default.AI_UTILIZE,
Expand Down Expand Up @@ -401,6 +406,7 @@ Entry.AI_UTILIZE_BLOCK.audio.getBlocks = function() {
js: [],
py: [],
},
wikiClass: 'ai_utilize_stt',
},
};
};
Loading
Loading