lhye200/AIO_3D_Print_Web_Platform
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tmp

Browse Source
This commit is contained in:
lhye200
2026-04-13 16:32:30 +08:00
parent dad17dbadd
commit 1de35f21d7
14 changed files with 1081 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
app/routes.py
View File

@@ -415,7 +415,16 @@ def merge_and_slice():
inputs.append((path, p['matrix']))
# 只有在单一编辑模式才修改原模型的矩阵 (如果多模型/新建模式，我们不修改原模型，而是后续记录到新的包含实体上)
if 'raw_matrix' in p and is_edit and len(pieces) == 1:
f.transform_matrix = json.dumps(p['raw_matrix'])
f.transform_matrix = json.dumps({
"is_composite": False,
"matrix": p['raw_matrix'],
"settings": {
"quality": quality,
"infill": infill_density,
"support": support_enable,
"support_pattern": support_pattern
}
})
db.session.add(f)
db.session.commit()
@@ -431,7 +440,13 @@ def merge_and_slice():
if print_file.transform_matrix and 'is_composite' in print_file.transform_matrix:
composite_data = {
"is_composite": True,
"parts": []
"parts": [],
"settings": {
"quality": quality,
"infill": infill_density,
"support": support_enable,
"support_pattern": support_pattern
}
}
for p in pieces:
pf = PrintFile.query.get(p['file_id'])
@@ -444,7 +459,16 @@ def merge_and_slice():
})
print_file.transform_matrix = json.dumps(composite_data)
elif len(pieces) == 1:
print_file.transform_matrix = json.dumps(pieces[0].get('raw_matrix', pieces[0]['matrix']))
print_file.transform_matrix = json.dumps({
"is_composite": False,
"matrix": pieces[0].get('raw_matrix', pieces[0]['matrix']),
"settings": {
"quality": quality,
"infill": infill_density,
"support": support_enable,
"support_pattern": support_pattern
}
})
db.session.commit()
@@ -474,7 +498,13 @@ def merge_and_slice():
# 构建组合文件元数据树 (is_composite: true)
composite_data = {
"is_composite": True,
"parts": []
"parts": [],
"settings": {
"quality": quality,
"infill": infill_density,
"support": support_enable,
"support_pattern": support_pattern
}
}
for p in pieces:
pf = PrintFile.query.get(p['file_id'])