@@ -765,8 +781,10 @@
document.write(''+ createProgressBar(50,"#0784FF")+ ' ');//asa aero
document.write(''+ createProgressBar(25,"#0784FF")+ ' ');//pa12 cf
document.write(''+ createProgressBar(50,"#0784FF")+ ' ');//paht cf
+ document.write(''+ createProgressBar(50,"#0784FF")+ ' ');//paht gf
document.write(''+ createProgressBar(75,"#0784FF")+ ' ');//pc abs fr
document.write(''+ createProgressBar(75,"#0784FF")+ ' ');//pet cf
+ document.write(''+ createProgressBar(75,"#0784FF")+ ' ');//pet gf
document.write(''+ createProgressBar(75,"#0784FF")+ ' ');//petg
document.write('/ ');//pps-cf
document.write('/ ');//tpu
@@ -790,8 +808,10 @@
document.write(''+ createProgressBar(25,"#5cb85c")+ ' ');//asa aero
document.write(''+ createProgressBar(50,"#5cb85c")+ ' ');//pa12 cf
document.write(''+ createProgressBar(75,"#5cb85c")+ ' ');//paht cf
+ document.write(''+ createProgressBar(75,"#5cb85c")+ ' ');//paht gf
document.write(''+ createProgressBar(25,"#5cb85c")+ ' ');//pc abs fr
document.write(''+ createProgressBar(75,"#5cb85c")+ ' ');//pet cf
+ document.write(''+ createProgressBar(75,"#5cb85c")+ ' ');//pet gf
document.write(''+ createProgressBar(50,"#5cb85c")+ ' ');//petg
document.write('/ ');//pps-cf
document.write('/ ');//tpu
@@ -815,8 +835,10 @@
document.write(''+ createProgressBar(50,"#CC6B36")+ ' ');//asa aero
document.write(''+ createProgressBar(25,"#CC6B36")+ ' ');//pa12 cf
document.write(''+ createProgressBar(75,"#CC6B36")+ ' ');//paht cf
+ document.write(''+ createProgressBar(75,"#CC6B36")+ ' ');//paht gf
document.write(''+ createProgressBar(75,"#CC6B36")+ ' ');//pc abs fr
document.write(''+ createProgressBar(75,"#CC6B36")+ ' ');//pet cf
+ document.write(''+ createProgressBar(75,"#CC6B36")+ ' ');//pet gf
document.write(''+ createProgressBar(75,"#CC6B36")+ ' ');//petg
document.write('/ ');//pps-cf
document.write('/ ');//tpu
@@ -840,8 +862,10 @@
document.write('70℃ ');//asa aero
document.write('149.6℃ ');//pa12 cf
document.write('192.3℃ ');//paht cf
+ document.write('83.4℃ ');//paht gf
document.write('88℃ ');//pc abs fr
document.write('148.8℃ ');//pet cf
+ document.write('120.3℃ ');//pet gf
document.write('78℃ ');//petg
document.write('242.7℃ ');//pps-cf
document.write('/ ');//tpu
@@ -865,8 +889,10 @@
document.write('55℃ ');//asa aero
document.write('112.4℃ ');//pa12 cf
document.write('121.7℃ ');//paht cf
+ document.write('79.5℃ ');//paht gf
document.write('83℃ ');//pc abs fr
document.write('112.1℃ ');//pet cf
+ document.write('99.1℃ ');//pet gf
document.write('73℃ ');//petg
document.write('/ ');//pps-cf
document.write('/ ');//tpu
@@ -890,8 +916,10 @@
document.write('8.25 ± 0.15 MPa ');//asa aero
document.write('87.49 ± 2.81 MPa ');//pa12 cf
document.write('104.90 ± 1.99 MPa ');//paht cf
+ document.write('86.49 ± 1.03 MPa ');//paht gf
document.write('52.51 ± 0.28 MPa ');//pc abs fr
document.write('87.41 ± 3.57 MPa ');//pet cf
+ document.write('70.86 ± 2.86 MPa ');//pet gf
document.write('40.3 ± 0.6 MPa ');//petg
document.write('60 MPa ');//pps-cf
document.write('31.81 MPa ');//tpu
@@ -915,8 +943,10 @@
document.write('593.99 ± 24.34 MPa ');//asa aero
document.write('5438.40 ± 282.82 MPa ');//pa12 cf
document.write('8383.26 ± 419.53 MPa ');//paht cf
+ document.write('5118.97 ± 296.57 MPa ');//paht gf
document.write('2588.73 ± 64.81 MPa ');//pc abs fr
document.write('6025.53 ± 355.46 MPa ');//pet cf
+ document.write('4130.13 ± 107.00 MPa ');//pet gf
document.write('1780 ± 80 MPa ');//petg
document.write('4800 MPa ');//pps-cf
document.write('/ ');//tpu
@@ -940,9 +970,11 @@
document.write('11.52 ± 0.58% ');//asa aero
document.write('2.59 ± 0.19% ');//pa12 cf
document.write('1.60 ± 0.07% ');//paht cf
+ document.write('2.71 ± 0.28% ');//paht gf
document.write('5.55 ± 0.99% ');//pc abs fr
document.write('1.99 ± 0.18% ');//pet cf
- document.write('4.0 ± 0.2% ');//petg
+ document.write('2.56 ± 0.30% ');//pet gf
+ document.write('4.0 ± 0.20% ');//petg
document.write('6% ');//pps-cf
document.write('471% ');//tpu
document.write('11.68 ± 3.36% ');//ultra pa
@@ -965,8 +997,10 @@
document.write('14.31 ± 1.66 MPa ');//asa aero
document.write('133.17 ± 4.66 MPa ');//pa12 cf
document.write('147.70 ± 4.09 MPa ');//paht cf
+ document.write('137.78 ± 2.35 MPa ');//paht gf
document.write('85.95 ± 0.83 MPa ');//pc abs fr
document.write('122.69 ± 5.19 MPa ');//pet cf
+ document.write('114.87 ± 3.00 MPa ');//pet gf
document.write('62.8 ± 0.4 MPa ');//petg
document.write('105 MPa ');//pps-cf
document.write('/ ');//tpu
@@ -990,8 +1024,10 @@
document.write('457.94 ± 20.84 MPa ');//asa aero
document.write('4667.43 ± 339.80 MPa ');//pa12 cf
document.write('5969.35 ± 145.28 MPa ');//paht cf
+ document.write('4135.14 ± 64.91 MPa ');//paht gf
document.write('2504.55 ± 22.88 MPa ');//pc abs fr
document.write('5313.21 ± 197.89 MPa ');//pet cf
+ document.write('3650.32 ± 65.81 MPa ');//pet gf
document.write('1919 ± 54 MPa ');//petg
document.write('5500 MPa ');//pps-cf
document.write('/ ');//tpu
@@ -1015,8 +1051,10 @@
document.write('2.29 ± 0.13KJ/㎡ ');//asa aero
document.write('6.11 ± 1.45KJ/㎡ ');//pa12 cf
document.write('6.17 ± 0.2KJ/㎡ ');//paht cf
+ document.write('7.97 ± 1.75KJ/㎡ ');//paht gf
document.write('8.39 ± 0.46KJ/㎡ ');//pc abs fr
document.write('5.57 ± 0.58KJ/㎡ ');//pet cf
+ document.write('6.56 ± 0.68KJ/㎡ ');//pet gf
document.write('13.9 ± 2.3KJ/㎡ ');//petg
document.write('11KJ/㎡ ');//pps-cf
document.write('/ ');//tpu
@@ -1040,8 +1078,10 @@
document.write('' + getTranslation('Recommended drying', lang) + ' ');//asa aero
document.write('' + getTranslation('Need to dry', lang) + ' ');//pa12 cf
document.write('' + getTranslation('Need to dry', lang) + ' ');//paht cf
+ document.write('' + getTranslation('Need to dry', lang) + ' ');//paht gf
document.write('' + getTranslation('Recommended drying', lang) + ' ');//pc abs fr
document.write('' + getTranslation('Need to dry', lang) + ' ');//pet cf
+ document.write('' + getTranslation('Need to dry', lang) + ' ');//pet gf
document.write('' + getTranslation('Recommended drying', lang) + ' ');//petg
document.write('' + getTranslation('Need to dry', lang) + ' ');//pps-cf
document.write('' + getTranslation('Need to dry', lang) + ' ');//tpu
@@ -1065,8 +1105,10 @@
document.write('/ ');//asa aero
document.write('110-120℃ 4-6h ');//pa12 cf
document.write('/ ');//paht cf
+ document.write('80-100℃ 4-6h ');//paht gf
document.write('/ ');//pc abs fr
document.write('100℃ 4-6h ');//pet cf
+ document.write('100-120℃ 4-6h ');//pet gf
document.write('60-70℃ 4-6h ');//petg
document.write('/ ');//pps-cf
document.write('70-80℃ 4-6h ');//tpu
@@ -1090,8 +1132,10 @@
document.write('80-90℃ ');//asa aero
document.write('40-80℃ ');//pa12 cf
document.write('70-80℃ ');//paht cf
+ document.write('70-90℃ ');//paht gf
document.write('100-110℃ ');//pc abs fr
document.write('70-80℃ ');//pet cf
+ document.write('60-80℃ ');//pet gf
document.write('70-80℃ ');//petg
document.write('80-110℃ ');//pps-cf
document.write('20-60℃ ');//tpu
@@ -1115,8 +1159,10 @@
document.write('√ ');//asa aero
document.write('× ');//pa12 cf
document.write('× ');//paht cf
+ document.write('× ');//paht gf
document.write('√ ');//pc abs fr
document.write('× ');//pet cf
+ document.write('× ');//pet gf
document.write('× ');//petg
document.write('√ ');//pps-cf
document.write('× ');//tpu
@@ -1140,8 +1186,10 @@
document.write('240-280℃ ');//asa aero
document.write('280-300℃ ');//pa12 cf
document.write('300-320℃ ');//paht cf
+ document.write('300-320℃ ');//paht gf
document.write('240-270℃ ');//pc abs fr
document.write('280-320℃ ');//pet cf
+ document.write('280-320℃ ');//pet gf
document.write('240-280℃ ');//petg
document.write('300-370℃ ');//pps-cf
document.write('210-230℃ ');//tpu
@@ -1165,8 +1213,10 @@
document.write('＜90mm/s ');//asa aero
document.write('＜60mm/s ');//pa12 cf
document.write('＜160mm/s ');//paht cf
+ document.write('＜200mm/s ');//paht gf
document.write('＜300mm/s ');//pc abs fr
document.write('＜200mm/s ');//pet cf
+ document.write('＜200mm/s ');//pet gf
document.write('＜300mm/s ');//petg
document.write('＜200mm/s ');//pps-cf
document.write('＜120mm/s ');//tpu
@@ -1190,8 +1240,10 @@
document.write('/ ');//asa aero
document.write('80-100℃ ');//pa12 cf
document.write('80-100℃ ');//paht cf
+ document.write('80-100℃ ');//paht gf
document.write('/ ');//pc abs fr
document.write('80-100℃ ');//pet cf
+ document.write('80-100℃ ');//pet gf
document.write('/ ');//petg
document.write('/ ');//pps-cf
document.write('/ ');//tpu
diff --git a/resources/web/guide/21/21.js b/resources/web/guide/21/21.js
index c016304..49fa0cc 100644
--- a/resources/web/guide/21/21.js
+++ b/resources/web/guide/21/21.js
@@ -74,7 +74,7 @@ function HandleModelList( pVal )
{
let sVV=strVendor;
if( sVV=="QDT" )
- sVV="QIDI Lab";
+ sVV="QIDI Tech";
let HtmlNewVendor=''+
'
'+
@@ -88,7 +88,7 @@ function HandleModelList( pVal )
'
'+
'
printer ：
diff --git a/resources/web/guide/22/test.js b/resources/web/guide/22/test.js
index b194657..6a47112 100644
--- a/resources/web/guide/22/test.js
+++ b/resources/web/guide/22/test.js
@@ -1,159 +1,159 @@
var cData={
"filament": {
"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",
"selected": 1,
"sub_path": "filament/QIDI ABS @QDT X1C.json",
"type": "ABS",
- "vendor": "QIDI Lab"
+ "vendor": "QIDI Tech"
},
"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",
"selected": 1,
"sub_path": "filament/QIDI ABS @QDT X1C 0.2 nozzle.json",
"type": "ABS",
- "vendor": "QIDI Lab"
+ "vendor": "QIDI Tech"
},
"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",
"selected": 1,
"sub_path": "filament/QIDI ABS @QDT X1C 0.8 nozzle.json",
"type": "ABS",
- "vendor": "QIDI Lab"
+ "vendor": "QIDI Tech"
},
"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",
"selected": 0,
"sub_path": "filament/QIDI PA-CF @QDT X1C.json",
"type": "PA-CF",
- "vendor": "QIDI Lab"
+ "vendor": "QIDI Tech"
},
"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",
"selected": 1,
"sub_path": "filament/QIDI PC @QDT X1C.json",
"type": "PC",
- "vendor": "QIDI Lab"
+ "vendor": "QIDI Tech"
},
"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",
"selected": 1,
"sub_path": "filament/QIDI PC @QDT X1C 0.8 nozzle.json",
"type": "PC",
- "vendor": "QIDI Lab"
+ "vendor": "QIDI Tech"
},
"QIDI PLA Basic @QDT X1": {
- "models": "[QIDI Lab X1++0.4]",
+ "models": "[QIDI Tech X1++0.4]",
"name": "QIDI PLA Basic @QDT X1",
"selected": 1,
"sub_path": "filament/QIDI PLA Basic @QDT X1.json",
"type": "PLA",
- "vendor": "QIDI Lab"
+ "vendor": "QIDI Tech"
},
"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",
"selected": 1,
"sub_path": "filament/QIDI PLA Basic @QDT X1C.json",
"type": "PLA",
- "vendor": "QIDI Lab"
+ "vendor": "QIDI Tech"
},
"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",
"selected": 1,
"sub_path": "filament/QIDI PLA Basic @QDT X1C 0.2 nozzle.json",
"type": "PLA",
- "vendor": "QIDI Lab"
+ "vendor": "QIDI Tech"
},
"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",
"selected": 1,
"sub_path": "filament/QIDI PLA Basic @QDT X1C 0.8 nozzle.json",
"type": "PLA",
- "vendor": "QIDI Lab"
+ "vendor": "QIDI Tech"
},
"QIDI PLA Matte @QDT X1": {
- "models": "[QIDI Lab X1++0.4]",
+ "models": "[QIDI Tech X1++0.4]",
"name": "QIDI PLA Matte @QDT X1",
"selected": 1,
"sub_path": "filament/QIDI PLA Matte @QDT X1.json",
"type": "PLA",
- "vendor": "QIDI Lab"
+ "vendor": "QIDI Tech"
},
"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",
"selected": 1,
"sub_path": "filament/QIDI PLA Matte @QDT X1C.json",
"type": "PLA",
- "vendor": "QIDI Lab"
+ "vendor": "QIDI Tech"
},
"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",
"selected": 1,
"sub_path": "filament/QIDI PLA Matte @QDT X1C 0.2 nozzle.json",
"type": "PLA",
- "vendor": "QIDI Lab"
+ "vendor": "QIDI Tech"
},
"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",
"selected": 1,
"sub_path": "filament/QIDI PLA Matte @QDT X1C 0.8 nozzle.json",
"type": "PLA",
- "vendor": "QIDI Lab"
+ "vendor": "QIDI Tech"
},
"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",
"selected": 0,
"sub_path": "filament/QIDI Support G @QDT X1C.json",
"type": "PA",
- "vendor": "QIDI Lab"
+ "vendor": "QIDI Tech"
},
"QIDI Support W @QDT X1": {
- "models": "[QIDI Lab X1++0.4]",
+ "models": "[QIDI Tech X1++0.4]",
"name": "QIDI Support W @QDT X1",
"selected": 1,
"sub_path": "filament/QIDI Support W @QDT X1.json",
"type": "PLA",
- "vendor": "QIDI Lab"
+ "vendor": "QIDI Tech"
},
"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",
"selected": 1,
"sub_path": "filament/QIDI Support W @QDT X1C.json",
"type": "PLA",
- "vendor": "QIDI Lab"
+ "vendor": "QIDI Tech"
},
"QIDI TPU 95A @QDT X1": {
- "models": "[QIDI Lab X1++0.4]",
+ "models": "[QIDI Tech X1++0.4]",
"name": "QIDI TPU 95A @QDT X1",
"selected": 1,
"sub_path": "filament/QIDI TPU 95A @QDT X1.json",
"type": "TPU",
- "vendor": "QIDI Lab"
+ "vendor": "QIDI Tech"
},
"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",
"selected": 1,
"sub_path": "filament/QIDI TPU 95A @QDT X1C.json",
"type": "TPU",
- "vendor": "QIDI Lab"
+ "vendor": "QIDI Tech"
},
"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",
"selected": 0,
"sub_path": "filament/Generic ABS.json",
@@ -161,7 +161,7 @@ var cData={
"vendor": "Generic"
},
"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",
"selected": 0,
"sub_path": "filament/Generic ASA.json",
@@ -169,7 +169,7 @@ var cData={
"vendor": "Generic"
},
"Generic PA": {
- "models": "[QIDI Lab X1 Carbon++0.4]",
+ "models": "[QIDI Tech X1 Carbon++0.4]",
"name": "Generic PA",
"selected": 0,
"sub_path": "filament/Generic PA.json",
@@ -177,7 +177,7 @@ var cData={
"vendor": "Generic"
},
"Generic PA-CF": {
- "models": "[QIDI Lab X1 Carbon++0.4]",
+ "models": "[QIDI Tech X1 Carbon++0.4]",
"name": "Generic PA-CF",
"selected": 0,
"sub_path": "filament/Generic PA-CF.json",
@@ -185,7 +185,7 @@ var cData={
"vendor": "Generic"
},
"Generic PC": {
- "models": "[QIDI Lab X1 Carbon++0.4]",
+ "models": "[QIDI Tech X1 Carbon++0.4]",
"name": "Generic PC",
"selected": 0,
"sub_path": "filament/Generic PC.json",
@@ -193,7 +193,7 @@ var cData={
"vendor": "Generic"
},
"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",
"selected": 0,
"sub_path": "filament/Generic PETG.json",
@@ -201,7 +201,7 @@ var cData={
"vendor": "Generic"
},
"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",
"selected": 1,
"sub_path": "filament/Generic PLA.json",
@@ -209,7 +209,7 @@ var cData={
"vendor": "Generic"
},
"Generic PLA-CF": {
- "models": "[QIDI Lab X1 Carbon++0.4]",
+ "models": "[QIDI Tech X1 Carbon++0.4]",
"name": "Generic PLA-CF",
"selected": 0,
"sub_path": "filament/Generic PLA-CF.json",
@@ -217,7 +217,7 @@ var cData={
"vendor": "Generic"
},
"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",
"selected": 0,
"sub_path": "filament/Generic PVA.json",
@@ -225,7 +225,7 @@ var cData={
"vendor": "Generic"
},
"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",
"selected": 0,
"sub_path": "filament/Generic TPU.json",
@@ -233,7 +233,7 @@ var cData={
"vendor": "Generic"
},
"PolyLite PLA @QDT X1": {
- "models": "[QIDI Lab X1++0.4]",
+ "models": "[QIDI Tech X1++0.4]",
"name": "PolyLite PLA @QDT X1",
"selected": 1,
"sub_path": "filament/PolyLite PLA @QDT X1.json",
@@ -241,7 +241,7 @@ var cData={
"vendor": "Polymaker"
},
"PolyLite PLA @QDT X1C": {
- "models": "[QIDI Lab X1 Carbon++0.4]",
+ "models": "[QIDI Tech X1 Carbon++0.4]",
"name": "PolyLite PLA @QDT X1C",
"selected": 1,
"sub_path": "filament/PolyLite PLA @QDT X1C.json",
@@ -249,7 +249,7 @@ var cData={
"vendor": "Polymaker"
},
"PolyTerra PLA @QDT X1": {
- "models": "[QIDI Lab X1++0.4]",
+ "models": "[QIDI Tech X1++0.4]",
"name": "PolyTerra PLA @QDT X1",
"selected": 1,
"sub_path": "filament/PolyTerra PLA @QDT X1.json",
@@ -257,7 +257,7 @@ var cData={
"vendor": "Polymaker"
},
"PolyTerra PLA @QDT X1C": {
- "models": "[QIDI Lab X1 Carbon++0.4]",
+ "models": "[QIDI Tech X1 Carbon++0.4]",
"name": "PolyTerra PLA @QDT X1C",
"selected": 1,
"sub_path": "filament/PolyTerra PLA @QDT X1C.json",
@@ -266,54 +266,54 @@ var cData={
}
},
"machine": {
- "QIDI Lab X1 0.4 nozzle": {
- "model": "QIDI Lab X1",
- "name": "QIDI Lab X1 0.4 nozzle",
+ "QIDI Tech X1 0.4 nozzle": {
+ "model": "QIDI Tech X1",
+ "name": "QIDI Tech X1 0.4 nozzle",
"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": {
- "model": "QIDI Lab X1 Carbon",
- "name": "QIDI Lab X1 Carbon 0.2 nozzle",
+ "QIDI Tech X1 Carbon 0.2 nozzle": {
+ "model": "QIDI Tech X1 Carbon",
+ "name": "QIDI Tech X1 Carbon 0.2 nozzle",
"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": {
- "model": "QIDI Lab X1 Carbon",
- "name": "QIDI Lab X1 Carbon 0.4 nozzle",
+ "QIDI Tech X1 Carbon 0.4 nozzle": {
+ "model": "QIDI Tech X1 Carbon",
+ "name": "QIDI Tech X1 Carbon 0.4 nozzle",
"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": {
- "model": "QIDI Lab X1 Carbon",
- "name": "QIDI Lab X1 Carbon 0.6 nozzle",
+ "QIDI Tech X1 Carbon 0.6 nozzle": {
+ "model": "QIDI Tech X1 Carbon",
+ "name": "QIDI Tech X1 Carbon 0.6 nozzle",
"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": {
- "model": "QIDI Lab X1 Carbon",
- "name": "QIDI Lab X1 Carbon 0.8 nozzle",
+ "QIDI Tech X1 Carbon 0.8 nozzle": {
+ "model": "QIDI Tech X1 Carbon",
+ "name": "QIDI Tech X1 Carbon 0.8 nozzle",
"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": [
{
- "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;",
- "model": "QIDI Lab X1 Carbon",
+ "model": "QIDI Tech X1 Carbon",
"nozzle_diameter": "0.4;0.2;0.6;0.8",
"nozzle_selected": "0.2;0.6",
- "sub_path": "machine/QIDI Lab X1 Carbon.json",
+ "sub_path": "machine/QIDI Tech X1 Carbon.json",
"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;",
- "model": "QIDI Lab X1",
+ "model": "QIDI Tech X1",
"nozzle_diameter": "0.4",
"nozzle_selected": "0.4",
- "sub_path": "machine/QIDI Lab X1.json",
+ "sub_path": "machine/QIDI Tech X1.json",
"vendor": "QDT"
}
],
diff --git a/resources/web/guide/23/23.js b/resources/web/guide/23/23.js
index 37837f8..f113569 100644
--- a/resources/web/guide/23/23.js
+++ b/resources/web/guide/23/23.js
@@ -240,7 +240,7 @@ function SortUI()
let fWholeName = OneFila['name'].trim();
let fShortName = GetFilamentShortname(OneFila['name']);
let fVendor = OneFila['vendor'];
- if (fVendor != "Generic")
+ if (fVendor == "QIDI")
continue;
let fType = OneFila['type'];
let fSelect = OneFila['selected'];
diff --git a/resources/web/guide/23/index.html b/resources/web/guide/23/index.html
index 8b3efc7..9a00c08 100644
--- a/resources/web/guide/23/index.html
+++ b/resources/web/guide/23/index.html
@@ -26,14 +26,14 @@
printer ：
diff --git a/resources/web/guide/24/24.js b/resources/web/guide/24/24.js
index f22df81..af56f71 100644
--- a/resources/web/guide/24/24.js
+++ b/resources/web/guide/24/24.js
@@ -73,7 +73,7 @@ function HandleModelList( pVal )
{
let sVV=strVendor;
if( sVV=="QDT" )
- sVV="QIDI Lab";
+ sVV="QIDI Tech";
let HtmlNewVendor=''+
'
'+
@@ -87,7 +87,7 @@ function HandleModelList( pVal )
'
'+
'
Online Models
MORE >
-
+
+
+ -->
+
+
+
+
+
+
+
+
Print History
+
+
+
MORE >
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/resources/web/homepage3/img/left_ph.svg b/resources/web/homepage3/img/left_ph.svg
new file mode 100644
index 0000000..a7dc8c6
--- /dev/null
+++ b/resources/web/homepage3/img/left_ph.svg
@@ -0,0 +1,8 @@
+
+
diff --git a/resources/web/homepage3/img/ph.svg b/resources/web/homepage3/img/ph.svg
new file mode 100644
index 0000000..896c3ed
--- /dev/null
+++ b/resources/web/homepage3/img/ph.svg
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/resources/web/homepage3/img/refresh.svg b/resources/web/homepage3/img/refresh.svg
new file mode 100644
index 0000000..934161b
--- /dev/null
+++ b/resources/web/homepage3/img/refresh.svg
@@ -0,0 +1,3 @@
+
+
diff --git a/resources/web/homepage3/img/search.svg b/resources/web/homepage3/img/search.svg
new file mode 100644
index 0000000..be31c05
--- /dev/null
+++ b/resources/web/homepage3/img/search.svg
@@ -0,0 +1,3 @@
+
+
diff --git a/resources/web/homepage3/img/search_dark.svg b/resources/web/homepage3/img/search_dark.svg
new file mode 100644
index 0000000..ed41ba2
--- /dev/null
+++ b/resources/web/homepage3/img/search_dark.svg
@@ -0,0 +1,3 @@
+
+
diff --git a/resources/web/homepage3/img/time.svg b/resources/web/homepage3/img/time.svg
new file mode 100644
index 0000000..ee5ad72
--- /dev/null
+++ b/resources/web/homepage3/img/time.svg
@@ -0,0 +1,12 @@
+
+
diff --git a/resources/web/homepage3/js/home.js b/resources/web/homepage3/js/home.js
index 084d256..1f3acfe 100644
--- a/resources/web/homepage3/js/home.js
+++ b/resources/web/homepage3/js/home.js
@@ -4,6 +4,7 @@ var m_HotModelList=null;
var m_ForUModelList=null;
var m_MakerlabList=null;
+var m_PrintHistoryList=null;
function OnHomeInit()
{
@@ -13,8 +14,26 @@ function OnHomeInit()
SendMsg_GetRecentFile();
SendMsg_GetStaffPick();
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']);
+
+ //$('#PrintHistoryArea').show();
+ //ShowPrintHistory(Test_PrintTaskList['hits']);
+
+ //Show4UPick(Test_4UModelList['hits']);
}
//Recent详情页面的状态
@@ -31,9 +50,25 @@ function OnRecentInit()
Set_RecentFile_Delete_Checkbox_Event();
}
+var m_LineMenuName='';
function OnLineInit()
{
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 )
{
let strCmd = pVal['command'];
+ //alert(strCmd);
if(strCmd=='get_recent_projects')
{
@@ -195,6 +231,43 @@ function HandleStudio( pVal )
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 )
@@ -210,7 +283,10 @@ function OnBoardChange( strMenu )
SendMsg_GetStaffPick();
if( m_MakerlabList==null || m_MakerlabList.length==0 )
- SendMsg_GetMakerlabList();
+ SendMsg_GetMakerlabList();
+
+ if( m_PrintHistoryList==null )
+ SendMsg_GetPrintHistory();
}
else if(strMenu=='recent')
{
@@ -663,6 +739,7 @@ function ShowStaffPick( ModelList )
$('#HotModelList').html(strPickHtml);
InitStaffPick();
$('#HotModelArea').show();
+ $('#HotModel_Search_Bar').css('display','flex');
}
function Show4UPick( ModelList )
@@ -721,6 +798,7 @@ function Show4UPick( ModelList )
$('#HotModelList').html(strPickHtml);
InitStaffPick();
$('#HotModelArea').show();
+ $('#HotModel_Search_Bar').css('display','flex');
}
function OpenOneStaffPickModel( ModelID )
@@ -735,6 +813,19 @@ function OpenOneStaffPickModel( ModelID )
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------------
function IsChinese()
@@ -818,6 +909,122 @@ function OnOpenOneMakerlab( ChildUrl )
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=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=''+
+ '
'+
+ '
'+
+ '
'+TaskName+'
'+
+ '
'+
+ '
'+strCostTime+' '+
+ '
'+DeviceName+' '+
+ '
'+
+ '
'+
+ '
'+
+ '
'+PlateName+'
'+
+ '
('+StartTime+')
'+
+ '
';
+ switch(Status)
+ {
+ case 2:
+ strTaskHtml+='
Success
';
+ break;
+ case 3:
+ strTaskHtml+='
Canceled
';
+ break;
+ default:
+ strTaskHtml+='
Printing
';
+ break;
+ }
+ strTaskHtml+=
+ '
'+
+ '
';
+ if( isPublicProfile==false && sMode!='cloud_slice' )
+ strTaskHtml+='
Gcode
';
+
+ strTaskHtml+='
-
Makerlab
+
MakerLab
New
+
User Manual
diff --git a/resources/web/include/globalapi.js b/resources/web/include/globalapi.js
index f0246eb..e21ef58 100644
--- a/resources/web/include/globalapi.js
+++ b/resources/web/include/globalapi.js
@@ -62,7 +62,7 @@ function GetFullDate()
return tDate;
}
-
+//return YYYY-MM-DD
function Unixtimestamp2Date( nSecond )
{
var d=new Date(nSecond*1000);
@@ -93,6 +93,17 @@ function Unixtimestamp2Date( nSecond )
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.prototype.in_array = function (e) {
@@ -468,10 +479,16 @@ function DisableHotkey( b_CtrlP )
if (e.shiftKey && e.metaKey)
OutputKey(e.keyCode, false, true, true);
- if (window.event) {
- try { e.keyCode = 0; } catch (e) { }
- e.returnValue = false;
+ //F1--F12
+ if ( e.keyCode>=112 && e.keyCode<=123 )
+ {
+ e.preventDefault();
}
+
+// if (window.event) {
+// try { e.keyCode = 0; } catch (e) { }
+// e.returnValue = false;
+// }
};
window.addEventListener('mousewheel', function (event) {
@@ -479,7 +496,24 @@ function DisableHotkey( b_CtrlP )
event.preventDefault();
}
}, { passive: false });
+
+ DisableDropAction();
}
DisableHotkey();
+/*--------Disable Drop Action---------*/
+function DisableDropAction()
+{
+ document.addEventListener("dragstart", (event) => {
+ event.preventDefault();
+ });
+
+ document.addEventListener("dragover", (event) => {
+ event.preventDefault();
+ });
+
+ document.addEventListener("drop", (event) => {
+ event.preventDefault();
+ });
+}
\ No newline at end of file
diff --git a/resources/web/model/index.html b/resources/web/model/index.html
index 5ef0a07..b9ca50b 100644
--- a/resources/web/model/index.html
+++ b/resources/web/model/index.html
@@ -22,8 +22,6 @@
-
-
no model information
diff --git a/resources/web/model/model.css b/resources/web/model/model.css
index d52be39..303ef49 100644
--- a/resources/web/model/model.css
+++ b/resources/web/model/model.css
@@ -4,7 +4,6 @@
padding: 0px;
border: 0px;
font-family: "system-ui", "Segoe UI", Roboto, Oxygen, Ubuntu, "Fira Sans", "Droid Sans", "Helvetica Neue", sans-sans;
- user-select: none;
}
html
diff --git a/resources/web/model/model.js b/resources/web/model/model.js
index bdc85fe..de923de 100644
--- a/resources/web/model/model.js
+++ b/resources/web/model/model.js
@@ -144,6 +144,14 @@ function Request3MFInfo()
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)
{
let strCmd=pVal['command'];
@@ -213,6 +221,7 @@ function ShowModelInfo( pModel )
let UploadType=pModel.upload_type.toLowerCase();
let sLicence=pModel.license.toUpperCase();
let sModelDesc=decodeURIComponent(pModel.description);
+ sModelDesc=HtmlDecodeFrom3MF( sModelDesc );
if( pModel.hasOwnProperty('model_id') )
{
@@ -275,8 +284,8 @@ function ShowModelInfo( pModel )
$('#ModelLicenceImg').hide();
break;
}
-
- $('#Model_Desc').html( html_decode(sModelDesc) );
+
+ $('#Model_Desc').html( sModelDesc );
let ModelPreviewList=pModel.preview_img;
let TotalPreview=ModelPreviewList.length;
@@ -490,11 +499,12 @@ function ShowProfilelInfo( pProfile )
let sProfileName=decodeURIComponent(pProfile.name);
let sProfileAuthor=decodeURIComponent(pProfile.author);
let sProfileDesc=decodeURIComponent(pProfile.description);
+ sProfileDesc=HtmlDecodeFrom3MF(sProfileDesc);
$('#ProfileName').html(sProfileName);
$('#ProfileAuthor').html(sProfileAuthor);
- $('#Profile_Desc').html( html_decode(sProfileDesc) );
+ $('#Profile_Desc').html( sProfileDesc );
let ProfilePreviewList=pProfile.preview_img;
let TotalPreview=ProfilePreviewList.length;
diff --git a/resources/web/qidi/link_missing_connection.html b/resources/web/qidi/link_missing_connection.html
index 11597c6..1d5a78e 100644
--- a/resources/web/qidi/link_missing_connection.html
+++ b/resources/web/qidi/link_missing_connection.html
@@ -36,10 +36,10 @@
- Connect Device
+ Connect Device
- 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.
+ 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.
diff --git a/resources/web/qidi/missing_connection.html b/resources/web/qidi/missing_connection.html
index c9eb04f..0e9281e 100644
--- a/resources/web/qidi/missing_connection.html
+++ b/resources/web/qidi/missing_connection.html
@@ -36,10 +36,10 @@
- Connect Device
+ Connect Device
- Please set up your printer connection to view the device.
+ Please set up your printer connection to view the device.
diff --git a/src/admesh/stl.h b/src/admesh/stl.h
index 0f1a0ce..0a4d07f 100644
--- a/src/admesh/stl.h
+++ b/src/admesh/stl.h
@@ -45,7 +45,8 @@ typedef Eigen::Matrix
stl_triangle_vertex_indices
static_assert(sizeof(stl_vertex) == 12, "size of stl_vertex incorrect");
static_assert(sizeof(stl_normal) == 12, "size of stl_normal incorrect");
-typedef std::function ImportstlProgressFn;
+typedef std::function ImportstlProgressFn;
typedef enum {
eNormal, // normal face
diff --git a/src/admesh/stlinit.cpp b/src/admesh/stlinit.cpp
index 8196bf1..96532e2 100644
--- a/src/admesh/stlinit.cpp
+++ b/src/admesh/stlinit.cpp
@@ -46,6 +46,9 @@ extern void stl_internal_reverse_quads(char *buf, size_t cnt);
const int LOAD_STL_UNIT_NUM = 5;
static std::string model_id = "";
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)
{
@@ -162,30 +165,61 @@ static bool stl_read(stl_file *stl, FILE *fp, int first_facet, bool first, Impor
else {
rewind(fp);
try{
- char solid_name[256];
- int res_solid = fscanf(fp, " solid %[^\n]", solid_name);
+ char solid_content[256];
+ int res_solid = fscanf(fp, " solid %[^\n]", solid_content);
if (res_solid == 1) {
- char* mw_position = strstr(solid_name, "MW");
- if (mw_position != NULL) {
- // Extract the value after "MW"
- char version_str[16];
- char model_id_str[128];
- char country_code_str[16];
- int num_values = sscanf(mw_position + 3, "%s %s %s", version_str, model_id_str, country_code_str);
- if (num_values == 3) {
- if (strcmp(version_str, "1.0") == 0) {
- model_id = model_id_str;
- country_code = country_code_str;
+ /*include ml info*/
+ std::string ext_content(solid_content);
+ std::string ml_content;
+ std::string mw_content;
+
+ size_t pos = ext_content.find('&');
+ if (pos != std::string::npos) {
+ mw_content = ext_content.substr(0, pos);
+ ml_content = ext_content.substr(pos + 1);
+ }
+
+ 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 result;
+ while (iss >> token) {
+ if (token.find(' ') == std::string::npos) {
+ result.push_back(token);
}
}
- else {
- model_id = "";
- country_code = "";
+
+ if (result.size() == 4 && result[0] == "ML") {
+ ml_region = result[1];
+ ml_name = result[2];
+ ml_id = result[3];
}
}
- else {
- model_id = ""; // No MW format found
- country_code = "";
+
+ /*parse mw info*/
+ if (!mw_content.empty()) {
+ std::istringstream iss(mw_content);
+ std::string token;
+ std::vector 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) {
bool cb_cancel = false;
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)
return false;
}
Open Project
- 
Create new project
- 
+ 
+ 
+ 
'+strCostTime+''+
+ ' 
'+DeviceName+''+
+ ' 
diff --git a/resources/web/qidi/missing_connection.html b/resources/web/qidi/missing_connection.html
index c9eb04f..0e9281e 100644
--- a/resources/web/qidi/missing_connection.html
+++ b/resources/web/qidi/missing_connection.html
@@ -36,10 +36,10 @@
diff --git a/src/admesh/stl.h b/src/admesh/stl.h
index 0f1a0ce..0a4d07f 100644
--- a/src/admesh/stl.h
+++ b/src/admesh/stl.h
@@ -45,7 +45,8 @@ typedef Eigen::Matrix