From 1665de3ea7dfae08e9de6aca2e5bae744b2dbc1a Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Fri, 29 Apr 2011 14:34:37 +0200 Subject: [PATCH] first try of ModuleA - simple dynamo --- software/Makefile | 4 +- software/modules/ModuleA.png | Bin 2493 -> 2024 bytes software/modules/ModuleA.py | 33 ++++++++++++++-- software/modules/ModuleA.ui | 67 ++++++++++++++++++++++++++++++++ software/modules/ModuleDebug.py | 3 -- 5 files changed, 98 insertions(+), 9 deletions(-) create mode 100644 software/modules/ModuleA.ui diff --git a/software/Makefile b/software/Makefile index 5af1307..dbea95b 100644 --- a/software/Makefile +++ b/software/Makefile @@ -1,4 +1,4 @@ -all: edubrm mainUi.py resources_rc.py modules/ModuleDebugUi.py +all: edubrm mainUi.py resources_rc.py modules/ModuleAUi.py modules/ModuleDebugUi.py mainUi.py: main.ui pyuic4 $< -o $@ @@ -6,7 +6,7 @@ mainUi.py: main.ui resources_rc.py: resources.qrc pyrcc4 $< -o $@ -modules/ModuleDebugUi.py: modules/ModuleDebug.ui +modules/Module%Ui.py: modules/Module%.ui pyuic4 $< -o $@ clean: diff --git a/software/modules/ModuleA.png b/software/modules/ModuleA.png index af7cef47d02eaa7214f0f7f01a8bdb0ca4b454b1..8a7db962b90e2e2e82a4ad79d946cf3939efa406 100644 GIT binary patch delta 1995 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 iZXJtp0kk*s-t|AmDp<#QQZCg10000 + + ModuleA + + + + 0 + 0 + 781 + 531 + + + + Form + + + + + 80 + 10 + 691 + 481 + + + + + + + 10 + 10 + 61 + 481 + + + + 4000 + + + 0 + + + false + + + Qt::Vertical + + + + + + 10 + 500 + 61 + 21 + + + + 0.000 V + + + Qt::AlignCenter + + + + + + diff --git a/software/modules/ModuleDebug.py b/software/modules/ModuleDebug.py index aa981e5..032ed74 100644 --- a/software/modules/ModuleDebug.py +++ b/software/modules/ModuleDebug.py @@ -126,7 +126,6 @@ class ModuleDebugWidget(QWidget): self.ui.labelIO2.setText('IO2: -') self.ui.labelIO3.setText('IO3: -') - def read_inputs(self): r = self.dev.read() self.ui.labelAD0.setText('AD0: ' + str(r[0])) @@ -147,9 +146,7 @@ class ModuleDebug(): self.widget = ModuleDebugWidget() def start(self): - print 'start Debug' self.widget.dev = Device() def stop(self): - print 'stop Debug' self.widget.timer.stop()