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

Re-enabled the progress circle

Browse source 
A fix in Uranium made it possible for a timer to function, which ensures that it no longer breaks on linux

CURA-4343
This commit is contained in:
Jaime van Kessel 2017-09-19 11:31:28 +02:00
parent d49e84830b
commit 4e897a9a00
1 changed files with 25 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

28
cura/CuraSplashScreen.py
View file

@ -3,7 +3,7 @@
from threading import Thread, Event from threading import Thread, Event
from PyQt5.QtCore import Qt, QCoreApplication from PyQt5.QtCore import Qt, QCoreApplication, QTimer
from PyQt5.QtGui import QPixmap, QColor, QFont, QPen, QPainter from PyQt5.QtGui import QPixmap, QColor, QFont, QPen, QPainter
from PyQt5.QtWidgets import QSplashScreen from PyQt5.QtWidgets import QSplashScreen
@ -24,10 +24,22 @@ class CuraSplashScreen(QSplashScreen):
self._loading_image_rotation_angle = 0 self._loading_image_rotation_angle = 0
self._to_stop = False self._to_stop = False
self._change_timer = QTimer()
self._change_timer.setInterval(50)
self._change_timer.setSingleShot(False)
#self.timeoutSignal.connect(self._onTimeout)
self._change_timer.timeout.connect(self.updateLoadingImage)
def show(self): def show(self):
super().show() super().show()
self._to_stop = False self._change_timer.start()
def updateLoadingImage(self):
if self._to_stop:
return
self._loading_image_rotation_angle -= 10
self.repaint()
def drawContents(self, painter): def drawContents(self, painter):
if self._to_stop: if self._to_stop:
@ -55,6 +67,13 @@ class CuraSplashScreen(QSplashScreen):
painter.drawText(252, 105, 330 * self._scale, 255 * self._scale, Qt.AlignLeft | Qt.AlignTop, version[1]) painter.drawText(252, 105, 330 * self._scale, 255 * self._scale, Qt.AlignLeft | Qt.AlignTop, version[1])
painter.setPen(QColor(255, 255, 255, 255)) painter.setPen(QColor(255, 255, 255, 255))
# draw the loading image
pen = QPen()
pen.setWidth(6 * self._scale)
pen.setColor(QColor(32, 166, 219, 255))
painter.setPen(pen)
painter.drawArc(60, 150, 32 * self._scale, 32 * self._scale, self._loading_image_rotation_angle * 16, 300 * 16)
# draw message text # draw message text
if self._current_message: if self._current_message:
font = QFont() # Using system-default font here font = QFont() # Using system-default font here
@ -71,9 +90,9 @@ class CuraSplashScreen(QSplashScreen):
super().drawContents(painter) super().drawContents(painter)
def showMessage(self, message, *args, **kwargs): def showMessage(self, message, *args, **kwargs):
if self._to_stop: if self._to_stop:
return return
self._current_message = message self._current_message = message
self.messageChanged.emit(message) self.messageChanged.emit(message)
QCoreApplication.flush() QCoreApplication.flush()
@ -82,4 +101,7 @@ class CuraSplashScreen(QSplashScreen):
def close(self): def close(self):
# set stop flags # set stop flags
self._to_stop = True self._to_stop = True
self._change_timer.stop()
super().close() super().close()