QIDITECH/QIDIStudio
1
0
Fork 0
mirror of https://github.com/QIDITECH/QIDIStudio.git synced 2026-01-31 00:48:41 +03:00
Code Issues Packages Projects Releases Wiki Activity

update resources

Browse Source
This commit is contained in:
QIDI TECH
2024-11-28 15:01:13 +08:00
parent 22572c2286
commit 459e7822db
86 changed files with 2353 additions and 282 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
resources/data/hints.ini
View File

@@ -155,7 +155,7 @@ image = images/dailytips_TypesOfSupports.png
; [hint:Printing Silk Filament] ; [hint:Printing Silk Filament]
; text = Printing Silk Filament\nDid you know that Silk filament needs special consideration to print it successfully? Higher temperature and lower speed are always recommended for the best results. ; text = Printing Silk Filament\nDid you know that Silk filament needs special consideration to print it successfully? Higher temperature and lower speed are always recommended for the best results.
; documentation_link= https://wiki.qidilab.com/en/x1/manual/printing-with-silk-filaments ; documentation_link= https://wiki.qiditech.com/en/x1/manual/printing-with-silk-filaments
[hint:Brim for better adhesion] [hint:Brim for better adhesion]
text = Brim for better adhesion\nDid you know that when printing models have a small contact interface with the printing surface, it's recommended to use a brim? text = Brim for better adhesion\nDid you know that when printing models have a small contact interface with the printing surface, it's recommended to use a brim?
@@ -173,7 +173,7 @@ image = images/dailytips_StackObject.png
# hint:Flush into support/objects/infill] # hint:Flush into support/objects/infill]
# text = Flush into support/objects/infill\nDid you know that you can save the wasted filament by flushing them into support/objects/infill during filament change? # text = Flush into support/objects/infill\nDid you know that you can save the wasted filament by flushing them into support/objects/infill during filament change?
# documentation_link= https://wiki.qidilab.com/en/software/qidi-studio/reduce-wasting-during-filament-change # documentation_link= https://wiki.qiditech.com/en/software/qidi-studio/reduce-wasting-during-filament-change
[hint:Improve strength] [hint:Improve strength]
text = Improve strength\nDid you know that you can use more wall loops and higher sparse infill density to improve the strength of the model? text = Improve strength\nDid you know that you can use more wall loops and higher sparse infill density to improve the strength of the model?

61
resources/flush/flush_data.txt Normal file
View File

@@ -0,0 +1,61 @@
colors
#000000 #C12E1F #00AE42 #545454 #D1D3D5 #5B6579 #F4EE2A #9D432C #5E43B7 #0A2989 #FF6A13 #8E9089
src dst flush
#000000 #F4EE2A 450
#000000 #5E43B7 330
#C12E1F #F4EE2A 420
#C12E1F #FF6A13 210
#00AE42 #D1D3D5 330
#00AE42 #F4EE2A 240
#00AE42 #FF6A13 270
#545454 #00AE42 180
#545454 #D1D3D5 240
#545454 #F4EE2A 270
#545454 #5E43B7 120
#545454 #FF6A13 300
#545454 #8E9089 120
#D1D3D5 #F4EE2A 120
#D1D3D5 #FF6A13 150
#5B6579 #C12E1F 120
#5B6579 #00AE42 90
#5B6579 #D1D3D5 120
#5B6579 #F4EE2A 180
#5B6579 #9D432C 120
#5B6579 #0A2989 90
#5B6579 #FF6A13 180
#5B6579 #8E9089 90
#F4EE2A #000000 120
#F4EE2A #C12E1F 90
#F4EE2A #00AE42 150
#F4EE2A #9D432C 150
#F4EE2A #FF6A13 90
#9D432C #00AE42 240
#9D432C #D1D3D5 300
#9D432C #F4EE2A 270
#9D432C #FF6A13 180
#9D432C #8E9089 210
#5E43B7 #00AE42 180
#5E43B7 #D1D3D5 270
#5E43B7 #F4EE2A 270
#5E43B7 #9D432C 150
#5E43B7 #FF6A13 270
#5E43B7 #8E9089 210
#0A2989 #C12E1F 330
#0A2989 #00AE42 210
#0A2989 #545454 150
#0A2989 #D1D3D5 450
#0A2989 #5B6579 240
#0A2989 #9D432C 270
#0A2989 #5E43B7 180
#0A2989 #FF6A13 390
#0A2989 #8E9089 270
#FF6A13 #C12E1F 90
#FF6A13 #D1D3D5 210
#FF6A13 #F4EE2A 210
#FF6A13 #9D432C 120
#FF6A13 #8E9089 180
#8E9089 #C12E1F 150
#8E9089 #00AE42 120
#8E9089 #D1D3D5 150
#8E9089 #F4EE2A 270
#8E9089 #FF6A13 150

BIN
resources/fonts/NanumGothic-Bold.ttf Normal file
View File

Binary file not shown.

BIN
resources/fonts/NanumGothic-Regular.ttf Normal file
View File

Binary file not shown.

BIN
resources/fonts/NotoSansJP-Bold.ttf
View File

Binary file not shown.

BIN
resources/fonts/NotoSansJP-Regular.ttf
View File

Binary file not shown.

BIN
resources/fonts/NotoSansKR-Bold.ttf
View File

Binary file not shown.

BIN
resources/fonts/NotoSansKR-Regular.ttf
View File

Binary file not shown.

BIN
resources/fonts/SourceHanSansJP-Bold.otf Normal file
View File

Binary file not shown.

BIN
resources/fonts/SourceHanSansJP-Normal.otf Normal file
View File

Binary file not shown.

BIN
resources/images/Q1 Pro_thumbnail.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 6.3 KiB

BIN
resources/images/X-MAX 3_thumbnail.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 9.7 KiB

BIN
resources/images/X-Plus 3_thumbnail.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 7.9 KiB

BIN
resources/images/X-Plus 4_thumbnail.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 9.1 KiB

BIN
resources/images/X-Smart 3_thumbnail.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 6.3 KiB

1
resources/images/add_text_modifier.svg Normal file
View File

@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path d="M6.5,14.5a1,1,0,0,1-1-1v-9h-4a1,1,0,0,1-1-1v-2a1,1,0,0,1,1-1h12a1,1,0,0,1,1,1v2a1,1,0,0,1-1,1h-4v2" style="fill:none;stroke:#949494;stroke-linecap:round;stroke-linejoin:round"/><line x1="8.5" y1="8.5" x2="14.5" y2="14.5" style="fill:none;stroke:#009688;stroke-linejoin:round"/><line x1="14.5" y1="8.5" x2="8.5" y2="14.5" style="fill:none;stroke:#009688;stroke-linejoin:round"/><line x1="11.5" y1="8.5" x2="11.5" y2="14.5" style="fill:none;stroke:#009688;stroke-linecap:square;stroke-linejoin:round"/><line x1="14.5" y1="11.5" x2="8.5" y2="11.5" style="fill:none;stroke:#009688;stroke-linecap:square;stroke-linejoin:round"/></svg>
Side by Side

After

Width:  |  Height:  |  Size: 721 B

1
resources/images/add_text_negative.svg Normal file
View File

@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path d="M6.5,14.5a1,1,0,0,1-1-1v-9h-4a1,1,0,0,1-1-1v-2a1,1,0,0,1,1-1h12a1,1,0,0,1,1,1v2a1,1,0,0,1-1,1h-4v2" style="fill:none;stroke:#949494;stroke-linecap:round;stroke-linejoin:round"/><path d="M15,11.5A3.5,3.5,0,1,1,11.5,8,3.5,3.5,0,0,1,15,11.5ZM14,11H9v1h5Z" style="fill:#009688"/></svg>
Side by Side

After

Width:  |  Height:  |  Size: 373 B

1
resources/images/add_text_part.svg Normal file
View File

@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path d="M6.5,14.5a1,1,0,0,1-1-1v-9h-4a1,1,0,0,1-1-1v-2a1,1,0,0,1,1-1h12a1,1,0,0,1,1,1v2a1,1,0,0,1-1,1h-4v2" style="fill:none;stroke:#949494;stroke-linecap:round;stroke-linejoin:round"/><path d="M15,11.5A3.5,3.5,0,1,1,11.5,8,3.5,3.5,0,0,1,15,11.5ZM14,11H12V9H11v2H9v1h2v2h1V12h2Z" style="fill:#009688"/></svg>
Side by Side

After

Width:  |  Height:  |  Size: 392 B

3
resources/images/bind_device_ping_code_dark.svg Normal file
View File

@@ -0,0 +1,3 @@
<svg width="8" height="8" viewBox="0 0 8 8" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M3.346 0.361999H5.068V3.078H7.77V4.786H5.068V7.502H3.346V4.786H0.63V3.078H3.346V0.361999Z" fill="white"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 214 B

0
resources/images/bind_device_ping_code.svg → resources/images/bind_device_ping_code_light.svg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 214 B

After

Width:  |  Height:  |  Size: 214 B

1
resources/images/menu_obj_svg.svg Normal file
View File

@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><line x1="2.5" y1="1.5" x2="12.5" y2="1.5" style="fill:none;stroke:#949494;stroke-linecap:round;stroke-linejoin:round;opacity:0.5"/><path d="M1.541,12.5A12,12,0,0,1,12.5,1.541" style="fill:none;stroke:#949494;stroke-linecap:round;stroke-linejoin:round"/><rect x="12.5" y="0.5" width="2" height="2" style="fill:none;stroke:#949494;stroke-linecap:round;stroke-linejoin:round"/><rect x="0.5" y="12.5" width="2" height="2" style="fill:none;stroke:#949494;stroke-linecap:round;stroke-linejoin:round"/><circle cx="1.5" cy="1.5" r="1.5" style="fill:#949494"/></svg>
Side by Side

After

Width:  |  Height:  |  Size: 641 B

1
resources/images/menu_obj_text.svg Normal file
View File

@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path d="M6.5,14.5h2a1,1,0,0,0,1-1v-9h4a1,1,0,0,0,1-1v-2a1,1,0,0,0-1-1H1.5a1,1,0,0,0-1,1v2a1,1,0,0,0,1,1h4v9a1,1,0,0,0,1,1" style="fill:none;stroke:#949494;stroke-linecap:round;stroke-linejoin:round"/></svg>
Side by Side

After

Width:  |  Height:  |  Size: 290 B

5
resources/images/step_mesh_info.svg Normal file
View File

@@ -0,0 +1,5 @@
<svg width="407" height="141" viewBox="0 0 407 141" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M29.635 14.6721L70.408 1.42417L111.181 14.6721L136.38 49.3557V92.2269L111.181 126.91L70.408 140.158L29.635 126.91L4.43594 92.2269V49.3557L29.635 14.6721Z" stroke="#262E30"/>
<path d="M309.925 6.6897L336.476 1.40823L363.028 6.6897L385.538 21.7301L400.578 44.2396L405.859 70.7913L400.578 97.343L385.538 119.852L363.028 134.893L336.476 140.174L309.925 134.893L287.415 119.852L272.375 97.343L267.093 70.7913L272.375 44.2395L287.415 21.7301L309.925 6.6897Z" stroke="#262E30"/>
<path d="M257.937 80.4962C258.328 80.1057 258.328 79.4725 257.937 79.082L251.573 72.718C251.183 72.3275 250.549 72.3275 250.159 72.718C249.768 73.1085 249.768 73.7417 250.159 74.1322L255.816 79.7891L250.159 85.4459C249.768 85.8364 249.768 86.4696 250.159 86.8601C250.549 87.2507 251.183 87.2507 251.573 86.8601L257.937 80.4962ZM152 80.7891L257.23 80.7891L257.23 78.7891L152 78.7891L152 80.7891Z" fill="#262E30"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1001 B

1
resources/images/svg_modifier.svg Normal file
View File

@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><line x1="2.5" y1="1.5" x2="12.5" y2="1.5" style="fill:none;stroke:#949494;stroke-linecap:round;stroke-linejoin:round;opacity:0.5"/><line x1="8.5" y1="8.5" x2="14.5" y2="14.5" style="fill:none;stroke:#009688;stroke-linejoin:round"/><line x1="14.5" y1="8.5" x2="8.5" y2="14.5" style="fill:none;stroke:#009688;stroke-linejoin:round"/><line x1="11.5" y1="8.5" x2="11.5" y2="14.5" style="fill:none;stroke:#009688;stroke-linecap:square;stroke-linejoin:round"/><line x1="14.5" y1="11.5" x2="8.5" y2="11.5" style="fill:none;stroke:#009688;stroke-linecap:square;stroke-linejoin:round"/><path d="M1.541,12.5A12,12,0,0,1,12.5,1.541" style="fill:none;stroke:#009688;stroke-linecap:round;stroke-linejoin:round"/><rect x="12.5" y="0.5" width="2" height="2" style="fill:none;stroke:#949494;stroke-linecap:round;stroke-linejoin:round"/><rect x="0.5" y="12.5" width="2" height="2" style="fill:none;stroke:#949494;stroke-linecap:round;stroke-linejoin:round"/><circle cx="1.5" cy="1.5" r="1.5" style="fill:#949494"/></svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

1
resources/images/svg_negative.svg Normal file
View File

@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path d="M15,11.5A3.5,3.5,0,1,1,11.5,8,3.5,3.5,0,0,1,15,11.5ZM14,11H9v1h5Z" style="fill:#009688"/><line x1="2.5" y1="1.5" x2="12.5" y2="1.5" style="fill:none;stroke:#949494;stroke-linecap:round;stroke-linejoin:round;opacity:0.5"/><path d="M1.541,12.5A12,12,0,0,1,12.5,1.541" style="fill:none;stroke:#009688;stroke-linecap:round;stroke-linejoin:round"/><rect x="12.5" y="0.5" width="2" height="2" style="fill:none;stroke:#949494;stroke-linecap:round;stroke-linejoin:round"/><rect x="0.5" y="12.5" width="2" height="2" style="fill:none;stroke:#949494;stroke-linecap:round;stroke-linejoin:round"/><circle cx="1.5" cy="1.5" r="1.5" style="fill:#949494"/></svg>
Side by Side

After

Width:  |  Height:  |  Size: 739 B

1
resources/images/svg_part.svg Normal file
View File

@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path d="M15,11.5A3.5,3.5,0,1,1,11.5,8,3.5,3.5,0,0,1,15,11.5ZM14,11H12V9H11v2H9v1h2v2h1V12h2Z" style="fill:#009688"/><line x1="2.5" y1="1.5" x2="12.5" y2="1.5" style="fill:none;stroke:#949494;stroke-linecap:round;stroke-linejoin:round;opacity:0.5"/><path d="M1.541,12.5A12,12,0,0,1,12.5,1.541" style="fill:none;stroke:#009688;stroke-linecap:round;stroke-linejoin:round"/><rect x="12.5" y="0.5" width="2" height="2" style="fill:none;stroke:#949494;stroke-linecap:round;stroke-linejoin:round"/><rect x="0.5" y="12.5" width="2" height="2" style="fill:none;stroke:#949494;stroke-linecap:round;stroke-linejoin:round"/><circle cx="1.5" cy="1.5" r="1.5" style="fill:#949494"/></svg>
Side by Side

After

Width:  |  Height:  |  Size: 758 B

1
resources/images/text_bake.svg Normal file
View File

@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path d="M6.5,14.5c-3,0-5-1-5-4,0-5,6-5,4-10,7,2,9,6,9,9,0,4-3,5-6,5" style="fill:none;stroke:#949494;stroke-linecap:round;stroke-linejoin:round"/><path d="M6.5,12.5a2.151,2.151,0,0,1-2-2c0-2,1-2,2-3,0,1,0,2,1,2s3-2,1-5c3,2,3,3,3,5a2.652,2.652,0,0,1-3,3" style="fill:none;stroke:#009688;stroke-linecap:round;stroke-linejoin:round"/></svg>
Side by Side

After

Width:  |  Height:  |  Size: 421 B

1
resources/images/text_lock_closed.svg Normal file
View File

@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><rect x="2.5" y="7.5" width="10" height="7" rx="1" style="fill:none;stroke:#009688;stroke-linecap:round;stroke-linejoin:round"/><path d="M3.5,7.5v-3a4,4,0,0,1,8,0v3" style="fill:none;stroke:#009688;stroke-linecap:round;stroke-linejoin:round"/></svg>
Side by Side

After

Width:  |  Height:  |  Size: 332 B

1
resources/images/text_lock_open.svg Normal file
View File

@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><rect x="2.5" y="7.5" width="10" height="7" rx="1" style="fill:none;stroke:#949494;stroke-linecap:round;stroke-linejoin:round"/><path d="M11.5,7.5v-3a4,4,0,0,0-7.874-1" style="fill:none;stroke:#949494;stroke-linecap:round;stroke-linejoin:round"/></svg>
Side by Side

After

Width:  |  Height:  |  Size: 335 B

1
resources/images/text_obj_warning.svg Normal file
View File

@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path d="M7.159.511l-7.034,13A1,1,0,0,0,.966,15H15.034a1,1,0,0,0,.841-1.494L8.841.511A.948.948,0,0,0,7.159.511Z" style="fill:#ff6f00"/><rect x="7" y="4" width="2" height="6" rx="1" style="fill:#fff"/><rect x="7" y="11" width="2" height="2" rx="1" style="fill:#fff"/></svg>
Side by Side

After

Width:  |  Height:  |  Size: 355 B

1
resources/images/text_open.svg Normal file
View File

@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path d="M14.5,8.5v5a1,1,0,0,1-1,1H1.5a1,1,0,0,1-1-1V1.5a1,1,0,0,1,1-1h5" style="fill:none;stroke:#949494;stroke-linecap:round;stroke-linejoin:round"/><line x1="14.5" y1="0.5" x2="4.5" y2="10.5" style="fill:none;stroke:#009688;stroke-linecap:round;stroke-linejoin:round"/><line x1="14.5" y1="5.5" x2="14.5" y2="0.5" style="fill:none;stroke:#009688;stroke-linecap:round;stroke-linejoin:round"/><line x1="9.5" y1="0.5" x2="14.5" y2="0.5" style="fill:none;stroke:#009688;stroke-linecap:round;stroke-linejoin:round"/></svg>
Side by Side

After

Width:  |  Height:  |  Size: 602 B

1
resources/images/text_reflection_x.svg Normal file
View File

@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><rect x="7" width="1" height="3" style="fill:#009688"/><rect x="7" y="12" width="1" height="3" style="fill:#009688"/><rect x="7" y="10" width="1" height="1" style="fill:#009688"/><rect x="7" y="4" width="1" height="1" style="fill:#009688"/><rect x="7" y="6" width="1" height="3" style="fill:#009688"/><polygon points="0.5 14.5 1.5 14.5 5.5 7.5 1.5 0.5 0.5 0.5 0.5 14.5" style="fill:none;stroke:#949494;stroke-linecap:round;stroke-linejoin:round"/><polygon points="9.5 7.5 13.5 14.5 14.5 14.5 14.5 0.5 13.5 0.5 9.5 7.5" style="fill:none;stroke:#009688;stroke-linecap:round;stroke-linejoin:round"/></svg>
Side by Side

After

Width:  |  Height:  |  Size: 685 B

1
resources/images/text_reflection_y.svg Normal file
View File

@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><rect x="13" y="6" width="1" height="3" transform="translate(21 -6) rotate(90)" style="fill:#009688"/><rect x="1" y="6" width="1" height="3" transform="translate(9 6) rotate(90)" style="fill:#009688"/><rect x="4" y="7" width="1" height="1" transform="translate(12 3) rotate(90)" style="fill:#009688"/><rect x="10" y="7" width="1" height="1" transform="translate(18 -3) rotate(90)" style="fill:#009688"/><rect x="7" y="6" width="1" height="3" transform="translate(15 0) rotate(90)" style="fill:#009688"/><polygon points="0.5 0.5 0.5 1.5 7.5 5.5 14.5 1.5 14.5 0.5 0.5 0.5" style="fill:none;stroke:#949494;stroke-linecap:round;stroke-linejoin:round"/><polygon points="7.5 9.5 0.5 13.5 0.5 14.5 14.5 14.5 14.5 13.5 7.5 9.5" style="fill:none;stroke:#009688;stroke-linecap:round;stroke-linejoin:round"/></svg>
Side by Side

After

Width:  |  Height:  |  Size: 886 B

1
resources/images/text_refresh.svg Normal file
View File

@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><polyline points="0.5 0.5 0.5 4.5 4.5 4.5" style="fill:none;stroke:#009688;stroke-linecap:round;stroke-linejoin:round"/><polyline points="14.5 14.5 14.5 10.5 10.5 10.5" style="fill:none;stroke:#009688;stroke-linecap:round;stroke-linejoin:round"/><path d="M14.5,7.5a7,7,0,0,0-13.326-3" style="fill:none;stroke:#009688;stroke-linecap:round;stroke-linejoin:round"/><path d="M.5,7.5a7,7,0,0,0,13.326,3" style="fill:none;stroke:#009688;stroke-linecap:round;stroke-linejoin:round"/></svg>
Side by Side

After

Width:  |  Height:  |  Size: 565 B

1
resources/images/text_save.svg Normal file
View File

@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path d="M.5,13.5V1.5a1,1,0,0,1,1-1h10l3,3v10a1,1,0,0,1-1,1H1.5A1,1,0,0,1,.5,13.5Zm4-12v1a1,1,0,0,0,1,1h4a1,1,0,0,0,1-1v-1m1,12v-3a1,1,0,0,0-1-1h-6a1,1,0,0,0-1,1v3" style="fill:none;stroke:#949494;stroke-linecap:square;stroke-linejoin:round;opacity:1"/></svg>
Side by Side

After

Width:  |  Height:  |  Size: 342 B

1
resources/images/text_undo.svg Normal file
View File

@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path d="M13.914,6.45A6.5,6.5,0,0,0,2,4.044V1.5a.5.5,0,0,0-1,0v4a.5.5,0,0,0,.5.5h4a.5.5,0,0,0,0-1H2.612a5.477,5.477,0,1,1-.54,3.388.5.5,0,1,0-.987.162,6.5,6.5,0,0,0,11.693,2.743A6.459,6.459,0,0,0,13.914,6.45Z" style="fill:#ff6f00"/></svg>
Side by Side

After

Width:  |  Height:  |  Size: 321 B

19
resources/images/toolbar_brimears.svg Normal file
View File

File diff suppressed because one or more lines are too long
Side by Side

After

Width:  |  Height:  |  Size: 194 KiB

19
resources/images/toolbar_brimears_dark.svg Normal file
View File

File diff suppressed because one or more lines are too long
Side by Side

After

Width:  |  Height:  |  Size: 149 KiB

5
resources/images/toolbar_reset_zero.svg Normal file
View File

@@ -0,0 +1,5 @@
<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M10.6457 7C10.5448 7 10.4602 6.9247 10.4433 6.82524C10.1226 4.93741 8.47917 3.5 6.5 3.5C4.29086 3.5 2.5 5.29086 2.5 7.5C2.5 9.47929 3.93759 11.1228 5.82559 11.4434C5.92506 11.4603 6.00037 11.5448 6.00037 11.6457V12.7588C6.00037 12.8763 5.89925 12.9688 5.7827 12.9536C3.08405 12.6022 1 10.2945 1 7.5C1 4.46243 3.46243 2 6.5 2C9.29433 2 11.6019 4.08386 11.9536 6.78232C11.9688 6.89888 11.8763 7 11.7587 7H10.6457Z" fill="#FF6F00"/>
<path d="M11.1649 9.76271C11.0854 9.87751 10.9156 9.87751 10.8361 9.76271L8.61993 6.5639C8.52803 6.43126 8.62296 6.25 8.78433 6.25H13.2167C13.3781 6.25 13.473 6.43126 13.3811 6.5639L11.1649 9.76271Z" fill="#FF6F00"/>
<path d="M8.38678 7.61146C8.38678 8.48963 8.22064 9.15893 7.88836 9.61938C7.56082 10.0798 7.09326 10.31 6.48566 10.31C5.87807 10.31 5.40576 10.0822 5.06873 9.6265C4.73645 9.16605 4.57031 8.49438 4.57031 7.61146C4.57031 6.72855 4.73645 6.05687 5.06873 5.59643C5.40576 5.13598 5.87807 4.90576 6.48566 4.90576C7.09326 4.90576 7.56082 5.13598 7.88836 5.59643C8.22064 6.05687 8.38678 6.72855 8.38678 7.61146ZM5.85908 7.61146C5.85908 8.14786 5.90892 8.54659 6.00861 8.80767C6.11304 9.06874 6.27206 9.19928 6.48566 9.19928C6.69453 9.19928 6.8488 9.06874 6.94848 8.80767C7.04817 8.54184 7.09801 8.14311 7.09801 7.61146C7.09801 7.07982 7.04817 6.68346 6.94848 6.42238C6.8488 6.15656 6.69453 6.02364 6.48566 6.02364C6.27206 6.02364 6.11304 6.15181 6.00861 6.40814C5.90892 6.66447 5.85908 7.06558 5.85908 7.61146Z" fill="#FF6F00"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

4
resources/images/toolbar_reset_zero_hover.svg Normal file
View File

@@ -0,0 +1,4 @@
<svg width="14" height="15" viewBox="0 0 14 15" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M10.2937 5.6687C9.71589 3.84914 8.01293 2.53076 6.00204 2.53076C3.51563 2.53076 1.5 4.54639 1.5 7.0328C1.5 9.27369 3.13722 11.1322 5.28073 11.4774C5.38062 11.4935 5.4564 11.5783 5.4564 11.6794V12.7916C5.4564 12.9091 5.35522 13.0016 5.23861 12.9868C2.28425 12.6118 0 10.0891 0 7.0328C0 3.71797 2.68721 1.03076 6.00204 1.03076C8.84765 1.03076 11.2307 3.01105 11.8484 5.6687H13.3662C13.5275 5.6687 13.6225 5.84996 13.5306 5.9826L11.0772 9.52371C10.9977 9.63851 10.8279 9.63851 10.7484 9.52371L8.29505 5.9826C8.20315 5.84996 8.29808 5.6687 8.45945 5.6687H10.2937Z" fill="#FF6F00"/>
<path d="M7.99414 7.03451C7.99414 7.96884 7.81738 8.68095 7.46384 9.17084C7.11537 9.66073 6.6179 9.90568 5.97144 9.90568C5.32499 9.90568 4.82247 9.66326 4.46389 9.17842C4.11036 8.68852 3.93359 7.97389 3.93359 7.03451C3.93359 6.09513 4.11036 5.38049 4.46389 4.8906C4.82247 4.40071 5.32499 4.15576 5.97144 4.15576C6.6179 4.15576 7.11537 4.40071 7.46384 4.8906C7.81738 5.38049 7.99414 6.09513 7.99414 7.03451ZM5.30479 7.03451C5.30479 7.60521 5.35782 8.02944 5.46387 8.30722C5.57498 8.58499 5.74417 8.72388 5.97144 8.72388C6.19366 8.72388 6.3578 8.58499 6.46386 8.30722C6.56992 8.02439 6.62295 7.60016 6.62295 7.03451C6.62295 6.46886 6.56992 6.04715 6.46386 5.76937C6.3578 5.48655 6.19366 5.34514 5.97144 5.34514C5.74417 5.34514 5.57498 5.4815 5.46387 5.75422C5.35782 6.02695 5.30479 6.45371 5.30479 7.03451Z" fill="#FF6F00"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
resources/model/double_tear_romboid_cylinder.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.7 KiB

BIN
resources/model/double_tear_romboid_cylinder.stl Normal file
View File

Binary file not shown.

6
resources/printers/filaments_blacklist.json
View File

@@ -9,7 +9,7 @@
"description": "TPU: not supported" "description": "TPU: not supported"
}, },
{ {
"vendor": "QIDIlab", "vendor": "QIDITech",
"type": "TPU", "type": "TPU",
"action": "prohibition", "action": "prohibition",
"description": "TPU: not supported" "description": "TPU: not supported"
@@ -45,13 +45,13 @@
"description": "CF/GF: hard and brittle" "description": "CF/GF: hard and brittle"
}, },
{ {
"vendor": "QIDIlab", "vendor": "QIDITech",
"type": "PET-CF", "type": "PET-CF",
"action": "prohibition", "action": "prohibition",
"description": "QIDI PET-CF/PA6-CF: not supported" "description": "QIDI PET-CF/PA6-CF: not supported"
}, },
{ {
"vendor": "QIDIlab", "vendor": "QIDITech",
"type": "PA6-CF", "type": "PA6-CF",
"action": "prohibition", "action": "prohibition",
"description": "QIDI PET-CF/PA6-CF: not supported" "description": "QIDI PET-CF/PA6-CF: not supported"

0
resources/shaders/flat.fs → resources/shaders/110/flat.fs
View File

0
resources/shaders/flat.vs → resources/shaders/110/flat.vs
View File

12
resources/shaders/110/flat_instance.vs Normal file
View File

@@ -0,0 +1,12 @@
#version 110
uniform mat4 view_matrix;
uniform mat4 projection_matrix;
attribute vec3 v_position;
attribute vec2 v_undefine;
attribute mat4 instanceMatrix;
void main()
{
gl_Position = projection_matrix * view_matrix * instanceMatrix * vec4(v_position, 1.0);
}

10
resources/shaders/printbed.fs → resources/shaders/110/printbed.fs
View File

@@ -1,21 +1,21 @@
#version 110 #version 110
const vec3 back_color_dark = vec3(0.235, 0.235, 0.235); const vec3 back_color_dark = vec3(0.235, 0.235, 0.235);
const vec3 back_color_light = vec3(0.365, 0.365, 0.365); const vec3 back_color_light = vec3(0.365, 0.365, 0.365);
uniform sampler2D texture; uniform sampler2D texture;
uniform bool transparent_background; uniform bool transparent_background;
uniform bool svg_source; uniform bool svg_source;
varying vec2 tex_coords; varying vec2 tex_coord;
vec4 svg_color() vec4 svg_color()
{ {
// takes foreground from texture // takes foreground from texture
vec4 fore_color = texture2D(texture, tex_coords); vec4 fore_color = texture2D(texture, tex_coord);
// calculates radial gradient // calculates radial gradient
vec3 back_color = vec3(mix(back_color_light, back_color_dark, smoothstep(0.0, 0.5, length(abs(tex_coords.xy) - vec2(0.5))))); vec3 back_color = vec3(mix(back_color_light, back_color_dark, smoothstep(0.0, 0.5, length(abs(tex_coord.xy) - vec2(0.5)))));
// blends foreground with background // blends foreground with background
return vec4(mix(back_color, fore_color.rgb, fore_color.a), transparent_background ? fore_color.a : 1.0); return vec4(mix(back_color, fore_color.rgb, fore_color.a), transparent_background ? fore_color.a : 1.0);
@@ -24,7 +24,7 @@ vec4 svg_color()
vec4 non_svg_color() vec4 non_svg_color()
{ {
// takes foreground from texture // takes foreground from texture
vec4 color = texture2D(texture, tex_coords); vec4 color = texture2D(texture, tex_coord);
return vec4(color.rgb, transparent_background ? color.a * 0.25 : color.a); return vec4(color.rgb, transparent_background ? color.a * 0.25 : color.a);
} }

15
resources/shaders/110/printbed.vs Normal file
View File

@@ -0,0 +1,15 @@
#version 110
uniform mat4 view_model_matrix;
uniform mat4 projection_matrix;
attribute vec3 v_position;
attribute vec2 v_tex_coord;
varying vec2 tex_coord;
void main()
{
tex_coord = v_tex_coord;
gl_Position = projection_matrix * view_model_matrix * vec4(v_position, 1.0);
}

14
resources/shaders/printbed.vs
View File

@@ -1,14 +0,0 @@
#version 110
attribute vec3 v_position;
attribute vec2 v_tex_coords;
varying vec2 tex_coords;
void main()
{
gl_Position = gl_ModelViewProjectionMatrix * vec4(v_position.x, v_position.y, v_position.z, 1.0);
// the following line leads to crash on some Intel graphics card
//gl_Position = gl_ModelViewProjectionMatrix * vec4(v_position, 1.0);
tex_coords = v_tex_coords;
}

298
resources/web/data/text.js
View File

@@ -34,7 +34,7 @@ var LangText={
"t32": "Create new project", "t32": "Create new project",
"t33": "Open Project", "t33": "Open Project",
"t34": "hotspot", "t34": "hotspot",
"t35": "Recently opened", "t35": "Recently Opened",
"t36": "ok", "t36": "ok",
"t37": "At least one printer must be selected.", "t37": "At least one printer must be selected.",
"t38": "Cancel", "t38": "Cancel",
@@ -107,10 +107,18 @@ var LangText={
"t113":"You may change your choice in preference anytime.", "t113":"You may change your choice in preference anytime.",
"t114":"Home", "t114":"Home",
"t115":"Batch", "t115":"Batch",
"t116":"Retry", "t116": "Retry",
"t117":"Connect Device", "t117": "Print History",
"t118":"Please set up your printer connection to view the device.", "t118": "Printing",
"t119":"Please use the QIDI Link APP to connect to your printer. Once the link is completed, the online device will be synced to the \"Link\" page." "t119": "Success",
"t120": "Canceled",
"t121": "Search",
"t122": "Search online models",
"t123": "Plate",
"t124": "",
"t201":"Connect Device",
"t202":"Please set up your printer connection to view the device.",
"t203":"Please use the QIDI Link APP to connect to your printer. Once the link is completed, the online device will be synced to the \"Link\" page."
}, },
"zh_CN": { "zh_CN": {
"t1": "欢迎使用QIDI Studio", "t1": "欢迎使用QIDI Studio",
@@ -221,9 +229,17 @@ var LangText={
"t114":"首页", "t114":"首页",
"t115":"批量处理", "t115":"批量处理",
"t116": "重试", "t116": "重试",
"t117": "设备连接", "t117": "打印历史",
"t118":"请设置您的打印机连接以查看设备。", "t118": "正在打印",
"t119":"请使用 QIDI Link APP 连接您的打印机。链接完成后，在线设备将同步到 “Link” 页面。", "t119": "成功",
"t120": "已取消",
"t121": "搜索",
"t122": "搜索在线模型",
"t123": "第",
"t124": " 盘",
"t201": "设备连接",
"t202":"请设置您的打印机连接以查看设备。",
"t203":"请使用 QIDI Link APP 连接您的打印机。链接完成后，在线设备将同步到 “Link” 页面。",
"wk1": "快速入门指南", "wk1": "快速入门指南",
"wk2": "本文介绍了QIDI Studio的最基本用法。它指导用户配置软件，创建项目，并逐步完成第一个打印任务。", "wk2": "本文介绍了QIDI Studio的最基本用法。它指导用户配置软件，创建项目，并逐步完成第一个打印任务。",
"wk3": "基于项目的工作流", "wk3": "基于项目的工作流",
@@ -288,7 +304,7 @@ var LangText={
"t50": "サインアウト", "t50": "サインアウト",
"t52": "スキップ", "t52": "スキップ",
"t53": "参加する", "t53": "参加する",
"t54": "3Dプリンティングのコミュニティで、私たちはお互いの成功例と失敗例から色々勉強してきています。QIDI Labもそうと考えています、AIでユーザの実世界の経験から勉強し、造型の性能を向上しにいきたいと思います。あなたの経験は私たちにとって大切なので、私たちの「ユーザ体験向上プログラム」を参加してみませんか？「参加」する場合、エラーログや使用ログから情報をQIDI Labと共有します、具体的な項目は", "t54": "3Dプリンティングのコミュニティで、私たちはお互いの成功例と失敗例から色々勉強してきています。QIDI Techもそうと考えています、AIでユーザの実世界の経験から勉強し、造型の性能を向上しにいきたいと思います。あなたの経験は私たちにとって大切なので、私たちの「ユーザ体験向上プログラム」を参加してみませんか？「参加」する場合、エラーログや使用ログから情報をQIDI Techと共有します、具体的な項目は",
"t55": "プライバシーポリシー", "t55": "プライバシーポリシー",
"t56": "をご参照ください。個人情報は一切共有しませんのでご安心ください。", "t56": "をご参照ください。個人情報は一切共有しませんのでご安心ください。",
"t57": "", "t57": "",
@@ -350,9 +366,17 @@ var LangText={
"t114":"トップページ", "t114":"トップページ",
"t115":"バッチ", "t115":"バッチ",
"t116": "[再試行]", "t116": "[再試行]",
"t117": "デバイスを接続", "t117": "印刷履歴",
"t118": "デバイスを表示するには、プリンター接続を設定してください。", "t118": "印刷中",
"t119": "プリンターに接続するには、QIDI Linkアプリを使用してください。リンクが完了すると、オンラインデバイスが「リンク」ページに同期されます。" "t119": "成功",
"t120": "キャンセルされた",
"t121": "検索",
"t122": "オンラインモデルを検索する",
"t123": "シート材",
"t124": "" ,
"t201": "デバイスを接続",
"t202": "デバイスを表示するには、プリンター接続を設定してください。",
"t203": "プリンターに接続するには、QIDI Linkアプリを使用してください。リンクが完了すると、オンラインデバイスが「リンク」ページに同期されます。"
}, },
"it_IT": { "it_IT": {
"t1": "Benvenuti allo Studio QIDI", "t1": "Benvenuti allo Studio QIDI",
@@ -462,10 +486,18 @@ var LangText={
"t113":"Puoi cambiare la tua scelta in qualsiasi momento.", "t113":"Puoi cambiare la tua scelta in qualsiasi momento.",
"t114":"Home", "t114":"Home",
"t115":"Lotto", "t115":"Lotto",
"t116":"Riprova", "t116": "Riprova",
"t117": "Collega dispositivo", "t117": "Storico di stampa",
"t118": "Si prega di configurare la connessione della stampante per visualizzare il dispositivo.", "t118": "Stampa in corso",
"t119": "Si prega di utilizzare l'app QIDI Link per connettersi alla stampante. Una volta completato il collegamento, il dispositivo online verrà sincronizzato nella pagina \"Link\"." "t119": "Successo",
"t120": "annullato",
"t121": "Ricerca",
"t122": "Cerca modelli online",
"t123": "piatto",
"t124": "" ,
"t201": "Collega dispositivo",
"t202": "Si prega di configurare la connessione della stampante per visualizzare il dispositivo.",
"t203": "Si prega di utilizzare l'app QIDI Link per connettersi alla stampante. Una volta completato il collegamento, il dispositivo online verrà sincronizzato nella pagina \"Link\"."
}, },
"fr_FR": { "fr_FR": {
"t1": "Bienvenue chez QIDI Studio", "t1": "Bienvenue chez QIDI Studio",
@@ -575,10 +607,18 @@ var LangText={
"t113":"Vous pouvez modifier vos préférences à tout moment.", "t113":"Vous pouvez modifier vos préférences à tout moment.",
"t114":"Accueil", "t114":"Accueil",
"t115":"Un lot de", "t115":"Un lot de",
"t116":"Retenter", "t116": "Retenter",
"t117": "Connecter l'appareil", "t117": "Historique d'impression",
"t118": "Veuillez configurer la connexion de votre imprimante pour voir l'appareil.", "t118": "Impression en cours",
"t119": "Veuillez utiliser l'application QIDI Link pour vous connecter à votre imprimante. Une fois le lien terminé, l'appareil en ligne sera synchronisé sur la page \"Lien\"." "t119": "Succès",
"t120": "annulé",
"t121": "Recherche",
"t122": "Rechercher des modèles en ligne",
"t123": "assiette",
"t124": "",
"t201": "Connecter l'appareil",
"t202": "Veuillez configurer la connexion de votre imprimante pour voir l'appareil.",
"t203": "Veuillez utiliser l'application QIDI Link pour vous connecter à votre imprimante. Une fois le lien terminé, l'appareil en ligne sera synchronisé sur la page \"Lien\"."
}, },
"de_DE": { "de_DE": {
"t1": "Willkommen im QIDI Studio", "t1": "Willkommen im QIDI Studio",
@@ -688,10 +728,18 @@ var LangText={
"t113":"Sie können Ihre Wahl jederzeit ändern.", "t113":"Sie können Ihre Wahl jederzeit ändern.",
"t114":"Startseite", "t114":"Startseite",
"t115":"Charge", "t115":"Charge",
"t116":"Erneut versuchen", "t116": "Erneut versuchen",
"t117": "Gerät verbinden", "t117": "Druckverlauf",
"t118": "Bitte richten Sie die Druckerverbindung ein, um das Gerät anzuzeigen.", "t118": "Wird gedruckt",
"t119": "Bitte verwenden Sie die QIDI Link App, um sich mit Ihrem Drucker zu verbinden. Sobald die Verbindung hergestellt ist, wird das Online-Gerät auf der Seite \"Link\" synchronisiert." "t119": "Erfolg",
"t120": "storniert",
"t121": "Suche",
"t122": "Suche Online-Modelle",
"t123": "Teller",
"t124": "",
"t201": "Gerät verbinden",
"t202": "Bitte richten Sie die Druckerverbindung ein, um das Gerät anzuzeigen.",
"t203": "Bitte verwenden Sie die QIDI Link App, um sich mit Ihrem Drucker zu verbinden. Sobald die Verbindung hergestellt ist, wird das Online-Gerät auf der Seite \"Link\" synchronisiert."
}, },
"hu_HU": { "hu_HU": {
"t1": "Üdvözöljük a QIDI Stúdióban", "t1": "Üdvözöljük a QIDI Stúdióban",
@@ -801,10 +849,18 @@ var LangText={
"t113":"Bármikor megváltoztathatja a preferenciáját.", "t113":"Bármikor megváltoztathatja a preferenciáját.",
"t114":"honlap", "t114":"honlap",
"t115":"Tétel", "t115":"Tétel",
"t116":"Újrapróbálkozás", "t116": "Újrapróbálkozás",
"t117": "Eszköz csatlakoztatása", "t117": "Nyomtatási előzmények",
"t118": "Kérjük, állítsa be a nyomtató kapcsolatát az eszköz megtekintéséhez.", "t118": "Nyomtatás folyamatban",
"t119": "Kérjük, használja a QIDI Link alkalmazást a nyomtatóhoz való csatlakozáshoz. Miután a kapcsolat létrejött, az online eszköz szinkronizálódik a „Link” oldalon." "t119": "Siker",
"t120": "törölt",
"t121": "Keresés",
"t122": "Online modellek keresése",
"t123": "tányér",
"t124": "",
"t201": "Eszköz csatlakoztatása",
"t202": "Kérjük, állítsa be a nyomtató kapcsolatát az eszköz megtekintéséhez.",
"t203": "Kérjük, használja a QIDI Link alkalmazást a nyomtatóhoz való csatlakozáshoz. Miután a kapcsolat létrejött, az online eszköz szinkronizálódik a „Link” oldalon."
}, },
"es_ES": { "es_ES": {
"t1": "Bienvenido a QIDI Studio", "t1": "Bienvenido a QIDI Studio",
@@ -914,10 +970,18 @@ var LangText={
"t113":"Puede cambiar sus preferencias en cualquier momento.", "t113":"Puede cambiar sus preferencias en cualquier momento.",
"t114":"Página de inicio", "t114":"Página de inicio",
"t115":"Un lote", "t115":"Un lote",
"t116":"Reintentar", "t116": "Reintentar",
"t117": "Conectar dispositivo", "t117": "Historial de impresión",
"t118": "Por favor, configure la conexión de su impresora para ver el dispositivo.", "t118": "Imprimiendo",
"t119": "Por favor, use la aplicación QIDI Link para conectarse a su impresora. Una vez completado el enlace, el dispositivo en línea se sincronizará en la página \"Enlace\"." "t119": "Éxito",
"t120": "cancelado",
"t121": "Búsqueda",
"t122": "Buscar modelos en línea",
"t123": "plato",
"t124": "",
"t201": "Conectar dispositivo",
"t202": "Por favor, configure la conexión de su impresora para ver el dispositivo.",
"t203": "Por favor, use la aplicación QIDI Link para conectarse a su impresora. Una vez completado el enlace, el dispositivo en línea se sincronizará en la página \"Enlace\"."
}, },
"sv_SE": { "sv_SE": {
"t1": "Välkommen till QIDI Studio", "t1": "Välkommen till QIDI Studio",
@@ -1027,10 +1091,18 @@ var LangText={
"t113":"Du kan ändra ditt val när som helst.", "t113":"Du kan ändra ditt val när som helst.",
"t114":"startsida", "t114":"startsida",
"t115":"Batch", "t115":"Batch",
"t116":"Försök igen", "t116": "Försök igen",
"t117": "Anslut enhet", "t117": "Utskriftshistorik",
"t118": "Vänligen ställ in din skrivarkoppling för att se enheten.", "t118": "Skrivs ut",
"t119": "Använd QIDI Link-appen för att ansluta till din skrivare. När länken är klar kommer den online-enheten att synkroniseras till \"Länk\"-sidan." "t119": "Lyckad",
"t120": "avbruten",
"t121": "Sök",
"t122": "Sök online-modeller",
"t123": "fat",
"t124": "",
"t201": "Anslut enhet",
"t202": "Vänligen ställ in din skrivarkoppling för att se enheten.",
"t203": "Använd QIDI Link-appen för att ansluta till din skrivare. När länken är klar kommer den online-enheten att synkroniseras till \"Länk\"-sidan."
}, },
"cs_CZ": { "cs_CZ": {
"t1": "Vítejte v QIDI Studio", "t1": "Vítejte v QIDI Studio",
@@ -1140,10 +1212,18 @@ var LangText={
"t113":"Své preference můžete kdykoliv změnit.", "t113":"Své preference můžete kdykoliv změnit.",
"t114":"domovská stránka", "t114":"domovská stránka",
"t115":"Šarže", "t115":"Šarže",
"t116":"Zkuste to znovu", "t116": "Zkuste to znovu",
"t117": "Připojit zařízení", "t117": "Historie tisku",
"t118": "Nastavte prosím připojení tiskárny, abyste mohli zobrazit zařízení.", "t118": "Tisk probíhá",
"t119": "Použijte prosím aplikaci QIDI Link k připojení k tiskárně. Jakmile bude spojení dokončeno, online zařízení bude synchronizováno na stránce \"Odkaz\"." "t119": "Úspěch",
"t120": "zrušený",
"t121": "Hledat",
"t122": "Hledat online modely",
"t123": "talíř",
"t124": "",
"t201": "Připojit zařízení",
"t202": "Nastavte prosím připojení tiskárny, abyste mohli zobrazit zařízení.",
"t203": "Použijte prosím aplikaci QIDI Link k připojení k tiskárně. Jakmile bude spojení dokončeno, online zařízení bude synchronizováno na stránce \"Odkaz\"."
}, },
"nl_NL": { "nl_NL": {
"t1": "Welkom bij QIDI Studio", "t1": "Welkom bij QIDI Studio",
@@ -1253,10 +1333,18 @@ var LangText={
"t113":"U kunt uw keuze op elk gewenst moment wijzigen.", "t113":"U kunt uw keuze op elk gewenst moment wijzigen.",
"t114":"startpagina", "t114":"startpagina",
"t115":"Batch", "t115":"Batch",
"t116":"Probeer het opnieuw", "t116": "Probeer het opnieuw",
"t117": "Apparaat verbinden", "t117": "Afdrukhistoriek",
"t118": "Stel de printerverbinding in om het apparaat te bekijken.", "t118": "Aan het printen",
"t119": "Gebruik de QIDI Link-app om verbinding te maken met uw printer. Zodra de koppeling is voltooid, wordt het online apparaat gesynchroniseerd op de pagina \"Link\"." "t119": "Succes",
"t120": "geannuleerd",
"t121": "Zoeken",
"t122": "Zoek online modellen",
"t123": "bord",
"t124": "",
"t201": "Apparaat verbinden",
"t202": "Stel de printerverbinding in om het apparaat te bekijken.",
"t203": "Gebruik de QIDI Link-app om verbinding te maken met uw printer. Zodra de koppeling is voltooid, wordt het online apparaat gesynchroniseerd op de pagina \"Link\"."
}, },
"uk_UA": { "uk_UA": {
"t1": "Вітаємо в QIDI Studio!", "t1": "Вітаємо в QIDI Studio!",
@@ -1367,9 +1455,17 @@ var LangText={
"t114": "Головна сторінка", "t114": "Головна сторінка",
"t115": "Одна партія", "t115": "Одна партія",
"t116": "Спробувати знову", "t116": "Спробувати знову",
"t117": "Підключити пристрій", "t117": "Історія друку",
"t118": "Будь ласка, налаштуйте підключення принтера, щоб переглянути пристрій.", "t118": "Друкується",
"t119": "Будь ласка, використовуйте додаток QIDI Link для підключення до вашого принтера. Після завершення підключення онлайн-пристрій буде синхронізовано на сторінці \"Посилання\"." "t119": "Успіх",
"t120": "скасований",
"t121": "Пошук",
"t122": "Пошук онлайн-моделей",
"t123": "тарілка",
"t124": "",
"t201": "Підключити пристрій",
"t202": "Будь ласка, налаштуйте підключення принтера, щоб переглянути пристрій.",
"t203": "Будь ласка, використовуйте додаток QIDI Link для підключення до вашого принтера. Після завершення підключення онлайн-пристрій буде синхронізовано на сторінці \"Посилання\"."
}, },
"ru_RU": { "ru_RU": {
"t1": "Приветствуем в QIDI Studio!", "t1": "Приветствуем в QIDI Studio!",
@@ -1479,10 +1575,18 @@ var LangText={
"t113":"Вы можете изменить свои предпочтения в любое время.", "t113":"Вы можете изменить свои предпочтения в любое время.",
"t114":"Главная страница", "t114":"Главная страница",
"t115":"Одна партия", "t115":"Одна партия",
"t116":"Повторить попытку", "t116": "Повторить попытку",
"t117": "Подключить устройство", "t117": "История печати",
"t118": "Пожалуйста, настройте подключение принтера, чтобы просмотреть устройство.", "t118": "Печатается",
"t119": "Пожалуйста, используйте приложение QIDI Link для подключения к вашему принтеру. После завершения подключения онлайн-устройство будет синхронизировано на странице \"Ссылка\"." "t119": "Успех",
"t120": "отмененный",
"t121": "Поиск",
"t122": "Поиск онлайн-моделей",
"t123": "тарелка",
"t124": "",
"t201": "Подключить устройство",
"t202": "Пожалуйста, настройте подключение принтера, чтобы просмотреть устройство.",
"t203": "Пожалуйста, используйте приложение QIDI Link для подключения к вашему принтеру. После завершения подключения онлайн-устройство будет синхронизировано на странице \"Ссылка\"."
}, },
"tr_TR": { "tr_TR": {
"t1": "QIDI Stüdyo'ya Hoş Geldiniz", "t1": "QIDI Stüdyo'ya Hoş Geldiniz",
@@ -1592,10 +1696,18 @@ var LangText={
"t113":"ercihlerinizde istediğiniz zaman seçiminizi değiştirebilirsiniz.", "t113":"ercihlerinizde istediğiniz zaman seçiminizi değiştirebilirsiniz.",
"t114":"Ana Sayfa", "t114":"Ana Sayfa",
"t115":"Toplu", "t115":"Toplu",
"t116":"Yeniden Dene", "t116": "Yeniden Dene",
"t117": "Cihazı Bağla", "t117": "Yazdırma geçmişi",
"t118": "Cihazı görüntülemek için lütfen yazıcı bağlantınızı ayarlayın.", "t118": "Yazdırılıyor",
"t119": "Yazıcınıza bağlanmak için lütfen QIDI Link uygulamasını kullanın. Bağlantı tamamlandığında, çevrimiçi cihaz \"Bağlantı\" sayfasına senkronize edilecektir." "t119": "Başarılı",
"t120": "iptal edildi",
"t121": "Arama",
"t122": "Çevrimiçi modelleri arayın",
"t123": "tabak",
"t124": "",
"t201": "Cihazı Bağla",
"t202": "Cihazı görüntülemek için lütfen yazıcı bağlantınızı ayarlayın.",
"t203": "Yazıcınıza bağlanmak için lütfen QIDI Link uygulamasını kullanın. Bağlantı tamamlandığında, çevrimiçi cihaz \"Bağlantı\" sayfasına senkronize edilecektir."
}, },
"pt_BR": { "pt_BR": {
"t1": "Bem-vindo ao QIDI Studio", "t1": "Bem-vindo ao QIDI Studio",
@@ -1705,10 +1817,18 @@ var LangText={
"t113":"Você pode alterar sua escolha nas Preferências a qualquer momento", "t113":"Você pode alterar sua escolha nas Preferências a qualquer momento",
"t114":"Inicio", "t114":"Inicio",
"t115":"Lote", "t115":"Lote",
"t116":"Retentar", "t116": "Retentar",
"t117": "Conectar Dispositivo", "t117": "Histórico de impressão",
"t118": "Por favor, configure a conexão da sua impressora para visualizar o dispositivo.", "t118": "Imprimindo",
"t119": "Por favor, use o aplicativo QIDI Link para se conectar à sua impressora. Uma vez concluída a conexão, o dispositivo online será sincronizado na página \"Link\"." "t119": "Sucesso",
"t120": "cancelado",
"t121": "Pesquisa",
"t122": "Procurar modelos online",
"t123": "prato",
"t124": "",
"t201": "Conectar Dispositivo",
"t202": "Por favor, configure a conexão da sua impressora para visualizar o dispositivo.",
"t203": "Por favor, use o aplicativo QIDI Link para se conectar à sua impressora. Uma vez concluída a conexão, o dispositivo online será sincronizado na página \"Link\"."
}, },
"ko_KR": { "ko_KR": {
"t1": "QIDI Studio에 오신 것을 환영합니다", "t1": "QIDI Studio에 오신 것을 환영합니다",
@@ -1819,9 +1939,17 @@ var LangText={
"t114": "홈", "t114": "홈",
"t115": "일괄 처리", "t115": "일괄 처리",
"t116": "재시도", "t116": "재시도",
"t117": "장치 연결", "t117": "인쇄 기록",
"t118": "장치를 보려면 프린터 연결을 설정하십시오.", "t118": "인쇄 중",
"t119": "프린터에 연결하려면 QIDI Link 앱을 사용하십시오. 연결이 완료되면 온라인 장치가 '링크' 페이지에 동기화됩니다." "t119": "성공",
"t120": "취소된",
"t121": "검색",
"t122": "온라인 모델을 검색하다",
"t123": "접시",
"t124": "",
"t201": "장치 연결",
"t202": "장치를 보려면 프린터 연결을 설정하십시오.",
"t203": "프린터에 연결하려면 QIDI Link 앱을 사용하십시오. 연결이 완료되면 온라인 장치가 '링크' 페이지에 동기화됩니다."
}, },
"pl_PL": { "pl_PL": {
"t1": "Witamy w QIDI Studio", "t1": "Witamy w QIDI Studio",
@@ -1932,9 +2060,17 @@ var LangText={
"t114": "Strona główna", "t114": "Strona główna",
"t115": "Wartość zbiorcza", "t115": "Wartość zbiorcza",
"t116": "Ponów", "t116": "Ponów",
"t117": "Podłącz urządzenie", "t117": "Historia druku",
"t118": "Proszę skonfigurować połączenie drukarki, aby wyświetlić urządzenie.", "t118": "Drukuje się",
"t119": "Proszę użyć aplikacji QIDI Link, aby połączyć się z drukarką. Po zakończeniu połączenia, urządzenie online zostanie zsynchronizowane na stronie \"Link\"." "t119": "Sukces",
"t120": "anulowany",
"t121": "Wyszukiwanie",
"t122": "Wyszukaj modele online",
"t123": "talerz",
"t124": "",
"t201": "Podłącz urządzenie",
"t202": "Proszę skonfigurować połączenie drukarki, aby wyświetlić urządzenie.",
"t203": "Proszę użyć aplikacji QIDI Link, aby połączyć się z drukarką. Po zakończeniu połączenia, urządzenie online zostanie zsynchronizowane na stronie \"Link\"."
} }
}; };
@@ -1978,3 +2114,35 @@ function TranslatePage()
} }
} }
} }
function GetCurrentTextByKey( key )
{
let strLang=GetQueryString("lang");
if(strLang!=null)
{
//setCookie(LANG_COOKIE_NAME,strLang,LANG_COOKIE_EXPIRESECOND,'/');
localStorage.setItem(LANG_COOKIE_NAME,strLang);
}
else
{
//strLang=getCookie(LANG_COOKIE_NAME);
strLang=localStorage.getItem(LANG_COOKIE_NAME);
}
//alert(strLang);
if( !LangText.hasOwnProperty(strLang) )
strLang="en";
let strText='';
if( LangText[strLang].hasOwnProperty(key) )
{
strText=LangText[strLang][key];
}
else if(strLang!='en' && LangText['en'].hasOwnProperty(key) )
{
strText=LangText['en'][key];
}
return strText;
}

82
resources/web/filament/index.html
View File

@@ -9,13 +9,14 @@
body { body {
font-family: Arial, sans-serif; font-family: Arial, sans-serif;
margin: 20px; margin: 20px;
overflow: hidden;
} }
.table-container { .table-container {
width: 100%; width: 100%;
max-width: 1800px; max-width: 1800px;
min-width: 900px; min-width: 900px;
height: auto; height: auto;
max-height: 85vh; max-height: 80vh;
min-height: 300px; min-height: 300px;
overflow-x: auto; overflow-x: auto;
overflow-y: auto; overflow-y: auto;
@@ -23,7 +24,7 @@
position: relative; position: relative;
margin: 0 auto; margin: 0 auto;
padding: 0; padding: 0;
overflow: hidden; overflow: show;
} }
table { table {
width: 100%; width: 100%;
@@ -90,6 +91,17 @@
z-index: 3; z-index: 3;
border-left: none; border-left: none;
} }
td:nth-child(2)::after,
th:nth-child(2)::after {
content: '';
position: absolute;
top: 0;
right: 0;
bottom: 0;
width: 0.1px;
background-color: #ccc;
z-index: 5;
}
td:nth-child(2)::before { td:nth-child(2)::before {
content: ''; content: '';
position: absolute; position: absolute;
@@ -238,12 +250,14 @@
<label><input type="checkbox" value="filament11"> ASA-Aero</label> <label><input type="checkbox" value="filament11"> ASA-Aero</label>
<label><input type="checkbox" value="filament12"> PA12-CF</label> <label><input type="checkbox" value="filament12"> PA12-CF</label>
<label><input type="checkbox" value="filament13"> PAHT-CF</label> <label><input type="checkbox" value="filament13"> PAHT-CF</label>
<label><input type="checkbox" value="filament14"> PC-ABS-FR</label> <label><input type="checkbox" value="filament14"> PAHT-GF</label>
<label><input type="checkbox" value="filament15"> PET-CF</label> <label><input type="checkbox" value="filament15"> PC-ABS-FR</label>
<label><input type="checkbox" value="filament16"> PETG Tough</label> <label><input type="checkbox" value="filament16"> PET-CF</label>
<label><input type="checkbox" value="filament17"> PPS-CF</label> <label><input type="checkbox" value="filament17"> PET-GF</label>
<label><input type="checkbox" value="filament18"> TPU 95A-HF</label> <label><input type="checkbox" value="filament18"> PETG Tough</label>
<label><input type="checkbox" value="filament19"> UltraPA</label> <label><input type="checkbox" value="filament19"> PPS-CF</label>
<label><input type="checkbox" value="filament20"> TPU 95A-HF</label>
<label><input type="checkbox" value="filament21"> UltraPA</label>
</div> </div>
</div> </div>
</div> </div>
@@ -267,12 +281,14 @@
<th class="filament11">ASA-Aero</th> <th class="filament11">ASA-Aero</th>
<th class="filament12">PA12-CF</th> <th class="filament12">PA12-CF</th>
<th class="filament13">PAHT-CF</th> <th class="filament13">PAHT-CF</th>
<th class="filament14">PC-ABS-FR</th> <th class="filament14">PAHT-GF</th>
<th class="filament15">PET-CF</th> <th class="filament15">PC-ABS-FR</th>
<th class="filament16">PETG Tough</th> <th class="filament16">PET-CF</th>
<th class="filament17">PPS-CF</th> <th class="filament17">PET-GF</th>
<th class="filament18">TPU 95A-HF</th> <th class="filament18">PETG Tough</th>
<th class="filament19">UltraPA</th> <th class="filament19">PPS-CF</th>
<th class="filament20">TPU 95A-HF</th>
<th class="filament21">UltraPA</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@@ -765,8 +781,10 @@
document.write('<td>'+ createProgressBar(50,"#0784FF")+ '</td>');//asa aero document.write('<td>'+ createProgressBar(50,"#0784FF")+ '</td>');//asa aero
document.write('<td>'+ createProgressBar(25,"#0784FF")+ '</td>');//pa12 cf document.write('<td>'+ createProgressBar(25,"#0784FF")+ '</td>');//pa12 cf
document.write('<td>'+ createProgressBar(50,"#0784FF")+ '</td>');//paht cf document.write('<td>'+ createProgressBar(50,"#0784FF")+ '</td>');//paht cf
document.write('<td>'+ createProgressBar(50,"#0784FF")+ '</td>');//paht gf
document.write('<td>'+ createProgressBar(75,"#0784FF")+ '</td>');//pc abs fr document.write('<td>'+ createProgressBar(75,"#0784FF")+ '</td>');//pc abs fr
document.write('<td>'+ createProgressBar(75,"#0784FF")+ '</td>');//pet cf document.write('<td>'+ createProgressBar(75,"#0784FF")+ '</td>');//pet cf
document.write('<td>'+ createProgressBar(75,"#0784FF")+ '</td>');//pet gf
document.write('<td>'+ createProgressBar(75,"#0784FF")+ '</td>');//petg document.write('<td>'+ createProgressBar(75,"#0784FF")+ '</td>');//petg
document.write('<td>/</td>');//pps-cf document.write('<td>/</td>');//pps-cf
document.write('<td>/</td>');//tpu document.write('<td>/</td>');//tpu
@@ -790,8 +808,10 @@
document.write('<td>'+ createProgressBar(25,"#5cb85c")+ '</td>');//asa aero document.write('<td>'+ createProgressBar(25,"#5cb85c")+ '</td>');//asa aero
document.write('<td>'+ createProgressBar(50,"#5cb85c")+ '</td>');//pa12 cf document.write('<td>'+ createProgressBar(50,"#5cb85c")+ '</td>');//pa12 cf
document.write('<td>'+ createProgressBar(75,"#5cb85c")+ '</td>');//paht cf document.write('<td>'+ createProgressBar(75,"#5cb85c")+ '</td>');//paht cf
document.write('<td>'+ createProgressBar(75,"#5cb85c")+ '</td>');//paht gf
document.write('<td>'+ createProgressBar(25,"#5cb85c")+ '</td>');//pc abs fr document.write('<td>'+ createProgressBar(25,"#5cb85c")+ '</td>');//pc abs fr
document.write('<td>'+ createProgressBar(75,"#5cb85c")+ '</td>');//pet cf document.write('<td>'+ createProgressBar(75,"#5cb85c")+ '</td>');//pet cf
document.write('<td>'+ createProgressBar(75,"#5cb85c")+ '</td>');//pet gf
document.write('<td>'+ createProgressBar(50,"#5cb85c")+ '</td>');//petg document.write('<td>'+ createProgressBar(50,"#5cb85c")+ '</td>');//petg
document.write('<td>/</td>');//pps-cf document.write('<td>/</td>');//pps-cf
document.write('<td>/</td>');//tpu document.write('<td>/</td>');//tpu
@@ -815,8 +835,10 @@
document.write('<td>'+ createProgressBar(50,"#CC6B36")+ '</td>');//asa aero document.write('<td>'+ createProgressBar(50,"#CC6B36")+ '</td>');//asa aero
document.write('<td>'+ createProgressBar(25,"#CC6B36")+ '</td>');//pa12 cf document.write('<td>'+ createProgressBar(25,"#CC6B36")+ '</td>');//pa12 cf
document.write('<td>'+ createProgressBar(75,"#CC6B36")+ '</td>');//paht cf document.write('<td>'+ createProgressBar(75,"#CC6B36")+ '</td>');//paht cf
document.write('<td>'+ createProgressBar(75,"#CC6B36")+ '</td>');//paht gf
document.write('<td>'+ createProgressBar(75,"#CC6B36")+ '</td>');//pc abs fr document.write('<td>'+ createProgressBar(75,"#CC6B36")+ '</td>');//pc abs fr
document.write('<td>'+ createProgressBar(75,"#CC6B36")+ '</td>');//pet cf document.write('<td>'+ createProgressBar(75,"#CC6B36")+ '</td>');//pet cf
document.write('<td>'+ createProgressBar(75,"#CC6B36")+ '</td>');//pet gf
document.write('<td>'+ createProgressBar(75,"#CC6B36")+ '</td>');//petg document.write('<td>'+ createProgressBar(75,"#CC6B36")+ '</td>');//petg
document.write('<td>/</td>');//pps-cf document.write('<td>/</td>');//pps-cf
document.write('<td>/</td>');//tpu document.write('<td>/</td>');//tpu
@@ -840,8 +862,10 @@
document.write('<td>70℃</td>');//asa aero document.write('<td>70℃</td>');//asa aero
document.write('<td>149.6℃</td>');//pa12 cf document.write('<td>149.6℃</td>');//pa12 cf
document.write('<td>192.3℃</td>');//paht cf document.write('<td>192.3℃</td>');//paht cf
document.write('<td>83.4℃</td>');//paht gf
document.write('<td>88℃</td>');//pc abs fr document.write('<td>88℃</td>');//pc abs fr
document.write('<td>148.8℃</td>');//pet cf document.write('<td>148.8℃</td>');//pet cf
document.write('<td>120.3℃</td>');//pet gf
document.write('<td>78℃</td>');//petg document.write('<td>78℃</td>');//petg
document.write('<td>242.7℃</td>');//pps-cf document.write('<td>242.7℃</td>');//pps-cf
document.write('<td>/</td>');//tpu document.write('<td>/</td>');//tpu
@@ -865,8 +889,10 @@
document.write('<td>55℃</td>');//asa aero document.write('<td>55℃</td>');//asa aero
document.write('<td>112.4℃</td>');//pa12 cf document.write('<td>112.4℃</td>');//pa12 cf
document.write('<td>121.7℃</td>');//paht cf document.write('<td>121.7℃</td>');//paht cf
document.write('<td>79.5℃</td>');//paht gf
document.write('<td>83℃</td>');//pc abs fr document.write('<td>83℃</td>');//pc abs fr
document.write('<td>112.1℃</td>');//pet cf document.write('<td>112.1℃</td>');//pet cf
document.write('<td>99.1℃</td>');//pet gf
document.write('<td>73℃</td>');//petg document.write('<td>73℃</td>');//petg
document.write('<td>/</td>');//pps-cf document.write('<td>/</td>');//pps-cf
document.write('<td>/</td>');//tpu document.write('<td>/</td>');//tpu
@@ -890,8 +916,10 @@
document.write('<td>8.25 ± 0.15 MPa<br>'+ createProgressBar(8.25/150*100,"#CCB70B")+ '</td>');//asa aero document.write('<td>8.25 ± 0.15 MPa<br>'+ createProgressBar(8.25/150*100,"#CCB70B")+ '</td>');//asa aero
document.write('<td>87.49 ± 2.81 MPa<br>'+ createProgressBar(87.49/150*100,"#CCB70B")+ '</td>');//pa12 cf document.write('<td>87.49 ± 2.81 MPa<br>'+ createProgressBar(87.49/150*100,"#CCB70B")+ '</td>');//pa12 cf
document.write('<td>104.90 ± 1.99 MPa<br>'+ createProgressBar(104.9/150*100,"#CCB70B")+ '</td>');//paht cf document.write('<td>104.90 ± 1.99 MPa<br>'+ createProgressBar(104.9/150*100,"#CCB70B")+ '</td>');//paht cf
document.write('<td>86.49 ± 1.03 MPa<br>'+ createProgressBar(86.49/150*100,"#CCB70B")+ '</td>');//paht gf
document.write('<td>52.51 ± 0.28 MPa<br>'+ createProgressBar(52.51/150*100,"#CCB70B")+ '</td>');//pc abs fr document.write('<td>52.51 ± 0.28 MPa<br>'+ createProgressBar(52.51/150*100,"#CCB70B")+ '</td>');//pc abs fr
document.write('<td>87.41 ± 3.57 MPa<br>'+ createProgressBar(87.41/150*100,"#CCB70B")+ '</td>');//pet cf document.write('<td>87.41 ± 3.57 MPa<br>'+ createProgressBar(87.41/150*100,"#CCB70B")+ '</td>');//pet cf
document.write('<td>70.86 ± 2.86 MPa<br>'+ createProgressBar(70.86/150*100,"#CCB70B")+ '</td>');//pet gf
document.write('<td>40.3 ± 0.6 MPa<br>'+ createProgressBar(40.3/150*100,"#CCB70B")+ '</td>');//petg document.write('<td>40.3 ± 0.6 MPa<br>'+ createProgressBar(40.3/150*100,"#CCB70B")+ '</td>');//petg
document.write('<td>60 MPa<br>'+ createProgressBar(60/150*100,"#CCB70B")+ '</td>');//pps-cf document.write('<td>60 MPa<br>'+ createProgressBar(60/150*100,"#CCB70B")+ '</td>');//pps-cf
document.write('<td>31.81 MPa<br>'+ createProgressBar(31.81/150*100,"#CCB70B")+ '</td>');//tpu document.write('<td>31.81 MPa<br>'+ createProgressBar(31.81/150*100,"#CCB70B")+ '</td>');//tpu
@@ -915,8 +943,10 @@
document.write('<td>593.99 ± 24.34 MPa<br>'+ createProgressBar(593.99/10000*100,"#CC0003")+ '</td>');//asa aero document.write('<td>593.99 ± 24.34 MPa<br>'+ createProgressBar(593.99/10000*100,"#CC0003")+ '</td>');//asa aero
document.write('<td>5438.40 ± 282.82 MPa<br>'+ createProgressBar(5438.4/10000*100,"#CC0003")+ '</td>');//pa12 cf document.write('<td>5438.40 ± 282.82 MPa<br>'+ createProgressBar(5438.4/10000*100,"#CC0003")+ '</td>');//pa12 cf
document.write('<td>8383.26 ± 419.53 MPa<br>'+ createProgressBar(8383.26/10000*100,"#CC0003")+ '</td>');//paht cf document.write('<td>8383.26 ± 419.53 MPa<br>'+ createProgressBar(8383.26/10000*100,"#CC0003")+ '</td>');//paht cf
document.write('<td>5118.97 ± 296.57 MPa<br>'+ createProgressBar(5118.97/10000*100,"#CC0003")+ '</td>');//paht gf
document.write('<td>2588.73 ± 64.81 MPa<br>'+ createProgressBar(2588.73/10000*100,"#CC0003")+ '</td>');//pc abs fr document.write('<td>2588.73 ± 64.81 MPa<br>'+ createProgressBar(2588.73/10000*100,"#CC0003")+ '</td>');//pc abs fr
document.write('<td>6025.53 ± 355.46 MPa<br>'+ createProgressBar(6025.53/10000*100,"#CC0003")+ '</td>');//pet cf document.write('<td>6025.53 ± 355.46 MPa<br>'+ createProgressBar(6025.53/10000*100,"#CC0003")+ '</td>');//pet cf
document.write('<td>4130.13 ± 107.00 MPa<br>'+ createProgressBar(4130.13/10000*100,"#CC0003")+ '</td>');//pet gf
document.write('<td>1780 ± 80 MPa<br>'+ createProgressBar(1780/10000*100,"#CC0003")+ '</td>');//petg document.write('<td>1780 ± 80 MPa<br>'+ createProgressBar(1780/10000*100,"#CC0003")+ '</td>');//petg
document.write('<td>4800 MPa<br>'+ createProgressBar(4800/10000*100,"#CC0003")+ '</td>');//pps-cf document.write('<td>4800 MPa<br>'+ createProgressBar(4800/10000*100,"#CC0003")+ '</td>');//pps-cf
document.write('<td>/</td>');//tpu document.write('<td>/</td>');//tpu
@@ -940,9 +970,11 @@
document.write('<td>11.52 ± 0.58%</td>');//asa aero document.write('<td>11.52 ± 0.58%</td>');//asa aero
document.write('<td>2.59 ± 0.19%</td>');//pa12 cf document.write('<td>2.59 ± 0.19%</td>');//pa12 cf
document.write('<td>1.60 ± 0.07%</td>');//paht cf document.write('<td>1.60 ± 0.07%</td>');//paht cf
document.write('<td>2.71 ± 0.28%</td>');//paht gf
document.write('<td>5.55 ± 0.99%</td>');//pc abs fr document.write('<td>5.55 ± 0.99%</td>');//pc abs fr
document.write('<td>1.99 ± 0.18%</td>');//pet cf document.write('<td>1.99 ± 0.18%</td>');//pet cf
document.write('<td>4.0 ± 0.2%</td>');//petg document.write('<td>2.56 ± 0.30%</td>');//pet gf
document.write('<td>4.0 ± 0.20%</td>');//petg
document.write('<td>6%</td>');//pps-cf document.write('<td>6%</td>');//pps-cf
document.write('<td>471%</td>');//tpu document.write('<td>471%</td>');//tpu
document.write('<td>11.68 ± 3.36%</td>');//ultra pa document.write('<td>11.68 ± 3.36%</td>');//ultra pa
@@ -965,8 +997,10 @@
document.write('<td>14.31 ± 1.66 MPa<br>'+ createProgressBar(14.31/200*100,"#16417C")+ '</td>');//asa aero document.write('<td>14.31 ± 1.66 MPa<br>'+ createProgressBar(14.31/200*100,"#16417C")+ '</td>');//asa aero
document.write('<td>133.17 ± 4.66 MPa<br>'+ createProgressBar(133.17/200*100,"#16417C")+ '</td>');//pa12 cf document.write('<td>133.17 ± 4.66 MPa<br>'+ createProgressBar(133.17/200*100,"#16417C")+ '</td>');//pa12 cf
document.write('<td>147.70 ± 4.09 MPa<br>'+ createProgressBar(144.7/200*100,"#16417C")+ '</td>');//paht cf document.write('<td>147.70 ± 4.09 MPa<br>'+ createProgressBar(144.7/200*100,"#16417C")+ '</td>');//paht cf
document.write('<td>137.78 ± 2.35 MPa<br>'+ createProgressBar(137.78/200*100,"#16417C")+ '</td>');//paht gf
document.write('<td>85.95 ± 0.83 MPa<br>'+ createProgressBar(85.95/200*100,"#16417C")+ '</td>');//pc abs fr document.write('<td>85.95 ± 0.83 MPa<br>'+ createProgressBar(85.95/200*100,"#16417C")+ '</td>');//pc abs fr
document.write('<td>122.69 ± 5.19 MPa<br>'+ createProgressBar(122.69/200*100,"#16417C")+ '</td>');//pet cf document.write('<td>122.69 ± 5.19 MPa<br>'+ createProgressBar(122.69/200*100,"#16417C")+ '</td>');//pet cf
document.write('<td>114.87 ± 3.00 MPa<br>'+ createProgressBar(114.87/200*100,"#16417C")+ '</td>');//pet gf
document.write('<td>62.8 ± 0.4 MPa<br>'+ createProgressBar(62.8/200*100,"#16417C")+ '</td>');//petg document.write('<td>62.8 ± 0.4 MPa<br>'+ createProgressBar(62.8/200*100,"#16417C")+ '</td>');//petg
document.write('<td>105 MPa<br>'+ createProgressBar(105/200*100,"#16417C")+ '</td>');//pps-cf document.write('<td>105 MPa<br>'+ createProgressBar(105/200*100,"#16417C")+ '</td>');//pps-cf
document.write('<td>/</td>');//tpu document.write('<td>/</td>');//tpu
@@ -990,8 +1024,10 @@
document.write('<td>457.94 ± 20.84 MPa<br>'+ createProgressBar(457.94/8000*100,"#EA3FF7")+ '</td>');//asa aero document.write('<td>457.94 ± 20.84 MPa<br>'+ createProgressBar(457.94/8000*100,"#EA3FF7")+ '</td>');//asa aero
document.write('<td>4667.43 ± 339.80 MPa<br>'+ createProgressBar(4667.43/8000*100,"#EA3FF7")+ '</td>');//pa12 cf document.write('<td>4667.43 ± 339.80 MPa<br>'+ createProgressBar(4667.43/8000*100,"#EA3FF7")+ '</td>');//pa12 cf
document.write('<td>5969.35 ± 145.28 MPa<br>'+ createProgressBar(5969.33/8000*100,"#EA3FF7")+ '</td>');//paht cf document.write('<td>5969.35 ± 145.28 MPa<br>'+ createProgressBar(5969.33/8000*100,"#EA3FF7")+ '</td>');//paht cf
document.write('<td>4135.14 ± 64.91 MPa<br>'+ createProgressBar(4135.14/8000*100,"#EA3FF7")+ '</td>');//paht gf
document.write('<td>2504.55 ± 22.88 MPa<br>'+ createProgressBar(2504.55/8000*100,"#EA3FF7")+ '</td>');//pc abs fr document.write('<td>2504.55 ± 22.88 MPa<br>'+ createProgressBar(2504.55/8000*100,"#EA3FF7")+ '</td>');//pc abs fr
document.write('<td>5313.21 ± 197.89 MPa<br>'+ createProgressBar(5313.21/8000*100,"#EA3FF7")+ '</td>');//pet cf document.write('<td>5313.21 ± 197.89 MPa<br>'+ createProgressBar(5313.21/8000*100,"#EA3FF7")+ '</td>');//pet cf
document.write('<td>3650.32 ± 65.81 MPa<br>'+ createProgressBar(3650.32/8000*100,"#EA3FF7")+ '</td>');//pet gf
document.write('<td>1919 ± 54 MPa<br>'+ createProgressBar(1919/8000*100,"#EA3FF7")+ '</td>');//petg document.write('<td>1919 ± 54 MPa<br>'+ createProgressBar(1919/8000*100,"#EA3FF7")+ '</td>');//petg
document.write('<td>5500 MPa<br>'+ createProgressBar(5500/8000*100,"#EA3FF7")+ '</td>');//pps-cf document.write('<td>5500 MPa<br>'+ createProgressBar(5500/8000*100,"#EA3FF7")+ '</td>');//pps-cf
document.write('<td>/</td>');//tpu document.write('<td>/</td>');//tpu
@@ -1015,8 +1051,10 @@
document.write('<td>2.29 ± 0.13KJ/㎡<br>'+ createProgressBar(2.29/30*100,"#F77089")+ '</td>');//asa aero document.write('<td>2.29 ± 0.13KJ/㎡<br>'+ createProgressBar(2.29/30*100,"#F77089")+ '</td>');//asa aero
document.write('<td>6.11 ± 1.45KJ/㎡<br>'+ createProgressBar(6.11/30*100,"#F77089")+ '</td>');//pa12 cf document.write('<td>6.11 ± 1.45KJ/㎡<br>'+ createProgressBar(6.11/30*100,"#F77089")+ '</td>');//pa12 cf
document.write('<td>6.17 ± 0.2KJ/㎡<br>'+ createProgressBar(6.17/30*100,"#F77089")+ '</td>');//paht cf document.write('<td>6.17 ± 0.2KJ/㎡<br>'+ createProgressBar(6.17/30*100,"#F77089")+ '</td>');//paht cf
document.write('<td>7.97 ± 1.75KJ/㎡<br>'+ createProgressBar(7.97/30*100,"#F77089")+ '</td>');//paht gf
document.write('<td>8.39 ± 0.46KJ/㎡<br>'+ createProgressBar(8.39/30*100,"#F77089")+ '</td>');//pc abs fr document.write('<td>8.39 ± 0.46KJ/㎡<br>'+ createProgressBar(8.39/30*100,"#F77089")+ '</td>');//pc abs fr
document.write('<td>5.57 ± 0.58KJ/㎡<br>'+ createProgressBar(5.57/30*100,"#F77089")+ '</td>');//pet cf document.write('<td>5.57 ± 0.58KJ/㎡<br>'+ createProgressBar(5.57/30*100,"#F77089")+ '</td>');//pet cf
document.write('<td>6.56 ± 0.68KJ/㎡<br>'+ createProgressBar(6.56/30*100,"#F77089")+ '</td>');//pet gf
document.write('<td>13.9 ± 2.3KJ/㎡<br>'+ createProgressBar(13.9/30*100,"#F77089")+ '</td>');//petg document.write('<td>13.9 ± 2.3KJ/㎡<br>'+ createProgressBar(13.9/30*100,"#F77089")+ '</td>');//petg
document.write('<td>11KJ/㎡<br>'+ createProgressBar(11/30*100,"#F77089")+ '</td>');//pps-cf document.write('<td>11KJ/㎡<br>'+ createProgressBar(11/30*100,"#F77089")+ '</td>');//pps-cf
document.write('<td>/</td>');//tpu document.write('<td>/</td>');//tpu
@@ -1040,8 +1078,10 @@
document.write('<td>' + getTranslation('Recommended drying', lang) + '</td>');//asa aero document.write('<td>' + getTranslation('Recommended drying', lang) + '</td>');//asa aero
document.write('<td>' + getTranslation('Need to dry', lang) + '</td>');//pa12 cf document.write('<td>' + getTranslation('Need to dry', lang) + '</td>');//pa12 cf
document.write('<td>' + getTranslation('Need to dry', lang) + '</td>');//paht cf document.write('<td>' + getTranslation('Need to dry', lang) + '</td>');//paht cf
document.write('<td>' + getTranslation('Need to dry', lang) + '</td>');//paht gf
document.write('<td>' + getTranslation('Recommended drying', lang) + '</td>');//pc abs fr document.write('<td>' + getTranslation('Recommended drying', lang) + '</td>');//pc abs fr
document.write('<td>' + getTranslation('Need to dry', lang) + '</td>');//pet cf document.write('<td>' + getTranslation('Need to dry', lang) + '</td>');//pet cf
document.write('<td>' + getTranslation('Need to dry', lang) + '</td>');//pet gf
document.write('<td>' + getTranslation('Recommended drying', lang) + '</td>');//petg document.write('<td>' + getTranslation('Recommended drying', lang) + '</td>');//petg
document.write('<td>' + getTranslation('Need to dry', lang) + '</td>');//pps-cf document.write('<td>' + getTranslation('Need to dry', lang) + '</td>');//pps-cf
document.write('<td>' + getTranslation('Need to dry', lang) + '</td>');//tpu document.write('<td>' + getTranslation('Need to dry', lang) + '</td>');//tpu
@@ -1065,8 +1105,10 @@
document.write('<td>/</td>');//asa aero document.write('<td>/</td>');//asa aero
document.write('<td>110-120℃ 4-6h</td>');//pa12 cf document.write('<td>110-120℃ 4-6h</td>');//pa12 cf
document.write('<td>/</td>');//paht cf document.write('<td>/</td>');//paht cf
document.write('<td>80-100℃ 4-6h</td>');//paht gf
document.write('<td>/</td>');//pc abs fr document.write('<td>/</td>');//pc abs fr
document.write('<td>100℃ 4-6h</td>');//pet cf document.write('<td>100℃ 4-6h</td>');//pet cf
document.write('<td>100-120℃ 4-6h</td>');//pet gf
document.write('<td>60-70℃ 4-6h</td>');//petg document.write('<td>60-70℃ 4-6h</td>');//petg
document.write('<td>/</td>');//pps-cf document.write('<td>/</td>');//pps-cf
document.write('<td>70-80℃ 4-6h</td>');//tpu document.write('<td>70-80℃ 4-6h</td>');//tpu
@@ -1090,8 +1132,10 @@
document.write('<td>80-90℃</td>');//asa aero document.write('<td>80-90℃</td>');//asa aero
document.write('<td>40-80℃</td>');//pa12 cf document.write('<td>40-80℃</td>');//pa12 cf
document.write('<td>70-80℃</td>');//paht cf document.write('<td>70-80℃</td>');//paht cf
document.write('<td>70-90℃</td>');//paht gf
document.write('<td>100-110℃</td>');//pc abs fr document.write('<td>100-110℃</td>');//pc abs fr
document.write('<td>70-80℃</td>');//pet cf document.write('<td>70-80℃</td>');//pet cf
document.write('<td>60-80℃</td>');//pet gf
document.write('<td>70-80℃</td>');//petg document.write('<td>70-80℃</td>');//petg
document.write('<td>80-110℃</td>');//pps-cf document.write('<td>80-110℃</td>');//pps-cf
document.write('<td>20-60℃</td>');//tpu document.write('<td>20-60℃</td>');//tpu
@@ -1115,8 +1159,10 @@
document.write('<td>√</td>');//asa aero document.write('<td>√</td>');//asa aero
document.write('<td>×</td>');//pa12 cf document.write('<td>×</td>');//pa12 cf
document.write('<td>×</td>');//paht cf document.write('<td>×</td>');//paht cf
document.write('<td>×</td>');//paht gf
document.write('<td>√</td>');//pc abs fr document.write('<td>√</td>');//pc abs fr
document.write('<td>×</td>');//pet cf document.write('<td>×</td>');//pet cf
document.write('<td>×</td>');//pet gf
document.write('<td>×</td>');//petg document.write('<td>×</td>');//petg
document.write('<td>√</td>');//pps-cf document.write('<td>√</td>');//pps-cf
document.write('<td>×</td>');//tpu document.write('<td>×</td>');//tpu
@@ -1140,8 +1186,10 @@
document.write('<td>240-280℃</td>');//asa aero document.write('<td>240-280℃</td>');//asa aero
document.write('<td>280-300℃</td>');//pa12 cf document.write('<td>280-300℃</td>');//pa12 cf
document.write('<td>300-320℃</td>');//paht cf document.write('<td>300-320℃</td>');//paht cf
document.write('<td>300-320℃</td>');//paht gf
document.write('<td>240-270℃</td>');//pc abs fr document.write('<td>240-270℃</td>');//pc abs fr
document.write('<td>280-320℃</td>');//pet cf document.write('<td>280-320℃</td>');//pet cf
document.write('<td>280-320℃</td>');//pet gf
document.write('<td>240-280℃</td>');//petg document.write('<td>240-280℃</td>');//petg
document.write('<td>300-370℃</td>');//pps-cf document.write('<td>300-370℃</td>');//pps-cf
document.write('<td>210-230℃</td>');//tpu document.write('<td>210-230℃</td>');//tpu
@@ -1165,8 +1213,10 @@
document.write('<td>＜90mm/s</td>');//asa aero document.write('<td>＜90mm/s</td>');//asa aero
document.write('<td>＜60mm/s</td>');//pa12 cf document.write('<td>＜60mm/s</td>');//pa12 cf
document.write('<td>＜160mm/s</td>');//paht cf document.write('<td>＜160mm/s</td>');//paht cf
document.write('<td>＜200mm/s</td>');//paht gf
document.write('<td>＜300mm/s</td>');//pc abs fr document.write('<td>＜300mm/s</td>');//pc abs fr
document.write('<td>＜200mm/s</td>');//pet cf document.write('<td>＜200mm/s</td>');//pet cf
document.write('<td>＜200mm/s</td>');//pet gf
document.write('<td>＜300mm/s</td>');//petg document.write('<td>＜300mm/s</td>');//petg
document.write('<td>＜200mm/s</td>');//pps-cf document.write('<td>＜200mm/s</td>');//pps-cf
document.write('<td>＜120mm/s</td>');//tpu document.write('<td>＜120mm/s</td>');//tpu
@@ -1190,8 +1240,10 @@
document.write('<td>/</td>');//asa aero document.write('<td>/</td>');//asa aero
document.write('<td>80-100℃</td>');//pa12 cf document.write('<td>80-100℃</td>');//pa12 cf
document.write('<td>80-100℃</td>');//paht cf document.write('<td>80-100℃</td>');//paht cf
document.write('<td>80-100℃</td>');//paht gf
document.write('<td>/</td>');//pc abs fr document.write('<td>/</td>');//pc abs fr
document.write('<td>80-100℃</td>');//pet cf document.write('<td>80-100℃</td>');//pet cf
document.write('<td>80-100℃</td>');//pet gf
document.write('<td>/</td>');//petg document.write('<td>/</td>');//petg
document.write('<td>/</td>');//pps-cf document.write('<td>/</td>');//pps-cf
document.write('<td>/</td>');//tpu document.write('<td>/</td>');//tpu

4
resources/web/guide/21/21.js
View File

@@ -74,7 +74,7 @@ function HandleModelList( pVal )
{ {
let sVV=strVendor; let sVV=strVendor;
if( sVV=="QDT" ) if( sVV=="QDT" )
sVV="QIDI Lab"; sVV="QIDI Tech";
let HtmlNewVendor='<div class="OneVendorBlock" Vendor="'+strVendor+'">'+ let HtmlNewVendor='<div class="OneVendorBlock" Vendor="'+strVendor+'">'+
'<div class="BlockBanner">'+ '<div class="BlockBanner">'+
@@ -88,7 +88,7 @@ function HandleModelList( pVal )
'</div>'+ '</div>'+
'</div>'; '</div>';
if(sVV=='QIDI Lab') if(sVV=='QIDI Tech')
$('#Content').html( HtmlNewVendor + $('#Content').html() ); $('#Content').html( HtmlNewVendor + $('#Content').html() );
else else
$('#Content').append( HtmlNewVendor ); $('#Content').append( HtmlNewVendor );

8
resources/web/guide/21/test.js
View File

@@ -427,13 +427,13 @@ var cData={
}, },
"machine": [{ "machine": [{
"model": "QDT-3DP-V4NORMAL", "model": "QDT-3DP-V4NORMAL",
"name": "QIDIlab QDT-3DP-001-V4-normal", "name": "QIDITech QDT-3DP-001-V4-normal",
"sub_path": "machine/QIDIlab QDT-3DP-001-V4-normal.json" "sub_path": "machine/QIDITech QDT-3DP-001-V4-normal.json"
}, },
{ {
"model": "QDT-3DP-V5NORMAL", "model": "QDT-3DP-V5NORMAL",
"name": "QIDIlab QDT-3DP-001-V5-normal", "name": "QIDITech QDT-3DP-001-V5-normal",
"sub_path": "machine/QIDIlab QDT-3DP-001-V5-normal.json" "sub_path": "machine/QIDITech QDT-3DP-001-V5-normal.json"
} }
], ],
"model": [{ "model": [{

2
resources/web/guide/22/22.js
View File

@@ -234,7 +234,7 @@ function SortUI()
let fWholeName = OneFila['name'].trim(); let fWholeName = OneFila['name'].trim();
let fShortName = GetFilamentShortname(OneFila['name']); let fShortName = GetFilamentShortname(OneFila['name']);
let fVendor = OneFila['vendor']; let fVendor = OneFila['vendor'];
if (fVendor != "Generic") if (fVendor == "QIDI")
continue; continue;
let fType = OneFila['type']; let fType = OneFila['type'];
let fSelect = OneFila['selected']; let fSelect = OneFila['selected'];

34
resources/web/guide/22/index.html
View File

@@ -25,23 +25,23 @@
<div class="CName"><span class="trans" tid="t15">printer</span>：</div> <div class="CName"><span class="trans" tid="t15">printer</span>：</div>
<div class="CValues"> <div class="CValues">
<div><input type="checkbox" mode="all" onClick="ChooseAllMachine()" /><span class="trans" tid="t11">all</span></div> <div><input type="checkbox" mode="all" onClick="ChooseAllMachine()" /><span class="trans" tid="t11">all</span></div>
<!-- <div><input type="checkbox" mode="-normal" onChange="SortFilament()" />QIDIlab QDT-3DP-001-V4-normal</div> <!-- <div><input type="checkbox" mode="-normal" onChange="SortFilament()" />QIDITech QDT-3DP-001-V4-normal</div>
<div><input type="checkbox" />QIDIlab QDT-3DP-001-V5-normal</div> <div><input type="checkbox" />QIDITech QDT-3DP-001-V5-normal</div>
<div><input type="checkbox" />QIDIlab QDT-3DP-001-V4-normal</div> <div><input type="checkbox" />QIDITech QDT-3DP-001-V4-normal</div>
<div><input type="checkbox" />QIDIlab QDT-3DP-001-V4-normal</div> <div><input type="checkbox" />QIDITech QDT-3DP-001-V4-normal</div>
<div><input type="checkbox" />QIDIlab QDT-3DP-001-V5-normal</div> <div><input type="checkbox" />QIDITech QDT-3DP-001-V5-normal</div>
<div><input type="checkbox" />QIDIlab QDT-3DP-001-V4-normal</div> <div><input type="checkbox" />QIDITech QDT-3DP-001-V4-normal</div>
<div><input type="checkbox" />QIDIlab QDT-3DP-001-V4-normal</div> <div><input type="checkbox" />QIDITech QDT-3DP-001-V4-normal</div>
<div><input type="checkbox" />QIDIlab QDT-3DP-001-V5-normal</div> <div><input type="checkbox" />QIDITech QDT-3DP-001-V5-normal</div>
<div><input type="checkbox" />QIDIlab QDT-3DP-001-V4-normal</div> <div><input type="checkbox" />QIDITech QDT-3DP-001-V4-normal</div>
<div><input type="checkbox" />QIDIlab QDT-3DP-001-V5-normal</div> <div><input type="checkbox" />QIDITech QDT-3DP-001-V5-normal</div>
<div><input type="checkbox" />QIDIlab QDT-3DP-001-V4-normal</div> <div><input type="checkbox" />QIDITech QDT-3DP-001-V4-normal</div>
<div><input type="checkbox" />QIDIlab QDT-3DP-001-V4-normal</div> <div><input type="checkbox" />QIDITech QDT-3DP-001-V4-normal</div>
<div><input type="checkbox" />QIDIlab QDT-3DP-001-V5-normal</div> <div><input type="checkbox" />QIDITech QDT-3DP-001-V5-normal</div>
<div><input type="checkbox" />QIDIlab QDT-3DP-001-V4-normal</div> <div><input type="checkbox" />QIDITech QDT-3DP-001-V4-normal</div>
<div><input type="checkbox" />QIDIlab QDT-3DP-001-V4-normal</div> <div><input type="checkbox" />QIDITech QDT-3DP-001-V4-normal</div>
<div><input type="checkbox" />QIDIlab QDT-3DP-001-V5-normal</div> <div><input type="checkbox" />QIDITech QDT-3DP-001-V5-normal</div>
<div><input type="checkbox" />QIDIlab QDT-3DP-001-V4-normal</div> --> <div><input type="checkbox" />QIDITech QDT-3DP-001-V4-normal</div> -->
</div> </div>
</div> </div>

156
resources/web/guide/22/test.js
View File

@@ -1,159 +1,159 @@
var cData={ var cData={
"filament": { "filament": {
"QIDI ABS @QDT X1C": { "QIDI ABS @QDT X1C": {
"models": "[QIDI Lab X1 Carbon++0.4][QIDI Lab X1++0.4][QIDI Lab X1 Carbon++0.6]", "models": "[QIDI Tech X1 Carbon++0.4][QIDI Tech X1++0.4][QIDI Tech X1 Carbon++0.6]",
"name": "QIDI ABS @QDT X1C", "name": "QIDI ABS @QDT X1C",
"selected": 1, "selected": 1,
"sub_path": "filament/QIDI ABS @QDT X1C.json", "sub_path": "filament/QIDI ABS @QDT X1C.json",
"type": "ABS", "type": "ABS",
"vendor": "QIDI Lab" "vendor": "QIDI Tech"
}, },
"QIDI ABS @QDT X1C 0.2 nozzle": { "QIDI ABS @QDT X1C 0.2 nozzle": {
"models": "[QIDI Lab X1 Carbon++0.2]", "models": "[QIDI Tech X1 Carbon++0.2]",
"name": "QIDI ABS @QDT X1C 0.2 nozzle", "name": "QIDI ABS @QDT X1C 0.2 nozzle",
"selected": 1, "selected": 1,
"sub_path": "filament/QIDI ABS @QDT X1C 0.2 nozzle.json", "sub_path": "filament/QIDI ABS @QDT X1C 0.2 nozzle.json",
"type": "ABS", "type": "ABS",
"vendor": "QIDI Lab" "vendor": "QIDI Tech"
}, },
"QIDI ABS @QDT X1C 0.8 nozzle": { "QIDI ABS @QDT X1C 0.8 nozzle": {
"models": "[QIDI Lab X1 Carbon++0.8]", "models": "[QIDI Tech X1 Carbon++0.8]",
"name": "QIDI ABS @QDT X1C 0.8 nozzle", "name": "QIDI ABS @QDT X1C 0.8 nozzle",
"selected": 1, "selected": 1,
"sub_path": "filament/QIDI ABS @QDT X1C 0.8 nozzle.json", "sub_path": "filament/QIDI ABS @QDT X1C 0.8 nozzle.json",
"type": "ABS", "type": "ABS",
"vendor": "QIDI Lab" "vendor": "QIDI Tech"
}, },
"QIDI PA-CF @QDT X1C": { "QIDI PA-CF @QDT X1C": {
"models": "[QIDI Lab X1 Carbon++0.4]", "models": "[QIDI Tech X1 Carbon++0.4]",
"name": "QIDI PA-CF @QDT X1C", "name": "QIDI PA-CF @QDT X1C",
"selected": 0, "selected": 0,
"sub_path": "filament/QIDI PA-CF @QDT X1C.json", "sub_path": "filament/QIDI PA-CF @QDT X1C.json",
"type": "PA-CF", "type": "PA-CF",
"vendor": "QIDI Lab" "vendor": "QIDI Tech"
}, },
"QIDI PC @QDT X1C": { "QIDI PC @QDT X1C": {
"models": "[QIDI Lab X1 Carbon++0.4][QIDI Lab X1++0.4][QIDI Lab X1 Carbon++0.6]", "models": "[QIDI Tech X1 Carbon++0.4][QIDI Tech X1++0.4][QIDI Tech X1 Carbon++0.6]",
"name": "QIDI PC @QDT X1C", "name": "QIDI PC @QDT X1C",
"selected": 1, "selected": 1,
"sub_path": "filament/QIDI PC @QDT X1C.json", "sub_path": "filament/QIDI PC @QDT X1C.json",
"type": "PC", "type": "PC",
"vendor": "QIDI Lab" "vendor": "QIDI Tech"
}, },
"QIDI PC @QDT X1C 0.8 nozzle": { "QIDI PC @QDT X1C 0.8 nozzle": {
"models": "[QIDI Lab X1 Carbon++0.8]", "models": "[QIDI Tech X1 Carbon++0.8]",
"name": "QIDI PC @QDT X1C 0.8 nozzle", "name": "QIDI PC @QDT X1C 0.8 nozzle",
"selected": 1, "selected": 1,
"sub_path": "filament/QIDI PC @QDT X1C 0.8 nozzle.json", "sub_path": "filament/QIDI PC @QDT X1C 0.8 nozzle.json",
"type": "PC", "type": "PC",
"vendor": "QIDI Lab" "vendor": "QIDI Tech"
}, },
"QIDI PLA Basic @QDT X1": { "QIDI PLA Basic @QDT X1": {
"models": "[QIDI Lab X1++0.4]", "models": "[QIDI Tech X1++0.4]",
"name": "QIDI PLA Basic @QDT X1", "name": "QIDI PLA Basic @QDT X1",
"selected": 1, "selected": 1,
"sub_path": "filament/QIDI PLA Basic @QDT X1.json", "sub_path": "filament/QIDI PLA Basic @QDT X1.json",
"type": "PLA", "type": "PLA",
"vendor": "QIDI Lab" "vendor": "QIDI Tech"
}, },
"QIDI PLA Basic @QDT X1C": { "QIDI PLA Basic @QDT X1C": {
"models": "[QIDI Lab X1 Carbon++0.4][QIDI Lab X1 Carbon++0.6]", "models": "[QIDI Tech X1 Carbon++0.4][QIDI Tech X1 Carbon++0.6]",
"name": "QIDI PLA Basic @QDT X1C", "name": "QIDI PLA Basic @QDT X1C",
"selected": 1, "selected": 1,
"sub_path": "filament/QIDI PLA Basic @QDT X1C.json", "sub_path": "filament/QIDI PLA Basic @QDT X1C.json",
"type": "PLA", "type": "PLA",
"vendor": "QIDI Lab" "vendor": "QIDI Tech"
}, },
"QIDI PLA Basic @QDT X1C 0.2 nozzle": { "QIDI PLA Basic @QDT X1C 0.2 nozzle": {
"models": "[QIDI Lab X1 Carbon++0.2]", "models": "[QIDI Tech X1 Carbon++0.2]",
"name": "QIDI PLA Basic @QDT X1C 0.2 nozzle", "name": "QIDI PLA Basic @QDT X1C 0.2 nozzle",
"selected": 1, "selected": 1,
"sub_path": "filament/QIDI PLA Basic @QDT X1C 0.2 nozzle.json", "sub_path": "filament/QIDI PLA Basic @QDT X1C 0.2 nozzle.json",
"type": "PLA", "type": "PLA",
"vendor": "QIDI Lab" "vendor": "QIDI Tech"
}, },
"QIDI PLA Basic @QDT X1C 0.8 nozzle": { "QIDI PLA Basic @QDT X1C 0.8 nozzle": {
"models": "[QIDI Lab X1 Carbon++0.8]", "models": "[QIDI Tech X1 Carbon++0.8]",
"name": "QIDI PLA Basic @QDT X1C 0.8 nozzle", "name": "QIDI PLA Basic @QDT X1C 0.8 nozzle",
"selected": 1, "selected": 1,
"sub_path": "filament/QIDI PLA Basic @QDT X1C 0.8 nozzle.json", "sub_path": "filament/QIDI PLA Basic @QDT X1C 0.8 nozzle.json",
"type": "PLA", "type": "PLA",
"vendor": "QIDI Lab" "vendor": "QIDI Tech"
}, },
"QIDI PLA Matte @QDT X1": { "QIDI PLA Matte @QDT X1": {
"models": "[QIDI Lab X1++0.4]", "models": "[QIDI Tech X1++0.4]",
"name": "QIDI PLA Matte @QDT X1", "name": "QIDI PLA Matte @QDT X1",
"selected": 1, "selected": 1,
"sub_path": "filament/QIDI PLA Matte @QDT X1.json", "sub_path": "filament/QIDI PLA Matte @QDT X1.json",
"type": "PLA", "type": "PLA",
"vendor": "QIDI Lab" "vendor": "QIDI Tech"
}, },
"QIDI PLA Matte @QDT X1C": { "QIDI PLA Matte @QDT X1C": {
"models": "[QIDI Lab X1 Carbon++0.4][QIDI Lab X1 Carbon++0.6]", "models": "[QIDI Tech X1 Carbon++0.4][QIDI Tech X1 Carbon++0.6]",
"name": "QIDI PLA Matte @QDT X1C", "name": "QIDI PLA Matte @QDT X1C",
"selected": 1, "selected": 1,
"sub_path": "filament/QIDI PLA Matte @QDT X1C.json", "sub_path": "filament/QIDI PLA Matte @QDT X1C.json",
"type": "PLA", "type": "PLA",
"vendor": "QIDI Lab" "vendor": "QIDI Tech"
}, },
"QIDI PLA Matte @QDT X1C 0.2 nozzle": { "QIDI PLA Matte @QDT X1C 0.2 nozzle": {
"models": "[QIDI Lab X1 Carbon++0.2]", "models": "[QIDI Tech X1 Carbon++0.2]",
"name": "QIDI PLA Matte @QDT X1C 0.2 nozzle", "name": "QIDI PLA Matte @QDT X1C 0.2 nozzle",
"selected": 1, "selected": 1,
"sub_path": "filament/QIDI PLA Matte @QDT X1C 0.2 nozzle.json", "sub_path": "filament/QIDI PLA Matte @QDT X1C 0.2 nozzle.json",
"type": "PLA", "type": "PLA",
"vendor": "QIDI Lab" "vendor": "QIDI Tech"
}, },
"QIDI PLA Matte @QDT X1C 0.8 nozzle": { "QIDI PLA Matte @QDT X1C 0.8 nozzle": {
"models": "[QIDI Lab X1 Carbon++0.8]", "models": "[QIDI Tech X1 Carbon++0.8]",
"name": "QIDI PLA Matte @QDT X1C 0.8 nozzle", "name": "QIDI PLA Matte @QDT X1C 0.8 nozzle",
"selected": 1, "selected": 1,
"sub_path": "filament/QIDI PLA Matte @QDT X1C 0.8 nozzle.json", "sub_path": "filament/QIDI PLA Matte @QDT X1C 0.8 nozzle.json",
"type": "PLA", "type": "PLA",
"vendor": "QIDI Lab" "vendor": "QIDI Tech"
}, },
"QIDI Support G @QDT X1C": { "QIDI Support G @QDT X1C": {
"models": "[QIDI Lab X1 Carbon++0.4]", "models": "[QIDI Tech X1 Carbon++0.4]",
"name": "QIDI Support G @QDT X1C", "name": "QIDI Support G @QDT X1C",
"selected": 0, "selected": 0,
"sub_path": "filament/QIDI Support G @QDT X1C.json", "sub_path": "filament/QIDI Support G @QDT X1C.json",
"type": "PA", "type": "PA",
"vendor": "QIDI Lab" "vendor": "QIDI Tech"
}, },
"QIDI Support W @QDT X1": { "QIDI Support W @QDT X1": {
"models": "[QIDI Lab X1++0.4]", "models": "[QIDI Tech X1++0.4]",
"name": "QIDI Support W @QDT X1", "name": "QIDI Support W @QDT X1",
"selected": 1, "selected": 1,
"sub_path": "filament/QIDI Support W @QDT X1.json", "sub_path": "filament/QIDI Support W @QDT X1.json",
"type": "PLA", "type": "PLA",
"vendor": "QIDI Lab" "vendor": "QIDI Tech"
}, },
"QIDI Support W @QDT X1C": { "QIDI Support W @QDT X1C": {
"models": "[QIDI Lab X1 Carbon++0.4]", "models": "[QIDI Tech X1 Carbon++0.4]",
"name": "QIDI Support W @QDT X1C", "name": "QIDI Support W @QDT X1C",
"selected": 1, "selected": 1,
"sub_path": "filament/QIDI Support W @QDT X1C.json", "sub_path": "filament/QIDI Support W @QDT X1C.json",
"type": "PLA", "type": "PLA",
"vendor": "QIDI Lab" "vendor": "QIDI Tech"
}, },
"QIDI TPU 95A @QDT X1": { "QIDI TPU 95A @QDT X1": {
"models": "[QIDI Lab X1++0.4]", "models": "[QIDI Tech X1++0.4]",
"name": "QIDI TPU 95A @QDT X1", "name": "QIDI TPU 95A @QDT X1",
"selected": 1, "selected": 1,
"sub_path": "filament/QIDI TPU 95A @QDT X1.json", "sub_path": "filament/QIDI TPU 95A @QDT X1.json",
"type": "TPU", "type": "TPU",
"vendor": "QIDI Lab" "vendor": "QIDI Tech"
}, },
"QIDI TPU 95A @QDT X1C": { "QIDI TPU 95A @QDT X1C": {
"models": "[QIDI Lab X1 Carbon++0.4][QIDI Lab X1 Carbon++0.6][QIDI Lab X1 Carbon++0.8]", "models": "[QIDI Tech X1 Carbon++0.4][QIDI Tech X1 Carbon++0.6][QIDI Tech X1 Carbon++0.8]",
"name": "QIDI TPU 95A @QDT X1C", "name": "QIDI TPU 95A @QDT X1C",
"selected": 1, "selected": 1,
"sub_path": "filament/QIDI TPU 95A @QDT X1C.json", "sub_path": "filament/QIDI TPU 95A @QDT X1C.json",
"type": "TPU", "type": "TPU",
"vendor": "QIDI Lab" "vendor": "QIDI Tech"
}, },
"Generic ABS": { "Generic ABS": {
"models": "[QIDI Lab X1 Carbon++0.4][QIDI Lab X1++0.4]", "models": "[QIDI Tech X1 Carbon++0.4][QIDI Tech X1++0.4]",
"name": "Generic ABS", "name": "Generic ABS",
"selected": 0, "selected": 0,
"sub_path": "filament/Generic ABS.json", "sub_path": "filament/Generic ABS.json",
@@ -161,7 +161,7 @@ var cData={
"vendor": "Generic" "vendor": "Generic"
}, },
"Generic ASA": { "Generic ASA": {
"models": "[QIDI Lab X1 Carbon++0.4][QIDI Lab X1++0.4]", "models": "[QIDI Tech X1 Carbon++0.4][QIDI Tech X1++0.4]",
"name": "Generic ASA", "name": "Generic ASA",
"selected": 0, "selected": 0,
"sub_path": "filament/Generic ASA.json", "sub_path": "filament/Generic ASA.json",
@@ -169,7 +169,7 @@ var cData={
"vendor": "Generic" "vendor": "Generic"
}, },
"Generic PA": { "Generic PA": {
"models": "[QIDI Lab X1 Carbon++0.4]", "models": "[QIDI Tech X1 Carbon++0.4]",
"name": "Generic PA", "name": "Generic PA",
"selected": 0, "selected": 0,
"sub_path": "filament/Generic PA.json", "sub_path": "filament/Generic PA.json",
@@ -177,7 +177,7 @@ var cData={
"vendor": "Generic" "vendor": "Generic"
}, },
"Generic PA-CF": { "Generic PA-CF": {
"models": "[QIDI Lab X1 Carbon++0.4]", "models": "[QIDI Tech X1 Carbon++0.4]",
"name": "Generic PA-CF", "name": "Generic PA-CF",
"selected": 0, "selected": 0,
"sub_path": "filament/Generic PA-CF.json", "sub_path": "filament/Generic PA-CF.json",
@@ -185,7 +185,7 @@ var cData={
"vendor": "Generic" "vendor": "Generic"
}, },
"Generic PC": { "Generic PC": {
"models": "[QIDI Lab X1 Carbon++0.4]", "models": "[QIDI Tech X1 Carbon++0.4]",
"name": "Generic PC", "name": "Generic PC",
"selected": 0, "selected": 0,
"sub_path": "filament/Generic PC.json", "sub_path": "filament/Generic PC.json",
@@ -193,7 +193,7 @@ var cData={
"vendor": "Generic" "vendor": "Generic"
}, },
"Generic PETG": { "Generic PETG": {
"models": "[QIDI Lab X1 Carbon++0.4][QIDI Lab X1++0.4]", "models": "[QIDI Tech X1 Carbon++0.4][QIDI Tech X1++0.4]",
"name": "Generic PETG", "name": "Generic PETG",
"selected": 0, "selected": 0,
"sub_path": "filament/Generic PETG.json", "sub_path": "filament/Generic PETG.json",
@@ -201,7 +201,7 @@ var cData={
"vendor": "Generic" "vendor": "Generic"
}, },
"Generic PLA": { "Generic PLA": {
"models": "[QIDI Lab X1 Carbon++0.4][QIDI Lab X1++0.4]", "models": "[QIDI Tech X1 Carbon++0.4][QIDI Tech X1++0.4]",
"name": "Generic PLA", "name": "Generic PLA",
"selected": 1, "selected": 1,
"sub_path": "filament/Generic PLA.json", "sub_path": "filament/Generic PLA.json",
@@ -209,7 +209,7 @@ var cData={
"vendor": "Generic" "vendor": "Generic"
}, },
"Generic PLA-CF": { "Generic PLA-CF": {
"models": "[QIDI Lab X1 Carbon++0.4]", "models": "[QIDI Tech X1 Carbon++0.4]",
"name": "Generic PLA-CF", "name": "Generic PLA-CF",
"selected": 0, "selected": 0,
"sub_path": "filament/Generic PLA-CF.json", "sub_path": "filament/Generic PLA-CF.json",
@@ -217,7 +217,7 @@ var cData={
"vendor": "Generic" "vendor": "Generic"
}, },
"Generic PVA": { "Generic PVA": {
"models": "[QIDI Lab X1 Carbon++0.4][QIDI Lab X1++0.4]", "models": "[QIDI Tech X1 Carbon++0.4][QIDI Tech X1++0.4]",
"name": "Generic PVA", "name": "Generic PVA",
"selected": 0, "selected": 0,
"sub_path": "filament/Generic PVA.json", "sub_path": "filament/Generic PVA.json",
@@ -225,7 +225,7 @@ var cData={
"vendor": "Generic" "vendor": "Generic"
}, },
"Generic TPU": { "Generic TPU": {
"models": "[QIDI Lab X1 Carbon++0.4][QIDI Lab X1++0.4]", "models": "[QIDI Tech X1 Carbon++0.4][QIDI Tech X1++0.4]",
"name": "Generic TPU", "name": "Generic TPU",
"selected": 0, "selected": 0,
"sub_path": "filament/Generic TPU.json", "sub_path": "filament/Generic TPU.json",
@@ -233,7 +233,7 @@ var cData={
"vendor": "Generic" "vendor": "Generic"
}, },
"PolyLite PLA @QDT X1": { "PolyLite PLA @QDT X1": {
"models": "[QIDI Lab X1++0.4]", "models": "[QIDI Tech X1++0.4]",
"name": "PolyLite PLA @QDT X1", "name": "PolyLite PLA @QDT X1",
"selected": 1, "selected": 1,
"sub_path": "filament/PolyLite PLA @QDT X1.json", "sub_path": "filament/PolyLite PLA @QDT X1.json",
@@ -241,7 +241,7 @@ var cData={
"vendor": "Polymaker" "vendor": "Polymaker"
}, },
"PolyLite PLA @QDT X1C": { "PolyLite PLA @QDT X1C": {
"models": "[QIDI Lab X1 Carbon++0.4]", "models": "[QIDI Tech X1 Carbon++0.4]",
"name": "PolyLite PLA @QDT X1C", "name": "PolyLite PLA @QDT X1C",
"selected": 1, "selected": 1,
"sub_path": "filament/PolyLite PLA @QDT X1C.json", "sub_path": "filament/PolyLite PLA @QDT X1C.json",
@@ -249,7 +249,7 @@ var cData={
"vendor": "Polymaker" "vendor": "Polymaker"
}, },
"PolyTerra PLA @QDT X1": { "PolyTerra PLA @QDT X1": {
"models": "[QIDI Lab X1++0.4]", "models": "[QIDI Tech X1++0.4]",
"name": "PolyTerra PLA @QDT X1", "name": "PolyTerra PLA @QDT X1",
"selected": 1, "selected": 1,
"sub_path": "filament/PolyTerra PLA @QDT X1.json", "sub_path": "filament/PolyTerra PLA @QDT X1.json",
@@ -257,7 +257,7 @@ var cData={
"vendor": "Polymaker" "vendor": "Polymaker"
}, },
"PolyTerra PLA @QDT X1C": { "PolyTerra PLA @QDT X1C": {
"models": "[QIDI Lab X1 Carbon++0.4]", "models": "[QIDI Tech X1 Carbon++0.4]",
"name": "PolyTerra PLA @QDT X1C", "name": "PolyTerra PLA @QDT X1C",
"selected": 1, "selected": 1,
"sub_path": "filament/PolyTerra PLA @QDT X1C.json", "sub_path": "filament/PolyTerra PLA @QDT X1C.json",
@@ -266,54 +266,54 @@ var cData={
} }
}, },
"machine": { "machine": {
"QIDI Lab X1 0.4 nozzle": { "QIDI Tech X1 0.4 nozzle": {
"model": "QIDI Lab X1", "model": "QIDI Tech X1",
"name": "QIDI Lab X1 0.4 nozzle", "name": "QIDI Tech X1 0.4 nozzle",
"nozzle": "0.4", "nozzle": "0.4",
"sub_path": "machine/QIDI Lab X1 0.4 nozzle.json" "sub_path": "machine/QIDI Tech X1 0.4 nozzle.json"
}, },
"QIDI Lab X1 Carbon 0.2 nozzle": { "QIDI Tech X1 Carbon 0.2 nozzle": {
"model": "QIDI Lab X1 Carbon", "model": "QIDI Tech X1 Carbon",
"name": "QIDI Lab X1 Carbon 0.2 nozzle", "name": "QIDI Tech X1 Carbon 0.2 nozzle",
"nozzle": "0.2", "nozzle": "0.2",
"sub_path": "machine/QIDI Lab X1 Carbon 0.2 nozzle.json" "sub_path": "machine/QIDI Tech X1 Carbon 0.2 nozzle.json"
}, },
"QIDI Lab X1 Carbon 0.4 nozzle": { "QIDI Tech X1 Carbon 0.4 nozzle": {
"model": "QIDI Lab X1 Carbon", "model": "QIDI Tech X1 Carbon",
"name": "QIDI Lab X1 Carbon 0.4 nozzle", "name": "QIDI Tech X1 Carbon 0.4 nozzle",
"nozzle": "0.4", "nozzle": "0.4",
"sub_path": "machine/QIDI Lab X1 Carbon 0.4 nozzle.json" "sub_path": "machine/QIDI Tech X1 Carbon 0.4 nozzle.json"
}, },
"QIDI Lab X1 Carbon 0.6 nozzle": { "QIDI Tech X1 Carbon 0.6 nozzle": {
"model": "QIDI Lab X1 Carbon", "model": "QIDI Tech X1 Carbon",
"name": "QIDI Lab X1 Carbon 0.6 nozzle", "name": "QIDI Tech X1 Carbon 0.6 nozzle",
"nozzle": "0.6", "nozzle": "0.6",
"sub_path": "machine/QIDI Lab X1 Carbon 0.6 nozzle.json" "sub_path": "machine/QIDI Tech X1 Carbon 0.6 nozzle.json"
}, },
"QIDI Lab X1 Carbon 0.8 nozzle": { "QIDI Tech X1 Carbon 0.8 nozzle": {
"model": "QIDI Lab X1 Carbon", "model": "QIDI Tech X1 Carbon",
"name": "QIDI Lab X1 Carbon 0.8 nozzle", "name": "QIDI Tech X1 Carbon 0.8 nozzle",
"nozzle": "0.8", "nozzle": "0.8",
"sub_path": "machine/QIDI Lab X1 Carbon 0.8 nozzle.json" "sub_path": "machine/QIDI Tech X1 Carbon 0.8 nozzle.json"
} }
}, },
"model": [ "model": [
{ {
"cover": "C:\\Users\\zorro\\AppData\\Roaming\\QIDIStudio\\system\\QDT\\QIDI Lab X1 Carbon_cover.png", "cover": "C:\\Users\\zorro\\AppData\\Roaming\\QIDIStudio\\system\\QDT\\QIDI Tech X1 Carbon_cover.png",
"materials": "Generic PLA;QIDI PLA Matte @QDT X1C;QIDI PLA Basic @QDT X1C;QIDI ABS @QDT X1C;QIDI PC @QDT X1C;QIDI Support W @QDT X1C;QIDI TPU 95A @QDT X1C;PolyTerra PLA @QDT X1C;PolyLite PLA @QDT X1C;", "materials": "Generic PLA;QIDI PLA Matte @QDT X1C;QIDI PLA Basic @QDT X1C;QIDI ABS @QDT X1C;QIDI PC @QDT X1C;QIDI Support W @QDT X1C;QIDI TPU 95A @QDT X1C;PolyTerra PLA @QDT X1C;PolyLite PLA @QDT X1C;",
"model": "QIDI Lab X1 Carbon", "model": "QIDI Tech X1 Carbon",
"nozzle_diameter": "0.4;0.2;0.6;0.8", "nozzle_diameter": "0.4;0.2;0.6;0.8",
"nozzle_selected": "0.2;0.6", "nozzle_selected": "0.2;0.6",
"sub_path": "machine/QIDI Lab X1 Carbon.json", "sub_path": "machine/QIDI Tech X1 Carbon.json",
"vendor": "QDT" "vendor": "QDT"
}, },
{ {
"cover": "C:\\Users\\zorro\\AppData\\Roaming\\QIDIStudio\\system\\QDT\\QIDI Lab X1_cover.png", "cover": "C:\\Users\\zorro\\AppData\\Roaming\\QIDIStudio\\system\\QDT\\QIDI Tech X1_cover.png",
"materials": "Generic PLA;QIDI PLA Matte @QDT X1;QIDI PLA Basic @QDT X1;QIDI ABS @QDT X1C;QIDI PC @QDT X1C;QIDI Support W @QDT X1;QIDI TPU 95A @QDT X1;PolyTerra PLA @QDT X1;PolyLite PLA @QDT X1;", "materials": "Generic PLA;QIDI PLA Matte @QDT X1;QIDI PLA Basic @QDT X1;QIDI ABS @QDT X1C;QIDI PC @QDT X1C;QIDI Support W @QDT X1;QIDI TPU 95A @QDT X1;PolyTerra PLA @QDT X1;PolyLite PLA @QDT X1;",
"model": "QIDI Lab X1", "model": "QIDI Tech X1",
"nozzle_diameter": "0.4", "nozzle_diameter": "0.4",
"nozzle_selected": "0.4", "nozzle_selected": "0.4",
"sub_path": "machine/QIDI Lab X1.json", "sub_path": "machine/QIDI Tech X1.json",
"vendor": "QDT" "vendor": "QDT"
} }
], ],

2
resources/web/guide/23/23.js
View File

@@ -240,7 +240,7 @@ function SortUI()
let fWholeName = OneFila['name'].trim(); let fWholeName = OneFila['name'].trim();
let fShortName = GetFilamentShortname(OneFila['name']); let fShortName = GetFilamentShortname(OneFila['name']);
let fVendor = OneFila['vendor']; let fVendor = OneFila['vendor'];
if (fVendor != "Generic") if (fVendor == "QIDI")
continue; continue;
let fType = OneFila['type']; let fType = OneFila['type'];
let fSelect = OneFila['selected']; let fSelect = OneFila['selected'];

16
resources/web/guide/23/index.html
View File

@@ -26,14 +26,14 @@
<div class="CName"><span class="trans" tid="t15">printer</span>：</div> <div class="CName"><span class="trans" tid="t15">printer</span>：</div>
<div class="CValues"> <div class="CValues">
<div><input type="checkbox" mode="all" onClick="ChooseAllMachine()" /><span class="trans" tid="t11">all</span></div> <div><input type="checkbox" mode="all" onClick="ChooseAllMachine()" /><span class="trans" tid="t11">all</span></div>
<!-- <div><input type="checkbox" mode="-normal" onChange="SortFilament()" />QIDIlab QDT-3DP-001-V4-normal</div> <!-- <div><input type="checkbox" mode="-normal" onChange="SortFilament()" />QIDITech QDT-3DP-001-V4-normal</div>
<div><input type="checkbox" />QIDIlab QDT-3DP-001-V5-normal</div> <div><input type="checkbox" />QIDITech QDT-3DP-001-V5-normal</div>
<div><input type="checkbox" />QIDIlab QDT-3DP-001-V4-normal</div> <div><input type="checkbox" />QIDITech QDT-3DP-001-V4-normal</div>
<div><input type="checkbox" />QIDIlab QDT-3DP-001-V4-normal</div> <div><input type="checkbox" />QIDITech QDT-3DP-001-V4-normal</div>
<div><input type="checkbox" />QIDIlab QDT-3DP-001-V5-normal</div> <div><input type="checkbox" />QIDITech QDT-3DP-001-V5-normal</div>
<div><input type="checkbox" />QIDIlab QDT-3DP-001-V4-normal</div> <div><input type="checkbox" />QIDITech QDT-3DP-001-V4-normal</div>
<div><input type="checkbox" />QIDIlab QDT-3DP-001-V4-normal</div> <div><input type="checkbox" />QIDITech QDT-3DP-001-V4-normal</div>
<div><input type="checkbox" />QIDIlab QDT-3DP-001-V5-normal</div> --> <div><input type="checkbox" />QIDITech QDT-3DP-001-V5-normal</div> -->
</div> </div>
</div> </div>

4
resources/web/guide/24/24.js
View File

@@ -73,7 +73,7 @@ function HandleModelList( pVal )
{ {
let sVV=strVendor; let sVV=strVendor;
if( sVV=="QDT" ) if( sVV=="QDT" )
sVV="QIDI Lab"; sVV="QIDI Tech";
let HtmlNewVendor='<div class="OneVendorBlock" Vendor="'+strVendor+'">'+ let HtmlNewVendor='<div class="OneVendorBlock" Vendor="'+strVendor+'">'+
'<div class="BlockBanner">'+ '<div class="BlockBanner">'+
@@ -87,7 +87,7 @@ function HandleModelList( pVal )
'</div>'+ '</div>'+
'</div>'; '</div>';
if(sVV=='QIDI Lab') if(sVV=='QIDI Tech')
$('#Content').html( HtmlNewVendor + $('#Content').html() ); $('#Content').html( HtmlNewVendor + $('#Content').html() );
else else
$('#Content').append( HtmlNewVendor ); $('#Content').append( HtmlNewVendor );

24
resources/web/homepage3/css/common.css
View File

@@ -15,6 +15,7 @@ html, body {
padding:0px; padding:0px;
border: 0px; border: 0px;
margin: 0px; margin: 0px;
background-color: #FFF;
} }
/*---字体----*/ /*---字体----*/
@@ -92,8 +93,14 @@ html, body {
#MenuArea #MenuArea
{ {
display:flex; display:flex;
justify-content: flex-end;
margin-bottom: 24px; margin-bottom: 24px;
flex-direction:row-reverse;
}
#MenuBtnBlock
{
display:flex;
margin-left: 60px;
} }
.Menu_Btn .Menu_Btn
@@ -110,6 +117,13 @@ html, body {
width: 18px; width: 18px;
} }
.Menu_Btn span
{
display: inline-block;
width: 100%;
white-space: nowrap;
}
/*---弹性内容块---*/ /*---弹性内容块---*/
.GuideBlock .GuideBlock
{ {
@@ -122,7 +136,7 @@ html, body {
{ {
width: calc(50% - 20px); width: calc(50% - 20px);
} }
.SingleGuideBar :nth-child(n+3) .SingleGuideBar > :nth-child(n+3)
{ {
display: none; display: none;
} }
@@ -134,7 +148,7 @@ html, body {
{ {
width: calc(33% - 20px); width: calc(33% - 20px);
} }
.SingleGuideBar :nth-child(n+4) .SingleGuideBar > :nth-child(n+4)
{ {
display: none; display: none;
} }
@@ -145,7 +159,7 @@ html, body {
{ {
width: calc(25% - 20px); width: calc(25% - 20px);
} }
.SingleGuideBar :nth-child(n+5) .SingleGuideBar > :nth-child(n+5)
{ {
display: none; display: none;
} }
@@ -156,7 +170,7 @@ html, body {
{ {
width: calc(20% - 20px); width: calc(20% - 20px);
} }
.SingleGuideBar :nth-child(n+6) .SingleGuideBar > :nth-child(n+6)
{ {
display: none; display: none;
} }

47
resources/web/homepage3/css/dark.css
View File

@@ -97,6 +97,12 @@ html,body
color:#818183; color:#818183;
} }
/*----Recent Opened----*/
.FileImg
{
background-color:#575757;
}
/*---Staff PIck----*/ /*---Staff PIck----*/
.HotModelPiece .HotModelPiece
{ {
@@ -112,3 +118,44 @@ html,body
{ {
filter: invert(1); filter: invert(1);
} }
#HotModel_Search_Bar
{
border: 1px solid #323A3D;
background-color: #36363A;
}
#HotModel_Search_InputArea
{
background-color: #36363A;
}
#HotModel_Search_Input
{
background-color: #36363A;
caret-color: white;
color: #FFFFFF;
}
#HotModel_Search_Btn img
{
filter: invert(100%) brightness(100);
}
/*----Makerlab-----*/
.MakerlabItem
{
border: none;
}
/*---Print History----*/
.PrintHistoryImg
{
border: 1px solid #474747;
background-color: #575757;
}
#PrintHistory_Refresh_Btn
{
filter: invert(80%) brightness(20);
}

176
resources/web/homepage3/css/home.css
View File

@@ -32,14 +32,14 @@ body
word-break: break-all; word-break: break-all;
position: relative; position: relative;
cursor: pointer; cursor: pointer;
border-radius: 8px; border-radius: 8px;
border: 1px solid #EEEEEE;
} }
.MakerlabImg img .MakerlabImg img
{ {
width: 100%; width: 100%;
aspect-radio: 16/9; aspect-radio: 16/9;
border-radius: 8px 8px 0px 0px;
} }
.MakerlabTextBlock .MakerlabTextBlock
@@ -71,4 +71,174 @@ body
{ {
font-size: 10px; font-size: 10px;
color: #ACACAC; color: #ACACAC;
} }
/*------Print History------*/
#PrintHistoryArea
{
display: none;
min-height: 100px;
}
#PrintHistory_Refresh_Btn
{
margin-left: 30px;
cursor: pointer;
filter: brightness(3);
width: 24px;
}
#PrintHistory_Refresh_Btn:hover
{
width: 27px;
}
#PrintHistoryList
{
display: flex;
}
.PrintHistoryItem
{
position: relative;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
word-break: break-all;
position: relative;
cursor: pointer;
border-radius: 12px;
overflow: hidden;
}
.PrintHistoryImg
{
border-radius: 12px;
border: 1px solid #EEEEEE;
background-color: #E4E4E4;
}
.PrintHistoryImg img
{
width: calc(100% - 2px);
aspect-ratio: 4/3;
object-fit:contain;
}
.PrintHistoryTextBlock
{
display: flex;
flex-direction: column;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
margin-top: 2px;
}
.PrintHistoryName
{
font-size: 14px;
font-weight: 700;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
}
.PrintHistory_Line2
{
display: flex;
flex-direction: row;
align-items: center;
font-size: 12px;
}
.PrintHistory_Line2 img
{
width: 14px;
height: 14px;
margin-right: 4px;
}
.PH_PrintTime
{
width: 50px;
margin-right: 4px;
}
.PH_DeviceName
{
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
}
.PrintHistoryInfo
{
display: flex;
justify-content: space-between;
}
.PrintHistoryPlate
{
display: flex;
font-size: 12px;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
}
.PH_PlateName
{
flex-grow: 1;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
}
.PH_PrintDate
{
margin-left: 4px;
}
.PrintHistoryStatus
{
margin-left: 6px;
font-size: 12px;
font-weight: 700;
}
.PH_Status_Printing
{
color: #FF6F00;
}
.PH_Status_Fail
{
color: #D01B1B;
}
.PH_Status_Success
{
color: #00AE42;
}
.PH_Gcode_Icon
{
background-color: #8F8F8F;
display: inline-block;
padding: 6px 12px;
width: Hug (61px)px;
height: Hug (28px)px;
gap: 10px;
border-radius: 0px 0px 4px 0px;
opacity: 0px;
color: #FFFFFF;
position: absolute;
top: 1px;
left: 1px;
font-weight: 700;
}

7
resources/web/homepage3/css/left.css
View File

@@ -113,11 +113,9 @@ body
#NoPluginTip #NoPluginTip
{ {
position: absolute; position: absolute;
top: 0px;
left: 0px; left: 0px;
bottom: 0px; bottom: 0px;
right: 0px; right: 0px;
z-index: 1;
display: none; display: none;
flex-direction: column; flex-direction: column;
justify-content: flex-end; justify-content: flex-end;
@@ -217,6 +215,11 @@ body
display: none; display: none;
} }
.BtnItem[menu="printhistory"]
{
display: none;
}
.JumpIcon .JumpIcon
{ {
display: none; display: none;

42
resources/web/homepage3/css/online.css
View File

@@ -60,7 +60,8 @@
display:flex; display:flex;
flex-direction: column; flex-direction: column;
cursor: pointer; cursor: pointer;
border-radius: 8px; border-radius: 10px;
overflow: hidden;
} }
.HotModel_PrevBlock .HotModel_PrevBlock
@@ -160,3 +161,42 @@
align-items: center; align-items: center;
} }
/*-----Search Bar------*/
#HotModel_Search_Bar
{
display: none;
align-items: center;
border-radius: 22px;
border: 1px solid #EEEEEE;
flex-grow: 1;
background-color: #FFFFFF;
}
#HotModel_Search_InputArea
{
background-color: #FFF;
display: flex;
align-items: center;
flex-grow: 1;
padding: 0px 22px 0px 0px;
border-radius: 22px 0px 0px 22px;
}
#HotModel_Search_Input
{
height: 30px;
flex-grow: 1;
outline: none;
font-size: 16px;
}
#HotModel_Search_Btn
{
width: 60px;
height: 100%;
border-radius: 0px 22px 22px 0px;
display: flex;
align-items: center;
justify-content: center;
}

1
resources/web/homepage3/css/recent.css
View File

@@ -102,7 +102,6 @@
word-break: break-all; word-break: break-all;
position: relative; position: relative;
cursor: pointer; cursor: pointer;
border-radius: 8px;
} }
.FileMask .FileMask

2
resources/web/homepage3/css/rightcommon.css
View File

@@ -1,7 +1,7 @@
html html
{ {
background-color: #F8F8F8; background-color: #FFF;
padding: 28px 36px; padding: 28px 36px;
display: flex; display: flex;
justify-content: center; justify-content: center;

160
resources/web/homepage3/home.html
View File

@@ -18,20 +18,29 @@
<script type="text/javascript" src="../include/globalapi.js"></script> <script type="text/javascript" src="../include/globalapi.js"></script>
<script type="text/javascript" src="../data/text.js"></script> <script type="text/javascript" src="../data/text.js"></script>
<script type="text/javascript" src="js/test.js"></script>
<script type="text/javascript" src="js/home.js"></script> <script type="text/javascript" src="js/home.js"></script>
<!--<script type="text/javascript" src="js/test.js"></script>-->
</head> </head>
<body class="ZScrol" onLoad="OnHomeInit()"> <body class="ZScrol" onLoad="OnHomeInit()">
<!----------Project Menu----------> <!----------Project Menu---------->
<div id="MenuArea"> <div id="MenuArea">
<div class="Menu_Btn Btn_White" onClick="OnClickOpenProject()"> <div id="MenuBtnBlock">
<img src="img/project_open.svg" /><span class="trans" tid='t33'>Open Project</span> <div class="Menu_Btn Btn_White" onClick="OnClickOpenProject()">
</div> <img src="img/project_open.svg" /><span class="trans" tid='t33'>Open Project</span>
<div class="Menu_Btn Btn_Green" onClick="OnClickNewProject()"> </div>
<img src="img/project_new.svg" /><span class="trans" tid='t32'>Create new project</span> <div class="Menu_Btn Btn_Green" onClick="OnClickNewProject()">
</div> <img src="img/project_new.svg" /><span class="trans" tid='t32'>Create new project</span>
</div>
</div>
<div id="HotModel_Search_Bar">
<div id="HotModel_Search_Btn" >
<img src="img/search.svg" />
</div>
<div id="HotModel_Search_InputArea">
<input id="HotModel_Search_Input" maxlength="1000" placeholder="" />
</div>
</div>
</div> </div>
@@ -101,7 +110,7 @@
<div class="Content-Title trans TextS1" tid="t107">Online Models</div> <div class="Content-Title trans TextS1" tid="t107">Online Models</div>
</div> </div>
<div class="Right_Title_More TextS1" onClick="SwtichLeftMenu('online')"><span class="trans" tid="t108">MORE</span> ></div> <div class="Right_Title_More TextS1" onClick="SwtichLeftMenu('online')"><span class="trans" tid="t108">MORE</span> ></div>
</div> </div>
<div id="HotModelList" class="SingleGuideBar"> <div id="HotModelList" class="SingleGuideBar">
<!-- <div class="HotModelPiece GuideBlock" onClick="OpenOneStaffPickModel(1)"> <!-- <div class="HotModelPiece GuideBlock" onClick="OpenOneStaffPickModel(1)">
<div class="HotModel_PrevBlock"> <div class="HotModel_PrevBlock">
@@ -251,12 +260,13 @@
<div id="RecentTitleBlock"> <div id="RecentTitleBlock">
<div id="Recent_LEFT_Title"> <div id="Recent_LEFT_Title">
<img class="TitleSmallIcon" src="./img/ml.svg" /> <img class="TitleSmallIcon" src="./img/ml.svg" />
<div id="RecentTitle" class="Content-Title trans TextS1" tid="">Makerlab</div> <div id="RecentTitle" class="Content-Title trans TextS1" tid="">MakerLab</div>
</div> </div>
<div class="Right_Title_More TextS1" onClick="SwtichLeftMenu('makerlab')"><span class="trans" tid="t108">MORE</span> ></div> <div class="Right_Title_More TextS1" onClick="SwtichLeftMenu('makerlab')"><span class="trans" tid="t108">MORE</span> ></div>
</div> </div>
<div id="LabList" class="SingleGuideBar"> <div id="LabList" class="SingleGuideBar">
<!-- <div class="MakerlabItem GuideBlock" onClick="OnOpenOneMakerlab('aaaa')" > <!--
<div class="MakerlabItem GuideBlock" onClick="OnOpenOneMakerlab('aaaa')" >
<div class="MakerlabImg"><img src="img/ml1.jpg"/></div> <div class="MakerlabImg"><img src="img/ml1.jpg"/></div>
<div class="MakerlabTextBlock"> <div class="MakerlabTextBlock">
<div class="MakerlabName">xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx</div> <div class="MakerlabName">xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx</div>
@@ -303,10 +313,134 @@
<div class="MakerlabDesc">xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx</div> <div class="MakerlabDesc">xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx</div>
<div class="MakerlabAuthor">xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx</div> <div class="MakerlabAuthor">xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx</div>
</div> </div>
</div> --> </div>
-->
</div>
</div>
<!-------------Print History-------------->
<div id="PrintHistoryArea">
<div id="PrintHistory_Bar" class="Title_Bar">
<div class="Title_Left_Area">
<img class="TitleSmallIcon" src="./img/ph.svg" />
<div class="Content-Title trans TextS1" tid="t117">Print History</div>
<img id="PrintHistory_Refresh_Btn" src="img/refresh.svg" onClick="SendMsg_GetPrintHistory()" />
</div>
<div class="Right_Title_More TextS1" onClick="SwtichLeftMenu('printhistory')"><span class="trans" tid="t108">MORE</span> ></div>
</div>
<div id="PrintHistoryList" class="SingleGuideBar">
<!-- <div class="PrintHistoryItem GuideBlock" onClick="OnOpenPrintHistory(0)" >
<div class="PrintHistoryImg"><img src="img/ml1.jpg"/></div>
<div class="PrintHistoryTextBlock">
<div class="PrintHistoryName TextS1">xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx</div>
<div class="PrintHistory_Line2">
<img src="img/time.svg" /><span class="PH_PrintTime TextS2">999.5h</span>
<img src="img/device.svg" /><span class="PH_DeviceName TextS2">XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX</span>
</div>
<div class="PrintHistoryInfo">
<div class="PrintHistoryPlate TextS2">
<div class="PH_PlateName"><span tid="t123" class="trans"></span>&nbsp;1<span title="t124" class="trans"></span></div>
<div class="PH_PrintDate">(2022/07/22 21:11)</div>
</div>
<div class="PrintHistoryStatus PH_Status_Printing TextS2 trans" tid="t118">Printing</div>
</div>
</div>
<div class="PH_Gcode_Icon">Gcode</div>
</div>
<div class="PrintHistoryItem GuideBlock" onClick="OnOpenPrintHistory(0)" >
<div class="PrintHistoryImg"><img src="img/ml1.jpg"/></div>
<div class="PrintHistoryTextBlock">
<div class="PrintHistoryName TextS1">xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx</div>
<div class="PrintHistory_Line2">
<img src="img/time.svg" /><span class="PH_PrintTime TextS2">999.5h</span>
<img src="img/device.svg" /><span class="PH_DeviceName TextS2">XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX</span>
</div>
<div class="PrintHistoryInfo">
<div class="PrintHistoryPlate TextS2">
<div class="PH_PlateName"><span tid="t123" class="trans"></span>&nbsp;1<span title="t124" class="trans"> - xxxxxxxxxxxxx</span></div>
<div class="PH_PrintDate">(2022/07/22 21:11)</div>
</div>
<div class="PrintHistoryStatus PH_Status_Success TextS2 trans" tid="t119">Success</div>
</div>
</div>
<div class="PH_Gcode_Icon">Gcode</div>
</div>
<div class="PrintHistoryItem GuideBlock" onClick="OnOpenPrintHistory(0)" >
<div class="PrintHistoryImg"><img src="img/ml1.jpg"/></div>
<div class="PrintHistoryTextBlock">
<div class="PrintHistoryName TextS1">xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx</div>
<div class="PrintHistory_Line2">
<img src="img/time.svg" /><span class="PH_PrintTime TextS2">999.5h</span>
<img src="img/device.svg" /><span class="PH_DeviceName TextS2">XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX</span>
</div>
<div class="PrintHistoryInfo">
<div class="PrintHistoryPlate TextS2">
<div class="PH_PlateName"><span tid="t123" class="trans"></span>&nbsp;1<span title="t124" class="trans"></span></div>
<div class="PH_PrintDate">(2022/07/22 21:11)</div>
</div>
<div class="PrintHistoryStatus PH_Status_Fail TextS2 trans" tid="t120">Canceled</div>
</div>
</div>
<div class="PH_Gcode_Icon">Gcode</div>
</div>
<div class="PrintHistoryItem GuideBlock" onClick="OnOpenPrintHistory(0)" >
<div class="PrintHistoryImg"><img src="img/ml1.jpg"/></div>
<div class="PrintHistoryTextBlock">
<div class="PrintHistoryName TextS1">xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx</div>
<div class="PrintHistory_Line2">
<img src="img/time.svg" /><span class="PH_PrintTime TextS2">999.5h</span>
<img src="img/device.svg" /><span class="PH_DeviceName TextS2">XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX</span>
</div>
<div class="PrintHistoryInfo">
<div class="PrintHistoryPlate TextS2">
<div class="PH_PlateName"><span tid="t123" class="trans"></span>&nbsp;1<span title="t124" class="trans"></span></div>
<div class="PH_PrintDate">(2022/07/22 21:11)</div>
</div>
<div class="PrintHistoryStatus PH_Status_Printing TextS2 trans" tid="t118">Printing</div>
</div>
</div>
<div class="PH_Gcode_Icon">Gcode</div>
</div>
<div class="PrintHistoryItem GuideBlock" onClick="OnOpenPrintHistory(0)" >
<div class="PrintHistoryImg"><img src="img/ml1.jpg"/></div>
<div class="PrintHistoryTextBlock">
<div class="PrintHistoryName TextS1">xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx</div>
<div class="PrintHistory_Line2">
<img src="img/time.svg" /><span class="PH_PrintTime TextS2">999.5h</span>
<img src="img/device.svg" /><span class="PH_DeviceName TextS2">XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX</span>
</div>
<div class="PrintHistoryInfo">
<div class="PrintHistoryPlate TextS2">
<div class="PH_PlateName">xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx</div>
<div class="PH_PrintDate">(2022/07/22 21:11)</div>
</div>
<div class="PrintHistoryStatus PH_Status_Printing TextS2 trans" tid="t118">Printing</div>
</div>
</div>
<div class="PH_Gcode_Icon">Gcode</div>
</div>
<div class="PrintHistoryItem GuideBlock" onClick="OnOpenPrintHistory(0)" >
<div class="PrintHistoryImg"><img src="img/ml1.jpg"/></div>
<div class="PrintHistoryTextBlock">
<div class="PrintHistoryName TextS1">xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx</div>
<div class="PrintHistory_Line2">
<img src="img/time.svg" /><span class="PH_PrintTime TextS2">999.5h</span>
<img src="img/device.svg" /><span class="PH_DeviceName TextS2">XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX</span>
</div>
<div class="PrintHistoryInfo">
<div class="PrintHistoryPlate TextS2">
<div class="PH_PlateName"><span tid="t123" class="trans"></span>&nbsp;1<span title="t124" class="trans"></span></div>
<div class="PH_PrintDate">(2022/07/22 21:11)</div>
</div>
<div class="PrintHistoryStatus PH_Status_Printing TextS2 trans" tid="t118">Printing</div>
</div>
</div>
<div class="PH_Gcode_Icon">Gcode</div>
</div> -->
</div> </div>
</div> </div>
</div> </div>
<!----------Recent Context Menu---------> <!----------Recent Context Menu--------->

15
resources/web/homepage3/img/device.svg Normal file
View File

@@ -0,0 +1,15 @@
<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
<g clip-path="url(#clip0_18273_33564)">
<path fill-rule="evenodd" clip-rule="evenodd" d="M1.46387 3.92552C1.46387 3.64575 1.68122 3.41895 1.94934 3.41895H10.2717C10.5398 3.41895 10.7572 3.64575 10.7572 3.92552V12.6097C10.7572 12.8895 10.5398 13.1163 10.2717 13.1163H1.94934C1.68122 13.1163 1.46387 12.8895 1.46387 12.6097V3.92552ZM2.43481 4.4321V12.1032H9.78623V4.4321H2.43481Z" fill="#595959"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M4.6844 1.15161C4.76844 1.08584 4.87064 1.05029 4.97569 1.05029H12.5415C12.7378 1.05029 12.9148 1.17372 12.99 1.36301C13.0651 1.55231 13.0236 1.7702 12.8848 1.91508L10.615 4.2835C10.524 4.3785 10.4005 4.43187 10.2717 4.43187H1.94937C1.74041 4.43187 1.55489 4.29234 1.48881 4.08549C1.42273 3.87863 1.49092 3.65086 1.65809 3.52003L4.6844 1.15161ZM5.13751 2.06345L3.40578 3.41871H10.0706L11.3694 2.06345H5.13751Z" fill="#595959"/>
<path d="M6.48921 7.08301H12.5418L10.2721 10.2409H3.46289L6.48921 7.08301Z" fill="#DDDDDD"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M7.24543 3.37305C7.53792 3.37305 7.77503 3.62047 7.77503 3.92568V6.2941C7.77503 6.59931 7.53792 6.84673 7.24543 6.84673C6.95293 6.84673 6.71582 6.59931 6.71582 6.2941V3.92568C6.71582 3.62047 6.95293 3.37305 7.24543 3.37305Z" fill="#595959"/>
<path d="M10.2715 3.92555L12.5412 1.55713V9.45187L10.2715 12.6098V3.92555Z" fill="#DDDDDD"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M12.7271 1.08887C12.9085 1.16728 13.0268 1.35199 13.0268 1.55689V9.45162C13.0268 9.56123 12.9927 9.66788 12.9297 9.75557L10.66 12.9135C10.5346 13.0879 10.3163 13.1591 10.1181 13.0901C9.91985 13.0211 9.78613 12.8276 9.78613 12.6095V3.92531C9.78613 3.79095 9.83728 3.6621 9.92832 3.5671L12.1981 1.19868C12.3369 1.0538 12.5457 1.01046 12.7271 1.08887ZM10.7571 4.13514V11.0898L12.0559 9.28276V2.77988L10.7571 4.13514Z" fill="#595959"/>
</g>
<defs>
<clipPath id="clip0_18273_33564">
<rect width="13.4167" height="14" fill="white" transform="translate(0.458008)"/>
</clipPath>
</defs>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 2.0 KiB

8
resources/web/homepage3/img/left_ph.svg Normal file
View File

@@ -0,0 +1,8 @@
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M5.40039 4.91553H17.0909C17.3671 4.91553 17.5909 5.13939 17.5909 5.41553V9.8976C18.1143 9.97737 18.617 10.1201 19.0909 10.3179V5.41553C19.0909 4.31096 18.1955 3.41553 17.0909 3.41553H5.40039C4.29582 3.41553 3.40039 4.31096 3.40039 5.41553V19.0272C3.40039 20.1317 4.29582 21.0272 5.40039 21.0272H12.2727C11.7959 20.5923 11.3846 20.0868 11.0554 19.5272H5.40039C5.12425 19.5272 4.90039 19.3033 4.90039 19.0272V5.41553C4.90039 5.13938 5.12425 4.91553 5.40039 4.91553Z" fill="#6B6B6B"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M16.1221 7.88135C16.1221 8.29556 15.7863 8.63135 15.3721 8.63135L6.90246 8.63135C6.48824 8.63135 6.15246 8.29556 6.15246 7.88135C6.15246 7.46713 6.48824 7.13135 6.90246 7.13135L15.3721 7.13135C15.7863 7.13135 16.1221 7.46713 16.1221 7.88135Z" fill="#6B6B6B"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M10.667 12.2212C10.667 12.6354 10.3312 12.9712 9.91699 12.9712H6.90238C6.48816 12.9712 6.15238 12.6354 6.15238 12.2212C6.15238 11.807 6.48816 11.4712 6.90238 11.4712H9.91699C10.3312 11.4712 10.667 11.807 10.667 12.2212Z" fill="#6B6B6B"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M10.667 16.561C10.667 16.9752 10.3312 17.311 9.91699 17.311H6.90238C6.48816 17.311 6.15238 16.9752 6.15238 16.561C6.15238 16.1468 6.48816 15.811 6.90238 15.811H9.91699C10.3312 15.811 10.667 16.1468 10.667 16.561Z" fill="#6B6B6B"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M16.6118 12.7271C14.6577 12.7271 13.0732 14.3115 13.0732 16.2656C13.0732 18.2198 14.6577 19.8042 16.6118 19.8042C17.4261 19.8042 18.1742 19.5299 18.7723 19.0681C19.1002 18.815 19.5712 18.8756 19.8243 19.2035C20.0774 19.5313 20.0168 20.0023 19.689 20.2555C18.8379 20.9125 17.7698 21.3042 16.6118 21.3042C13.8292 21.3042 11.5732 19.0482 11.5732 16.2656C11.5732 13.483 13.8292 11.2271 16.6118 11.2271C19.3944 11.2271 21.6504 13.483 21.6504 16.2656C21.6504 17.0661 21.4632 17.8243 21.1296 18.4983C20.9459 18.8696 20.496 19.0216 20.1248 18.8379C19.7536 18.6541 19.6015 18.2043 19.7853 17.833C20.0189 17.3609 20.1504 16.8299 20.1504 16.2656C20.1504 14.3115 18.566 12.7271 16.6118 12.7271Z" fill="#6B6B6B"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M16.2773 12.918C16.6916 12.918 17.0273 13.2538 17.0273 13.668V15.8262H18.8871C19.3013 15.8262 19.6371 16.162 19.6371 16.5762C19.6371 16.9905 19.3013 17.3262 18.8871 17.3262H16.4953C15.9607 17.3262 15.5273 16.8929 15.5273 16.3583V13.668C15.5273 13.2538 15.8631 12.918 16.2773 12.918Z" fill="#6B6B6B"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 2.5 KiB

23
resources/web/homepage3/img/ph.svg Normal file
View File

@@ -0,0 +1,23 @@
<svg width="28" height="28" viewBox="0 0 28 28" fill="none" xmlns="http://www.w3.org/2000/svg">
<rect x="2.42383" y="2.28613" width="18.3456" height="22.6158" rx="3" fill="url(#paint0_linear_18237_33272)"/>
<circle cx="18.5852" cy="19.6536" r="6.0598" fill="url(#paint1_linear_18237_33272)"/>
<circle cx="19.5178" cy="19.614" r="6.0598" fill="url(#paint2_linear_18237_33272)"/>
<path d="M19.5176 15.8853V19.5466C19.5176 20.0989 19.9653 20.5466 20.5176 20.5466H22.5475" stroke="white" stroke-width="1.5" stroke-linecap="round"/>
<path d="M6.42285 6.67041H16.7712" stroke="white" stroke-width="2" stroke-linecap="round"/>
<path d="M6.42285 13.6084H12.1177" stroke="white" stroke-width="2" stroke-linecap="round"/>
<path d="M6.42285 20.5469H10.592" stroke="white" stroke-width="2" stroke-linecap="round"/>
<defs>
<linearGradient id="paint0_linear_18237_33272" x1="11.5966" y1="2.28613" x2="11.5966" y2="24.9019" gradientUnits="userSpaceOnUse">
<stop stop-color="#6662FF"/>
<stop offset="1" stop-color="#8945F8"/>
</linearGradient>
<linearGradient id="paint1_linear_18237_33272" x1="18.5852" y1="13.5937" x2="18.5852" y2="25.7134" gradientUnits="userSpaceOnUse">
<stop stop-color="#A8A6FF"/>
<stop offset="1" stop-color="#7345FF"/>
</linearGradient>
<linearGradient id="paint2_linear_18237_33272" x1="19.5178" y1="13.5542" x2="19.5178" y2="25.6738" gradientUnits="userSpaceOnUse">
<stop stop-color="#8C82FF"/>
<stop offset="1" stop-color="#9E9CFF"/>
</linearGradient>
</defs>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

3
resources/web/homepage3/img/refresh.svg Normal file
View File

@@ -0,0 +1,3 @@
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M20.069 10.7578C20.5849 10.7578 21 10.3428 21 9.82681V4.2406C21 3.72466 20.5849 3.30957 20.069 3.30957C19.553 3.30957 19.1379 3.72466 19.1379 4.2406V7.34793L18.3621 6.43629C16.7716 4.52767 14.3703 3.30957 11.6897 3.30957C6.89095 3.30957 3 7.20052 3 11.9992C3 16.7979 6.89095 20.6889 11.6897 20.6889C13.6448 20.6889 15.4526 20.041 16.9034 18.951C17.3147 18.6406 17.3961 18.0587 17.0897 17.6475C16.7832 17.2363 16.1974 17.1548 15.7862 17.4613C14.6457 18.3186 13.2297 18.8268 11.6897 18.8268C7.91897 18.8268 4.86207 15.7699 4.86207 11.9992C4.86207 8.22854 7.91897 5.17164 11.6897 5.17164C13.7961 5.17164 15.6815 6.12595 16.9345 7.63112L16.9384 7.63888L18.0091 8.89578H14.4828C13.9668 8.89578 13.5517 9.31086 13.5517 9.82681C13.5517 10.3428 13.9668 10.7578 14.4828 10.7578H20.069Z" fill="#1F1F1F"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 907 B

3
resources/web/homepage3/img/search.svg Normal file
View File

@@ -0,0 +1,3 @@
<svg width="19" height="20" viewBox="0 0 19 20" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M7.43718 16.285C9.03616 16.285 10.5107 15.7453 11.7171 14.8458L16.2555 19.5833C16.4661 19.8031 16.7438 19.9131 17.0406 19.9131C17.663 19.9131 18.1034 19.4133 18.1034 18.7737C18.1034 18.4738 18.0077 18.184 17.797 17.9741L13.2873 13.2566C14.2352 11.9573 14.8001 10.3481 14.8001 8.59904C14.8001 4.37127 11.4873 0.913086 7.43718 0.913086C3.39665 0.913086 0.0742188 4.36127 0.0742188 8.59904C0.0742188 12.8268 3.38707 16.285 7.43718 16.285ZM7.43718 14.6259C4.27752 14.6259 1.66362 11.8973 1.66362 8.59904C1.66362 5.30078 4.27752 2.57221 7.43718 2.57221C10.5968 2.57221 13.2107 5.30078 13.2107 8.59904C13.2107 11.8973 10.5968 14.6259 7.43718 14.6259Z" fill="#ACACAC"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 775 B

3
resources/web/homepage3/img/search_dark.svg Normal file
View File

@@ -0,0 +1,3 @@
<svg width="19" height="20" viewBox="0 0 19 20" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M7.90105 15.4647C9.50002 15.4647 10.9745 14.925 12.1809 14.0254L16.7194 18.7629C16.93 18.9828 17.2077 19.0928 17.5045 19.0928C18.1268 19.0928 18.5673 18.593 18.5673 17.9534C18.5673 17.6535 18.4715 17.3637 18.2609 17.1538L13.7512 12.4363C14.6991 11.137 15.264 9.52781 15.264 7.77873C15.264 3.55095 11.9512 0.0927734 7.90105 0.0927734C3.86051 0.0927734 0.538086 3.54096 0.538086 7.77873C0.538086 12.0065 3.85094 15.4647 7.90105 15.4647ZM7.90105 13.8056C4.74139 13.8056 2.12749 11.077 2.12749 7.77873C2.12749 4.48046 4.74139 1.7519 7.90105 1.7519C11.0607 1.7519 13.6746 4.48046 13.6746 7.77873C13.6746 11.077 11.0607 13.8056 7.90105 13.8056Z" fill="white"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 767 B

12
resources/web/homepage3/img/time.svg Normal file
View File

@@ -0,0 +1,12 @@
<svg width="14" height="15" viewBox="0 0 14 15" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M12.5778 7.45799C12.5778 4.06393 9.9498 1.3125 6.70801 1.3125V7.45799L10.85 11.8125C11.9172 10.6997 12.5778 9.1596 12.5778 7.45799Z" fill="#DDDDDD"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M6.70788 1.83809C3.74395 1.83809 1.34121 4.34529 1.34121 7.43809C1.34121 10.5309 3.74395 13.0381 6.70788 13.0381C9.67181 13.0381 12.0745 10.5309 12.0745 7.43809C12.0745 4.34529 9.67181 1.83809 6.70788 1.83809ZM0.334961 7.43809C0.334961 3.76539 3.18821 0.788086 6.70788 0.788086C10.2275 0.788086 13.0808 3.76539 13.0808 7.43809C13.0808 11.1108 10.2275 14.0881 6.70788 14.0881C3.18821 14.0881 0.334961 11.1108 0.334961 7.43809Z" fill="#595959"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M6.7082 5.16309C6.98607 5.16309 7.21133 5.39814 7.21133 5.68809V7.43809C7.21133 7.72804 6.98607 7.96309 6.7082 7.96309C6.43033 7.96309 6.20508 7.72804 6.20508 7.43809V5.68809C6.20508 5.39814 6.43033 5.16309 6.7082 5.16309Z" fill="#595959"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M6.35244 7.06685C6.54892 6.86183 6.86748 6.86183 7.06397 7.06685L8.74105 8.81686C8.93753 9.02188 8.93753 9.35429 8.74105 9.55932C8.54457 9.76434 8.22601 9.76434 8.02952 9.55932L6.35244 7.80932C6.15596 7.60429 6.15596 7.27188 6.35244 7.06685Z" fill="#595959"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M0.418945 7.4375C0.418945 7.19588 0.606659 7 0.838216 7H2.09603C2.32759 7 2.5153 7.19588 2.5153 7.4375C2.5153 7.67912 2.32759 7.875 2.09603 7.875H0.838216C0.606659 7.875 0.418945 7.67912 0.418945 7.4375Z" fill="#595959"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M10.9004 7.4375C10.9004 7.19588 11.0881 7 11.3197 7H12.5775C12.809 7 12.9967 7.19588 12.9967 7.4375C12.9967 7.67912 12.809 7.875 12.5775 7.875H11.3197C11.0881 7.875 10.9004 7.67912 10.9004 7.4375Z" fill="#595959"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M6.70833 14C6.47678 14 6.28906 13.8041 6.28906 13.5625L6.28906 12.25C6.28906 12.0084 6.47678 11.8125 6.70833 11.8125C6.93989 11.8125 7.1276 12.0084 7.1276 12.25L7.1276 13.5625C7.1276 13.8041 6.93989 14 6.70833 14Z" fill="#595959"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M6.70833 3.0625C6.47678 3.0625 6.28906 2.86662 6.28906 2.625L6.28906 1.3125C6.28906 1.07088 6.47678 0.875 6.70833 0.875C6.93989 0.875 7.1276 1.07088 7.1276 1.3125L7.1276 2.625C7.1276 2.86662 6.93989 3.0625 6.70833 3.0625Z" fill="#595959"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M2.3925 0.565641C2.55623 0.736495 2.55623 1.0135 2.3925 1.18436L1.13469 2.49686C0.97095 2.66771 0.705482 2.66771 0.541747 2.49686C0.378011 2.326 0.378011 2.049 0.541747 1.87814L1.79956 0.565641C1.96329 0.394786 2.22876 0.394786 2.3925 0.565641Z" fill="#595959"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M11.0235 0.565641C10.8598 0.736495 10.8598 1.0135 11.0235 1.18436L12.2813 2.49686C12.4451 2.66771 12.7105 2.66771 12.8743 2.49686C13.038 2.326 13.038 2.049 12.8743 1.87814L11.6165 0.565641C11.4527 0.394786 11.1873 0.394786 11.0235 0.565641Z" fill="#595959"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 3.0 KiB

209
resources/web/homepage3/js/home.js
View File

@@ -4,6 +4,7 @@ var m_HotModelList=null;
var m_ForUModelList=null; var m_ForUModelList=null;
var m_MakerlabList=null; var m_MakerlabList=null;
var m_PrintHistoryList=null;
function OnHomeInit() function OnHomeInit()
{ {
@@ -13,8 +14,26 @@ function OnHomeInit()
SendMsg_GetRecentFile(); SendMsg_GetRecentFile();
SendMsg_GetStaffPick(); SendMsg_GetStaffPick();
SendMsg_GetMakerlabList(); SendMsg_GetMakerlabList();
SendMsg_GetPrintHistory();
document.getElementById('HotModel_Search_Input').onkeydown = function (event) {
if (event.key === 'Enter') {
OnSearchOnline();
}
event.defaultPrevented();
};
let ModelSearchTip=GetCurrentTextByKey('t122');
$('#HotModel_Search_Input').prop('placeholder', ModelSearchTip);
//Test
//ShowMakerlabList(Test_MakerlabList['list']); //ShowMakerlabList(Test_MakerlabList['list']);
//$('#PrintHistoryArea').show();
//ShowPrintHistory(Test_PrintTaskList['hits']);
//Show4UPick(Test_4UModelList['hits']);
} }
//Recent详情页面的状态 //Recent详情页面的状态
@@ -31,9 +50,25 @@ function OnRecentInit()
Set_RecentFile_Delete_Checkbox_Event(); Set_RecentFile_Delete_Checkbox_Event();
} }
var m_LineMenuName='';
function OnLineInit() function OnLineInit()
{ {
TranslatePage(); TranslatePage();
m_LineMenuName=GetQueryString("menu");
}
function OnLineRetry()
{
if(m_LineMenuName!="" && m_LineMenuName!=null)
SwitchContent(m_LineMenuName);
}
function ShowLineWarn( bShow )
{
if(bShow)
$('#WarnMainArea').show();
else
$('#WarnMainArea').hide();
} }
//------最佳打开文件的右键菜单功能---------- //------最佳打开文件的右键菜单功能----------
@@ -103,6 +138,7 @@ function Set_RecentFile_MouseRightBtn_Event()
function HandleStudio( pVal ) function HandleStudio( pVal )
{ {
let strCmd = pVal['command']; let strCmd = pVal['command'];
//alert(strCmd);
if(strCmd=='get_recent_projects') if(strCmd=='get_recent_projects')
{ {
@@ -195,6 +231,43 @@ function HandleStudio( pVal )
OnHomeInit(); OnHomeInit();
} }
else if(strCmd=='printhistory_task_show')
{
if( m_PrintHistoryList!=null && pVal['hits'].length>0 )
{
let SS1=JSON.stringify(pVal['list']);
let SS2=JSON.stringify(m_PrintHistoryList);
if( SS1==SS2 )
{
alert("PrintHistory is Same. Ignore");
return;
}
}
m_PrintHistoryList=pVal['hits'];
ShowPrintHistory(m_PrintHistoryList);
}
else if(strCmd=='homepage_leftmenu_show')
{
let MenuName=pVal['menu'];
let nShow=pVal['show']*1;
if(MenuName=='printhistory')
{
if(nShow==1)
{
$('#PrintHistoryArea').show();
}
else
{
$('#PrintHistoryArea').hide();
m_PrintHistoryList=null;
$('#PrintHistoryList').html('');
}
}
}
} }
function OnBoardChange( strMenu ) function OnBoardChange( strMenu )
@@ -210,7 +283,10 @@ function OnBoardChange( strMenu )
SendMsg_GetStaffPick(); SendMsg_GetStaffPick();
if( m_MakerlabList==null || m_MakerlabList.length==0 ) if( m_MakerlabList==null || m_MakerlabList.length==0 )
SendMsg_GetMakerlabList(); SendMsg_GetMakerlabList();
if( m_PrintHistoryList==null )
SendMsg_GetPrintHistory();
} }
else if(strMenu=='recent') else if(strMenu=='recent')
{ {
@@ -663,6 +739,7 @@ function ShowStaffPick( ModelList )
$('#HotModelList').html(strPickHtml); $('#HotModelList').html(strPickHtml);
InitStaffPick(); InitStaffPick();
$('#HotModelArea').show(); $('#HotModelArea').show();
$('#HotModel_Search_Bar').css('display','flex');
} }
function Show4UPick( ModelList ) function Show4UPick( ModelList )
@@ -721,6 +798,7 @@ function Show4UPick( ModelList )
$('#HotModelList').html(strPickHtml); $('#HotModelList').html(strPickHtml);
InitStaffPick(); InitStaffPick();
$('#HotModelArea').show(); $('#HotModelArea').show();
$('#HotModel_Search_Bar').css('display','flex');
} }
function OpenOneStaffPickModel( ModelID ) function OpenOneStaffPickModel( ModelID )
@@ -735,6 +813,19 @@ function OpenOneStaffPickModel( ModelID )
SendWXMessage( JSON.stringify(tSend) ); SendWXMessage( JSON.stringify(tSend) );
} }
function OnSearchOnline(event)
{
let strKW=$('#HotModel_Search_Input').val().trim();
if(strKW=='' )
return;
var tSend={};
tSend['sequence_id']=Math.round(new Date() / 1000);
tSend['command']="homepage_online_search";
tSend['keyword']=strKW;
SendWXMessage( JSON.stringify(tSend) );
}
//----------MakerLab------------ //----------MakerLab------------
function IsChinese() function IsChinese()
@@ -818,6 +909,122 @@ function OnOpenOneMakerlab( ChildUrl )
SendWXMessage( JSON.stringify(tSend) ); SendWXMessage( JSON.stringify(tSend) );
} }
//-----------Print History------------
function SendMsg_GetPrintHistory()
{
var tSend={};
tSend['sequence_id']=Math.round(new Date() / 1000);
tSend['command']="homepage_printhistory_get";
SendWXMessage( JSON.stringify(tSend) );
}
function convertTimeFormat(timeStr)
{
const date = new Date(timeStr);
const year = date.getFullYear(); // 取后两位年份
const day = date.getDate();
const month = date.getMonth() + 1;
const hours = date.getHours();
const minutes = date.getMinutes();
return `${year}/${month.toString().padStart(2, '0')}/${day.toString().padStart(2, '0')} ${hours.toString().padStart(2, '0')}:${minutes.toString().padStart(2, '0')}`;
}
//只更新HTML内容，不控制显示/隐藏
function ShowPrintHistory( TaskList )
{
let TaskTotal=TaskList.length;
let strTaskHtml='';
for(let a=0;a<TaskTotal;a++)
{
let OneTask=TaskList[a];
let TaskID=OneTask['id'];
let Status=OneTask['status'];
let TaskName=OneTask['designTitle']!=''?OneTask['designTitle']:OneTask['title'];
let CoverImg=OneTask['cover'];
let DeviceName=OneTask['deviceName'];
let CostTime=OneTask['costTime'];
if( Status==2 || Status==3 )
{
if( OneTask['startTime']!=null && OneTask['endTime']!=null )
{
CostTime=DateToUnixstamp(OneTask['endTime'])-DateToUnixstamp(OneTask['startTime']);
}
}
let strCostTime='';
if(CostTime>=3600)
{
strCostTime=Math.round( (CostTime/3600)*10 )/10+'h';
}
else if(CostTime>=60)
{
strCostTime=Math.floor( CostTime/60 )+'min';
}
else
strCostTime=CostTime+'s';
let PlateName='<span tid="t123" class="trans"></span>&nbsp;'+OneTask['plateIndex']+'<span tid="t124" class="trans"></span>';
if( OneTask['plateName'].trim()!='' )
PlateName+=' - '+OneTask['plateName'].trim();
let StartTime=convertTimeFormat( OneTask['startTime'] );
let isPublicProfile =OneTask['isPublicProfile'];
let sMode=OneTask['mode'];
strTaskHtml+=
'<div class="PrintHistoryItem GuideBlock" onClick="OnOpenPrintHistory('+TaskID+')" >'+
' <div class="PrintHistoryImg"><img src="'+CoverImg+'" onerror="this.onerror=null;this.src=\'img/d.png\';" /></div>'+
' <div class="PrintHistoryTextBlock">'+
' <div class="PrintHistoryName TextS1">'+TaskName+'</div>'+
' <div class="PrintHistory_Line2">'+
' <img src="img/time.svg" /><span class="PH_PrintTime TextS2">'+strCostTime+'</span>'+
' <img src="img/device.svg" /><span class="PH_DeviceName TextS2">'+DeviceName+'</span>'+
' </div>'+
' <div class="PrintHistoryInfo">'+
' <div class="PrintHistoryPlate TextS2">'+
' <div class="PH_PlateName">'+PlateName+'</div>'+
' <div class="PH_PrintDate">('+StartTime+')</div>'+
' </div>';
switch(Status)
{
case 2:
strTaskHtml+=' <div class="PrintHistoryStatus PH_Status_Success trans" tid="t119">Success</div>';
break;
case 3:
strTaskHtml+=' <div class="PrintHistoryStatus PH_Status_Fail trans" tid="t120">Canceled</div>';
break;
default:
strTaskHtml+=' <div class="PrintHistoryStatus PH_Status_Printing trans" tid="t118">Printing</div>';
break;
}
strTaskHtml+=
' </div>'+
' </div>';
if( isPublicProfile==false && sMode!='cloud_slice' )
strTaskHtml+=' <div class="PH_Gcode_Icon">Gcode</div>';
strTaskHtml+='</div>';
}
$('#PrintHistoryList').html(strTaskHtml);
TranslatePage();
}
function OnOpenPrintHistory( TaskID )
{
var tSend={};
tSend['sequence_id']=Math.round(new Date() / 1000);
tSend['command']="homepage_printhistory_click";
tSend['taskid']=TaskID*1;
SendWXMessage( JSON.stringify(tSend) );
}
//---------------Global----------------- //---------------Global-----------------
window.postMessage = HandleStudio; window.postMessage = HandleStudio;

18
resources/web/homepage3/js/left.js
View File

@@ -1,6 +1,7 @@
//var TestData={"sequence_id":"0","command":"get_recent_projects","response":[{"path":"D:\\work\\Models\\Toy\\3d-puzzle-cube-model_files\\3d-puzzle-cube.3mf","time":"2022\/3\/24 20:33:10"},{"path":"D:\\work\\Models\\Art\\Carved Stone Vase - remeshed+drainage\\Carved Stone Vase.3mf","time":"2022\/3\/24 17:11:51"},{"path":"D:\\work\\Models\\Art\\Kity & Cat\\Cat.3mf","time":"2022\/3\/24 17:07:55"},{"path":"D:\\work\\Models\\Toy\\鐩村墤.3mf","time":"2022\/3\/24 17:06:02"},{"path":"D:\\work\\Models\\Toy\\minimalistic-dual-tone-whistle-model_files\\minimalistic-dual-tone-whistle.3mf","time":"2022\/3\/22 21:12:22"},{"path":"D:\\work\\Models\\Toy\\spiral-city-model_files\\spiral-city.3mf","time":"2022\/3\/22 18:58:37"},{"path":"D:\\work\\Models\\Toy\\impossible-dovetail-puzzle-box-model_files\\impossible-dovetail-puzzle-box.3mf","time":"2022\/3\/22 20:08:40"}]}; //var TestData={"sequence_id":"0","command":"get_recent_projects","response":[{"path":"D:\\work\\Models\\Toy\\3d-puzzle-cube-model_files\\3d-puzzle-cube.3mf","time":"2022\/3\/24 20:33:10"},{"path":"D:\\work\\Models\\Art\\Carved Stone Vase - remeshed+drainage\\Carved Stone Vase.3mf","time":"2022\/3\/24 17:11:51"},{"path":"D:\\work\\Models\\Art\\Kity & Cat\\Cat.3mf","time":"2022\/3\/24 17:07:55"},{"path":"D:\\work\\Models\\Toy\\鐩村墤.3mf","time":"2022\/3\/24 17:06:02"},{"path":"D:\\work\\Models\\Toy\\minimalistic-dual-tone-whistle-model_files\\minimalistic-dual-tone-whistle.3mf","time":"2022\/3\/22 21:12:22"},{"path":"D:\\work\\Models\\Toy\\spiral-city-model_files\\spiral-city.3mf","time":"2022\/3\/22 18:58:37"},{"path":"D:\\work\\Models\\Toy\\impossible-dovetail-puzzle-box-model_files\\impossible-dovetail-puzzle-box.3mf","time":"2022\/3\/22 20:08:40"}]};
var m_HotModelList=null; var m_HotModelList=null;
var m_HasNetworkPlugin=true;
function OnInit() function OnInit()
{ {
@@ -32,10 +33,13 @@ function HandleStudio( pVal )
{ {
$("#NoPluginTip").show(); $("#NoPluginTip").show();
$("#NoPluginTip").css("display","flex"); $("#NoPluginTip").css("display","flex");
m_HasNetworkPlugin=false;
} }
else else
{ {
$("#NoPluginTip").hide(); $("#NoPluginTip").hide();
m_HasNetworkPlugin=true;
} }
} }
else if(strCmd=='homepage_leftmenu_clicked') else if(strCmd=='homepage_leftmenu_clicked')
@@ -174,9 +178,19 @@ function SendMsg_GetLoginInfo()
function OnLoginOrRegister() function OnLoginOrRegister()
{ {
var tSend={}; var tSend={};
// y
// if( m_HasNetworkPlugin )
// {
// tSend['sequence_id']=Math.round(new Date() / 1000);
// tSend['command']="homepage_login_or_register";
// }
// else
// {
// tSend['sequence_id']=Math.round(new Date() / 1000);
// tSend['command']="homepage_need_networkplugin";
// }
tSend['sequence_id']=Math.round(new Date() / 1000); tSend['sequence_id']=Math.round(new Date() / 1000);
tSend['command']="homepage_login_or_register"; tSend['command']="homepage_login_or_register";
SendWXMessage( JSON.stringify(tSend) ); SendWXMessage( JSON.stringify(tSend) );
} }

929
resources/web/homepage3/js/test.js
View File

@@ -54,4 +54,933 @@ var Test_MakerlabList={
} }
} }
] ]
};
var Test_PrintTaskList={
"command": "printhistory_task_show",
"total": 15,
"hits": [
{
"id": 3622536,
"designId": 374186,
"designTitle": "首发模型0914 1409 --0918 12：00改为独家",
"designTitleTranslated": "Exclusive model debut 0914 1409 --0918 12:00",
"instanceId": 32755,
"modelId": "CNQ72af310210f64b",
"title": "首发变独家",
"cover": "https://public-dev-cdn.bambulab.net/makerworld/model/CNQ72af310210f64b/4007130/instance/plate_1.png",
"status": 3,
"feedbackStatus": 1,
"startTime": "2024-09-20T09:56:22Z",
"endTime": "2024-09-20T09:56:32Z",
"weight": 0,
"length": 0,
"costTime": 0,
"profileId": 4007130,
"plateIndex": 1,
"plateName": "",
"deviceId": "03W09A380900239",
"amsDetailMapping": [
{
"ams": 0,
"sourceColor": "FFFFFFFF",
"targetColor": "",
"filamentId": "",
"filamentType": "PLA",
"targetFilamentType": "PLA",
"weight": 0
}
],
"mode": "cloud_slice",
"isPublicProfile": true,
"isPrintable": true,
"isDelete": false,
"deviceModel": "X1E",
"deviceName": "3DP-03W-239",
"bedType": "Cool Plate"
},
{
"id": 3622535,
"designId": 374186,
"designTitle": "首发模型0914 1409 --0918 12：00改为独家",
"designTitleTranslated": "Exclusive model debut 0914 1409 --0918 12:00",
"instanceId": 32755,
"modelId": "CNQ72af310210f64b",
"title": "首发变独家",
"cover": "https://public-dev-cdn.bambulab.net/makerworld/model/CNQ72af310210f64b/4007130/instance/plate_1.png",
"status": 3,
"feedbackStatus": 1,
"startTime": "2024-09-20T09:55:42Z",
"endTime": "2024-09-20T09:56:00Z",
"weight": 0,
"length": 0,
"costTime": 0,
"profileId": 4007130,
"plateIndex": 1,
"plateName": "",
"deviceId": "03W09A380900239",
"amsDetailMapping": [
{
"ams": 0,
"sourceColor": "FFFFFFFF",
"targetColor": "",
"filamentId": "",
"filamentType": "PLA",
"targetFilamentType": "PLA",
"weight": 0
}
],
"mode": "cloud_slice",
"isPublicProfile": true,
"isPrintable": true,
"isDelete": false,
"deviceModel": "X1E",
"deviceName": "3DP-03W-239",
"bedType": "Cool Plate"
},
{
"id": 3622505,
"designId": 374186,
"designTitle": "首发模型0914 1409 --0918 12：00改为独家",
"designTitleTranslated": "Exclusive model debut 0914 1409 --0918 12:00",
"instanceId": 32755,
"modelId": "CNQ72af310210f64b",
"title": "首发变独家",
"cover": "https://public-dev-cdn.bambulab.net/makerworld/cache/1/CNQ72af310210f64b/4007130/3mf/3/REP1/Metadata/plate_3.png",
"status": 2,
"feedbackStatus": 1,
"startTime": "2024-09-20T06:38:33Z",
"endTime": "2024-09-20T08:27:56Z",
"weight": 53.54,
"length": 1766,
"costTime": 6376,
"profileId": 4007130,
"plateIndex": 3,
"plateName": "",
"deviceId": "03W09A380900239",
"amsDetailMapping": [
{
"ams": 0,
"sourceColor": "FFFFFFFF",
"targetColor": "FFFFFFFF",
"filamentId": "",
"filamentType": "PLA",
"targetFilamentType": "PLA",
"weight": 53.54
}
],
"mode": "cloud_slice",
"isPublicProfile": true,
"isPrintable": true,
"isDelete": false,
"deviceModel": "X1E",
"deviceName": "3DP-03W-239",
"bedType": "Cool Plate"
},
{
"id": 3622504,
"designId": 374186,
"designTitle": "首发模型0914 1409 --0918 12：00改为独家",
"designTitleTranslated": "Exclusive model debut 0914 1409 --0918 12:00",
"instanceId": 32755,
"modelId": "CNQ72af310210f64b",
"title": "首发变独家",
"cover": "https://public-dev-cdn.bambulab.net/makerworld/cache/1/CNQ72af310210f64b/4007130/3mf/3/%23A0E20EFF/REP1/Metadata/plate_3.png",
"status": 2,
"feedbackStatus": 1,
"startTime": "2024-09-20T06:38:18Z",
"endTime": "2024-09-20T08:38:35Z",
"weight": 56.09,
"length": 1766,
"costTime": 7131,
"profileId": 4007130,
"plateIndex": 3,
"plateName": "",
"deviceId": "00W00A242600023",
"amsDetailMapping": [
{
"ams": 1,
"sourceColor": "FFFFFFFF",
"targetColor": "A0E20EFF",
"filamentId": "",
"filamentType": "PLA",
"targetFilamentType": "PLA",
"weight": 56.09
}
],
"mode": "cloud_slice",
"isPublicProfile": true,
"isPrintable": true,
"isDelete": false,
"deviceModel": "X1",
"deviceName": "025",
"bedType": "Cool Plate"
},
{
"id": 3622499,
"designId": 374186,
"designTitle": "首发模型0914 1409 --0918 12：00改为独家",
"designTitleTranslated": "Exclusive model debut 0914 1409 --0918 12:00",
"instanceId": 32755,
"modelId": "CNQ72af310210f64b",
"title": "首发变独家",
"cover": "https://public-dev-cdn.bambulab.net/makerworld/cache/1/CNQ72af310210f64b/4007130/3mf/3/REP1/Metadata/plate_3.png",
"status": 2,
"feedbackStatus": 1,
"startTime": "2024-09-20T04:12:14Z",
"endTime": "2024-09-20T06:02:16Z",
"weight": 53.54,
"length": 1766,
"costTime": 6376,
"profileId": 4007130,
"plateIndex": 3,
"plateName": "",
"deviceId": "03W09A380900239",
"amsDetailMapping": [
{
"ams": 0,
"sourceColor": "FFFFFFFF",
"targetColor": "FFFFFFFF",
"filamentId": "",
"filamentType": "PLA",
"targetFilamentType": "PLA",
"weight": 53.54
}
],
"mode": "cloud_slice",
"isPublicProfile": true,
"isPrintable": true,
"isDelete": false,
"deviceModel": "X1E",
"deviceName": "3DP-03W-239",
"bedType": "Cool Plate"
}
]
}
var Test_4UModelList={
"hits": [
{
"id": 374202,
"title": "0920 可定制",
"titleTranslated": "0920 Customizable",
"cover": "https://public-dev-cdn.bambulab.net/makerworld/model/CNQc553e8906eaff0/design/2024-09-20_7cf6087c009.jpg",
"likeCount": 0,
"collectionCount": 1,
"shareCount": 0,
"printCount": 0,
"downloadCount": 0,
"commentCount": 0,
"readCount": 0,
"designCreator": {
"uid": 1074649781,
"name": "xiaohuan.li888888888888888888888888888",
"avatar": "https://public-us-cdn.bambulab.net/avatar/9a12d850-539a-11ef-bcfb-2953b84d62de.jpg",
"fanCount": 6,
"followCount": 6,
"createTime": "2023-08-29T07:06:16Z",
"certificated": true,
"handle": "xiaohuan.li6667",
"level": 30,
"gradeType": 4
},
"createTime": "2024-09-20T03:10:43Z",
"nsfw": false,
"hotScore": 794,
"status": 1,
"hasCollect": false,
"hasLike": false,
"hasDislike": false,
"isStaffPicked": true,
"pickReason": "",
"isPrintable": true,
"isOfficial": false,
"isPointRedeemable": false,
"pointRedeemDetail": {
"price": 0,
"sku": "",
"status": 0
},
"isExclusive": true,
"contest": {
"contestId": 124,
"rank": 0,
"status": 1,
"contestName": "0718 contest",
"contestStatus": 0,
"comment": ""
},
"source": 4,
"customizedByMakerLab": true,
"preset": {
"type": "",
"filamentConfig": null,
"printerConfig": null,
"processConfig": null,
"printerSettings": null,
"file": {
"name": "",
"size": 0,
"url": ""
}
},
"coverLandscape": "",
"coverPortrait": "",
"boostCnt": 0,
"bomsNeeded": false,
"bannerTitle": "",
"ext": "{\"rc\":[\"4|0.93\"],\"rk\":\"-0.04|0\"}",
"modelId": "CNQc553e8906eaff0"
},
{
"id": 374215,
"title": "jeep",
"titleTranslated": "",
"cover": "https://public-dev-cdn.bambulab.net/makerworld/model/CNQ5da5ab69430323/design/2024-09-20_ef0049a4b5026.jpg",
"likeCount": 0,
"collectionCount": 1,
"shareCount": 0,
"printCount": 0,
"downloadCount": 1,
"commentCount": 1,
"readCount": 0,
"designCreator": {
"uid": 415112594,
"name": "Yifan Wu",
"avatar": "https://public-dev-cdn.bambulab.net/avatar/415112594/2023-05-06_1f35259225fad.jpg",
"fanCount": 14,
"followCount": 14,
"createTime": "2022-04-07T09:52:23Z",
"certificated": false,
"handle": "wuyifan",
"level": 11,
"gradeType": 1
},
"createTime": "2024-09-20T12:00:13Z",
"nsfw": false,
"hotScore": 2726,
"status": 1,
"hasCollect": false,
"hasLike": false,
"hasDislike": false,
"isStaffPicked": false,
"pickReason": "",
"isPrintable": true,
"isOfficial": false,
"isPointRedeemable": false,
"pointRedeemDetail": {
"price": 0,
"sku": "",
"status": 0
},
"isExclusive": true,
"contest": {
"contestId": 0,
"rank": 0,
"status": 0,
"contestName": "",
"contestStatus": 0,
"comment": ""
},
"source": 7,
"customizedByMakerLab": false,
"preset": {
"type": "",
"filamentConfig": null,
"printerConfig": null,
"processConfig": null,
"printerSettings": null,
"file": {
"name": "",
"size": 0,
"url": ""
}
},
"coverLandscape": "",
"coverPortrait": "",
"boostCnt": 3,
"bomsNeeded": false,
"bannerTitle": "",
"ext": "{\"rc\":[\"7|1\"],\"rk\":\"-0.11|1\"}",
"modelId": "CNQ5da5ab69430323"
},
{
"id": 374216,
"title": "小迷宫",
"titleTranslated": "mini maze",
"cover": "https://public-dev-cdn.bambulab.net/makerworld/model/DSM00000000374216/design/2024-09-20_e31bc38f1cef9.webp",
"likeCount": 0,
"collectionCount": 0,
"shareCount": 0,
"printCount": 0,
"downloadCount": 2,
"commentCount": 0,
"readCount": 0,
"designCreator": {
"uid": 415112594,
"name": "Yifan Wu",
"avatar": "https://public-dev-cdn.bambulab.net/avatar/415112594/2023-05-06_1f35259225fad.jpg",
"fanCount": 14,
"followCount": 14,
"createTime": "2022-04-07T09:52:23Z",
"certificated": false,
"handle": "wuyifan",
"level": 11,
"gradeType": 1
},
"createTime": "2024-09-20T12:44:02Z",
"nsfw": false,
"hotScore": 1891,
"status": 1,
"hasCollect": false,
"hasLike": false,
"hasDislike": false,
"isStaffPicked": false,
"pickReason": "",
"isPrintable": true,
"isOfficial": false,
"isPointRedeemable": false,
"pointRedeemDetail": {
"price": 0,
"sku": "",
"status": 0
},
"isExclusive": true,
"contest": {
"contestId": 0,
"rank": 0,
"status": 0,
"contestName": "",
"contestStatus": 0,
"comment": ""
},
"source": 7,
"customizedByMakerLab": false,
"preset": {
"type": "",
"filamentConfig": null,
"printerConfig": null,
"processConfig": null,
"printerSettings": null,
"file": {
"name": "",
"size": 0,
"url": ""
}
},
"coverLandscape": "",
"coverPortrait": "",
"boostCnt": 1,
"bomsNeeded": false,
"bannerTitle": "",
"ext": "{\"rc\":[\"7|0.92\"],\"rk\":\"-0.17|2\"}",
"modelId": "CNQ581249e18cec42"
},
{
"id": 374218,
"title": "运营开启独家未达标用户",
"titleTranslated": "The following content requires translation:\nExclusive unmet user operations have been initiated.",
"cover": "https://public-dev-cdn.bambulab.net/makerworld/model/CNQf2d9054da20bfe/design/2024-09-23_d4d635adef548.jpg",
"likeCount": 0,
"collectionCount": 0,
"shareCount": 0,
"printCount": 0,
"downloadCount": 11,
"commentCount": 0,
"readCount": 0,
"designCreator": {
"uid": 1375262870,
"name": "XNCS025",
"avatar": "https://oss-cdn.bambulab.com/default-avatar.png",
"fanCount": 1,
"followCount": 1,
"createTime": "2023-03-07T02:14:57Z",
"certificated": false,
"handle": "XNCS025",
"level": 4,
"gradeType": 0
},
"createTime": "2024-09-23T07:17:13Z",
"nsfw": false,
"hotScore": 2447,
"status": 1,
"hasCollect": false,
"hasLike": false,
"hasDislike": false,
"isStaffPicked": false,
"pickReason": "",
"isPrintable": true,
"isOfficial": false,
"isPointRedeemable": false,
"pointRedeemDetail": {
"price": 0,
"sku": "",
"status": 0
},
"isExclusive": true,
"contest": {
"contestId": 0,
"rank": 0,
"status": 0,
"contestName": "",
"contestStatus": 0,
"comment": ""
},
"source": 7,
"customizedByMakerLab": false,
"preset": {
"type": "",
"filamentConfig": null,
"printerConfig": null,
"processConfig": null,
"printerSettings": null,
"file": {
"name": "",
"size": 0,
"url": ""
}
},
"coverLandscape": "",
"coverPortrait": "",
"boostCnt": 0,
"bomsNeeded": false,
"bannerTitle": "",
"ext": "{\"rc\":[\"7|0.96\"],\"rk\":\"-0.21|3\"}",
"modelId": "CNQf2d9054da20bfe"
},
{
"id": 374229,
"title": "测试一下定时任务",
"titleTranslated": "Test the scheduled task",
"cover": "https://public-dev-cdn.bambulab.net/makerworld/model/CNQe4b47ef2e53023/design/2024-09-23_ed5de35b423cc.webp",
"likeCount": 0,
"collectionCount": 0,
"shareCount": 0,
"printCount": 2,
"downloadCount": 2,
"commentCount": 0,
"readCount": 0,
"designCreator": {
"uid": 1812646376,
"name": "银鱼test2",
"avatar": "https://public-cdn.bblmw.com/default/avatar.png",
"fanCount": 1,
"followCount": 1,
"createTime": "2024-09-12T07:02:50Z",
"certificated": false,
"handle": "user_1812646376",
"level": 10,
"gradeType": 1
},
"createTime": "2024-09-23T10:42:15Z",
"nsfw": false,
"hotScore": 1442,
"status": 1,
"hasCollect": false,
"hasLike": false,
"hasDislike": false,
"isStaffPicked": false,
"pickReason": "",
"isPrintable": true,
"isOfficial": false,
"isPointRedeemable": false,
"pointRedeemDetail": {
"price": 0,
"sku": "",
"status": 0
},
"isExclusive": false,
"contest": {
"contestId": 0,
"rank": 0,
"status": 0,
"contestName": "",
"contestStatus": 0,
"comment": ""
},
"source": 7,
"customizedByMakerLab": false,
"preset": {
"type": "",
"filamentConfig": null,
"printerConfig": null,
"processConfig": null,
"printerSettings": null,
"file": {
"name": "",
"size": 0,
"url": ""
}
},
"coverLandscape": "",
"coverPortrait": "",
"boostCnt": 0,
"bomsNeeded": false,
"bannerTitle": "",
"ext": "{\"rc\":[\"7|0.88\"],\"rk\":\"-0.22|4\"}",
"modelId": "CNQe4b47ef2e53023"
},
{
"id": 371892,
"title": "测试竞赛",
"titleTranslated": "",
"cover": "https://public-dev-cdn.bambulab.net/makerworld/model/DSM00000000371892/design/2024-03-28_6875c4e16c667.jpg",
"likeCount": 1,
"collectionCount": 1,
"shareCount": 0,
"printCount": 0,
"downloadCount": 1,
"commentCount": 0,
"readCount": 0,
"designCreator": {
"uid": 3185390264,
"name": "fang.nie",
"avatar": "https://public-dev-cdn.bambulab.net/avatar/3185390264/2024-02-26_fc5558ccc29f1.jpg",
"fanCount": 6,
"followCount": 6,
"createTime": "2022-05-11T07:56:50Z",
"certificated": false,
"handle": "fang.nie",
"level": 8,
"gradeType": 1
},
"createTime": "2024-03-28T07:59:10Z",
"nsfw": false,
"hotScore": 0,
"status": 1,
"hasCollect": false,
"hasLike": false,
"hasDislike": false,
"isStaffPicked": true,
"pickReason": "",
"isPrintable": false,
"isOfficial": false,
"isPointRedeemable": false,
"pointRedeemDetail": {
"price": 0,
"sku": "",
"status": 0
},
"isExclusive": false,
"contest": {
"contestId": 75,
"rank": 0,
"status": 1,
"contestName": "0306进行中的竞赛",
"contestStatus": 0,
"comment": ""
},
"source": 4,
"customizedByMakerLab": false,
"preset": {
"type": "",
"filamentConfig": null,
"printerConfig": null,
"processConfig": null,
"printerSettings": null,
"file": {
"name": "",
"size": 0,
"url": ""
}
},
"coverLandscape": "",
"coverPortrait": "",
"boostCnt": 0,
"bomsNeeded": false,
"bannerTitle": "",
"ext": "{\"rc\":[\"4|1\"],\"rk\":\"-0.28|5\"}",
"modelId": ""
},
{
"id": 374114,
"title": "打印时长超过20小时",
"titleTranslated": "Printing duration exceeds 20 hours",
"cover": "https://public-dev-cdn.bambulab.net/makerworld/model/CNQf47c4b034a745c/design/2024-08-30_2606102d038c5.webp",
"likeCount": 0,
"collectionCount": 0,
"shareCount": 0,
"printCount": 0,
"downloadCount": 0,
"commentCount": 0,
"readCount": 0,
"designCreator": {
"uid": 3345032319,
"name": "Summer_lights",
"avatar": "https://public-cdn.bambulab.com/default/avatar.png",
"fanCount": 2,
"followCount": 2,
"createTime": "2023-08-04T08:43:14Z",
"certificated": true,
"handle": "Summer_lights",
"level": 7,
"gradeType": 1
},
"createTime": "2024-08-30T02:52:40Z",
"nsfw": false,
"hotScore": 0,
"status": 1,
"hasCollect": false,
"hasLike": false,
"hasDislike": false,
"isStaffPicked": true,
"pickReason": "",
"isPrintable": true,
"isOfficial": false,
"isPointRedeemable": false,
"pointRedeemDetail": {
"price": 0,
"sku": "",
"status": 0
},
"isExclusive": false,
"contest": {
"contestId": 0,
"rank": 0,
"status": 0,
"contestName": "",
"contestStatus": 0,
"comment": ""
},
"source": 4,
"customizedByMakerLab": false,
"preset": {
"type": "",
"filamentConfig": null,
"printerConfig": null,
"processConfig": null,
"printerSettings": null,
"file": {
"name": "",
"size": 0,
"url": ""
}
},
"coverLandscape": "",
"coverPortrait": "",
"boostCnt": 0,
"bomsNeeded": false,
"bannerTitle": "",
"ext": "{\"rc\":[\"4|0.86\"],\"rk\":\"-0.4|6\"}",
"modelId": "CNQf47c4b034a745c"
},
{
"id": 374044,
"title": "恐龙模型",
"titleTranslated": "Dinosaur Model",
"cover": "https://public-dev-cdn.bambulab.net/makerworld/model/DSM00000000374044/design/2024-08-08_0cade4e99b18c.png",
"likeCount": 2,
"collectionCount": 2,
"shareCount": 0,
"printCount": 0,
"downloadCount": 1,
"commentCount": 10,
"readCount": 0,
"designCreator": {
"uid": 3603343695,
"name": "龙井~qa",
"avatar": "https://public-dev-cdn.bambulab.net/avatar/3603343695/2023-11-01_f32d53e210073.jpg",
"fanCount": 12,
"followCount": 12,
"createTime": "2022-08-01T07:37:47Z",
"certificated": false,
"handle": "user_3603343695",
"level": 10,
"gradeType": 1
},
"createTime": "2024-08-08T08:09:44Z",
"nsfw": false,
"hotScore": 163,
"status": 1,
"hasCollect": false,
"hasLike": false,
"hasDislike": false,
"isStaffPicked": true,
"pickReason": "",
"isPrintable": true,
"isOfficial": true,
"isPointRedeemable": false,
"pointRedeemDetail": {
"price": 0,
"sku": "",
"status": 0
},
"isExclusive": false,
"contest": {
"contestId": 0,
"rank": 0,
"status": 0,
"contestName": "",
"contestStatus": 0,
"comment": ""
},
"source": 4,
"customizedByMakerLab": false,
"preset": {
"type": "",
"filamentConfig": null,
"printerConfig": null,
"processConfig": null,
"printerSettings": null,
"file": {
"name": "",
"size": 0,
"url": ""
}
},
"coverLandscape": "",
"coverPortrait": "",
"boostCnt": 4,
"bomsNeeded": false,
"bannerTitle": "",
"ext": "{\"rc\":[\"4|0.79\"],\"rk\":\"-0.43|7\"}",
"modelId": "CNQ1ff72338b76e42"
},
{
"id": 374224,
"title": "testing1",
"titleTranslated": "",
"cover": "https://public-dev-cdn.bambulab.net/makerworld/model/CNQ6d8c4e451cb1cb/design/2024-09-23_523ae314284da.webp",
"likeCount": 0,
"collectionCount": 0,
"shareCount": 0,
"printCount": 0,
"downloadCount": 0,
"commentCount": 0,
"readCount": 0,
"designCreator": {
"uid": 899054757,
"name": "user_899054757",
"avatar": "https://public-us-cdn.bambulab.net/avatar/bfe3d810-798b-11ef-bd70-27bc07e67d92.jpg",
"fanCount": 0,
"followCount": 0,
"createTime": "2024-09-20T09:19:40Z",
"certificated": false,
"handle": "user_899054757",
"level": 6,
"gradeType": 0
},
"createTime": "2024-09-23T09:48:17Z",
"nsfw": false,
"hotScore": 0,
"status": 1,
"hasCollect": false,
"hasLike": false,
"hasDislike": false,
"isStaffPicked": false,
"pickReason": "",
"isPrintable": true,
"isOfficial": false,
"isPointRedeemable": false,
"pointRedeemDetail": {
"price": 0,
"sku": "",
"status": 0
},
"isExclusive": false,
"contest": {
"contestId": 0,
"rank": 0,
"status": 0,
"contestName": "",
"contestStatus": 0,
"comment": ""
},
"source": 7,
"customizedByMakerLab": false,
"preset": {
"type": "",
"filamentConfig": null,
"printerConfig": null,
"processConfig": null,
"printerSettings": null,
"file": {
"name": "",
"size": 0,
"url": ""
}
},
"coverLandscape": "",
"coverPortrait": "",
"boostCnt": 0,
"bomsNeeded": false,
"bannerTitle": "",
"ext": "{\"rc\":[\"7|0.56\"],\"rk\":\"-0.43|8\"}",
"modelId": "CNQ6d8c4e451cb1cb"
},
{
"id": 374227,
"title": "test2",
"titleTranslated": "",
"cover": "https://public-dev-cdn.bambulab.net/makerworld/model/DSM00000000374227/design/2024-09-23_ff06b8ab9e468.jpg",
"likeCount": 0,
"collectionCount": 0,
"shareCount": 0,
"printCount": 0,
"downloadCount": 0,
"commentCount": 0,
"readCount": 0,
"designCreator": {
"uid": 899054757,
"name": "user_899054757",
"avatar": "https://public-us-cdn.bambulab.net/avatar/bfe3d810-798b-11ef-bd70-27bc07e67d92.jpg",
"fanCount": 0,
"followCount": 0,
"createTime": "2024-09-20T09:19:40Z",
"certificated": false,
"handle": "user_899054757",
"level": 6,
"gradeType": 0
},
"createTime": "2024-09-23T09:51:22Z",
"nsfw": false,
"hotScore": 0,
"status": 1,
"hasCollect": false,
"hasLike": false,
"hasDislike": false,
"isStaffPicked": false,
"pickReason": "",
"isPrintable": false,
"isOfficial": false,
"isPointRedeemable": false,
"pointRedeemDetail": {
"price": 0,
"sku": "",
"status": 0
},
"isExclusive": false,
"contest": {
"contestId": 0,
"rank": 0,
"status": 0,
"contestName": "",
"contestStatus": 0,
"comment": ""
},
"source": 7,
"customizedByMakerLab": false,
"preset": {
"type": "",
"filamentConfig": null,
"printerConfig": null,
"processConfig": null,
"printerSettings": null,
"file": {
"name": "",
"size": 0,
"url": ""
}
},
"coverLandscape": "",
"coverPortrait": "",
"boostCnt": 0,
"bomsNeeded": false,
"bannerTitle": "",
"ext": "{\"rc\":[\"7|0.68\"],\"rk\":\"-0.49|9\"}",
"modelId": ""
}
],
"seed": 1149157380,
"surplus": 32
}; };

6
resources/web/homepage3/left.html
View File

@@ -99,10 +99,14 @@
</div> </div>
<div menu="makerlab" class="BtnItem" onClick="GotoMenu('makerlab')"> <div menu="makerlab" class="BtnItem" onClick="GotoMenu('makerlab')">
<div class="BtnIcon "><img class="LeftIcon" src="img/left_ml.svg" /></div> <div class="BtnIcon "><img class="LeftIcon" src="img/left_ml.svg" /></div>
<div class="BtnText trans" tid="">Makerlab</div> <div class="BtnText trans" tid="">MakerLab</div>
<div ><img class="JumpIcon" src="img/jump.svg" /></div> <div ><img class="JumpIcon" src="img/jump.svg" /></div>
<div id="MakerlabNewTag" class="BtnNewIcon">New</div> <div id="MakerlabNewTag" class="BtnNewIcon">New</div>
</div> </div>
<div menu="printhistory" class="BtnItem" onClick="GotoMenu('printhistory')">
<div class="BtnIcon "><img class="LeftIcon" src="img/left_ph.svg" /></div>
<div class="BtnText trans" tid="t117">Print History</div>
</div>
<div menu="manual" class="BtnItem" onClick="GotoMenu('manual')"> <div menu="manual" class="BtnItem" onClick="GotoMenu('manual')">
<div class="BtnIcon "><img class="LeftIcon" src="img/left_manual.svg" /></div> <div class="BtnIcon "><img class="LeftIcon" src="img/left_manual.svg" /></div>
<div class="BtnText trans" tid="t87">User Manual</div> <div class="BtnText trans" tid="t87">User Manual</div>

42
resources/web/include/globalapi.js
View File

@@ -62,7 +62,7 @@ function GetFullDate()
return tDate; return tDate;
} }
//return YYYY-MM-DD
function Unixtimestamp2Date( nSecond ) function Unixtimestamp2Date( nSecond )
{ {
var d=new Date(nSecond*1000); var d=new Date(nSecond*1000);
@@ -93,6 +93,17 @@ function Unixtimestamp2Date( nSecond )
return tDate.strdate; return tDate.strdate;
} }
function DateToUnixstamp( strDate )
{
const date = new Date(strDate);
return Math.floor(date.getTime() / 1000);
}
function DateToUnixstampMS( strDate )
{
const date = new Date(strDate);
return date.getTime();
}
//------------Array Function------------- //------------Array Function-------------
Array.prototype.in_array = function (e) { Array.prototype.in_array = function (e) {
@@ -468,10 +479,16 @@ function DisableHotkey( b_CtrlP )
if (e.shiftKey && e.metaKey) if (e.shiftKey && e.metaKey)
OutputKey(e.keyCode, false, true, true); OutputKey(e.keyCode, false, true, true);
if (window.event) { //F1--F12
try { e.keyCode = 0; } catch (e) { } if ( e.keyCode>=112 && e.keyCode<=123 )
e.returnValue = false; {
e.preventDefault();
} }
// if (window.event) {
// try { e.keyCode = 0; } catch (e) { }
// e.returnValue = false;
// }
}; };
window.addEventListener('mousewheel', function (event) { window.addEventListener('mousewheel', function (event) {
@@ -479,7 +496,24 @@ function DisableHotkey( b_CtrlP )
event.preventDefault(); event.preventDefault();
} }
}, { passive: false }); }, { passive: false });
DisableDropAction();
} }
DisableHotkey(); DisableHotkey();
/*--------Disable Drop Action---------*/
function DisableDropAction()
{
document.addEventListener("dragstart", (event) => {
event.preventDefault();
});
document.addEventListener("dragover", (event) => {
event.preventDefault();
});
document.addEventListener("drop", (event) => {
event.preventDefault();
});
}

2
resources/web/model/index.html
View File

@@ -22,8 +22,6 @@
<script type="text/javascript" src="model.js"></script> <script type="text/javascript" src="model.js"></script>
</head> </head>
<body onLoad="OnInit()"> <body onLoad="OnInit()">
<div id="EmptyArea"> <div id="EmptyArea">
<div><img src="img/null.png"></div> <div><img src="img/null.png"></div>
<div>no model information</div> <div>no model information</div>

1
resources/web/model/model.css
View File

@@ -4,7 +4,6 @@
padding: 0px; padding: 0px;
border: 0px; border: 0px;
font-family: "system-ui", "Segoe UI", Roboto, Oxygen, Ubuntu, "Fira Sans", "Droid Sans", "Helvetica Neue", sans-sans; font-family: "system-ui", "Segoe UI", Roboto, Oxygen, Ubuntu, "Fira Sans", "Droid Sans", "Helvetica Neue", sans-sans;
user-select: none;
} }
html html

16
resources/web/model/model.js
View File

@@ -144,6 +144,14 @@ function Request3MFInfo()
SendWXMessage( JSON.stringify(tSend) ); SendWXMessage( JSON.stringify(tSend) );
} }
function HtmlDecodeFrom3MF(strInput)
{
const el = document.createElement('textarea');
el.innerHTML = strInput;
el.innerHTML = el.value;
return el.value;
}
function HandleStudio(pVal) function HandleStudio(pVal)
{ {
let strCmd=pVal['command']; let strCmd=pVal['command'];
@@ -213,6 +221,7 @@ function ShowModelInfo( pModel )
let UploadType=pModel.upload_type.toLowerCase(); let UploadType=pModel.upload_type.toLowerCase();
let sLicence=pModel.license.toUpperCase(); let sLicence=pModel.license.toUpperCase();
let sModelDesc=decodeURIComponent(pModel.description); let sModelDesc=decodeURIComponent(pModel.description);
sModelDesc=HtmlDecodeFrom3MF( sModelDesc );
if( pModel.hasOwnProperty('model_id') ) if( pModel.hasOwnProperty('model_id') )
{ {
@@ -275,8 +284,8 @@ function ShowModelInfo( pModel )
$('#ModelLicenceImg').hide(); $('#ModelLicenceImg').hide();
break; break;
} }
$('#Model_Desc').html( html_decode(sModelDesc) ); $('#Model_Desc').html( sModelDesc );
let ModelPreviewList=pModel.preview_img; let ModelPreviewList=pModel.preview_img;
let TotalPreview=ModelPreviewList.length; let TotalPreview=ModelPreviewList.length;
@@ -490,11 +499,12 @@ function ShowProfilelInfo( pProfile )
let sProfileName=decodeURIComponent(pProfile.name); let sProfileName=decodeURIComponent(pProfile.name);
let sProfileAuthor=decodeURIComponent(pProfile.author); let sProfileAuthor=decodeURIComponent(pProfile.author);
let sProfileDesc=decodeURIComponent(pProfile.description); let sProfileDesc=decodeURIComponent(pProfile.description);
sProfileDesc=HtmlDecodeFrom3MF(sProfileDesc);
$('#ProfileName').html(sProfileName); $('#ProfileName').html(sProfileName);
$('#ProfileAuthor').html(sProfileAuthor); $('#ProfileAuthor').html(sProfileAuthor);
$('#Profile_Desc').html( html_decode(sProfileDesc) ); $('#Profile_Desc').html( sProfileDesc );
let ProfilePreviewList=pProfile.preview_img; let ProfilePreviewList=pProfile.preview_img;
let TotalPreview=ProfilePreviewList.length; let TotalPreview=ProfilePreviewList.length;

4
resources/web/qidi/link_missing_connection.html
View File

@@ -36,10 +36,10 @@
</head> </head>
<body onLoad="OnHomeInit()"> <body onLoad="OnHomeInit()">
<h1 > <h1 >
<span class="trans" tid='t117'>Connect Device</span> <span class="trans" tid='t201'>Connect Device</span>
</h1> </h1>
<p> <p>
<span class="trans" tid='t119'>Please use the QIDI Link APP to connect to your printer. Once the link is completed, the online device will be synced to the "Link" page.</span> <span class="trans" tid='t203'>Please use the QIDI Link APP to connect to your printer. Once the link is completed, the online device will be synced to the "Link" page.</span>
</p> </p>
<img src="link_connection.png" alt="Device Connection Image"> <img src="link_connection.png" alt="Device Connection Image">
</body> </body>

4
resources/web/qidi/missing_connection.html
View File

@@ -36,10 +36,10 @@
</head> </head>
<body onLoad="OnHomeInit()"> <body onLoad="OnHomeInit()">
<h1 > <h1 >
<span class="trans" tid='t117'>Connect Device</span> <span class="trans" tid='t201'>Connect Device</span>
</h1> </h1>
<p> <p>
<span class="trans" tid='t118'>Please set up your printer connection to view the device.</span> <span class="trans" tid='t202'>Please set up your printer connection to view the device.</span>
</p> </p>
<img src="setup_connection.gif" alt="Device Connection Image"> <img src="setup_connection.gif" alt="Device Connection Image">
</body> </body>

3
src/admesh/stl.h
View File

@@ -45,7 +45,8 @@ typedef Eigen::Matrix<int, 3, 1, Eigen::DontAlign> stl_triangle_vertex_indices
static_assert(sizeof(stl_vertex) == 12, "size of stl_vertex incorrect"); static_assert(sizeof(stl_vertex) == 12, "size of stl_vertex incorrect");
static_assert(sizeof(stl_normal) == 12, "size of stl_normal incorrect"); static_assert(sizeof(stl_normal) == 12, "size of stl_normal incorrect");
typedef std::function<void(int current, int total, bool& cancel, std::string& model_id, std::string& code)> ImportstlProgressFn; typedef std::function<void(int current, int total, bool& cancel, std::string& model_id, std::string& code,
std::string& ml_region, std::string& ml_name, std::string& ml_id)> ImportstlProgressFn;
typedef enum { typedef enum {
eNormal, // normal face eNormal, // normal face

74
src/admesh/stlinit.cpp
View File

@@ -46,6 +46,9 @@ extern void stl_internal_reverse_quads(char *buf, size_t cnt);
const int LOAD_STL_UNIT_NUM = 5; const int LOAD_STL_UNIT_NUM = 5;
static std::string model_id = ""; static std::string model_id = "";
static std::string country_code = ""; static std::string country_code = "";
static std::string ml_name = "";
static std::string ml_id = "";
static std::string ml_region = "";
static FILE *stl_open_count_facets(stl_file *stl, const char *file, unsigned int custom_header_length) static FILE *stl_open_count_facets(stl_file *stl, const char *file, unsigned int custom_header_length)
{ {
@@ -162,30 +165,61 @@ static bool stl_read(stl_file *stl, FILE *fp, int first_facet, bool first, Impor
else { else {
rewind(fp); rewind(fp);
try{ try{
char solid_name[256]; char solid_content[256];
int res_solid = fscanf(fp, " solid %[^\n]", solid_name); int res_solid = fscanf(fp, " solid %[^\n]", solid_content);
if (res_solid == 1) { if (res_solid == 1) {
char* mw_position = strstr(solid_name, "MW"); /*include ml info*/
if (mw_position != NULL) { std::string ext_content(solid_content);
// Extract the value after "MW" std::string ml_content;
char version_str[16]; std::string mw_content;
char model_id_str[128];
char country_code_str[16]; size_t pos = ext_content.find('&');
int num_values = sscanf(mw_position + 3, "%s %s %s", version_str, model_id_str, country_code_str); if (pos != std::string::npos) {
if (num_values == 3) { mw_content = ext_content.substr(0, pos);
if (strcmp(version_str, "1.0") == 0) { ml_content = ext_content.substr(pos + 1);
model_id = model_id_str; }
country_code = country_code_str;
if (ml_content.empty() && ext_content.find("ML") != std::string::npos) {
ml_content = ext_content;
}
if (mw_content.empty() && ext_content.find("MW") != std::string::npos) {
mw_content = ext_content;
}
/*parse ml info*/
if (!ml_content.empty()) {
std::istringstream iss(ml_content);
std::string token;
std::vector<std::string> result;
while (iss >> token) {
if (token.find(' ') == std::string::npos) {
result.push_back(token);
} }
} }
else {
model_id = ""; if (result.size() == 4 && result[0] == "ML") {
country_code = ""; ml_region = result[1];
ml_name = result[2];
ml_id = result[3];
} }
} }
else {
model_id = ""; // No MW format found /*parse mw info*/
country_code = ""; if (!mw_content.empty()) {
std::istringstream iss(mw_content);
std::string token;
std::vector<std::string> result;
while (iss >> token) {
if (token.find(' ') == std::string::npos) {
result.push_back(token);
}
}
if (result.size() == 4 && result[0] == "MW") {
model_id = result[2];
country_code = result[3];
}
} }
} }
} }
@@ -204,7 +238,7 @@ static bool stl_read(stl_file *stl, FILE *fp, int first_facet, bool first, Impor
if ((i % unit) == 0) { if ((i % unit) == 0) {
bool cb_cancel = false; bool cb_cancel = false;
if (stlFn) { if (stlFn) {
stlFn(i, facets_num, cb_cancel, model_id, country_code); stlFn(i, facets_num, cb_cancel, model_id, country_code, ml_region, ml_name, ml_id);
if (cb_cancel) if (cb_cancel)
return false; return false;
} }