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

Fix some more code-style

Browse Source
This commit is contained in:
Diego Prado Gesto 2018-07-03 13:09:05 +02:00
parent ae7875a756
commit ff6bc9de4e
4 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cura/PickingPass.py
View File

@ -69,6 +69,7 @@ class PickingPass(RenderPass):
## Get the world coordinates of a picked point ## Get the world coordinates of a picked point
def getPickedPosition(self, x: int, y: int) -> Vector: def getPickedPosition(self, x: int, y: int) -> Vector:
distance = self.getPickedDepth(x, y) distance = self.getPickedDepth(x, y)
ray = self._scene.getActiveCamera().getRay(x, y) camera = self._scene.getActiveCamera()
if camera:
return ray.getPointAlongRay(distance) return camera.getRay(x, y).getPointAlongRay(distance)
return Vector()

4
cura/PrinterOutput/NetworkedPrinterOutputDevice.py
View File

@ -191,6 +191,7 @@ class NetworkedPrinterOutputDevice(PrinterOutputDevice):
def put(self, target: str, data: str, on_finished: Optional[Callable[[QNetworkReply], None]]) -> None: def put(self, target: str, data: str, on_finished: Optional[Callable[[QNetworkReply], None]]) -> None:
if self._manager is None: if self._manager is None:
self._createNetworkManager() self._createNetworkManager()
assert (self._manager is not None)
request = self._createEmptyRequest(target) request = self._createEmptyRequest(target)
self._last_request_time = time() self._last_request_time = time()
reply = self._manager.put(request, data.encode()) reply = self._manager.put(request, data.encode())
@ -199,6 +200,7 @@ class NetworkedPrinterOutputDevice(PrinterOutputDevice):
def get(self, target: str, on_finished: Optional[Callable[[QNetworkReply], None]]) -> None: def get(self, target: str, on_finished: Optional[Callable[[QNetworkReply], None]]) -> None:
if self._manager is None: if self._manager is None:
self._createNetworkManager() self._createNetworkManager()
assert (self._manager is not None)
request = self._createEmptyRequest(target) request = self._createEmptyRequest(target)
self._last_request_time = time() self._last_request_time = time()
reply = self._manager.get(request) reply = self._manager.get(request)
@ -207,6 +209,7 @@ class NetworkedPrinterOutputDevice(PrinterOutputDevice):
def post(self, target: str, data: str, on_finished: Optional[Callable[[QNetworkReply], None]], on_progress: Callable = None) -> None: def post(self, target: str, data: str, on_finished: Optional[Callable[[QNetworkReply], None]], on_progress: Callable = None) -> None:
if self._manager is None: if self._manager is None:
self._createNetworkManager() self._createNetworkManager()
assert (self._manager is not None)
request = self._createEmptyRequest(target) request = self._createEmptyRequest(target)
self._last_request_time = time() self._last_request_time = time()
reply = self._manager.post(request, data) reply = self._manager.post(request, data)
@ -218,6 +221,7 @@ class NetworkedPrinterOutputDevice(PrinterOutputDevice):
if self._manager is None: if self._manager is None:
self._createNetworkManager() self._createNetworkManager()
assert (self._manager is not None)
request = self._createEmptyRequest(target, content_type=None) request = self._createEmptyRequest(target, content_type=None)
multi_post_part = QHttpMultiPart(QHttpMultiPart.FormDataType) multi_post_part = QHttpMultiPart(QHttpMultiPart.FormDataType)
for part in parts: for part in parts:

1
cura/Settings/ContainerManager.py
View File

@ -208,7 +208,6 @@ class ContainerManager(QObject):
if not file_url: if not file_url:
return {"status": "error", "message": "Invalid path"} return {"status": "error", "message": "Invalid path"}
mime_type = None
if file_type not in self._container_name_filters: if file_type not in self._container_name_filters:
try: try:
mime_type = MimeTypeDatabase.getMimeTypeForFile(file_url) mime_type = MimeTypeDatabase.getMimeTypeForFile(file_url)

1
plugins/SupportEraser/SupportEraser.py
View File

@ -4,6 +4,7 @@
from PyQt5.QtCore import Qt, QTimer from PyQt5.QtCore import Qt, QTimer
from PyQt5.QtWidgets import QApplication from PyQt5.QtWidgets import QApplication
from UM.Application import Application
from UM.Math.Vector import Vector from UM.Math.Vector import Vector
from UM.Tool import Tool from UM.Tool import Tool
from UM.Event import Event, MouseEvent from UM.Event import Event, MouseEvent