burmatovan/openuds
1
0
Fork 0
forked from shaba/openuds
Code Issues Pull Requests Projects Releases Wiki Activity

Several improvements to UDS Client connector

Browse Source
This commit is contained in:
Adolfo Gómez García 2016-04-14 06:01:41 +02:00
parent 273b2a59c4
commit 07137c2416
1 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
client/src/UDSClient.py
View File

@ -56,7 +56,7 @@ class UDSClient(QtGui.QMainWindow):
withError = False withError = False
animTimer = None animTimer = None
anim = 0 anim = 0
animInc = 1 animInverted = False
def __init__(self): def __init__(self):
QtGui.QMainWindow.__init__(self) QtGui.QMainWindow.__init__(self)
@ -100,9 +100,8 @@ class UDSClient(QtGui.QMainWindow):
def showError(self, e): def showError(self, e):
self.stopAnim() self.stopAnim()
self.ui.progressBar.setValue(100) self.ui.info.setText('UDS Plugin Error') # In fact, main window is hidden, so this is not visible... :)
self.ui.info.setText('Error') QtGui.QMessageBox.critical(None, 'UDS Plugin Error', '{}'.format(e), QtGui.QMessageBox.Ok)
QtGui.QMessageBox.critical(self, 'Error', six.text_type(e), QtGui.QMessageBox.Ok)
self.closeWindow() self.closeWindow()
self.withError = True self.withError = True
@ -111,17 +110,19 @@ class UDSClient(QtGui.QMainWindow):
@QtCore.pyqtSlot() @QtCore.pyqtSlot()
def updateAnim(self): def updateAnim(self):
self.anim += self.animInc self.anim += 2
if self.anim < 1 or self.anim > 99: if self.anim > 99:
self.ui.progressBar.invertedAppearance = not self.ui.progressBar.invertedAppearance self.animInverted = not self.animInverted
self.animInc = -self.animInc self.ui.progressBar.setInvertedAppearance(self.animInverted)
self.anim = 0
self.ui.progressBar.setValue(self.anim) self.ui.progressBar.setValue(self.anim)
def startAnim(self): def startAnim(self):
self.ui.progressBar.invertedAppearance = False self.ui.progressBar.invertedAppearance = False
self.anim = 0 self.anim = 0
self.animInc = 1 self.animInverted = False
self.ui.progressBar.setInvertedAppearance(self.animInverted)
self.animTimer.start(40) self.animTimer.start(40)
def stopAnim(self): def stopAnim(self):
@ -256,6 +257,10 @@ if __name__ == "__main__":
# First parameter must be url # First parameter must be url
try: try:
uri = sys.argv[1] uri = sys.argv[1]
if uri == '--test':
sys.exit(0)
logger.debug('URI: {}'.format(uri)) logger.debug('URI: {}'.format(uri))
if uri[:6] != 'uds://' and uri[:7] != 'udss://': if uri[:6] != 'uds://' and uri[:7] != 'udss://':
raise Exception() raise Exception()
@ -298,12 +303,3 @@ if __name__ == "__main__":
logger.debug('Exiting') logger.debug('Exiting')
sys.exit(exitVal) sys.exit(exitVal)
# Build base REST
# v = RestRequest('', done)
# v.get()
# sys.exit(1)
# myapp = UDSConfigDialog(cfg)
# myapp.show()