more fixes

This commit is contained in:
Pavol Rusnak 2011-05-04 02:16:08 +02:00
parent 1413db58fd
commit 19bd37a530
7 changed files with 285 additions and 58 deletions

View file

@ -20,10 +20,11 @@ class ModuleCWidget(QWidget):
self.timer = QTimer()
QObject.connect(self.timer, SIGNAL("timeout()"), self.read_inputs)
self.data1 = 200*[0.0]
self.data2 = 200*[0.0]
self.datau = 200*[0.0]
self.datai = 200*[0.0]
self.current = 0
self.mode = ['DC', 'L']
self.mode = ['DC', 'C']
@pyqtSlot()
def on_radioAC_clicked(self):
@ -54,6 +55,7 @@ class ModuleCWidget(QWidget):
def on_btnStart_clicked(self):
self.ui.btnStart.setEnabled(False)
self.ui.btnStop.setEnabled(True)
self.current = 3.3
if self.mode == ['DC', 'L']:
self.dev.setout(1, 1)
if self.mode == ['DC', 'C']:
@ -65,6 +67,7 @@ class ModuleCWidget(QWidget):
def on_btnStop_clicked(self):
self.ui.btnStart.setEnabled(True)
self.ui.btnStop.setEnabled(False)
self.current = 0.0
if self.mode == ['DC', 'L']:
self.dev.setout(1, 0)
if self.mode == ['DC', 'C']:
@ -73,45 +76,55 @@ class ModuleCWidget(QWidget):
self.dev.setout(3, 0)
def setup_hw(self):
if self.mode == ['DC', 'L']:
self.dev.switches(1<<0)
if self.mode == ['DC', 'C']:
self.dev.switches(1<<1)
if self.mode == ['DC', 'LC']:
if self.mode == ['DC', 'L']: # AD6
self.dev.switches(1<<5)
self.dev.opamp(2, 5, 0)
if self.mode == ['DC', 'C']: # AD5
self.dev.switches(1<<4)
self.dev.opamp(2, 4, 0)
if self.mode == ['DC', 'LC']: # AD3
self.dev.switches(1<<2)
self.dev.opamp(2, 2, 0)
def setup_scene(self, scene):
scene.addLine(-5, 200-0, 610, 200-0)
scene.addLine(-5, 100-0, 605, 100-0)
scene.addLine(0, 200+5, 0, 200-205)
scene.addLine(-5, 200- 50, 10, 200- 50)
scene.addLine(-5, 200-100, 10, 200-100)
scene.addLine(-5, 200-150, 10, 200-150)
scene.addSimpleText('4.0').moveBy(-40, 0-10)
scene.addSimpleText('3.0').moveBy(-40, 50-10)
scene.addSimpleText('2.0').moveBy(-40, 100-10)
scene.addSimpleText('1.0').moveBy(-40, 150-10)
scene.addSimpleText('0.0').moveBy(-40, 200-10)
scene.addLine(-5, 200- 0, 5, 200- 0)
scene.addLine(-5, 200- 50, 5, 200- 50)
scene.addLine(-5, 200-100, 5, 200-100)
scene.addLine(-5, 200-150, 5, 200-150)
scene.addLine(-5, 200-200, 5, 200-200)
def tick_DC(self, u, i):
self.data1.pop(0)
self.data2.pop(0)
self.data1.append(u)
self.data2.append(i)
self.datau.pop(0)
self.datai.pop(0)
self.datau.append(u)
self.datai.append(i)
self.scene1 = QGraphicsScene()
self.scene2 = QGraphicsScene()
self.setup_scene(self.scene1)
self.setup_scene(self.scene2)
self.scene1.addSimpleText('[U]').moveBy(-39, 220-10)
self.scene2.addSimpleText('[I]').moveBy(-39, 220-10)
self.scene1.addSimpleText('[U/V]').moveBy(-39, 220-10)
self.scene2.addSimpleText('[I/mA]').moveBy(-39, 220-10)
self.scene1.addSimpleText('+4.0').moveBy(-40, 0-10)
self.scene1.addSimpleText('+2.0').moveBy(-40, 50-10)
self.scene1.addSimpleText(' 0.0').moveBy(-40, 100-10)
self.scene1.addSimpleText('-2.0').moveBy(-40, 150-10)
self.scene1.addSimpleText('-4.0').moveBy(-40, 200-10)
self.scene2.addSimpleText('+0.4').moveBy(-40, 0-10)
self.scene2.addSimpleText('+0.2').moveBy(-40, 50-10)
self.scene2.addSimpleText(' 0.0').moveBy(-40, 100-10)
self.scene2.addSimpleText('-0.2').moveBy(-40, 150-10)
self.scene2.addSimpleText('-0.4').moveBy(-40, 200-10)
path = QPainterPath()
path.moveTo(0,200-self.data1[0]*50)
path.moveTo(0,100-self.datau[0]*25)
for i in xrange(1,200):
path.lineTo(3*(i+1), 200-self.data1[i]*50)
path.lineTo(3*(i+1), 100-self.datau[i]*25)
self.scene1.addPath(path, QPen(QColor(0,0,255), 3))
path = QPainterPath()
path.moveTo(0,200-self.data2[0]*50)
path.moveTo(0,100-self.datai[0]*25)
for i in xrange(1,200):
path.lineTo(3*(i+1), 200-self.data2[i]*50)
path.lineTo(3*(i+1), 100-self.datai[i]*25)
self.scene2.addPath(path, QPen(QColor(0,0,255), 3))
self.ui.graph1.setScene(self.scene1)
self.ui.graph2.setScene(self.scene2)
@ -121,7 +134,7 @@ class ModuleCWidget(QWidget):
if self.mode[0] == 'DC':
u = r[0]/1023.0 * 3.3 # TODO: change this if we change opamp
i = 1 # TODO: read real current
i = self.current - r[0]/1023.0 * 3.3
self.tick_DC(u, i)
class ModuleC():
@ -134,6 +147,8 @@ class ModuleC():
self.widget.dev = Device()
self.widget.setup_hw()
self.widget.timer.start(25)
self.widget.datau = 200*[0.0]
self.widget.datai = 200*[0.0]
def stop(self):
self.widget.timer.stop()