GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-14 15:35:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge changes

Browse Source
This commit is contained in:
Diego Prado Gesto 2017-09-22 11:29:29 +02:00
commit 4d113a746c
3 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cura/CuraSplashScreen.py
View File

@ -41,6 +41,10 @@ class CuraSplashScreen(QSplashScreen):
self._loading_image_rotation_angle -= 10 self._loading_image_rotation_angle -= 10
self.repaint() self.repaint()
# Override the mousePressEvent so the splashscreen doesn't disappear when clicked
def mousePressEvent(self, mouse_event):
pass
def drawContents(self, painter): def drawContents(self, painter):
if self._to_stop: if self._to_stop:
return return

3
cura/Settings/ProfilesModel.py
View File

@ -114,8 +114,7 @@ class ProfilesModel(InstanceContainersModel):
quality_type = profile[0].getMetaDataEntry("quality_type") if profile else "" quality_type = profile[0].getMetaDataEntry("quality_type") if profile else ""
if quality_type not in tmp_all_quality_items: if quality_type not in tmp_all_quality_items:
tmp_all_quality_items[quality_type] = {"suitable_container": None, tmp_all_quality_items[quality_type] = {"suitable_container": None, "all_containers": []}
"all_containers": []}
tmp_all_quality_items[quality_type]["all_containers"].append(item) tmp_all_quality_items[quality_type]["all_containers"].append(item)
if tmp_all_quality_items[quality_type]["suitable_container"] is None and profile[0] in qualities: if tmp_all_quality_items[quality_type]["suitable_container"] is None and profile[0] in qualities:

8
plugins/3MFReader/ThreeMFReader.py
View File

@ -204,10 +204,12 @@ class ThreeMFReader(MeshReader):
# Pre multiply the transformation with the loaded transformation, so the data is handled correctly. # Pre multiply the transformation with the loaded transformation, so the data is handled correctly.
um_node.setTransformation(um_node.getLocalTransformation().preMultiply(transformation_matrix)) um_node.setTransformation(um_node.getLocalTransformation().preMultiply(transformation_matrix))
# If the object in a saved project is below the bed, keep it that way # Check if the model is positioned below the build plate and honor that when loading project files.
if um_node.getMeshData() != None and um_node.getMeshData().getExtents(um_node.getWorldTransformation()).minimum.y < 0: if um_node.getMeshData() is not None:
minimum_z_value = um_node.getMeshData().getExtents(um_node.getWorldTransformation()).minimum.y # y is z in transformation coordinates
if minimum_z_value < 0:
um_node.addDecorator(ZOffsetDecorator()) um_node.addDecorator(ZOffsetDecorator())
um_node.callDecoration("setZOffset",um_node.getMeshData().getExtents(um_node.getWorldTransformation()).minimum.y) um_node.callDecoration("setZOffset", minimum_z_value)
result.append(um_node) result.append(um_node)