Pass the protocol file to Backend's createSocket

This commit is contained in:
Arjen Hiemstra 2016-01-28 03:22:18 +01:00
parent ffa87a9302
commit 6930008dd8

View file

@ -12,6 +12,7 @@ from UM.Logger import Logger
from UM.Resources import Resources from UM.Resources import Resources
from UM.Settings.SettingOverrideDecorator import SettingOverrideDecorator from UM.Settings.SettingOverrideDecorator import SettingOverrideDecorator
from UM.Message import Message from UM.Message import Message
from UM.PluginRegistry import PluginRegistry
from cura.OneAtATimeIterator import OneAtATimeIterator from cura.OneAtATimeIterator import OneAtATimeIterator
from . import Cura_pb2 from . import Cura_pb2
@ -221,15 +222,7 @@ class CuraEngineBackend(Backend):
pass pass
def _createSocket(self): def _createSocket(self):
super()._createSocket() super()._createSocket(os.path.abspath(os.path.join(PluginRegistry.getInstance().getPluginPath(self.getPluginId()), "Cura.proto")))
self._socket.registerMessageType(1, Cura_pb2.Slice)
self._socket.registerMessageType(2, Cura_pb2.SlicedObjectList)
self._socket.registerMessageType(3, Cura_pb2.Progress)
self._socket.registerMessageType(4, Cura_pb2.GCodeLayer)
self._socket.registerMessageType(5, Cura_pb2.ObjectPrintTime)
self._socket.registerMessageType(6, Cura_pb2.SettingList)
self._socket.registerMessageType(7, Cura_pb2.GCodePrefix)
## Manually triggers a reslice ## Manually triggers a reslice
def forceSlice(self): def forceSlice(self):
@ -266,7 +259,6 @@ class CuraEngineBackend(Backend):
else: else:
self._layer_view_active = False self._layer_view_active = False
def _onInstanceChanged(self): def _onInstanceChanged(self):
self._terminate() self._terminate()
self.slicingCancelled.emit() self.slicingCancelled.emit()