Commit Graph

345 Commits

Author SHA1 Message Date
jmaniuvc
2b4e5cdcb2 Data Repository 모달 2025-05-22 18:29:09 +09:00
jmaniuvc
c99b61e031 Info_API 제작 2025-05-22 16:12:56 +09:00
ba196b626a workspace 폴더 커밋 2025-05-21 17:54:01 +09:00
0b0d236821 객체 데이터 연결 이벤트 설정 2025-05-20 18:31:54 +09:00
4c02c24680 데이터 연결설정 2025-05-20 18:29:36 +09:00
wsh
521b7e9de6 missing 수정 2025-05-20 18:23:13 +09:00
wsh
cd3b70644d 1 2025-05-20 18:18:10 +09:00
wsh
ec82271fb0 Merge branch 'main' of http://220.90.135.190:3000/UVCXR/Studio 2025-05-20 16:40:16 +09:00
wsh
46bf63621d 미사용 클래스 삭제 및 컴파일러 경고 수정 2025-05-20 16:40:14 +09:00
aaf4bf0981 Update README.md 2025-05-20 16:26:35 +09:00
wsh
41d23c984e 네임스페이스 수정 XED->Studio 2025-05-20 16:25:58 +09:00
bdc35636bc Merge pull request '가상 공장 대시보드' (#79) from pgd/20250520 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/79
2025-05-20 14:21:33 +09:00
geondo55
415b4f5f49 Merge branch 'main' into pgd/20250520 2025-05-20 13:50:57 +09:00
geondo55
59821ac6dc 가상 공장 대시보드 2025-05-20 13:49:53 +09:00
wsh
003e52ff2e 1 2025-05-20 10:36:18 +09:00
geondo55
17b472745c Merge branch 'main' into pgd/20250520 2025-05-20 09:32:51 +09:00
geondo55
999c94ed1f 1차 가상 공장 대시보드 2025-05-19 18:42:00 +09:00
bfdaeaab19 Merge pull request 'mqtt,api 연결 설정 작업' (#78) from njh/250516_00 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/78
2025-05-19 13:53:31 +09:00
000e328c6e Merge pull request '프로그램 종료 시점 감지 기능 개발' (#77) from dev/jym/250516_00 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/77
2025-05-19 13:53:20 +09:00
818dc2e703 Merge branch 'njh/250514_01' into njh/250516_00 2025-05-16 12:54:55 +09:00
a74afe0319 MQTT,API 연결 작성 -> 데이터 송수신 확인 2025-05-16 12:54:02 +09:00
정영민
db43ffbfe1 프로그램 종료 시점 감지 2025-05-16 11:54:49 +09:00
911d2901ba Update README.md 2025-05-16 09:20:23 +09:00
wsh
69995e6d0d Merge branch 'main' of http://220.90.135.190:3000/UVCXR/Studio 2025-05-16 09:19:51 +09:00
wsh
b2941f6010 pre-0.24.0 2025-05-16 09:19:49 +09:00
5f53518c8b Merge pull request '저장 확인 모달 UI 작업' (#76) from jym/250515_01 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/76
2025-05-16 09:06:22 +09:00
정영민
b87bc2dc66 저장 확인 모달 UI 작업 2025-05-15 18:49:20 +09:00
5dc44ba995 Update README.md 2025-05-15 17:34:09 +09:00
5dbe535810 Merge pull request 'UI 생성 설정 기능 개발 및 UI 오류 수정' (#75) from jym/250515_00 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/75
2025-05-15 17:17:09 +09:00
0512d1bce3 Merge pull request '객체 라이브러리 창 수정' (#74) from pgd/20250515 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/74
2025-05-15 17:16:59 +09:00
정영민
4ccfd08ef6 UI 생성 설정 기능 개발 및 UI 오류 수정 2025-05-15 15:12:02 +09:00
geondo55
78aa08dc38 Merge branch 'main' into pgd/20250515 2025-05-15 14:24:14 +09:00
geondo55
d9cbd84332 객체 라이브러리 창 2025-05-15 14:22:55 +09:00
wsh
158efff01f merge 2025-05-15 09:49:17 +09:00
geondo55
3a2f634096 Merge branch 'main' into pgd/20250515 2025-05-15 09:29:53 +09:00
3c73f1cdbc Merge pull request 'Studio UI 통합' (#73) from njh/250514_01 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/73
2025-05-15 09:12:28 +09:00
036e2dbfeb mqtt add 2025-05-14 18:03:33 +09:00
e703d2fcf5 Fix : Studio UI Merge 2025-05-14 17:00:44 +09:00
7b62435115 Merge pull request 'jym/250513_00' (#72) from jym/250513_00 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/72
2025-05-14 13:44:47 +09:00
정영민
16b00a0183 UI 생성 모달 수정 2025-05-14 10:45:36 +09:00
정영민
297c7b1e53 3D 동적 객체 생성 설정 모달 및 UI 동적 생성 모달 UI 작업 2025-05-14 09:12:33 +09:00
geondo55
e2683e77c4 백업 2025-05-13 18:08:24 +09:00
ed51e6f85a Merge pull request '시작화면 모달' (#70) from pgd/20250512_1 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/70
2025-05-13 14:55:31 +09:00
geondo55
6f93f2c02c Merge branch 'main' into pgd/20250512_1 2025-05-13 14:50:24 +09:00
geondo55
14fef6bb18 시작화면 모달 수정 2025-05-13 14:49:57 +09:00
jym
33074bbf32 Merge pull request 'jym/250512_02' (#69) from jym/250512_02 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/69
2025-05-13 14:25:15 +09:00
정영민
cf8ce3303d Merge branch 'jym/250512_01' into jym/250512_02 2025-05-13 14:24:13 +09:00
jym
a1476fe166 Merge pull request 'MQTT 연결 설정 모달 UI 작업' (#67) from jym/250512_00 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/67
2025-05-13 14:14:48 +09:00
jym
61c3b40468 Merge branch 'main' into jym/250512_00 2025-05-13 14:11:52 +09:00
jym
51315cbe5f Merge branch 'main' into jym/250512_01 2025-05-13 14:10:57 +09:00