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

Install pyDulcificum

Browse Source 
Contributes to CURA-10561
This commit is contained in:
Jelle Spijker 2023-10-26 16:09:38 +02:00
parent 69f474a426
commit b2ced7c0ba
No known key found for this signature in database
GPG Key ID: 034D1C0527888B65
3 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
conandata.yml
View File

@ -86,6 +86,7 @@ pyinstaller:
hiddenimports: hiddenimports:
- "pySavitar" - "pySavitar"
- "pyArcus" - "pyArcus"
- "pyDulcificum"
- "pynest2d" - "pynest2d"
- "PyQt6" - "PyQt6"
- "PyQt6.QtNetwork" - "PyQt6.QtNetwork"

3
conanfile.py
View File

@ -192,6 +192,7 @@ class CuraConan(ConanFile):
self.options["pyarcus"].shared = True self.options["pyarcus"].shared = True
self.options["pysavitar"].shared = True self.options["pysavitar"].shared = True
self.options["pynest2d"].shared = True self.options["pynest2d"].shared = True
self.options["dulcificum"].shared = True
self.options["cpython"].shared = True self.options["cpython"].shared = True
self.options["boost"].header_only = True self.options["boost"].header_only = True
if self.settings.os == "Linux": if self.settings.os == "Linux":
@ -204,9 +205,11 @@ class CuraConan(ConanFile):
def requirements(self): def requirements(self):
self.requires("boost/1.82.0") self.requires("boost/1.82.0")
self.requires("fmt/9.0.0")
self.requires("curaengine_grpc_definitions/(latest)@ultimaker/testing") self.requires("curaengine_grpc_definitions/(latest)@ultimaker/testing")
self.requires("zlib/1.2.13") self.requires("zlib/1.2.13")
self.requires("pyarcus/5.3.0") self.requires("pyarcus/5.3.0")
self.requires("dulcificum/(latest)@ultimaker/cura_10561")
self.requires("curaengine/(latest)@ultimaker/testing") self.requires("curaengine/(latest)@ultimaker/testing")
self.requires("pysavitar/5.3.0") self.requires("pysavitar/5.3.0")
self.requires("pynest2d/5.3.0") self.requires("pynest2d/5.3.0")

2
plugins/MakerbotWriter/MakerbotWriter.py
View File

@ -5,6 +5,7 @@ from io import StringIO, BufferedIOBase
import json import json
from typing import cast, List, Optional, Dict from typing import cast, List, Optional, Dict
from zipfile import BadZipFile, ZipFile, ZIP_DEFLATED from zipfile import BadZipFile, ZipFile, ZIP_DEFLATED
import pyDulcificum as du
from PyQt6.QtCore import QBuffer from PyQt6.QtCore import QBuffer
@ -29,6 +30,7 @@ class MakerbotWriter(MeshWriter):
def __init__(self) -> None: def __init__(self) -> None:
super().__init__(add_to_recent_files=False) super().__init__(add_to_recent_files=False)
Logger.info(f"Using PyDulcificum: {du.__version__}")
_PNG_FORMATS = [ _PNG_FORMATS = [
{"prefix": "isometric_thumbnail", "width": 120, "height": 120}, {"prefix": "isometric_thumbnail", "width": 120, "height": 120},