From b2ced7c0bade3814773f7bccbad0f911e238d9cc Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Thu, 26 Oct 2023 16:09:38 +0200 Subject: [PATCH] Install pyDulcificum Contributes to CURA-10561 --- conandata.yml | 1 + conanfile.py | 3 +++ plugins/MakerbotWriter/MakerbotWriter.py | 2 ++ 3 files changed, 6 insertions(+) diff --git a/conandata.yml b/conandata.yml index c5ca663f91..c027bde567 100644 --- a/conandata.yml +++ b/conandata.yml @@ -86,6 +86,7 @@ pyinstaller: hiddenimports: - "pySavitar" - "pyArcus" + - "pyDulcificum" - "pynest2d" - "PyQt6" - "PyQt6.QtNetwork" diff --git a/conanfile.py b/conanfile.py index a9173e6614..27736d9daa 100644 --- a/conanfile.py +++ b/conanfile.py @@ -192,6 +192,7 @@ class CuraConan(ConanFile): self.options["pyarcus"].shared = True self.options["pysavitar"].shared = True self.options["pynest2d"].shared = True + self.options["dulcificum"].shared = True self.options["cpython"].shared = True self.options["boost"].header_only = True if self.settings.os == "Linux": @@ -204,9 +205,11 @@ class CuraConan(ConanFile): def requirements(self): self.requires("boost/1.82.0") + self.requires("fmt/9.0.0") self.requires("curaengine_grpc_definitions/(latest)@ultimaker/testing") self.requires("zlib/1.2.13") self.requires("pyarcus/5.3.0") + self.requires("dulcificum/(latest)@ultimaker/cura_10561") self.requires("curaengine/(latest)@ultimaker/testing") self.requires("pysavitar/5.3.0") self.requires("pynest2d/5.3.0") diff --git a/plugins/MakerbotWriter/MakerbotWriter.py b/plugins/MakerbotWriter/MakerbotWriter.py index 059dbd185d..db4a8b7797 100644 --- a/plugins/MakerbotWriter/MakerbotWriter.py +++ b/plugins/MakerbotWriter/MakerbotWriter.py @@ -5,6 +5,7 @@ from io import StringIO, BufferedIOBase import json from typing import cast, List, Optional, Dict from zipfile import BadZipFile, ZipFile, ZIP_DEFLATED +import pyDulcificum as du from PyQt6.QtCore import QBuffer @@ -29,6 +30,7 @@ class MakerbotWriter(MeshWriter): def __init__(self) -> None: super().__init__(add_to_recent_files=False) + Logger.info(f"Using PyDulcificum: {du.__version__}") _PNG_FORMATS = [ {"prefix": "isometric_thumbnail", "width": 120, "height": 120},