ENH: refine camera status and settings
Change-Id: I2a8c23ca119ff5d38272dad46347704bf457dee0 Signed-off-by: Stone Li <stone.li@bambulab.com>
This commit is contained in:
Stone Li
Lane.Wei
parent
0d4b8382f5
commit
58dab90e53
|
|
@ -0,0 +1,6 @@
|
|||
<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M9.99563 2.2C6.24251 2.2 3.2 5.24251 3.2 8.99563C3.2 12.7487 6.24251 15.7913 9.99563 15.7913C13.7487 15.7913 16.7913 12.7487 16.7913 8.99563C16.7913 5.24251 13.7487 2.2 9.99563 2.2ZM2 8.99563C2 4.57976 5.57976 1 9.99563 1C14.4115 1 17.9913 4.57976 17.9913 8.99563C17.9913 13.4115 14.4115 16.9913 9.99563 16.9913C5.57976 16.9913 2 13.4115 2 8.99563Z" fill="#6B6B6B"/>
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M9.9917 7.52459C8.36251 7.52459 7.0418 8.8453 7.0418 10.4745C7.0418 12.1037 8.36251 13.4244 9.9917 13.4244C11.6209 13.4244 12.9416 12.1037 12.9416 10.4745C12.9416 8.8453 11.6209 7.52459 9.9917 7.52459ZM5.8418 10.4745C5.8418 8.18256 7.69977 6.32458 9.9917 6.32458C12.2836 6.32458 14.1416 8.18256 14.1416 10.4745C14.1416 12.7664 12.2836 14.6244 9.9917 14.6244C7.69977 14.6244 5.8418 12.7664 5.8418 10.4745Z" fill="#6B6B6B"/>
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M13.2461 15.0427L16.0403 19.8825H3.95117L6.74049 15.0513L7.23361 15.2699C8.07405 15.6426 9.00466 15.85 9.9853 15.85C10.9719 15.85 11.9078 15.6401 12.7523 15.2632L13.2461 15.0427ZM12.7383 16.5632C11.8794 16.8782 10.9518 17.05 9.9853 17.05C9.02525 17.05 8.10366 16.8805 7.24958 16.5695L6.02963 18.6825H13.9619L12.7383 16.5632Z" fill="#6B6B6B"/>
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M3.37695 19.3404C3.37695 19.009 3.64558 18.7404 3.97695 18.7404L15.74 18.7404C16.0713 18.7404 16.34 19.009 16.34 19.3404C16.34 19.6717 16.0713 19.9404 15.74 19.9404L3.97695 19.9404C3.64558 19.9404 3.37695 19.6717 3.37695 19.3404Z" fill="#6B6B6B"/>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 1.6 KiB |
|
|
@ -0,0 +1,7 @@
|
|||
<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M10.1456 1.5C6.47535 1.5 3.5 4.47535 3.5 8.14563C3.5 11.8159 6.47535 14.7913 10.1456 14.7913C13.8159 14.7913 16.7913 11.8159 16.7913 8.14563C16.7913 4.47535 13.8159 1.5 10.1456 1.5ZM2 8.14563C2 3.64692 5.64692 0 10.1456 0C14.6443 0 18.2913 3.64692 18.2913 8.14563C18.2913 12.6443 14.6443 16.2913 10.1456 16.2913C5.64692 16.2913 2 12.6443 2 8.14563Z" fill="#323A3D"/>
|
||||
<path d="M13.6916 9.62449C13.6916 11.585 12.1023 13.1744 10.1417 13.1744C8.18114 13.1744 6.5918 11.585 6.5918 9.62449C6.5918 7.66393 8.18114 6.07458 10.1417 6.07458C12.1023 6.07458 13.6916 7.66393 13.6916 9.62449Z" fill="#FF6F00"/>
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M10.1417 6.82458C8.59536 6.82458 7.3418 8.07814 7.3418 9.62449C7.3418 11.1708 8.59536 12.4244 10.1417 12.4244C11.688 12.4244 12.9416 11.1708 12.9416 9.62449C12.9416 8.07814 11.688 6.82458 10.1417 6.82458ZM5.8418 9.62449C5.8418 7.24972 7.76693 5.32458 10.1417 5.32458C12.5165 5.32458 14.4416 7.24972 14.4416 9.62449C14.4416 11.9993 12.5165 13.9244 10.1417 13.9244C7.76693 13.9244 5.8418 11.9993 5.8418 9.62449Z" fill="#323A3D"/>
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M13.4578 14.0006L16.4496 19.1825H3.84082L6.82747 14.0095L7.44387 14.2828C8.26553 14.6471 9.17546 14.8499 10.1348 14.8499C11.0999 14.8499 12.015 14.6447 12.8406 14.2761L13.4578 14.0006ZM12.8204 15.8966C11.9788 16.1904 11.0748 16.3499 10.1348 16.3499C9.20123 16.3499 8.30318 16.1926 7.4665 15.9026L6.4389 17.6825H13.8515L12.8204 15.8966Z" fill="#323A3D"/>
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M3.52637 18.3403C3.52637 17.9261 3.86215 17.5903 4.27637 17.5903L15.7394 17.5903C16.1536 17.5903 16.4894 17.9261 16.4894 18.3403C16.4894 18.7545 16.1536 19.0903 15.7394 19.0903L4.27637 19.0903C3.86215 19.0903 3.52637 18.7545 3.52637 18.3403Z" fill="#323A3D"/>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 1.9 KiB |
|
|
@ -0,0 +1,8 @@
|
|||
<svg width="36" height="20" viewBox="0 0 36 20" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M29.8319 8.80498L26.4821 13.0243L29.8319 17.2444L29.8319 8.80498ZM31.0175 8.247C31.0175 7.29187 29.8439 6.85222 29.2594 7.58841L25.4574 12.3774C25.1643 12.7467 25.1671 13.2795 25.4642 13.6538L29.2662 18.4437C29.8551 19.1856 31.0175 18.7756 31.0175 17.8259L31.0175 8.247Z" fill="#6B6B6B"/>
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M12.0467 6.92217V18.3073H24.1149V6.92217H12.0467ZM11.8467 5.72217C11.2944 5.72217 10.8467 6.16988 10.8467 6.72217V18.5073C10.8467 19.0596 11.2944 19.5073 11.8467 19.5073H24.3149C24.8672 19.5073 25.3149 19.0596 25.3149 18.5073V6.72217C25.3149 6.16988 24.8672 5.72217 24.3149 5.72217H11.8467Z" fill="#6B6B6B"/>
|
||||
<path d="M18.5147 14.3996C18.5147 15.7797 17.3959 16.8985 16.0158 16.8985C14.6358 16.8985 13.517 15.7797 13.517 14.3996C13.517 13.0196 14.6358 11.9008 16.0158 11.9008C17.3959 11.9008 18.5147 13.0196 18.5147 14.3996Z" stroke="#6B6B6B" stroke-width="1.2"/>
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M9.13767 2.2C5.30634 2.2 2.2 5.30634 2.2 9.13767C2.2 12.969 5.30634 16.0753 9.13767 16.0753C9.46904 16.0753 9.73767 16.344 9.73767 16.6753C9.73767 17.0067 9.46904 17.2753 9.13767 17.2753C4.6436 17.2753 1 13.6317 1 9.13767C1 4.6436 4.6436 1 9.13767 1C11.4381 1 13.5165 1.95551 14.9959 3.48962C15.226 3.72816 15.2191 4.10799 14.9805 4.33801C14.742 4.56803 14.3622 4.56113 14.1321 4.3226C12.8695 3.01327 11.099 2.2 9.13767 2.2Z" fill="#6B6B6B"/>
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M8.54824 3.97412C8.87961 3.97412 9.14824 4.24275 9.14824 4.57412V9.08574H9.71785C10.0492 9.08574 10.3179 9.35437 10.3179 9.68574C10.3179 10.0171 10.0492 10.2857 9.71785 10.2857H8.93124C8.38837 10.2857 7.94824 9.84562 7.94824 9.30274V4.57412C7.94824 4.24275 8.21687 3.97412 8.54824 3.97412Z" fill="#6B6B6B"/>
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M14.814 1.58691C15.1454 1.58691 15.414 1.85554 15.414 2.18691V3.6397C15.414 4.19283 15.0032 4.65993 14.4547 4.73067L12.7901 4.9453C12.4614 4.98767 12.1606 4.7556 12.1183 4.42695C12.0759 4.0983 12.308 3.79753 12.6366 3.75515L14.214 3.55176V2.18691C14.214 1.85554 14.4826 1.58691 14.814 1.58691Z" fill="#6B6B6B"/>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 2.2 KiB |
|
|
@ -0,0 +1,9 @@
|
|||
<svg width="37" height="20" viewBox="0 0 37 20" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M30.6849 9.81265L28.0135 13.1775L30.6849 16.5429L30.6849 9.81265ZM32.1669 8.3969C32.1669 7.44177 30.9933 7.00212 30.4088 7.73831L26.6068 12.5273C26.3137 12.8966 26.3165 13.4294 26.6136 13.8037L30.4156 18.5936C31.0045 19.3355 32.1669 18.9255 32.1669 17.9758L32.1669 8.3969Z" fill="#323A3D"/>
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M13.4961 7.37213V18.1573H24.9643V7.37213H13.4961ZM12.9961 5.87213C12.4438 5.87213 11.9961 6.31985 11.9961 6.87213V18.6573C11.9961 19.2095 12.4438 19.6573 12.9961 19.6573H25.4643C26.0166 19.6573 26.4643 19.2095 26.4643 18.6573V6.87213C26.4643 6.31985 26.0166 5.87213 25.4643 5.87213H12.9961Z" fill="#323A3D"/>
|
||||
<path d="M20.2641 14.5496C20.2641 16.261 18.8767 17.6484 17.1653 17.6484C15.4538 17.6484 14.0664 16.261 14.0664 14.5496C14.0664 12.8381 15.4538 11.4507 17.1653 11.4507C18.8767 11.4507 20.2641 12.8381 20.2641 14.5496Z" fill="#FF6F00"/>
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M17.1653 16.1484C18.0483 16.1484 18.7641 15.4326 18.7641 14.5496C18.7641 13.6666 18.0483 12.9507 17.1653 12.9507C16.2822 12.9507 15.5664 13.6666 15.5664 14.5496C15.5664 15.4326 16.2822 16.1484 17.1653 16.1484ZM17.1653 17.6484C18.8767 17.6484 20.2641 16.261 20.2641 14.5496C20.2641 12.8381 18.8767 11.4507 17.1653 11.4507C15.4538 11.4507 14.0664 12.8381 14.0664 14.5496C14.0664 16.261 15.4538 17.6484 17.1653 17.6484Z" fill="#323A3D"/>
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M10.2877 2.5C6.53919 2.5 3.5 5.53919 3.5 9.28767C3.5 13.0361 6.53919 16.0753 10.2877 16.0753C10.7019 16.0753 11.0377 16.4111 11.0377 16.8253C11.0377 17.2395 10.7019 17.5753 10.2877 17.5753C5.71076 17.5753 2 13.8646 2 9.28767C2 4.71076 5.71076 1 10.2877 1C12.6305 1 14.7474 1.97328 16.2539 3.5355C16.5414 3.83367 16.5328 4.30846 16.2346 4.59599C15.9365 4.88351 15.4617 4.87489 15.1742 4.57673C13.9386 3.2955 12.2066 2.5 10.2877 2.5Z" fill="#323A3D"/>
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M9.69824 3.97412C10.1125 3.97412 10.4482 4.30991 10.4482 4.72412V9.08574H10.8679C11.2821 9.08574 11.6179 9.42153 11.6179 9.83574C11.6179 10.25 11.2821 10.5857 10.8679 10.5857H10.0812C9.45552 10.5857 8.94824 10.0785 8.94824 9.45274V4.72412C8.94824 4.30991 9.28403 3.97412 9.69824 3.97412Z" fill="#323A3D"/>
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M15.964 1.58698C16.3782 1.58698 16.714 1.92276 16.714 2.33698V3.78976C16.714 4.41832 16.2472 4.94912 15.6239 5.0295L13.9593 5.24413C13.5485 5.2971 13.1725 5.00701 13.1195 4.5962C13.0666 4.18538 13.3566 3.80941 13.7675 3.75644L15.214 3.56992V2.33698C15.214 1.92276 15.5498 1.58698 15.964 1.58698Z" fill="#323A3D"/>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 2.7 KiB |
|
|
@ -0,0 +1,8 @@
|
|||
<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<path d="M6 6.99279C7.20333 5.7619 8.86454 5 10.6992 5C12.5339 5 14.1951 5.7619 15.3984 6.99279" stroke="#6B6B6B" stroke-width="1.2" stroke-miterlimit="10" stroke-linecap="round"/>
|
||||
<path d="M7.88477 8.92028C8.60676 8.18079 9.60224 7.72461 10.704 7.72461C11.8042 7.72461 12.8012 8.18239 13.5232 8.92028" stroke="#6B6B6B" stroke-width="1.2" stroke-miterlimit="10" stroke-linecap="round"/>
|
||||
<path d="M11.8474 10.7808C11.9252 10.7027 11.9258 10.5754 11.84 10.5063C11.5292 10.2561 11.1354 10.1067 10.7055 10.1067C10.2756 10.1067 9.88181 10.2561 9.57109 10.5063C9.48522 10.5754 9.48585 10.7027 9.5637 10.7808L10.5639 11.7837C10.6421 11.8621 10.769 11.8621 10.8471 11.7837L11.8474 10.7808Z" fill="#6B6B6B"/>
|
||||
<circle cx="10.3956" cy="8.39563" r="7.39563" stroke="#6B6B6B" stroke-width="1.2"/>
|
||||
<path d="M13.3971 15.211L13.9167 14.911L13.6463 14.4427L13.1525 14.6631L13.3971 15.211ZM7.39062 15.2184L7.63383 14.6699L7.14071 14.4512L6.871 14.9184L7.39062 15.2184ZM5.39062 18.6825L4.87101 18.3825L4.35139 19.2825H5.39062V18.6825ZM15.4013 18.6825V19.2825H16.4406L15.9209 18.3825L15.4013 18.6825ZM13.1525 14.6631C12.3081 15.0401 11.3721 15.2499 10.3855 15.2499V16.4499C11.5439 16.4499 12.6463 16.2032 13.6416 15.7589L13.1525 14.6631ZM10.3855 15.2499C9.40489 15.2499 8.47427 15.0426 7.63383 14.6699L7.1474 15.7669C8.13806 16.2062 9.23413 16.4499 10.3855 16.4499V15.2499ZM5.91024 18.9825L7.91023 15.5184L6.871 14.9184L4.87101 18.3825L5.91024 18.9825ZM15.4013 18.0825H5.39062V19.2825H15.4013V18.0825ZM12.8774 15.511L14.8817 18.9825L15.9209 18.3825L13.9167 14.911L12.8774 15.511Z" fill="#6B6B6B"/>
|
||||
<line x1="4.37637" y1="18.7403" x2="16.1394" y2="18.7403" stroke="#6B6B6B" stroke-width="1.2" stroke-linecap="round"/>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 1.8 KiB |
|
|
@ -0,0 +1,8 @@
|
|||
<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<path d="M6 6.99279C7.20333 5.7619 8.86454 5 10.6992 5C12.5339 5 14.1951 5.7619 15.3984 6.99279" stroke="#FF6F00" stroke-width="1.5" stroke-miterlimit="10" stroke-linecap="round"/>
|
||||
<path d="M7.88477 8.92028C8.60676 8.18079 9.60224 7.72461 10.704 7.72461C11.8042 7.72461 12.8012 8.18239 13.5232 8.92028" stroke="#FF6F00" stroke-width="1.5" stroke-miterlimit="10" stroke-linecap="round"/>
|
||||
<path d="M11.8474 10.7808C11.9252 10.7027 11.9258 10.5754 11.84 10.5063C11.5292 10.2561 11.1354 10.1067 10.7055 10.1067C10.2756 10.1067 9.88181 10.2561 9.57109 10.5063C9.48522 10.5754 9.48585 10.7027 9.5637 10.7808L10.5639 11.7837C10.6421 11.8621 10.769 11.8621 10.8471 11.7837L11.8474 10.7808Z" fill="#FF6F00"/>
|
||||
<circle cx="10.3956" cy="8.39563" r="7.39563" stroke="#323A3D" stroke-width="1.5"/>
|
||||
<path d="M13.3971 15.2111L14.0466 14.8361L13.7086 14.2507L13.0914 14.5262L13.3971 15.2111ZM7.39062 15.2185L7.69464 14.5328L7.07824 14.2595L6.7411 14.8435L7.39062 15.2185ZM5.39062 18.6825L4.74111 18.3075L4.09159 19.4325H5.39062V18.6825ZM15.4013 18.6825V19.4325H16.7004L16.0508 18.3075L15.4013 18.6825ZM13.0914 14.5262C12.2658 14.8947 11.3506 15.1 10.3855 15.1V16.6C11.5654 16.6 12.6886 16.3487 13.7028 15.8959L13.0914 14.5262ZM10.3855 15.1C9.42623 15.1 8.5163 14.8972 7.69464 14.5328L7.0866 15.9041C8.09603 16.3517 9.21278 16.6 10.3855 16.6V15.1ZM6.04014 19.0575L8.04014 15.5935L6.7411 14.8435L4.74111 18.3075L6.04014 19.0575ZM15.4013 17.9325H5.39062V19.4325H15.4013V17.9325ZM12.7475 15.5861L14.7518 19.0575L16.0508 18.3075L14.0466 14.8361L12.7475 15.5861Z" fill="#323A3D"/>
|
||||
<line x1="4.52637" y1="18.5903" x2="15.9894" y2="18.5903" stroke="#323A3D" stroke-width="1.5" stroke-linecap="round"/>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 1.7 KiB |
|
|
@ -1,6 +0,0 @@
|
|||
<svg width="38" height="23" viewBox="0 0 38 23" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M18.9995 2.93047C15.2464 2.93047 12.2039 5.97297 12.2039 9.72609C12.2039 13.4792 15.2464 16.5217 18.9995 16.5217C22.7527 16.5217 25.7952 13.4792 25.7952 9.72609C25.7952 5.97297 22.7527 2.93047 18.9995 2.93047ZM11.0039 9.72609C11.0039 5.31023 14.5837 1.73047 18.9995 1.73047C23.4154 1.73047 26.9952 5.31023 26.9952 9.72609C26.9952 14.142 23.4154 17.7217 18.9995 17.7217C14.5837 17.7217 11.0039 14.142 11.0039 9.72609Z" fill="#6B6B6B"/>
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M18.9976 8.25469C17.3684 8.25469 16.0477 9.5754 16.0477 11.2046C16.0477 12.8338 17.3684 14.1545 18.9976 14.1545C20.6267 14.1545 21.9475 12.8338 21.9475 11.2046C21.9475 9.5754 20.6267 8.25469 18.9976 8.25469ZM14.8477 11.2046C14.8477 8.91266 16.7056 7.05469 18.9976 7.05469C21.2895 7.05469 23.1475 8.91266 23.1475 11.2046C23.1475 13.4965 21.2895 15.3545 18.9976 15.3545C16.7056 15.3545 14.8477 13.4965 14.8477 11.2046Z" fill="#6B6B6B"/>
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M22.248 15.7734L25.0423 20.6132H12.9531L15.7424 15.782L16.2356 16.0007C17.076 16.3733 18.0066 16.5807 18.9873 16.5807C19.9738 16.5807 20.9098 16.3708 21.7542 15.9939L22.248 15.7734ZM21.7402 17.2939C20.8813 17.6089 19.9538 17.7807 18.9873 17.7807C18.0272 17.7807 17.1056 17.6112 16.2515 17.3002L15.0316 19.4132H22.9638L21.7402 17.2939Z" fill="#6B6B6B"/>
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M12.3789 20.0707C12.3789 19.7393 12.6475 19.4707 12.9789 19.4707L24.7419 19.4707C25.0733 19.4707 25.3419 19.7393 25.3419 20.0707C25.3419 20.4021 25.0733 20.6707 24.7419 20.6707L12.9789 20.6707C12.6475 20.6707 12.3789 20.4021 12.3789 20.0707Z" fill="#6B6B6B"/>
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 1.7 KiB |
|
|
@ -0,0 +1,10 @@
|
|||
<svg width="38" height="22" viewBox="0 0 38 22" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M28.0605 17.7949L28.0605 4.20519C28.0605 3.76337 27.7024 3.40519 27.2605 3.40519L14.7017 3.40519C14.502 3.40519 14.3096 3.47982 14.1622 3.61441L10.1998 7.23224C10.0338 7.38382 9.93926 7.59824 9.93926 7.82303L9.93926 17.7949C9.93926 18.2367 10.2974 18.5949 10.7393 18.5949L27.2605 18.5949C27.7024 18.5949 28.0605 18.2367 28.0605 17.7949ZM29.2605 4.20519L29.2605 17.7949C29.2605 18.8994 28.3651 19.7949 27.2605 19.7949L10.7393 19.7949C9.63469 19.7949 8.73926 18.8994 8.73926 17.7949L8.73926 7.82303C8.73926 7.26105 8.9757 6.72499 9.39072 6.34606L13.3531 2.72822C13.7216 2.39175 14.2026 2.20519 14.7017 2.20519L27.2605 2.20519C28.3651 2.20519 29.2605 3.10063 29.2605 4.20519Z" fill="#ACACAC"/>
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M12.1396 14.5765L12.1396 16.541L15.9265 16.541L15.9265 14.5765L12.1396 14.5765ZM11.1396 16.541C11.1396 17.0933 11.5874 17.541 12.1396 17.541L15.9265 17.541C16.4788 17.541 16.9265 17.0933 16.9265 16.541L16.9265 14.5765C16.9265 14.0242 16.4788 13.5765 15.9265 13.5765L12.1396 13.5765C11.5874 13.5765 11.1396 14.0242 11.1396 14.5765L11.1396 16.541Z" fill="#ACACAC"/>
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M19.407 16.341L25.3243 16.341L25.3243 5.66152L19.407 5.66152L19.407 16.341ZM18.207 16.541C18.207 17.0933 18.6547 17.541 19.207 17.541L25.5243 17.541C26.0766 17.541 26.5243 17.0933 26.5243 16.541L26.5243 5.46152C26.5243 4.90923 26.0766 4.46152 25.5243 4.46152L19.207 4.46152C18.6547 4.46152 18.207 4.90924 18.207 5.46152L18.207 16.541Z" fill="#ACACAC"/>
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M12.1396 10.0206L12.1396 12.0291L15.9265 12.0291L15.9265 10.0206L12.1396 10.0206ZM11.1396 12.0291C11.1396 12.5813 11.5874 13.0291 12.1396 13.0291L15.9265 13.0291C16.4788 13.0291 16.9265 12.5813 16.9265 12.0291L16.9265 10.0206C16.9265 9.46834 16.4788 9.02062 15.9265 9.02062L12.1396 9.02062C11.5874 9.02062 11.1396 9.46834 11.1396 10.0206L11.1396 12.0291Z" fill="#ACACAC"/>
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M14.4893 5.55136L14.4893 7.37744L15.9267 7.37744L15.9267 5.55136L14.4893 5.55136ZM13.4893 7.37744C13.4893 7.92973 13.937 8.37744 14.4893 8.37744L15.9267 8.37744C16.479 8.37744 16.9267 7.92973 16.9267 7.37744L16.9267 5.55136C16.9267 4.99908 16.479 4.55136 15.9267 4.55136L14.4893 4.55136C13.937 4.55136 13.4893 4.99908 13.4893 5.55136L13.4893 7.37744Z" fill="#ACACAC"/>
|
||||
<path d="M24.0938 17C24.0938 14.7909 25.8846 13 28.0938 13V13C30.3029 13 32.0938 14.7909 32.0938 17V17C32.0938 19.2091 30.3029 21 28.0938 21V21C25.8846 21 24.0938 19.2091 24.0938 17V17Z" fill="#323A3D"/>
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M30.1124 19.0209C29.9172 19.2162 29.6007 19.2163 29.4053 19.0211L26.0733 15.6911C25.878 15.4959 25.8779 15.1793 26.0731 14.984C26.2683 14.7886 26.5849 14.7885 26.7802 14.9837L30.1122 18.3138C30.3076 18.509 30.3077 18.8256 30.1124 19.0209Z" fill="white"/>
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M26.0753 19.0211C25.8799 18.8259 25.8798 18.5094 26.0751 18.314L29.4051 14.982C29.6003 14.7867 29.9169 14.7866 30.1122 14.9818C30.3076 15.177 30.3077 15.4936 30.1124 15.6889L26.7824 19.0209C26.5872 19.2162 26.2706 19.2163 26.0753 19.0211Z" fill="white"/>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 3.2 KiB |
|
Before Width: | Height: | Size: 2.4 KiB After Width: | Height: | Size: 2.4 KiB |
|
|
@ -1,15 +0,0 @@
|
|||
<svg width="39" height="23" viewBox="0 0 39 23" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<g clip-path="url(#clip0_8660_33052)">
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M32.7264 9.17985L29.3767 13.3992L32.7264 17.6193L32.7264 9.17985ZM33.9121 8.62188C33.9121 7.66675 32.7384 7.2271 32.154 7.96329L28.352 12.7523C28.0588 13.1216 28.0616 13.6544 28.3587 14.0287L32.1607 18.8186C32.7496 19.5605 33.9121 19.1504 33.9121 18.2008L33.9121 8.62188Z" fill="#6B6B6B"/>
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M14.9422 7.29766V18.6828H27.0104V7.29766H14.9422ZM14.7422 6.09766C14.1899 6.09766 13.7422 6.54537 13.7422 7.09766V18.8828C13.7422 19.4351 14.1899 19.8828 14.7422 19.8828H27.2104C27.7627 19.8828 28.2104 19.4351 28.2104 18.8828V7.09766C28.2104 6.54537 27.7627 6.09766 27.2104 6.09766H14.7422Z" fill="#6B6B6B"/>
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M18.9113 16.6735C19.9601 16.6735 20.8102 15.8233 20.8102 14.7746C20.8102 13.7259 19.9601 12.8758 18.9113 12.8758C17.8626 12.8758 17.0125 13.7259 17.0125 14.7746C17.0125 15.8233 17.8626 16.6735 18.9113 16.6735ZM18.9113 17.8735C20.6228 17.8735 22.0102 16.4861 22.0102 14.7746C22.0102 13.0632 20.6228 11.6758 18.9113 11.6758C17.1999 11.6758 15.8125 13.0632 15.8125 14.7746C15.8125 16.4861 17.1999 17.8735 18.9113 17.8735Z" fill="#6B6B6B"/>
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M12.0322 2.575C8.20087 2.575 5.09453 5.68134 5.09453 9.51267C5.09453 13.344 8.20087 16.4503 12.0322 16.4503C12.3636 16.4503 12.6322 16.719 12.6322 17.0503C12.6322 17.3817 12.3636 17.6503 12.0322 17.6503C7.53813 17.6503 3.89453 14.0067 3.89453 9.51267C3.89453 5.0186 7.53813 1.375 12.0322 1.375C14.3326 1.375 16.4111 2.33051 17.8905 3.86462C18.1205 4.10316 18.1136 4.48299 17.8751 4.71301C17.6365 4.94303 17.2567 4.93613 17.0267 4.6976C15.764 3.38827 13.9935 2.575 12.0322 2.575Z" fill="#6B6B6B"/>
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M11.4438 4.34961C11.7751 4.34961 12.0438 4.61824 12.0438 4.94961V9.46123H12.6134C12.9447 9.46123 13.2134 9.72986 13.2134 10.0612C13.2134 10.3926 12.9447 10.6612 12.6134 10.6612H11.8268C11.2839 10.6612 10.8438 10.2211 10.8438 9.67823V4.94961C10.8438 4.61824 11.1124 4.34961 11.4438 4.34961Z" fill="#6B6B6B"/>
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M17.7085 1.96289C18.0399 1.96289 18.3085 2.23152 18.3085 2.56289V4.01568C18.3085 4.56881 17.8978 5.03591 17.3492 5.10664L15.6846 5.32127C15.356 5.36365 15.0552 5.13158 15.0128 4.80293C14.9704 4.47428 15.2025 4.1735 15.5311 4.13113L17.1085 3.92774V2.56289C17.1085 2.23152 17.3771 1.96289 17.7085 1.96289Z" fill="#6B6B6B"/>
|
||||
</g>
|
||||
<defs>
|
||||
<clipPath id="clip0_8660_33052">
|
||||
<rect width="38" height="22" fill="white" transform="translate(0.230469 0.5)"/>
|
||||
</clipPath>
|
||||
</defs>
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 2.7 KiB |
|
|
@ -1,8 +0,0 @@
|
|||
<svg width="39" height="23" viewBox="0 0 39 23" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<circle cx="19.8644" cy="9.7257" r="7.39563" stroke="#6B6B6B" stroke-width="1.2"/>
|
||||
<path d="M22.8658 16.541L23.3854 16.241L23.115 15.7727L22.6212 15.9931L22.8658 16.541ZM16.8594 16.5484L17.1026 15.9999L16.6095 15.7813L16.3398 16.2484L16.8594 16.5484ZM14.8594 20.0125L14.3398 19.7125L13.8201 20.6125H14.8594V20.0125ZM24.8701 20.0125V20.6125H25.9093L25.3897 19.7125L24.8701 20.0125ZM22.6212 15.9931C21.7768 16.3701 20.8409 16.5799 19.8543 16.5799V17.7799C21.0127 17.7799 22.115 17.5332 23.1104 17.0889L22.6212 15.9931ZM19.8543 16.5799C18.8736 16.5799 17.943 16.3726 17.1026 15.9999L16.6162 17.0969C17.6068 17.5362 18.7029 17.7799 19.8543 17.7799V16.5799ZM15.379 20.3125L17.379 16.8484L16.3398 16.2484L14.3398 19.7125L15.379 20.3125ZM24.8701 19.4125H14.8594V20.6125H24.8701V19.4125ZM22.3462 16.841L24.3505 20.3125L25.3897 19.7125L23.3854 16.241L22.3462 16.841Z" fill="#6B6B6B"/>
|
||||
<line x1="13.8461" y1="20.0699" x2="25.6091" y2="20.0699" stroke="#6B6B6B" stroke-width="1.2" stroke-linecap="round"/>
|
||||
<path d="M15.1641 9.1256C16.3674 7.89471 18.0286 7.13281 19.8633 7.13281C21.698 7.13281 23.3592 7.89471 24.5625 9.1256" stroke="#6B6B6B" stroke-width="1.2" stroke-miterlimit="10" stroke-linecap="round"/>
|
||||
<path d="M17.0469 11.0531C17.7689 10.3136 18.7643 9.85742 19.8661 9.85742C20.9663 9.85742 21.9633 10.3152 22.6853 11.0531" stroke="#6B6B6B" stroke-width="1.2" stroke-miterlimit="10" stroke-linecap="round"/>
|
||||
<path d="M21.0104 12.9143C21.0883 12.8363 21.0889 12.7089 21.003 12.6398C20.6923 12.3896 20.2985 12.2402 19.8686 12.2402C19.4387 12.2402 19.0449 12.3896 18.7342 12.6398C18.6483 12.7089 18.6489 12.8363 18.7268 12.9143L19.727 13.9173C19.8051 13.9956 19.9321 13.9956 20.0102 13.9173L21.0104 12.9143Z" fill="#6B6B6B"/>
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 1.8 KiB |
|
|
@ -269,11 +269,12 @@ void CameraPopup::check_func_supported()
|
|||
}
|
||||
}
|
||||
|
||||
void CameraPopup::update()
|
||||
void CameraPopup::update(bool vcamera_streaming)
|
||||
{
|
||||
if (!m_obj) return;
|
||||
m_switch_recording->SetValue(m_obj->camera_recording_when_printing);
|
||||
sync_resolution_setting(m_obj->camera_resolution);
|
||||
sync_vcamera_state(vcamera_streaming);
|
||||
|
||||
rescale();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ public:
|
|||
|
||||
void sync_vcamera_state(bool show_vcamera);
|
||||
void check_func_supported();
|
||||
void update();
|
||||
void update(bool vcamera_streaming);
|
||||
|
||||
enum CameraResolution
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1229,7 +1229,7 @@ MachineObject::SdcardState MachineObject::get_sdcard_state()
|
|||
return sdcard_state;
|
||||
}
|
||||
|
||||
bool MachineObject::has_timelapse()
|
||||
bool MachineObject::is_timelapse()
|
||||
{
|
||||
return camera_timelapse;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -606,7 +606,7 @@ public:
|
|||
std::string subtask_name;
|
||||
bool is_sdcard_printing();
|
||||
bool has_sdcard();
|
||||
bool has_timelapse();
|
||||
bool is_timelapse();
|
||||
bool is_recording_enable();
|
||||
bool is_recording();
|
||||
|
||||
|
|
|
|||
|
|
@ -187,11 +187,15 @@ void StatusBasePanel::init_bitmaps()
|
|||
m_bitmap_extruder_filled_load = *cache.load_png("monitor_extruder_filled_load", FromDIP(28), FromDIP(70), false, false);
|
||||
m_bitmap_extruder_empty_unload = *cache.load_png("monitor_extruder_empty_unload", FromDIP(28), FromDIP(70), false, false);
|
||||
m_bitmap_extruder_filled_unload = *cache.load_png("monitor_extruder_filled_unload", FromDIP(28), FromDIP(70), false, false);
|
||||
m_bitmap_sdcard_state_on = create_scaled_bitmap("sdcard_state_on", nullptr, 20);
|
||||
m_bitmap_sdcard_state_no = create_scaled_bitmap("sdcard_state_no", nullptr, 20);
|
||||
m_bitmap_sdcard_state_abnormal = create_scaled_bitmap("sdcard_state_abnormal", nullptr, 20);
|
||||
m_bitmap_recording = create_scaled_bitmap("recording", nullptr, 20);
|
||||
m_bitmap_timelapse = create_scaled_bitmap("timelapse", nullptr, 20);
|
||||
m_bitmap_vcamera = create_scaled_bitmap("vcamera", nullptr, 20);
|
||||
m_bitmap_sdcard_state_normal = create_scaled_bitmap("sdcard_state_normal", nullptr, 20);
|
||||
m_bitmap_recording_on = create_scaled_bitmap("monitor_recording_on", nullptr, 20);
|
||||
m_bitmap_recording_off = create_scaled_bitmap("monitor_recording_off", nullptr, 20);
|
||||
m_bitmap_timelapse_on = create_scaled_bitmap("monitor_timelapse_on", nullptr, 20);
|
||||
m_bitmap_timelapse_off = create_scaled_bitmap("monitor_timelapse_off", nullptr, 20);
|
||||
m_bitmap_vcamera_on = create_scaled_bitmap("monitor_vcamera_on", nullptr, 20);
|
||||
m_bitmap_vcamera_off = create_scaled_bitmap("monitor_vcamera_off", nullptr, 20);
|
||||
}
|
||||
|
||||
wxBoxSizer *StatusBasePanel::create_monitoring_page()
|
||||
|
|
@ -228,22 +232,18 @@ wxBoxSizer *StatusBasePanel::create_monitoring_page()
|
|||
//m_bitmap_camera_img->SetMinSize(wxSize(FromDIP(32), FromDIP(18)));
|
||||
//bSizer_monitoring_title->Add(m_bitmap_camera_img, 0, wxALIGN_CENTER_VERTICAL | wxALL, FromDIP(5));
|
||||
|
||||
m_bitmap_sdcard_abnormal_img = new wxStaticBitmap(m_panel_monitoring_title, wxID_ANY, m_bitmap_sdcard_state_abnormal, wxDefaultPosition, wxSize(FromDIP(38), FromDIP(24)), 0);
|
||||
m_bitmap_sdcard_abnormal_img->SetMinSize(wxSize(FromDIP(38), FromDIP(24)));
|
||||
m_bitmap_sdcard_on_img = new wxStaticBitmap(m_panel_monitoring_title, wxID_ANY, m_bitmap_sdcard_state_on, wxDefaultPosition, wxSize(FromDIP(38), FromDIP(24)), 0);
|
||||
m_bitmap_sdcard_on_img->SetMinSize(wxSize(FromDIP(38), FromDIP(24)));
|
||||
m_bitmap_sdcard_on_img->Hide();
|
||||
m_bitmap_sdcard_abnormal_img->Hide();
|
||||
m_bitmap_sdcard_img = new wxStaticBitmap(m_panel_monitoring_title, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize(FromDIP(38), FromDIP(24)), 0);
|
||||
m_bitmap_sdcard_img->SetMinSize(wxSize(FromDIP(38), FromDIP(24)));
|
||||
|
||||
m_bitmap_timelapse_img = new wxStaticBitmap(m_panel_monitoring_title, wxID_ANY, m_bitmap_timelapse, wxDefaultPosition, wxSize(FromDIP(38), FromDIP(24)), 0);
|
||||
m_bitmap_timelapse_img = new wxStaticBitmap(m_panel_monitoring_title, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize(FromDIP(38), FromDIP(24)), 0);
|
||||
m_bitmap_timelapse_img->SetMinSize(wxSize(FromDIP(38), FromDIP(24)));
|
||||
m_bitmap_timelapse_img->Hide();
|
||||
|
||||
m_bitmap_recording_img = new wxStaticBitmap(m_panel_monitoring_title, wxID_ANY, m_bitmap_recording, wxDefaultPosition, wxSize(FromDIP(38), FromDIP(24)), 0);
|
||||
m_bitmap_recording_img = new wxStaticBitmap(m_panel_monitoring_title, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize(FromDIP(38), FromDIP(24)), 0);
|
||||
m_bitmap_recording_img->SetMinSize(wxSize(FromDIP(38), FromDIP(24)));
|
||||
m_bitmap_timelapse_img->Hide();
|
||||
|
||||
m_bitmap_vcamera_img = new wxStaticBitmap(m_panel_monitoring_title, wxID_ANY, m_bitmap_vcamera, wxDefaultPosition, wxSize(FromDIP(38), FromDIP(24)), 0);
|
||||
m_bitmap_vcamera_img = new wxStaticBitmap(m_panel_monitoring_title, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize(FromDIP(38), FromDIP(24)), 0);
|
||||
m_bitmap_vcamera_img->SetMinSize(wxSize(FromDIP(38), FromDIP(24)));
|
||||
m_bitmap_vcamera_img->Hide();
|
||||
|
||||
|
|
@ -251,15 +251,13 @@ wxBoxSizer *StatusBasePanel::create_monitoring_page()
|
|||
m_setting_button->SetMinSize(wxSize(FromDIP(38), FromDIP(24)));
|
||||
m_setting_button->SetBackgroundColour(STATUS_TITLE_BG);
|
||||
|
||||
m_bitmap_sdcard_on_img->SetToolTip(_L("SD Card"));
|
||||
m_bitmap_sdcard_abnormal_img->SetToolTip(_L("SD Card Abnormal"));
|
||||
m_bitmap_sdcard_img->SetToolTip(_L("SD Card"));
|
||||
m_bitmap_timelapse_img->SetToolTip(_L("Timelapse"));
|
||||
m_bitmap_recording_img->SetToolTip(_L("Video"));
|
||||
m_bitmap_vcamera_img->SetToolTip(_L("Virtual Camera"));
|
||||
m_setting_button->SetToolTip(_L("Camera Setting"));
|
||||
|
||||
bSizer_monitoring_title->Add(m_bitmap_sdcard_abnormal_img, 0, wxALIGN_CENTER_VERTICAL | wxALL, FromDIP(5));
|
||||
bSizer_monitoring_title->Add(m_bitmap_sdcard_on_img, 0, wxALIGN_CENTER_VERTICAL | wxALL, FromDIP(5));
|
||||
bSizer_monitoring_title->Add(m_bitmap_sdcard_img, 0, wxALIGN_CENTER_VERTICAL | wxALL, FromDIP(5));
|
||||
bSizer_monitoring_title->Add(m_bitmap_timelapse_img, 0, wxALIGN_CENTER_VERTICAL | wxALL, FromDIP(5));
|
||||
bSizer_monitoring_title->Add(m_bitmap_recording_img, 0, wxALIGN_CENTER_VERTICAL | wxALL, FromDIP(5));
|
||||
bSizer_monitoring_title->Add(m_bitmap_vcamera_img, 0, wxALIGN_CENTER_VERTICAL | wxALL, FromDIP(5));
|
||||
|
|
@ -1041,45 +1039,86 @@ void StatusBasePanel::show_ams_group(bool show)
|
|||
m_show_ams_group = show;
|
||||
}
|
||||
|
||||
void StatusPanel::update_img_status(wxStaticBitmap* img, bool on_off)
|
||||
void StatusPanel::update_camera_state(MachineObject* obj)
|
||||
{
|
||||
if (on_off)
|
||||
img->Show();
|
||||
else
|
||||
img->Hide();
|
||||
}
|
||||
if (!obj) return;
|
||||
|
||||
void StatusPanel::update_camera_state(bool recording, bool timelapse, MachineObject::SdcardState sdcard_state)
|
||||
{
|
||||
//m_bitmap_sdcard_abnormal_img->SetToolTip(_L("SD Card Abnormal"));
|
||||
//sdcard
|
||||
switch (sdcard_state) {
|
||||
case MachineObject::SdcardState::NO_SDCARD:
|
||||
m_bitmap_sdcard_on_img->Hide();
|
||||
m_bitmap_sdcard_abnormal_img->Hide();
|
||||
break;
|
||||
case MachineObject::SdcardState::HAS_SDCARD_NORMAL:
|
||||
m_bitmap_sdcard_on_img->Show();
|
||||
m_bitmap_sdcard_abnormal_img->Hide();
|
||||
break;
|
||||
case MachineObject::SdcardState::HAS_SDCARD_ABNORMAL:
|
||||
m_bitmap_sdcard_on_img->Hide();
|
||||
m_bitmap_sdcard_abnormal_img->Show();
|
||||
break;
|
||||
default:
|
||||
;
|
||||
if (m_last_sdcard != (int)obj->get_sdcard_state()) {
|
||||
if (obj->get_sdcard_state() == MachineObject::SdcardState::NO_SDCARD) {
|
||||
m_bitmap_sdcard_img->SetBitmap(m_bitmap_sdcard_state_no);
|
||||
m_bitmap_sdcard_img->SetToolTip(_L("No SD Card"));
|
||||
} else if (obj->get_sdcard_state() == MachineObject::SdcardState::HAS_SDCARD_NORMAL) {
|
||||
m_bitmap_sdcard_img->SetBitmap(m_bitmap_sdcard_state_normal);
|
||||
m_bitmap_sdcard_img->SetToolTip(_L("SD Card"));
|
||||
} else if (obj->get_sdcard_state() == MachineObject::SdcardState::HAS_SDCARD_ABNORMAL) {
|
||||
m_bitmap_sdcard_img->SetBitmap(m_bitmap_sdcard_state_abnormal);
|
||||
m_bitmap_sdcard_img->SetToolTip(_L("SD Card Abnormal"));
|
||||
} else {
|
||||
m_bitmap_sdcard_img->SetBitmap(m_bitmap_sdcard_state_normal);
|
||||
m_bitmap_sdcard_img->SetToolTip(_L("SD Card"));
|
||||
}
|
||||
m_last_sdcard = (int)obj->get_sdcard_state();
|
||||
}
|
||||
|
||||
//recording
|
||||
update_img_status(m_bitmap_recording_img, recording);
|
||||
if (obj->is_function_supported(PrinterFunction::FUNC_RECORDING)) {
|
||||
if (m_last_recording != (obj->is_recording() ? 1: 0)) {
|
||||
if (obj->is_recording()) {
|
||||
m_bitmap_recording_img->SetBitmap(m_bitmap_recording_on);
|
||||
} else {
|
||||
m_bitmap_recording_img->SetBitmap(m_bitmap_recording_off);
|
||||
}
|
||||
m_last_recording = obj->is_recording() ? 1 : 0;
|
||||
}
|
||||
if (!m_bitmap_recording_img->IsShown())
|
||||
m_bitmap_recording_img->Show();
|
||||
} else {
|
||||
if (m_bitmap_recording_img->IsShown())
|
||||
m_bitmap_recording_img->Hide();
|
||||
}
|
||||
|
||||
//timelapse
|
||||
update_img_status(m_bitmap_timelapse_img, timelapse);
|
||||
if (obj->is_function_supported(PrinterFunction::FUNC_TIMELAPSE)) {
|
||||
if (m_last_timelapse != (obj->is_timelapse() ? 1: 0)) {
|
||||
if (obj->is_timelapse()) {
|
||||
m_bitmap_timelapse_img->SetBitmap(m_bitmap_timelapse_on);
|
||||
} else {
|
||||
m_bitmap_timelapse_img->SetBitmap(m_bitmap_timelapse_off);
|
||||
}
|
||||
m_last_timelapse = obj->is_timelapse() ? 1 : 0;
|
||||
}
|
||||
if (!m_bitmap_timelapse_img->IsShown())
|
||||
m_bitmap_timelapse_img->Show();
|
||||
} else {
|
||||
if (m_bitmap_timelapse_img->IsShown())
|
||||
m_bitmap_timelapse_img->Hide();
|
||||
}
|
||||
|
||||
//vcamera
|
||||
update_img_status(m_bitmap_vcamera_img, m_media_play_ctrl->IsStreaming());
|
||||
show_vcamera = m_media_play_ctrl->IsStreaming();
|
||||
if (obj->is_function_supported(PrinterFunction::FUNC_VIRTUAL_CAMERA)) {
|
||||
if (m_last_vcamera != (m_media_play_ctrl->IsStreaming() ? 1: 0)) {
|
||||
if (m_media_play_ctrl->IsStreaming()) {
|
||||
m_bitmap_vcamera_img->SetBitmap(m_bitmap_vcamera_on);
|
||||
} else {
|
||||
m_bitmap_vcamera_img->SetBitmap(m_bitmap_vcamera_off);
|
||||
}
|
||||
m_last_vcamera = m_media_play_ctrl->IsStreaming() ? 1 : 0;
|
||||
}
|
||||
if (!m_bitmap_vcamera_img->IsShown())
|
||||
m_bitmap_vcamera_img->Show();
|
||||
} else {
|
||||
if (m_bitmap_vcamera_img->IsShown())
|
||||
m_bitmap_vcamera_img->Hide();
|
||||
}
|
||||
|
||||
//camera setting
|
||||
if (m_camera_popup) {
|
||||
m_camera_popup->update();
|
||||
m_camera_popup->sync_vcamera_state(show_vcamera);
|
||||
bool show_vcamera = m_media_play_ctrl->IsStreaming();
|
||||
m_camera_popup->update(show_vcamera);
|
||||
}
|
||||
|
||||
m_panel_monitoring_title->Layout();
|
||||
}
|
||||
|
||||
|
|
@ -1455,7 +1494,7 @@ void StatusPanel::update(MachineObject *obj)
|
|||
update_error_message();
|
||||
}
|
||||
|
||||
update_camera_state(obj->is_recording_enable(), obj->has_timelapse(), obj->get_sdcard_state());
|
||||
update_camera_state(obj);
|
||||
|
||||
m_machine_ctrl_panel->Thaw();
|
||||
}
|
||||
|
|
@ -1684,16 +1723,19 @@ void StatusPanel::update_extruder_status(MachineObject* obj)
|
|||
{
|
||||
if (!obj) return;
|
||||
if (obj->is_filament_at_extruder()) {
|
||||
if (obj->extruder_axis_status == MachineObject::ExtruderAxisStatus::LOAD)
|
||||
if (obj->extruder_axis_status == MachineObject::ExtruderAxisStatus::LOAD) {
|
||||
m_bitmap_extruder_img->SetBitmap(m_bitmap_extruder_filled_load);
|
||||
else
|
||||
}
|
||||
else {
|
||||
m_bitmap_extruder_img->SetBitmap(m_bitmap_extruder_filled_unload);
|
||||
}
|
||||
}
|
||||
else {
|
||||
if (obj->extruder_axis_status == MachineObject::ExtruderAxisStatus::LOAD)
|
||||
if (obj->extruder_axis_status == MachineObject::ExtruderAxisStatus::LOAD) {
|
||||
m_bitmap_extruder_img->SetBitmap(m_bitmap_extruder_empty_load);
|
||||
else
|
||||
} else {
|
||||
m_bitmap_extruder_img->SetBitmap(m_bitmap_extruder_empty_unload);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -2677,6 +2719,7 @@ void StatusPanel::on_camera_enter(wxMouseEvent& event)
|
|||
wxPoint pos = ctrl->ClientToScreen(wxPoint(0, 0));
|
||||
wxSize sz = ctrl->GetSize();
|
||||
m_camera_popup->Position(pos, wxSize(sz.x, sz.y));
|
||||
m_camera_popup->update(m_media_play_ctrl->IsStreaming());
|
||||
m_camera_popup->Popup();
|
||||
}
|
||||
}
|
||||
|
|
@ -2846,8 +2889,7 @@ void StatusPanel::msw_rescale()
|
|||
m_bitmap_recording_img->SetMinSize(wxSize(38, 24));
|
||||
m_bitmap_vcamera_img->SetMinSize(wxSize(38, 24));
|
||||
m_setting_button->SetMinSize(wxSize(38, 24));
|
||||
m_bitmap_sdcard_abnormal_img->SetMinSize(wxSize(FromDIP(38), FromDIP(24)));
|
||||
m_bitmap_sdcard_on_img->SetMinSize(wxSize(FromDIP(38), FromDIP(24)));
|
||||
m_bitmap_sdcard_img->SetMinSize(wxSize(FromDIP(38), FromDIP(24)));
|
||||
|
||||
m_bpButton_xy->Rescale();
|
||||
m_tempCtrl_nozzle->SetMinSize(TEMP_CTRL_MIN_SIZE);
|
||||
|
|
|
|||
|
|
@ -94,11 +94,15 @@ protected:
|
|||
CameraItem *m_setting_button;
|
||||
|
||||
wxBitmap m_bitmap_camera;
|
||||
wxBitmap m_bitmap_sdcard_state_on;
|
||||
wxBitmap m_bitmap_sdcard_state_normal;
|
||||
wxBitmap m_bitmap_sdcard_state_abnormal;
|
||||
wxBitmap m_bitmap_recording;
|
||||
wxBitmap m_bitmap_timelapse;
|
||||
wxBitmap m_bitmap_vcamera;
|
||||
wxBitmap m_bitmap_sdcard_state_no;
|
||||
wxBitmap m_bitmap_recording_on;
|
||||
wxBitmap m_bitmap_recording_off;
|
||||
wxBitmap m_bitmap_timelapse_on;
|
||||
wxBitmap m_bitmap_timelapse_off;
|
||||
wxBitmap m_bitmap_vcamera_on;
|
||||
wxBitmap m_bitmap_vcamera_off;
|
||||
|
||||
/* title panel */
|
||||
wxPanel * media_ctrl_panel;
|
||||
|
|
@ -116,8 +120,7 @@ protected:
|
|||
wxStaticBitmap *m_bitmap_recording_img;
|
||||
wxStaticBitmap *m_bitmap_timelapse_img;
|
||||
wxStaticBitmap* m_bitmap_vcamera_img;
|
||||
wxStaticBitmap *m_bitmap_sdcard_on_img;
|
||||
wxStaticBitmap *m_bitmap_sdcard_abnormal_img;
|
||||
wxStaticBitmap *m_bitmap_sdcard_img;
|
||||
wxStaticBitmap *m_bitmap_static_use_time;
|
||||
wxStaticBitmap *m_bitmap_static_use_weight;
|
||||
|
||||
|
|
@ -268,6 +271,12 @@ protected:
|
|||
wxString m_request_url;
|
||||
bool m_start_loading_thumbnail = false;
|
||||
bool m_load_sdcard_thumbnail = false;
|
||||
int m_last_sdcard = -1;
|
||||
int m_last_recording = -1;
|
||||
int m_last_timelapse = -1;
|
||||
int m_last_extrusion = -1;
|
||||
int m_last_vcamera = -1;
|
||||
|
||||
wxWebRequest web_request;
|
||||
bool bed_temp_input = false;
|
||||
bool nozzle_temp_input = false;
|
||||
|
|
@ -363,8 +372,7 @@ protected:
|
|||
bool is_task_changed(MachineObject* obj);
|
||||
|
||||
/* camera */
|
||||
void update_camera_state(bool recording, bool timelapse, MachineObject::SdcardState sdcard_state);
|
||||
void update_img_status(wxStaticBitmap* img, bool on_off);
|
||||
void update_camera_state(MachineObject* obj);
|
||||
bool show_vcamera = false;
|
||||
|
||||
public:
|
||||
|
|
|
|||
Loading…
Reference in New Issue