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

Merge pull request #16485 from Ultimaker/CURA-10619_infill_fix

Browse Source 
Send over plugin name and version
This commit is contained in:
Remco Burema 2023-08-16 17:36:37 +02:00 committed by GitHub
commit 5ac4303175
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
conanfile.py
View File

@ -303,7 +303,7 @@ class CuraConan(ConanFile):
def requirements(self): def requirements(self):
self.requires("boost/1.81.0") self.requires("boost/1.81.0")
self.requires("pyarcus/(latest)@ultimaker/cura_10475") self.requires("pyarcus/(latest)@ultimaker/cura_10475")
self.requires("curaengine/(latest)@ultimaker/cura_10475") self.requires("curaengine/(latest)@ultimaker/cura_10619")
self.requires("pysavitar/5.2.2") self.requires("pysavitar/5.2.2")
self.requires("pynest2d/5.2.2") self.requires("pynest2d/5.2.2")
self.requires("uranium/(latest)@ultimaker/cura_10475") self.requires("uranium/(latest)@ultimaker/cura_10475")

8
cura/BackendPlugin.py
View File

@ -6,9 +6,13 @@ from typing import Optional, List
from UM.Logger import Logger from UM.Logger import Logger
from UM.Message import Message from UM.Message import Message
from UM.Settings.AdditionalSettingDefinitionAppender import AdditionalSettingDefinitionsAppender from UM.Settings.AdditionalSettingDefinitionAppender import AdditionalSettingDefinitionsAppender
from UM.PluginObject import PluginObject
from UM.i18n import i18nCatalog
class BackendPlugin(AdditionalSettingDefinitionsAppender): class BackendPlugin(AdditionalSettingDefinitionsAppender, PluginObject):
catalog = i18nCatalog("cura")
def __init__(self) -> None: def __init__(self) -> None:
super().__init__() super().__init__()
self.__port: int = 0 self.__port: int = 0
@ -42,7 +46,7 @@ class BackendPlugin(AdditionalSettingDefinitionsAppender):
if not self._plugin_command or "--port" in self._plugin_command: if not self._plugin_command or "--port" in self._plugin_command:
return self._plugin_command or [] return self._plugin_command or []
return self._plugin_command + ["--port", str(self.__port)] return self._plugin_command + ["--address", self.getAddress(), "--port", str(self.__port)]
def start(self) -> bool: def start(self) -> bool:
""" """

6
plugins/CuraEngineBackend/Cura.proto
View File

@ -19,8 +19,10 @@ enum SlotID {
message EnginePlugin message EnginePlugin
{ {
SlotID id = 1; SlotID id = 1;
optional string address = 2; string address = 2;
optional uint32 port = 3; uint32 port = 3;
string plugin_name = 4;
string plugin_version = 5;
} }
message Slice message Slice

2
plugins/CuraEngineBackend/StartSliceJob.py
View File

@ -314,6 +314,8 @@ class StartSliceJob(Job):
plugin_message.id = slot plugin_message.id = slot
plugin_message.address = plugin.getAddress() plugin_message.address = plugin.getAddress()
plugin_message.port = plugin.getPort() plugin_message.port = plugin.getPort()
plugin_message.plugin_name = plugin.getPluginId()
plugin_message.plugin_version = plugin.getVersion()
for group in filtered_object_groups: for group in filtered_object_groups:
group_message = self._slice_message.addRepeatedMessage("object_lists") group_message = self._slice_message.addRepeatedMessage("object_lists")