3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-25 07:33:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merge branch '2.5' of github.com:Ultimaker/Cura into 2.5

Browse source
This commit is contained in:
Jack Ha 2017-03-30 16:05:07 +02:00
commit fa7a026efe
3 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cura/BuildVolume.py
View file

@ -110,7 +110,7 @@ class BuildVolume(SceneNode):
def _onChangeTimerFinished(self): def _onChangeTimerFinished(self):
root = Application.getInstance().getController().getScene().getRoot() root = Application.getInstance().getController().getScene().getRoot()
new_scene_objects = set(node for node in BreadthFirstIterator(root) if node.getMeshData() and type(node) is SceneNode) new_scene_objects = set(node for node in BreadthFirstIterator(root) if node.callDecoration("isSliceable"))
if new_scene_objects != self._scene_objects: if new_scene_objects != self._scene_objects:
for node in new_scene_objects - self._scene_objects: #Nodes that were added to the scene. for node in new_scene_objects - self._scene_objects: #Nodes that were added to the scene.
self._onNodeDecoratorChanged(node) self._onNodeDecoratorChanged(node)

2
cura/PrintInformation.py
View file

@ -75,6 +75,8 @@ class PrintInformation(QObject):
Application.getInstance().getMachineManager().activeMaterialChanged.connect(self._onActiveMaterialChanged) Application.getInstance().getMachineManager().activeMaterialChanged.connect(self._onActiveMaterialChanged)
self._onActiveMaterialChanged() self._onActiveMaterialChanged()
self._material_amounts = []
currentPrintTimeChanged = pyqtSignal() currentPrintTimeChanged = pyqtSignal()
preSlicedChanged = pyqtSignal() preSlicedChanged = pyqtSignal()

3
plugins/UM3NetworkPrinting/NetworkPrinterOutputDevice.py
View file

@ -852,7 +852,6 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice):
url = QUrl("http://" + self._address + self._api_prefix + "auth/request") url = QUrl("http://" + self._address + self._api_prefix + "auth/request")
request = QNetworkRequest(url) request = QNetworkRequest(url)
request.setHeader(QNetworkRequest.ContentTypeHeader, "application/json") request.setHeader(QNetworkRequest.ContentTypeHeader, "application/json")
self.setAuthenticationState(AuthState.AuthenticationRequested)
self._manager.post(request, json.dumps({"application": "Cura-" + Application.getInstance().getVersion(), "user": self._getUserName()}).encode()) self._manager.post(request, json.dumps({"application": "Cura-" + Application.getInstance().getVersion(), "user": self._getUserName()}).encode())
## Send all material profiles to the printer. ## Send all material profiles to the printer.
@ -1033,7 +1032,7 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice):
if "/auth/request" in reply_url: if "/auth/request" in reply_url:
# We got a response to requesting authentication. # We got a response to requesting authentication.
data = json.loads(bytes(reply.readAll()).decode("utf-8")) data = json.loads(bytes(reply.readAll()).decode("utf-8"))
self.setAuthenticationState(AuthState.AuthenticationRequested)
global_container_stack = Application.getInstance().getGlobalContainerStack() global_container_stack = Application.getInstance().getGlobalContainerStack()
if global_container_stack: # Remove any old data. if global_container_stack: # Remove any old data.
Logger.log("d", "Removing old network authentication data as a new one was requested.") Logger.log("d", "Removing old network authentication data as a new one was requested.")