diff --git a/examples/dokk/datafiles/dengue/top_ten.ini b/examples/dokk/datafiles/dengue/top_ten.ini index 9b68e0dab505375a0e26f136b6faf6f7058cc42c..0e9aec53fb7fce0b5b94e953f50dfe947c6501e3 100644 --- a/examples/dokk/datafiles/dengue/top_ten.ini +++ b/examples/dokk/datafiles/dengue/top_ten.ini @@ -1,28 +1,32 @@ [1] -score = 1.22069145838 +score = 1.08804896275 name = STU [3] -score = 1.34045518637 +score = 1.26454350948 name = STU [2] -score = 1.26454350948 +score = 1.22069145838 name = STU [5] -score = 1.87384883563 -name = BIO +score = 1.57162377437 +name = STU [4] -score = 1.57162377437 +score = 1.34045518637 name = STU [7] -score = 2.80041636229 -name = AAA - -[6] score = 2.58003196716 name = STU +[6] +score = 1.87384883563 +name = BIO + +[8] +score = 2.80041636229 +name = AAA + diff --git a/examples/dokk/datafiles/tutorial_1/level.ini b/examples/dokk/datafiles/tutorial_1/level.ini index 62771d8e99a91ba9c65947dc1263409c30cc8475..dc39ebe0bd2bfae738b77776ceb789f2e4f6ae6b 100644 --- a/examples/dokk/datafiles/tutorial_1/level.ini +++ b/examples/dokk/datafiles/tutorial_1/level.ini @@ -27,7 +27,8 @@ TEXTTIME3: 8000 TEXT4: Sie k�nnen mit dem 3D-Input Device den Liganden verschieben, indem Sie den Joystick in die entsprechende Richtung bewegen. -TEXTTIME4: 8000 +TEXTTIME4: 13000 +TEXTIMG4: images/translation.png TEXT5: Falls Fragen bestehen, k�nnen Sie sich gerne an eine unserer Fachkr�fte wenden. TEXTTIME5: 5000 diff --git a/examples/dokk/datafiles/tutorial_2/level.ini b/examples/dokk/datafiles/tutorial_2/level.ini index e0a848e227c08cc5c39d3395f6867644fd363e26..5e6d1b5725153fb461a647119504c3c55a77d592 100644 --- a/examples/dokk/datafiles/tutorial_2/level.ini +++ b/examples/dokk/datafiles/tutorial_2/level.ini @@ -19,7 +19,8 @@ TEXTTIME1: 3000 TEXT2: In diesem �bungslevel lernen Sie, wie der Ligand rotiert werden kann. Dazu k�nnen Sie den Joystick drehen oder ziehen und bewegen. -TEXTTIME2: 8000 +TEXTTIME2: 13000 +TEXTIMG2: images/rotation.png TEXT3: Sind Sie bereit? Es wird ein wenig schwerer. TEXTTIME3: 3000 diff --git a/examples/dokk/hud.py b/examples/dokk/hud.py index bc5aa3c1dca11a3d1b1cc7d4ec6a3fc9bf43951d..2ee4e7f3542b1a80c3049cc8a77daec7768978af 100644 --- a/examples/dokk/hud.py +++ b/examples/dokk/hud.py @@ -114,3 +114,13 @@ class RectHUDObject(HUDObject): painter.setBrush(self.bg_color) painter.drawRect(self.rect) painter.setPen(QPen(self.border_color, Qt.SolidLine)) + +class ImgHUDObject(HUDObject): + def __init__(self, time, pos, img_loc="", parent=None): + HUDObject.__init__(self,time,parent) + self.pos = pos + self.img = QImage(img_loc) + + def Paint(self, painter): + painter.drawImage(self.pos, self.img) + \ No newline at end of file diff --git a/examples/dokk/level_messages.py b/examples/dokk/level_messages.py index e20c18b4f3cab6ab62fbff9a1809cc824803dda3..14abe499cde88feac120c2964217ae1a01185d88 100644 --- a/examples/dokk/level_messages.py +++ b/examples/dokk/level_messages.py @@ -2,6 +2,7 @@ from PyQt4 import QtCore, QtGui from dokk import Dokk from hud import RectHUDObject from hud import RectTextHUDObject +from hud import ImgHUDObject class LevelMessages(QtCore.QObject): def __init__(self, config_map, parent=None): @@ -32,7 +33,14 @@ class LevelMessages(QtCore.QObject): except: size = default_size - self.text_list.append([config_map["TEXT%s"%i], time, color, size]) + try: + print "TEST IMG" + img = config_map["TEXTIMG%s"%i] + print img + except: + img = None + + self.text_list.append([config_map["TEXT%s"%i], time, color, size, img]) self.total_time += time self.cur_text = 0 @@ -52,10 +60,12 @@ class LevelMessages(QtCore.QObject): font = QtGui.QFont("Verdana", 15); rect = QtCore.QRect(QtCore.QPoint(60, 60), QtCore.QSize(dokk.gl_win.Width()-120, dokk.gl_win.Height()-120)) self.text = RectTextHUDObject(text="", rect=rect, time=0, font=font) + self.img = ImgHUDObject(time=0,pos=QtCore.QPoint(dokk.gl_win.Width()/2, dokk.gl_win.Height()-600)) QtCore.QObject.connect(self.text, QtCore.SIGNAL("Finished()"), self.NextMessage) self.bg = RectHUDObject(time,rect, bg_color=QtGui.QColor(128,128,128,200)) dokk.gl_win.AddHUDObject(self.bg) dokk.gl_win.AddHUDObject(self.text) + dokk.gl_win.AddHUDObject(self.img) def Stop(self): self.cur_text = -1 @@ -71,6 +81,14 @@ class LevelMessages(QtCore.QObject): self.text.color=self.text_list[self.cur_text][2] self.text.font.setPointSize(self.text_list[self.cur_text][3]) self.text.Reset() + + print self.text_list[self.cur_text][4] + if(self.text_list[self.cur_text][4]): + self.img.img = QtGui.QImage(self.text_list[self.cur_text][4]) + hw=self.img.img.width()/2.0 + self.img.time = self.text_list[self.cur_text][1] + self.img.pos = QtCore.QPoint((dokk.gl_win.Width()/2)-hw, dokk.gl_win.Height()/2+70) + self.img.Reset() else: self.emit(QtCore.SIGNAL('Finished()')) self.cur_text = -1